perl 5.002_01: [patch re-organisation and introduction]

This is my patch _01 to perl 5.002.

The bulk of this patch consists of VMS and OS/2 updates, and the
conversion to use EMBED as the default when building Perl.  It
also includes miscellaneous bugfixes, corrections to the pods,
and minor additions, notably the new $^E and $^O variables.

[editor's note: the changes between this and the perl-5.002_01 tag are
the individual changes in the patch set]

7 files changed, 0 insertions, 1017 deletions

diff --git a/os2/diff.Makefile b/os2/diff.Makefile
deleted file mode 100644
index fdce070977..0000000000
--- a/os2/diff.Makefile
+++ /dev/null
@@ -1,415 +0,0 @@
-*** Makefile.SH.orig	Fri Feb 02 16:38:32 1996
---- Makefile.SH	Sat Feb 03 14:40:28 1996
-***************
-*** 31,43 ****
-       *[0-9]) plibsuf=.$so.$patchlevel;;
-       *)	    plibsuf=.$so;;
-      esac
-      case "$shrpdir" in
-       /usr/lib)	;;
-       "")	;;
-       *)		shrpenv="env LD_RUN_PATH=$shrpdir";;
-      esac
-      pldlflags="$cccdlflags";;
-! *)  plibsuf=.a
-      pldlflags="";;
-  esac
-  
---- 31,44 ----
-       *[0-9]) plibsuf=.$so.$patchlevel;;
-       *)	    plibsuf=.$so;;
-      esac
-+     if test "x$plibext" != "x" ; then  plibsuf=$plibext d_shrplib=custom ; fi
-      case "$shrpdir" in
-       /usr/lib)	;;
-       "")	;;
-       *)		shrpenv="env LD_RUN_PATH=$shrpdir";;
-      esac
-      pldlflags="$cccdlflags";;
-! *)  plibsuf=$lib_ext
-      pldlflags="";;
-  esac
-  
-***************
-*** 53,59 ****
-  static_ai_list=' '
-  for f in $static_ext; do
-  	base=`echo "$f" | sed 's/.*\///'`
-! 	static_list="$static_list lib/auto/$f/$base.a"
-  	if test -f ext/$f/AutoInit.c; then
-  	    static_ai_list="$static_ai_list ext/$f/AutoInit.c"
-  	fi
---- 54,60 ----
-  static_ai_list=' '
-  for f in $static_ext; do
-  	base=`echo "$f" | sed 's/.*\///'`
-! 	static_list="$static_list lib/auto/$f/$base\$(LIB_EXT)"
-  	if test -f ext/$f/AutoInit.c; then
-  	    static_ai_list="$static_ai_list ext/$f/AutoInit.c"
-  	fi
-***************
-*** 115,122 ****
-  static_ext = $static_list
-  ext = \$(dynamic_ext) \$(static_ext)
-  static_ext_autoinit = $static_ai_list
-! DYNALOADER = lib/auto/DynaLoader/DynaLoader.a
-! 
-  
-  libs = $libs $cryptlib
-  
---- 116,122 ----
-  static_ext = $static_list
-  ext = \$(dynamic_ext) \$(static_ext)
-  static_ext_autoinit = $static_ai_list
-! DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
-  
-  libs = $libs $cryptlib
-  
-***************
-*** 140,145 ****
---- 140,147 ----
-  # Any special object files needed by this architecture, e.g. os2/os2.obj
-  ARCHOBJS = $archobjs
-  
-+ .SUFFIXES: .c \$(OBJ_EXT)
-+ 
-  !GROK!THIS!
-  
-  ## In the following dollars and backticks do not need the extra backslash.
-***************
-*** 178,188 ****
-  
-  c = $(c1) $(c2) $(c3) miniperlmain.c perlmain.c
-  
-! obj1 = $(mallocobj) gv.o toke.o perly.o op.o regcomp.o dump.o util.o mg.o
-! obj2 = hv.o av.o run.o pp_hot.o sv.o pp.o scope.o pp_ctl.o pp_sys.o
-! obj3 = doop.o doio.o regexec.o taint.o deb.o globals.o
-! 
-! 
-  obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
-  
-  # Once perl has been Configure'd and built ok you build different
---- 180,189 ----
-  
-  c = $(c1) $(c2) $(c3) miniperlmain.c perlmain.c
-  
-! obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT)
-! obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT)
-! obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) globals$(OBJ_EXT)
-!   
-  obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
-  
-  # Once perl has been Configure'd and built ok you build different
-***************
-*** 201,207 ****
-  # grrr
-  SHELL = /bin/sh
-  
-! .c.o:
-  	$(CCCMD) $(PLDLFLAGS) $*.c
-  
-  all: makefile miniperl $(private) $(plextract) $(public) $(dynamic_ext)
---- 202,208 ----
-  # grrr
-  SHELL = /bin/sh
-  
-! .c$(OBJ_EXT):
-  	$(CCCMD) $(PLDLFLAGS) $*.c
-  
-  all: makefile miniperl $(private) $(plextract) $(public) $(dynamic_ext)
-***************
-*** 230,247 ****
-  # build problems but that's not obvious to the novice.
-  # The Module used here must not depend on Config or any extensions.
-  
-! miniperl: $& miniperlmain.o $(perllib)
-! 	$(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain.o $(perllib) $(libs)
-  	@./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
-  
-! miniperlmain.o: miniperlmain.c
-  	$(CCCMD) $(PLDLFLAGS) $*.c
-  
-  perlmain.c: miniperlmain.c config.sh makefile $(static_ext_autoinit)
-  	sh writemain $(DYNALOADER) $(static_ext) > tmp
-  	sh mv-if-diff tmp perlmain.c
-  
-! perlmain.o: perlmain.c
-  	$(CCCMD) $(PLDLFLAGS) $*.c
-  
-  # The file ext.libs is a list of libraries that must be linked in
---- 231,248 ----
-  # build problems but that's not obvious to the novice.
-  # The Module used here must not depend on Config or any extensions.
-  
-! miniperl: $& miniperlmain$(OBJ_EXT) $(perllib)
-! 	$(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(perllib) $(libs)
-  	@./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
-  
-! miniperlmain$(OBJ_EXT): miniperlmain.c
-  	$(CCCMD) $(PLDLFLAGS) $*.c
-  
-  perlmain.c: miniperlmain.c config.sh makefile $(static_ext_autoinit)
-  	sh writemain $(DYNALOADER) $(static_ext) > tmp
-  	sh mv-if-diff tmp perlmain.c
-  
-! perlmain$(OBJ_EXT): perlmain.c
-  	$(CCCMD) $(PLDLFLAGS) $*.c
-  
-  # The file ext.libs is a list of libraries that must be linked in
-***************
-*** 250,277 ****
-  ext.libs: $(static_ext)
-  	-@test -f ext.libs || touch ext.libs
-  
-! perl: $& perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs
-! 	$(SHRPENV) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs)
-  
-! pureperl: $& perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs
-! 	purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs)
-  
-! quantperl: $& perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs
-! 	quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs)
-  
-! $(perllib): $& perl.o $(obj)
-  !NO!SUBS!
-  
-  case "$d_shrplib" in
-  *define*)
-  $spitshell >>Makefile <<'!NO!SUBS!'
-! 	$(LD) $(LDDLFLAGS) -o $@ perl.o $(obj)
-  !NO!SUBS!
-  ;;
-  *)
-  $spitshell >>Makefile <<'!NO!SUBS!'
-  	rm -f $(perllib)
-! 	$(AR) rcu $(perllib) perl.o $(obj)
-  	@$(ranlib) $(perllib)
-  !NO!SUBS!
-  ;;
---- 251,290 ----
-  ext.libs: $(static_ext)
-  	-@test -f ext.libs || touch ext.libs
-  
-! perl: $& perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) ext.libs
-! 	$(SHRPENV) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs)
-  
-! pureperl: $& perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) ext.libs
-! 	purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs)
-  
-! quantperl: $& perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) ext.libs
-! 	quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs)
-  
-! $(perllib): $& perl$(OBJ_EXT) $(obj)
-  !NO!SUBS!
-  
-  case "$d_shrplib" in
-  *define*)
-  $spitshell >>Makefile <<'!NO!SUBS!'
-! 	$(LD) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj)
-  !NO!SUBS!
-  ;;
-+ custom)
-+ if test -r $osname/Makefile.SHs ; then 
-+   . $osname/Makefile.SHs
-+   $spitshell >>Makefile <<!GROK!THIS!
-+ 
-+ Makefile: $osname/Makefile.SHs
-+ 
-+ !GROK!THIS!
-+ else
-+   echo "Could not find $osname/Makefile.SH! Skipping target \$(perllib) in Makefile!"
-+ fi
-+ ;;
-  *)
-  $spitshell >>Makefile <<'!NO!SUBS!'
-  	rm -f $(perllib)
-! 	$(AR) rcu $(perllib) perl$(OBJ_EXT) $(obj)
-  	@$(ranlib) $(perllib)
-  !NO!SUBS!
-  ;;
-***************
-*** 284,293 ****
-  # checks as well as the special code to validate that the script in question
-  # has been invoked correctly.
-  
-! suidperl: $& sperl.o perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs
-! 	$(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain.o sperl.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs)
-  
-! sperl.o: perl.c perly.h patchlevel.h $(h)
-  	$(RMS) sperl.c
-  	$(LNS) perl.c sperl.c
-  	$(CCCMD) -DIAMSUID sperl.c
---- 297,306 ----
-  # checks as well as the special code to validate that the script in question
-  # has been invoked correctly.
-  
-! suidperl: $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) ext.libs
-! 	$(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs)
-  
-! sperl$(OBJ_EXT): perl.c perly.h patchlevel.h $(h)
-  	$(RMS) sperl.c
-  	$(LNS) perl.c sperl.c
-  	$(CCCMD) -DIAMSUID sperl.c
-***************
-*** 297,303 ****
-  #	test -d lib/auto || mkdir lib/auto
-  #
-  preplibrary: miniperl lib/Config.pm $(plextract)
-! 	@./makedir lib/auto
-  	@echo "	AutoSplitting perl library"
-  	@./miniperl -Ilib -e 'use AutoSplit; \
-  		autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm
---- 310,316 ----
-  #	test -d lib/auto || mkdir lib/auto
-  #
-  preplibrary: miniperl lib/Config.pm $(plextract)
-! 	@sh ./makedir lib/auto
-  	@echo "	AutoSplitting perl library"
-  	@./miniperl -Ilib -e 'use AutoSplit; \
-  		autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm
-***************
-*** 315,328 ****
-  
-  install: all install.perl install.man
-  
-! install.perl:	all
-  	./perl installperl
-  
-! install.man:	all
-  	./perl installman
-  
-  # Not implemented yet.
-! #install.html:	all
-  #	./perl installhtml
-  
-  # I now supply perly.c with the kits, so the following section is
---- 328,341 ----
-  
-  install: all install.perl install.man
-  
-! install.perl:	all installperl
-  	./perl installperl
-  
-! install.man:	all installman
-  	./perl installman
-  
-  # Not implemented yet.
-! #install.html:	all installhtml
-  #	./perl installhtml
-  
-  # I now supply perly.c with the kits, so the following section is
-***************
-*** 382,389 ****
-  	@sh ext/util/make_ext static $@ LIBPERL_A=$(perllib)
-  
-  clean:
-! 	rm -f *.o *.a all perlmain.c
-  	rm -f perl.exp ext.libs
-  	-cd pod; $(MAKE) clean
-  	-cd utils; $(MAKE) clean
-  	-cd x2p; $(MAKE) clean
---- 395,403 ----
-  	@sh ext/util/make_ext static $@ LIBPERL_A=$(perllib)
-  
-  clean:
-! 	rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c
-  	rm -f perl.exp ext.libs
-+ 	-rm perl.export perl.dll perl.libexp perl.map perl.def
-  	-cd pod; $(MAKE) clean
-  	-cd utils; $(MAKE) clean
-  	-cd x2p; $(MAKE) clean
-***************
-*** 402,408 ****
-  	done
-  	rm -f *.orig */*.orig *~ */*~ core t/core t/c t/perl
-  	rm -rf $(addedbyconf)
-! 	rm -f makefile makefile.old
-  	rm -f $(private)
-  	rm -rf lib/auto
-  	rm -f lib/.exists
---- 416,422 ----
-  	done
-  	rm -f *.orig */*.orig *~ */*~ core t/core t/c t/perl
-  	rm -rf $(addedbyconf)
-! 	rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
-  	rm -f $(private)
-  	rm -rf lib/auto
-  	rm -f lib/.exists
-***************
-*** 423,447 ****
-  lint: perly.c $(c)
-  	lint $(lintflags) $(defs) perly.c $(c) > perl.fuzz
-  
-! makefile:	Makefile
-! 	$(MAKE) depend
-  
-  config.h: config.sh
-  	/bin/sh config_h.SH
-  
-  # When done, touch perlmain.c so that it doesn't get remade each time.
-  depend: makedepend
-! 	./makedepend
-  	- test -s perlmain.c && touch perlmain.c
-  	cd x2p; $(MAKE) depend
-  
-  test: miniperl perl preplibrary $(dynamic_ext)
-  	- cd t && chmod +x TEST */*.t
-! 	- cd t && (rm -f perl; $(LNS) ../perl perl) && ./perl TEST </dev/tty
-  
-  minitest: miniperl
-  	- cd t && chmod +x TEST */*.t
-! 	- cd t && (rm -f perl; $(LNS) ../miniperl perl) \
-  		&& ./perl TEST base/*.t comp/*.t cmd/*.t io/*.t op/*.t </dev/tty
-  
-  clist:	$(c)
---- 437,469 ----
-  lint: perly.c $(c)
-  	lint $(lintflags) $(defs) perly.c $(c) > perl.fuzz
-  
-! # Need to unset during recursion to go out of loop
-! 
-! MAKEDEPEND = makedepend
-! 
-! $(FIRSTMAKEFILE):	Makefile $(MAKEDEPEND)
-! 	$(MAKE) depend MAKEDEPEND=
-  
-  config.h: config.sh
-  	/bin/sh config_h.SH
-  
-  # When done, touch perlmain.c so that it doesn't get remade each time.
-  depend: makedepend
-! 	sh ./makedepend
-  	- test -s perlmain.c && touch perlmain.c
-  	cd x2p; $(MAKE) depend
-  
-+ # Cannot postpone this until $firstmakefile is ready ;-)
-+ makedepend: makedepend.SH config.sh
-+ 	sh ./makedepend.SH
-+ 
-  test: miniperl perl preplibrary $(dynamic_ext)
-  	- cd t && chmod +x TEST */*.t
-! 	- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT)) && ./perl TEST </dev/tty
-  
-  minitest: miniperl
-  	- cd t && chmod +x TEST */*.t
-! 	- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
-  		&& ./perl TEST base/*.t comp/*.t cmd/*.t io/*.t op/*.t </dev/tty
-  
-  clist:	$(c)
-***************
-*** 464,470 ****
-  case `pwd` in
-  *SH)
-      $rm -f ../Makefile
-!     ln Makefile ../Makefile
-      ;;
-  esac
-! rm -f makefile
---- 486,492 ----
-  case `pwd` in
-  *SH)
-      $rm -f ../Makefile
-!     $ln Makefile ../Makefile
-      ;;
-  esac
-! $rm -f $firstmakefile
diff --git a/os2/diff.c2ph b/os2/diff.c2ph
deleted file mode 100644
index a3fb6c625f..0000000000
--- a/os2/diff.c2ph
+++ /dev/null
@@ -1,19 +0,0 @@
-*** c2ph.PL~	Mon Nov 20 09:36:16 1995
---- utils/c2ph.PL	Thu Dec 07 15:24:10 1995
-***************
-*** 1180,1184 ****
-  close OUT or die "Can't close $file: $!";
-  chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
-  unlink 'pstruct';
-! link c2ph, pstruct;
-  exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
---- 1180,1188 ----
-  close OUT or die "Can't close $file: $!";
-  chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
-  unlink 'pstruct';
-! if (defined $Config{d_link}) {
-!   link 'c2ph', 'pstruct';
-! } else {
-!   system $Config{cp}, 'c2ph', 'pstruct';
-! }
-  exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
diff --git a/os2/diff.installman b/os2/diff.installman
deleted file mode 100644
index 036cf908bf..0000000000
--- a/os2/diff.installman
+++ /dev/null
@@ -1,76 +0,0 @@
-*** installman.orig	Thu Jun 22 10:42:40 1995
---- installman	Thu Nov 02 04:07:38 1995
-***************
-*** 6,11 ****
---- 6,12 ----
-  require Cwd;
-  
-  umask 022;
-+ $ENV{SHELL} = 'sh' if $Config{osname} eq 'os2';
-  
-  $ver = $];
-  $release = substr($ver,0,3);   # Not used presently.
-***************
-*** 38,48 ****
-  
-  #Sanity checks
-  
-! -x  "./perl"	|| warn "./perl not found!  Have you run make?\n";
-  -d  $Config{'installprivlib'}
-  	|| warn "Perl library directory $Config{'installprivlib'} not found.
-  		Have you run make install?.  (Installing anyway.)\n";
-! -x 't/TEST'		|| warn "WARNING: You've never run 'make test'!!!",
-  	"  (Installing anyway.)\n";
-  
-  # Install the main pod pages.
---- 39,50 ----
-  
-  #Sanity checks
-  
-! -x  "./perl$Config{exe_ext}" 
-!   or warn "./perl$Config{exe_ext} not found!  Have you run make?\n";
-  -d  $Config{'installprivlib'}
-  	|| warn "Perl library directory $Config{'installprivlib'} not found.
-  		Have you run make install?.  (Installing anyway.)\n";
-! -x "t/perl$Config{exe_ext}"		|| warn "WARNING: You've never run 'make test'!!!",
-  	"  (Installing anyway.)\n";
-  
-  # Install the main pod pages.
-***************
-*** 66,72 ****
-      # are enhancements or changes from previous installed versions.
-      # The error message doesn't include the '..' because the user
-      # won't be aware that we've chdir to $poddir.
-!     -x  "../pod/pod2man" || die "Executable pod/pod2man not found.\n";
-  
-      # We want to be sure to use the current perl.  We can't rely on
-      # the installed perl because it might not be actually installed
---- 68,74 ----
-      # are enhancements or changes from previous installed versions.
-      # The error message doesn't include the '..' because the user
-      # won't be aware that we've chdir to $poddir.
-!     -r  "../pod/pod2man" || die "Executable pod/pod2man not found.\n";
-  
-      # We want to be sure to use the current perl.  We can't rely on
-      # the installed perl because it might not be actually installed
-***************
-*** 86,92 ****
-  	# Convert name from  File/Basename.pm to File::Basename.3 format,
-  	# if necessary.
-  	$manpage =~ s#\.p(m|od)$##;
-! 	$manpage =~ s#/#::#g;
-  	$manpage = "${mandir}/${manpage}.${manext}";
-  	# Print $release $patchlevel stuff?  or should pod2man do that?
-  	&cmd("$pod2man $mod > $manpage");
---- 88,98 ----
-  	# Convert name from  File/Basename.pm to File::Basename.3 format,
-  	# if necessary.
-  	$manpage =~ s#\.p(m|od)$##;
-! 	if ($Config{osname} eq "os2") {
-! 	  $manpage =~ s#/#.#g;
-! 	} else {
-! 	  $manpage =~ s#/#::#g;
-! 	}
-  	$manpage = "${mandir}/${manpage}.${manext}";
-  	# Print $release $patchlevel stuff?  or should pod2man do that?
-  	&cmd("$pod2man $mod > $manpage");
diff --git a/os2/diff.installperl b/os2/diff.installperl
deleted file mode 100644
index 710ee918b3..0000000000
--- a/os2/diff.installperl
+++ /dev/null
@@ -1,228 +0,0 @@
-*** installperl.orig	Mon Nov 20 09:55:08 1995
---- installperl	Wed Nov 22 02:29:34 1995
-***************
-*** 4,9 ****
---- 4,10 ----
-  use Config;
-  
-  $mainperldir = "/usr/bin";
-+ $exe_ext = $Config{exe_ext};
-  
-  while (@ARGV) {
-      $nonono = 1 if $ARGV[0] eq '-n';
-***************
-*** 61,68 ****
-  -w $installbin		|| die "$installbin is not writable by you\n"
-  	unless $installbin =~ m#^/afs/# || $nonono;
-  
-! -x 'perl'		|| die "perl isn't executable!\n";
-! -x 'suidperl'		|| die "suidperl isn't executable!\n" if $d_dosuid;
-  
-  -x 't/TEST'		|| warn "WARNING: You've never run 'make test'!!!",
-  	"  (Installing anyway.)\n";
---- 62,69 ----
-  -w $installbin		|| die "$installbin is not writable by you\n"
-  	unless $installbin =~ m#^/afs/# || $nonono;
-  
-! -x 'perl' . $exe_ext	|| die "perl isn't executable!\n";
-! -x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
-  
-  -x 't/TEST'		|| warn "WARNING: You've never run 'make test'!!!",
-  	"  (Installing anyway.)\n";
-***************
-*** 80,92 ****
-  
-  # First we install the version-numbered executables.
-  
-! &safe_unlink("$installbin/perl$ver");
-! &cmd("cp perl $installbin/perl$ver");
-  
-! &safe_unlink("$installbin/sperl$ver");
-  if ($d_dosuid) {
-!     &cmd("cp suidperl $installbin/sperl$ver");
-!     &chmod(04711, "$installbin/sperl$ver");
-  }
-  
-  exit 0 if $versiononly;
---- 81,93 ----
-  
-  # First we install the version-numbered executables.
-  
-! &safe_unlink("$installbin/perl$ver$exe_ext");
-! &cmd("cp perl$exe_ext $installbin/perl$ver$exe_ext");
-  
-! &safe_unlink("$installbin/sperl$ver$exe_ext");
-  if ($d_dosuid) {
-!     &cmd("cp suidperl$exe_ext $installbin/sperl$ver$exe_ext");
-!     &chmod(04711, "$installbin/sperl$ver$exe_ext");
-  }
-  
-  exit 0 if $versiononly;
-***************
-*** 94,108 ****
-  # Make links to ordinary names if installbin directory isn't current directory.
-  
-  if (! &samepath($installbin, '.')) {
-!     &safe_unlink("$installbin/perl", "$installbin/suidperl");
-!     &link("$installbin/perl$ver", "$installbin/perl");
-!     &link("$installbin/sperl$ver", "$installbin/suidperl") if $d_dosuid;
-  }
-  
-  if (! &samepath($installbin, 'x2p')) {
-!     &safe_unlink("$installbin/a2p");
-!     &cmd("cp x2p/a2p $installbin/a2p");
-!     &chmod(0755, "$installbin/a2p");
-  }
-  
-  # Install scripts.
---- 95,110 ----
-  # Make links to ordinary names if installbin directory isn't current directory.
-  
-  if (! &samepath($installbin, '.')) {
-!     &safe_unlink("$installbin/perl$exe_ext", "$installbin/suidperl$exe_ext");
-!     &link("$installbin/perl$ver$exe_ext", "$installbin/perl$exe_ext");
-!     &link("$installbin/sperl$ver$exe_ext", "$installbin/suidperl$exe_ext") 
-!       if $d_dosuid;
-  }
-  
-  if (! &samepath($installbin, 'x2p')) {
-!     &safe_unlink("$installbin/a2p$exe_ext");
-!     &cmd("cp x2p/a2p$exe_ext $installbin/a2p$exe_ext");
-!     &chmod(0755, "$installbin/a2p$exe_ext");
-  }
-  
-  # Install scripts.
-***************
-*** 188,201 ****
-  if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) {
-      # First make sure $mainperldir/perl is not already the same as
-      # the perl we just installed
-!     if (-x "$mainperldir/perl") {
-  	# Try to be clever about mainperl being a symbolic link
-  	# to binexp/perl if binexp and installbin are different.
-  	$mainperl_is_instperl =
-! 	    &samepath("$mainperldir/perl", "$installbin/perl") ||
-  	     (($binexp ne $installbin) &&
-! 	      (-l "$mainperldir/perl") &&
-! 	      ((readlink "$mainperldir/perl") eq "$binexp/perl"));
-      }
-      if ((! $mainperl_is_instperl) &&
-  	(&yn("Many scripts expect perl to be installed as " .
---- 190,203 ----
-  if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) {
-      # First make sure $mainperldir/perl is not already the same as
-      # the perl we just installed
-!     if (-x "$mainperldir/perl$exe_ext") {
-  	# Try to be clever about mainperl being a symbolic link
-  	# to binexp/perl if binexp and installbin are different.
-  	$mainperl_is_instperl =
-! 	    &samepath("$mainperldir/perl$exe_ext", "$installbin/perl$exe_ext") ||
-  	     (($binexp ne $installbin) &&
-! 	      (-l "$mainperldir/perl$exe_ext") &&
-! 	      ((readlink "$mainperldir/perl$exe_ext") eq "$binexp/perl$exe_ext"));
-      }
-      if ((! $mainperl_is_instperl) &&
-  	(&yn("Many scripts expect perl to be installed as " .
-***************
-*** 203,212 ****
-  	     "Do you wish to have $mainperldir/perl be the same as\n" .
-  	     "$binexp/perl? [y] ")))
-      {	
-! 	unlink("$mainperldir/perl");
-! 	eval 'link("$installbin/perl", "$mainperldir/perl")' ||
-! 	eval 'symlink("$binexp/perl", "$mainperldir/perl")' ||
-! 	&cmd("cp $installbin/perl $mainperldir");
-  	$mainperl_is_instperl = 1;
-      }
-  }
---- 205,214 ----
-  	     "Do you wish to have $mainperldir/perl be the same as\n" .
-  	     "$binexp/perl? [y] ")))
-      {	
-! 	unlink("$mainperldir/perl$exe_ext");
-! 	eval 'link("$installbin/perl$exe_ext", "$mainperldir/perl$exe_ext")' ||
-! 	eval 'symlink("$binexp/perl$exe_ext", "$mainperldir/perl$exe_ext")' ||
-! 	&cmd("cp $installbin/perl$exe_ext $mainperldir$exe_ext");
-  	$mainperl_is_instperl = 1;
-      }
-  }
-***************
-*** 217,223 ****
-  # Also skip $mainperl if the user opted to have it be a link to the
-  # installed perl.
-  
-! @path = split(/:/, $ENV{"PATH"});
-  @otherperls = ();
-  for (@path) {
-      next unless m,^/,;
---- 219,227 ----
-  # Also skip $mainperl if the user opted to have it be a link to the
-  # installed perl.
-  
-! $dirsep = ($osname =~ m:^os/?2$:i) ? ';' : ':' ;
-! ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
-! @path = split(/$dirsep/, $path);
-  @otherperls = ();
-  for (@path) {
-      next unless m,^/,;
-***************
-*** 225,231 ****
-      # Use &samepath here because some systems have other dirs linked
-      # to $mainperldir (like SunOS)
-      next if ($mainperl_is_instperl && &samepath($_, $mainperldir));
-!     push(@otherperls, "$_/perl") if (-x "$_/perl" && ! -d "$_/perl");
-  }
-  if (@otherperls) {
-      print STDERR "\nWarning: perl appears in your path in the following " .
---- 229,236 ----
-      # Use &samepath here because some systems have other dirs linked
-      # to $mainperldir (like SunOS)
-      next if ($mainperl_is_instperl && &samepath($_, $mainperldir));
-!     push(@otherperls, "$_/perl$exe_ext")
-!       if (-x "$_/perl$exe_ext" && ! -d "$_/perl$exe_ext");
-  }
-  if (@otherperls) {
-      print STDERR "\nWarning: perl appears in your path in the following " .
-***************
-*** 258,263 ****
---- 263,269 ----
-      foreach $name (@names) {
-  	next unless -e $name;
-  	print STDERR "  unlink $name\n";
-+ 	chmod 0777, $name if $osname =~ m:^os/?2$:i ;
-  	unlink($name) || warn "Couldn't unlink $name: $!\n" unless $nonono;
-      }
-  }
-***************
-*** 269,274 ****
---- 275,281 ----
-  	next unless -e $name;
-  	print STDERR "  unlink $name\n";
-  	next if $nonono;
-+ 	chmod 0777, $name if $osname =~ m:^os/?2$:i ;
-  	next if unlink($name);
-  	warn "Couldn't unlink $name: $!\n";
-  	if ($! =~ /busy/i) {
-***************
-*** 304,310 ****
-      local($from,$to) = @_;
-  
-      print STDERR "  ln $from $to\n";
-!     link($from,$to) || warn "Couldn't link $from to $to: $!\n" unless $nonono;
-  }
-  
-  sub chmod {
---- 311,323 ----
-      local($from,$to) = @_;
-  
-      print STDERR "  ln $from $to\n";
-!     eval {
-!       link($from,$to) || warn "Couldn't link $from to $to: $!\n" unless $nonono;
-!     };
-!     if ($@) {
-!       system( $cp, $from, $to )
-! 	&& warn "Couldn't copy $from to $to: $!\n" unless $nonono;
-!     }
-  }
-  
-  sub chmod {
diff --git a/os2/diff.mkdep b/os2/diff.mkdep
deleted file mode 100644
index 86d3e0c0a2..0000000000
--- a/os2/diff.mkdep
+++ /dev/null
@@ -1,131 +0,0 @@
-*** makedepend.SH.orig	Wed Aug 30 19:55:44 1995
---- makedepend.SH	Sun Nov 26 14:59:34 1995
-***************
-*** 53,69 ****
-  $cat /dev/null >.deptmp
-  $rm -f *.c.c c/*.c.c
-  if test -f Makefile; then
-!     cp Makefile makefile
-  fi
-! mf=makefile
-  if test -f $mf; then
-      defrule=`<$mf sed -n		\
-! 	-e '/^\.c\.o:.*;/{'		\
-  	-e    's/\$\*\.c//'		\
-  	-e    's/^[^;]*;[	 ]*//p'	\
-  	-e    q				\
-  	-e '}'				\
-! 	-e '/^\.c\.o: *$/{'		\
-  	-e    N				\
-  	-e    's/\$\*\.c//'		\
-  	-e    's/^.*\n[	 ]*//p'		\
---- 53,69 ----
-  $cat /dev/null >.deptmp
-  $rm -f *.c.c c/*.c.c
-  if test -f Makefile; then
-!     cp Makefile $firstmakefile
-  fi
-! mf=$firstmakefile
-  if test -f $mf; then
-      defrule=`<$mf sed -n		\
-! 	-e '/^\.c\(\$(OBJ_EXT)\|\.o\):.*;/{'	\
-  	-e    's/\$\*\.c//'		\
-  	-e    's/^[^;]*;[	 ]*//p'	\
-  	-e    q				\
-  	-e '}'				\
-! 	-e '/^\.c\(\$(OBJ_EXT)\|\.o\): *$/{'	\
-  	-e    N				\
-  	-e    's/\$\*\.c//'		\
-  	-e    's/^.*\n[	 ]*//p'		\
-***************
-*** 91,97 ****
-      */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
-      *)   finc= ;;
-      esac
-!     $echo "Finding dependencies for $filebase.o."
-      ( $echo "#line 1 \"$file\""; \
-        $sed -n <$file \
-  	-e "/^${filebase}_init(/q" \
---- 91,97 ----
-      */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
-      *)   finc= ;;
-      esac
-!     $echo "Finding dependencies for $filebase$obj_ext."
-      ( $echo "#line 1 \"$file\""; \
-        $sed -n <$file \
-  	-e "/^${filebase}_init(/q" \
-***************
-*** 107,114 ****
-  	-e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
-  	-e 's/^[	 ]*#[	 ]*line/#/' \
-  	-e '/^# *[0-9][0-9]* *[".\/]/!d' \
-! 	-e 's/^.*"\(.*\)".*$/'$filebase'.o: \1/' \
-! 	-e 's/^# *[0-9][0-9]* \(.*\)$/'$filebase'.o: \1/' \
-  	-e 's|: \./|: |' \
-  	-e 's|\.c\.c|.c|' | \
-      $uniq | $sort | $uniq >> .deptmp
---- 107,114 ----
-  	-e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
-  	-e 's/^[	 ]*#[	 ]*line/#/' \
-  	-e '/^# *[0-9][0-9]* *[".\/]/!d' \
-! 	-e 's/^.*"\(.*\)".*$/'$filebase'\$(OBJ_EXT): \1/' \
-! 	-e 's/^# *[0-9][0-9]* \(.*\)$/'$filebase'\$(OBJ_EXT): \1/' \
-  	-e 's|: \./|: |' \
-  	-e 's|\.c\.c|.c|' | \
-      $uniq | $sort | $uniq >> .deptmp
-***************
-*** 118,123 ****
---- 118,130 ----
-  
-  $MAKE shlist || ($echo "Searching for .SH files..."; \
-  	$echo *.SH | $tr ' ' '\012' | $egrep -v '\*' >.shlist)
-+ 
-+ # Now extract the dependency on makedepend.SH
-+ # (it should reside in the main Makefile):
-+ mv .shlist .shlist.old
-+ $egrep -v '^makedepend\.SH' <.shlist.old >.shlist
-+ rm .shlist.old
-+ 
-  if $test -s .deptmp; then
-      for file in `cat .shlist`; do
-  	$echo `$expr X$file : 'X\(.*\).SH'`: $file $TOP/config.sh \; \
-***************
-*** 126,132 ****
-      $echo "Updating $mf..."
-      $echo "# If this runs make out of memory, delete /usr/include lines." \
-  	>> $mf.new
-!     $sed 's|^\(.*\.o:\) *\(.*/.*\.c\) *$|\1 \2; '"$defrule \2|" .deptmp \
-         >>$mf.new
-  else
-      $MAKE hlist || ($echo "Searching for .h files..."; \
---- 133,139 ----
-      $echo "Updating $mf..."
-      $echo "# If this runs make out of memory, delete /usr/include lines." \
-  	>> $mf.new
-!     $sed 's|^\(.*\(\$(OBJ_EXT)\|\.o\):\) *\(.*/.*\.c\) *$|\1 \3; '"$defrule \2|" .deptmp \
-         >>$mf.new
-  else
-      $MAKE hlist || ($echo "Searching for .h files..."; \
-***************
-*** 136,145 ****
-      $echo "Updating $mf..."
-      <.clist $sed -n							\
-  	-e '/\//{'							\
-! 	-e   's|^\(.*\)/\(.*\)\.c|\2.o: \1/\2.c; '"$defrule \1/\2.c|p"	\
-  	-e   d								\
-  	-e '}'								\
-! 	-e 's|^\(.*\)\.c|\1.o: \1.c|p' >> $mf.new
-      <.hlist $sed -n 's|\(.*/\)\(.*\)|s= \2= \1\2=|p' >.hsed
-      <.deptmp $sed -n 's|c:#include "\(.*\)".*$|o: \1|p' | \
-         $sed 's|^[^;]*/||' | \
---- 143,152 ----
-      $echo "Updating $mf..."
-      <.clist $sed -n							\
-  	-e '/\//{'							\
-! 	-e   's|^\(.*\)/\(.*\)\.c|\2\$(OBJ_EXT): \1/\2.c; '"$defrule \1/\2.c|p"	\
-  	-e   d								\
-  	-e '}'								\
-! 	-e 's|^\(.*\)\.c|\1\$(OBJ_EXT): \1.c|p' >> $mf.new
-      <.hlist $sed -n 's|\(.*/\)\(.*\)|s= \2= \1\2=|p' >.hsed
-      <.deptmp $sed -n 's|c:#include "\(.*\)".*$|o: \1|p' | \
-         $sed 's|^[^;]*/||' | \
diff --git a/os2/diff.rest b/os2/diff.rest
deleted file mode 100644
index 7c44334da3..0000000000
--- a/os2/diff.rest
+++ /dev/null
@@ -1,12 +0,0 @@
-*** t/TEST~	Tue Nov 14 08:22:08 1995
---- t/TEST	Wed Nov 22 02:04:22 1995
-***************
-*** 31,36 ****
---- 31,37 ----
-  	last;
-      }
-  }
-+ $sharpbang = 0 if $ENV{OS2_SHELL};		# OS/2
-  $bad = 0;
-  $good = 0;
-  $total = @ARGV;
diff --git a/os2/diff.x2pMakefile b/os2/diff.x2pMakefile
deleted file mode 100644
index 46fdedb8d2..0000000000
--- a/os2/diff.x2pMakefile
+++ /dev/null
@@ -1,136 +0,0 @@
-*** x2p/Makefile.SH.orig	Sun Nov 19 20:17:38 1995
---- x2p/Makefile.SH	Wed Nov 22 20:18:08 1995
-***************
-*** 34,39 ****
---- 34,52 ----
-  shellflags = $shellflags
-  
-  libs = $libs
-+ 
-+ # These variables will be used in a future version to make
-+ # the make file more portable to non-unix systems.
-+ AR = $ar
-+ EXE_EXT = $exe_ext
-+ LIB_EXT = $lib_ext
-+ OBJ_EXT = $obj_ext
-+ PATH_SEP = $path_sep
-+ 
-+ FIRSTMAKEFILE = $firstmakefile
-+ 
-+ .SUFFIXES: .c \$(OBJ_EXT)
-+ 
-  !GROK!THIS!
-  
-  cat >>Makefile <<'!NO!SUBS!'
-***************
-*** 60,80 ****
-  
-  c = hash.c $(mallocsrc) str.c util.c walk.c
-  
-! obj = hash.o $(mallocobj) str.o util.o walk.o
-  
-  lintflags = -phbvxac
-  
-  # grrr
-  SHELL = /bin/sh
-  
-! .c.o:
-  	$(CCCMD) $*.c
-  
-  all: $(public) $(private) $(util)
-  	touch all
-  
-! a2p: $(obj) a2p.o
-! 	$(CC) $(LDFLAGS) $(obj) a2p.o $(libs) -o a2p
-  
-  # I now supply a2p.c with the kits, so the following section is
-  # used only if you force byacc to run by saying
---- 73,93 ----
-  
-  c = hash.c $(mallocsrc) str.c util.c walk.c
-  
-! obj = hash$(OBJ_EXT) $(mallocobj) str$(OBJ_EXT) util$(OBJ_EXT) walk$(OBJ_EXT)
-  
-  lintflags = -phbvxac
-  
-  # grrr
-  SHELL = /bin/sh
-  
-! .c$(OBJ_EXT):
-  	$(CCCMD) $*.c
-  
-  all: $(public) $(private) $(util)
-  	touch all
-  
-! a2p: $(obj) a2p$(OBJ_EXT)
-! 	$(CC) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs) -o a2p
-  
-  # I now supply a2p.c with the kits, so the following section is
-  # used only if you force byacc to run by saying
-***************
-*** 90,104 ****
-  a2p.c: a2p.y
-  	-@touch a2p.c
-  
-! a2p.o: a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h handy.h ../config.h str.h hash.h
-  	$(CCCMD) $(LARGE) a2p.c
-  
-  clean:
-! 	rm -f a2p *.o
-  
-  realclean: clean
-  	rm -f *.orig core $(addedbyconf) all malloc.c
-! 	rm -f makefile makefile.old
-  
-  # The following lint has practically everything turned on.  Unfortunately,
-  # you have to wade through a lot of mumbo jumbo that can't be suppressed.
---- 103,117 ----
-  a2p.c: a2p.y
-  	-@touch a2p.c
-  
-! a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h handy.h ../config.h str.h hash.h
-  	$(CCCMD) $(LARGE) a2p.c
-  
-  clean:
-! 	rm -f a2p *$(OBJ_EXT)
-  
-  realclean: clean
-  	rm -f *.orig core $(addedbyconf) all malloc.c
-! 	rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
-  
-  # The following lint has practically everything turned on.  Unfortunately,
-  # you have to wade through a lot of mumbo jumbo that can't be suppressed.
-***************
-*** 109,115 ****
-  	lint $(lintflags) $(defs) $(c) > a2p.fuzz
-  
-  depend: $(mallocsrc) ../makedepend
-! 	../makedepend
-  
-  clist:
-  	echo $(c) | tr ' ' '\012' >.clist
---- 122,128 ----
-  	lint $(lintflags) $(defs) $(c) > a2p.fuzz
-  
-  depend: $(mallocsrc) ../makedepend
-! 	sh ../makedepend
-  
-  clist:
-  	echo $(c) | tr ' ' '\012' >.clist
-***************
-*** 140,146 ****
-  case `pwd` in
-  *SH)
-      $rm -f ../Makefile
-!     ln Makefile ../Makefile
-      ;;
-  esac
-! rm -f makefile
---- 153,159 ----
-  case `pwd` in
-  *SH)
-      $rm -f ../Makefile
-!     $ln Makefile ../Makefile
-      ;;
-  esac
-! rm -f $firstmakefile