diff options
author | jlam <jlam@pkgsrc.org> | 2005-08-07 21:47:24 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2005-08-07 21:47:24 +0000 |
commit | 0680c23678158103ecd6ac3bec08ba0ad37b732a (patch) | |
tree | ba0ce26eeb543a636c23cb88660a9626c7ece6d0 /lang/perl5/patches/patch-aa | |
parent | d1cbf814501d6fff5c705a58ffd4b4e9ed545970 (diff) | |
download | pkgsrc-0680c23678158103ecd6ac3bec08ba0ad37b732a.tar.gz |
Fix an error in ExtUtils::MakeMaker that didn't output the definitions
for INSTALLSITESCRIPT and INSTALLVENDORSCRIPT in MakeMaker-generated
Makefiles. Bump the PKGREVISION to 1.
Diffstat (limited to 'lang/perl5/patches/patch-aa')
-rw-r--r-- | lang/perl5/patches/patch-aa | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa index 91b08bc57cc..b233fc0932f 100644 --- a/lang/perl5/patches/patch-aa +++ b/lang/perl5/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.27 2005/08/06 06:18:45 jlam Exp $ +$NetBSD: patch-aa,v 1.28 2005/08/07 21:47:24 jlam Exp $ --- lib/ExtUtils/MM_Unix.pm.orig 2004-01-05 17:34:59.000000000 -0500 +++ lib/ExtUtils/MM_Unix.pm @@ -48,7 +48,42 @@ $NetBSD: patch-aa,v 1.27 2005/08/06 06:18:45 jlam Exp $ } } } -@@ -2480,13 +2480,13 @@ sub install { +@@ -2082,6 +2082,21 @@ sub init_INSTALL { + $self->catdir($sprefix, 'bin'); + } + ++ unless( $Config{installsitescript} ) { ++ $Config_Override{installsitescript} = ++ $self->catdir($sprefix, 'bin'); ++ } ++ ++ unless( $Config{installvendorbin} ) { ++ $Config_Override{installvendorbin} = ++ $self->catdir($vprefix, 'bin'); ++ } ++ ++ unless( $Config{installvendorscript} ) { ++ $Config_Override{installvendorscript} = ++ $self->catdir($vprefix, 'bin'); ++ } ++ + $self->{PREFIX} ||= ''; + + if( $self->{PREFIX} ) { +@@ -2127,6 +2142,12 @@ sub init_INSTALL { + script => { s => $iprefix, + t => 'perl', + d => 'bin' }, ++ vendorscript => { s => $vprefix, ++ t => 'vendor', ++ d => 'bin' }, ++ sitescript => { s => $sprefix, ++ t => 'site', ++ d => 'bin' }, + ); + + my %man_layouts = +@@ -2480,13 +2501,13 @@ sub install { my(@m); push @m, q{ @@ -66,7 +101,7 @@ $NetBSD: patch-aa,v 1.27 2005/08/06 06:18:45 jlam Exp $ pure_install :: pure_$(INSTALLDIRS)_install -@@ -2519,7 +2519,7 @@ pure_site_install :: +@@ -2519,7 +2540,7 @@ pure_site_install :: $(INST_LIB) $(DESTINSTALLSITELIB) \ $(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \ $(INST_BIN) $(DESTINSTALLSITEBIN) \ @@ -75,7 +110,7 @@ $NetBSD: patch-aa,v 1.27 2005/08/06 06:18:45 jlam Exp $ $(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \ $(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR) $(NOECHO) $(WARN_IF_OLD_PACKLIST) \ -@@ -2532,7 +2532,7 @@ pure_vendor_install :: +@@ -2532,7 +2553,7 @@ pure_vendor_install :: $(INST_LIB) $(DESTINSTALLVENDORLIB) \ $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \ $(INST_BIN) $(DESTINSTALLVENDORBIN) \ |