Bug 122780, freebsd hints via flameeyes

(Portage version: 2.1_pre3-r1)

4 files changed, 44 insertions, 14 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index b5b91f2eb7a4..695efd377749 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.197 2006/02/20 22:05:22 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.198 2006/02/20 22:30:01 mcummings Exp $
+
+  20 Feb 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/perl-5.8.8-fbsdhints.patch, perl-5.8.8.ebuild:
+  Bug 122780, freebsd hints via flameeyes
 
   20 Feb 2006; Michael Cummings <mcummings@gentoo.org>
   +files/perl-5.8.8-dragonfly-clean.patch, perl-5.8.8.ebuild:
-  Bug 122706, dragonfly patches
+  Bug 122706, dragonfly patches. Patch submitted upstream and here by 
+  Robert Sebastian Gerus, should be available in blead now.
 
   20 Feb 2006; Michael Cummings <mcummings@gentoo.org> perl-5.8.8.ebuild:
   Updated perl-cleaner dep
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 4d9ea1a55635..7db2deb737c5 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2f9ca7df5b7e8a9432d47099b7134c8e ChangeLog 48860
 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
 MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
@@ -24,6 +21,7 @@ MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007
 MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.8-CAN-2005-0448-rmtree.patch 6961
 MD5 93a7b749eec75f6ba4bc7c4edf3a0ccd files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch 4963
 MD5 476fc96783fc1fd13c86aa1e66b98778 files/perl-5.8.8-dragonfly-clean.patch 5211
+MD5 6a2521ba615f5a59d06b6c4e4f2ac253 files/perl-5.8.8-fbsdhints.patch 1190
 MD5 b67f84d9f78688c8d1d06503241d0f6d files/perl-5.8.8-lib64.patch 3393
 MD5 e1310772583a085881cd30e53546410d files/perl-5.8.8-links.patch 2925
 MD5 f6c5dc893c771f72cc183c946628d35e files/perl-5.8.8-reorder-INC.patch 3046
@@ -48,11 +46,4 @@ MD5 eed286c2c0e5a6a0baa1b8c4730f93ba perl-5.8.7-r1.ebuild 19456
 MD5 dfddff8d434bcd0bd02f8fc47f682089 perl-5.8.7-r2.ebuild 19525
 MD5 4f26a59cea9d114b7ee5e3e338df38df perl-5.8.7-r3.ebuild 19608
 MD5 5af1d9db05e7055740baff2a28fbcbee perl-5.8.7.ebuild 19224
-MD5 6acfe51459d3061111b4413b848a3c6c perl-5.8.8.ebuild 18644
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD+j0xtG5z4I8BtQoRAq69AJ9pnUnW2btH4iEl4N/t8altngA9FQCgj09A
-RPIPmUHU/FmDjYC/EiZXklM=
-=8t/U
------END PGP SIGNATURE-----
+MD5 a53f8f6fe77ac9a39fd84cdc6006b4ac perl-5.8.8.ebuild 18696
diff --git a/dev-lang/perl/files/perl-5.8.8-fbsdhints.patch b/dev-lang/perl/files/perl-5.8.8-fbsdhints.patch
new file mode 100644
index 000000000000..5f888346ae43
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-fbsdhints.patch
@@ -0,0 +1,33 @@
+Index: perl-5.8.8/hints/freebsd.sh
+===================================================================
+--- perl-5.8.8.orig/hints/freebsd.sh
++++ perl-5.8.8/hints/freebsd.sh
+@@ -88,6 +88,8 @@ case "$osvers" in
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ c / /'`
+ 	# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
+ 	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	d_setregid='define'
+@@ -102,6 +104,10 @@ case "$osvers" in
+ 	        ;;
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
++	libswanted=`echo $libswanted | sed 's/ c / /'`
+ 	;;
+ esac
+ 
+@@ -137,7 +143,7 @@ case "$osvers" in
+ 
+ *)
+ 	ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
+-	if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
++	if /usr/bin/file -L /usr/lib/libc.so | grep -vq "not stripped" ; then
+ 	    usenm=false
+ 	fi
+         ;;
diff --git a/dev-lang/perl/perl-5.8.8.ebuild b/dev-lang/perl/perl-5.8.8.ebuild
index 1f36e6a6eb84..01a7b686a4ad 100644
--- a/dev-lang/perl/perl-5.8.8.ebuild
+++ b/dev-lang/perl/perl-5.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8.ebuild,v 1.8 2006/02/20 22:05:23 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8.ebuild,v 1.9 2006/02/20 22:30:01 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -108,6 +108,7 @@ src_unpack() {
 	use amd64 && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
 
 	[[ ${CHOST} == *-dragonfly* ]] && cd ${S} && epatch ${FILESDIR}/${P}-dragonfly-clean.patch
+	[[ ${CHOST} == *-freebsd* ]] && cd ${S} && epatch ${FILESDIR}/${P}-fbsdhints.patch
 	cd ${S}; epatch ${FILESDIR}/${P}-USE_MM_LD_RUN_PATH.patch
 	cd ${S}; epatch ${FILESDIR}/${P}-links.patch