Patches for freebsd and dragonfly per the perl ebuild - just to be safe

Package-Manager: portage-2.1_pre3-r1

5 files changed, 221 insertions, 42 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index 64fd803a2cae..657b50771a1d 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.101 2006/02/07 23:43:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.102 2006/02/21 00:16:53 mcummings Exp $
+
+  21 Feb 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/libperl-5.8.8-dragonfly-clean.patch,
+  +files/libperl-5.8.8-fbsdhints.patch, libperl-5.8.8.ebuild:
+  Patches for freebsd and dragonfly per the perl ebuild - just to be safe
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org> libperl-5.8.8.ebuild:
   Prefer to avoid eval and use a bash array for myconf instead, it's less
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 2958c18ac2d2..bbcad1b36930 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,61 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 420b799a7938b66fdc78dec5333d1e8f ChangeLog 15003
-RMD160 051ad320879928e89859c3dfb7d1a57846ec9cfc ChangeLog 15003
-SHA256 4cc19a8e0d89f04afda8f418e286514ba9ee74ad7cfe9275c70de3dd7416f92e ChangeLog 15003
+MD5 b84ebb2125944042e767d4f395bb8b80 ChangeLog 15242
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
-RMD160 65b25cf2b098d17ae8354e087ff03f8c4a79a081 files/digest-libperl-5.8.6 64
-SHA256 0f4931ee9ace7fa9c9aedf2213b09a91789c1887d78d17c829c4b479aec9e4f3 files/digest-libperl-5.8.6 64
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6-r1 64
-RMD160 65b25cf2b098d17ae8354e087ff03f8c4a79a081 files/digest-libperl-5.8.6-r1 64
-SHA256 0f4931ee9ace7fa9c9aedf2213b09a91789c1887d78d17c829c4b479aec9e4f3 files/digest-libperl-5.8.6-r1 64
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-libperl-5.8.7 64
-RMD160 21381de31d6da67594744081be0a94da3fd067ff files/digest-libperl-5.8.7 64
-SHA256 681fd892979121a8ff1ead060881146194c9fd448b77f94d6f88cdb5b3cce34c files/digest-libperl-5.8.7 64
 MD5 f408b45cbe8f14c380ae6ffce87c01c4 files/digest-libperl-5.8.8 65
-RMD160 25b183ec478f7aba6ba98471e97a9fd9f96a6478 files/digest-libperl-5.8.8 65
-SHA256 d083e2a403dd2011be23b6a000310da291fb19d2b9be606b324a2c7088187902 files/digest-libperl-5.8.8 65
 MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
-RMD160 d8a1b40e86094a63f60783f550afd1087bb5a5f0 files/libperl-5.8.2-uclibc.patch 573
-SHA256 a054e63156fb2f1c167c2806f4d8c1a97a85dc0eecf2bd737bb63c92f079e98d files/libperl-5.8.2-uclibc.patch 573
+MD5 476fc96783fc1fd13c86aa1e66b98778 files/libperl-5.8.8-dragonfly-clean.patch 5211
+MD5 6a2521ba615f5a59d06b6c4e4f2ac253 files/libperl-5.8.8-fbsdhints.patch 1190
 MD5 b67f84d9f78688c8d1d06503241d0f6d files/libperl-5.8.8-lib64.patch 3393
-RMD160 406206c33b10b4af8cb2d1aba2fa6aadf5d9eea6 files/libperl-5.8.8-lib64.patch 3393
-SHA256 3efe8048934093a1a66bc37b22fbb56a6e10df2940bb85b57802c9129c9bd1bd files/libperl-5.8.8-lib64.patch 3393
 MD5 f6c5dc893c771f72cc183c946628d35e files/libperl-5.8.8-reorder-INC.patch 3046
-RMD160 73bc824bebee8889073656a7b547dc63b35696dc files/libperl-5.8.8-reorder-INC.patch 3046
-SHA256 136ca6c6cfaa3467f6a164f26b34ff06cc55823ca5723118764589cc15d37aed files/libperl-5.8.8-reorder-INC.patch 3046
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
-RMD160 ea221c4f1a284ad28b30e9354222859ac1c6392e files/libperl-create-libperl-soname.patch 417
-SHA256 cf417526a71b7c8a5015171fdefb6d7a52dbd6914762bb628d2662f6c28c7f61 files/libperl-create-libperl-soname.patch 417
 MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
-RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc files/libperl-noksh.patch 611
-SHA256 0861f7f54c184e99a0ffeebeab9420d969d2002f921bc3fb14841a1e24be1f5e files/libperl-noksh.patch 611
 MD5 f7324a62f22aabde3387b7e8a8b2106e files/libperl-reorder-INC.patch 1141
-RMD160 4a889fa029fb77e7454ed0c6f7870359340df672 files/libperl-reorder-INC.patch 1141
-SHA256 4e075cb6b6b418ab3b2a6f6b9af633ac51cc7d7749330d3981fa69d0f2d16564 files/libperl-reorder-INC.patch 1141
 MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
-RMD160 d8a1b40e86094a63f60783f550afd1087bb5a5f0 files/libperl-uclibc.patch 573
-SHA256 a054e63156fb2f1c167c2806f4d8c1a97a85dc0eecf2bd737bb63c92f079e98d files/libperl-uclibc.patch 573
 MD5 9fe69fdbfc5ff4096e83a0aea7ac96c8 libperl-5.8.6-r1.ebuild 10587
-RMD160 3e90e297dd0da471431f69a298bdc13e5c7294d6 libperl-5.8.6-r1.ebuild 10587
-SHA256 30719e97a85da4241d1fc942713de8dcdfb878da691d578ed5b7ee9b54929e59 libperl-5.8.6-r1.ebuild 10587
 MD5 8138254c857a5c439bfc0c39c9a9dc9b libperl-5.8.6.ebuild 10591
-RMD160 672aefcff30ffa5cbe158edf24e890daed90a476 libperl-5.8.6.ebuild 10591
-SHA256 c09672b88f4fe48814ff426715aaeea46cb13d9b304d7d6396ab4cafb4a360ed libperl-5.8.6.ebuild 10591
 MD5 4bc541a781cafd9a9e54efd62d45b1e7 libperl-5.8.7.ebuild 10987
-RMD160 807450f51a594759dc7b8522e0223a9fa21a6ce5 libperl-5.8.7.ebuild 10987
-SHA256 a78bfd1ed6a1ac81673a6467b4fcc7787003f1dda3a67f21448611a6dd4bf3e7 libperl-5.8.7.ebuild 10987
-MD5 8597435b151e94ebb8994e21269aeae5 libperl-5.8.8.ebuild 11404
-RMD160 aa566000a608ff6cd265d98e03379f6fedda95db libperl-5.8.8.ebuild 11404
-SHA256 9d936152f9b5f5c512e7b4fdffd2d5965b5f8e55d2b29279ceacbccebf820627 libperl-5.8.8.ebuild 11404
+MD5 a42aceb81e6e70312ffd6140404bc4ea libperl-5.8.8.ebuild 11619
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
-SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFD6TCzJrHF4yAQTrARAtc1AKCHcHYunU1bbaMQweejAJhOYEqf5ACgxHm0
-Kq9F3KXOaRs8lDBcM+rgIY0=
-=0Oe6
+iD8DBQFD+lwEtG5z4I8BtQoRAlMlAJ9FzGGZxQa+qHzpgiXRxO6GC0vMxwCbBMeZ
+FugCnx5sRxYCLod/ovj/1Cg=
+=YdMZ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libperl/files/libperl-5.8.8-dragonfly-clean.patch b/sys-devel/libperl/files/libperl-5.8.8-dragonfly-clean.patch
new file mode 100644
index 000000000000..52f32bf5e265
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.8-dragonfly-clean.patch
@@ -0,0 +1,170 @@
+Index: perl-5.8.8/Configure
+===================================================================
+--- perl-5.8.8.orig/Configure	2006-01-08 14:51:03 +0000
++++ perl-5.8.8/Configure	2006-02-14 13:41:41 +0000
+@@ -3130,6 +3130,8 @@
+ 		dgux)	osname=dgux 
+ 			osvers="$3"
+ 			;;
++		dragonfly) osname=dragonfly
++			osvers="$3" ;;
+ 		dynixptx*) osname=dynixptx
+ 			osvers=`echo "$4"|sed 's/^v//'`
+ 			;;
+@@ -7889,7 +7891,7 @@
+ 	solaris)
+ 		xxx="-R $shrpdir"
+ 		;;
+-	freebsd|netbsd|openbsd|interix)
++	freebsd|netbsd|openbsd|dragonfly|interix)
+ 		xxx="-Wl,-R$shrpdir"
+ 		;;
+ 	bsdos|linux|irix*|dec_osf|gnu*)
+Index: perl-5.8.8/Makefile.SH
+===================================================================
+--- perl-5.8.8.orig/Makefile.SH	2006-01-24 12:49:44 +0000
++++ perl-5.8.8/Makefile.SH	2006-02-14 13:46:57 +0000
+@@ -73,7 +73,7 @@
+ 	sunos*)
+ 		linklibperl="-lperl"
+ 		;;
+-	netbsd*|freebsd[234]*|openbsd*)
++	netbsd*|freebsd[234]*|openbsd*|dragonfly*)
+ 		linklibperl="-L. -lperl"
+ 		;;
+ 	interix*)
+@@ -990,6 +990,10 @@
+ n_dummy $(nonxs_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
+ 	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
+ 
++.PHONY: printconfig
++printconfig:
++	@eval `$(LDLIBPTH) ./perl -Ilib -V:$(CONFIGVAR)`; echo $$$(CONFIGVAR)
++
+ .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
+ 	realclean _realcleaner clobber _clobber \
+ 	distclean veryclean _verycleaner
+Index: perl-5.8.8/hints/dragonfly.sh
+===================================================================
+--- perl-5.8.8.orig/hints/dragonfly.sh	1970-01-01 00:00:00 +0000
++++ perl-5.8.8/hints/dragonfly.sh	2006-02-14 13:15:04 +0000
+@@ -0,0 +1,118 @@
++# hints/dragonfly.sh
++#
++# This file is mostly copied from hints/freebsd.sh with the OS version
++# information taken out and only the FreeBSD-4 information intact.
++# Please check with Todd Willey <xtoddx@gmail.com> before making
++# modifications to this file.
++
++case "$osvers" in
++*)     usevfork='true'
++       case "$usemymalloc" in
++           "") usemymalloc='n'
++               ;;
++       esac
++       libswanted=`echo $libswanted | sed 's/ malloc / /'`
++       ;;
++esac
++
++# Dynamic Loading flags have not changed much, so they are separated
++# out here to avoid duplicating them everywhere.
++case "$osvers" in
++*)
++        objformat=`/usr/bin/objformat`
++        if [ x$objformat = xelf ]; then
++            libpth="/usr/lib /usr/local/lib"
++            glibpth="/usr/lib /usr/local/lib"
++            ldflags="-Wl,-E "
++            lddlflags="-shared "
++        else
++            if [ -e /usr/lib/aout ]; then
++                libpth="/usr/lib/aout /usr/local/lib /usr/lib"
++                glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
++            fi
++            lddlflags='-Bshareable'
++        fi
++        cccdlflags='-DPIC -fPIC'
++        ;;
++esac
++
++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
++           usenm=false
++       fi
++        ;;
++esac
++
++cat <<'EOM' >&4
++
++Some users have reported that Configure halts when testing for
++the O_NONBLOCK symbol with a syntax error.  This is apparently a
++sh error.  Rerunning Configure with ksh apparently fixes the
++problem.  Try
++       ksh Configure [your options]
++
++EOM
++
++# From: Anton Berezin <tobez@plab.ku.dk>
++# To: perl5-porters@perl.org
++# Subject: [PATCH 5.005_54] Configure - hints/freebsd.sh signal handler type
++# Date: 30 Nov 1998 19:46:24 +0100
++# Message-ID: <864srhhvcv.fsf@lion.plab.ku.dk>
++
++signal_t='void'
++d_voidsig='define'
++
++# This script UU/usethreads.cbu will get 'called-back' by Configure
++# after it has prompted the user for whether to use threads.
++cat > UU/usethreads.cbu <<'EOCBU'
++case "$usethreads" in
++$define|true|[yY]*)
++        lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'|sed -n '$p'`
++        case "$osvers" in
++       *)
++             if [ ! -r "$lc_r" ]; then
++             cat <<EOM >&4
++POSIX threads should be supported by FreeBSD $osvers --
++but your system is missing the shared libc_r.
++(/sbin/ldconfig -r doesn't find any).
++
++Consider using the latest STABLE release.
++EOM
++                exit 1
++             fi
++             case "$osvers" in
++             *)        ldflags="-pthread $ldflags"
++                       ;;
++             esac
++             # Both in 4.x and 5.x gethostbyaddr_r exists but
++             # it is "Temporary function, not threadsafe"...
++             # Presumably earlier it didn't even exist.
++             d_gethostbyaddr_r="undef"
++             d_gethostbyaddr_r_proto="0"
++             ;;
++
++       esac
++
++       set `echo X "$libswanted "| sed -e 's/ c / c_r /'`
++       shift
++       libswanted="$*"
++       # Configure will probably pick the wrong libc to use for nm scan.
++       # The safest quick-fix is just to not use nm at all...
++       usenm=false
++
++        unset lc_r
++
++       # Even with the malloc mutexes the Perl malloc does not
++       # seem to be threadsafe in FreeBSD?
++       case "$usemymalloc" in
++       '') usemymalloc=n ;;
++       esac
++esac
++EOCBU
++
++# malloc wrap works
++case "$usemallocwrap" in
++'') usemallocwrap='define' ;;
++esac
+
diff --git a/sys-devel/libperl/files/libperl-5.8.8-fbsdhints.patch b/sys-devel/libperl/files/libperl-5.8.8-fbsdhints.patch
new file mode 100644
index 000000000000..5f888346ae43
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-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/sys-devel/libperl/libperl-5.8.8.ebuild b/sys-devel/libperl/libperl-5.8.8.ebuild
index ef32b0d5bd56..04f4152dff61 100644
--- a/sys-devel/libperl/libperl-5.8.8.ebuild
+++ b/sys-devel/libperl/libperl-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/sys-devel/libperl/libperl-5.8.8.ebuild,v 1.4 2006/02/07 23:43:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.8.ebuild,v 1.5 2006/02/21 00:16:53 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -136,6 +136,8 @@ src_unpack() {
 	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
 
 	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
 }
 
 myconf() {
@@ -161,6 +163,7 @@ src_compile() {
 
 	case ${CHOST} in
 		*-freebsd*) osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
 		*-netbsd*) osname="netbsd" ;;
 		*-openbsd*) osname="openbsd" ;;
 		*-darwin*) osname="darwin" ;;