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.

3 files changed, 43 insertions, 8 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 58f1d9e33ff..595c803ddbc 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2005/08/06 06:18:45 jlam Exp $
+# $NetBSD: Makefile,v 1.98 2005/08/07 21:47:24 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 .if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
 DISTNAME=	perl-${PERL5_VERS}
 PKGNAME=	perl-${PERL5_VERS}
-PKGREVISION=	# empty
+PKGREVISION=	1
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
 .else
 .  if !empty(PERL5_SNAPSHOT)
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index c7c4d838507..c68a3f8b4ca 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2005/08/07 00:29:47 jlam Exp $
+$NetBSD: distinfo,v 1.25 2005/08/07 21:47:24 jlam Exp $
 
 SHA1 (perl-5.8.7.tar.bz2) = c9477c6fe76b200033694bdc555a0276523d4228
 RMD160 (perl-5.8.7.tar.bz2) = 110c286d73fd89e25da8ea394e763f209a76d283
 Size (perl-5.8.7.tar.bz2) = 9839086 bytes
-SHA1 (patch-aa) = 03e6d0683625a3da30582abb89646b88cde84ea9
+SHA1 (patch-aa) = 44b08347f78c203f71f98797a213a3828b0954eb
 SHA1 (patch-ae) = 044ac094cd475a16483552aa6f1bde03bd11f592
 SHA1 (patch-ah) = 7847562d35cd4834a45139b6a8cfe766aa45fa0a
 SHA1 (patch-al) = 7b86ec658c09077bec513eadc02006525a548d6f
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) \