[inseparable changes from match from perl-5.003_92 to perl-5.003_93]

 BUILD PROCESS

Subject: Fix for Unisys UNIX and libperl.so
Date: Thu, 6 Mar 97 16:28 GMT0
From: Alan Burlison <aburlison@cix.compulink.co.uk>
Files: Configure
Msg-ID: memo.147328@cix.compulink.co.uk

    (applied based on p5p patch as commit 2f525a329506abe067c4ec9d4c7ae13d8b223081)

Subject: Allow './Configure -Uoptimize'
Date: Thu, 06 Mar 1997 11:15:47 -0500 (EST)
From: Andy Dougherty <doughera@fractal.phys.lafayette.edu>
Files: Configure
Msg-ID: Pine.SOL.3.95q.970306110532.11070A-100000@fractal.lafayette.

    (applied based on p5p patch as commit 59ae47780c168857b216412f8354d10ae6dd0b61)

Subject: Use 'test -f', not 'test -x'
Date: Fri, 7 Mar 1997 19:53:00 -0500
From: Spider Boardman <spider@web.zk3.dec.com>
Files: Configure
Msg-ID: 199703080053.TAA13943@web.zk3.dec.com

    (applied based on p5p patch as commit 64b4562546c4e74f87c21f65a76ec05e96a1b74f)

 CORE LANGUAGE CHANGES

Subject: Don't autovivify array and hash elements in sub parameters
Date: Thu, 06 Mar 1997 14:12:09 -0500
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Files: op.c pod/perldelta.pod pod/perlsub.pod pod/perltrap.pod
Msg-ID: 199703061912.OAA20606@aatma.engin.umich.edu

    (applied based on p5p patch as commit 0ffc6623ceb5acc7b954e8cdbaeb8ba319474d7b)

Subject: Support READ and GETC for tied handles
Date: Sat, 08 Mar 1997 19:19:38 -0500
From: Doug MacEachern <dougm@opengroup.org>
Files: pod/perldelta.pod pod/perltie.pod pp_sys.c t/op/misc.t
Msg-ID: 199703090019.TAA32591@postman.osf.org

    (applied based on p5p patch as commit b06b64f805517c26cbd7c4d2f74efd5f36b4692c)

Subject: Warn on C<@x =~ /a/> and C<%x =~ s/a/b/>
From: Chip Salzenberg <chip@perl.com>
Files: op.c pod/perldiag.pod

 CORE PORTABILITY

Subject: VMS update
Date: Fri, 07 Mar 1997 22:49:46 -0500 (EST)
From: Charles Bailey <bailey@HMIVAX.HUMGEN.UPENN.EDU>
Files: lib/ExtUtils/MM_VMS.pm vms/descrip.mms vms/gen_shrfls.pl vms/sockadapt.h

    private-msgid: 01IG8KN5R28M00661G@hmivax.humgen.upenn.edu

 DOCUMENTATION

Subject: Consolidated INSTALL updates since _92
Date: Sat, 08 Mar 1997 13:21:22 -0500 (EST)
From: Andy Dougherty <doughera@fractal.phys.lafayette.edu>
Files: 
Msg-ID: Pine.SOL.3.95q.970308131806.23766F-100000@fractal.lafayette.

    (applied based on p5p patch as commit e6834c60cd85866fc530e8b4bb831af6186bad4d)

Subject: PODs corrections
Date: Fri, 7 Mar 1997 21:53:04 -0500 (EST)
From: Ilya Zakharevich <ilya@math.ohio-state.edu>
Files: ext/DB_File/DB_File.pm ext/Socket/Socket.pm lib/Class/Template.pm lib/ExtUtils/Embed.pm lib/ExtUtils/MM_VMS.pm lib/ExtUtils/Mksymlists.pm lib/File/Basename.pm lib/File/stat.pm lib/Time/gmtime.pm lib/Time/localtime.pm lib/Time/tm.pm lib/User/grent.pm lib/User/pwent.pm pod/perlcall.pod pod/perldebug.pod pod/perlfunc.pod pod/perlguts.pod pod/perllocale.pod pod/perlop.pod pod/perlsub.pod
Msg-ID: 199703080253.VAA24975@monk.mps.ohio-state.edu

    (applied based on p5p patch as commit 72451f4af0d31f24ef5b12bc5d034e3e8b35d43d)

 OTHER CORE CHANGES

Subject: Fix imbalanced ENTER/LEAVE from C<BEGIN{die}>
From: Chip Salzenberg <chip@perl.com>
Files: op.c perl.c proto.h

Subject: perl -P path patch
Date: Sat, 08 Mar 1997 12:45:08 -0500 (EST)
From: Andy Dougherty <doughera@fractal.phys.lafayette.edu>
Files: config_H config_h.SH perl.c plan9/config.plan9 t/comp/cpp.t vms/config.vms win32/config.H
Msg-ID: Pine.SOL.3.95q.970308120242.23766D-100000@fractal.lafayette.

    (applied based on p5p patch as commit bba014945c609b5474f61f5e82ed2ff3e83a6e47)

4 files changed, 35 insertions, 18 deletions

diff --git a/vms/config.vms b/vms/config.vms
index 03051da43d..040895d957 100644
--- a/vms/config.vms
+++ b/vms/config.vms
@@ -76,7 +76,7 @@
  * when Perl is built.  Please do not change it by hand; make
  * any changes to FndVers.Com instead.
  */
-#define ARCHLIB_EXP "/perl_root/lib/VMS_VAX/5_00392"  /**/
+#define ARCHLIB_EXP "/perl_root/lib/VMS_VAX/5_00393"  /**/
 #define ARCHLIB ARCHLIB_EXP	/*config-skip*/
 
 /* ARCHNAME:
@@ -979,7 +979,12 @@
  *	This symbol holds the path of the bin directory where the package will
  *	be installed. Program must be prepared to deal with ~name substitution.
  */
+/* BIN_EXP:
+ *	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 "/perl_root/000000"	/**/
+#define BIN_EXP "/perl_root/000000"	/**/
 
 /* HAS_ALARM:
  *	This symbol, if defined, indicates that the alarm routine is
@@ -1466,14 +1471,6 @@
 #define SITEARCH_EXP "/perl_root/lib/site_perl/VMS_VAX"  /**/
 #define SITEARCH SITEARCH_EXP  /*config-skip*/
 
-/* SCRIPTDIR:
- *	This symbol holds the name of the directory in which the user wants
- *	to put publicly executable scripts for the package in question.  It
- *	is often a directory that is mounted across diverse architectures.
- *	Programs must be prepared to deal with ~name expansion.
- */
-#define SCRIPTDIR "/perl_root/script"	/**/
-
 /* Size_t:
  *	This symbol holds the type used to declare length parameters
  *	for string functions.  It is usually size_t, but may be
diff --git a/vms/descrip.mms b/vms/descrip.mms
index 184271c14c..c22dcdea16 100644
--- a/vms/descrip.mms
+++ b/vms/descrip.mms
@@ -65,7 +65,7 @@ OBJVAL = $(MMS$TARGET_NAME)$(O)
 .endif
 
 # Updated by fndvers.com -- do not edit by hand
-PERL_VERSION = 5_00392#
+PERL_VERSION = 5_00393#
 
 
 ARCHDIR =  [.lib.$(ARCH).$(PERL_VERSION)]
@@ -85,10 +85,11 @@ PIPES_BROKEN = 1
 	@ @[.vms]fndvers.com "" "" "[.vms]descrip.mms"
 	@ If F$TrnLnm("Sys").eqs."" Then Define/NoLog SYS GNU_CC_Include:[VMS]
 CC = gcc
+PIPES_BROKEN = 1
 # -fno-builtin avoids bug in gcc up to version 2.6.2 which can destroy
 # data when memcpy() is called on large (>64 kB) blocks of memory
 # (fixed in gcc 2.6.3)
-XTRACCFLAGS = /Obj=$(MMS$TARGET_NAME)$(O)/NoCase_Hack/Optimize=2/CC1="""""-fno-builtin"""""
+XTRACCFLAGS = /Obj=$(MMS$TARGET_NAME)$(O)/NoCase_Hack/Optimize=2
 DBGSPECFLAGS =
 XTRADEF = ,GNUC_ATTRIBUTE_CHECK
 XTRAOBJS =
@@ -373,7 +374,7 @@ $(ARCHDIR)config.pm : [.lib]config.pm
 	$(XSUBPP) $(MMS$SOURCE) >$(MMS$TARGET)
 
 [.ext.dynaloader]dl_vms$(O) : [.ext.dynaloader]dl_vms.c
-	$(CC) $(CFLAGS) /Object=$(MMS$TARGET) $(MMS$SOURCE)
+	$(CC) $(CFLAGS) /Include=([],[.ext.dynaloader])/Object=$(MMS$TARGET) $(MMS$SOURCE)
 
 [.lib]DynaLoader.pm : [.ext.dynaloader]dynaloader.pm
 	Copy/Log/NoConfirm [.ext.dynaloader]dynaloader.pm [.lib]DynaLoader.pm
@@ -550,12 +551,28 @@ IO : [.lib]IO.pm [.lib.IO]File.pm [.lib.IO]Handle.pm [.lib.IO]Pipe.pm [.lib.IO]S
 	Link $(LINKFLAGS) /Exe=$(MMS$TARGET) $(MMS$SOURCE_LIST) $(CRTLOPTS)
 
 # Accomodate buggy cpp in some version of DECC, which chokes on illegal
-# filespec "y.tab.c"
+# filespec "y.tab.c", and broken gcc cpp, which doesn't start #include ""
+# search in same dir as source file
 [.x2p]a2p$(O) : [.x2p]a2p.c $(MINIPERL_EXE)
 	$(MINIPERL) -pe "s/^#line\s+(\d+)\s+\Q""y.tab.c""/#line $1 ""y_tab.c""/;" $(MMS$SOURCE) >$(MMS$TARGET_NAME)_vms.c
-	$(CC) $(CFLAGS) /Object=$(MMS$TARGET) $(MMS$TARGET_NAME)_vms.c
+	$(CC) $(CFLAGS) /Object=$(MMS$TARGET)/Include=([.x2p],[]) $(MMS$TARGET_NAME)_vms.c
 	Delete/Log/NoConfirm $(MMS$TARGET_NAME)_vms.c;
 
+# gcc cpp broken -- doesn't look in directory of source file for #include ""
+.ifdef GNUC
+[.x2p]hash$(O) : [.x2p]hash.c
+	$(CC) $(CFLAGS) /Include=[.x2p] $(MMS$SOURCE)
+
+[.x2p]str$(O) : [.x2p]str.c
+	$(CC) $(CFLAGS) /Include=[.x2p] $(MMS$SOURCE)
+
+[.x2p]util$(O) : [.x2p]util.c
+	$(CC) $(CFLAGS) /Include=[.x2p] $(MMS$SOURCE)
+
+[.x2p]walk$(O) : [.x2p]walk.c
+	$(CC) $(CFLAGS) /Include=[.x2p] $(MMS$SOURCE)
+.endif
+
 [.lib.pod]pod2html.com : [.pod]pod2html.PL $(ARCHDIR)Config.pm
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
 	$(MINIPERL) $(MMS$SOURCE)
@@ -1611,7 +1628,9 @@ globals$(O) : util.h
 [.x2p]str$(O) : [.x2p]str.h
 [.x2p]str$(O) : handy.h
 [.x2p]str$(O) : [.x2p]util.h
+.ifdef __MMK__
 [.x2p]util$(O) : [.x2p]util.c
+.endif
 [.x2p]util$(O) : [.x2p]EXTERN.h
 [.x2p]util$(O) : [.x2p]a2p.h
 [.x2p]util$(O) : [.x2p]hash.h
diff --git a/vms/gen_shrfls.pl b/vms/gen_shrfls.pl
index 48092ba360..cb4f7dd1f1 100644
--- a/vms/gen_shrfls.pl
+++ b/vms/gen_shrfls.pl
@@ -268,7 +268,7 @@ elsif ($isgcc) {
   # if DOINIT is #defined.  Bleah.  It's cheaper to just add
   # it by hand than to add /Define=DOINIT to the preprocessing
   # run and wade through all the extra junk.
-  $vars{'Error'}++;
+  $vars{"${embed}Error"}++;
 }
 
 # Eventually, we'll check against existing copies here, so we can add new
diff --git a/vms/sockadapt.h b/vms/sockadapt.h
index e104ca7f3c..d7f7cdc376 100644
--- a/vms/sockadapt.h
+++ b/vms/sockadapt.h
@@ -140,9 +140,6 @@ void endnetent();
 #include <in.h>
 #include <inet.h>
 #include <netdb.h>
-/* However, we don't have these two in the system headers. */
-void setnetent(int);
-void endnetent();
 
 /* SocketShr doesn't support these routines, but the DECC RTL contains
  * stubs with these names, designed to be used with the UCX socket
@@ -155,6 +152,10 @@ void endnetent();
 #define endnetent    no_endnetent
 #endif
 
+/* We don't have these two in the system headers. */
+void setnetent(int);
+void endnetent();
+
 #include <socketshr.h>
 /* socketshr.h from SocketShr 0.9D doesn't alias fileno; its comments say
  * that the CRTL version works OK.  This isn't the case, at least with