Revision: 6245
http://gar.svn.sourceforge.net/gar/?rev=6245&view=rev
Author: wahwah
Date: 2009-09-09 15:30:27 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
tightvnc: Builds fine on Solaris 10 with SOS12. Doesn't USE_LIBWRAP.
Modified Paths:
--------------
csw/mgar/pkg/tightvnc/trunk/Makefile
csw/mgar/pkg/tightvnc/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch
Removed Paths:
-------------
csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch
Modified: csw/mgar/pkg/tightvnc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 14:45:00 UTC (rev
6244)
+++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-09 15:30:27 UTC (rev
6245)
@@ -35,22 +35,17 @@
EXTRA_DEFINES = -DUSE_LIBWRAP=1
EXTRA_INC = /usr/openwin/share/include/X11
+EXTRA_INCLUDES = $(EXTRA_INC)
EXTRA_LDFLAGS = /opt/csw/lib
LOCAL_LDFLAGS = $(LINKER_FLAGS)
-BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS
-CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile
-# Xvnc
-CONFIGURE_ARGS = -a
-BUILD_SCRIPTS = vnc Xvnc
+BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDES LOCAL_LDFLAGS
+CONFIGURE_SCRIPTS = vnc
+BUILD_SCRIPTS = maciej
TEST_SCRIPTS =
INSTALL_SCRIPTS = vnc
-# This patch has been sent upstream with a bug report.
-#
http://sourceforge.net/tracker/?func=detail&aid=2852808&group_id=14067&atid=114067
-# PATCHFILES += 0002-Test-for-Makefile-presence.patch
-#
PATCHFILES = 0001-Sun-compiler-in-sun.cf.patch
-PATCHFILES += 0002-pass-f-xmakefile-flag-when-appropriate.patch
PATCHFILES += 0003-GNU-make-by-default.patch
+PATCHFILES += 0003-libdix.a-after-libos.a.patch
include gar/category.mk
@@ -58,28 +53,34 @@
perl -pi -e "s|/usr/local/vnc/classes|$(datadir)/vnc/classes|"
$(WORKSRC)/vncserver
@$(MAKECOOKIE)
-configure-Xvnc:
- banner "Config Xvnc"
- perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure
- (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure)
+configure-vnc:
+ (cd $(WORKSRC) && $(CONFIGURE_ENV) xmkmf)
@$(MAKECOOKIE)
-build-vnc:
- banner "Build VNC"
- cd $(WORKSRC) && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach
TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World
- # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) $(PARALLELMFLAGS) $(foreach
TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") World
- @$(MAKECOOKIE)
+build-maciej:
+ (cd $(WORKSRC) && $(BUILD_ENV) \
+ EXTRA_INCLUDES="-I/opt/csw/include" \
+ LOCAL_LDFLAGS="-L/opt/csw/lib" \
+ gmake World)
+ (cd $(WORKSRC)/Xvnc && $(CONFIGURE_ENV) \
+ EXTRA_LIBRARIES="-lwrap -lsocket" \
+ EXTRA_DEFINES="-DUSE_LIBWRAP=1" \
+ EXTRA_INCLUDES="-I/opt/csw/include" \
+ LOCAL_LDFLAGS="-L/opt/csw/lib" \
+ ./configure)
+ (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \
+ EXTRA_INCLUDES="-I/opt/csw/include" \
+ LOCAL_LDFLAGS="-L/opt/csw/lib" \
+ gmake)
+ # <maciej> This is something that Dago wanted to do, but it causes the
build to
+ # fail. I'm leaving it for future reference.
+ # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \
+ # EXTRA_LIBRARIES="-lwrap -lsocket" \
+ # EXTRA_DEFINES="-DUSE_LIBWRAP=1" \
+ # LOCAL_LDFLAGS="-L/opt/csw/lib" \
+ # EXTRA_INCLUDES="-I/opt/csw/include" \
+ # $(MAKE))
-build-Xvnc: configure-Xvnc
- # $(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap"
EXTRA_DEFINES="-DUSE_LIBWRAP=1" World
- # banner "Config Xvnc"
- # (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure)
- banner "Build Xvnc"
- $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap
-lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib
-L/usr/lib" World
- # cd $(WORKSRC) && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap"
EXTRA_DEFINES="-DUSE_LIBWRAP=1" World
- # cd $(WORKSRC)/Xvnc && $(MAKE) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap
-lsocket" EXTRA_DEFINES="-DUSE_LIBWRAP=1" EXTRA_LDOPTIONS="-L/opt/csw/lib
-L/usr/lib" World
- @$(MAKECOOKIE)
-
install-vnc:
ginstall -d $(DESTDIR)$(bindir)
ginstall -d $(DESTDIR)$(mandir)/man1
Modified: csw/mgar/pkg/tightvnc/trunk/checksums
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 14:45:00 UTC (rev
6244)
+++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-09 15:30:27 UTC (rev
6245)
@@ -1,5 +1,5 @@
76166d097bf2e70627cb6c87d312bca5 download/0001-Sun-compiler-in-sun.cf.patch
-51441e1d47891f910f0929cd65a487a7
download/0002-pass-f-xmakefile-flag-when-appropriate.patch
1264014c1ce47a119a724f17a6e0a768 download/0003-GNU-make-by-default.patch
+c5e9c3e4017caa65d14a0b98858043b9 download/0003-libdix.a-after-libos.a.patch
397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2
56c09be17c17184e96193c13246fd649 download/vncservers
Deleted:
csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch
===================================================================
---
csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch
2009-09-09 14:45:00 UTC (rev 6244)
+++
csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch
2009-09-09 15:30:27 UTC (rev 6245)
@@ -1,50 +0,0 @@
-From 796212b91212ad84a516554ba5bb6250d8fd1c87 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <[email protected]>
-Date: Mon, 7 Sep 2009 10:08:34 +0200
-Subject: [PATCH 2/3] pass -f xmakefile flag when appropriate
-
----
- Xvnc/config/cf/Imake.rules | 13 ++++++++++---
- 1 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/Xvnc/config/cf/Imake.rules b/Xvnc/config/cf/Imake.rules
-index 5ab9a18..353dabf 100644
---- a/Xvnc/config/cf/Imake.rules
-+++ b/Xvnc/config/cf/Imake.rules
-@@ -2469,7 +2469,7 @@ $(ONESUBDIR)/Makefile:
@@\
- fi; @@\
- @@\
- target:: @@\
-- -...@makeflagstoshellflags(ik,set +e); \
@@\
-+ MakeFlagsToShellFlags(ik,set +e); \ @@\
- MakeFlagsToShellFlags(n,executeit="no"); \ @@\
- for i in dirs ;\ @@\
- do \ @@\
-@@ -2477,7 +2477,7 @@ target::
@@\
- .) curdir= ;; \ @@\
- *) curdir=$(CURRENT_DIR)/ ;; \ @@\
- esac; \ @@\
-- echo "making Makefiles in $$curdir$$i..."; \ @@\
-+ echo "making Makefiles in '$$curdir'::'$$i'..."; \
@@\
- itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\
- curtmp="$(CURRENT_DIR)" \ @@\
- toptmp=""; \ @@\
-@@ -2514,7 +2514,14 @@ target::
@@\
- $(MV) $$i/Makefile $$i/Makefile.bak; \ @@\
- fi; \ @@\
- fi; \ @@\
-- $(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir
IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \ @@\
-+ [ -r xmakefile ] && $(MAKE) -f xmakefile $(MFLAGS) \ @@\
-+ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\
-+ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\
-+ $$i/Makefile || \ @@\
-+ $(MAKE) $(MFLAGS) \ @@\
-+ $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir \ @@\
-+ IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix \ @@\
-+ $$i/Makefile; \ @@\
- if [ -d $$i ] ; then \ @@\
- cd $$i; \ @@\
- $(MAKE) $(MFLAGS) Makefiles; \ @@\
---
-1.6.3.2
-
Added: csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch
(rev 0)
+++ csw/mgar/pkg/tightvnc/trunk/files/0003-libdix.a-after-libos.a.patch
2009-09-09 15:30:27 UTC (rev 6245)
@@ -0,0 +1,25 @@
+From 490679f2825057f4516557abce0109a324c95a8a Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <[email protected]>
+Date: Wed, 9 Sep 2009 11:36:02 +0200
+Subject: [PATCH 3/3] libdix.a after libos.a
+
+---
+ Xvnc/programs/Xserver/Imakefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xvnc/programs/Xserver/Imakefile b/Xvnc/programs/Xserver/Imakefile
+index 4209d1f..89a1a97 100644
+--- a/Xvnc/programs/Xserver/Imakefile
++++ b/Xvnc/programs/Xserver/Imakefile
+@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.85.2.8
1998/02/07 00:44:33 daw
+ INSTPGMFLAGS =
+ #endif
+
+-#define PreFbLibs $(DIX) $(OS) $(FONT) $(XPDDX)
++#define PreFbLibs $(DIX) $(OS) $(DIX) $(FONT) $(XPDDX)
+ #define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI)
+ #define PostFbLibs BarePostFbLibs $(EXTENSIONS)
+ #define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI)
+--
+1.6.3.2
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
