[csw-devel] SF.net SVN: gar:[6195] csw/mgar/pkg/vncserver/trunk

[wahwah at users.sourceforge.net]

Revision: 6195
          http://gar.svn.sourceforge.net/gar/?rev=6195&view=rev
Author:   wahwah
Date:     2009-09-05 16:26:49 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
vncserver: Some more work. Doesn't compile yet, calls 'clean' target on directories with no Makefiles.

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

Added Paths:
-----------
    csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch

Modified: csw/mgar/pkg/vncserver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vncserver/trunk/Makefile	2009-09-05 11:55:40 UTC (rev 6194)
+++ csw/mgar/pkg/vncserver/trunk/Makefile	2009-09-05 16:26:49 UTC (rev 6195)
@@ -18,7 +18,6 @@
 
 REQUIRED_PKGS = CSWjpeg CSWtcpwrap
 
-# We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_USE_SF = 1
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=14067
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)_unixsrc.tar.bz2
@@ -28,7 +27,8 @@
 # Use tightvnc.spec
 
 EXTRA_DEFINES = -DUSE_LIBWRAP=1
-EXTRA_INCLUDE = $(CFLAGS)
+EXTRA_INC = /usr/openwin/share/include/X11
+EXTRA_LDFLAGS = /opt/csw/lib
 LOCAL_LDFLAGS = $(LINKER_FLAGS)
 BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS
 
@@ -38,10 +38,13 @@
 BUILD_SCRIPTS = vnc Xvnc
 
 # VNC doesn't come with tests
-TEST_SCRIPTS =
+SKIPTEST = 1
 
 INSTALL_SCRIPTS = vnc
 
+PATCHFILES  = 0001-GNU-make-by-default.patch
+# PATCHFILES += work-in-progress.patch
+
 include gar/category.mk
 
 pre-configure-modulated:
@@ -62,7 +65,10 @@
 
 build-Xvnc: configure-Xvnc
 	banner "Build Xvnc"
-	cd $(WORKSRC)/Xvnc && $(MAKE) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1"
+	# $(MAKE) -C $(WORKSRC)/Xvnc $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World
+	$(MAKE) -C $(WORKSRC) $(BUILD_ENV) EXTRA_LIBRARIES="-lwrap" EXTRA_DEFINES="-DUSE_LIBWRAP=1" World
+	$(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
+	@$(MAKECOOKIE)
 
 #xmkmf -a
 #make CDEBUGFLAGS="$RPM_OPT_FLAGS" World
@@ -129,4 +135,3 @@
 # VNCSERVERS="1:myusername"
 #EOF
 #chmod 644 %{buildroot}/etc/sysconfig/vncservers
-

Modified: csw/mgar/pkg/vncserver/trunk/checksums
===================================================================
--- csw/mgar/pkg/vncserver/trunk/checksums	2009-09-05 11:55:40 UTC (rev 6194)
+++ csw/mgar/pkg/vncserver/trunk/checksums	2009-09-05 16:26:49 UTC (rev 6195)
@@ -1,2 +1,3 @@
+ccaa72230aff091ca3863896b5c36885  download/0001-GNU-make-by-default.patch
 397b35faad32d5246b6d44b142f8304f  download/tightvnc-1.3.10_unixsrc.tar.bz2
 56c09be17c17184e96193c13246fd649  download/vncservers

Added: csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch
===================================================================
--- csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch	                        (rev 0)
+++ csw/mgar/pkg/vncserver/trunk/files/0001-GNU-make-by-default.patch	2009-09-05 16:26:49 UTC (rev 6195)
@@ -0,0 +1,25 @@
+From 985baba7fd98f7e329fdbe09559f8f98c1bcce82 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Sat, 5 Sep 2009 14:18:18 +0100
+Subject: [PATCH] GNU make by default
+
+---
+ Xvnc/config/cf/svr4.cf |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xvnc/config/cf/svr4.cf b/Xvnc/config/cf/svr4.cf
+index b9fbcfc..2d7d3ab 100644
+--- a/Xvnc/config/cf/svr4.cf
++++ b/Xvnc/config/cf/svr4.cf
+@@ -74,7 +74,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.25.2.2 1997/07/05 15:55:30 dawes Exp $
+ #define	LexCmd	/usr/ccs/bin/lex
+ #endif
+ #ifndef MakeCmd
+-#define	MakeCmd	/usr/ccs/bin/make
++#define	MakeCmd	/opt/csw/bin/gmake
+ #endif
+ #ifndef YaccCmd
+ #define	YaccCmd	/usr/ccs/bin/yacc
+-- 
+1.6.3.2
+


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