Add patch to compile on FreeBSD and keyword ~x86-fbsd, #132085.

Package-Manager: portage-2.1.2.7

5 files changed, 154 insertions, 23 deletions

diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog
index 650282727537..15bd58e6d5f4 100644
--- a/sys-process/lsof/ChangeLog
+++ b/sys-process/lsof/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/lsof
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.30 2007/05/12 11:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.31 2007/05/18 14:18:44 uberlord Exp $
+
+  18 May 2007; Roy Marples <uberlord@gentoo.org>
+  +files/lsof-4.78-answer-config.patch, +files/lsof-4.78-freebsd.patch,
+  lsof-4.78.ebuild:
+  Add patch to compile on FreeBSD and keyword ~x86-fbsd, #132085.
 
 *lsof-4.78 (12 May 2007)
 
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index ca85a9debfb5..b0ce8fc9c9e0 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -1,24 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.73-answer-config.patch 1755 RMD160 e7a11d6028e7f91c8621078034ac438e5065ac4e SHA1 9237a3a2200867471091c43c0e1552b74824b85e SHA256 0d6257c35020dc4a45c1832ba5c0f925c005914fa44702d2f6d357a3944ac6a3
 MD5 8a26fd08042572a5821e4f5fa51ac5ff files/4.73-answer-config.patch 1755
 RMD160 e7a11d6028e7f91c8621078034ac438e5065ac4e files/4.73-answer-config.patch 1755
 SHA256 0d6257c35020dc4a45c1832ba5c0f925c005914fa44702d2f6d357a3944ac6a3 files/4.73-answer-config.patch 1755
+AUX lsof-4.78-answer-config.patch 2656 RMD160 1a14c80d8b4702b6c9d0269fd70bea1a3643a210 SHA1 7f1adedd267028cb472a4007c71befa9b019da79 SHA256 dbc2d386efcfc1ad45a9e65ffe98e3f05c3b940344574032114668cffd8a9514
+MD5 157ed78e5a27619b1d611f27492fce95 files/lsof-4.78-answer-config.patch 2656
+RMD160 1a14c80d8b4702b6c9d0269fd70bea1a3643a210 files/lsof-4.78-answer-config.patch 2656
+SHA256 dbc2d386efcfc1ad45a9e65ffe98e3f05c3b940344574032114668cffd8a9514 files/lsof-4.78-answer-config.patch 2656
+AUX lsof-4.78-freebsd.patch 455 RMD160 8595b877ed722cffda486232cbbbbe6cfc61b4f7 SHA1 a5ce7efd2fd074fdd97114e1f4fc0822b83d0834 SHA256 6a3c841f11fbabb17cf8ff7c6c7b19c04cf169dc01002ee243370003fd81367b
+MD5 7736ad97778540dee579a128d91bbabe files/lsof-4.78-freebsd.patch 455
+RMD160 8595b877ed722cffda486232cbbbbe6cfc61b4f7 files/lsof-4.78-freebsd.patch 455
+SHA256 6a3c841f11fbabb17cf8ff7c6c7b19c04cf169dc01002ee243370003fd81367b files/lsof-4.78-freebsd.patch 455
 DIST lsof_4.77.tar.bz2 708416 RMD160 e71ecec2e3281197846658b5ac774ae80b59de3d SHA1 603c35a7ade01edf5efcea45abe4b5857aa66a58 SHA256 fe6fde629a97a2855e608cd6ae1f89e66ae42d7045499b1a6faca5cfb50f5f3b
 DIST lsof_4.78.tar.bz2 756729 RMD160 50d71e500f1109cda717b73ce209c0e100a6dbe9 SHA1 0379fc9f38a931ce19e8386e662314d96fc2a099 SHA256 898db51a4016efca7d408163578443238373773357949e1b4978e26807a1fb2b
 EBUILD lsof-4.77.ebuild 1485 RMD160 65349747db9a565e6129a8df728a33248b808d29 SHA1 f342bfd27c19bf89c6fec7289e869792e972e609 SHA256 f7ce54485fc0184983ae26a250166ce68be7aba23a03ff8a41c7779e31a9b71f
 MD5 7626a2286f40df8926d75ae88345c93a lsof-4.77.ebuild 1485
 RMD160 65349747db9a565e6129a8df728a33248b808d29 lsof-4.77.ebuild 1485
 SHA256 f7ce54485fc0184983ae26a250166ce68be7aba23a03ff8a41c7779e31a9b71f lsof-4.77.ebuild 1485
-EBUILD lsof-4.78.ebuild 1492 RMD160 5d03d84ab44174aea829ece87925246c414a493a SHA1 ec3e5ce8cc4850d5e15d3c90fe0a222a6a18bfdf SHA256 200d66db9d0268b52880f88a752d060747910c48d8cddd91c8780d856ed60f64
-MD5 d1197770c55e743c432fa1bef303f3df lsof-4.78.ebuild 1492
-RMD160 5d03d84ab44174aea829ece87925246c414a493a lsof-4.78.ebuild 1492
-SHA256 200d66db9d0268b52880f88a752d060747910c48d8cddd91c8780d856ed60f64 lsof-4.78.ebuild 1492
-MISC ChangeLog 7328 RMD160 76e1aa6400e013c908f39b28b0b8a7f6141a1c1a SHA1 617e09eba4c7711929ba56a735a756ece27d270f SHA256 134e350fa7d3c1dd8e9f7f10ba7620f76a3caadb7389f8bcec78d5a387a0362a
-MD5 83572867ce2cdb88c7add2e09b7ef273 ChangeLog 7328
-RMD160 76e1aa6400e013c908f39b28b0b8a7f6141a1c1a ChangeLog 7328
-SHA256 134e350fa7d3c1dd8e9f7f10ba7620f76a3caadb7389f8bcec78d5a387a0362a ChangeLog 7328
+EBUILD lsof-4.78.ebuild 1609 RMD160 bf6a671e722280aae46992882843e9022d29edb1 SHA1 2c3dab95b362870a9df71993fb08cd87862e5103 SHA256 7bfe413e42e68ce76fddbb613e1633745fa9a87b8af52507331f9b6ca10d60e3
+MD5 17c3ab352b4787c8b6a8c8b6abb2436e lsof-4.78.ebuild 1609
+RMD160 bf6a671e722280aae46992882843e9022d29edb1 lsof-4.78.ebuild 1609
+SHA256 7bfe413e42e68ce76fddbb613e1633745fa9a87b8af52507331f9b6ca10d60e3 lsof-4.78.ebuild 1609
+MISC ChangeLog 7538 RMD160 19def496d8e6c0c9d42d9e32d23d940e98e01900 SHA1 9c8d58a581dfdca40d08ba88bdb3f0423800917f SHA256 b30d2f827e1f586b565e8a235bb26e3e3226c203b2bcfd1a4f67cef5d2c36b5b
+MD5 6c14f1949e0754190714124b3bbd5c26 ChangeLog 7538
+RMD160 19def496d8e6c0c9d42d9e32d23d940e98e01900 ChangeLog 7538
+SHA256 b30d2f827e1f586b565e8a235bb26e3e3226c203b2bcfd1a4f67cef5d2c36b5b ChangeLog 7538
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -29,10 +34,3 @@ SHA256 b07f2bfa9a80ca792889f9ea744d534308f9914a5c55f1917e61fe1ca15659e0 files/di
 MD5 ac99813bdddfddafacc0ac98bf146123 files/digest-lsof-4.78 232
 RMD160 1819b9e9600756877cf79852077c6e96b4748cd1 files/digest-lsof-4.78 232
 SHA256 d0ad63269404932186ef2aa538eb9600ae127bc7b2f444c8f4e9f65ed4754502 files/digest-lsof-4.78 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGRafD8bi6rjpTunYRAtugAKDZrEMpVnfEUZlXXu/BxG8dF/LNPQCgx8lu
-3B53m7iyMF2CJPcA7IL4+j0=
-=TmFz
------END PGP SIGNATURE-----
diff --git a/sys-process/lsof/files/lsof-4.78-answer-config.patch b/sys-process/lsof/files/lsof-4.78-answer-config.patch
new file mode 100644
index 000000000000..8aa51c5a8c75
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.78-answer-config.patch
@@ -0,0 +1,107 @@
+diff -ur a/Configure b/Configure
+--- a/Configure	2007-05-18 15:02:13 +0100
++++ b/Configure	2007-05-18 15:03:04 +0100
+@@ -2294,7 +2294,7 @@
+ 
+       LSOF_VERS=`echo $LSOF_VSTR | sed 's/\./ /g' | awk '{printf "%d%d%03d",\$1,\$2,\$3}'`
+     fi	# }
+-    LSOF_CFGF="-DLINUXV=$LSOF_VERS"
++    LSOF_CFGF="${CFLAGS} -DLINUXV=$LSOF_VERS"
+     if test $LSOF_VERS -lt 21072	# {
+     then
+       echo ""
+@@ -4828,7 +4828,7 @@
+ if test "X$LSOF_LIB_NO" = "X"	# {
+ then
+   echo "" >> $LSOF_MKFC
+-  echo "CFGL=	$LSOF_FCFGL -L./$LSOF_LIB -llsof $LSOF_CFGL" >> $LSOF_MKFC
++  echo "CFGL=	$LSOF_FCFGL -L./$LSOF_LIB -llsof $LSOF_CFGL ${LDFLAGS}" >> $LSOF_MKFC
+ fi	# }
+ echo "" >> $LSOF_MKFC
+ if test "X$LSOF_DEBUG" = "X"	# {
+Only in b: Configure.orig
+diff -ur a/Customize b/Customize
+--- a/Customize	2007-05-18 15:02:13 +0100
++++ b/Customize	2007-05-18 15:05:46 +0100
+@@ -110,7 +110,7 @@
+ do
+   echo ""
+   echo $EO "Do you want to customize (y|n) [y]? $EC"
+-  read ANS EXCESS
++  ANS=y
+   if test "X$ANS" = "Xn" -o "X$ANS" = "XN"
+   then
+     exit 0
+@@ -214,7 +214,7 @@
+   else
+     echo $EO "Enable HASSECURITY (y|n) [n]? $EC"
+   fi
+-  read ANS EXCESS
++  ANS=y
+   if test "X$ANS" = "Xy" -o "X$ANS" = "XY"
+   then
+     echo ""
+@@ -277,7 +277,7 @@
+     else
+       echo $EO "Enable HASNOSOCKSECURITY (y|n) [n]? $EC"
+     fi
+-    read ANS EXCESS
++    ANS=y
+     if test "X$ANS" = "Xy" -o "X$ANS" = "XY"
+     then
+       echo ""
+@@ -339,7 +339,7 @@
+   else
+     echo $EO "Disable WARNINGSTATE? (y|n) [n]? $EC"
+   fi
+-  read ANS EXCESS
++  ANS=n
+   if test "X$ANS" = "Xy" -o "X$ANS" = "XY"
+   then
+     echo ""
+@@ -408,7 +408,7 @@
+     else
+       echo $EO "Enable WARNDEVACCESS (y|n) [n]? $EC"
+     fi
+-    read ANS EXCESS
++    ANS=n
+     if test "X$ANS" = "Xy" -o "X$ANS" = "XY"
+     then
+       echo ""
+@@ -491,7 +491,7 @@
+     else
+       echo $EO "Enable HASDCACHE (y|n) [n]? $EC"
+     fi
+-    read ANS EXCESS
++    ANS=n
+     if test "X$ANS" = "Xy" -o "X$ANS" = "XY"
+     then
+       echo ""
+@@ -545,7 +545,7 @@
+     do
+       echo ""
+       echo $EO "Do you want to change path options (y|n) [n]? $EC"
+-      read ANS EXCESS
++      ANS=n
+       if test "X$ANS" = "Xy" -o "X$ANS" = "XY"
+       then
+         CDC=1
+@@ -928,7 +928,7 @@
+       else
+         echo $EO "Enable HASKERNIDCK (y|n) [n]? $EC"
+       fi
+-      read ANS EXCESS
++      ANS=y
+       if test "X$ANS" = "Xy" -o "X$ANS" = "XY"
+       then
+         echo ""
+@@ -1125,7 +1125,7 @@
+   echo ""
+   echo "Do you want to rename $OLD to ${OLD}.old and replace it with"
+   echo $EO "$NEW (y|n) [y]? $EC"
+-  read ANS EXCESS
++  ANS=y
+   if test "X$ANS" = "Xn" -o "X$ANS" = "XN"
+   then
+     END=1
+Only in b: Customize.orig
diff --git a/sys-process/lsof/files/lsof-4.78-freebsd.patch b/sys-process/lsof/files/lsof-4.78-freebsd.patch
new file mode 100644
index 000000000000..99a6cfd88be4
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.78-freebsd.patch
@@ -0,0 +1,18 @@
+diff -ur a/dialects/freebsd/dlsof.h b/dialects/freebsd/dlsof.h
+--- a/dialects/freebsd/dlsof.h	2006-03-28 00:29:11 +0100
++++ b/dialects/freebsd/dlsof.h	2007-05-18 15:08:19 +0100
+@@ -43,7 +43,6 @@
+ #include <nlist.h>
+ #include <setjmp.h>
+ #include <signal.h>
+-#include <string.h>
+ #include <unistd.h>
+ 
+ # if	FREEBSDV>=4000
+@@ -550,4 +549,6 @@
+ #define	NCACHE_VROOT	VV_ROOT
+ #endif	/* FREEBSDV>=5000 */
+ 
++#include <string.h>
++
+ #endif	/* FREEBSD_LSOF_H */
diff --git a/sys-process/lsof/lsof-4.78.ebuild b/sys-process/lsof/lsof-4.78.ebuild
index 9de5745d4346..5c436196b326 100644
--- a/sys-process/lsof/lsof-4.78.ebuild
+++ b/sys-process/lsof/lsof-4.78.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/sys-process/lsof/lsof-4.78.ebuild,v 1.1 2007/05/12 11:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.78.ebuild,v 1.2 2007/05/18 14:18:44 uberlord Exp $
 
 inherit eutils flag-o-matic fixheadtails toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
 
 LICENSE="lsof"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="static"
 
 DEPEND=""
@@ -29,13 +29,16 @@ src_unpack() {
 	cd "${S}"
 	ht_fix_file Configure Customize
 	touch .neverInv
-	epatch "${FILESDIR}"/4.73-answer-config.patch
+	epatch "${FILESDIR}/${P}"-answer-config.patch
+	epatch "${FILESDIR}/${P}"-freebsd.patch
 }
 
 src_compile() {
 	use static && append-ldflags -static
 
-	./Configure linux || die "configure failed"
+	local target="linux"
+	use kernel_FreeBSD && target=freebsd
+	./Configure ${target} || die "configure failed"
 
 	# Make sure we use proper toolchain
 	sed -i \