[csw-devel] SF.net SVN: gar:[6246] csw/mgar/pkg/tightvnc/trunk

[wahwah at users.sourceforge.net]

Revision: 6246
          http://gar.svn.sourceforge.net/gar/?rev=6246&view=rev
Author:   wahwah
Date:     2009-09-09 16:51:21 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
tightvnc: Enabling libwrap.

Modified Paths:
--------------
    csw/mgar/pkg/tightvnc/trunk/Makefile
    csw/mgar/pkg/tightvnc/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch

Modified: csw/mgar/pkg/tightvnc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/Makefile	2009-09-09 15:30:27 UTC (rev 6245)
+++ csw/mgar/pkg/tightvnc/trunk/Makefile	2009-09-09 16:51:21 UTC (rev 6246)
@@ -38,14 +38,16 @@
 EXTRA_INCLUDES = $(EXTRA_INC)
 EXTRA_LDFLAGS = /opt/csw/lib
 LOCAL_LDFLAGS = $(LINKER_FLAGS)
-BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDES LOCAL_LDFLAGS
+EXTRA_LIBRARIES = -lwrap -lsocket
+BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDES LOCAL_LDFLAGS EXTRA_LIBRARIES
 CONFIGURE_SCRIPTS = vnc
-BUILD_SCRIPTS = maciej
+BUILD_SCRIPTS = vnc
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = vnc
 PATCHFILES  = 0001-Sun-compiler-in-sun.cf.patch
 PATCHFILES += 0003-GNU-make-by-default.patch
 PATCHFILES += 0003-libdix.a-after-libos.a.patch
+PATCHFILES += 0001-Force-the-use-of-libwrap.patch
 
 include gar/category.mk
 
@@ -57,7 +59,7 @@
 	(cd $(WORKSRC) && $(CONFIGURE_ENV) xmkmf)
 	@$(MAKECOOKIE)
 
-build-maciej:
+build-vnc:
 	(cd $(WORKSRC) && $(BUILD_ENV) \
 		EXTRA_INCLUDES="-I/opt/csw/include" \
 		LOCAL_LDFLAGS="-L/opt/csw/lib" \
@@ -69,17 +71,11 @@
 		LOCAL_LDFLAGS="-L/opt/csw/lib" \
 		./configure)
 	(cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \
-		EXTRA_INCLUDES="-I/opt/csw/include" \
+		EXTRA_LIBRARIES="-lwrap -lsocket" \
+		EXTRA_DEFINES="-DUSE_LIBWRAP=1" \
 		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))
+		EXTRA_INCLUDES="-I/opt/csw/include" \
+		$(MAKE))
 
 install-vnc:
 	ginstall -d $(DESTDIR)$(bindir)

Modified: csw/mgar/pkg/tightvnc/trunk/checksums
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/checksums	2009-09-09 15:30:27 UTC (rev 6245)
+++ csw/mgar/pkg/tightvnc/trunk/checksums	2009-09-09 16:51:21 UTC (rev 6246)
@@ -1,3 +1,4 @@
+38a4eaded4a6418f5547fa57cefb97f9  download/0001-Force-the-use-of-libwrap.patch
 76166d097bf2e70627cb6c87d312bca5  download/0001-Sun-compiler-in-sun.cf.patch
 1264014c1ce47a119a724f17a6e0a768  download/0003-GNU-make-by-default.patch
 c5e9c3e4017caa65d14a0b98858043b9  download/0003-libdix.a-after-libos.a.patch

Added: csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch	                        (rev 0)
+++ csw/mgar/pkg/tightvnc/trunk/files/0001-Force-the-use-of-libwrap.patch	2009-09-09 16:51:21 UTC (rev 6246)
@@ -0,0 +1,25 @@
+From dd810a41debde8e4e24241a87b7ba19766407032 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 9 Sep 2009 18:18:18 +0200
+Subject: [PATCH] Force the use of libwrap
+
+---
+ Xvnc/config/cf/vnclibs.def |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xvnc/config/cf/vnclibs.def b/Xvnc/config/cf/vnclibs.def
+index c033ca7..948fd7a 100644
+--- a/Xvnc/config/cf/vnclibs.def
++++ b/Xvnc/config/cf/vnclibs.def
+@@ -11,7 +11,7 @@ VNCLIBS = $(TOP)/../libvncauth/libvncauth.a
+ /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
+ VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
+ #else
+-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
++VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt -lwrap
+ #endif
+ 
+ VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
+-- 
+1.6.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.