adopt some patches from FreeBSD ports, allowing this to build on

FreeBSD 5.0.

also, make really sure we don't try to use perl's malloc().

6 files changed, 66 insertions, 7 deletions

diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 3be24c95770..06cd46e1a6f 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/02/17 15:28:00 dillo Exp $
+# $NetBSD: Makefile,v 1.9 2003/02/21 16:10:27 grant Exp $
 
 .include "Makefile.common"
 
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=	-Dscriptdir="${PREFIX}/bin"
 CONFIGURE_ARGS+=	-Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
 CONFIGURE_ARGS+=	-Doptimize="${CFLAGS}"
 CONFIGURE_ARGS+=	-Dcc="${CC:T}"
+CONFIGURE_ARGS+=	-Ui_malloc
 CONFIGURE_ARGS+=	-Uusemymalloc
 CONFIGURE_ARGS+=	-Uinstallusrbinperl
 TEST_TARGET=		test
diff --git a/lang/perl58/distinfo b/lang/perl58/distinfo
index 895e707d0de..d0ecee4e7bb 100644
--- a/lang/perl58/distinfo
+++ b/lang/perl58/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/22 21:50:37 jlam Exp $
+$NetBSD: distinfo,v 1.2 2003/02/21 16:10:27 grant Exp $
 
 SHA1 (perl-5.8.0.tar.gz) = be1e05876ca734464f8a770d61b1f15cca555719
 Size (perl-5.8.0.tar.gz) = 11023084 bytes
-SHA1 (patch-ah) = 72f8f113eacd913f72cf50dc37ac0bb95615b102
+SHA1 (patch-ac) = 8596389f77a6eafea7817e19c46165c1a34fdda6
+SHA1 (patch-ae) = 7bb2f96693cef5b4008a02fde2bde5ae1ce73cb6
+SHA1 (patch-af) = e401879a63419c23c50ce18b34950f45825763a3
+SHA1 (patch-ah) = 39d007da11f28ab37a81b7403b92be2784e942c6
diff --git a/lang/perl58/patches/patch-ac b/lang/perl58/patches/patch-ac
new file mode 100644
index 00000000000..322990aa657
--- /dev/null
+++ b/lang/perl58/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.1 2003/02/21 16:10:27 grant Exp $
+
+--- hints/freebsd.sh.orig	Sun Jun  2 03:03:12 2002
++++ hints/freebsd.sh
+@@ -98,6 +98,13 @@ case "$osvers" in
+ 	        ;;
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
++	d_setregid='define'
++	d_setreuid='define'
++	d_setegid='define'
++	d_seteuid='define'
++	d_dosuid='define'
+ 	;;
+ esac
+ 
+@@ -124,7 +131,7 @@ case "$osvers" in
+             fi
+             lddlflags='-Bshareable'
+         fi
+-        cccdlflags='-DPIC -fpic'
++        cccdlflags='-DPIC -fPIC'
+         ;;
+ esac
+ 
diff --git a/lang/perl58/patches/patch-ae b/lang/perl58/patches/patch-ae
new file mode 100644
index 00000000000..11c785f63ba
--- /dev/null
+++ b/lang/perl58/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2003/02/21 16:10:27 grant Exp $
+
+--- makedepend.SH.orig	Wed Jul 10 00:06:42 2002
++++ makedepend.SH
+@@ -79,6 +79,7 @@ if test -f Makefile; then
+     case "$osname" in
+     os2) ;;
+     netbsd) ;;
++    freebsd) ;;
+     *) $touch $firstmakefile ;;
+     esac
+ fi
diff --git a/lang/perl58/patches/patch-af b/lang/perl58/patches/patch-af
new file mode 100644
index 00000000000..d085a33b461
--- /dev/null
+++ b/lang/perl58/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2003/02/21 16:10:27 grant Exp $
+
+--- Configure.orig	Fri Jul 19 08:55:15 2002
++++ Configure
+@@ -9933,8 +9933,9 @@ eval $setvar
+ 
+ : see if crypt exists
+ echo " "
+-set crypt d_crypt
+-eval $inlibc
++: no, crypt is NOT in libc on FreeBSD
++: set crypt d_crypt
++: eval $inlibc
+ case "$d_crypt" in
+ $define) cryptlib='' ;;
+ *)	if set crypt val -f d_crypt; eval $csym; $val; then
diff --git a/lang/perl58/patches/patch-ah b/lang/perl58/patches/patch-ah
index 362e86c18f5..3155a8983af 100644
--- a/lang/perl58/patches/patch-ah
+++ b/lang/perl58/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/07/22 21:50:37 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2003/02/21 16:10:27 grant Exp $
 
---- perl.c.orig	Sat Jun 15 12:40:21 2002
+--- perl.c.orig	Wed Jul 10 05:41:43 2002
 +++ perl.c
-@@ -3673,12 +3673,32 @@
+@@ -3673,12 +3673,32 @@ S_init_perllib(pTHX)
      }
  
  /* Use the ~-expanded versions of APPLLIB (undocumented),
@@ -36,7 +36,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2002/07/22 21:50:37 jlam Exp $
  #ifdef ARCHLIB_EXP
      incpush(ARCHLIB_EXP, FALSE, FALSE);
  #endif
-@@ -3710,26 +3730,6 @@
+@@ -3710,26 +3730,6 @@ S_init_perllib(pTHX)
      incpush(PRIVLIB_EXP, TRUE, FALSE);
  #else
      incpush(PRIVLIB_EXP, FALSE, FALSE);