Add patch and modify the ebuild a bit for x86-fbsd, thanks to Joe Peterson <lavajoe at gentoo dot org>for the patch, bug 178430

Package-Manager: portage-2.1.2.9

5 files changed, 69 insertions, 25 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 65238d88429c..dadde7247f8d 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/vnc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.80 2007/05/20 23:44:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.81 2007/06/09 19:05:29 armin76 Exp $
+
+  09 Jun 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/vnc-4.1.2-freebsd.patch, vnc-4.1.2-r2.ebuild, vnc-4.1.2-r3.ebuild:
+  Add patch and modify the ebuild a bit for x86-fbsd, thanks to Joe Peterson
+  <lavajoe at gentoo dot org>for the patch, bug 178430
 
   20 May 2007; Jeroen Roovers <jer@gentoo.org> vnc-4.1.2-r2.ebuild:
   Stable for HPPA (bug #175985).
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 035ac7d816eb..e9e256ecd1cc 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,3 +1,7 @@
+AUX vnc-4.1.2-freebsd.patch 806 RMD160 fa025702ed01fac452f55cb93bff0d8b93d5271e SHA1 f02462c998f61be7f56f0be70ee812c392d93405 SHA256 01558966a94bdacb60f6a480e4b05cf53e82246691aad0ca9c78e27040130a86
+MD5 7c8938e6a202fa1b66aed590054aa516 files/vnc-4.1.2-freebsd.patch 806
+RMD160 fa025702ed01fac452f55cb93bff0d8b93d5271e files/vnc-4.1.2-freebsd.patch 806
+SHA256 01558966a94bdacb60f6a480e4b05cf53e82246691aad0ca9c78e27040130a86 files/vnc-4.1.2-freebsd.patch 806
 AUX vnc.confd 341 RMD160 3ec4bdfd3fd2c5938c3969305f04020342e9263d SHA1 4b7f5f708cb92f5fc82508141422003ab05c1452 SHA256 3463105ab7f4aec95b9a72bcfcb9808b3acdcad0c1e5b608f1408faa79f3d4a0
 MD5 7319b537e42c0e12033ac679063161cc files/vnc.confd 341
 RMD160 3ec4bdfd3fd2c5938c3969305f04020342e9263d files/vnc.confd 341
@@ -21,22 +25,22 @@ EBUILD vnc-4.1.2-r1.ebuild 4226 RMD160 9ef544a3dc65530825022c68055dab28075b0549
 MD5 ac1efb08e9b4dbef83d59d7a3f8431ac vnc-4.1.2-r1.ebuild 4226
 RMD160 9ef544a3dc65530825022c68055dab28075b0549 vnc-4.1.2-r1.ebuild 4226
 SHA256 986d63aa512c712ccd1829701848c1c1e6b4dbf39234544ef41d2a5d9e2f934c vnc-4.1.2-r1.ebuild 4226
-EBUILD vnc-4.1.2-r2.ebuild 4672 RMD160 f5823746a8b599fad90d002c087295ab041f6e31 SHA1 8b11884e10eb5575ba4cf59c9a36a7af379ea158 SHA256 046d6e5424444e33b3c1533d9c3905e1f3ff10b1c08ea1657398736ff0ffcfb0
-MD5 de5efb57cb533bdbbc51fbde146578de vnc-4.1.2-r2.ebuild 4672
-RMD160 f5823746a8b599fad90d002c087295ab041f6e31 vnc-4.1.2-r2.ebuild 4672
-SHA256 046d6e5424444e33b3c1533d9c3905e1f3ff10b1c08ea1657398736ff0ffcfb0 vnc-4.1.2-r2.ebuild 4672
-EBUILD vnc-4.1.2-r3.ebuild 4596 RMD160 cf7c77f6961c7f6418de2973c379e047bc84110b SHA1 97754ea8c30ba1bcaccd4ae89557198f4ad43f1c SHA256 fc6b187e6c336f3ec039096bb16fd8d5a831fad2d8e5a79febdf44f220ca0a56
-MD5 3f1338bee16f1f72f0863a33167e010f vnc-4.1.2-r3.ebuild 4596
-RMD160 cf7c77f6961c7f6418de2973c379e047bc84110b vnc-4.1.2-r3.ebuild 4596
-SHA256 fc6b187e6c336f3ec039096bb16fd8d5a831fad2d8e5a79febdf44f220ca0a56 vnc-4.1.2-r3.ebuild 4596
+EBUILD vnc-4.1.2-r2.ebuild 4757 RMD160 bb005dde0ffdb59241f3f58eb55d3f9f8797e3af SHA1 ce420ce08aae38f6510a998d9d1a2c5535147279 SHA256 9500445071bcb3bf12f5f0304c41b1ee38f6028116448145985958c7a4e3832a
+MD5 2754a9d4630e8b457afa493b5791c39e vnc-4.1.2-r2.ebuild 4757
+RMD160 bb005dde0ffdb59241f3f58eb55d3f9f8797e3af vnc-4.1.2-r2.ebuild 4757
+SHA256 9500445071bcb3bf12f5f0304c41b1ee38f6028116448145985958c7a4e3832a vnc-4.1.2-r2.ebuild 4757
+EBUILD vnc-4.1.2-r3.ebuild 4668 RMD160 028926c8ae4222d337bd046d5c36659fc885ef7e SHA1 dd6e43a4da1a249a05de3c0a6cb67ab14d462677 SHA256 92390aff51bcaf9f79c13e9ce980e2078698249fdcb8e7f3abd09e9775067d33
+MD5 c6322faa014a3a8c22643160bc838a22 vnc-4.1.2-r3.ebuild 4668
+RMD160 028926c8ae4222d337bd046d5c36659fc885ef7e vnc-4.1.2-r3.ebuild 4668
+SHA256 92390aff51bcaf9f79c13e9ce980e2078698249fdcb8e7f3abd09e9775067d33 vnc-4.1.2-r3.ebuild 4668
 EBUILD vnc-4.1.2.ebuild 4195 RMD160 be4425e8cc8dbec2df4c051588bca61b0004171c SHA1 9f5c407f9d425b235af8787759b02d767ba2242b SHA256 964caa85e96db3b854a71fd9b553535dbfbb734a57febb10e685a3af9c337631
 MD5 4b215a222ab6da3a9a3eb17d26473c6e vnc-4.1.2.ebuild 4195
 RMD160 be4425e8cc8dbec2df4c051588bca61b0004171c vnc-4.1.2.ebuild 4195
 SHA256 964caa85e96db3b854a71fd9b553535dbfbb734a57febb10e685a3af9c337631 vnc-4.1.2.ebuild 4195
-MISC ChangeLog 12300 RMD160 d7ed633e273cd9ce61e8742d7b2b4ce2a5af7653 SHA1 a0303cb9f9ad34aeb7da13f4062bd7962a1e9ec4 SHA256 a9831973ec33d7bd3c8d5b88ab5c19f0723320411a92d5f8ba5d7cfae8d76039
-MD5 fbd42cf8f248b84ff4056ab7374ddcb8 ChangeLog 12300
-RMD160 d7ed633e273cd9ce61e8742d7b2b4ce2a5af7653 ChangeLog 12300
-SHA256 a9831973ec33d7bd3c8d5b88ab5c19f0723320411a92d5f8ba5d7cfae8d76039 ChangeLog 12300
+MISC ChangeLog 12562 RMD160 3a1431735773aa0a39aa71f05cf671cf89bf2aff SHA1 ee2502e8cec2b37f9a024b024d81fbedbc4d6052 SHA256 15472fb8cbaebc5cddf3f547cbf9099fba2e998491d81078a984452731a26ee8
+MD5 a7db03aee8714ee59654daa9a1387d51 ChangeLog 12562
+RMD160 3a1431735773aa0a39aa71f05cf671cf89bf2aff ChangeLog 12562
+SHA256 15472fb8cbaebc5cddf3f547cbf9099fba2e998491d81078a984452731a26ee8 ChangeLog 12562
 MISC metadata.xml 285 RMD160 2bdfdc81153ba4c9857b853668141216b8d33fb9 SHA1 2c95c236b44a86f17fe3ecc7fa7d775587443ba3 SHA256 78f00ad3b66ff4b0ec0bca5c771f4d4ba69dab3ea88c198a5d54fb83fe8fddff
 MD5 3ba05c3b9f15d67563d5699dad396690 metadata.xml 285
 RMD160 2bdfdc81153ba4c9857b853668141216b8d33fb9 metadata.xml 285
diff --git a/net-misc/vnc/files/vnc-4.1.2-freebsd.patch b/net-misc/vnc/files/vnc-4.1.2-freebsd.patch
new file mode 100644
index 000000000000..759d6afbfa58
--- /dev/null
+++ b/net-misc/vnc/files/vnc-4.1.2-freebsd.patch
@@ -0,0 +1,29 @@
+--- vnc-4_1_2-unixsrc/unix/vncserver.orig	2007-05-13 20:42:50 -0600
++++ vnc-4_1_2-unixsrc/unix/vncserver	2007-05-13 20:42:41 -0600
+@@ -127,8 +127,24 @@
+ $desktopLog = "$vncUserDir/$host:$displayNumber.log";
+ unlink($desktopLog);
+ 
+-# Make an X server cookie - use mcookie
+-$cookie = `/usr/bin/mcookie`;
++# Make an X server cookie
++#   For FreeBSD, generate it randomly
++#   For Linux, use mcookie
++if (`/usr/bin/uname` == 'FreeBSD')
++{
++    srand;
++    $cookie = '';
++    for (1..16)
++    {
++        $cookie .= sprintf("%02x", int(rand(256)));
++    }
++}
++else
++{
++    $cookie = `/usr/bin/mcookie`;
++}
++
++# Now use the cookie in the xauth file
+ open (XAUTH, "|xauth -f $xauthorityFile source -");
+ print XAUTH "add $host:$displayNumber . $cookie\n";
+ print XAUTH "add $host/unix:$displayNumber . $cookie\n";
\ No newline at end of file
diff --git a/net-misc/vnc/vnc-4.1.2-r2.ebuild b/net-misc/vnc/vnc-4.1.2-r2.ebuild
index f09f42e9e8ba..247b8d531fdd 100644
--- a/net-misc/vnc/vnc-4.1.2-r2.ebuild
+++ b/net-misc/vnc/vnc-4.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r2.ebuild,v 1.8 2007/05/20 23:44:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r2.ebuild,v 1.9 2007/06/09 19:05:29 armin76 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -93,18 +93,21 @@ src_unpack() {
 	eautoreconf
 
 	if use server ; then
-		cp -a xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+		cp -RPp xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 			xc/programs/Xserver/Xvnc.man \
 			xc/programs/Xserver/vnc/*.{h,cc} \
 			xorg-x11-server-source/hw/vnc
-		cp -a xorg-x11-server-source/{cfb/cfb.h,hw/vnc}
-		cp -a xorg-x11-server-source/{fb/fb.h,hw/vnc}
-		cp -a xorg-x11-server-source/{fb/fbrop.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{cfb/cfb.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{fb/fb.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{fb/fbrop.h,hw/vnc}
 		sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
 			xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h
 		cd xorg-x11-server-source
 		eautoreconf
 	fi
+
+        cd "${S}"
+        epatch "${FILESDIR}"/${PN}-${PV}-freebsd.patch
 }
 
 src_compile() {
@@ -177,4 +180,4 @@ src_install() {
 	fi
 
 	rm ${D}/usr/$(get_libdir)/librfb.{a,la,so}
-}
+}
\ No newline at end of file
diff --git a/net-misc/vnc/vnc-4.1.2-r3.ebuild b/net-misc/vnc/vnc-4.1.2-r3.ebuild
index a68385966a34..c926c6dcb009 100644
--- a/net-misc/vnc/vnc-4.1.2-r3.ebuild
+++ b/net-misc/vnc/vnc-4.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r3.ebuild,v 1.2 2007/05/08 17:30:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r3.ebuild,v 1.3 2007/06/09 19:05:29 armin76 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -92,18 +92,21 @@ src_unpack() {
 	eautoreconf
 
 	if use server ; then
-		cp -a xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+		cp -RPp xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 			xc/programs/Xserver/Xvnc.man \
 			xc/programs/Xserver/vnc/*.{h,cc} \
 			xorg-x11-server-source/hw/vnc
-		cp -a xorg-x11-server-source/{cfb/cfb.h,hw/vnc}
-		cp -a xorg-x11-server-source/{fb/fb.h,hw/vnc}
-		cp -a xorg-x11-server-source/{fb/fbrop.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{cfb/cfb.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{fb/fb.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{fb/fbrop.h,hw/vnc}
 		sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
 			xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h
 		cd xorg-x11-server-source
 		eautoreconf
 	fi
+
+        cd "${S}"
+        epatch ${FILESDIR}/${P}-freebsd.patch
 }
 
 src_compile() {
@@ -176,4 +179,4 @@ src_install() {
 	fi
 
 	rm ${D}/usr/$(get_libdir)/librfb.{a,la,so}
-}
+}
\ No newline at end of file