perl-5.6.0 + local changes

5 files changed, 15 insertions, 9 deletions

diff --git a/gnu/usr.bin/perl/plan9/config.plan9 b/gnu/usr.bin/perl/plan9/config.plan9
index b35f60a93a6..24b3075f71e 100644
--- a/gnu/usr.bin/perl/plan9/config.plan9
+++ b/gnu/usr.bin/perl/plan9/config.plan9
@@ -716,7 +716,7 @@
 /* HAS_SHMAT_PROTOTYPE:
  *	This symbol, if defined, indicates that the sys/shm.h includes
  *	a prototype for shmat().  Otherwise, it is up to the program to
- *	guess one.  Shmat_t shmat _((int, Shmat_t, int)) is a good guess,
+ *	guess one.  Shmat_t shmat (int, Shmat_t, int) is a good guess,
  *	but not always right so it should be emitted by the program only
  *	when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs.
  */
diff --git a/gnu/usr.bin/perl/plan9/genconfig.pl b/gnu/usr.bin/perl/plan9/genconfig.pl
index 458c4c3ee9b..d934659ec42 100644
--- a/gnu/usr.bin/perl/plan9/genconfig.pl
+++ b/gnu/usr.bin/perl/plan9/genconfig.pl
@@ -261,12 +261,18 @@ foreach (sort keys %val_vars) {
 
 if (open(PL,"${outdir}patchlevel.h")) {
   while (<PL>) {
-    if    (/^#define PATCHLEVEL\s+(\S+)/) { print OUT "PATCHLEVEL='$1'\n"; }
-    elsif (/^#define SUBVERSION\s+(\S+)/) { print OUT "SUBVERSION='$1'\n"; }
+    if    (/^#define PERL_VERSION\s+(\S+)/) {
+      print OUT "PERL_VERSION='$1'\n";
+      print OUT "PATCHLEVEL='$1'\n";		# XXX compat
+    }
+    elsif (/^#define PERL_SUBVERSION\s+(\S+)/) {
+      print OUT "PERL_SUBVERSION='$1'\n";
+      print OUT "SUBVERSION='$1'\n";		# XXX compat
+    }
   }
   close PL;
 }
-else { warn "Can't read ${outdir}patchlevel.h - skipping 'PATCHLEVEL'"; }
+else { warn "Can't read ${outdir}patchlevel.h - skipping 'PERL_VERSION'"; }
 
 print OUT "pager='/bin/p'\n";
 
diff --git a/gnu/usr.bin/perl/plan9/myconfig.plan9 b/gnu/usr.bin/perl/plan9/myconfig.plan9
index f336a7ce530..59512d5c9c0 100644
--- a/gnu/usr.bin/perl/plan9/myconfig.plan9
+++ b/gnu/usr.bin/perl/plan9/myconfig.plan9
@@ -15,7 +15,7 @@
 
 $spitshell<<!GROK!THIS!
 
-Summary of my $package ($baserev patchlevel $PATCHLEVEL) configuration:
+Summary of my $package ($baserev version $PERL_VERSION subversion $PERL_SUBVERSION) configuration:
   Platform:
     osname=$osname, osver=$osvers, archname=$archname
     uname='$myuname'
diff --git a/gnu/usr.bin/perl/plan9/plan9ish.h b/gnu/usr.bin/perl/plan9/plan9ish.h
index 06a30fee3a5..6fb59663f3a 100644
--- a/gnu/usr.bin/perl/plan9/plan9ish.h
+++ b/gnu/usr.bin/perl/plan9/plan9ish.h
@@ -54,7 +54,7 @@
 
 /* USEMYBINMODE
  *	This symbol, if defined, indicates that the program should
- *	use the routine my_binmode(FILE *fp, char iotype) to insure
+ *	use the routine my_binmode(FILE *fp, char iotype, int mode) to insure
  *	that a file is in "binary" mode -- that is, that no translation
  *	of bytes occurs on read or write operations.
  */
@@ -103,7 +103,7 @@
 #ifndef SIGILL
 #    define SIGILL 6         /* blech */
 #endif
-#define ABORT() kill(getpid(),SIGABRT);
+#define ABORT() kill(PerlProc_getpid(),SIGABRT);
 
 #define BIT_BUCKET "/dev/null"
 #define PERL_SYS_INIT(c,v)	MALLOC_INIT
diff --git a/gnu/usr.bin/perl/plan9/versnum b/gnu/usr.bin/perl/plan9/versnum
index 83e46826c34..6e579f30485 100644
--- a/gnu/usr.bin/perl/plan9/versnum
+++ b/gnu/usr.bin/perl/plan9/versnum
@@ -1,5 +1,5 @@
-/PATCHLEVEL/ {base = $3}
-/SUBVERSION/ {subvers = $3}
+/PERL_VERSION/ {base = $3}
+/PERL_SUBVERSION/ {subvers = $3}
 END {
 if (subvers == 0) 
 	printf "p9pvers = 5.%03d\n", base> "buildinfo";