Configure update

	Message-Id: <9807020307.AA17848@newton.phys.lafayette.edu>
	Subject: [PATCH 5.004_69] Config_69-01

p4raw-id: //depot/perl@1295

12 files changed, 725 insertions, 745 deletions

diff --git a/Configure b/Configure
index ffd7e08a0e..d7076767b6 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,8 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Tue Jun  9 14:56:54 EDT 1998 [metaconfig 3.0 PL70]
+# Generated on Wed Jul  1 12:16:14 EDT 1998 [metaconfig 3.0 PL70]
+# (with additional metaconfig patches by doughera@lafayette.edu)
 
 cat >/tmp/c1$$ <<EOF
 ARGGGHHHH!!!!!
@@ -138,16 +139,25 @@ true)
 	;;
 esac
 
+: if needed set CDPATH to a harmless value that is not chatty
+: avoid bash 2.02 problems with empty CDPATH.
+case "$CDPATH" in
+'')	;;
+*)	case "$SHELL" in
+	*bash*)	CDPATH='.' ;;
+	*)		CDPATH='' ;;
+	esac
+	;;
+esac
 : Configure runs within the UU subdirectory
 test -d UU || mkdir UU
-CDPATH='.'
 cd UU && rm -f ./*
 
 dynamic_ext=''
 extensions=''
 known_extensions=''
-static_ext=''
 nonxs_ext=''
+static_ext=''
 useopcode=''
 useposix=''
 d_bsd=''
@@ -376,7 +386,6 @@ d_memmove=''
 d_memset=''
 d_mkdir=''
 d_mkfifo=''
-d_mknod=''
 d_mktime=''
 d_msg=''
 d_msgctl=''
@@ -590,7 +599,6 @@ plibpth=''
 xlibpth=''
 libs=''
 lns=''
-devtype=''
 lseektype=''
 make_set_make=''
 d_mymalloc=''
@@ -635,8 +643,10 @@ ranlib=''
 package=''
 spackage=''
 pager=''
+apiversion=''
 patchlevel=''
 subversion=''
+version=''
 perladmin=''
 perlpath=''
 pidtype=''
@@ -789,9 +799,6 @@ plibpth=''
 
 : default library list
 libswanted=''
-: full support for void wanted by default
-defvoidused=15
-
 : Possible local include directories to search.
 : Set locincpth to "" in a hint file to defeat local include searches.
 locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
@@ -805,6 +812,9 @@ _exe=''
 : Extra object files, if any, needed on this platform.
 archobjs=''
 groupstype=''
+: full support for void wanted by default
+defvoidused=15
+
 : set useposix=false in your hint file to disable the POSIX extension.
 useposix=true
 : set useopcode=false in your hint file to disable the Opcode extension.
@@ -857,7 +867,7 @@ case "$sh" in
 $me:  Fatal Error:  I can't find a Bourne Shell anywhere.  
 
 Usually it's in /bin/sh.  How did you even get this far?
-Please contact me (Andy Dougherty) at doughera@lafcol.lafayette.edu and 
+Please contact me (Andy Dougherty) at doughera@lafayette.edu and 
 we'll try to straighten this all out.
 EOM
 	exit 1
@@ -1326,7 +1336,7 @@ THIS PACKAGE SEEMS TO BE INCOMPLETE.
 You have the option of continuing the configuration process, despite the
 distinct possibility that your kit is damaged, by typing 'y'es.  If you
 do, don't blame me if something goes wrong.  I advise you to type 'n'o
-and contact the author (doughera@lafcol.lafayette.edu).
+and contact the author (doughera@lafayette.edu).
 
 EOM
 		echo $n "Continue? [n] $c" >&4
@@ -1527,7 +1537,7 @@ Much effort has been expended to ensure that this shell script will run on any
 Unix system.  If despite that it blows up on yours, your best bet is to edit
 Configure and run it again.  If you can't run Configure for some reason,
 you'll have to generate a config.sh file by hand.  Whatever problems you
-have, let me (doughera@lafcol.lafayette.edu) know how I blew it.
+have, let me (doughera@lafayette.edu) know how I blew it.
 
 This installation script affects things in two ways:
 
@@ -1850,7 +1860,7 @@ EOM
 	(cd $src/hints; ls -C *.sh) | $sed 's/\.sh/   /g' >&4
 	dflt=''
 	: Half the following guesses are probably wrong... If you have better
-	: tests or hints, please send them to doughera@lafcol.lafayette.edu
+	: tests or hints, please send them to doughera@lafayette.edu
 	: The metaconfig authors would also appreciate a copy...
 	$test -f /irix && osname=irix
 	$test -f /xenix && osname=sco_xenix
@@ -1940,14 +1950,7 @@ EOM
 			osvers="$3" ;;
 		genix) osname=genix ;;
 		hp*) osname=hpux 
-			case "$3" in
-			*.08.*) osvers=9 ;;
-			*.09.*) osvers=9 ;;
-			*.10.*) osvers=10 ;;
-			*.11.*) osvers=11 ;;
-			*.12.*) osvers=12 ;;
-			*)	osvers="$3" ;;
-			esac
+			osvers=`echo "$3" | $sed 's,.*\.\([0-9]*\.[0-9]*\),\1,'`
 			;;
 		irix*) osname=irix
 			case "$3" in
@@ -2704,12 +2707,53 @@ prefixit='case "$3" in
 	esac;;
 esac'
 
+: set the base revision
+baserev=5.0
+
+: get the patchlevel
+echo " "
+echo "Getting the current patchlevel..." >&4
+if $test -r $rsrc/patchlevel.h;then
+	patchlevel=`awk '/define[ 	]+PATCHLEVEL/ {print $3}' $rsrc/patchlevel.h`
+	subversion=`awk '/define[ 	]+SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
+else
+	patchlevel=0
+	subversion=0
+fi
+$echo $n "(You have $package" $c
+case "$package" in
+"*$baserev")	;;
+*)		$echo $n " $baserev" $c ;;
+esac
+$echo $n " patchlevel $patchlevel" $c
+test 0 -eq "$subversion" || $echo $n " subversion $subversion" $c
+echo ".)"
+
+if test 0 -eq "$subversion"; then
+	version=`LC_ALL=C; export LC_ALL; \
+		 echo $baserev $patchlevel | \
+		 $awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
+else
+	version=`LC_ALL=C; export LC_ALL; \
+		 echo $baserev $patchlevel $subversion | \
+		 $awk '{ printf "%.5f\n", $1 + $2/1000.0 + $3/100000.0 }'`
+fi
+: Figure out perl API version.  Perhaps this should be in patchlevel.h
+if test "$subversion" -lt 50; then
+	apiversion=`LC_ALL=C; export LC_ALL; \
+		 echo $baserev $patchlevel | \
+		 $awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
+else
+	apiversion="$version"
+fi
+
 : determine where private library files go
-: Usual default is /usr/local/lib/perl5.  Also allow things like 
-: /opt/perl/lib, since /opt/perl/lib/perl5 would be redundant.
+: Usual default is /usr/local/lib/perl5/$version/share.
+: Also allow things like /opt/perl/lib/$version/share, since 
+: /opt/perl/lib/perl5... would be redundant.
 case "$prefix" in
-*perl*) set dflt privlib lib ;;
-*)	 set dflt privlib lib/$package ;;
+*perl*) set dflt privlib lib/$version/share ;;
+*)	 set dflt privlib lib/$package/$version/share ;;
 esac
 eval $prefixit
 $cat <<EOM
@@ -2746,28 +2790,6 @@ else
 	installprivlib="$privlibexp"
 fi
 
-: set the base revision
-baserev=5.0
-
-: get the patchlevel
-echo " "
-echo "Getting the current patchlevel..." >&4
-if $test -r $rsrc/patchlevel.h;then
-	patchlevel=`awk '/define[ 	]+PATCHLEVEL/ {print $3}' $rsrc/patchlevel.h`
-	subversion=`awk '/define[ 	]+SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
-else
-	patchlevel=0
-	subversion=0
-fi
-$echo $n "(You have $package" $c
-case "$package" in
-"*$baserev")	;;
-*)		$echo $n " $baserev" $c ;;
-esac
-$echo $n " patchlevel $patchlevel" $c
-test 0 -eq "$subversion" || $echo $n " subversion $subversion" $c
-echo ".)"
-
 : set the prefixup variable, to restore leading tilda escape
 prefixup='case "$prefixexp" in
 "$prefix") ;;
@@ -2777,28 +2799,14 @@ esac'
 : determine where public architecture dependent libraries go
 set archlib archlib
 eval $prefixit
+: privlib default is /usr/local/lib/$package/$version/share
+: archlib default is /usr/local/lib/$package/$version/$archname
+tdflt=`echo $privlib | $sed 's,/share$,,'`
+tdflt=$tdflt/$archname
 case "$archlib" in
-'')
-    case "$privlib" in
-    '')	dflt=`./loc . "." $prefixexp/lib /usr/local/lib /usr/lib /lib`
-	set dflt
-	eval $prefixup
+'')	dflt=$tdflt
 	;;
-    *)	if test 0 -eq "$subversion"; then
-	    version=`LC_ALL=C; export LC_ALL; \
-		     echo $baserev $patchlevel | \
-		     $awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
-	else
-	    version=`LC_ALL=C; export LC_ALL; \
-		     echo $baserev $patchlevel $subversion | \
-		     $awk '{ printf "%.5f\n", $1 + $2/1000.0 + $3/100000.0 }'`
-	fi
-	dflt="$privlib/$archname/$version"
-	;;
-    esac
-    ;;
-*)
-    dflt="$archlib"
+*)	dflt="$archlib"
     ;;
 esac
 cat <<EOM
@@ -3956,6 +3964,181 @@ n) echo "OK, that should do.";;
 esac
 $rm -f try try.* core
 
+: determine filename position in cpp output
+echo " "
+echo "Computing filename position in cpp output for #include directives..." >&4
+echo '#include <stdio.h>' > foo.c
+$cat >fieldn <<EOF
+$startsh
+$cppstdin $cppflags $cppminus <foo.c 2>/dev/null | \
+$grep '^[ 	]*#.*stdio\.h' | \
+while read cline; do
+	pos=1
+	set \$cline
+	while $test \$# -gt 0; do
+		if $test -r \`echo \$1 | $tr -d '"'\`; then
+			echo "\$pos"
+			exit 0
+		fi
+		shift
+		pos=\`expr \$pos + 1\`
+	done
+done
+EOF
+chmod +x fieldn
+fieldn=`./fieldn`
+$rm -f foo.c fieldn
+case $fieldn in
+'') pos='???';;
+1) pos=first;;
+2) pos=second;;
+3) pos=third;;
+*) pos="${fieldn}th";;
+esac
+echo "Your cpp writes the filename in the $pos field of the line."
+
+: locate header file
+$cat >findhdr <<EOF
+$startsh
+wanted=\$1
+name=''
+if test -f $usrinc/\$wanted; then
+	echo "$usrinc/\$wanted"
+	exit 0
+fi
+awkprg='{ print \$$fieldn }'
+echo "#include <\$wanted>" > foo\$\$.c
+$cppstdin $cppminus $cppflags < foo\$\$.c 2>/dev/null | \
+$grep "^[ 	]*#.*\$wanted" | \
+while read cline; do
+	name=\`echo \$cline | $awk "\$awkprg" | $tr -d '"'\`
+	case "\$name" in
+	*/\$wanted) echo "\$name"; exit 0;;
+	*) name='';;
+	esac;
+done;
+$rm -f foo\$\$.c;
+case "\$name" in
+'') exit 1;;
+esac
+EOF
+chmod +x findhdr
+
+: define an alternate in-header-list? function
+inhdr='echo " "; td=$define; tu=$undef; yyy=$@;
+cont=true; xxf="echo \"<\$1> found.\" >&4";
+case $# in 2) xxnf="echo \"<\$1> NOT found.\" >&4";;
+*) xxnf="echo \"<\$1> NOT found, ...\" >&4";;
+esac;
+case $# in 4) instead=instead;; *) instead="at last";; esac;
+while $test "$cont"; do
+	xxx=`./findhdr $1`
+	var=$2; eval "was=\$$2";
+	if $test "$xxx" && $test -r "$xxx";
+	then eval $xxf;
+	eval "case \"\$$var\" in $undef) . ./whoa; esac"; eval "$var=\$td";
+		cont="";
+	else eval $xxnf;
+	eval "case \"\$$var\" in $define) . ./whoa; esac"; eval "$var=\$tu"; fi;
+	set $yyy; shift; shift; yyy=$@;
+	case $# in 0) cont="";;
+	2) xxf="echo \"but I found <\$1> $instead.\" >&4";
+		xxnf="echo \"and I did not find <\$1> either.\" >&4";;
+	*) xxf="echo \"but I found <\$1\> instead.\" >&4";
+		xxnf="echo \"there is no <\$1>, ...\" >&4";;
+	esac;
+done;
+while $test "$yyy";
+do set $yyy; var=$2; eval "was=\$$2";
+	eval "case \"\$$var\" in $define) . ./whoa; esac"; eval "$var=\$tu";
+	set $yyy; shift; shift; yyy=$@;
+done'
+
+: see if this is a malloc.h system
+set malloc.h i_malloc
+eval $inhdr
+
+: see if stdlib is available
+set stdlib.h i_stdlib
+eval $inhdr
+
+: determine which malloc to compile in
+echo " "
+case "$usemymalloc" in
+''|y*|true)	dflt='y' ;;
+n*|false)	dflt='n' ;;
+*)	dflt="$usemymalloc" ;;
+esac
+rp="Do you wish to attempt to use the malloc that comes with $package?"
+. ./myread
+usemymalloc="$ans"
+case "$ans" in
+y*|true)
+	usemymalloc='y'
+	mallocsrc='malloc.c'
+	mallocobj="malloc$_o"
+	d_mymalloc="$define"
+	case "$libs" in
+	*-lmalloc*)
+		: Remove malloc from list of libraries to use
+		echo "Removing unneeded -lmalloc from library list" >&4
+		set `echo X $libs | $sed -e 's/-lmalloc / /' -e 's/-lmalloc$//'`
+		shift
+		libs="$*"
+		echo "libs = $libs" >&4
+		;;
+	esac
+	;;
+*)
+	usemymalloc='n'
+	mallocsrc=''
+	mallocobj=''
+	d_mymalloc="$undef"
+	;;
+esac
+
+: compute the return types of malloc and free
+echo " "
+$cat >malloc.c <<END
+#$i_malloc I_MALLOC
+#$i_stdlib I_STDLIB
+#include <stdio.h>
+#include <sys/types.h>
+#ifdef I_MALLOC
+#include <malloc.h>
+#endif
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+#ifdef TRY_MALLOC
+void *malloc();
+#endif
+#ifdef TRY_FREE
+void free();
+#endif
+END
+case "$malloctype" in
+'')
+	if $cc $ccflags -c -DTRY_MALLOC malloc.c >/dev/null 2>&1; then
+		malloctype='void *'
+	else
+		malloctype='char *'
+	fi
+	;;
+esac
+echo "Your system wants malloc to return '$malloctype', it would seem." >&4
+
+case "$freetype" in
+'')
+	if $cc $ccflags -c -DTRY_FREE malloc.c >/dev/null 2>&1; then
+		freetype='void'
+	else
+		freetype='int'
+	fi
+	;;
+esac
+echo "Your system uses $freetype free(), it would seem." >&4
+$rm -f malloc.[co]
 : Cruising for prototypes
 echo " "
 echo "Checking out function prototypes..." >&4
@@ -4432,96 +4615,6 @@ fi
 esac
 $rm -f libnames libpath
 
-: determine filename position in cpp output
-echo " "
-echo "Computing filename position in cpp output for #include directives..." >&4
-echo '#include <stdio.h>' > foo.c
-$cat >fieldn <<EOF
-$startsh
-$cppstdin $cppflags $cppminus <foo.c 2>/dev/null | \
-$grep '^[ 	]*#.*stdio\.h' | \
-while read cline; do
-	pos=1
-	set \$cline
-	while $test \$# -gt 0; do
-		if $test -r \`echo \$1 | $tr -d '"'\`; then
-			echo "\$pos"
-			exit 0
-		fi
-		shift
-		pos=\`expr \$pos + 1\`
-	done
-done
-EOF
-chmod +x fieldn
-fieldn=`./fieldn`
-$rm -f foo.c fieldn
-case $fieldn in
-'') pos='???';;
-1) pos=first;;
-2) pos=second;;
-3) pos=third;;
-*) pos="${fieldn}th";;
-esac
-echo "Your cpp writes the filename in the $pos field of the line."
-
-: locate header file
-$cat >findhdr <<EOF
-$startsh
-wanted=\$1
-name=''
-if test -f $usrinc/\$wanted; then
-	echo "$usrinc/\$wanted"
-	exit 0
-fi
-awkprg='{ print \$$fieldn }'
-echo "#include <\$wanted>" > foo\$\$.c
-$cppstdin $cppminus $cppflags < foo\$\$.c 2>/dev/null | \
-$grep "^[ 	]*#.*\$wanted" | \
-while read cline; do
-	name=\`echo \$cline | $awk "\$awkprg" | $tr -d '"'\`
-	case "\$name" in
-	*/\$wanted) echo "\$name"; exit 0;;
-	*) name='';;
-	esac;
-done;
-$rm -f foo\$\$.c;
-case "\$name" in
-'') exit 1;;
-esac
-EOF
-chmod +x findhdr
-
-: define an alternate in-header-list? function
-inhdr='echo " "; td=$define; tu=$undef; yyy=$@;
-cont=true; xxf="echo \"<\$1> found.\" >&4";
-case $# in 2) xxnf="echo \"<\$1> NOT found.\" >&4";;
-*) xxnf="echo \"<\$1> NOT found, ...\" >&4";;
-esac;
-case $# in 4) instead=instead;; *) instead="at last";; esac;
-while $test "$cont"; do
-	xxx=`./findhdr $1`
-	var=$2; eval "was=\$$2";
-	if $test "$xxx" && $test -r "$xxx";
-	then eval $xxf;
-	eval "case \"\$$var\" in $undef) . ./whoa; esac"; eval "$var=\$td";
-		cont="";
-	else eval $xxnf;
-	eval "case \"\$$var\" in $define) . ./whoa; esac"; eval "$var=\$tu"; fi;
-	set $yyy; shift; shift; yyy=$@;
-	case $# in 0) cont="";;
-	2) xxf="echo \"but I found <\$1> $instead.\" >&4";
-		xxnf="echo \"and I did not find <\$1> either.\" >&4";;
-	*) xxf="echo \"but I found <\$1\> instead.\" >&4";
-		xxnf="echo \"there is no <\$1>, ...\" >&4";;
-	esac;
-done;
-while $test "$yyy";
-do set $yyy; var=$2; eval "was=\$$2";
-	eval "case \"\$$var\" in $define) . ./whoa; esac"; eval "$var=\$tu";
-	set $yyy; shift; shift; yyy=$@;
-done'
-
 : see if dld is available
 set dld.h i_dld
 eval $inhdr
@@ -4685,6 +4778,7 @@ EOM
 			*)	dflt='-fpic' ;;
 		    esac ;;
 	    esac ;;
+	' ') dflt='none' ;;
     *)	dflt="$cccdlflags" ;;
     esac
     rp="Any special flags to pass to $cc -c to compile shared library modules?"
@@ -4758,21 +4852,21 @@ EOM
     *) dflt="$lddlflags" ;;
     esac
 
-: Try to guess additional flags to pick up local libraries.
-for thisflag in $ldflags; do
-	case "$thisflag" in
-	-L*)
-		case " $dflt " in
-		*" $thisflag "*) ;;
-		*) dflt="$dflt $thisflag" ;;
+	: Try to guess additional flags to pick up local libraries.
+	for thisflag in $ldflags; do
+		case "$thisflag" in
+		-L*)
+			case " $dflt " in
+			*" $thisflag "*) ;;
+			*) dflt="$dflt $thisflag" ;;
+			esac
+			;;
 		esac
-		;;
-	esac
-done
+	done
 
-case "$dflt" in
-'') dflt='none' ;;
-esac
+	case "$dflt" in
+	''|' ') dflt='none' ;;
+	esac
 
     rp="Any special flags to pass to $ld to create a dynamically loaded library?"
     . ./myread
@@ -4796,6 +4890,7 @@ EOM
 		sunos)	dflt='none' ;;
 		*)	dflt='none' ;;
 	    esac ;;
+    ' ')  dflt='none' ;;
     *)  dflt="$ccdlflags" ;;
     esac
     rp="Any special flags to pass to $cc to use dynamic loading?"
@@ -4952,7 +5047,7 @@ case "$shrpdir" in
 *)	$cat >&4 <<EOM
 WARNING:  Use of the shrpdir variable for the installation location of
 the shared $libperl is not supported.  It was never documented and
-will not work in this version.  Let me (doughera@lafcol.lafayette.edu)
+will not work in this version.  Let me (doughera@lafayette.edu)
 know of any problems this may cause.
 
 EOM
@@ -5686,14 +5781,13 @@ else
 fi
 
 : determine where site specific libraries go.
-set sitelib sitelib
-eval $prefixit
-case "$sitelib" in
-'')
-	prog=`echo $package | $sed 's/-*[0-9.]*$//'`
-	dflt="$privlib/site_$prog" ;;
-*)	dflt="$sitelib" ;;
+: Usual default is /usr/local/lib/perl5/site_perl/$apiversion/share
+prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+case "$prefix" in
+*perl*) set dflt sitelib lib/site_$prog/$apiversion/share ;;
+*)	 set dflt sitelib lib/$package/site_$prog/$apiversion/share ;;
 esac
+eval $prefixit
 $cat <<EOM
 
 The installation process will also create a directory for
@@ -5732,12 +5826,14 @@ else
 fi
 
 : determine where site specific architecture-dependent libraries go.
-xxx=`echo $sitelib/$archname | sed 's!^$prefix!!'`
-: xxx is usuually lib/site_perl/archname.
+: sitelib  default is /usr/local/lib/perl5/site_perl/$apiversion/share
+: sitearch default is /usr/local/lib/perl5/site_perl/$apiversion/$archname
+tdflt=`echo $sitelib | $sed 's,/share$,,'`
+tdflt="$tdflt/$archname"
 set sitearch sitearch none
 eval $prefixit
 case "$sitearch" in
-'')	dflt="$sitelib/$archname" ;;
+'')	dflt="$tdflt" ;;
 *)	dflt="$sitearch" ;;
 esac
 $cat <<EOM
@@ -7399,10 +7495,6 @@ eval $inlibc
 set mkfifo d_mkfifo
 eval $inlibc
 
-: see if mknod exists
-set mknod d_mknod
-eval $inlibc
-
 : see if mktime exists
 set mktime d_mktime
 eval $inlibc
@@ -7440,91 +7532,6 @@ fi
 set d_msg
 eval $setvar
 
-: see if this is a malloc.h system
-set malloc.h i_malloc
-eval $inhdr
-
-: see if stdlib is available
-set stdlib.h i_stdlib
-eval $inhdr
-
-: determine which malloc to compile in
-echo " "
-case "$usemymalloc" in
-''|y*|true)	dflt='y' ;;
-n*|false)	dflt='n' ;;
-*)	dflt="$usemymalloc" ;;
-esac
-rp="Do you wish to attempt to use the malloc that comes with $package?"
-. ./myread
-usemymalloc="$ans"
-case "$ans" in
-y*|true)
-	usemymalloc='y'
-	mallocsrc='malloc.c'
-	mallocobj="malloc$_o"
-	d_mymalloc="$define"
-	case "$libs" in
-	*-lmalloc*)
-		: Remove malloc from list of libraries to use
-		echo "Removing unneeded -lmalloc from library list" >&4
-		set `echo X $libs | $sed -e 's/-lmalloc / /' -e 's/-lmalloc$//'`
-		shift
-		libs="$*"
-		echo "libs = $libs" >&4
-		;;
-	esac
-	;;
-*)
-	usemymalloc='n'
-	mallocsrc=''
-	mallocobj=''
-	d_mymalloc="$undef"
-	;;
-esac
-
-: compute the return types of malloc and free
-echo " "
-$cat >malloc.c <<END
-#$i_malloc I_MALLOC
-#$i_stdlib I_STDLIB
-#include <stdio.h>
-#include <sys/types.h>
-#ifdef I_MALLOC
-#include <malloc.h>
-#endif
-#ifdef I_STDLIB
-#include <stdlib.h>
-#endif
-#ifdef TRY_MALLOC
-void *malloc();
-#endif
-#ifdef TRY_FREE
-void free();
-#endif
-END
-case "$malloctype" in
-'')
-	if $cc $ccflags -c -DTRY_MALLOC malloc.c >/dev/null 2>&1; then
-		malloctype='void *'
-	else
-		malloctype='char *'
-	fi
-	;;
-esac
-echo "Your system wants malloc to return '$malloctype', it would seem." >&4
-
-case "$freetype" in
-'')
-	if $cc $ccflags -c -DTRY_FREE malloc.c >/dev/null 2>&1; then
-		freetype='void'
-	else
-		freetype='int'
-	fi
-	;;
-esac
-echo "Your system uses $freetype free(), it would seem." >&4
-$rm -f malloc.[co]
 : see if nice exists
 set nice d_nice
 eval $inlibc
@@ -8884,6 +8891,10 @@ eval $inhdr
 set sys/ndir.h i_sysndir
 eval $inhdr
 
+: see if sys/types.h has to be included
+set sys/types.h i_systypes
+eval $inhdr
+
 : see if closedir exists
 set closedir d_closedir
 eval $inlibc
@@ -8896,7 +8907,11 @@ case "$d_closedir" in
 #$i_dirent I_DIRENT		/**/
 #$i_sysdir I_SYS_DIR		/**/
 #$i_sysndir I_SYS_NDIR		/**/
+#$i_systypes I_SYS_TYPES	/**/
 
+#if defined(I_SYS_TYPES)
+#include <sys/types.h>
+#endif
 #if defined(I_DIRENT)
 #include <dirent.h>
 #if defined(NeXT) && defined(I_SYS_DIR) /* NeXT needs dirent + sys/dir.h */
@@ -9288,15 +9303,6 @@ esac
 : check for void type
 echo " "
 echo "Checking to see how well your C compiler groks the void type..." >&4
-echo " "
-$cat >&4 <<EOM
-  Support flag bits are:
-    1: basic void declarations.
-    2: arrays of pointers to functions returning void.
-    4: operations between pointers to and addresses of void functions.
-    8: generic void pointers.
-EOM
-echo " "
 case "$voidflags" in
 '')
 	$cat >try.c <<'EOCP'
@@ -9325,7 +9331,7 @@ main() { sub(); }
 EOCP
 	if $cc $ccflags -c -DTRY=$defvoidused try.c >.out 2>&1 ; then
 		voidflags=$defvoidused
-	echo "It appears to support void to the level $package wants ($defvoidused)."
+	echo "Good.  It appears to support void to the level $package wants.">&4
 		if $contains warning .out >/dev/null 2>&1; then
 			echo "However, you might get some warnings that look like this:"
 			$cat .out
@@ -9371,7 +9377,13 @@ echo "Hmm, your compiler has some difficulty with void. Checking further..." >&4
 esac
 case "$voidflags" in
 "$defvoidused") ;;
-*)
+*)	$cat >&4 <<'EOM'
+  Support flag bits are:
+    1: basic void declarations.
+    2: arrays of pointers to functions returning void.
+    4: operations between pointers to and addresses of void functions.
+    8: generic void pointers.
+EOM
 	dflt="$voidflags";
 	rp="Your void support flags add up to what?"
 	. ./myread
@@ -9480,11 +9492,6 @@ EOM
 *)  groupstype="$gidtype";;
 esac
 
-: see what type is used for devices
-rp="What is the type used for device numbers on this system?"
-set dev_t devtype long stdio.h sys/types.h
-eval $typedef_ask
-
 : see what type lseek is declared as in the kernel
 rp="What is the type used for lseek's offset on this system?"
 set off_t lseektype long stdio.h sys/types.h
@@ -10821,10 +10828,6 @@ eval $inhdr
 set sys/stat.h i_sysstat
 eval $inhdr
 
-: see if sys/types.h has to be included
-set sys/types.h i_systypes
-eval $inhdr
-
 : see if this is a sys/un.h system
 set sys/un.h i_sysun
 eval $inhdr
@@ -10889,22 +10892,20 @@ for xxx in * ; do
 	DynaLoader) ;;
 	*)	if $test -f $xxx/$xxx.xs; then
 			known_extensions="$known_extensions $xxx"
+		elif $test -f $xxx/Makefile.PL; then
+			nonxs_extensions="$nonxs_extensions $xxx"
 		else
 			if $test -d $xxx; then
+				# Look for nested extensions, eg. Devel/Dprof.
 				cd $xxx
-				zzz=$known_extensions
 				for yyy in * ; do
 				if $test -f $yyy/$yyy.xs; then
 					known_extensions="$known_extensions $xxx/$yyy"
+				elif $test -f $yyy/Makefile.PL; then
+					nonxs_extensions="$nonxs_extensions $xxx/$yyy"
 				fi
 				done
 				cd ..
-				if $test "$zzz" = "$known_extensions"; then
-					if $test -f $xxx/Makefile.PL; then
-						known_extensions="$known_extensions $xxx"
-						nonxs_extensions="$nonxs_extensions $xxx"
-					fi
-				fi
 			fi
 		fi 
 		;;
@@ -10962,11 +10963,7 @@ for xxx in $known_extensions ; do
 		true|$define|y) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
-	*)
-		case " $nonxs_extensions " in
-		*" $xxx "*) ;;
-		*) avail_ext="$avail_ext $xxx" ;;
-		esac
+	*)	avail_ext="$avail_ext $xxx"
 		;;
 	esac
 done
@@ -10976,6 +10973,7 @@ shift
 avail_ext="$*"
 
 : Now see which nonxs extensions are supported on this system.
+: For now assume all are.
 nonxs_ext=''
 for xxx in $nonxs_extensions ; do
 	case "$xxx" in
@@ -11018,7 +11016,6 @@ EOM
 		esac
 		;;
 	esac
-	: Exclude those that are not xs extensions
 	case "$dflt" in
 	'')	dflt=none;;
 	esac
@@ -11034,7 +11031,7 @@ EOM
 		: Exclude those already listed in dynamic linking
 		dflt=''
 		for xxx in $avail_ext; do
-			case " $dynamic_ext $nonxs_ext " in
+			case " $dynamic_ext " in
 			*" $xxx "*) ;;
 			*) dflt="$dflt $xxx" ;;
 			esac
@@ -11084,6 +11081,7 @@ EOM
 		esac
 		;;
 	esac
+	: Exclude those that are not xs extensions
 	case "$dflt" in
 	'')	dflt=none;;
 	esac
@@ -11096,7 +11094,7 @@ EOM
 	;;
 esac
 
-set X $dynamic_ext $static_ext
+set X $dynamic_ext $static_ext $nonxs_ext
 shift
 extensions="$*"
 
@@ -11186,6 +11184,7 @@ afs='$afs'
 alignbytes='$alignbytes'
 ansi2knr='$ansi2knr'
 aphostname='$aphostname'
+apiversion='$apiversion'
 ar='$ar'
 archlib='$archlib'
 archlibexp='$archlibexp'
@@ -11323,7 +11322,6 @@ d_memmove='$d_memmove'
 d_memset='$d_memset'
 d_mkdir='$d_mkdir'
 d_mkfifo='$d_mkfifo'
-d_mknod='$d_mknod'
 d_mktime='$d_mktime'
 d_msg='$d_msg'
 d_msgctl='$d_msgctl'
@@ -11445,7 +11443,6 @@ date='$date'
 db_hashtype='$db_hashtype'
 db_prefixtype='$db_prefixtype'
 defvoidused='$defvoidused'
-devtype='$devtype'
 direntrytype='$direntrytype'
 dlext='$dlext'
 dlsrc='$dlsrc'
@@ -11602,6 +11599,7 @@ netdb_net_type='$netdb_net_type'
 nm='$nm'
 nm_opt='$nm_opt'
 nm_so_opt='$nm_so_opt'
+nonxs_ext='$nonxs_ext'
 nroff='$nroff'
 o_nonblock='$o_nonblock'
 obj_ext='$obj_ext'
@@ -11617,7 +11615,6 @@ path_sep='$path_sep'
 perl='$perl'
 perladmin='$perladmin'
 perlpath='$perlpath'
-nonxs_ext='$nonxs_ext'
 pg='$pg'
 phostname='$phostname'
 pidtype='$pidtype'
@@ -11707,6 +11704,7 @@ usethreads='$usethreads'
 usevfork='$usevfork'
 usrinc='$usrinc'
 uuname='$uuname'
+version='$version'
 vi='$vi'
 voidflags='$voidflags'
 xlibpth='$xlibpth'
diff --git a/INSTALL b/INSTALL
index 053798a91d..191d6fff55 100644
--- a/INSTALL
+++ b/INSTALL
@@ -48,19 +48,15 @@ If there is a hint file for your system (in the hints/ directory) you
 should also read that hint file for specific information for your
 system.  (Unixware users should use the svr4.sh hint file.)
 
-=head1 NOTE:  This version is not binary compatible with Perl 5.004.
+=head1 WARNING:  This version is not binary compatible with Perl 5.004.
 
-For Perl 5.004 it was possible to be binary compatible with 5.003.
-Starting from Perl 5.004_50 this is no longer possible because there were
-many deep and far-reaching changes to the language internals.
-
-If you have dynamically loaded extensions that you built under perl
-5.003 or 5.004 and the so-called 'bincompat3' mode (the default mode)
-and that you wish to continue to use with perl 5.005, you may need to
-reinstall the extensions.  If you wish to continue to support both 5.004
-and 5.005 on your system, you will have to move the 5.004 extensions
-over to the 5.004 architecture-dependent library.  See the discussion
-below on L<"Coexistence with earlier versions of perl5.">
+Starting with Perl 5.004_50 there were many deep and far-reaching changes
+to the language internals.  If you have dynamically loaded extensions
+that you built under perl 5.003 or 5.004, you can continue to use them
+with 5.004, but you will need to rebuild and reinstall those extensions
+to use them 5.005.  See the discussions below on
+L<"Coexistence with earlier versions of perl5"> and
+L<"Upgrading from 5.004 to 5.005"> for more details.
 
 The standard extensions supplied with Perl will be handled automatically.
 
@@ -109,8 +105,8 @@ Similarly, if you used a shared libperl.so (see below) with version
 numbers, you will probably want to adjust them as well.
 
 Also, be careful to check your architecture name.  Some Linux systems
-(such as Debian) use i386, while others may use i486 or i586.  If you
-pick up a precompiled binary, it might not use the same name.
+(such as Debian) use i386, while others may use i486, i586, or i686.
+If you pick up a precompiled binary, it might not use the same name.
 
 In short, if you wish to use your old config.sh, I recommend running
 Configure interactively rather than blindly accepting the defaults.
@@ -359,14 +355,14 @@ everything where you want it.  At any point during the Configure
 process, you can answer a question with  &-d  and Configure
 will use the defaults from then on.
 
-By default, Configure uses the following directories for
-library files  (archname is a string like sun4-sunos, determined
-by Configure)
+By default, Configure will use the following directories for
+library files for 5.005 (archname is a string like sun4-sunos, determined
+by Configure).
 
-	/usr/local/lib/perl5/archname/5.004
-	/usr/local/lib/perl5/
-	/usr/local/lib/perl5/site_perl/archname
-	/usr/local/lib/perl5/site_perl
+	/usr/local/lib/perl5/5.005/archname
+	/usr/local/lib/perl5/5.005/share
+	/usr/local/lib/perl5/site_perl/5.005/archname
+	/usr/local/lib/perl5/site_perl/5.005/share
 
 and the following directories for manual pages:
 
@@ -395,12 +391,12 @@ Some users also prefer to use a .3pm suffix.  You can do that with
 
 If you specify a prefix that contains the string "perl", then the
 directory structure is simplified.  For example, if you Configure with
--Dprefix=/opt/perl, then the defaults are
+-Dprefix=/opt/perl, then the defaults for 5.005 are
 
-	/opt/perl/lib/archname/5.004
-	/opt/perl/lib
-	/opt/perl/lib/site_perl/archname
-	/opt/perl/lib/site_perl
+	/opt/perl/lib/5.005/archname
+	/opt/perl/lib/5.005/share
+	/opt/perl/lib/site_perl/5.005/archname
+	/opt/perl/lib/site_perl/5.005/share
 
 	/opt/perl/man/man1
 	/opt/perl/man/man3
@@ -408,14 +404,18 @@ directory structure is simplified.  For example, if you Configure with
 The perl executable will search the libraries in the order given
 above.
 
-The  directories site_perl and site_perl/archname are empty, but are
-intended to be used for installing local or site-wide extensions.  Perl
-will automatically look in these directories.
+The  directories under site_perl are empty, but are intended to be used
+for installing local or site-wide extensions.  Perl will automatically
+look in these directories.
 
-In order to support using things like #!/usr/local/bin/perl5.004 after
+In order to support using things like #!/usr/local/bin/perl5.005 after
 a later version is released, architecture-dependent libraries are
 stored in a version-specific directory, such as
-/usr/local/lib/perl5/archname/5.004/.
+/usr/local/lib/perl5/archname/5.005/.
+
+Further details about the installation directories, maintenance and
+development subversions, and about supporting multiple versions are
+discussed in L<"Coexistence with earlier versions of perl5"> below.
 
 Again, these are just the defaults, and can be changed as you run
 Configure.
@@ -475,9 +475,11 @@ installed on multiple systems.  Here's one way to do that:
     make test
     make install
     cd /tmp/perl5
-    # Edit lib/<archname>/<version>/Config.pm to change all the
+    # Edit $archlib/Config.pm to change all the
     # install* variables back to reflect where everything will
     # really be installed.
+    # Edit any of the scripts in $scriptdir to have the correct
+    # #!/wherever/perl line.
     tar cvf ../perl5-archive.tar .
     # Then, on each machine where you want to install perl,
     cd /usr/local  # Or wherever you specified as $prefix
@@ -551,8 +553,7 @@ extension modules or external libraries may not work.  This
 configuration exists to allow these issues to be worked on.
 
 This option requires the 'sfio' package to have been built and installed.
-A (fairly old) version of sfio is in CPAN, and work is in progress to make
-it more easily buildable by adding Configure support.
+A (fairly old) version of sfio is in CPAN.
 
 You select this option by
 
@@ -585,8 +586,7 @@ portable version of this may eventually make its way into Configure.)
     fi
 
 If you have this problem, the fix is to go back to your sfio sources
-and correct iffe's guess about atexit (or whatever is appropriate for
-your platform.)
+and correct iffe's guess about atexit.
 
 There also might be a more recent release of Sfio that fixes your
 problem.
@@ -688,12 +688,12 @@ Perl relies heavily on malloc(3) to grow data structures as needed, so
 perl's performance can be noticeably affected by the performance of
 the malloc function on your system.
 
-The perl source is shipped with a version of malloc that is very fast
-but somewhat wasteful of space.  On the other hand, your system's
-malloc() function may be a bit slower but also a bit more frugal.
-However, note that space efficiency also contributes to speed efficiency,
-so there's a chance that perl's malloc may be more efficient both
-space and speed wise.
+The perl source is shipped with a version of malloc that is very fast but
+somewhat wasteful of space.  On the other hand, your system's malloc
+function may be a bit slower but also a bit more frugal.  However,
+as of 5.004_68, perl's malloc has been optimized for the typical
+requests from perl, so there's a chance that it may be both faster and
+use less memory.
 
 For many uses, speed is probably the most important consideration, so
 the default behavior (for most systems) is to use the malloc supplied
@@ -715,27 +715,20 @@ or you can answer 'n' at the appropriate interactive Configure prompt.
 If you are using Perl's malloc, you may add one or more of the following
 items to your ccflags config.sh variable to change its behavior.  You can
 find out more about these and other flags by reading the commentary near
-the top of the malloc.c source.
+the top of the malloc.c source.  The defaults should be fine for
+nearly everyone.
 
 =over 4
 
 =item -DNO_FANCY_MALLOC
 
-Undefined by default.  Defining it returns malloc to the state it was at
-in Perl version 5.004.
-
-If left undefined, it enables -DBUCKETS_ROOT2, -DIGNORE_SMALL_BAD_FREE,
-and -DSMALL_BUCKET_VIA_VTABLE.  See the commentary in malloc.c for more
-details.
+Undefined by default.  Defining it returns malloc to the version used
+in Perl 5.004.
 
 =item -DPLAIN_MALLOC
 
 Undefined by default.  Defining it in addition to NO_FANCY_MALLOC returns
-malloc to the state it was at in Perl version 5.000.
-
-If left undefined, it enables -DPERL_EMERGENCY_SBRK, -DPACK_MALLOC,
--DTWO_POT_OPTIMIZE, and -DDEBUGGING_MSTATS.  See the commentary in
-malloc.c for more details.
+malloc to the version used in Perl version 5.000.
 
 =back
 
@@ -840,7 +833,8 @@ system.
 For example, suppose you have added libgdbm.a to your system
 and you decide to reconfigure perl to use GDBM_File.  When you run
 Configure again, you will need to add -lgdbm to the list of libraries.
-Now, Configure will find your gdbm library and will issue a message:
+Now, Configure will find your gdbm include file and library and will
+issue a message:
 
     *** WHOA THERE!!! ***
 	The previous value for $i_gdbm on this machine was "undef"!
@@ -928,14 +922,12 @@ various other operating systems.
 
 =head1 make depend
 
-This will look for all the includes.
-The output is stored in makefile.  The only difference between
-Makefile and makefile is the dependencies at the bottom of
-makefile.  If you have to make any changes, you should edit
-makefile, not Makefile since the Unix make command reads
-makefile first.  (On non-Unix systems, the output may be stored in
-a different file.  Check the value of $firstmakefile in your config.sh
-if in doubt.)
+This will look for all the includes.  The output is stored in makefile.
+The only difference between Makefile and makefile is the dependencies at
+the bottom of makefile.  If you have to make any changes, you should edit
+makefile, not Makefile since the Unix make command reads makefile first.
+(On non-Unix systems, the output may be stored in a different file.
+Check the value of $firstmakefile in your config.sh if in doubt.)
 
 Configure will offer to do this step for you, so it isn't listed
 explicitly above.
@@ -969,11 +961,11 @@ to test your version of miniperl.
 
 =item locale
 
-If you have any locale-related environment variables set, try
-unsetting them.  I have some reports that some versions of IRIX hang
-while running B<./miniperl configpm> with locales other than the C
-locale.  See the discussion under L<"make test"> below about locales
-and the whole L<Locale problems> section in the file pod/perllocale.pod.
+If you have any locale-related environment variables set, try unsetting
+them.  I have some reports that some versions of IRIX hang while
+running B<./miniperl configpm> with locales other than the C locale.
+See the discussion under L<"make test"> below about locales and the
+whole L<"Locale problems"> section in the file pod/perllocale.pod.
 The latter is especially useful if you see something like this
 
 	perl: warning: Setting locale failed.
@@ -993,21 +985,21 @@ to your ccflags variable in config.sh.
 =item varargs
 
 If you get varargs problems with gcc, be sure that gcc is installed
-correctly.  When using gcc, you should probably have i_stdarg='define'
-and i_varargs='undef' in config.sh.  The problem is usually solved by
-running fixincludes correctly.  If you do change config.sh, don't
-forget to propagate your changes (see
-L<"Propagating your changes to config.sh"> below).
+correctly and that you are not passing -I/usr/include to gcc.  When using
+gcc, you should probably have i_stdarg='define' and i_varargs='undef'
+in config.sh.  The problem is usually solved by running fixincludes
+correctly.  If you do change config.sh, don't forget to propagate
+your changes (see L<"Propagating your changes to config.sh"> below).
 See also the L<"vsprintf"> item below.
 
-=item croak
+=item util.c
 
 If you get error messages such as the following (the exact line
-numbers will vary in different versions of perl):
+numbers and function name may vary in different versions of perl):
 
-    util.c: In function `Perl_croak':
-    util.c:962: number of arguments doesn't match prototype
-    proto.h:45: prototype declaration
+    util.c: In function `Perl_form':
+    util.c:1107: number of arguments doesn't match prototype
+    proto.h:125: prototype declaration
 
 it might well be a symptom of the gcc "varargs problem".  See the
 previous L<"varargs"> item.
@@ -1074,6 +1066,14 @@ or by answering the nm extraction question interactively.
 If you have previously run Configure, you should not reuse your old
 config.sh.
 
+=item umask not found
+
+If the build processes encounters errors relating to umask(), the problem
+is probably that Configure couldn't find your umask() system call.
+Check your config.sh.  You should have d_umask='define'.  If you don't,
+this is probably the L<"nm extraction"> problem discussed above.  Also,
+try reading the hints file for your system for further information.
+
 =item vsprintf
 
 If you run into problems with vsprintf in compiling util.c, the
@@ -1085,15 +1085,15 @@ d_vprintf in config.sh.  If your system has vprintf, it should be:
 	d_vprintf='define'
 
 If Configure guessed wrong, it is likely that Configure guessed wrong
-on a number of other common functions too.  You are probably better off
-re-running Configure without using nm extraction (see previous item).
+on a number of other common functions too.  This is probably
+the L<"nm extraction"> problem discussed above.
 
 =item do_aspawn
 
 If you run into problems relating to do_aspawn or do_spawn, the
 problem is probably that Configure failed to detect your system's
-fork() function.  Follow the procedure in the previous items
-on L<"vsprintf"> and L<"nm extraction">.
+fork() function.  Follow the procedure in the previous item
+on L<"nm extraction">.
 
 =item __inet_* errors
 
@@ -1114,7 +1114,7 @@ optimizer.  Edit config.sh and change the line
 
 	optimize='-O'
 
-to something like
+to
 
 	optimize=' '
 
@@ -1133,7 +1133,8 @@ indigestion easily.
 If you have missing routines, you probably need to add some library or
 other, or you need to undefine some feature that Configure thought was
 there but is defective or incomplete.  Look through config.h for
-likely suspects.
+likely suspects.  If Configure guessed wrong on a number of functions,
+you might have the L<"nm extraction"> problem discussed above.
 
 =item toke.c
 
@@ -1280,9 +1281,6 @@ test, it does not necessarily mean you have a broken perl.  This test
 tries to exercise the regular expression subsystem quite thoroughly,
 and may well be far more demanding than your normal usage.
 
-You may also be able to reduce perl's memory usage by using some of
-the ideas described above in L<"Malloc Performance Flags">.
-
 =back
 
 =head1 make install
@@ -1344,9 +1342,11 @@ make install will install the following:
 
 Installperl will also create the library directories $siteperl and
 $sitearch listed in config.sh.  Usually, these are something like
-	/usr/local/lib/perl5/site_perl/
-	/usr/local/lib/perl5/site_perl/$archname
-where $archname is something like sun4-sunos.  These directories
+
+	/usr/local/lib/perl5/site_perl/5.005/share
+	/usr/local/lib/perl5/site_perl/5.005/archname
+
+where archname is something like sun4-sunos.  These directories
 will be used for installing extensions.
 
 Perl's *.h header files and the libperl.a library are also installed
@@ -1368,49 +1368,46 @@ with 5.004_04, simply replace the '#!/usr/local/bin/perl' line at the
 top of the script with the particular version you want to run, e.g.
 #!/usr/local/bin/perl5.00404.
 
-(If you are upgrading from 5.002 or earlier, beware that some of the
-standard library files have changed in incompatible ways, so you are
-probably better off starting with a fresh installation.)
-
-The standard library files in /usr/local/lib/perl5 should be usable by
-all versions of perl5 after 5.002.  An exception is the diagnostics.pm
-module.  Since that module uses the /usr/local/lib/perl5/pod/perldiag.pod
-documentation file, the C<use diagnostics;> pragma and the splain script
-will only identify and explain any warnings or errors that the most
-recently-installed version of perl can generate.  Usually, this is not
-a problem.
-
 Most extensions will probably not need to be recompiled to use
 with a newer version of perl.   Here is how it is supposed to work.
 (These examples assume you accept all the Configure defaults.)
 
-The directories searched by version 5.004_05 will be
-
-	/usr/local/lib/perl5/archname/5.00405
-	/usr/local/lib/perl5/
-	/usr/local/lib/perl5/site_perl/archname
-	/usr/local/lib/perl5/site_perl
-
-while the directories searched by version 5.004_04 are
-
-	/usr/local/lib/perl5/archname/5.00404
-	/usr/local/lib/perl5/
-	/usr/local/lib/perl5/site_perl/archname
-	/usr/local/lib/perl5/site_perl
-
-When you install an add-on extension, it gets installed into
-/usr/local/lib/perl5/site_perl/archname (if it is architecture-specific.)
-This directory is deliberately NOT version-specific so that both 5.004_04
-and 5.004_05 can use the extension.
-
-However, if you do run into problems, and you want to continue to
-use the old version of perl along with your extension, simply move
-those extension files to the appropriate version directory, such as
-/usr/local/lib/perl5/archname/5.00404.  Then use your newer version of
-perl to rebuild and re-install the extension into site_perl.  This way,
-Perl 5.004_04 will find your files in the 5.00404 directory, and
-newer versions of perl will find your newer extension in the site_perl
-directory.
+The directories searched by version 5.005 will be
+
+    Configure variable		Default value
+	$archlib 	/usr/local/lib/perl5/5.005/archname
+	$privlib	/usr/local/lib/perl5/5.005/share
+	$sitearch	/usr/local/lib/perl5/site_perl/5.005/archname
+	$sitelib	/usr/local/lib/perl5/site_perl/5.005/share
+
+while the directories searched by version 5.005_01 will be
+
+	$archlib 	/usr/local/lib/perl5/5.00501/archname
+	$privlib	/usr/local/lib/perl5/5.00501/share
+	$sitearch	/usr/local/lib/perl5/site_perl/5.005/archname
+	$sitelib	/usr/local/lib/perl5/site_perl/5.005/share
+
+When you install an add-on extension, it gets installed into $sitelib (or
+$sitearch if it is architecture-specific).  This directory deliberately
+does NOT include the sub-version number (01) so that both 5.005 and
+5.005_01 can use the extension.  Only when a perl version changes to
+break backwards compatibility will the default suggestions for the
+$sitearch and $sitelib version numbers be increased.
+
+However, if you do run into problems, and you want to continue to use the
+old version of perl along with your extension, move those extension files
+to the appropriate version directory, such as $privlib (or $archlib).
+(The extension's .packlist file lists the files installed with that
+extension.  For the Tk extension, for example, the list of files installed
+is in $sitearch/auto/Tk/.packlist.)  Then use your newer version of perl
+to rebuild and re-install the extension into $sitelib.  This way, Perl
+5.005 will find your files in the 5.005 directory, and newer versions
+of perl will find your newer extension in the $sitelib directory.
+(This is also why perl searches the site-specific libraries last.)
+
+Alternatively, if you are willing to reinstall all your extensions
+every time you upgrade perl, then you can include the subversion
+number in $sitearch and $sitelib when you run Configure.
 
 =head2 Maintaining completely separate versions
 
@@ -1435,24 +1432,12 @@ yet.
 
 =head2 Upgrading from 5.004 to 5.005
 
-Extensions compiled with versions of perl prior to 5.004_50 will need
-to be recompiled to be used with 5.004_50 and later.
-
-If you wish to continue using those extensions under 5.004_04, for
-example, then you need to move those extensions from their current
-directories, which are something like
-
-	/usr/local/lib/perl5/site_perl/
-	/usr/local/lib/perl5/site_perl/archname
-
-to the version-specific directory such as
-
-	/usr/local/lib/perl5/archname/5.00404
-
-as described above.
-
-Once you have moved the 5.00404 versions of the extensions out of the
-way, you may recompile and reinstall with 5.005.
+Extensions built and installed with versions of perl prior to 5.004_50
+will need to be recompiled to be used with 5.004_50 and later.  You will,
+however, be able to continue using 5.004 even after you install 5.005.
+The 5.004 binary will still be able to find the extensions built under
+5.004; the 5.005 binary will look in the new $sitearch and $sitelib
+directories, and will not find them.
 
 =head1 Coexistence with perl4
 
@@ -1474,11 +1459,8 @@ for possible problems running perl4 scripts under perl5.
 Some perl scripts need to be able to obtain information from
 the system header files.  This command will convert the most commonly used
 header files in /usr/include into files that can be easily interpreted
-by perl.  These files will be placed in the architectural library directory
-you specified to Configure; by default this is
-/usr/local/lib/perl5/ARCH/VERSION, where ARCH is your architecture
-(such as sun4-solaris) and VERSION is the version of perl you are
-building (for example, 5.004).
+by perl.  These files will be placed in the architecture-dependent library
+($archlib) directory you specified to Configure.
 
 Note:  Due to differences in the C and perl languages, the
 conversion of the header files is not perfect.  You will probably have
@@ -1524,31 +1506,32 @@ available in TeX format.  Type
 
 =head1 Reporting Problems
 
-If you have difficulty building perl, and none of the advice in this
-file helps, and careful reading of the error message and the relevant
-manual pages on your system doesn't help either, then you should send a
-message to either the comp.lang.perl.misc newsgroup or to
-perlbug@perl.com with an accurate description of your problem.
+If you have difficulty building perl, and none of the advice in this file
+helps, and careful reading of the error message and the relevant manual
+pages on your system doesn't help either, then you should send a message
+to either the comp.lang.perl.misc newsgroup or to perlbug@perl.com with
+an accurate description of your problem.
 
-Please include the output of the ./myconfig shell script
-that comes with the distribution.  Alternatively, you can use the
-perlbug program that comes with the perl distribution,
-but you need to have perl compiled and installed before you can use it.
+Please include the output of the ./myconfig shell script that comes with
+the distribution.  Alternatively, you can use the perlbug program that
+comes with the perl distribution, but you need to have perl compiled
+before you can use it.  (If you have not installed it yet, you need to
+run C<./perlbug -Ilib> instead of a plain C<perlbug>.)
 
-You might also find helpful information in the Porting
-directory of the perl distribution.
+You might also find helpful information in the Porting directory of the
+perl distribution.
 
 =head1 DOCUMENTATION
 
-Read the manual entries before running perl.  The main documentation is
-in the pod/ subdirectory and should have been installed during the
+Read the manual entries before running perl.  The main documentation
+is in the pod/ subdirectory and should have been installed during the
 build process.  Type B<man perl> to get started.  Alternatively, you
-can type B<perldoc perl> to use the supplied perldoc script.  This
-is sometimes useful for finding things in the library modules.
+can type B<perldoc perl> to use the supplied perldoc script.  This is
+sometimes useful for finding things in the library modules.
 
 Under UNIX, you can produce a documentation book in postscript form,
-along with its table of contents, by going to the pod/ subdirectory
-and running (either):
+along with its table of contents, by going to the pod/ subdirectory and
+running (either):
 
 	./roffitall -groff		# If you have GNU groff installed
 	./roffitall -psroff		# If you have psroff
@@ -1557,20 +1540,19 @@ This will leave you with two postscript files ready to be printed.
 (You may need to fix the roffitall command to use your local troff
 set-up.)
 
-Note that you must have performed the installation already before
-running the above, since the script collects the installed files to
-generate the documentation.
+Note that you must have performed the installation already before running
+the above, since the script collects the installed files to generate
+the documentation.
 
 =head1 AUTHOR
 
-Original author:  Andy Dougherty doughera@lafcol.lafayette.edu ,
-borrowing very heavily from the original README by Larry Wall,
-with lots of helpful feedback and additions from the
-perl5-porters@perl.org folks.
+Original author:  Andy Dougherty doughera@lafayette.edu , borrowing very
+heavily from the original README by Larry Wall, with lots of helpful
+feedback and additions from the perl5-porters@perl.org folks.
 
 If you have problems or questions, please see L<"Reporting Problems">
 above.
 
 =head1 LAST MODIFIED
 
-$Id: INSTALL,v 1.35 1998/05/18 19:06:26 doughera Released $
+$Id: INSTALL,v 1.38 1998/06/30 16:59:52 doughera Released $
diff --git a/MANIFEST b/MANIFEST
index 9c2eddd990..30d25fc8d0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -50,8 +50,8 @@ cflags.SH		A script that emits C compilation flags per file
 compat3.sym		List of symbols for binary-compatibility with 5.003
 config_h.SH		Produces config.h
 configpm		Produces lib/Config.pm
+configure.com		Configure-equivalent for VMS
 configure.gnu		Crude emulation of GNU configure
-configure.com   Configure-equivalent for VMS
 cop.h			Control operator header
 cv.h			Code value header
 cygwin32/cw32imp.h	Cygwin32 port
diff --git a/Policy_sh.SH b/Policy_sh.SH
index 4ae0bb10dd..e25ccc3e91 100644
--- a/Policy_sh.SH
+++ b/Policy_sh.SH
@@ -63,16 +63,6 @@ esac
 
 !GROK!THIS!
 
-if test 0 -eq "$subversion"; then
-    version=`LC_ALL=C; export LC_ALL; \
-    echo $baserev $patchlevel |
-	$awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
-else
-    version=`LC_ALL=C; export LC_ALL; \
-	echo $baserev $patchlevel $subversion | \
-	$awk '{ printf "%.5f\n", $1 + $2/1000.0 + $3/100000.0 }'`
-fi
-
 for var in bin scriptdir privlib archlib \
 	man1dir man3dir sitelib sitearch \
 	installbin installscript installprivlib installarchlib \
@@ -91,13 +81,28 @@ for var in bin scriptdir privlib archlib \
 	;;
     privlib)
 	case "$prefix" in
-	*perl*)	dflt=$prefix/lib ;;
-	*)	dflt=$prefix/lib/$package ;;
+	*perl*)	dflt=$prefix/lib/$version/share ;;
+	*)	dflt=$prefix/lib/$package/$version/share ;;
+	esac
+	;;
+    archlib)	
+	case "$prefix" in
+	*perl*)	dflt=$prefix/lib/$version/$archname ;;
+	*)	dflt=$prefix/lib/$package/$version/$archname ;;
+	esac
+	;;
+    sitelib)
+	case "$prefix" in
+	*perl*)	dflt=$prefix/lib/site_perl/$apiversion/share ;;
+	*)	dflt=$prefix/lib/$package/site_perl/$apiversion/share ;;
+	esac
+	;;
+    sitearch)	
+	case "$prefix" in
+	*perl*)	dflt=$prefix/lib/site_perl/$apiversion/$archname ;;
+	*)	dflt=$prefix/lib/$package/site_perl/$apiversion/$archname ;;
 	esac
 	;;
-    archlib)	dflt="$privlib/$archname/$version" ;;
-    sitelib)	dflt="$privlib/site_perl" ;;
-    sitearch)	dflt="$sitelib/$archname" ;;
     man1dir)	dflt="$prefix/man/man1" ;;
     man3dir)
 	case "$prefix" in
diff --git a/Porting/Glossary b/Porting/Glossary
index fb7154d2ee..713fc64aa1 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -35,6 +35,15 @@ aphostname (d_gethname.U):
 	host name. The command is fully qualified by its absolute path, to make
 	it safe when used by a process with super-user privileges.
 
+apiversion (patchlevel.U):
+	This is a number which identifies the lowest version of perl
+	to have an API (for XS extensions) compatible with the present
+	version.  For example, for 5.005_01, the apiversion should be
+	5.005, since 5.005_01 should be binary compatible with 5.005.
+	This should probably be incremented manually somehow, perhaps
+	from patchlevel.h.  For now, we'll guess maintenance subversions
+	will retain binary compatibility.
+
 archlib (archlib.U):
 	This variable holds the name of the directory in which the user wants
 	to put architecture-dependent public library files for $package.
@@ -1165,7 +1174,7 @@ doublesize (doublesize.U):
 	indicates to the C program how many bytes there are in a double.
 
 dynamic_ext (Extensions.U):
-	This variable holds a list of extension files we want to
+	This variable holds a list of XS extension files we want to
 	link dynamically into the package.  It is used by Makefile.
 
 eagain (nblock_io.U):
@@ -1182,8 +1191,8 @@ exe_ext (Unix.U):
 	This is an old synonym for _exe.
 
 extensions (Extensions.U):
-	This variable holds a list of all extension files
-	linked into the package.  It is propagated to Config.pm
+	This variable holds a list of all extension files (both XS and
+	non-xs linked into the package.  It is propagated to Config.pm
 	and is typically used to test whether a particular extesion 
 	is available.
 
@@ -1548,7 +1557,7 @@ intsize (intsize.U):
 	indicates to the C program how many bytes there are in an int.
 
 known_extensions (Extensions.U):
-	This variable holds a list of all extensions included in 
+	This variable holds a list of all XS extensions included in 
 	the package.
 
 large (models.U):
@@ -1774,6 +1783,10 @@ nm_so_opt (usenm.U):
 	has been stripped, but nm --dynamic is *fatal* on an archive library.
 	Maybe Linux should just always set usenm=false.
 
+nonxs_ext (Extensions.U):
+	This variable holds a list of all non-xs extensions included
+	in the package.  All of them will be built.
+
 o_nonblock (nblock_io.U):
 	This variable bears the symbol value to be used during open() or fcntl()
 	to turn on non-blocking I/O for a file descriptor. If you wish to switch
@@ -2065,7 +2078,7 @@ startsh (startsh.U):
 	other shell.
 
 static_ext (Extensions.U):
-	This variable holds a list of extension files we want to
+	This variable holds a list of XS extension files we want to
 	link statically into the package.  It is used by Makefile.
 
 stdchar (stdchar.U):
@@ -2183,6 +2196,13 @@ usrinc (usrinc.U):
 	This variable holds the path of the include files, which is
 	usually /usr/include. It is mainly used by other Configure units.
 
+version (patchlevel.U):
+	The full version number of this package.  This combines
+	baserev, patchlevel, and subversion to get the full
+	version number, including any possible subversions.  Care
+	is taken to use the C locale in order to get something
+	like 5.004 instead of 5,004.  This is unique to perl.
+
 voidflags (voidflags.U):
 	This variable contains the eventual value of the VOIDFLAGS symbol,
 	which indicates how much support of the void type is given by this
diff --git a/Porting/config.sh b/Porting/config.sh
index 0ba33d0b6b..22065d4756 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,9 +8,9 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Mon Jun  8 12:25:25 EDT 1998
+# Configuration time: Wed Jul  1 12:34:37 EDT 1998
 # Configured by     : doughera
-# Target system     : linux fractal 2.0.33 #1 tue feb 3 10:11:46 est 1998 i686 unknown 
+# Target system     : linux fractal 2.0.34 #1 tue jun 23 10:09:17 edt 1998 i686 unknown 
 
 Author=''
 Date='$Date'
@@ -30,9 +30,10 @@ afs='false'
 alignbytes='4'
 ansi2knr=''
 aphostname=''
+apiversion='5.00469'
 ar='ar'
-archlib='/opt/perl/lib/i686-linux-thread/5.00466'
-archlibexp='/opt/perl/lib/i686-linux-thread/5.00466'
+archlib='/opt/perl/lib/5.00469/i686-linux-thread'
+archlibexp='/opt/perl/lib/5.00469/i686-linux-thread'
 archname='i686-linux-thread'
 archobjs=''
 awk='awk'
@@ -52,7 +53,7 @@ ccdlflags='-rdynamic'
 ccflags='-D_REENTRANT -Dbool=char -DHAS_BOOL -I/usr/local/include'
 cf_by='doughera'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Mon Jun  8 12:25:25 EDT 1998'
+cf_time='Wed Jul  1 12:34:37 EDT 1998'
 chgrp=''
 chmod=''
 chown=''
@@ -300,7 +301,7 @@ emacs=''
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B DB_File Fcntl GDBM_File IO NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs'
+extensions='B DB_File Fcntl GDBM_File IO NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs Errno'
 find='find'
 firstmakefile='makefile'
 flex=''
@@ -375,14 +376,14 @@ i_varhdr='stdarg.h'
 i_vfork='undef'
 incpath=''
 inews=''
-installarchlib='/opt/perl/lib/i686-linux-thread/5.00466'
+installarchlib='/opt/perl/lib/5.00469/i686-linux-thread'
 installbin='/opt/perl/bin'
 installman1dir='/opt/perl/man/man1'
 installman3dir='/opt/perl/man/man3'
-installprivlib='/opt/perl/lib'
+installprivlib='/opt/perl/lib/5.00469/share'
 installscript='/opt/perl/script'
-installsitearch='/opt/perl/lib/site_perl/i686-linux-thread'
-installsitelib='/opt/perl/lib/site_perl'
+installsitearch='/opt/perl/lib/site_perl/5.00469/i686-linux-thread'
+installsitelib='/opt/perl/lib/site_perl/5.00469/share'
 intsize='4'
 known_extensions='B DB_File Fcntl GDBM_File IO NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs'
 ksh=''
@@ -395,7 +396,7 @@ lib_ext='.a'
 libc=''
 libperl='libperl.a'
 libpth='/usr/local/lib /lib /usr/lib'
-libs='-lnsl -lgdbm -ldbm -ldb -ldl -lm -lpthread -lc -lposix -lcrypt'
+libs='-lnsl -lndbm -lgdbm -ldbm -ldb -ldl -lm -lpthread -lc -lposix -lcrypt'
 libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m pthread c cposix posix ndir dir crypt ucb BSD PW x'
 line='line'
 lint=''
@@ -435,7 +436,7 @@ mv=''
 myarchname='i686-linux'
 mydomain='.yourplace.com'
 myhostname='yourhost'
-myuname='linux fractal 2.0.33 #1 tue feb 3 10:11:46 est 1998 i686 unknown '
+myuname='linux fractal 2.0.34 #1 tue jun 23 10:09:17 edt 1998 i686 unknown '
 n='-n'
 netdb_hlen_type='int'
 netdb_host_type='const char *'
@@ -444,13 +445,14 @@ netdb_net_type='unsigned long'
 nm='nm'
 nm_opt=''
 nm_so_opt='--dynamic'
+nonxs_ext='Errno'
 nroff='nroff'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
 optimize='-O'
 orderlib='false'
 osname='linux'
-osvers='2.0.33'
+osvers='2.0.34'
 package='perl5'
 pager='/usr/bin/less'
 passcat='cat /etc/passwd'
@@ -467,8 +469,8 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib'
-privlibexp='/opt/perl/lib'
+privlib='/opt/perl/lib/5.00469/share'
+privlibexp='/opt/perl/lib/5.00469/share'
 prototype='define'
 ptrsize='4'
 randbits='31'
@@ -493,10 +495,10 @@ sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM
 sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "UNUSED", "IOT", "CLD", "POLL", 0'
 sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 6, 17, 29, 0'
 signal_t='void'
-sitearch='/opt/perl/lib/site_perl/i686-linux-thread'
-sitearchexp='/opt/perl/lib/site_perl/i686-linux-thread'
-sitelib='/opt/perl/lib/site_perl'
-sitelibexp='/opt/perl/lib/site_perl'
+sitearch='/opt/perl/lib/site_perl/5.00469/i686-linux-thread'
+sitearchexp='/opt/perl/lib/site_perl/5.00469/i686-linux-thread'
+sitelib='/opt/perl/lib/site_perl/5.00469/share'
+sitelibexp='/opt/perl/lib/site_perl/5.00469/share'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -521,7 +523,7 @@ stdio_filbuf=''
 stdio_ptr='((fp)->_IO_read_ptr)'
 strings='/usr/include/string.h'
 submit=''
-subversion='66'
+subversion='69'
 sysman='/usr/man/man1'
 tail=''
 tar=''
@@ -548,6 +550,7 @@ usethreads='define'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+version='5.00469'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
@@ -567,5 +570,5 @@ config_arg7='-Dmydomain=.yourplace.com'
 config_arg8='-Dmyhostname=yourhost'
 config_arg9='-dE'
 PATCHLEVEL=4
-SUBVERSION=66
+SUBVERSION=69
 CONFIG=true
diff --git a/Porting/config_H b/Porting/config_H
index b83e51707f..c67ed4ef14 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,9 +17,9 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Mon Jun  8 12:25:25 EDT 1998
+ * Configuration time: Wed Jul  1 12:34:37 EDT 1998
  * Configured by     : doughera
- * Target system     : linux fractal 2.0.33 #1 tue feb 3 10:11:46 est 1998 i686 unknown 
+ * Target system     : linux fractal 2.0.34 #1 tue jun 23 10:09:17 edt 1998 i686 unknown 
  */
 
 #ifndef _config_h_
@@ -1057,21 +1057,6 @@
  */
 /*#define I_VFORK	/ **/
 
-/* Free_t:
- *	This variable contains the return type of free().  It is usually
- * void, but occasionally int.
- */
-/* Malloc_t:
- *	This symbol is the type of pointer returned by malloc and realloc.
- */
-#define Malloc_t void *			/**/
-#define Free_t void			/**/
-
-/* MYMALLOC:
- *	This symbol, if defined, indicates that we're using our own malloc.
- */
-/*#define MYMALLOC			/ **/
-
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
  *	function prototypes.
@@ -1105,31 +1090,6 @@
  */
 #define STDCHAR char	/**/
 
-/* VOIDFLAGS:
- *	This symbol indicates how much support of the void type is given by this
- *	compiler.  What various bits mean:
- *
- *	    1 = supports declaration of void
- *	    2 = supports arrays of pointers to functions returning void
- *	    4 = supports comparisons between pointers to void functions and
- *		    addresses of void functions
- *	    8 = suports declaration of generic void pointers
- *
- *	The package designer should define VOIDUSED to indicate the requirements
- *	of the package.  This can be done either by #defining VOIDUSED before
- *	including config.h, or by defining defvoidused in Myinit.U.  If the
- *	latter approach is taken, only those flags will be tested.  If the
- *	level of void support necessary is not present, defines void to int.
- */
-#ifndef VOIDUSED
-#define VOIDUSED 15
-#endif
-#define VOIDFLAGS 15
-#if (VOIDFLAGS & VOIDUSED) != VOIDUSED
-#define void int		/* is void to be avoided? */
-#define M_VOID			/* Xenix strikes again */
-#endif
-
 /* MEM_ALIGNBYTES:
  *	 This symbol contains the number of bytes required to align a
  *	 double. Usual values are 2, 4 and 8.
@@ -1454,22 +1414,6 @@
  */
 #define OSNAME "linux"		/**/
 
-/* ARCHLIB:
- *	This variable, if defined, holds the name of the directory in
- *	which the user wants to put architecture-dependent public
- *	library files for perl5.  It is most often a local directory
- *	such as /usr/local/lib.  Programs using this variable must be
- *	prepared to deal with filename expansion.  If ARCHLIB is the
- *	same as PRIVLIB, it is not defined, since presumably the
- *	program already searches PRIVLIB.
- */
-/* ARCHLIB_EXP:
- *	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 "/opt/perl/lib/i686-linux-thread/5.00466"		/**/
-#define ARCHLIB_EXP "/opt/perl/lib/i686-linux-thread/5.00466"		/**/
-
 /* CAT2:
  *	This macro catenates 2 tokens together.
  */
@@ -1759,18 +1703,20 @@
 /*#define PWCOMMENT	/ **/
 #define PWGECOS	/**/
 
-/* PRIVLIB:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
+/* Free_t:
+ *	This variable contains the return type of free().  It is usually
+ * void, but occasionally int.
  */
-/* PRIVLIB_EXP:
- *	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.
+/* Malloc_t:
+ *	This symbol is the type of pointer returned by malloc and realloc.
  */
-#define PRIVLIB "/opt/perl/lib"		/**/
-#define PRIVLIB_EXP "/opt/perl/lib"		/**/
+#define Malloc_t void *			/**/
+#define Free_t void			/**/
+
+/* MYMALLOC:
+ *	This symbol, if defined, indicates that we're using our own malloc.
+ */
+/*#define MYMALLOC			/ **/
 
 /* SIG_NAME:
  *	This symbol contains a list of signal names in order of
@@ -1803,37 +1749,46 @@
 #define SIG_NAME "ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "UNUSED", "IOT", "CLD", "POLL", 0		/**/
 #define SIG_NUM  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 6, 17, 29, 0			/**/
 
-/* SITEARCH:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- *	The standard distribution will put nothing in this directory.
- *	Individual sites may place their own extensions and modules in
- *	this directory.
- */
-/* SITEARCH_EXP:
- *	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.
+/* VOIDFLAGS:
+ *	This symbol indicates how much support of the void type is given by this
+ *	compiler.  What various bits mean:
+ *
+ *	    1 = supports declaration of void
+ *	    2 = supports arrays of pointers to functions returning void
+ *	    4 = supports comparisons between pointers to void functions and
+ *		    addresses of void functions
+ *	    8 = suports declaration of generic void pointers
+ *
+ *	The package designer should define VOIDUSED to indicate the requirements
+ *	of the package.  This can be done either by #defining VOIDUSED before
+ *	including config.h, or by defining defvoidused in Myinit.U.  If the
+ *	latter approach is taken, only those flags will be tested.  If the
+ *	level of void support necessary is not present, defines void to int.
  */
-#define SITEARCH "/opt/perl/lib/site_perl/i686-linux-thread"		/**/
-#define SITEARCH_EXP "/opt/perl/lib/site_perl/i686-linux-thread"		/**/
+#ifndef VOIDUSED
+#define VOIDUSED 15
+#endif
+#define VOIDFLAGS 15
+#if (VOIDFLAGS & VOIDUSED) != VOIDUSED
+#define void int		/* is void to be avoided? */
+#define M_VOID			/* Xenix strikes again */
+#endif
 
-/* SITELIB:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- *	The standard distribution will put nothing in this directory.
- *	Individual sites may place their own extensions and modules in
- *	this directory.
+/* ARCHLIB:
+ *	This variable, if defined, holds the name of the directory in
+ *	which the user wants to put architecture-dependent public
+ *	library files for perl5.  It is most often a local directory
+ *	such as /usr/local/lib.  Programs using this variable must be
+ *	prepared to deal with filename expansion.  If ARCHLIB is the
+ *	same as PRIVLIB, it is not defined, since presumably the
+ *	program already searches PRIVLIB.
  */
-/* SITELIB_EXP:
- *	This symbol contains the ~name expanded version of SITELIB, to be used
+/* ARCHLIB_EXP:
+ *	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 SITELIB "/opt/perl/lib/site_perl"		/**/
-#define SITELIB_EXP "/opt/perl/lib/site_perl"		/**/
+#define ARCHLIB "/opt/perl/lib/5.00469/i686-linux-thread"		/**/
+#define ARCHLIB_EXP "/opt/perl/lib/5.00469/i686-linux-thread"		/**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *	This symbol, if defined, indicates that we need to prepend an
@@ -1868,6 +1823,51 @@
 #define DB_Hash_t	u_int32_t		/**/
 #define DB_Prefix_t	size_t  	/**/
 
+/* PRIVLIB:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ */
+/* PRIVLIB_EXP:
+ *	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 "/opt/perl/lib/5.00469/share"		/**/
+#define PRIVLIB_EXP "/opt/perl/lib/5.00469/share"		/**/
+
+/* SITEARCH:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ *	The standard distribution will put nothing in this directory.
+ *	Individual sites may place their own extensions and modules in
+ *	this directory.
+ */
+/* SITEARCH_EXP:
+ *	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 "/opt/perl/lib/site_perl/5.00469/i686-linux-thread"		/**/
+#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.00469/i686-linux-thread"		/**/
+
+/* SITELIB:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ *	The standard distribution will put nothing in this directory.
+ *	Individual sites may place their own extensions and modules in
+ *	this directory.
+ */
+/* SITELIB_EXP:
+ *	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 "/opt/perl/lib/site_perl/5.00469/share"		/**/
+#define SITELIB_EXP "/opt/perl/lib/site_perl/5.00469/share"		/**/
+
 /* STARTPERL:
  *	This variable contains the string to put in front of a perl
  *	script to make sure (one hopes) that it runs with perl and not
diff --git a/Porting/pumpkin.pod b/Porting/pumpkin.pod
index c46bd2907a..9416266ab3 100644
--- a/Porting/pumpkin.pod
+++ b/Porting/pumpkin.pod
@@ -299,17 +299,7 @@ program for this.  You can also use
 Both commands will also list extra files in the directory that are not
 listed in MANIFEST.
 
-The MANIFEST is normally sorted, with one exception.  Perl includes
-both a F<Configure> script and a F<configure> script.  The
-F<configure> script is a front-end to the main F<Configure>, but
-is there to aid folks who use autoconf-generated F<configure> files
-for other software.  The problem is that F<Configure> and F<configure>
-are the same on case-insensitive file systems, so I deliberately put
-F<configure> first in the MANIFEST so that the extraction of
-F<Configure> will overwrite F<configure> and leave you with the
-correct script.  (The F<configure> script must also have write
-permission for this to work, so it's the only file in the distribution
-I normally have with write permission.)
+The MANIFEST is normally sorted.
 
 If you are using metaconfig to regenerate Configure, then you should note
 that metaconfig actually uses MANIFEST.new, so you want to be sure
@@ -1312,4 +1302,4 @@ All opinions expressed herein are those of the authorZ<>(s).
 
 =head1 LAST MODIFIED
 
-$Id: pumpkin.pod,v 1.15 1998/04/23 17:03:48 doughera Released $
+$Id: pumpkin.pod,v 1.17 1998/06/30 17:00:06 doughera Released $
diff --git a/config_h.SH b/config_h.SH
index 781879291f..a5fffb9163 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -428,14 +428,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_mkfifo HAS_MKFIFO		/**/
 
-/* HAS_MKNOD:
- *	This symbol, if defined, indicates that the mknod routine is
- *	available to create character and block special files. Otherwise,
- *	mknod should be able to do it for you. However, if mknod is there,
- *	mknod might require super-user privileges which mknod will not.
- */
-#$d_mknod HAS_MKNOD		/**/
-
 /* HAS_MKTIME:
  *	This symbol, if defined, indicates that the mktime routine is
  *	available.
@@ -1079,21 +1071,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_vfork I_VFORK	/**/
 
-/* Free_t:
- *	This variable contains the return type of free().  It is usually
- * void, but occasionally int.
- */
-/* Malloc_t:
- *	This symbol is the type of pointer returned by malloc and realloc.
- */
-#define Malloc_t $malloctype			/**/
-#define Free_t $freetype			/**/
-
-/* MYMALLOC:
- *	This symbol, if defined, indicates that we're using our own malloc.
- */
-#$d_mymalloc MYMALLOC			/**/
-
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
  *	function prototypes.
@@ -1127,31 +1104,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define STDCHAR $stdchar	/**/
 
-/* VOIDFLAGS:
- *	This symbol indicates how much support of the void type is given by this
- *	compiler.  What various bits mean:
- *
- *	    1 = supports declaration of void
- *	    2 = supports arrays of pointers to functions returning void
- *	    4 = supports comparisons between pointers to void functions and
- *		    addresses of void functions
- *	    8 = suports declaration of generic void pointers
- *
- *	The package designer should define VOIDUSED to indicate the requirements
- *	of the package.  This can be done either by #defining VOIDUSED before
- *	including config.h, or by defining defvoidused in Myinit.U.  If the
- *	latter approach is taken, only those flags will be tested.  If the
- *	level of void support necessary is not present, defines void to int.
- */
-#ifndef VOIDUSED
-#define VOIDUSED $defvoidused
-#endif
-#define VOIDFLAGS $voidflags
-#if (VOIDFLAGS & VOIDUSED) != VOIDUSED
-#define void int		/* is void to be avoided? */
-#define M_VOID			/* Xenix strikes again */
-#endif
-
 /* MEM_ALIGNBYTES:
  *	 This symbol contains the number of bytes required to align a
  *	 double. Usual values are 2, 4 and 8.
@@ -1476,22 +1428,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define OSNAME "$osname"		/**/
 
-/* ARCHLIB:
- *	This variable, if defined, holds the name of the directory in
- *	which the user wants to put architecture-dependent public
- *	library files for $package.  It is most often a local directory
- *	such as /usr/local/lib.  Programs using this variable must be
- *	prepared to deal with filename expansion.  If ARCHLIB is the
- *	same as PRIVLIB, it is not defined, since presumably the
- *	program already searches PRIVLIB.
- */
-/* ARCHLIB_EXP:
- *	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.
- */
-#$d_archlib ARCHLIB "$archlib"		/**/
-#$d_archlib ARCHLIB_EXP "$archlibexp"		/**/
-
 /* CAT2:
  *	This macro catenates 2 tokens together.
  */
@@ -1781,18 +1717,20 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #$d_pwcomment PWCOMMENT	/**/
 #$d_pwgecos PWGECOS	/**/
 
-/* PRIVLIB:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
+/* Free_t:
+ *	This variable contains the return type of free().  It is usually
+ * void, but occasionally int.
  */
-/* PRIVLIB_EXP:
- *	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.
+/* Malloc_t:
+ *	This symbol is the type of pointer returned by malloc and realloc.
  */
-#define PRIVLIB "$privlib"		/**/
-#define PRIVLIB_EXP "$privlibexp"		/**/
+#define Malloc_t $malloctype			/**/
+#define Free_t $freetype			/**/
+
+/* MYMALLOC:
+ *	This symbol, if defined, indicates that we're using our own malloc.
+ */
+#$d_mymalloc MYMALLOC			/**/
 
 /* SIG_NAME:
  *	This symbol contains a list of signal names in order of
@@ -1825,37 +1763,46 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define SIG_NAME $sig_name_init		/**/
 #define SIG_NUM  $sig_num			/**/
 
-/* SITEARCH:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- *	The standard distribution will put nothing in this directory.
- *	Individual sites may place their own extensions and modules in
- *	this directory.
- */
-/* SITEARCH_EXP:
- *	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.
+/* VOIDFLAGS:
+ *	This symbol indicates how much support of the void type is given by this
+ *	compiler.  What various bits mean:
+ *
+ *	    1 = supports declaration of void
+ *	    2 = supports arrays of pointers to functions returning void
+ *	    4 = supports comparisons between pointers to void functions and
+ *		    addresses of void functions
+ *	    8 = suports declaration of generic void pointers
+ *
+ *	The package designer should define VOIDUSED to indicate the requirements
+ *	of the package.  This can be done either by #defining VOIDUSED before
+ *	including config.h, or by defining defvoidused in Myinit.U.  If the
+ *	latter approach is taken, only those flags will be tested.  If the
+ *	level of void support necessary is not present, defines void to int.
  */
-#define SITEARCH "$sitearch"		/**/
-#define SITEARCH_EXP "$sitearchexp"		/**/
+#ifndef VOIDUSED
+#define VOIDUSED $defvoidused
+#endif
+#define VOIDFLAGS $voidflags
+#if (VOIDFLAGS & VOIDUSED) != VOIDUSED
+#define void int		/* is void to be avoided? */
+#define M_VOID			/* Xenix strikes again */
+#endif
 
-/* SITELIB:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- *	The standard distribution will put nothing in this directory.
- *	Individual sites may place their own extensions and modules in
- *	this directory.
+/* ARCHLIB:
+ *	This variable, if defined, holds the name of the directory in
+ *	which the user wants to put architecture-dependent public
+ *	library files for $package.  It is most often a local directory
+ *	such as /usr/local/lib.  Programs using this variable must be
+ *	prepared to deal with filename expansion.  If ARCHLIB is the
+ *	same as PRIVLIB, it is not defined, since presumably the
+ *	program already searches PRIVLIB.
  */
-/* SITELIB_EXP:
- *	This symbol contains the ~name expanded version of SITELIB, to be used
+/* ARCHLIB_EXP:
+ *	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 SITELIB "$sitelib"		/**/
-#define SITELIB_EXP "$sitelibexp"		/**/
+#$d_archlib ARCHLIB "$archlib"		/**/
+#$d_archlib ARCHLIB_EXP "$archlibexp"		/**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *	This symbol, if defined, indicates that we need to prepend an
@@ -1890,6 +1837,51 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define DB_Hash_t	$db_hashtype		/**/
 #define DB_Prefix_t	$db_prefixtype  	/**/
 
+/* PRIVLIB:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ */
+/* PRIVLIB_EXP:
+ *	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 "$privlib"		/**/
+#define PRIVLIB_EXP "$privlibexp"		/**/
+
+/* SITEARCH:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ *	The standard distribution will put nothing in this directory.
+ *	Individual sites may place their own extensions and modules in
+ *	this directory.
+ */
+/* SITEARCH_EXP:
+ *	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 "$sitearch"		/**/
+#define SITEARCH_EXP "$sitearchexp"		/**/
+
+/* SITELIB:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ *	The standard distribution will put nothing in this directory.
+ *	Individual sites may place their own extensions and modules in
+ *	this directory.
+ */
+/* SITELIB_EXP:
+ *	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 "$sitelib"		/**/
+#define SITELIB_EXP "$sitelibexp"		/**/
+
 /* STARTPERL:
  *	This variable contains the string to put in front of a perl
  *	script to make sure (one hopes) that it runs with perl and not
@@ -2033,13 +2025,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define Gid_t $gidtype		/* Type for getgid(), etc... */
 
-/* Dev_t:
- *	This symbol holds the type used to declare device numbers.
- *	It can be int, long, dev_t, etc... It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-#define Dev_t $devtype			/* <device> type */
-
 /* Off_t:
  *	This symbol holds the type used to declare offsets in the kernel.
  *	It can be int, long, off_t, etc... It may be necessary to include
diff --git a/win32/config.bc b/win32/config.bc
index 0144b4b372..d25e81544e 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -279,7 +279,6 @@ date='date'
 db_hashtype='int'
 db_prefixtype='int'
 defvoidused='15'
-devtype='dev_t'
 direntrytype='struct direct'
 dlext='dll'
 dlsrc='dl_win32.xs'
@@ -292,7 +291,7 @@ emacs=''
 eunicefix=':'
 exe_ext='.exe'
 expr='expr'
-extensions='~static_ext~ ~dynamic_ext~'
+extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 find='find'
 firstmakefile='makefile'
 flex=''
diff --git a/win32/config.gc b/win32/config.gc
index 33114cbd84..7cdeffe196 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -279,7 +279,6 @@ date='date'
 db_hashtype='int'
 db_prefixtype='int'
 defvoidused='15'
-devtype='dev_t'
 direntrytype='struct direct'
 dlext='dll'
 dlsrc='dl_win32.xs'
@@ -292,7 +291,7 @@ emacs=''
 eunicefix=':'
 exe_ext='.exe'
 expr='expr'
-extensions='~static_ext~ ~dynamic_ext~'
+extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 find='find'
 firstmakefile='makefile'
 flex=''
diff --git a/win32/config.vc b/win32/config.vc
index a0207d1dc2..2364789157 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -279,7 +279,6 @@ date='date'
 db_hashtype='int'
 db_prefixtype='int'
 defvoidused='15'
-devtype='dev_t'
 direntrytype='struct direct'
 dlext='dll'
 dlsrc='dl_win32.xs'
@@ -292,7 +291,7 @@ emacs=''
 eunicefix=':'
 exe_ext='.exe'
 expr='expr'
-extensions='~static_ext~ ~dynamic_ext~'
+extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 find='find'
 firstmakefile='makefile'
 flex=''