Alter the configuration so that:

	$(prefix) == $(siteprefix) == $(vendorprefix)

so that if a perl module is configured with "perl Makefile.PL PREFIX=...",
then that single PREFIX definition will override all three of the
above, and files will be properly installed into the correct relative
path.  Also, patch a test so that it understands the different behavior
of the pkgsrc ExtUtils::MakeMaker module.  Bump the PKGREVISION to 2.

1 files changed, 40 insertions, 0 deletions

diff --git a/lang/perl5/patches/patch-ao b/lang/perl5/patches/patch-ao
new file mode 100644
index 00000000000..b5df7e305b9
--- /dev/null
+++ b/lang/perl5/patches/patch-ao
@@ -0,0 +1,40 @@
+$NetBSD: patch-ao,v 1.1 2005/08/08 16:39:58 jlam Exp $
+
+--- lib/ExtUtils/t/basic.t.orig	2004-01-05 17:34:59.000000000 -0500
++++ lib/ExtUtils/t/basic.t
+@@ -118,7 +118,7 @@ is( $?, 0,                              
+     diag $test_out;
+ 
+ 
+-my $install_out = run("$make install");
++my $install_out = run("$make install doc_install");
+ is( $?, 0, 'install' ) || diag $install_out;
+ like( $install_out, qr/^Installing /m );
+ like( $install_out, qr/^Writing /m );
+@@ -138,7 +138,7 @@ ok( $files{'perllocal.pod'},'  perllocal
+ SKIP: {
+     skip "VMS install targets do not preserve $(PREFIX)", 8 if $Is_VMS;
+ 
+-    $install_out = run("$make install PREFIX=elsewhere");
++    $install_out = run("$make install doc_install PREFIX=elsewhere");
+     is( $?, 0, 'install with PREFIX override' ) || diag $install_out;
+     like( $install_out, qr/^Installing /m );
+     like( $install_out, qr/^Writing /m );
+@@ -157,7 +157,7 @@ SKIP: {
+ SKIP: {
+     skip "VMS install targets do not preserve $(DESTDIR)", 10 if $Is_VMS;
+ 
+-    $install_out = run("$make install PREFIX= DESTDIR=other");
++    $install_out = run("$make install doc_install PREFIX= DESTDIR=other");
+     is( $?, 0, 'install with DESTDIR' ) || 
+         diag $install_out;
+     like( $install_out, qr/^Installing /m );
+@@ -197,7 +197,7 @@ SKIP: {
+ SKIP: {
+     skip "VMS install targets do not preserve $(PREFIX)", 9 if $Is_VMS;
+ 
+-    $install_out = run("$make install PREFIX=elsewhere DESTDIR=other/");
++    $install_out = run("$make install doc_install PREFIX=elsewhere DESTDIR=other/");
+     is( $?, 0, 'install with PREFIX override and DESTDIR' ) || 
+         diag $install_out;
+     like( $install_out, qr/^Installing /m );