Revision: 6213
http://gar.svn.sourceforge.net/gar/?rev=6213&view=rev
Author: wahwah
Date: 2009-09-07 08:14:03 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
tightvnc: Jumped over one more hoop.
Modified Paths:
--------------
csw/mgar/pkg/tightvnc/trunk/Makefile
csw/mgar/pkg/tightvnc/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch
csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch
csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch
Modified: csw/mgar/pkg/tightvnc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-07 02:02:26 UTC (rev
6212)
+++ csw/mgar/pkg/tightvnc/trunk/Makefile 2009-09-07 08:14:03 UTC (rev
6213)
@@ -38,15 +38,19 @@
EXTRA_LDFLAGS = /opt/csw/lib
LOCAL_LDFLAGS = $(LINKER_FLAGS)
BUILD_OVERRIDE_DIRS = EXTRA_DEFINES EXTRA_INCLUDE LOCAL_LDFLAGS
-CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile Xvnc
+CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile
+# Xvnc
CONFIGURE_ARGS = -a
BUILD_SCRIPTS = vnc Xvnc
-SKIPTEST = 1
+TEST_SCRIPTS =
INSTALL_SCRIPTS = vnc
-PATCHFILES = 0001-GNU-make-by-default.patch
# 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 += 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
include gar/category.mk
@@ -57,28 +61,25 @@
configure-Xvnc:
banner "Config Xvnc"
perl -pi -e "s|^(\s*make)\s*$$|\1 CC=$(CC)|" $(WORKSRC)/Xvnc/configure
- cd $(WORKSRC)/Xvnc && ./configure
+ (cd $(WORKSRC)/Xvnc && $(BUILD_ENV) ./configure)
@$(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-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"
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
+ # 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)
-#xmkmf -a
-#make CDEBUGFLAGS="$RPM_OPT_FLAGS" World
-#cd Xvnc
-#./configure
-#make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$RPM_OPT_FLAGS" \
-# EXTRA_DEFINES="-DUSE_LIBWRAP=1"
-
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-07 02:02:26 UTC (rev
6212)
+++ csw/mgar/pkg/tightvnc/trunk/checksums 2009-09-07 08:14:03 UTC (rev
6213)
@@ -1,4 +1,5 @@
-c041ccc52996cf7e085e8f3a51747aea download/0001-GNU-make-by-default.patch
-88d1dfca0c88c191f54f5aa5c6aab460
download/0002-Test-for-Makefile-presence.patch
+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
397b35faad32d5246b6d44b142f8304f download/tightvnc-1.3.10_unixsrc.tar.bz2
56c09be17c17184e96193c13246fd649 download/vncservers
Added: csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch
(rev 0)
+++ csw/mgar/pkg/tightvnc/trunk/files/0001-Sun-compiler-in-sun.cf.patch
2009-09-07 08:14:03 UTC (rev 6213)
@@ -0,0 +1,41 @@
+From dce24615e4e31aadf4a50bd07a502b9f9a8104b8 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <mac...@opencsw.org>
+Date: Mon, 7 Sep 2009 10:08:09 +0200
+Subject: [PATCH 1/3] Sun compiler in sun.cf
+
+---
+ Xvnc/config/cf/sun.cf | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Xvnc/config/cf/sun.cf b/Xvnc/config/cf/sun.cf
+index 01d76dc..622c73a 100644
+--- a/Xvnc/config/cf/sun.cf
++++ b/Xvnc/config/cf/sun.cf
+@@ -146,19 +146,19 @@ XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
+ #if OSMajorVersion > 4
+ #if HasSunC
+ /*
+- * Assume /opt/SUNWspro/bin/ contains symlinks to the appropriate tools
++ * Assume /opt/studio/SOS11/SUNWspro/bin/ contains symlinks to the
appropriate tools
+ */
+ #ifndef CcCmd
+-# define CcCmd /opt/SUNWspro/bin/cc
++# define CcCmd /opt/studio/SOS11/SUNWspro/bin/cc
+ #endif
+ #ifndef CplusplusCmd
+-# define CplusplusCmd /opt/SUNWspro/bin/CC
++# define CplusplusCmd /opt/studio/SOS11/SUNWspro/bin/CC
+ #endif
+ #ifndef CplusplusFilt
+-# define CplusplusFilt /opt/SUNWspro/bin/c++filt
++# define CplusplusFilt /opt/studio/SOS11/SUNWspro/bin/c++filt
+ #endif
+ #ifndef CplusplusDependIncludes
+-# define CplusplusDependIncludes -I/opt/SUNWspro/SC3.0/include/CC
++# define CplusplusDependIncludes
-I/opt/studio/SOS11/SUNWspro/SC3.0/include/CC
+ #endif
+ #endif
+
+--
+1.6.3.2
+
Added:
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
(rev 0)
+++
csw/mgar/pkg/tightvnc/trunk/files/0002-pass-f-xmakefile-flag-when-appropriate.patch
2009-09-07 08:14:03 UTC (rev 6213)
@@ -0,0 +1,50 @@
+From 796212b91212ad84a516554ba5bb6250d8fd1c87 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <mac...@opencsw.org>
+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-GNU-make-by-default.patch
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch
(rev 0)
+++ csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch
2009-09-07 08:14:03 UTC (rev 6213)
@@ -0,0 +1,25 @@
+From 3e9ba23cbf15392e04b1d06e57575027a88a16c3 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <mac...@opencsw.org>
+Date: Mon, 7 Sep 2009 10:09:47 +0200
+Subject: [PATCH 3/3] 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.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
