bump patchlevel to 68, Porting/makerel tweaks

p4raw-id: //depot/perl@1203

diff --git a/Porting/makerel b/Porting/makerel
index 5a7cd8b..cdaa00c 100644 (file)
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -52,9 +52,9 @@ if ("@$missentry" =~ m/\.orig\b/) {
 die "Aborted.\n" if @$missentry or @$missfile;
 print "\n";
 
-
-print "Updating VMS version specific files with $vms_vers...\n";
-system("perl -pi -e 's/^\QPERL_VERSION = \E\d\_\d+(\s*\#)/PERL_VERSION = $vms_vers$1/' vms/descrip.mms");
+# VMS no longer has hardcoded version numbers descrip.mms
+#print "Updating VMS version specific files with $vms_vers...\n";
+#system("perl -pi -e 's/^\QPERL_VERSION = \E\d\_\d+(\s*\#)/PERL_VERSION = $vms_vers$1/' vms/descrip.mms");
 
 
 print "Setting file permissions...\n";

diff --git a/patchlevel.h b/patchlevel.h
index 52866bb..a5d7580 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1,6 +1,6 @@
 #ifndef __PATCHLEVEL_H_INCLUDED__
 #define PATCHLEVEL 4
-#define SUBVERSION 67
+#define SUBVERSION 68
 
 /*
        local_patches -- list of locally applied less-than-subversion patches.

diff --git a/win32/Makefile b/win32/Makefile
index 89ec4de..045834d 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -25,7 +25,7 @@ INST_TOP      = $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER       = \5.00467
+INST_VER       = \5.00468
 
 #
 # uncomment to enable threads-capabilities

diff --git a/win32/config_H.bc b/win32/config_H.bc
index 35388fa..febd4ba 100644 (file)
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -34,8 +34,8 @@
  *     This symbol is the filename expanded version of the BIN symbol, for
  *     programs that do not want to deal with that at run-time.
  */
-#define BIN "c:\\perl\\5.00467\\bin\\MSWin32-x86"      /**/
-#define BIN_EXP "c:\\perl\\5.00467\\bin\\MSWin32-x86"  /**/
+#define BIN "c:\\perl\\5.00468\\bin\\MSWin32-x86"      /**/
+#define BIN_EXP "c:\\perl\\5.00468\\bin\\MSWin32-x86"  /**/
 
 /* CPPSTDIN:
  *     This symbol contains the first part of the string which will invoke
@@ -1463,7 +1463,7 @@
  *     This symbol contains the ~name expanded version of ARCHLIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.00467\\lib\\MSWin32-x86"          /**/
+#define ARCHLIB "c:\\perl\\5.00468\\lib\\MSWin32-x86"          /**/
 /*#define ARCHLIB_EXP ""       /**/
 
 /* CAT2:
@@ -1765,8 +1765,8 @@
  *     This symbol contains the ~name expanded version of PRIVLIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "c:\\perl\\5.00467\\lib"               /**/
-#define PRIVLIB_EXP (win32_get_privlib("5.00467"))     /**/
+#define PRIVLIB "c:\\perl\\5.00468\\lib"               /**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00468"))     /**/
 
 /* SIG_NAME:
  *     This symbol contains a list of signal names in order of
@@ -1812,7 +1812,7 @@
  *     This symbol contains the ~name expanded version of SITEARCH, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.00467\\lib\\MSWin32-x86"           /**/
+#define SITEARCH "c:\\perl\\site\\5.00468\\lib\\MSWin32-x86"           /**/
 /*#define SITEARCH_EXP ""      /**/
 
 /* SITELIB:
@@ -1828,8 +1828,8 @@
  *     This symbol contains the ~name expanded version of SITELIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITELIB "c:\\perl\\site\\5.00467\\lib"         /**/
-#define SITELIB_EXP (win32_get_sitelib("5.00467"))     /**/
+#define SITELIB "c:\\perl\\site\\5.00468\\lib"         /**/
+#define SITELIB_EXP (win32_get_sitelib("5.00468"))     /**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *     This symbol, if defined, indicates that we need to prepend an

diff --git a/win32/config_H.gc b/win32/config_H.gc
index 6b11014..cfe0091 100644 (file)
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -34,8 +34,8 @@
  *     This symbol is the filename expanded version of the BIN symbol, for
  *     programs that do not want to deal with that at run-time.
  */
-#define BIN "c:\\perl\\5.00467\\bin\\MSWin32-x86"      /**/
-#define BIN_EXP "c:\\perl\\5.00467\\bin\\MSWin32-x86"  /**/
+#define BIN "c:\\perl\\5.00468\\bin\\MSWin32-x86"      /**/
+#define BIN_EXP "c:\\perl\\5.00468\\bin\\MSWin32-x86"  /**/
 
 /* CPPSTDIN:
  *     This symbol contains the first part of the string which will invoke
@@ -1463,7 +1463,7 @@
  *     This symbol contains the ~name expanded version of ARCHLIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.00467\\lib\\MSWin32-x86"          /**/
+#define ARCHLIB "c:\\perl\\5.00468\\lib\\MSWin32-x86"          /**/
 /*#define ARCHLIB_EXP ""       /**/
 
 /* CAT2:
@@ -1765,8 +1765,8 @@
  *     This symbol contains the ~name expanded version of PRIVLIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "c:\\perl\\5.00467\\lib"               /**/
-#define PRIVLIB_EXP (win32_get_privlib("5.00467"))     /**/
+#define PRIVLIB "c:\\perl\\5.00468\\lib"               /**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00468"))     /**/
 
 /* SIG_NAME:
  *     This symbol contains a list of signal names in order of
@@ -1812,7 +1812,7 @@
  *     This symbol contains the ~name expanded version of SITEARCH, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.00467\\lib\\MSWin32-x86"           /**/
+#define SITEARCH "c:\\perl\\site\\5.00468\\lib\\MSWin32-x86"           /**/
 /*#define SITEARCH_EXP ""      /**/
 
 /* SITELIB:
@@ -1828,8 +1828,8 @@
  *     This symbol contains the ~name expanded version of SITELIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITELIB "c:\\perl\\site\\5.00467\\lib"         /**/
-#define SITELIB_EXP (win32_get_sitelib("5.00467"))     /**/
+#define SITELIB "c:\\perl\\site\\5.00468\\lib"         /**/
+#define SITELIB_EXP (win32_get_sitelib("5.00468"))     /**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *     This symbol, if defined, indicates that we need to prepend an

diff --git a/win32/config_H.vc b/win32/config_H.vc
index 05e98e5..dd293fa 100644 (file)
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -34,8 +34,8 @@
  *     This symbol is the filename expanded version of the BIN symbol, for
  *     programs that do not want to deal with that at run-time.
  */
-#define BIN "c:\\perl\\5.00467\\bin\\MSWin32-x86"      /**/
-#define BIN_EXP "c:\\perl\\5.00467\\bin\\MSWin32-x86"  /**/
+#define BIN "c:\\perl\\5.00468\\bin\\MSWin32-x86"      /**/
+#define BIN_EXP "c:\\perl\\5.00468\\bin\\MSWin32-x86"  /**/
 
 /* CPPSTDIN:
  *     This symbol contains the first part of the string which will invoke
@@ -1463,7 +1463,7 @@
  *     This symbol contains the ~name expanded version of ARCHLIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.00467\\lib\\MSWin32-x86"          /**/
+#define ARCHLIB "c:\\perl\\5.00468\\lib\\MSWin32-x86"          /**/
 /*#define ARCHLIB_EXP ""       /**/
 
 /* CAT2:
@@ -1765,8 +1765,8 @@
  *     This symbol contains the ~name expanded version of PRIVLIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "c:\\perl\\5.00467\\lib"               /**/
-#define PRIVLIB_EXP (win32_get_privlib("5.00467"))     /**/
+#define PRIVLIB "c:\\perl\\5.00468\\lib"               /**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00468"))     /**/
 
 /* SIG_NAME:
  *     This symbol contains a list of signal names in order of
@@ -1812,7 +1812,7 @@
  *     This symbol contains the ~name expanded version of SITEARCH, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.00467\\lib\\MSWin32-x86"           /**/
+#define SITEARCH "c:\\perl\\site\\5.00468\\lib\\MSWin32-x86"           /**/
 /*#define SITEARCH_EXP ""      /**/
 
 /* SITELIB:
@@ -1828,8 +1828,8 @@
  *     This symbol contains the ~name expanded version of SITELIB, to be used
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITELIB "c:\\perl\\site\\5.00467\\lib"         /**/
-#define SITELIB_EXP (win32_get_sitelib("5.00467"))     /**/
+#define SITELIB "c:\\perl\\site\\5.00468\\lib"         /**/
+#define SITELIB_EXP (win32_get_sitelib("5.00468"))     /**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *     This symbol, if defined, indicates that we need to prepend an

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 80d8546..e99e80e 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -29,7 +29,7 @@ INST_TOP      *= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER       *= \5.00467
+INST_VER       *= \5.00468
 
 #
 # uncomment to enable threads-capabilities