Added patches for Darwin for source and ebuild and marked ~ppc-macos (bug #89098)

Package-Manager: portage-2.0.51.22-r3

4 files changed, 62 insertions, 36 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index d8d28bac0d1a..2575fb1c5d6c 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.58 2005/10/25 04:13:25 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.59 2005/11/05 18:10:25 grobian Exp $
+
+  05 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/tightvnc-1.3_alpha7-darwin.patch, tightvnc-1.3_alpha7.ebuild:
+  Added patches for Darwin for source and ebuild and marked ~ppc-macos (bug
+  #89098)
 
   25 Oct 2005; Daniel Goller <morfic@gentoo.org> ChangeLog:
   Remove the 4.0 folder too
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index 8537f5b934dd..3c5319f36a11 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,36 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f83cd0482d322cf8ea294bbb1bce4756 ChangeLog 7818
-MD5 59a8848188e5992cbe142be7d6285ee5 metadata.xml 309
+MD5 9fc18bd0e2fbd2d12b29707f5d72a697 tightvnc-1.3_alpha7.ebuild 2276
 MD5 ad61c2374702756a5341de9f1a63efda tightvnc-1.2.8.ebuild 1595
 MD5 3cc698e0e4dc7d3c778411161b5af86d tightvnc-1.2.9-r1.ebuild 1717
 MD5 c3388af0849a29205dbf0a090a78f2c4 tightvnc-1.3_alpha5.ebuild 1871
-MD5 a51d14af2aeb21edf264185bb276b9f1 tightvnc-1.3_alpha7.ebuild 2113
-MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
+MD5 7ae0a240735554975624754b6dc58aae ChangeLog 8028
+MD5 59a8848188e5992cbe142be7d6285ee5 metadata.xml 309
 MD5 11be6d47e594297c9a92c56056df2f73 files/digest-tightvnc-1.2.8 76
-MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
+MD5 31639d1ccaa2c2a4e9dd869fd32f4602 files/tightvnc-1.2.9-gentoo.diff 653
+MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha7-imake-tmpdir.patch 956
+MD5 123eaef930daa068bd0b5366ca89f33c files/tightvnc-1.3_alpha7-darwin.patch 827
+MD5 255c92e5784a2fe1c9fe7283f4a54d34 files/tightvnc-1.3_alpha7-gentoo.diff 697
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.2.9-imake-tmpdir.patch 956
+MD5 fba34335858b6b6b681a660c7c74273f files/tightvnc-gentoo.diff 636
+MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.8-gentoo.security.patch 771
 MD5 4e84efe3429797daa190b7d29e9b5857 files/digest-tightvnc-1.3_alpha5 78
 MD5 e972798c3780581c31b4c0a4b35dfbb6 files/digest-tightvnc-1.3_alpha7 78
+MD5 70b94ceb3134edc412d70768b55661aa files/tightvnc-1.3_alpha5-gcc34.patch 1540
 MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.7-gentoo.diff 657
-MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
-MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.8-gentoo.security.patch 771
-MD5 31639d1ccaa2c2a4e9dd869fd32f4602 files/tightvnc-1.2.9-gentoo.diff 653
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
-MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.2.9-imake-tmpdir.patch 956
-MD5 70b94ceb3134edc412d70768b55661aa files/tightvnc-1.3_alpha5-gcc34.patch 1540
-MD5 255c92e5784a2fe1c9fe7283f4a54d34 files/tightvnc-1.3_alpha5-gentoo.diff 697
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.3_alpha5-gentoo.security.patch 771
-MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha5-imake-tmpdir.patch 956
-MD5 255c92e5784a2fe1c9fe7283f4a54d34 files/tightvnc-1.3_alpha7-gentoo.diff 697
+MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
+MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
+MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.3_alpha7-gentoo.security.patch 771
-MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha7-imake-tmpdir.patch 956
-MD5 fba34335858b6b6b681a660c7c74273f files/tightvnc-gentoo.diff 636
-MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDXbDz/aM9DdBw91cRAjHjAKDffiNYmVaQrYFQWPsiecdUhYW9iACdFQII
-FCyWnvDFH9OUgpTs2H78LoY=
-=Ycb8
------END PGP SIGNATURE-----
+MD5 255c92e5784a2fe1c9fe7283f4a54d34 files/tightvnc-1.3_alpha5-gentoo.diff 697
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha5-imake-tmpdir.patch 956
diff --git a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-darwin.patch b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-darwin.patch
new file mode 100644
index 000000000000..e5f7aa7016cf
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-darwin.patch
@@ -0,0 +1,24 @@
+--- vnc_unixsrc/Xvnc/config/cf/darwin.cf.orig	2005-11-05 16:42:53.000000000 +0100
++++ vnc_unixsrc/Xvnc/config/cf/darwin.cf	2005-11-05 16:46:52.000000000 +0100
+@@ -106,7 +106,6 @@
+ # endif
+ #endif
+ 
+-#define StandardDefines	-DCSRG_BASED
+ #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ 
+ 
+--- vnc_unixsrc/Xvnc/config/cf/vnclibs.def.orig	2005-11-05 17:11:41.000000000 +0100
++++ vnc_unixsrc/Xvnc/config/cf/vnclibs.def	2005-11-05 17:17:21.000000000 +0100
+@@ -11,7 +11,11 @@
+ /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
+ VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
+ #else
++# if HasLibCrypt == YES
+ VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
++# else
++VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
++# endif
+ #endif
+ 
+ VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
diff --git a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
index f1232f0dc822..cb63e01b305f 100644
--- a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild,v 1.3 2005/08/14 23:53:19 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild,v 1.4 2005/11/05 18:10:25 grobian Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ DESCRIPTION="A great client/server software package allowing remote network acce
 SRC_URI="mirror://sourceforge/vnc-tight/${P/_alpha/dev}_unixsrc.tar.bz2"
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -27,18 +27,22 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 
-	echo
-	einfo "The 'server' USE flag will build tightvnc's server."
-	einfo "If '-server' is chosen only the client is built to save space."
-	einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-	ebeep
-	epause 5
+	if ! use server;
+	then
+		echo
+		einfo "The 'server' USE flag will build tightvnc's server."
+		einfo "If '-server' is chosen only the client is built to save space."
+		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
+		ebeep
+		epause 5
+	fi
 
 	unpack ${A} && cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-gentoo.security.patch
 	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
 	epatch ${FILESDIR}/x86.patch
+	epatch "${FILESDIR}/${P}"-darwin.patch
 }
 
 src_compile() {
@@ -49,7 +53,9 @@ src_compile() {
 	if use server; then
 		cd Xvnc && ./configure || die "Configure failed."
 		if use tcpd; then
-			make EXTRA_LIBRARIES="-lwrap -lnss_nis" \
+			local myextra="-lwrap"
+			use userland_Darwin || myextra="${myextra} -lnss_nis"
+			make EXTRA_LIBRARIES="${myextra}" \
 				CDEBUGFLAGS="${CFLAGS}"  \
 				EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die
 		else