Use /usr/bin/cpp rather than /usr/libexec/cpp on FreeBSD (thanks to ebfe <knabberknusperhaus@yahoo.de> for patch); add ~x86-fbsd keyword; (bug #171945)

Package-Manager: portage-2.1.3_rc5

4 files changed, 35 insertions, 15 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index f59465c0246f..e26cd01505ab 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.112 2007/06/26 17:33:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.113 2007/06/27 16:36:18 lavajoe Exp $
+
+  27 Jun 2007; Joe Peterson <lavajoe@gentoo.org> files/1.3.9-fbsd.patch,
+  tightvnc-1.3.9.ebuild:
+  Use /usr/bin/cpp rather than /usr/libexec/cpp on FreeBSD (thanks to ebfe
+  <knabberknusperhaus@yahoo.de> for patch); add ~x86-fbsd keyword; (bug
+  #171945)
 
   26 Jun 2007; Raúl Porcel <armin76@gentoo.org>
   -files/tightvnc-1.2.9-amd64.patch, -files/tightvnc-1.2.9-gcc34.patch,
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index bc86a623f163..ece983c7493b 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,7 +1,7 @@
-AUX 1.3.9-fbsd.patch 291 RMD160 da893f9cb5788b061438d9064f36de88a6005369 SHA1 df8b07bb6317e5dd535140077c4bb966412f98d6 SHA256 b048f63da9e37cbb7730d3e178f73c7e84ae5c10b22902533e5713096373c414
-MD5 f7b6e41db9b8db17fa71678517494d29 files/1.3.9-fbsd.patch 291
-RMD160 da893f9cb5788b061438d9064f36de88a6005369 files/1.3.9-fbsd.patch 291
-SHA256 b048f63da9e37cbb7730d3e178f73c7e84ae5c10b22902533e5713096373c414 files/1.3.9-fbsd.patch 291
+AUX 1.3.9-fbsd.patch 830 RMD160 53be20b8823e8cce0f7cc9742bacb1b2d8a7649d SHA1 62f364cd571c05c30838910ce764409978453ebb SHA256 f465693797f4631f7d845aa54aa48febfd1182a0472d18e5babf3127e57be0b9
+MD5 b6beaf9eb9bd99b9e93fc53c475aebdb files/1.3.9-fbsd.patch 830
+RMD160 53be20b8823e8cce0f7cc9742bacb1b2d8a7649d files/1.3.9-fbsd.patch 830
+SHA256 f465693797f4631f7d845aa54aa48febfd1182a0472d18e5babf3127e57be0b9 files/1.3.9-fbsd.patch 830
 AUX README.JavaViewer 18585 RMD160 e40c2e27bd4c31d9d389a4a59a6ab7ef256bc962 SHA1 7c2b1ca4051ed2ad89e7f745736b985ea5c75ab0 SHA256 44baa12f5ee918aacf762f0d32ae45bffab17eed77e7e3ed5b43d06e2876d150
 MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
 RMD160 e40c2e27bd4c31d9d389a4a59a6ab7ef256bc962 files/README.JavaViewer 18585
@@ -43,14 +43,14 @@ MD5 13fdea0a38fc64d5c1f529dbadcfb8d8 files/vncviewer.png 495
 RMD160 0378b8e33783ea6599e304de8279e0e4a9478ae7 files/vncviewer.png 495
 SHA256 dfe4eaf3f68a4905b3ab90e7cae528449c7d13a4f712f97d8855058ed9cc3fc4 files/vncviewer.png 495
 DIST tightvnc-1.3.9_unixsrc.tar.bz2 1792459 RMD160 79d858466b7fab740b4d66d6b0963533f48a5163 SHA1 a9529a262a060517402fb9845ef63a0d18c3141f SHA256 99aaca636535f9127f3a435ee71aef6821f821e6319bc6e9b2c775fefd34325a
-EBUILD tightvnc-1.3.9.ebuild 2930 RMD160 df3db0bc6eb31093bc685367933fef19f2b92ddd SHA1 faa233040bb07406452d10ca2dedcbb940ccd305 SHA256 766c0564e60295868dae77554adfcfb597cb1b471b1b884d86dc10322db279e8
-MD5 81453d4556e45a29152b1666d202d22c tightvnc-1.3.9.ebuild 2930
-RMD160 df3db0bc6eb31093bc685367933fef19f2b92ddd tightvnc-1.3.9.ebuild 2930
-SHA256 766c0564e60295868dae77554adfcfb597cb1b471b1b884d86dc10322db279e8 tightvnc-1.3.9.ebuild 2930
-MISC ChangeLog 16878 RMD160 2cbd6979d47713f32ab18af3ac6e9cfadaeafa7a SHA1 ef5f9e7116776a36299505a4d78a9ac6510a359c SHA256 e643602d4f51e37decece74c362ed4a6682185007ffb8922bf021a0d446541b4
-MD5 5dafe31d58b095c132d0f34e924ac0ab ChangeLog 16878
-RMD160 2cbd6979d47713f32ab18af3ac6e9cfadaeafa7a ChangeLog 16878
-SHA256 e643602d4f51e37decece74c362ed4a6682185007ffb8922bf021a0d446541b4 ChangeLog 16878
+EBUILD tightvnc-1.3.9.ebuild 2941 RMD160 029bd1dbd3cec5c969a26733b43fa9b1c5237b5d SHA1 558cf07bfb778437f1aa7fb8ca7ee6504bd59e0f SHA256 e78d16b2176ed521324aaf968b539f212e0043d4736aab64ad17e7fc408451c9
+MD5 ebdcdea141b10e0117e09e5ae0577437 tightvnc-1.3.9.ebuild 2941
+RMD160 029bd1dbd3cec5c969a26733b43fa9b1c5237b5d tightvnc-1.3.9.ebuild 2941
+SHA256 e78d16b2176ed521324aaf968b539f212e0043d4736aab64ad17e7fc408451c9 tightvnc-1.3.9.ebuild 2941
+MISC ChangeLog 17135 RMD160 f575cdef912c9ce43e0cdcf3c0feb32ab6bda09c SHA1 e74962a0945009bf460c4c51372375a4232738f7 SHA256 1b4a06962ecb91118f2f0226a593a936c0d15d6c69d79bcb11e37e30110cca39
+MD5 8d4ebbaf3e9206599639bbf3ab7d824a ChangeLog 17135
+RMD160 f575cdef912c9ce43e0cdcf3c0feb32ab6bda09c ChangeLog 17135
+SHA256 1b4a06962ecb91118f2f0226a593a936c0d15d6c69d79bcb11e37e30110cca39 ChangeLog 17135
 MISC metadata.xml 223 RMD160 f88bcdebf752bcc3933b4159df5d8f9f7d487ca1 SHA1 4a17e70b26b3bba2ec6eddb403ff890bb8bcf13f SHA256 98c023870e5fbbcc4f050a192947b7b6bbd239041c9f921b3fbf64b03523019f
 MD5 038a74c1f0dc742c6df70730348c240a metadata.xml 223
 RMD160 f88bcdebf752bcc3933b4159df5d8f9f7d487ca1 metadata.xml 223
diff --git a/net-misc/tightvnc/files/1.3.9-fbsd.patch b/net-misc/tightvnc/files/1.3.9-fbsd.patch
index e42bd6a12eb7..bc527a802aed 100644
--- a/net-misc/tightvnc/files/1.3.9-fbsd.patch
+++ b/net-misc/tightvnc/files/1.3.9-fbsd.patch
@@ -13,3 +13,17 @@
   * Get struct timeval
   */
  
+--- Xvnc/config/imake/imakemdep.h~      2003-02-19 09:39:54 -0700
++++ Xvnc/config/imake/imakemdep.h       2007-06-27 09:54:44 -0600
+@@ -253,7 +253,10 @@
+ #ifdef _CRAY
+ #define DEFAULT_CPP "/lib/pcpp"
+ #endif
+-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__FreeBSD__)
++#define DEFAULT_CPP "/usr/bin/cpp"
++#endif
++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define DEFAULT_CPP "/usr/libexec/cpp"
+ #endif
+ #if defined(__sgi) && defined(__ANSI_CPP__)
diff --git a/net-misc/tightvnc/tightvnc-1.3.9.ebuild b/net-misc/tightvnc/tightvnc-1.3.9.ebuild
index f25c34ee9a08..7a9b863d493a 100644
--- a/net-misc/tightvnc/tightvnc-1.3.9.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3.9.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/tightvnc/tightvnc-1.3.9.ebuild,v 1.10 2007/06/26 17:01:15 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.9.ebuild,v 1.11 2007/06/27 16:36:18 lavajoe 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}_unixsrc.tar.bz2"
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~x86-fbsd"
 LICENSE="GPL-2"
 SLOT="0"