5 files changed, 43 insertions, 31 deletions

diff --git a/lang/perl5.10/files/patch-INST_PREFIX.t b/lang/perl5.10/files/patch-INST_PREFIX.t
new file mode 100644
index 000000000000..9520ef26890c
--- /dev/null
+++ b/lang/perl5.10/files/patch-INST_PREFIX.t
@@ -0,0 +1,20 @@
+--- lib/ExtUtils/t/INST_PREFIX.t.orig	Wed Feb 15 12:46:31 2006
++++ lib/ExtUtils/t/INST_PREFIX.t	Wed Feb 15 12:46:52 2006
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+ 
+ use strict;
+-use Test::More tests => 52;
++use Test::More tests => 51;
+ use MakeMaker::Test::Utils;
+ use MakeMaker::Test::Setup::BFD;
+ use ExtUtils::MakeMaker;
+@@ -62,7 +62,7 @@ like( $stdout->read, qr{
+                         Writing\ $Makefile\ for\ Big::Dummy\n
+ }x );
+ 
+-is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
++## is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
+ 
+ isa_ok( $mm, 'ExtUtils::MakeMaker' );
+ 
diff --git a/lang/perl5.10/files/patch-MM_Any.pm b/lang/perl5.10/files/patch-MM_Any.pm
new file mode 100644
index 000000000000..4e50627b00a8
--- /dev/null
+++ b/lang/perl5.10/files/patch-MM_Any.pm
@@ -0,0 +1,18 @@
+--- lib/ExtUtils/MM_Any.pm.orig	Wed Feb 15 12:20:43 2006
++++ lib/ExtUtils/MM_Any.pm	Wed Feb 15 12:22:29 2006
+@@ -1069,13 +1069,14 @@ sub init_INSTALL_from_PREFIX {
+           ('$(PREFIX)') x 3;
+     }
+     else {
++        $self->{PREFIX}   ||= $iprefix;
+         $self->{PERLPREFIX}   ||= $iprefix;
+         $self->{SITEPREFIX}   ||= $sprefix;
+         $self->{VENDORPREFIX} ||= $vprefix;
+ 
+         # Lots of MM extension authors like to use $(PREFIX) so we
+         # put something sensible in there no matter what.
+-        $self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
++        #$self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)';
+     }
+ 
+     my $arch    = $Config{archname};
diff --git a/lang/perl5.10/files/patch-MM_Unix.pm b/lang/perl5.10/files/patch-MM_Unix.pm
deleted file mode 100644
index 7937392ae080..000000000000
--- a/lang/perl5.10/files/patch-MM_Unix.pm
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/ExtUtils/MM_Unix.pm.orig	Tue Oct 28 22:12:01 2003
-+++ lib/ExtUtils/MM_Unix.pm	Tue Oct 28 22:14:18 2003
-@@ -2089,6 +2089,7 @@
-           ('$(PREFIX)') x 3;
-     }
-     else {
-+        $self->{PREFIX}   ||= $iprefix;  # for FreeBSD ports collection
-         $self->{PERLPREFIX}   ||= $iprefix;
-         $self->{SITEPREFIX}   ||= $sprefix;
-         $self->{VENDORPREFIX} ||= $vprefix;
diff --git a/lang/perl5.10/files/patch-SDBM-errno-fix b/lang/perl5.10/files/patch-SDBM-errno-fix
deleted file mode 100644
index 2dcf809d92d3..000000000000
--- a/lang/perl5.10/files/patch-SDBM-errno-fix
+++ /dev/null
@@ -1,16 +0,0 @@
---- ext/SDBM_File/sdbm/sdbm.c.orig	Thu Jun 23 08:06:21 2005
-+++ ext/SDBM_File/sdbm/sdbm.c	Thu Jun 23 08:06:57 2005
-@@ -34,11 +34,8 @@
- /*
-  * externals
-  */
--#ifndef WIN32
--#ifndef sun
--extern int errno;
--#endif
--#endif
-+
-+#include <errno.h>
- 
- extern Malloc_t malloc proto((MEM_SIZE));
- extern Free_t free proto((Malloc_t));
diff --git a/lang/perl5.10/files/perl-after-upgrade b/lang/perl5.10/files/perl-after-upgrade
index a60cd8e93ecb..fd787edab1e8 100644
--- a/lang/perl5.10/files/perl-after-upgrade
+++ b/lang/perl5.10/files/perl-after-upgrade
@@ -411,7 +411,7 @@ sub might_need_to_fix
 		return 1;
 	}
 	for ($pkg->lines) {
-		if (/^\@pkgdep\s+perl-($fuzzy_source)\S*\s*$/) {
+		if (/^\@pkgdep\s+perl-(threaded-)?($fuzzy_source)\S*\s*$/) {
 			return 1;
 		}
 	}
@@ -581,10 +581,10 @@ while (my $pkg = $db->next) {
 		}
 		if (/^\@cwd\s+(\S+)\s*$/) {
 			$prefix = $1;
-		} elsif (/^\@pkgdep\s+perl-($fuzzy_source)\S*\s*$/) {
-			if ($target ne $1) {
-				my $perlver = $1;
-				s|perl-\Q$perlver\E|perl-$target|;
+		} elsif (/^\@pkgdep\s+perl-(threaded-)?($fuzzy_source)\S*\s*$/) {
+			if ($target ne $2) {
+				my $perlver = $2;
+				s|perl-(threaded-)?\Q$perlver\E|perl-$target|;
 			}
 		}
 		my $old = $_;