Index: devel/p5-ExtUtils-MakeMaker/patches/patch-aa
===================================================================
RCS file: devel/p5-ExtUtils-MakeMaker/patches/patch-aa
diff -N devel/p5-ExtUtils-MakeMaker/patches/patch-aa
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ devel/p5-ExtUtils-MakeMaker/patches/patch-aa	22 Mar 2010 18:40:39 -0000
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- lib/ExtUtils/MM_VMS.pm.orig	2010-03-19 18:06:11.000000000 +0000
++++ lib/ExtUtils/MM_VMS.pm
+@@ -1165,7 +1165,7 @@ doc__install : doc_site_install
+ 
+ # This hack brought to you by DCL's 255-character command line limit
+ pure_perl_install ::
+-	$(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'read '.File::Spec->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').' '" >.MM_tmp
++	$(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'read '.File::Spec->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').' '" >.MM_tmp
+ 	$(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'write '.File::Spec->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').' '" >>.MM_tmp
+ 	$(NOECHO) $(ECHO_N) "$(INST_LIB) $(DESTINSTALLPRIVLIB) " >>.MM_tmp
+ 	$(NOECHO) $(ECHO_N) "$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) " >>.MM_tmp
+@@ -1179,7 +1179,7 @@ pure_perl_install ::
+ 
+ # Likewise
+ pure_site_install ::
+-	$(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'read '.File::Spec->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').' '" >.MM_tmp
++	$(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'read '.File::Spec->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').' '" >.MM_tmp
+ 	$(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'write '.File::Spec->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').' '" >>.MM_tmp
+ 	$(NOECHO) $(ECHO_N) "$(INST_LIB) $(DESTINSTALLSITELIB) " >>.MM_tmp
+ 	$(NOECHO) $(ECHO_N) "$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) " >>.MM_tmp
+@@ -1192,7 +1192,7 @@ pure_site_install ::
+ 	$(NOECHO) $(WARN_IF_OLD_PACKLIST) ].$self->catfile($self->{PERL_ARCHLIB},'auto',$self->{FULLEXT},'.packlist').q[
+ 
+ pure_vendor_install ::
+-	$(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'read '.File::Spec->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').' '" >.MM_tmp
++	$(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'read '.File::Spec->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').' '" >.MM_tmp
+ 	$(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'write '.File::Spec->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').' '" >>.MM_tmp
+ 	$(NOECHO) $(ECHO_N) "$(INST_LIB) $(DESTINSTALLVENDORLIB) " >>.MM_tmp
+ 	$(NOECHO) $(ECHO_N) "$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) " >>.MM_tmp
Index: devel/p5-ExtUtils-MakeMaker/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/devel/p5-ExtUtils-MakeMaker/patches/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- devel/p5-ExtUtils-MakeMaker/patches/patch-ab	5 Jan 2009 12:15:17 -0000	1.3
+++ devel/p5-ExtUtils-MakeMaker/patches/patch-ab	22 Mar 2010 18:40:39 -0000
@@ -1,10 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2009/01/05 12:15:17 he Exp $
+$NetBSD$
 
-Changes:
- o More general adaptation for BSDs
- o Install scripts in DESTINSTALLSITESCRIPT instead of DESTINSTALLSCRIPT
-
---- lib/ExtUtils/MM_Unix.pm.orig	2008-02-29 01:06:28.000000000 +0100
+--- lib/ExtUtils/MM_Unix.pm.orig	2009-12-17 22:02:03.000000000 +0000
 +++ lib/ExtUtils/MM_Unix.pm
 @@ -931,7 +931,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
  
@@ -15,7 +11,13 @@
  	# Use nothing on static perl platforms, and to the flags needed
  	# to link against the shared libperl library on shared perl
  	# platforms.  We peek at lddlflags to see if we need -Wl,-R
-@@ -2119,7 +2119,7 @@ pure_perl_install ::
+@@ -2047,12 +2047,12 @@ doc__install : doc_site_install
+ 
+ pure_perl_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
++		read }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+ 		write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
  		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
  		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
  		$(INST_BIN) $(DESTINSTALLBIN) \
@@ -24,3 +26,21 @@
  		$(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \
  		$(INST_MAN3DIR) $(DESTINSTALLMAN3DIR)
  	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
+@@ -2061,7 +2061,7 @@ pure_perl_install :: all
+ 
+ pure_site_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
++		read }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ 		write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLSITELIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
+@@ -2074,7 +2074,7 @@ pure_site_install :: all
+ 
+ pure_vendor_install :: all
+ 	$(NOECHO) $(MOD_INSTALL) \
+-		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
++		read }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ 		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
