diff options
author | grant <grant> | 2003-02-21 14:42:14 +0000 |
---|---|---|
committer | grant <grant> | 2003-02-21 14:42:14 +0000 |
commit | 918f1a856d76f3e0633e6bba4752db1a565a321e (patch) | |
tree | 02c2ec00d38c8d67384fc367c6a5826974652aa6 /lang | |
parent | 5a68dc46163238091d48e6e9448f40d057b90c20 (diff) | |
download | pkgsrc-918f1a856d76f3e0633e6bba4752db1a565a321e.tar.gz |
adopt some patches from FreeBSD ports, allowing this to build on
FreeBSD 5.0 (and probably Solaris w/ gcc3).
also, make really sure we don't try to use perl's malloc().
Diffstat (limited to 'lang')
-rw-r--r-- | lang/perl5/Makefile | 3 | ||||
-rw-r--r-- | lang/perl5/distinfo | 5 | ||||
-rw-r--r-- | lang/perl5/patches/patch-aj | 25 | ||||
-rw-r--r-- | lang/perl5/patches/patch-ak | 32 |
4 files changed, 58 insertions, 7 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 0078ca22750..071cee1a5d0 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2003/02/17 15:28:00 dillo Exp $ +# $NetBSD: Makefile,v 1.61 2003/02/21 14:42:14 grant Exp $ .include "../../lang/perl5/Makefile.common" @@ -26,6 +26,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/perl5/distinfo b/lang/perl5/distinfo index 9be9b8f2d25..b6c3ffd7b70 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/12/24 00:56:53 jschauma Exp $ +$NetBSD: distinfo,v 1.13 2003/02/21 14:42:14 grant Exp $ SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744 Size (perl-5.6.1.tar.gz) = 5983695 bytes @@ -10,4 +10,5 @@ SHA1 (patch-ae) = 677797f38279b7602fc5bbac8ee80c0e09f6e285 SHA1 (patch-af) = 94d91fba0731c9ee43b3e544f81cc9367a75a77c SHA1 (patch-ag) = 6f25b4799994279172bc756ede9f13506e9b1c28 SHA1 (patch-ah) = 4c689dde8cba8cb3c30295d52536ff09a0c7f589 -SHA1 (patch-aj) = 37d1e0a7625d388ef28954ee34bdebb483d602db +SHA1 (patch-aj) = c8bccd3e8dde70e79504022539f6dbb0785c7c0a +SHA1 (patch-ak) = 7aa35848111a62c608e792f025b7095513d7041b diff --git a/lang/perl5/patches/patch-aj b/lang/perl5/patches/patch-aj index b5c4ec41de9..6497b0a99d7 100644 --- a/lang/perl5/patches/patch-aj +++ b/lang/perl5/patches/patch-aj @@ -1,8 +1,25 @@ -$NetBSD: patch-aj,v 1.5 2002/12/24 00:56:54 jschauma Exp $ +$NetBSD: patch-aj,v 1.6 2003/02/21 14:42:14 grant Exp $ ---- makedepend.SH.orig Mon Dec 23 19:33:45 2002 -+++ makedepend.SH Mon Dec 23 19:34:27 2002 -@@ -196,7 +196,8 @@ +--- makedepend.SH.orig Mon Mar 19 18:33:17 2001 ++++ makedepend.SH +@@ -68,6 +68,7 @@ if test -f Makefile; then + case "$osname" in + os2) ;; + netbsd) ;; ++ freebsd) ;; + *) $touch $firstmakefile ;; + esac + fi +@@ -141,6 +142,8 @@ for file in `$cat .clist`; do + $cppstdin $finc -I. $cppflags $cppminus <UU/$file.c | + $sed \ + -e '/^#.*<stdin>/d' \ ++ -e '/^#.*<built-in>/d' \ ++ -e '/^#.*<command line>/d' \ + -e '/^#.*"-"/d' \ + -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ + -e 's/^[ ]*#[ ]*line/#/' \ +@@ -196,7 +199,8 @@ if $test -s .deptmp; then $echo "Updating $mf..." $echo "# If this runs make out of memory, delete /usr/include lines." \ >> $mf.new diff --git a/lang/perl5/patches/patch-ak b/lang/perl5/patches/patch-ak new file mode 100644 index 00000000000..85eb14df18b --- /dev/null +++ b/lang/perl5/patches/patch-ak @@ -0,0 +1,32 @@ +$NetBSD: patch-ak,v 1.1 2003/02/21 14:42:15 grant Exp $ + +--- hints/freebsd.sh.orig Sun Apr 8 16:09:16 2001 ++++ hints/freebsd.sh +@@ -85,10 +85,17 @@ case "$osvers" in + d_setreuid='define' + d_setegid='undef' + d_seteuid='undef' ++ d_dosuid='define' + ;; + *) usevfork='true' + usemymalloc='n' + libswanted=`echo $libswanted | sed 's/ malloc / /'` ++ libswanted=`echo $libswanted | sed 's/ bind / /'` ++ d_setregid='define' ++ d_setreuid='define' ++ d_setegid='undef' ++ d_seteuid='undef' ++ d_dosuid='define' + ;; + esac + +@@ -115,7 +122,8 @@ case "$osvers" in + fi + lddlflags='-Bshareable' + fi +- cccdlflags='-DPIC -fpic' ++ cccdlflags='-DPIC -fPIC' ++ libswanted=`echo $libswanted | sed 's/ iconv / /'` + ;; + esac + |