diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/perl5/Makefile | 25 | ||||
| -rw-r--r-- | lang/perl5/distinfo | 6 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-aa | 19 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-ab | 18 |
4 files changed, 50 insertions, 18 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index eebed25d342..d3246092fb7 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.45 2001/09/26 03:12:14 jlam Exp $ +# $NetBSD: Makefile,v 1.46 2001/10/01 07:05:10 jlam Exp $ .include "../../lang/perl5/Makefile.common" PKGNAME= perl-${PERL5_VERS} -PERL5_PKG_VERS= nb3 +PERL5_PKG_VERS= nb4 CATEGORIES+= lang devel MAINTAINER= jlam@netbsd.org @@ -45,6 +45,18 @@ LIBSWANTED.SunOS= m crypt socket nsl SYSLIBPATH.NetBSD= /usr/lib SYSLIBPATH.SunOS= /usr/lib +# Nail down the directories in which headers and libraries of +# locally-installed software may be found. +# +LOCLIBPATH= ${LOCALBASE}/lib +LOCINCPATH= ${LOCALBASE}/include + +.if ${OBJECT_FMT} == "a.out" +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-R/g} +.else +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-Wl,-R/g} +.endif + .if defined(LIBSWANTED.${OPSYS}) CONFIGURE_ARGS+= -Dlibswanted="${LIBSWANTED.${OPSYS}}" .endif @@ -87,10 +99,11 @@ post-patch: hintdir="${WRKSRC}/hints"; \ for hints in $${hintdir}/*.sh; do \ ${CHMOD} +w $${hints}; \ - ( ${ECHO} ""; \ - ${ECHO} "man3dir=none"; \ - ${ECHO} "locincpth='${LOCALBASE}/include'"; \ - ${ECHO} "loclibpth='${LOCALBASE}/lib'"; \ + ( ${ECHO} ''; \ + ${ECHO} 'man3dir=none'; \ + ${ECHO} 'locincpth="${LOCINCPATH}"'; \ + ${ECHO} 'loclibpth="${LOCLIBPATH}"'; \ + ${ECHO} 'ldflags="${LOCLIBRPATHFLAGS} $$ldflags"'; \ ) >> $${hints}; \ done .if defined(SYSLIBPATH.${OPSYS}) diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index 77475cc3e23..fd5b2c55397 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2001/09/17 18:04:42 tron Exp $ +$NetBSD: distinfo,v 1.6 2001/10/01 07:05:11 jlam Exp $ SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744 Size (perl-5.6.1.tar.gz) = 5983695 bytes -SHA1 (patch-aa) = 2f03e3b58eff2f7ff56dbcf0f5976f74199a3ab9 -SHA1 (patch-ab) = 65bbbb0d6a1ddf17bd5d718f0ac741faf37ce408 +SHA1 (patch-aa) = a92ec22c251a3b54d042fdcf6e2cfe6b128873c8 +SHA1 (patch-ab) = f5fb048313fd3e80dd7ad06fc4def1cbb7f0e209 SHA1 (patch-ac) = dfebafeec171c86de3d6105e5543270a30f82691 SHA1 (patch-ad) = 7a3ca903d958026473f593fdeb172f86f2ef66d2 SHA1 (patch-ae) = 677797f38279b7602fc5bbac8ee80c0e09f6e285 diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa index d3999384aa7..9972518edbf 100644 --- a/lang/perl5/patches/patch-aa +++ b/lang/perl5/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.21 2001/09/17 18:04:44 tron Exp $ +$NetBSD: patch-aa,v 1.22 2001/10/01 07:05:11 jlam Exp $ ---- Configure.orig Mon Mar 19 04:03:33 2001 -+++ Configure Mon Sep 17 11:59:02 2001 -@@ -6807,9 +6812,12 @@ +--- Configure.orig Sun Mar 18 22:03:33 2001 ++++ Configure +@@ -6598,7 +6598,7 @@ + esac + for thisflag in $ldflags; do + case "$thisflag" in +- -L*|-R*) ++ -L*|-R*|-Wl,-R*) + case " $dflt " in + *" $thisflag "*) ;; + *) dflt="$dflt $thisflag" ;; +@@ -6807,9 +6807,12 @@ aix) # We'll set it in Makefile.SH... ;; @@ -16,7 +25,7 @@ $NetBSD: patch-aa,v 1.21 2001/09/17 18:04:44 tron Exp $ freebsd) xxx="-Wl,-R$shrpdir" ;; -@@ -14719,7 +14727,7 @@ +@@ -14719,7 +14722,7 @@ eval $inhdr : see if this is a ieeefp.h system diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab index bedeb8734b7..9b3cc22037f 100644 --- a/lang/perl5/patches/patch-ab +++ b/lang/perl5/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.9 2001/09/12 18:58:57 jlam Exp $ +$NetBSD: patch-ab,v 1.10 2001/10/01 07:05:11 jlam Exp $ --- hints/netbsd.sh.orig Thu Feb 22 21:57:55 2001 -+++ hints/netbsd.sh Wed Sep 12 14:41:45 2001 -@@ -21,7 +21,11 @@ ++++ hints/netbsd.sh +@@ -21,12 +21,20 @@ if [ -f /usr/libexec/ld.elf_so ]; then d_dlopen=$define d_dlerror=$define @@ -15,7 +15,17 @@ $NetBSD: patch-ab,v 1.9 2001/09/12 18:58:57 jlam Exp $ cccdlflags="-DPIC -fPIC $cccdlflags" lddlflags="--whole-archive -shared $lddlflags" elif [ "`uname -m`" = "pmax" ]; then -@@ -59,12 +63,13 @@ + # NetBSD 1.3 and 1.3.1 on pmax shipped an `old' ld.so, which will not work. +- d_dlopen=$undef ++ case "$osvers" in ++ 1.3|1.3.1) ++ d_dlopen=$undef ++ ;; ++ esac + elif [ -f /usr/libexec/ld.so ]; then + d_dlopen=$define + d_dlerror=$define +@@ -59,12 +67,13 @@ d_setruid="$undef" # there's no problem with vfork. |