diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | lang/perl5/Makefile | 4 | ||||
| -rw-r--r-- | lang/perl5/distinfo | 4 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-ag | 22 |
4 files changed, 17 insertions, 16 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index f5e9af1f3cf..9370c92eca1 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.4441 2004/01/12 23:54:50 xtraeme Exp $ +$NetBSD: CHANGES,v 1.4442 2004/01/13 01:09:04 jlam Exp $ Changes to the packages collection and infrastructure in 2004: @@ -199,3 +199,4 @@ Changes to the packages collection and infrastructure in 2004: Updated ksi to 3.4.1nb1 [kristerw 2004-01-12] Updated gnutls to 1.0.4 [xtraeme 2004-01-12] Updated awstats to 5.9 [xtraeme 2004-01-12] + Updated perl5 to 5.6.1nb10 [jlam 2004-01-12] diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 3fce1a9fab7..06314ed6a17 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.78 2004/01/08 19:18:00 jlam Exp $ +# $NetBSD: Makefile,v 1.79 2004/01/13 01:08:57 jlam Exp $ .include "../../lang/perl5/Makefile.common" -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES+= lang devel MAINTAINER= jlam@NetBSD.org diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index a8059388fa2..d2536a75b7b 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2003/10/05 14:19:09 grant Exp $ +$NetBSD: distinfo,v 1.19 2004/01/13 01:08:57 jlam Exp $ SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744 Size (perl-5.6.1.tar.gz) = 5983695 bytes @@ -7,7 +7,7 @@ SHA1 (patch-ac) = dfebafeec171c86de3d6105e5543270a30f82691 SHA1 (patch-ad) = 7a3ca903d958026473f593fdeb172f86f2ef66d2 SHA1 (patch-ae) = 677797f38279b7602fc5bbac8ee80c0e09f6e285 SHA1 (patch-af) = 94d91fba0731c9ee43b3e544f81cc9367a75a77c -SHA1 (patch-ag) = 3ffe02cc745234b067c991b66024c17864f5babe +SHA1 (patch-ag) = 4e9c1a22d593f79e25a67ea330ae4b908b3c2c5f SHA1 (patch-ah) = 4c689dde8cba8cb3c30295d52536ff09a0c7f589 SHA1 (patch-aj) = 4da55b4bb1e1607fde7a3d9510ca3d6a90f8c10b SHA1 (patch-al) = 96b68e38900053109caeb10326cce6e17f58dcab diff --git a/lang/perl5/patches/patch-ag b/lang/perl5/patches/patch-ag index 39597e6e039..6e2397cab54 100644 --- a/lang/perl5/patches/patch-ag +++ b/lang/perl5/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.8 2003/05/27 21:57:25 jlam Exp $ +$NetBSD: patch-ag,v 1.9 2004/01/13 01:08:57 jlam Exp $ --- lib/ExtUtils/MM_Unix.pm.orig Thu Mar 15 10:25:20 2001 -+++ lib/ExtUtils/MM_Unix.pm Tue May 27 17:03:53 2003 -@@ -604,8 +604,8 @@ ++++ lib/ExtUtils/MM_Unix.pm +@@ -604,8 +604,8 @@ MAN3PODS = ".join(" \\\n\t", sort keys % INST_HTMLSITELIBDIR INSTALLHTMLSITELIBDIR INST_HTMLSCRIPTDIR INSTALLHTMLSCRIPTDIR INST_HTMLLIBDIR HTMLEXT @@ -13,7 +13,7 @@ $NetBSD: patch-ag,v 1.8 2003/05/27 21:57:25 jlam Exp $ /) { next unless defined $self->{$tmp}; push @m, "$tmp = $self->{$tmp}\n"; -@@ -1059,6 +1059,22 @@ +@@ -1059,6 +1059,22 @@ sub dynamic_lib { my($ldfrom) = '$(LDFROM)'; $armaybe = 'ar' if ($^O eq 'dec_osf' and $armaybe eq ':'); my(@m); @@ -26,9 +26,9 @@ $NetBSD: patch-ag,v 1.8 2003/05/27 21:57:25 jlam Exp $ + my($llibperl) = ''; + if (($^O eq 'netbsd') and ($Config{'useshrplib'} eq 'true')) { + if ($Config{'lddlflags'} =~ /-Wl,-R/) { -+ $llibperl = '-L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -lperl'; ++ $llibperl = '-L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -Wl,-R$(PERL_ARCHLIB)/CORE -lperl'; + } elsif ($Config{'lddlflags'} =~ /-R/) { -+ $llibperl = '-L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -lperl'; ++ $llibperl = '-L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -R$(PERL_ARCHLIB)/CORE -lperl'; + } + } + push(@m,'LLIBPERL = '.$llibperl."\n"); @@ -36,7 +36,7 @@ $NetBSD: patch-ag,v 1.8 2003/05/27 21:57:25 jlam Exp $ push(@m,' # This section creates the dynamically loadable $(INST_DYNAMIC) # from $(OBJECT) and possibly $(MYEXTLIB). -@@ -1088,7 +1104,7 @@ +@@ -1088,7 +1104,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ '); push(@m,' LD_RUN_PATH="$(LD_RUN_PATH)" $(LD) '.$ldrun.' $(LDDLFLAGS) '.$ldfrom. @@ -45,7 +45,7 @@ $NetBSD: patch-ag,v 1.8 2003/05/27 21:57:25 jlam Exp $ push @m, ' $(CHMOD) $(PERM_RWX) $@ '; -@@ -1888,7 +1904,9 @@ +@@ -1888,7 +1904,9 @@ usually solves this kind of problem. } for $install_variable (qw/ INSTALLMAN1DIR @@ -55,7 +55,7 @@ $NetBSD: patch-ag,v 1.8 2003/05/27 21:57:25 jlam Exp $ /) { $self->prefixify($install_variable,$search_prefix,$replace_prefix); -@@ -1898,6 +1916,8 @@ +@@ -1898,6 +1916,8 @@ usually solves this kind of problem. # installed $self->{INSTALLMAN1DIR} = $Config::Config{installman1dir} unless defined $self->{INSTALLMAN1DIR}; @@ -64,7 +64,7 @@ $NetBSD: patch-ag,v 1.8 2003/05/27 21:57:25 jlam Exp $ unless (defined $self->{INST_MAN1DIR}){ if ($self->{INSTALLMAN1DIR} =~ /^(none|\s*)$/){ $self->{INST_MAN1DIR} = $self->{INSTALLMAN1DIR}; -@@ -1909,6 +1929,8 @@ +@@ -1909,6 +1929,8 @@ usually solves this kind of problem. $self->{INSTALLMAN3DIR} = $Config::Config{installman3dir} unless defined $self->{INSTALLMAN3DIR}; @@ -73,7 +73,7 @@ $NetBSD: patch-ag,v 1.8 2003/05/27 21:57:25 jlam Exp $ unless (defined $self->{INST_MAN3DIR}){ if ($self->{INSTALLMAN3DIR} =~ /^(none|\s*)$/){ $self->{INST_MAN3DIR} = $self->{INSTALLMAN3DIR}; -@@ -2153,8 +2175,8 @@ +@@ -2153,8 +2175,8 @@ pure_site_install :: $(INST_SCRIPT) $(INSTALLSCRIPT) \ $(INST_HTMLLIBDIR) $(INSTALLHTMLSITELIBDIR) \ $(INST_HTMLSCRIPTDIR) $(INSTALLHTMLSCRIPTDIR) \ |