Introduce Perl 5.10.0

4 files changed, 24 insertions, 53 deletions

diff --git a/lang/perl5.14/files/patch-perl.c b/lang/perl5.14/files/patch-perl.c
index 8e91bd68b9e6..2f3753750e72 100644
--- a/lang/perl5.14/files/patch-perl.c
+++ b/lang/perl5.14/files/patch-perl.c
@@ -1,13 +1,5 @@
 --- perl.c
 +++ perl.c
-@@ -3724,7 +3724,7 @@
-  * perl with that fd as it has always done.
-  */
-     }
--    if (*suidscript) {
-+    if (*suidscript != TRUE) {
- 	Perl_croak(aTHX_ "suidperl needs (suid) fd script\n");
-     }
  #else /* IAMSUID */
 @@ -4882,6 +4882,28 @@
      incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
diff --git a/lang/perl5.14/files/patch-sv.c b/lang/perl5.14/files/patch-sv.c
index 4a4a6d840d26..5ee260a4b4bd 100644
--- a/lang/perl5.14/files/patch-sv.c
+++ b/lang/perl5.14/files/patch-sv.c
@@ -1,21 +1,21 @@
 --- sv.c
 +++ sv.c
-@@ -9813,7 +9813,8 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param)
+@@ -10421,7 +10421,8 @@ Perl_sv_dup(pTHX_ const SV *sstr, CLONE_PARAMS* param)
  		IoBOTTOM_NAME(dstr)	= SAVEPV(IoBOTTOM_NAME(dstr));
  		break;
  	    case SVt_PVAV:
 -		if (AvARRAY((AV*)sstr)) {
 +		/* avoid cloning an empty array */
-+		if (AvARRAY((AV*)sstr) && AvFILLp((AV*)sstr) >= 0) {
++		if (AvARRAY((AV *)sstr) && AvFILLp((AV *)sstr) >= 0) {
  		    SV **dst_ary, **src_ary;
  		    SSize_t items = AvFILLp((AV*)sstr) + 1;
  
-@@ -9838,6 +9839,8 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param)
+@@ -10446,6 +10447,8 @@ Perl_sv_dup(pTHX_ const SV *sstr, CLONE_PARAMS* param)
  		else {
- 		    SvPV_set(dstr, NULL);
+ 		    AvARRAY((AV*)dstr)	= NULL;
  		    AvALLOC((AV*)dstr)	= (SV**)NULL;
 +		    AvMAX(  (AV *)dstr)	= -1;
 +		    AvFILLp((AV *)dstr)	= -1;
  		}
- 		AvARYLEN((AV*)dstr) = sv_dup_inc(AvARYLEN((AV*)sstr), param);
  		break;
+ 	    case SVt_PVHV:
diff --git a/lang/perl5.14/files/perl-after-upgrade b/lang/perl5.14/files/perl-after-upgrade
index 144af3a3341c..a7f074d7566a 100644
--- a/lang/perl5.14/files/perl-after-upgrade
+++ b/lang/perl5.14/files/perl-after-upgrade
@@ -23,10 +23,10 @@ perl-after-upgrade -- fixup FreeBSD packages that depend on perl
 
 =head1 DESCRIPTION
 
-The standard procedure after a perl port (either lang/perl5.6 or
-lang/perl5.8) upgrade is to basically reinstall all other packages that
-depend on perl.  This is always a painful exercise.  The
-perl-after-upgrade utility makes this process mostly unnecessary.
+The standard procedure after a perl port (lang/perl5.X) upgrade is to
+basically reinstall all other packages that depend on perl.
+This is always a painful exercise.  The perl-after-upgrade utility makes
+this process mostly unnecessary.
 
 The tool goes through the list of installed packages, looks for those
 that depend on perl, moves files around, modifies shebang lines in those
@@ -222,7 +222,7 @@ use File::Copy;
 
 my $dry_run = 1;
 my @tmpl;
-my $VERSION = "1.2";
+my $VERSION = "1.3";
 
 while (@ARGV) {
 	my $opt = shift;
@@ -250,7 +250,7 @@ while (@ARGV) {
 my $target = '%%PERL_VERSION%%';
 my $new_perl_pkgname = '%%PKGNAME%%';
 
-my $fuzzy_source = "5\\.[\\d._]+";
+my $fuzzy_source = qr/5\.10\.\d+/;
 print STDERR "- Fuzzy source re: <$fuzzy_source>\n" if $debug;
 
 my @errors;
diff --git a/lang/perl5.14/files/use.perl b/lang/perl5.14/files/use.perl
index 55b7f51ed148..a75ac2641a65 100644
--- a/lang/perl5.14/files/use.perl
+++ b/lang/perl5.14/files/use.perl
@@ -17,41 +17,20 @@ else
     	osreldate=${OSVERSION}
 fi
 
-if [ "x$this" = "xuse.perl" ]; then
-	PKG_PREFIX="%%PREFIX%%"
-	if [ "$1" = "port" ] ; then
-		need_remove_links=yes
-		need_create_links=yes
-		need_cleanup_make_conf=yes
-		need_cleanup_manpath=yes
-		need_spam_make_conf=yes
-		need_spam_manpath=yes
-	elif [ "$1" = "system" ] ; then
-		need_remove_links=yes
-		need_cleanup_make_conf=yes
-		need_cleanup_manpath=yes
-	else
-		echo "Usage:
-	${0##*/} port       -> /usr/bin/perl is the perl5 port
-	${0##*/} system     -> /usr/bin/perl is the system perl"
-		exit 2;
-	fi
+if [ "$2" = "POST-INSTALL" ] ; then
+	need_remove_links=yes
+	need_create_links=yes
+	need_cleanup_make_conf=yes
+	need_cleanup_manpath=yes
+	need_spam_make_conf=yes
+	need_spam_manpath=yes
+	need_post_install=yes
+elif [ "$2" = "POST-DEINSTALL" ] ; then
+	need_remove_links=yes
+	need_cleanup_make_conf=yes
+	need_cleanup_manpath=yes
 else
-	if [ "$2" = "POST-INSTALL" ] ; then
-		need_remove_links=yes
-		need_create_links=yes
-		need_cleanup_make_conf=yes
-		need_cleanup_manpath=yes
-		need_spam_make_conf=yes
-		need_spam_manpath=yes
-		need_post_install=yes
-	elif [ "$2" = "POST-DEINSTALL" ] ; then
-		need_remove_links=yes
-		need_cleanup_make_conf=yes
-		need_cleanup_manpath=yes
-	else
-		exit 0;
-	fi
+	exit 0;
 fi
 
 special_link_list="