perl5.005_03 (stock)

4 files changed, 1744 insertions, 210 deletions

diff --git a/gnu/usr.bin/perl/Porting/Glossary b/gnu/usr.bin/perl/Porting/Glossary
index c71c199ec4b..52b560e1018 100644
--- a/gnu/usr.bin/perl/Porting/Glossary
+++ b/gnu/usr.bin/perl/Porting/Glossary
@@ -1,14 +1,60 @@
 This file contains a description of all the shell variables whose value is
 determined by the Configure script.  Variables intended for use in C
-programs (e.g. I_UNISTD) are already described in config_h.SH.
+programs (e.g. I_UNISTD) are already described in config_h.SH.  [`configpm'
+generates pod documentation for Config.pm from this file--please try to keep
+the formatting regular.]
+
+Mcc (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the Mcc program.  After Configure runs,
+	the value is reset to a plain "Mcc" and is not useful.
+
+_a (Unix.U):
+	This variable defines the extension used for ordinary libraries.
+	For unix, it is '.a'.  The '.' is included.  Other possible
+	values include '.lib'.
+
+_exe (Unix.U):
+	This variable defines the extension used for executable files.
+	For unix it is empty.  Other possible values include '.exe'.
+
+_o (Unix.U):
+	This variable defines the extension used for object files.
+	For unix, it is '.o'.  The '.' is included.  Other possible
+	values include '.obj'.
+
+afs (afs.U):
+	This variable is set to 'true' if AFS (Andrew File System) is used
+	on the system, 'false' otherwise.  It is possible to override this
+	with a hint value or command line option, but you'd better know
+	what you are doing.
 
 alignbytes (alignbytes.U):
 	This variable holds the number of bytes required to align a
 	double. Usual values are 2, 4 and 8.
 
-ar (Unix.U):
-	This variable defines the command to use to create an archive 
-	library.  For unix, it is 'ar'.
+ansi2knr (ansi2knr.U):
+	This variable is set if the user needs to run ansi2knr.  
+	Currently, this is not supported, so we just abort.
+
+aphostname (d_gethname.U):
+	Thie variable contains the command which can be used to compute the
+	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.
+
+ar (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the ar program.  After Configure runs,
+	the value is reset to a plain "ar" and is not useful.
 
 archlib (archlib.U):
 	This variable holds the name of the directory in which the user wants
@@ -21,6 +67,10 @@ archlibexp (archlib.U):
 	This variable is the same as the archlib variable, but is
 	filename expanded at configuration time, for convenient use.
 
+archname (archname.U):
+	This variable is a short name to characterize the current
+	architecture.  It is used mainly to construct the default archlib.
+
 archobjs (Unix.U):
 	This variable defines any additional objects that must be linked
 	in with the program on this architecture.  On unix, it is usually
@@ -28,15 +78,36 @@ archobjs (Unix.U):
 	or other facilities.  For perl on OS/2, for example, this would
 	include os2/os2.obj.
 
+awk (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the awk program.  After Configure runs,
+	the value is reset to a plain "awk" and is not useful.
+
+baserev (baserev.U):
+	The base revision level of this package, from the .package file.
+
+bash (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 bin (bin.U):
 	This variable holds the name of the directory in which the user wants
 	to put publicly executable images for the package in question.  It
 	is most often a local directory such as /usr/local/bin. Programs using
 	this variable must be prepared to deal with ~name substitution.
 
-bincompat3 (bincompat3.U):
-	This variable contains y if Perl 5.004 should be binary-compatible
-	with Perl 5.003.
+binexp (bin.U):
+	This is the same as the bin variable, but is filename expanded at
+	configuration time, for use in your makefiles.
+
+bison (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+byacc (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the byacc program.  After Configure runs,
+	the value is reset to a plain "byacc" and is not useful.
 
 byteorder (byteorder.U):
 	This variable holds the byte order. In the following, larger digits
@@ -57,20 +128,25 @@ castflags (d_castneg.U):
 		2 = couldn't cast >= 0x80000000
 		4 = couldn't cast in argument expression list
 
+cat (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the cat program.  After Configure runs,
+	the value is reset to a plain "cat" and is not useful.
+
 cc (cc.U):
 	This variable holds the name of a command to execute a C compiler which
 	can resolve multiple global references that happen to have the same
-	name.  Usual values are "cc", "Mcc", "cc -M", and "gcc".
+	name.  Usual values are 'cc', 'Mcc', 'cc -M', and 'gcc'.
 
 cccdlflags (dlsrc.U):
 	This variable contains any special flags that might need to be
-	passed with cc -c to compile modules to be used to create a shared
-	library that will be used for dynamic loading.  For hpux, this 
+	passed with 'cc -c' to compile modules to be used to create a shared
+	library that will be used for dynamic loading.  For hpux, this
 	should be +z.  It is up to the makefile to use it.
 
 ccdlflags (dlsrc.U):
 	This variable contains any special flags that might need to be
-	passed to cc to link with a shared library for dynamic loading. 
+	passed to cc to link with a shared library for dynamic loading.
 	It is up to the makefile to use it.  For sunos 4.1, it should
 	be empty.
 
@@ -78,14 +154,70 @@ ccflags (ccflags.U):
 	This variable contains any additional C compiler flags desired by
 	the user.  It is up to the Makefile to use this.
 
+ccsymbols (Cppsym.U):
+	The variable contains the symbols defined by the C compiler alone.
+	The symbols defined by cpp or by cc when it calls cpp are not in
+	this list, see cppsymbols and cppccsymbols.
+	The list is a space-separated list of symbol=value tokens.
+
 cf_by (cf_who.U):
 	Login name of the person who ran the Configure script and answered the
 	questions. This is used to tag both config.sh and config_h.SH.
 
+cf_email (cf_email.U):
+	Electronic mail address of the person who ran Configure. This can be
+	used by units that require the user's e-mail, like MailList.U.
+
 cf_time (cf_who.U):
 	Holds the output of the "date" command when the configuration file was
 	produced. This is used to tag both config.sh and config_h.SH.
 
+chgrp (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+chmod (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+chown (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+clocktype (d_times.U):
+	This variable holds the type returned by times(). It can be long,
+	or clock_t on BSD sites (in which case <sys/types.h> should be
+	included).
+
+comm (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the comm program.  After Configure runs,
+	the value is reset to a plain "comm" and is not useful.
+
+compress (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+contains (contains.U):
+	This variable holds the command to do a grep with a proper return
+	status.  On most sane systems it is simply "grep".  On insane systems
+	it is a grep followed by a cat followed by a test.  This variable
+	is primarily for the use of other Configure units.
+
+cp (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the cp program.  After Configure runs,
+	the value is reset to a plain "cp" and is not useful.
+
+cpio (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+cpp (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the cpp program.  After Configure runs,
+	the value is reset to a plain "cpp" and is not useful.
+
 cpp_stuff (cpp_stuff.U):
 	This variable contains an identification of the catenation mechanism
 	used by the C preprocessor.
@@ -94,23 +226,52 @@ cppflags (ccflags.U):
 	This variable holds the flags that will be passed to the C pre-
 	processor. It is up to the Makefile to use it.
 
+cpplast (cppstdin.U):
+	This variable has the same functionality as cppminus, only it applies to
+	cpprun and not cppstdin.
+
 cppminus (cppstdin.U):
 	This variable contains the second part of the string which will invoke
 	the C preprocessor on the standard input and produce to standard
 	output.  This variable will have the value "-" if cppstdin needs a minus
 	to specify standard input, otherwise the value is "".
 
+cpprun (cppstdin.U):
+	This variable contains the command which will invoke a C preprocessor
+	on standard input and put the output to stdout. It is guaranteed not
+	to be a wrapper and may be a null string if no preprocessor can be
+	made directly available. This preprocessor might be different from the
+	one used by the C compiler. Don't forget to append cpplast after the
+	preprocessor options.
+
 cppstdin (cppstdin.U):
 	This variable contains the command which will invoke the C
 	preprocessor on standard input and put the output to stdout.
 	It is primarily used by other Configure units that ask about
 	preprocessor symbols.
 
+cppsymbols (Cppsym.U):
+	The variable contains the symbols defined by the C preprocessor
+	alone.  The symbols defined by cc or by cc when it calls cpp are
+	not in this list, see ccsymbols and cppccsymbols.
+	The list is a space-separated list of symbol=value tokens.
+
+cppccsymbols (Cppsym.U):
+	The variable contains the symbols defined by the C compiler when
+	when it calls cpp.  The symbols defined by the cc alone or cpp
+	alone are not in this list, see ccsymbols and cppsymbols.
+	The list is a space-separated list of symbol=value tokens.
+
 cryptlib (d_crypt.U):
 	This variable holds -lcrypt or the path to a libcrypt.a archive if
 	the crypt() function is not defined in the standard C library. It is
 	up to the Makefile to use this.
 
+csh (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the csh program.  After Configure runs,
+	the value is reset to a plain "csh" and is not useful.
+
 d_Gconvert (d_gconvert.U):
 	This variable holds what Gconvert is defined as to convert
 	floating point numbers into strings. It could be 'gconvert'
@@ -129,6 +290,11 @@ d_archlib (archlib.U):
 	of architecture-dependent library files for $package.  If
 	$archlib is the same as $privlib, then this is set to undef.
 
+d_attribut (d_attribut.U):
+	This variable conditionally defines HASATTRIBUTE, which
+	indicates the C compiler can check for function attributes,
+	such as printf formats.
+
 d_bcmp (d_bcmp.U):
 	This variable conditionally defines the HAS_BCMP symbol if
 	the bcmp() routine is available to compare strings.
@@ -137,20 +303,14 @@ d_bcopy (d_bcopy.U):
 	This variable conditionally defines the HAS_BCOPY symbol if
 	the bcopy() routine is available to copy strings.
 
-d_bincompat3 (bincompat3.U):
-	This variable conditionally defines BINCOMPAT3 so that embed.h
-	can take special action if Perl 5.004 should be binary-compatible
-	with Perl 5.003.
+d_bsd (Guess.U):
+	This symbol conditionally defines the symbol BSD when running on a
+	BSD system.
 
 d_bsdgetpgrp (d_getpgrp.U):
 	This variable conditionally defines USE_BSD_GETPGRP if
 	getpgrp needs one arguments whereas USG one needs none.
 
-d_bsdpgrp (d_setpgrp.U):
-	This variable conditionally defines USE_BSDPGRP if the notion of
-	process group is the BSD one. This means setpgrp needs two arguments
-	whereas USG one needs none.
-
 d_bsdsetpgrp (d_setpgrp.U):
 	This variable conditionally defines USE_BSD_SETPGRP if
 	setpgrp needs two arguments whereas USG one needs none.
@@ -186,6 +346,10 @@ d_chsize (d_chsize.U):
 	indicates to the C program that the chsize() routine is available
 	to truncate files.  You might need a -lx to get this routine.
 
+d_closedir (d_closedir.U):
+	This variable conditionally defines HAS_CLOSEDIR if closedir() is
+	available.
+
 d_const (d_const.U):
 	This variable conditionally defines the HASCONST symbol, which
 	indicates to the C program that this C compiler knows about the
@@ -223,6 +387,10 @@ d_dlerror (d_dlerror.U):
 	This variable conditionally defines the HAS_DLERROR symbol, which
 	indicates to the C program that the dlerror() routine is available.
 
+d_dlopen (d_dlopen.U):
+	This variable conditionally defines the HAS_DLOPEN symbol, which
+	indicates to the C program that the dlopen() routine is available.
+
 d_dlsymun (d_dlsymun.U):
 	This variable conditionally defines DLSYM_NEEDS_UNDERSCORE, which
 	indicates that we need to prepend an underscore to the symbol
@@ -237,10 +405,40 @@ d_dup2 (d_dup2.U):
 	This variable conditionally defines HAS_DUP2 if dup2() is
 	available to duplicate file descriptors.
 
+d_endgrent (d_endgrent.U):
+	This variable conditionally defines the HAS_ENDGRENT symbol, which
+	indicates to the C program that the endgrent() routine is available
+	for sequential access of the group database.
+
+d_endhent (d_endhent.U):
+	This variable conditionally defines HAS_ENDHOSTENT if endhostent() is
+	available to close whatever was being used for host queries.
+
+d_endnent (d_endnent.U):
+	This variable conditionally defines HAS_ENDNETENT if endnetent() is
+	available to close whatever was being used for network queries.
+
+d_endpent (d_endpent.U):
+	This variable conditionally defines HAS_ENDPROTOENT if endprotoent() is
+	available to close whatever was being used for protocol queries.
+
+d_endpwent (d_endpwent.U):
+	This variable conditionally defines the HAS_ENDPWENT symbol, which
+	indicates to the C program that the endpwent() routine is available
+	for sequential access of the passwd database.
+
+d_endsent (d_endsent.U):
+	This variable conditionally defines HAS_ENDSERVENT if endservent() is
+	available to close whatever was being used for service queries.
+
 d_eofnblk (nblock_io.U):
 	This variable conditionally defines EOF_NONBLOCK if EOF can be seen
 	when reading from a non-blocking I/O source.
 
+d_eunice (Guess.U):
+	This variable conditionally defines the symbols EUNICE and VAX, which
+	alerts the C program that it must deal with ideosyncracies of VMS.
+
 d_fchmod (d_fchmod.U):
 	This variable conditionally defines the HAS_FCHMOD symbol, which
 	indicates to the C program that the fchmod() routine is available
@@ -255,6 +453,22 @@ d_fcntl (d_fcntl.U):
 	This variable conditionally defines the HAS_FCNTL symbol, and indicates
 	whether the fcntl() function exists
 
+d_fd_macros (d_fd_set.U):
+	This variable contains the eventual value of the HAS_FD_MACROS symbol,
+	which indicates if your C compiler knows about the macros which
+	manipulate an fd_set.
+
+d_fd_set (d_fd_set.U):
+	This variable contains the eventual value of the HAS_FD_SET symbol,
+	which indicates if your C compiler knows about the fd_set typedef.
+
+d_fds_bits (d_fd_set.U):
+	This variable contains the eventual value of the HAS_FDS_BITS symbol,
+	which indicates if your fd_set typedef contains the fds_bits member.
+	If you have an fd_set typedef, but the dweebs who installed it did
+	a half-fast job and neglected to provide the macros to manipulate
+	an fd_set, HAS_FDS_BITS will let us know how to fix the gaffe.
+
 d_fgetpos (d_fgetpos.U):
 	This variable conditionally defines HAS_FGETPOS if fgetpos() is
 	available to get the file position indicator.
@@ -281,39 +495,114 @@ d_fsetpos (d_fsetpos.U):
 	This variable conditionally defines HAS_FSETPOS if fsetpos() is
 	available to set the file position indicator.
 
+d_fstatfs (d_statfs.U):
+	This variable conditionally defines the HAS_FSTATFS symbol, which
+	indicates to the C program that the fstatfs() routine is available.
+
+d_fstatvfs (d_statvfs.U):
+	This variable conditionally defines the HAS_FSTATVFS symbol, which
+	indicates to the C program that the fstatvfs() routine is available.
+
 d_ftime (d_ftime.U):
-	This variable conditionally defines the HAS_FTIME symbol, which
-	indicates that the ftime() routine exists.  The ftime() routine is
-	basically a sub-second accuracy clock.
+	This variable conditionally defines the HAS_FTIME symbol, which indicates
+	that the ftime() routine exists.  The ftime() routine is basically
+	a sub-second accuracy clock.
+
+d_getgrent (d_getgrent.U):
+	This variable conditionally defines the HAS_GETGRENT symbol, which
+	indicates to the C program that the getgrent() routine is available
+	for sequential access of the group database.
+
+d_getgrps (d_getgrps.U):
+	This variable conditionally defines the HAS_GETGROUPS symbol, which
+	indicates to the C program that the getgroups() routine is available
+	to get the list of process groups.
+
+d_gethbyaddr (d_gethbyad.U):
+	This variable conditionally defines the HAS_GETHOSTBYADDR symbol, which
+	indicates to the C program that the gethostbyaddr() routine is available
+	to look up hosts by their IP addresses.
+
+d_gethbyname (d_gethbynm.U):
+	This variable conditionally defines the HAS_GETHOSTBYNAME symbol, which
+	indicates to the C program that the gethostbyname() routine is available
+	to look up host names in some data base or other.
 
 d_gethent (d_gethent.U):
 	This variable conditionally defines HAS_GETHOSTENT if gethostent() is
-	available to dup file descriptors.
+	available to look up host names in some data base or another.
 
-d_gettimeod (d_ftime.U):
-	This variable conditionally defines the HAS_GETTIMEOFDAY symbol, which
-	indicates that the gettimeofday() system call exists (to obtain a
-	sub-second accuracy clock).
+d_gethname (d_gethname.U):
+	This variable conditionally defines the HAS_GETHOSTNAME symbol, which
+	indicates to the C program that the gethostname() routine may be
+	used to derive the host name.
+
+d_gethostprotos (d_gethostprotos.U):
+	This variable conditionally defines the HAS_GETHOST_PROTOS symbol,
+	which indicates to the C program that <netdb.h> supplies
+	prototypes for the various gethost*() functions.  
+	See also netdbtype.U for probing for various netdb types.
 
 d_getlogin (d_getlogin.U):
 	This variable conditionally defines the HAS_GETLOGIN symbol, which
 	indicates to the C program that the getlogin() routine is available
 	to get the login name.
 
+d_getmntent (d_getmntent.U):
+	This variable conditionally defines the HAS_GETMNTENT symbol, which
+	indicates to the C program that the getmntent() routine is available
+	to iterate through mounted files.
+
+d_getnbyaddr (d_getnbyad.U):
+	This variable conditionally defines the HAS_GETNETBYADDR symbol, which
+	indicates to the C program that the getnetbyaddr() routine is available
+	to look up networks by their IP addresses.
+
+d_getnbyname (d_getnbynm.U):
+	This variable conditionally defines the HAS_GETNETBYNAME symbol, which
+	indicates to the C program that the getnetbyname() routine is available
+	to look up networks by their names.
+
+d_getnent (d_getnent.U):
+	This variable conditionally defines HAS_GETNETENT if getnetent() is
+	available to look up network names in some data base or another.
+
+d_getnetprotos (d_getnetprotos.U):
+	This variable conditionally defines the HAS_GETNET_PROTOS symbol,
+	which indicates to the C program that <netdb.h> supplies
+	prototypes for the various getnet*() functions.  
+	See also netdbtype.U for probing for various netdb types.
+
+d_getpbyname (d_getprotby.U):
+	This variable conditionally defines the HAS_GETPROTOBYNAME 
+	symbol, which indicates to the C program that the 
+	getprotobyname() routine is available to look up protocols
+	by their name.
+
+d_getpbynumber (d_getprotby.U):
+	This variable conditionally defines the HAS_GETPROTOBYNUMBER 
+	symbol, which indicates to the C program that the 
+	getprotobynumber() routine is available to look up protocols
+	by their number.
+
+d_getpent (d_getpent.U):
+	This variable conditionally defines HAS_GETPROTOENT if getprotoent() is
+	available to look up protocols in some data base or another.
+
 d_getpgid (d_getpgid.U):
 	This variable conditionally defines the HAS_GETPGID symbol, which
 	indicates to the C program that the getpgid(pid) function
 	is available to get the process group id.
 
-d_getpgrp (d_getpgrp.U):
-	This variable conditionally defines HAS_GETPGRP if getpgrp() is
-	available to get the current process group.
-
 d_getpgrp2 (d_getpgrp2.U):
 	This variable conditionally defines the HAS_GETPGRP2 symbol, which
 	indicates to the C program that the getpgrp2() (as in DG/UX) routine
 	is available to get the current process group.
 
+d_getpgrp (d_getpgrp.U):
+	This variable conditionally defines HAS_GETPGRP if getpgrp() is
+	available to get the current process group.
+
 d_getppid (d_getppid.U):
 	This variable conditionally defines the HAS_GETPPID symbol, which
 	indicates to the C program that the getppid() routine is available
@@ -323,6 +612,56 @@ d_getprior (d_getprior.U):
 	This variable conditionally defines HAS_GETPRIORITY if getpriority()
 	is available to get a process's priority.
 
+d_getprotoprotos (d_getprotoprotos.U):
+	This variable conditionally defines the HAS_GETPROTO_PROTOS symbol,
+	which indicates to the C program that <netdb.h> supplies
+	prototypes for the various getproto*() functions.  
+	See also netdbtype.U for probing for various netdb types.
+
+d_getpwent (d_getpwent.U):
+	This variable conditionally defines the HAS_GETPWENT symbol, which
+	indicates to the C program that the getpwent() routine is available
+	for sequential access of the passwd database.
+
+d_getsbyname (d_getsrvby.U):
+	This variable conditionally defines the HAS_GETSERVBYNAME 
+	symbol, which indicates to the C program that the 
+	getservbyname() routine is available to look up services
+	by their name.
+
+d_getsbyport (d_getsrvby.U):
+	This variable conditionally defines the HAS_GETSERVBYPORT 
+	symbol, which indicates to the C program that the 
+	getservbyport() routine is available to look up services
+	by their port.
+
+d_getsent (d_getsent.U):
+	This variable conditionally defines HAS_GETSERVENT if getservent() is
+	available to look up network services in some data base or another.
+
+d_getservprotos (d_getservprotos.U):
+	This variable conditionally defines the HAS_GETSERV_PROTOS symbol,
+	which indicates to the C program that <netdb.h> supplies
+	prototypes for the various getserv*() functions.  
+	See also netdbtype.U for probing for various netdb types.
+
+d_gettimeod (d_ftime.U):
+	This variable conditionally defines the HAS_GETTIMEOFDAY symbol, which
+	indicates that the gettimeofday() system call exists (to obtain a
+	sub-second accuracy clock). You should probably include <sys/resource.h>.
+
+d_gnulibc (d_gnulibc.U):
+	Defined if we're dealing with the GNU C Library.
+
+d_grpasswd (i_grp.U):
+	This variable conditionally defines GRPASSWD, which indicates
+	that struct group in <grp.h> contains gr_passwd.
+
+d_hasmntopt (d_hasmntopt.U):
+	This variable conditionally defines the HAS_HASMNTOPT symbol, which
+	indicates to the C program that the hasmntopt() routine is available
+	to query the mount options of file systems.
+
 d_htonl (d_htonl.U):
 	This variable conditionally defines HAS_HTONL if htonl() and its
 	friends are available to do network order byte swapping.
@@ -345,6 +684,11 @@ d_killpg (d_killpg.U):
 	indicates to the C program that the killpg() routine is available
 	to kill process groups.
 
+d_lchown (d_lchown.U):
+	This variable conditionally defines the HAS_LCHOWN symbol, which
+	indicates to the C program that the lchown() routine is available
+	to operate on a symbolic link (instead of following the link).
+
 d_link (d_link.U):
 	This variable conditionally defines HAS_LINK if link() is
 	available to create hard links.
@@ -357,6 +701,14 @@ d_lockf (d_lockf.U):
 	This variable conditionally defines HAS_LOCKF if lockf() is
 	available to do file locking.
 
+d_longdbl (d_longdbl.U):
+	This variable conditionally defines HAS_LONG_DOUBLE if 
+	the long double type is supported.
+
+d_longlong (d_longlong.U):
+	This variable conditionally defines HAS_LONG_LONG if 
+	the long long type is supported.
+
 d_lstat (d_lstat.U):
 	This variable conditionally defines HAS_LSTAT if lstat() is
 	available to do file stats on symbolic links.
@@ -413,6 +765,22 @@ d_msg (d_msg.U):
 	This variable conditionally defines the HAS_MSG symbol, which
 	indicates that the entire msg*(2) library is present.
 
+d_msgctl (d_msgctl.U):
+	This variable conditionally defines the HAS_MSGCTL symbol, which
+	indicates to the C program that the msgctl() routine is available.
+
+d_msgget (d_msgget.U):
+	This variable conditionally defines the HAS_MSGGET symbol, which
+	indicates to the C program that the msgget() routine is available.
+
+d_msgrcv (d_msgrcv.U):
+	This variable conditionally defines the HAS_MSGRCV symbol, which
+	indicates to the C program that the msgrcv() routine is available.
+
+d_msgsnd (d_msgsnd.U):
+	This variable conditionally defines the HAS_MSGSND symbol, which
+	indicates to the C program that the msgsnd() routine is available.
+
 d_mymalloc (mallocsrc.U):
 	This variable conditionally defines MYMALLOC in case other parts
 	of the source want to take special action if MYMALLOC is used.
@@ -422,10 +790,15 @@ d_nice (d_nice.U):
 	This variable conditionally defines the HAS_NICE symbol, which
 	indicates to the C program that the nice() routine is available.
 
-d_oldarchlib (oldarchlib.U):
-	This variable conditionally defines OLDARCHLIB to hold the pathname
-	of architecture-dependent library files for a previous
-	version of $package.
+d_oldpthreads (usethreads.U):
+	This variable conditionally defines the OLD_PTHREADS_API symbol,
+	and indicates that Perl should be built to use the old
+	draft POSIX threads API.  This is only potneially meaningful if
+	usethreads is set.
+
+d_oldsock (d_socket.U):
+	This variable conditionally defines the OLDSOCKET symbol, which
+	indicates that the BSD socket interface is based on 4.1c and not 4.2.
 
 d_open3 (d_open3.U):
 	This variable conditionally defines the HAS_OPEN3 manifest constant,
@@ -443,6 +816,11 @@ d_pause (d_pause.U):
 	indicates to the C program that the pause() routine is available
 	to suspend a process until a signal is received.
 
+d_phostname (d_gethname.U):
+	This variable conditionally defines the PHOSTNAME symbol, which
+	contains the shell command which, when fed to popen(), may be
+	used to derive the host name.
+
 d_pipe (d_pipe.U):
 	This variable conditionally defines the HAS_PIPE symbol, which
 	indicates to the C program that the pipe() routine is available
@@ -453,28 +831,51 @@ d_poll (d_poll.U):
 	indicates to the C program that the poll() routine is available
 	to poll active file descriptors.
 
+d_portable (d_portable.U):
+	This variable conditionally defines the PORTABLE symbol, which
+	indicates to the C program that it should not assume that it is
+	running on the machine it was compiled on.
+
+d_pthread_yield (d_pthread_y.U):
+	This variable conditionally defines the HAS_PTHREAD_YIELD
+	symbol if the pthread_yield routine is available to yield
+	the execution of the current thread.
+
+d_pthreads_created_joinable (d_pthreadj.U):
+	This variable conditionally defines the PTHREADS_CREATED_JOINABLE
+	symbol if pthreads are created in the joinable (aka undetached) 
+	state.
+
 d_pwage (i_pwd.U):
-	This varaible conditionally defines PWAGE, which indicates
+	This variable conditionally defines PWAGE, which indicates
 	that struct passwd contains pw_age.
 
 d_pwchange (i_pwd.U):
-	This varaible conditionally defines PWCHANGE, which indicates
+	This variable conditionally defines PWCHANGE, which indicates
 	that struct passwd contains pw_change.
 
 d_pwclass (i_pwd.U):
-	This varaible conditionally defines PWCLASS, which indicates
+	This variable conditionally defines PWCLASS, which indicates
 	that struct passwd contains pw_class.
 
 d_pwcomment (i_pwd.U):
-	This varaible conditionally defines PWCOMMENT, which indicates
+	This variable conditionally defines PWCOMMENT, which indicates
 	that struct passwd contains pw_comment.
 
 d_pwexpire (i_pwd.U):
-	This varaible conditionally defines PWEXPIRE, which indicates
+	This variable conditionally defines PWEXPIRE, which indicates
 	that struct passwd contains pw_expire.
 
+d_pwgecos (i_pwd.U):
+	This variable conditionally defines PWGECOS, which indicates
+	that struct passwd contains pw_gecos.
+
+d_pwpasswd (i_pwd.U):
+	This variable conditionally defines PWPASSWD, which indicates
+	that struct passwd contains pw_passwd.
+
 d_pwquota (i_pwd.U):
-	This varaible conditionally defines PWQUOTA, which indicates
+	This variable conditionally defines PWQUOTA, which indicates
 	that struct passwd contains pw_quota.
 
 d_readdir (d_readdir.U):
@@ -512,6 +913,11 @@ d_sanemcmp (d_sanemcmp.U):
 	the memcpy() routine is available and can be used to compare relative
 	magnitudes of chars with their high bits set.
 
+d_sched_yield (d_pthread_y.U):
+	This variable conditionally defines the HAS_SCHED_YIELD
+	symbol if the sched_yield routine is available to yield
+	the execution of the current thread.
+
 d_seekdir (d_readdir.U):
 	This variable conditionally defines HAS_SEEKDIR if seekdir() is
 	available.
@@ -525,6 +931,26 @@ d_sem (d_sem.U):
 	This variable conditionally defines the HAS_SEM symbol, which
 	indicates that the entire sem*(2) library is present.
 
+d_semctl (d_semctl.U):
+	This variable conditionally defines the HAS_SEMCTL symbol, which
+	indicates to the C program that the semctl() routine is available.
+
+d_semctl_semid_ds (d_union_senum.U):
+	This variable conditionally defines USE_SEMCTL_SEMID_DS, which
+	indicates that struct semid_ds * is to be used for semctl IPC_STAT.
+
+d_semctl_semun (d_union_senum.U):
+	This variable conditionally defines USE_SEMCTL_SEMUN, which
+	indicates that union semun is to be used for semctl IPC_STAT.
+
+d_semget (d_semget.U):
+	This variable conditionally defines the HAS_SEMGET symbol, which
+	indicates to the C program that the semget() routine is available.
+
+d_semop (d_semop.U):
+	This variable conditionally defines the HAS_SEMOP symbol, which
+	indicates to the C program that the semop() routine is available.
+
 d_setegid (d_setegid.U):
 	This variable conditionally defines the HAS_SETEGID symbol, which
 	indicates to the C program that the setegid() routine is available
@@ -535,6 +961,20 @@ d_seteuid (d_seteuid.U):
 	indicates to the C program that the seteuid() routine is available
 	to change the effective uid of the current program.
 
+d_setgrent (d_setgrent.U):
+	This variable conditionally defines the HAS_SETGRENT symbol, which
+	indicates to the C program that the setgrent() routine is available
+	for initializing sequential access to the group database.
+
+d_setgrps (d_setgrps.U):
+	This variable conditionally defines the HAS_SETGROUPS symbol, which
+	indicates to the C program that the setgroups() routine is available
+	to set the list of process groups.
+
+d_sethent (d_sethent.U):
+	This variable conditionally defines HAS_SETHOSTENT if sethostent() is
+	available.
+
 d_setlinebuf (d_setlnbuf.U):
 	This variable conditionally defines the HAS_SETLINEBUF symbol, which
 	indicates to the C program that the setlinebuf() routine is available
@@ -545,24 +985,36 @@ d_setlocale (d_setlocale.U):
 	This variable conditionally defines HAS_SETLOCALE if setlocale() is
 	available to handle locale-specific ctype implementations.
 
-d_setpgid (d_setpgid.U):
-	This variable conditionally defines the HAS_SETPGID symbol, which
-	indicates to the C program that the setpgid(pid, gpid) function
-	is available to set the process group id.
+d_setnent (d_setnent.U):
+	This variable conditionally defines HAS_SETNETENT if setnetent() is
+	available.
 
-d_setpgrp (d_setpgrp.U):
-	This variable conditionally defines HAS_SETPGRP if setpgrp() is
-	available to set the current process group.
+d_setpent (d_setpent.U):
+	This variable conditionally defines HAS_SETPROTOENT if setprotoent() is
+	available.
+
+d_setpgid (d_setpgid.U):
+	This variable conditionally defines the HAS_SETPGID symbol if the
+	setpgid(pid, gpid) function is available to set process group ID.
 
 d_setpgrp2 (d_setpgrp2.U):
 	This variable conditionally defines the HAS_SETPGRP2 symbol, which
 	indicates to the C program that the setpgrp2() (as in DG/UX) routine
 	is available to set the current process group.
 
+d_setpgrp (d_setpgrp.U):
+	This variable conditionally defines HAS_SETPGRP if setpgrp() is
+	available to set the current process group.
+
 d_setprior (d_setprior.U):
 	This variable conditionally defines HAS_SETPRIORITY if setpriority()
 	is available to set a process's priority.
 
+d_setpwent (d_setpwent.U):
+	This variable conditionally defines the HAS_SETPWENT symbol, which
+	indicates to the C program that the setpwent() routine is available
+	for initializing sequential access to the passwd database.
+
 d_setregid (d_setregid.U):
 	This variable conditionally defines HAS_SETREGID if setregid() is
 	available to change the real and effective gid of the current
@@ -593,10 +1045,19 @@ d_setruid (d_setruid.U):
 	indicates to the C program that the setruid() routine is available
 	to change the real uid of the current program.
 
+d_setsent (d_setsent.U):
+	This variable conditionally defines HAS_SETSERVENT if setservent() is
+	available.
+
 d_setsid (d_setsid.U):
 	This variable conditionally defines HAS_SETSID if setsid() is
 	available to set the process group ID.
 
+d_setvbuf (d_setvbuf.U):
+	This variable conditionally defines the HAS_SETVBUF symbol, which
+	indicates to the C program that the setvbuf() routine is available
+	to change buffering on an open stdio stream.
+
 d_sfio (d_sfio.U):
 	This variable conditionally defines the USE_SFIO symbol,
 	and indicates whether sfio is available (and should be used).
@@ -605,11 +1066,27 @@ d_shm (d_shm.U):
 	This variable conditionally defines the HAS_SHM symbol, which
 	indicates that the entire shm*(2) library is present.
 
+d_shmat (d_shmat.U):
+	This variable conditionally defines the HAS_SHMAT symbol, which
+	indicates to the C program that the shmat() routine is available.
+
 d_shmatprototype (d_shmat.U):
 	This variable conditionally defines the HAS_SHMAT_PROTOTYPE 
 	symbol, which indicates that sys/shm.h has a prototype for
 	shmat.
 
+d_shmctl (d_shmctl.U):
+	This variable conditionally defines the HAS_SHMCTL symbol, which
+	indicates to the C program that the shmctl() routine is available.
+
+d_shmdt (d_shmdt.U):
+	This variable conditionally defines the HAS_SHMDT symbol, which
+	indicates to the C program that the shmdt() routine is available.
+
+d_shmget (d_shmget.U):
+	This variable conditionally defines the HAS_SHMGET symbol, which
+	indicates to the C program that the shmget() routine is available.
+
 d_sigaction (d_sigaction.U):
 	This variable conditionally defines the HAS_SIGACTION symbol, which
 	indicates that the Vr4 sigaction() routine is available.
@@ -631,6 +1108,16 @@ d_statblks (d_statblks.U):
 	This variable conditionally defines USE_STAT_BLOCKS if this system
 	has a stat structure declaring st_blksize and st_blocks.
 
+d_statfsflags (d_statfs.U):
+	This variable conditionally defines the HAS_STRUCT_STATFS_FLAGS
+	symbol, which indicates to struct statfs from has f_flags member.
+	This kind of struct statfs is coming from sys/mount.h (BSD),
+	not from sys/statfs.h (SYSV).
+
+d_statvfs (d_statvfs.U):
+	This variable conditionally defines the HAS_STATVFS symbol, which
+	indicates to the C program that the statvfs() routine is available.
+
 d_stdio_cnt_lval (d_stdstdio.U):
 	This variable conditionally defines STDIO_CNT_LVALUE if the
 	FILE_cnt macro can be used as an lvalue.
@@ -709,6 +1196,10 @@ d_sysconf (d_sysconf.U):
 	indicates to the C program that the sysconf() routine is available
 	to determine system related limits and options.
 
+d_sysernlst (d_strerror.U):
+	This variable conditionally defines HAS_SYS_ERRNOLIST if sys_errnolist[]
+	is available to translate error numbers to the symbolic name.
+
 d_syserrlst (d_strerror.U):
 	This variable conditionally defines HAS_SYS_ERRLIST if sys_errlist[] is
 	available to translate error numbers to strings.
@@ -731,6 +1222,11 @@ d_telldir (d_readdir.U):
 	This variable conditionally defines HAS_TELLDIR if telldir() is
 	available.
 
+d_time (d_time.U):
+	This variable conditionally defines the HAS_TIME symbol, which indicates
+	that the time() routine exists.  The time() routine is normaly
+	provided on UNIX systems.
+
 d_times (d_times.U):
 	This variable conditionally defines the HAS_TIMES symbol, which indicates
 	that the times() routine exists.  The times() routine is normaly
@@ -754,6 +1250,10 @@ d_uname (d_gethname.U):
 	indicates to the C program that the uname() routine may be
 	used to derive the host name.
 
+d_union_semun (d_union_senum.U):
+	This variable conditionally defines HAS_UNION_SEMUN if the
+	union semun is defined by including <sys/sem.h>.
+
 d_vfork (d_vfork.U):
 	This variable conditionally defines the HAS_VFORK symbol, which
 	indicates the vfork() routine is available.
@@ -762,6 +1262,17 @@ d_void_closedir (d_closedir.U):
 	This variable conditionally defines VOID_CLOSEDIR if closedir()
 	does not return a value.
 
+d_voidsig (d_voidsig.U):
+	This variable conditionally defines VOIDSIG if this system
+	declares "void (*signal(...))()" in signal.h.  The old way was to
+	declare it as "int (*signal(...))()".
+
+d_voidtty (i_sysioctl.U):
+	This variable conditionally defines USE_IOCNOTTY to indicate that the
+	ioctl() call with TIOCNOTTY should be used to void tty association.
+	Otherwise (on USG probably), it is enough to close the standard file
+	decriptors and do a setpgrp().
+
 d_volatile (d_volatile.U):
 	This variable conditionally defines the HASVOLATILE symbol, which
 	indicates to the C program that this C compiler knows about the
@@ -790,6 +1301,15 @@ d_wctomb (d_wctomb.U):
 	indicates to the C program that the wctomb() routine is available
 	to convert a wide character to a multibyte.
 
+d_xenix (Guess.U):
+	This variable conditionally defines the symbol XENIX, which alerts
+	the C program that it runs under Xenix.
+
+date (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the date program.  After Configure runs,
+	the value is reset to a plain "date" and is not useful.
+
 db_hashtype (i_db.U):
 	This variable contains the type of the hash structure element
 	in the <db.h> header file.  In older versions of DB, it was
@@ -813,8 +1333,12 @@ dlsrc (dlsrc.U):
 	This variable contains the name of the dynamic loading file that
 	will be used with the package.
 
+doublesize (doublesize.U):
+	This variable contains the value of the DOUBLESIZE symbol, which
+	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):
@@ -822,14 +1346,49 @@ eagain (nblock_io.U):
 	data is present on the file and non-blocking I/O was enabled (otherwise,
 	read() blocks naturally).
 
+ebcdic (ebcdic.U):
+	This variable conditionally defines EBCDIC if this
+	system uses EBCDIC encoding.  Among other things, this
+	means that the character ranges are not contiguous.
+	See trnl.U
+
+echo (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the echo program.  After Configure runs,
+	the value is reset to a plain "echo" and is not useful.
+
+egrep (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the egrep program.  After Configure runs,
+	the value is reset to a plain "egrep" and is not useful.
+
+emacs (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 eunicefix (Init.U):
 	When running under Eunice this variable contains a command which will
 	convert a shell script to the proper form of text file for it to be
 	executable by the shell.  On other systems it is a no-op.
 
 exe_ext (Unix.U):
-	This variable defines the extension used for executable files.
-	For unix it is empty.  Other possible values include '.exe'.
+	This is an old synonym for _exe.
+
+expr (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the expr program.  After Configure runs,
+	the value is reset to a plain "expr" and is not useful.
+
+extensions (Extensions.U):
+	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.
+
+find (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the find program.  After Configure runs,
+	the value is reset to a plain "find" and is not useful.
 
 firstmakefile (Unix.U):
 	This variable defines the first file searched by make.  On unix,
@@ -837,6 +1396,10 @@ firstmakefile (Unix.U):
 	it might be something else.  This is only used to deal with
 	convoluted make depend tricks.
 
+flex (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 fpostype (fpostype.U):
 	This variable defines Fpos_t to be something like fpost_t, long, 
 	uint, or whatever type is used to declare file positions in libc.
@@ -845,6 +1408,11 @@ freetype (mallocsrc.U):
 	This variable contains the return type of free().  It is usually
 	void, but occasionally int.
 
+full_ar (Loc_ar.U):
+	This variable contains the full pathname to 'ar', whether or
+	not the user has specified 'portability'.  This is only used
+	in the Makefile.SH.
+
 full_csh (d_csh.U):
 	This variable contains the full pathname to 'csh', whether or
 	not the user has specified 'portability'.  This is only used
@@ -859,21 +1427,87 @@ full_sed (Loc_sed.U):
 	can share this executable will have the same full pathname to
 	'sed.'
 
+gccversion (cc.U):
+	If GNU cc (gcc) is used, this variable holds '1' or '2' to 
+	indicate whether the compiler is version 1 or 2.  This is used in
+	setting some of the default cflags.  It is set to '' if not gcc.
+
 gidtype (gidtype.U):
 	This variable defines Gid_t to be something like gid_t, int,
 	ushort, or whatever type is used to declare the return type
 	of getgid().  Typically, it is the type of group ids in the kernel.
 
+grep (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the grep program.  After Configure runs,
+	the value is reset to a plain "grep" and is not useful.
+
+groupcat (nis.U):
+	This variable contains a command that produces the text of the
+	/etc/group file.  This is normally "cat /etc/group", but can be
+	"ypcat group" when NIS is used.
+
 groupstype (groupstype.U):
 	This variable defines Groups_t to be something like gid_t, int, 
 	ushort, or whatever type is used for the second argument to
-	getgroups().  Usually, this is the same of gidtype, but
-	sometimes it isn't.
+	getgroups() and setgroups().  Usually, this is the same as
+	gidtype (gid_t), but sometimes it isn't.
+
+gzip (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the gzip program.  After Configure runs,
+	the value is reset to a plain "gzip" and is not useful.
+
+h_fcntl (h_fcntl.U):
+	This is variable gets set in various places to tell i_fcntl that
+	<fcntl.h> should be included.
+
+h_sysfile (h_sysfile.U):
+	This is variable gets set in various places to tell i_sys_file that
+	<sys/file.h> should be included.
+
+hint (Oldconfig.U):
+	Gives the type of hints used for previous answers. May be one of
+	"default", "recommended" or "previous".
+
+hostcat (nis.U):
+	This variable contains a command that produces the text of the
+	/etc/hosts file.  This is normally "cat /etc/hosts", but can be
+	"ypcat hosts" when NIS is used.
+
+huge (models.U):
+	This variable contains a flag which will tell the C compiler and loader
+	to produce a program running with a huge memory model.  If the
+	huge model is not supported, contains the flag to produce large
+	model programs.  It is up to the Makefile to use this.
+
+i_arpainet (i_arpainet.U):
+	This variable conditionally defines the I_ARPA_INET symbol,
+	and indicates whether a C program should include <arpa/inet.h>.
+
+i_bsdioctl (i_sysioctl.U):
+	This variable conditionally defines the I_SYS_BSDIOCTL symbol, which
+	indicates to the C program that <sys/bsdioctl.h> exists and should
+	be included.
+
+i_db (i_db.U):
+	This variable conditionally defines the I_DB symbol, and indicates
+	whether a C program may include Berkeley's DB include file <db.h>.
+
+i_dbm (i_dbm.U):
+	This variable conditionally defines the I_DBM symbol, which
+	indicates to the C program that <dbm.h> exists and should
+	be included.
 
 i_dirent (i_dirent.U):
 	This variable conditionally defines I_DIRENT, which indicates
 	to the C program that it should include <dirent.h>.
 
+i_dld (i_dld.U):
+	This variable conditionally defines the I_DLD symbol, which
+	indicates to the C program that <dld.h> (GNU dynamic loading)
+	exists and should be included.
+
 i_dlfcn (i_dlfcn.U):
 	This variable conditionally defines the I_DLFCN symbol, which
 	indicates to the C program that <dlfcn.h> exists and should
@@ -888,6 +1522,11 @@ i_float (i_float.U):
 	whether a C program may include <float.h> to get symbols like DBL_MAX
 	or DBL_MIN, i.e. machine dependent floating point values.
 
+i_gdbm (i_gdbm.U):
+	This variable conditionally defines the I_GDBM symbol, which
+	indicates to the C program that <gdbm.h> exists and should
+	be included.
+
 i_grp (i_grp.U):
 	This variable conditionally defines the I_GRP symbol, and indicates
 	whether a C program should include <grp.h>.
@@ -901,6 +1540,14 @@ i_locale (i_locale.U):
 	This variable conditionally defines the I_LOCALE symbol,
 	and indicates whether a C program should include <locale.h>.
 
+i_machcthr (i_machcthr.U):
+	This variable conditionally defines the I_MACH_CTHREADS symbol,
+	and indicates whether a C program should include <mach/cthreads.h>.
+
+i_malloc (i_malloc.U):
+	This variable conditionally defines the I_MALLOC symbol, and indicates
+	whether a C program should include <malloc.h>.
+
 i_math (i_math.U):
 	This variable conditionally defines the I_MATH symbol, and indicates
 	whether a C program may include <math.h>.
@@ -909,6 +1556,19 @@ i_memory (i_memory.U):
 	This variable conditionally defines the I_MEMORY symbol, and indicates
 	whether a C program should include <memory.h>.
 
+i_mntent (i_mntent.U):
+	This variable conditionally defines the I_MNTENT symbol, and indicates
+	whether a C program should include <mntent.h>.
+
+i_ndbm (i_ndbm.U):
+	This variable conditionally defines the I_NDBM symbol, which
+	indicates to the C program that <ndbm.h> exists and should
+	be included.
+
+i_netdb (i_netdb.U):
+	This variable conditionally defines the I_NETDB symbol, and indicates
+	whether a C program should include <netdb.h>.
+
 i_neterrno (i_neterrno.U):
 	This variable conditionally defines the I_NET_ERRNO symbol, which
 	indicates to the C program that <net/errno.h> exists and should
@@ -964,11 +1624,25 @@ i_sysfile (i_sysfile.U):
 	This variable conditionally defines the I_SYS_FILE symbol, and indicates
 	whether a C program should include <sys/file.h> to get R_OK and friends.
 
+i_sysfilio (i_sysioctl.U):
+	This variable conditionally defines the I_SYS_FILIO symbol, which
+	indicates to the C program that <sys/filio.h> exists and should
+	be included in preference to <sys/ioctl.h>.
+
+i_sysin (i_niin.U):
+	This variable conditionally defines I_SYS_IN, which indicates
+	to the C program that it should include <sys/in.h> instead of
+	<netinet/in.h>.
+
 i_sysioctl (i_sysioctl.U):
 	This variable conditionally defines the I_SYS_IOCTL symbol, which
 	indicates to the C program that <sys/ioctl.h> exists and should
 	be included.
 
+i_sysmount (i_sysmount.U):
+	This variable conditionally defines the I_SYSMOUNT symbol,
+	and indicates whether a C program should include <sys/mount.h>.
+
 i_sysndir (i_sysndir.U):
 	This variable conditionally defines the I_SYS_NDIR symbol, and indicates
 	whether a C program should include <sys/ndir.h>.
@@ -986,10 +1660,23 @@ i_sysselct (i_sysselct.U):
 	to the C program that it should include <sys/select.h> in order to
 	get the definition of struct timeval.
 
+i_syssockio (i_sysioctl.U):
+	This variable conditionally defines I_SYS_SOCKIO to indicate to the
+	C program that socket ioctl codes may be found in <sys/sockio.h>
+	instead of <sys/ioctl.h>.
+
 i_sysstat (i_sysstat.U):
 	This variable conditionally defines the I_SYS_STAT symbol,
 	and indicates whether a C program should include <sys/stat.h>.
 
+i_sysstatfs (i_sysstatfs.U):
+	This variable conditionally defines the I_SYSSTATFS symbol,
+	and indicates whether a C program should include <sys/statfs.h>.
+
+i_sysstatvfs (i_sysstatvfs.U):
+	This variable conditionally defines the I_SYSSTATVFS symbol,
+	and indicates whether a C program should include <sys/statvfs.h>.
+
 i_systime (i_time.U):
 	This variable conditionally defines I_SYS_TIME, which indicates
 	to the C program that it should include <sys/time.h>.
@@ -1055,20 +1742,78 @@ i_vfork (i_vfork.U):
 	This variable conditionally defines the I_VFORK symbol, and indicates
 	whether a C program should include vfork.h.
 
+ignore_versioned_solibs (libs.U):
+	This variable should be non-empty if non-versioned shared
+	libraries (libfoo.so.x.y) are to be ignored (because they
+	cannot be linked against).
+
+incpath (usrinc.U):
+	This variable must preceed the normal include path to get hte
+	right one, as in "$incpath/usr/include" or "$incpath/usr/lib".
+	Value can be "" or "/bsd43" on mips.
+
+inews (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+installarchlib (archlib.U):
+	This variable is really the same as archlibexp but may differ on
+	those systems using AFS. For extra portability, only this variable
+	should be used in makefiles.
+
 installbin (bin.U):
 	This variable is the same as binexp unless AFS is running in which case
 	the user is explicitely prompted for it. This variable should always
 	be used in your makefiles for maximum portability.
 
+installman1dir (man1dir.U):
+	This variable is really the same as man1direxp, unless you are using
+	AFS in which case it points to the read/write location whereas
+	man1direxp only points to the read-only access location. For extra
+	portability, you should only use this variable within your makefiles.
+
+installman3dir (man3dir.U):
+	This variable is really the same as man3direxp, unless you are using
+	AFS in which case it points to the read/write location whereas
+	man3direxp only points to the read-only access location. For extra
+	portability, you should only use this variable within your makefiles.
+
 installprivlib (privlib.U):
 	This variable is really the same as privlibexp but may differ on
 	those systems using AFS. For extra portability, only this variable
 	should be used in makefiles.
 
+installscript (scriptdir.U):
+	This variable is usually the same as scriptdirexp, unless you are on
+	a system running AFS, in which case they may differ slightly. You
+	should always use this variable within your makefiles for portability.
+
+installsitearch (sitearch.U):
+	This variable is really the same as sitearchexp but may differ on
+	those systems using AFS. For extra portability, only this variable
+	should be used in makefiles.
+
+installsitelib (sitelib.U):
+	This variable is really the same as sitelibexp but may differ on
+	those systems using AFS. For extra portability, only this variable
+	should be used in makefiles.
+
+installusrbinperl (instubperl.U):
+	This variable tells whether Perl should be installed also as
+	/usr/bin/perl in addition to
+	$installbin/perl
+
 intsize (intsize.U):
-	This variable contains the value of the INTSIZE symbol,
-	which indicates to the C program how many bytes there are
-	in an integer.
+	This variable contains the value of the INTSIZE symbol, which
+	indicates to the C program how many bytes there are in an int.
+
+known_extensions (Extensions.U):
+	This variable holds a list of all XS extensions included in 
+	the package.
+
+ksh (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
 
 large (models.U):
 	This variable contains a flag which will tell the C compiler and loader
@@ -1085,16 +1830,22 @@ lddlflags (dlsrc.U):
 	This variable contains any special flags that might need to be
 	passed to $ld to create a shared library suitable for dynamic
 	loading.  It is up to the makefile to use it.  For hpux, it
-	should be -b.  For sunos 4.1, it is empty.
+	should be '-b'.  For sunos 4.1, it is empty.
 
 ldflags (ccflags.U):
 	This variable contains any additional C loader flags desired by
 	the user.  It is up to the Makefile to use this.
 
+less (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the less program.  After Configure runs,
+	the value is reset to a plain "less" and is not useful.
+
 lib_ext (Unix.U):
-	This variable defines the extension used for ordinary libraries.
-	For unix, it is '.a'.  The '.' is included.  Other possible
-	values include '.lib'.
+	This is an old synonym for _a.
+
+libc (libc.U):
+	This variable contains the location of the C library.
 
 libperl (libperl.U):
 	The perl executable is obtained by linking perlmain.c with
@@ -1104,39 +1855,108 @@ libperl (libperl.U):
 	the user wishes to build a perl executable with a shared
 	library.
 
+libpth (libpth.U):
+	This variable holds the general path used to find libraries. It is
+	intended to be used by other units.
+
 libs (libs.U):
 	This variable holds the additional libraries we want to use.
 	It is up to the Makefile to deal with it.
 
+libswanted (Myinit.U):
+	This variable holds a list of all the libraries we want to
+	search.  The order is chosen to pick up the c library
+	ahead of ucb or bsd libraries for SVR4.
+
+line (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the line program.  After Configure runs,
+	the value is reset to a plain "line" and is not useful.
+
+lint (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+lkflags (ccflags.U):
+	This variable contains any additional C partial linker flags desired by
+	the user.  It is up to the Makefile to use this.
+
+ln (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the ln program.  After Configure runs,
+	the value is reset to a plain "ln" and is not useful.
+
 lns (lns.U):
 	This variable holds the name of the command to make 
 	symbolic links (if they are supported).  It can be used
 	in the Makefile. It is either 'ln -s' or 'ln'
 
+locincpth (ccflags.U):
+	This variable contains a list of additional directories to be
+	searched by the compiler.  The appropriate '-I' directives will
+	be added to ccflags.  This is intended to simplify setting
+	local directories from the Configure command line.
+	It's not much, but it parallels the loclibpth stuff in libpth.U.
+
+loclibpth (libpth.U):
+	This variable holds the paths used to find local libraries.  It is
+	prepended to libpth, and is intended to be easily set from the
+	command line.
+
+longdblsize (d_longdbl.U):
+	This variable contains the value of the LONG_DOUBLESIZE symbol, which
+	indicates to the C program how many bytes there are in a long double,
+	if this system supports long doubles.
+
+longlongsize (d_longlong.U):
+	This variable contains the value of the LONGLONGSIZE symbol, which
+	indicates to the C program how many bytes there are in a long long,
+	if this system supports long long.
+
 longsize (intsize.U):
-	This variable contains the value of the LONGSIZE symbol,
-	which indicates to the C program how many bytes there are
-	in a long integer.
+	This variable contains the value of the LONGSIZE symbol, which
+	indicates to the C program how many bytes there are in a long.
+
+lp (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+lpr (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+ls (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the ls program.  After Configure runs,
+	the value is reset to a plain "ls" and is not useful.
 
 lseektype (lseektype.U):
 	This variable defines lseektype to be something like off_t, long, 
 	or whatever type is used to declare lseek offset's type in the
 	kernel (which also appears to be lseek's return type).
 
-make (make.U):
-	This variable sets the path to the 'make' command.  It is
-	here rather than in Loc.U so that users can override it
-	with  Configure -Dmake=pmake, or equivalent.
+mail (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+mailx (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+make (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the make program.  After Configure runs,
+	the value is reset to a plain "make" and is not useful.
 
 make_set_make (make.U):
 	Some versions of 'make' set the variable MAKE.  Others do not.
 	This variable contains the string to be included in Makefile.SH
 	so that MAKE is set if needed, and not if not needed.
 	Possible values are:
-	make_set_make='#'	# If your make program handles this for you,
-	make_set_make=$make	# if it doesn't.
+	make_set_make='#'		# If your make program handles this for you,
+	make_set_make="MAKE=$make"	# if it doesn't.
 	I used a comment character so that we can distinguish a
-	'set' value (from a previous config.sh or Configure -D option)
+	'set' value (from a previous config.sh or Configure '-D' option)
 	from an uncomputed value.
 
 mallocobj (mallocsrc.U):
@@ -1160,6 +1980,10 @@ man1dir (man1dir.U):
 	Makefile.SH to get the value of this into the proper command.
 	You must be prepared to do the ~name expansion yourself.
 
+man1direxp (man1dir.U):
+	This variable is the same as the man1dir variable, but is filename
+	expanded at configuration time, for convenient use in makefiles.
+
 man1ext (man1dir.U):
 	This variable contains the extension that the manual page should
 	have: one of 'n', 'l', or '1'.  The Makefile must supply the '.'.
@@ -1171,55 +1995,181 @@ man3dir (man3dir.U):
 	Makefile.SH to get the value of this into the proper command.
 	You must be prepared to do the ~name expansion yourself.
 
+man3direxp (man3dir.U):
+	This variable is the same as the man3dir variable, but is filename
+	expanded at configuration time, for convenient use in makefiles.
+
 man3ext (man3dir.U):
 	This variable contains the extension that the manual page should
 	have: one of 'n', 'l', or '3'.  The Makefile must supply the '.'.
 	See man3dir.
 
+medium (models.U):
+	This variable contains a flag which will tell the C compiler and loader
+	to produce a program running with a medium memory model.  If the
+	medium model is not supported, contains the flag to produce large
+	model programs.  It is up to the Makefile to use this.
+
+mips_type (usrinc.U):
+	This variable holds the environment type for the mips system.
+	Possible values are "BSD 4.3" and "System V".
+
+mkdir (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the mkdir program.  After Configure runs,
+	the value is reset to a plain "mkdir" and is not useful.
+
+models (models.U):
+	This variable contains the list of memory models supported by this
+	system.  Possible component values are none, split, unsplit, small,
+	medium, large, and huge.  The component values are space separated.
+
 modetype (modetype.U):
 	This variable defines modetype to be something like mode_t, 
 	int, unsigned short, or whatever type is used to declare file 
 	modes for system calls.
 
+more (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the more program.  After Configure runs,
+	the value is reset to a plain "more" and is not useful.
+
+mv (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+myarchname (archname.U):
+	This variable holds the architecture name computed by Configure in
+	a previous run. It is not intended to be perused by any user and
+	should never be set in a hint file.
+
+mydomain (myhostname.U):
+	This variable contains the eventual value of the MYDOMAIN symbol,
+	which is the domain of the host the program is going to run on.
+	The domain must be appended to myhostname to form a complete host name.
+	The dot comes with mydomain, and need not be supplied by the program.
+
+myhostname (myhostname.U):
+	This variable contains the eventual value of the MYHOSTNAME symbol,
+	which is the name of the host the program is going to run on.
+	The domain is not kept with hostname, but must be gotten from mydomain.
+	The dot comes with mydomain, and need not be supplied by the program.
+
+myuname (Oldconfig.U):
+	The output of 'uname -a' if available, otherwise the hostname. On Xenix,
+	pseudo variables assignments in the output are stripped, thank you. The
+	whole thing is then lower-cased.
+
 n (n.U):
-	This variable contains the -n flag if that is what causes the echo
+	This variable contains the '-n' flag if that is what causes the echo
 	command to suppress newline.  Otherwise it is null.  Correct usage is
 	    $echo $n "prompt for a question: $c".
 
+netdb_hlen_type (netdbtype.U):
+	This variable holds the type used for the 2nd argument to
+	gethostbyaddr().  Usually, this is int or size_t or unsigned.
+	This is only useful if you have gethostbyaddr(), naturally.
+
+netdb_host_type (netdbtype.U):
+	This variable holds the type used for the 1st argument to
+	gethostbyaddr().  Usually, this is char * or void *,  possibly
+	with or without a const prefix.
+	This is only useful if you have gethostbyaddr(), naturally.
+
+netdb_name_type (netdbtype.U):
+	This variable holds the type used for the argument to
+	gethostbyname().  Usually, this is char * or const char *.
+	This is only useful if you have gethostbyname(), naturally.
+
+netdb_net_type (netdbtype.U):
+	This variable holds the type used for the 1st argument to
+	getnetbyaddr().  Usually, this is int or long.
+	This is only useful if you have getnetbyaddr(), naturally.
+
+nm (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the nm program.  After Configure runs,
+	the value is reset to a plain "nm" and is not useful.
+
+nm_opt (usenm.U):
+	This variable holds the options that may be necessary for nm.
+
+nm_so_opt (usenm.U):
+	This variable holds the options that may be necessary for nm
+	to work on a shared library but that can not be used on an
+	archive library.  Currently, this is only used by Linux, where
+	nm --dynamic is *required* to get symbols from an ELF library which
+	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.
+
+nroff (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the nroff program.  After Configure runs,
+	the value is reset to a plain "nroff" and is not useful.
+
 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
 	between blocking and non-blocking, you may try ioctl(FIOSNBIO) instead,
 	but that is only supported by some devices.
 
-oldarchlib (oldarchlib.U):
-	This variable holds the name of the directory in which perl5.000
-	and perl5.001 stored 
-	architecture-dependent public library files.
-
-oldarchlibexp (oldarchlib.U):
-	This variable is the same as the oldarchlib variable, but is 
-	filename expanded at configuration time, for convenient use.
+obj_ext (Unix.U):
+	This is an old synonym for _o.
 
 optimize (ccflags.U):
 	This variable contains any optimizer/debugger flag that should be used.
 	It is up to the Makefile to use it.
 
+orderlib (orderlib.U):
+	This variable is "true" if the components of libraries must be ordered
+	(with `lorder $* | tsort`) before placing them in an archive.  Set to
+	"false" if ranlib or ar can generate random libraries.
+
 osname (Oldconfig.U):
 	This variable contains the operating system name (e.g. sunos,
 	solaris, hpux, etc.).  It can be useful later on for setting
 	defaults.  Any spaces are replaced with underscores.  It is set
 	to a null string if we can't figure it out.
 
+osvers (Oldconfig.U):
+	This variable contains the operating system version (e.g.
+	4.1.3, 5.2, etc.).  It is primarily used for helping select
+	an appropriate hints file, but might be useful elsewhere for
+	setting defaults.  It is set to '' if we can't figure it out.
+	We try to be flexible about how much of the version number
+	to keep, e.g. if 4.1.1, 4.1.2, and 4.1.3 are essentially the
+	same for this package, hints files might just be os_4.0 or
+	os_4.1, etc., not keeping separate files for each little release.
+
+package (package.U):
+	This variable contains the name of the package being constructed.
+	It is primarily intended for the use of later Configure units.
+
 pager (pager.U):
 	This variable contains the name of the preferred pager on the system.
 	Usual values are (the full pathnames of) more, less, pg, or cat.
 
+passcat (nis.U):
+	This variable contains a command that produces the text of the
+	/etc/passwd file.  This is normally "cat /etc/passwd", but can be
+	"ypcat passwd" when NIS is used.
+
+patchlevel (patchlevel.U):
+	The patchlevel level of this package.
+	The value of patchlevel comes from the patchlevel.h file.
+
 path_sep (Unix.U):
-	This variable defines the character used to separate elements in
-	the shell's PATH environment variable.  On Unix, it is ':'.
-	This is probably identical to Head.U's p_ variable and can
-	probably be dropped.
+	This is an old synonym for p_ in Head.U, the character
+	used to separate elements in the command shell search PATH.
+
+perl (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the perl program.  After Configure runs,
+	the value is reset to a plain "perl" and is not useful.
 
 perladmin (perladmin.U):
 	Electronic mail address of the perl5 administrator.
@@ -1229,6 +2179,34 @@ perlpath (perlpath.U):
 	which contains the name of the perl interpreter to be used in
 	shell scripts and in the "eval 'exec'" idiom.
 
+pg (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the pg program.  After Configure runs,
+	the value is reset to a plain "pg" and is not useful.
+
+phostname (myhostname.U):
+	This variable contains the eventual value of the PHOSTNAME symbol,
+	which is a command that can be fed to popen() to get the host name.
+	The program should probably not presume that the domain is or isn't
+	there already.
+
+pidtype (pidtype.U):
+	This variable defines PIDTYPE to be something like pid_t, int, 
+	ushort, or whatever type is used to declare process ids in the kernel.
+
+plibpth (libpth.U):
+	Holds the private path used by Configure to find out the libraries.
+	Its value is prepend to libpth. This variable takes care of special
+	machines, like the mips.  Usually, it should be empty.
+
+pmake (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+pr (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 prefix (prefix.U):
 	This variable holds the name of the directory below which the
 	user will install the package.  Usually, this is /usr/local, and
@@ -1236,6 +2214,10 @@ prefix (prefix.U):
 	man pages in /usr/local/man, etc.  It is only used to set defaults
 	for things in bin.U, mansrc.U, privlib.U, or scriptdir.U.
 
+prefixexp (prefix.U):
+	This variable holds the full absolute path of the directory below
+	which the user will install the package.  Derived from prefix.
+
 privlib (privlib.U):
 	This variable contains the eventual value of the PRIVLIB symbol,
 	which is the name of the private library for this package.  It may
@@ -1250,6 +2232,10 @@ prototype (prototype.U):
 	This variable holds the eventual value of CAN_PROTOTYPE, which
 	indicates the C compiler can handle funciton prototypes.
 
+ptrsize (ptrsize.U):
+	This variable contains the value of the PTRSIZE symbol, which
+	indicates to the C program how many bytes there are in a pointer.
+
 randbits (randbits.U):
 	This variable contains the eventual value of the RANDBITS symbol,
 	which indicates to the C program how many bits of random number
@@ -1266,6 +2252,20 @@ rd_nodata (nblock_io.U):
 	used, which is a shame because you cannot make the difference between
 	no data and an EOF.. Sigh!
 
+rm (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the rm program.  After Configure runs,
+	the value is reset to a plain "rm" and is not useful.
+
+rmail (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+runnm (usenm.U):
+	This variable contains 'true' or 'false' depending whether the
+	nm extraction should be performed or not, according to the value
+	of usenm and the flags on the Configure command line.
+
 scriptdir (scriptdir.U):
 	This variable holds the name of the directory in which the user wants
 	to put publicly scripts for the package in question.  It is either
@@ -1273,30 +2273,58 @@ scriptdir (scriptdir.U):
 	mounted across different architectures, like /usr/share. Programs
 	must be prepared to deal with ~name expansion.
 
+scriptdirexp (scriptdir.U):
+	This variable is the same as scriptdir, but is filename expanded
+	at configuration time, for programs not wanting to bother with it.
+
+sed (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the sed program.  After Configure runs,
+	the value is reset to a plain "sed" and is not useful.
+
+selectminbits (selectminbits.U):
+	This variable holds the minimum number of bits operated by select.
+	That is, if you do select(n, ...), how many bits at least will be
+	cleared in the masks if some activity is detected.  Usually this
+	is either n or 32*ceil(n/32), especially many little-endians do
+	the latter.  This is only useful if you have select(), naturally.
+
 selecttype (selecttype.U):
 	This variable holds the type used for the 2nd, 3rd, and 4th
 	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
 	is defined, and 'int *' otherwise.  This is only useful if you 
 	have select(), naturally.
 
+sendmail (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the sendmail program.  After Configure runs,
+	the value is reset to a plain "sendmail" and is not useful.
+
 sh (sh.U):
 	This variable contains the full pathname of the shell used
 	on this system to execute Bourne shell scripts.  Usually, this will be
 	/bin/sh, though it's possible that some systems will have /bin/ksh,
 	/bin/pdksh, /bin/ash, /bin/bash, or even something such as
 	D:/bin/sh.exe.
-	This unit comes before Options.U, so you can't set sh with a -D
+	This unit comes before Options.U, so you can't set sh with a '-D'
 	option, though you can override this (and startsh)
-	with -O -Dsh=/bin/whatever -Dstartsh=whatever
+	with '-O -Dsh=/bin/whatever -Dstartsh=whatever'
+
+shar (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+sharpbang (spitshell.U):
+	This variable contains the string #! if this system supports that
+	construct.
 
 shmattype (d_shmat.U):
 	This symbol contains the type of pointer returned by shmat().
 	It can be 'void *' or 'char *'.
 
 shortsize (intsize.U):
-	This variable contains the value of the SHORTSIZE symbol,
-	which indicates to the C program how many bytes there are
-	in a short integer.
+	This variable contains the value of the SHORTSIZE symbol which
+	indicates to the C program how many bytes there are in a short.
 
 shrpenv (libperl.U):
 	If the user builds a shared libperl.so, then we need to tell the
@@ -1314,14 +2342,34 @@ shrpenv (libperl.U):
 	as -R $archlibexp/CORE (Solaris, NetBSD) or -Wl,-rpath
 	$archlibexp/CORE (Linux).
 
+shsharp (spitshell.U):
+	This variable tells further Configure units whether your sh can
+	handle # comments.
+
 sig_name (sig_name.U):
 	This variable holds the signal names, space separated. The leading
-	SIG in signals name is removed. See sig_num.
+	SIG in signal name is removed.  A ZERO is prepended to the
+	list.  This is currently not used.
+
+sig_name_init (sig_name.U):
+	This variable holds the signal names, enclosed in double quotes and
+	separated by commas, suitable for use in the SIG_NAME definition 
+	below.  A "ZERO" is prepended to the list, and the list is 
+	terminated with a plain 0.  The leading SIG in signal names
+	is removed. See sig_num.
 
 sig_num (sig_name.U):
-	This variable holds the signal numbers, space separated. Those numbers
-	correspond to the value of the signal listed in the same place within
-	the sig_name list.
+	This variable holds the signal numbers, comma separated. A 0 is
+	prepended to the list (corresponding to the fake SIGZERO), and 
+	the list is terminated with a 0.  Those numbers correspond to 
+	the value of the signal listed in the same place within the
+	sig_name list.
+
+sig_num_init (sig_name.U):
+	This variable holds the signal numbers, enclosed in double quotes and
+	separated by commas, suitable for use in the SIG_NUM definition 
+	below.  A "ZERO" is prepended to the list, and the list is 
+	terminated with a plain 0.
 
 signal_t (d_voidsig.U):
 	This variable holds the type of the signal handler (void or int).
@@ -1351,14 +2399,42 @@ sizetype (sizetype.U):
 	unsigned long, or whatever type is used to declare length 
 	parameters for string functions.
 
+sleep (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+smail (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 small (models.U):
 	This variable contains a flag which will tell the C compiler and loader
 	to produce a program running with a small memory model.  It is up to
 	the Makefile to use this.
 
+so (so.U):
+	This variable holds the extension used to identify shared libraries
+	(also known as shared objects) on the system. Usually set to 'so'.
+
+sockethdr (d_socket.U):
+	This variable has any cpp '-I' flags needed for socket support.
+
+socketlib (d_socket.U):
+	This variable has the names of any libraries needed for socket support.
+
+sort (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the sort program.  After Configure runs,
+	the value is reset to a plain "sort" and is not useful.
+
+spackage (package.U):
+	This variable contains the name of the package being constructed,
+	with the first letter uppercased, i.e. suitable for starting
+	sentences.
+
 spitshell (spitshell.U):
 	This variable contains the command necessary to spit out a runnable
-	shell on this system.  It is either cat or a grep -v for # comments.
+	shell on this system.  It is either cat or a grep '-v' for # comments.
 
 split (models.U):
 	This variable contains a flag which will tell the C compiler and loader
@@ -1366,6 +2442,11 @@ split (models.U):
 	machines that support separation of instruction and data space.  It is
 	up to the Makefile to use this.
 
+src (src.U):
+	This variable holds the path to the package source. It is up to
+	the Makefile to use this variable and set VPATH accordingly to
+	find the sources remotely.
+
 ssizetype (ssizetype.U):
 	This variable defines ssizetype to be something like ssize_t, 
 	long or int.  It is used by functions that return a count 
@@ -1377,7 +2458,7 @@ startperl (startperl.U):
 	script to make sure (hopefully) that it runs with perl and not some
 	shell. Of course, that leading line must be followed by the classical
 	perl idiom:
-		eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
+		eval 'exec perl -S $0 ${1+"$@"}'
 			if $running_under_some_shell;
 	to guarantee perl startup should the shell execute the script. Note
 	that this magic incatation is not understood by csh.
@@ -1388,33 +2469,206 @@ 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):
 	This variable conditionally defines STDCHAR to be the type of char
 	used in stdio.h.  It has the values "unsigned char" or "char".
 
+stdio_base (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to access the
+	_base field (or equivalent) of stdio.h's FILE structure.  This will
+	be used to define the macro FILE_base(fp).
+
+stdio_bufsiz (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to determine
+	the number of bytes store in the I/O buffer pointer to by the
+	_base field (or equivalent) of stdio.h's FILE structure.  This will
+	be used to define the macro FILE_bufsiz(fp).
+
+stdio_cnt (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to access the
+	_cnt field (or equivalent) of stdio.h's FILE structure.  This will
+	be used to define the macro FILE_cnt(fp).
+
+stdio_filbuf (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to tell
+	stdio to refill it's internal buffers (?).  This will
+	be used to define the macro FILE_filbuf(fp).
+
+stdio_ptr (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to access the
+	_ptr field (or equivalent) of stdio.h's FILE structure.  This will
+	be used to define the macro FILE_ptr(fp).
+
+strings (i_string.U):
+	This variable holds the full path of the string header that will be
+	used. Typically /usr/include/string.h or /usr/include/strings.h.
+
+submit (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+subversion (patchlevel.U):
+	The subversion level of this package.
+	The value of subversion comes from the patchlevel.h file.
+	This is unique to perl.
+
+sysman (sysman.U):
+	This variable holds the place where the manual is located on this
+	system. It is not the place where the user wants to put his manual
+	pages. Rather it is the place where Configure may look to find manual
+	for unix commands (section 1 of the manual usually). See mansrc.
+
+tail (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+tar (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+tbl (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+tee (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the tee program.  After Configure runs,
+	the value is reset to a plain "tee" and is not useful.
+
+test (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the test program.  After Configure runs,
+	the value is reset to a plain "test" and is not useful.
+
+timeincl (i_time.U):
+	This variable holds the full path of the included time header(s).
+
 timetype (d_time.U):
 	This variable holds the type returned by time(). It can be long,
 	or time_t on BSD sites (in which case <sys/types.h> should be
 	included). Anyway, the type Time_t should be used.
 
+touch (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the touch program.  After Configure runs,
+	the value is reset to a plain "touch" and is not useful.
+
+tr (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the tr program.  After Configure runs,
+	the value is reset to a plain "tr" and is not useful.
+
+trnl (trnl.U):
+	This variable contains the value to be passed to the tr(1)
+	command to transliterate a newline.  Typical values are
+	'\012' and '\n'.  This is needed for EBCDIC systems where
+	newline is not necessarily '\012'.
+
+troff (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 uidtype (uidtype.U):
 	This variable defines Uid_t to be something like uid_t, int, 
 	ushort, or whatever type is used to declare user ids in the kernel.
 
+uname (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the uname program.  After Configure runs,
+	the value is reset to a plain "uname" and is not useful.
+
+uniq (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the uniq program.  After Configure runs,
+	the value is reset to a plain "uniq" and is not useful.
+
+usedl (dlsrc.U):
+	This variable indicates if the the system supports dynamic
+	loading of some sort.  See also dlsrc and dlobj.
+
+usemymalloc (mallocsrc.U):
+	This variable contains y if the malloc that comes with this package
+	is desired over the system's version of malloc.  People often include
+	special versions of malloc for effiency, but such versions are often
+	less portable.  See also mallocsrc and mallocobj.
+	If this is 'y', then -lmalloc is removed from $libs.
+
+usenm (usenm.U):
+	This variable contains 'true' or 'false' depending whether the
+	nm extraction is wanted or not.
+
+useopcode (Extensions.U):
+	This variable holds either 'true' or 'false' to indicate
+	whether the Opcode extension should be used.  The sole
+	use for this currently is to allow an easy mechanism
+	for users to skip the Opcode extension from the Configure
+	command line.
+
 useperlio (useperlio.U):
 	This variable conditionally defines the USE_PERLIO symbol,
 	and indicates that the PerlIO abstraction should be
 	used throughout.
 
+useposix (Extensions.U):
+	This variable holds either 'true' or 'false' to indicate
+	whether the POSIX extension should be used.  The sole
+	use for this currently is to allow an easy mechanism
+	for hints files to indicate that POSIX will not compile
+	on a particular system.
+
+usesfio (d_sfio.U):
+	This variable is set to true when the user agrees to use sfio.
+	It is set to false when sfio is not available or when the user
+	explicitely requests not to use sfio.  It is here primarily so
+	that command-line settings can override the auto-detection of
+	d_sfio without running into a "WHOA THERE".
+
 useshrplib (libperl.U):
 	This variable is set to 'yes' if the user wishes
 	to build a shared libperl, and 'no' otherwise.
 
+usethreads (usethreads.U):
+	This variable conditionally defines the USE_THREADS symbol,
+	and indicates that Perl should be built to use threads.
+
+usevfork (d_vfork.U):
+	This variable is set to true when the user accepts to use vfork.
+	It is set to false when no vfork is available or when the user
+	explicitely requests not to use vfork.
+
+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.
+
+uuname (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+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.
+
+vi (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
 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
 	compiler.  See VOIDFLAGS for more info.
 
+zcat (Loc.U):
+	This variable is defined but not used by Configure.
+	The value is a plain '' and is not useful.
+
+zip (Loc.U):
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the zip program.  After Configure runs,
+	the value is reset to a plain "zip" and is not useful.
+
diff --git a/gnu/usr.bin/perl/Porting/makerel b/gnu/usr.bin/perl/Porting/makerel
index f719a5e9361..f2e1f9750b2 100644
--- a/gnu/usr.bin/perl/Porting/makerel
+++ b/gnu/usr.bin/perl/Porting/makerel
@@ -17,20 +17,35 @@ $relroot = "..";	# XXX make an option
 die "Must be in root of the perl source tree.\n"
 	unless -f "./MANIFEST" and -f "patchlevel.h";
 
-$patchlevel_h = `grep '#define ' patchlevel.h`;
+open PATCHLEVEL,"<patchlevel.h" or die;
+my @patchlevel_h = <PATCHLEVEL>;
+close PATCHLEVEL;
+my $patchlevel_h = join "", grep { /^#define/ } @patchlevel_h;
 print $patchlevel_h;
 $patchlevel = $1 if $patchlevel_h =~ /PATCHLEVEL\s+(\d+)/;
 $subversion = $1 if $patchlevel_h =~ /SUBVERSION\s+(\d+)/;
-die "Unable to parse patchlevel.h" unless $subversion > 0;
+die "Unable to parse patchlevel.h" unless $subversion >= 0;
 $vers = sprintf("5.%03d", $patchlevel);
-$vers.= sprintf( "_%02d", $subversion) if $subversion;
+$vms_vers = sprintf("5_%03d", $patchlevel);
+if ($subversion) {
+    $vers.= sprintf( "_%02d", $subversion);
+    $vms_vers.= sprintf( "%02d", $subversion);
+} else {
+    $vms_vers.= "  ";
+}
 
-$perl = "perl$vers";
-$reldir = "$relroot/$perl";
-$reldir .= "-$ARGV[0]" if $ARGV[0];
+# fetch list of local patches
+my (@local_patches, @lpatch_tags, $lpatch_tags);
+@local_patches = grep { /^static.*local_patches/../^};/ } @patchlevel_h;
+@local_patches = grep { !/^\s*,?NULL/  } @local_patches;
+@lpatch_tags   = map  {  /^\s*,"(\w+)/ } @local_patches;
+$lpatch_tags   = join "-", @lpatch_tags;
 
-print "\nMaking a release for $perl in $reldir\n\n";
+$perl = "perl$vers";
+$reldir = "$perl";
+$reldir .= "-$lpatch_tags" if $lpatch_tags;
 
+print "\nMaking a release for $perl in $relroot/$reldir\n\n";
 
 print "Cross-checking the MANIFEST...\n";
 ($missfile, $missentry) = fullcheck();
@@ -46,16 +61,34 @@ if ("@$missentry" =~ m/\.orig\b/) {
 die "Aborted.\n" if @$missentry or @$missfile;
 print "\n";
 
+# VMS no longer has hardcoded version numbers descrip.mms
+#print "Updating VMS version specific files with $vms_vers...\n";
+#system("perl -pi -e 's/^\QPERL_VERSION = \E\d\_\d+(\s*\#)/PERL_VERSION = $vms_vers$1/' vms/descrip.mms");
+
+
+
+print "Creating $relroot/$reldir release directory...\n";
+die "$relroot/$reldir release directory already exists\n"   if -e "$relroot/$reldir";
+die "$relroot/$reldir.tar.gz release file already exists\n" if -e "$relroot/$reldir.tar.gz";
+mkdir("$relroot/$reldir", 0755) or die "mkdir $relroot/$reldir: $!\n";
+print "\n";
+
+
+print "Copying files to release directory...\n";
+# ExtUtils::Manifest maniread does not preserve the order
+$cmd = "awk '{print \$1}' MANIFEST | cpio -pdm $relroot/$reldir";
+system($cmd) == 0 or die "$cmd failed";
+print "\n";
+
+chdir "$relroot/$reldir" or die $!;
 
 print "Setting file permissions...\n";
 system("find . -type f -print     | xargs chmod -w");
 system("find . -type d -print     | xargs chmod g-s");
 system("find t -name '*.t' -print | xargs chmod +x");
-system("chmod +w configure"); # special case (see pumpkin.pod)
-@exe = qw(
+my @exe = qw(
     Configure
     configpm
-    configure
     embed.pl
     installperl
     installman
@@ -68,32 +101,28 @@ system("chmod +w configure"); # special case (see pumpkin.pod)
     *.SH
     vms/ext/Stdio/test.pl
     vms/ext/filespec.t
-    vms/fndvers.com
     x2p/*.SH
     Porting/patchls
     Porting/makerel
 );
 system("chmod +x @exe");
-print "\n";
-
-
-print "Creating $reldir release directory...\n";
-die "$reldir release directory already exists\n"   if -e "../$perl";
-die "$reldir.tar.gz release file already exists\n" if -e "../$reldir.tar.gz";
-mkdir($reldir, 0755) or die "mkdir $reldir: $!\n";
-print "\n";
 
-
-print "Copying files to release directory...\n";
-# ExtUtils::Manifest maniread does not preserve the order
-$cmd = "awk '{print \$1}' MANIFEST | cpio -pdm $reldir";
-system($cmd) == 0 or die "$cmd failed";
+print "Adding CRs to DOSish files...\n";
+my @crlf = qw(
+    djgpp/configure.bat
+    README.dos
+    README.win32
+    win32/Makefile
+    win32/makefile.mk
+);
+system("perl -pi -e 's/\$/\\r/' @crlf");
 print "\n";
 
-chdir $relroot or die $!;
+chdir ".." or die $!;
 
 print "Creating and compressing the tar file...\n";
-$cmd = "tar cf - $perl | gzip --best > $perl.tar.gz";
+my $src = (-e $perl) ? $perl : 'perl'; # 'perl' in maint branch
+$cmd = "tar cf - $reldir | gzip --best > $reldir.tar.gz";
 system($cmd) == 0 or die "$cmd failed";
 print "\n";
 
diff --git a/gnu/usr.bin/perl/Porting/patchls b/gnu/usr.bin/perl/Porting/patchls
index 1d4bd5ac400..38c4dd1f473 100644
--- a/gnu/usr.bin/perl/Porting/patchls
+++ b/gnu/usr.bin/perl/Porting/patchls
@@ -17,10 +17,10 @@ use Text::Tabs qw(expand unexpand);
 use strict;
 use vars qw($VERSION);
 
-$VERSION = 2.04;
+$VERSION = 2.08;
 
 sub usage {
-die q{
+die qq{
   patchls [options] patchfile [ ... ]
 
     -h     no filename headers (like grep), only the listing.
@@ -30,13 +30,20 @@ die q{
     -m     print formatted Meta-information (Subject,From,Msg-ID etc).
     -p N   strip N levels of directory Prefix (like patch), else automatic.
     -v     more verbose (-d for noisy debugging).
+    -n     give a count of the number of patches applied to a file if >1.
     -f F   only list patches which patch files matching regexp F
-           (F has $ appended unless it contains a /).
+           (F has \$ appended unless it contains a /).
+    -e     Expect patched files to Exist (relative to current directory)
+           Will print warnings for files which don't. Also affects -4 option.
   other options for special uses:
     -I     just gather and display summary Information about the patches.
     -4     write to stdout the PerForce commands to prepare for patching.
+    -5     like -4 but add "|| exit 1" after each command
     -M T   Like -m but only output listed meta tags (eg -M 'Title From')
     -W N   set wrap width to N (defaults to 70, use 0 for no wrap)
+    -X     list patchfiles that may clash (i.e. patch the same file)
+
+  patchls version $VERSION by Tim Bunce
 }
 }
 
@@ -44,40 +51,75 @@ $::opt_p = undef;	# undef != 0
 $::opt_d = 0;
 $::opt_v = 0;
 $::opt_m = 0;
+$::opt_n = 0;
 $::opt_i = 0;
 $::opt_h = 0;
 $::opt_l = 0;
 $::opt_c = 0;
 $::opt_f = '';
+$::opt_e = 0;
 
 # special purpose options
 $::opt_I = 0;
 $::opt_4 = 0;	# output PerForce commands to prepare for patching
+$::opt_5 = 0;
 $::opt_M = '';	# like -m but only output these meta items (-M Title)
 $::opt_W = 70;	# set wrap width columns (see Text::Wrap module)
+$::opt_C = 0;	# 'Chip' mode (handle from/tags/article/bug files) undocumented
+$::opt_X = 0;	# list patchfiles that patch the same file
 
 usage unless @ARGV;
 
-getopts("mihlvc4p:f:IM:W:") or usage;
+getopts("dmnihlvecC45Xp:f:IM:W:") or usage;
 
 $columns = $::opt_W || 9999999;
 
 $::opt_m = 1 if $::opt_M;
-my @show_meta = split(' ', $::opt_M || 'Title From Msg-ID');
+$::opt_4 = 1 if $::opt_5;
+$::opt_i = 1 if $::opt_X;
+
+# see get_meta_info()
+my @show_meta = split(' ', $::opt_M || 'Title From Msg-ID Files');
+my %show_meta = map { ($_,1) } @show_meta;
 
 my %cat_title = (
     'BUILD'	=> 'BUILD PROCESS',
     'CORE'	=> 'CORE LANGUAGE',
     'DOC'	=> 'DOCUMENTATION',
-    'LIB'	=> 'LIBRARY AND EXTENSIONS',
+    'LIB'	=> 'LIBRARY',
     'PORT1'	=> 'PORTABILITY - WIN32',
     'PORT2'	=> 'PORTABILITY - GENERAL',
     'TEST'	=> 'TESTS',
     'UTIL'	=> 'UTILITIES',
     'OTHER'	=> 'OTHER CHANGES',
+    'EXT'	=> 'EXTENSIONS',
+    'UNKNOWN'	=> 'UNKNOWN - NO FILES PATCH',
 );
 
-my %ls;
+
+sub get_meta_info {
+    my $ls = shift;
+    local($_) = shift;
+    if (/^From:\s+(.*\S)/i) {;
+	my $from = $1;	# temporary measure for Chip Salzenberg
+	$from =~ s/chip\@(atlantic\.net|perlsupport\.com)/chip\@pobox.com/;
+	$from =~ s/\(Tim Bunce\) \(Tim Bunce\)/(Tim Bunce)/;
+	$ls->{From}{$from} = 1
+    }
+    if (/^Subject:\s+(?:Re: )?(.*\S)/i) {
+	my $title = $1;
+	$title =~ s/\[(PATCH|PERL)[\w\. ]*\]:?//g;
+	$title =~ s/\b(PATCH|PERL)[\w\.]*://g;
+	$title =~ s/\bRe:\s+/ /g;
+	$title =~ s/\s+/ /g;
+	$title =~ s/^\s*(.*?)\s*$/$1/g;
+	$ls->{Title}{$title} = 1;
+    }
+    $ls->{'Msg-ID'}{$1}=1 if /^Message-Id:\s+(.*\S)/i;
+    $ls->{Date}{$1}=1     if /^Date:\s+(.*\S)/i;
+    $ls->{$1}{$2}=1       if $::opt_M && /^([-\w]+):\s+(.*\S)/;
+}
+
 
 # Style 1:
 #	*** perl-5.004/embed.h  Sat May 10 03:39:32 1997
@@ -97,10 +139,16 @@ my %ls;
 # Variation:
 #	Index: embed.h
 
-my($in, $prevline, $prevtype, $ls);
-my(@removed, @added);
+my %ls;
+
+my $in;
+my $ls;
+my $prevline = '';
+my $prevtype = '';
+my (@removed, @added);
 my $prologue = 1;	# assume prologue till patch or /^exit\b/ seen
 
+
 foreach my $argv (@ARGV) {
     $in = $argv;
     unless (open F, "<$in") {
@@ -119,25 +167,24 @@ foreach my $argv (@ARGV) {
 		push @removed, $1   if /^rm\s+(?:-f)?\s*(\S+)/;
 		$prologue = 0       if /^exit\b/;
 	    }
-	    next unless $::opt_m;
-	    $ls->{From}{$1}=1,next     if /^From:\s+(.*\S)/i;
-	    $ls->{Title}{$1}=1,next    if /^Subject:\s+(?:Re: )?(.*\S)/i;
-	    $ls->{'Msg-ID'}{$1}=1,next if /^Message-Id:\s+(.*\S)/i;
-	    $ls->{Date}{$1}=1,next     if /^Date:\s+(.*\S)/i;
-	    $ls->{$1}{$2}=1,next       if /^([-\w]+):\s+(.*\S)/;
+	    get_meta_info($ls, $_) if $::opt_m;
 	    next;
 	}
 	$type = $1;
 	next if /^--- [0-9,]+ ----$/ || /^\*\*\* [0-9,]+ \*\*\*\*$/;
 	$prologue = 0;
 
-	print "Last: $prevline","This: ${_}Got:  $1\n\n" if $::opt_d;
+	print "Last: $prevline","This: ${_}Got:  $type\n\n" if $::opt_d;
 
 	# Some patches have Index lines but not diff headers
 	# Patch copes with this, so must we. It's also handy for
 	# documenting manual changes by simply adding Index: lines
-	# to the file which describes the problem bing fixed.
-	add_file($ls, $1), next if /^Index:\s+(\S+)/;
+	# to the file which describes the problem being fixed.
+	if (/^Index:\s+(.*)/) {
+	    my $f;
+	    foreach $f (split(/ /, $1)) { add_file($ls, $f) }
+	    next;
+	}
 
 	if (	($type eq '---' and $prevtype eq '***')	# Style 1
 	    or	($type eq '+++' and $prevtype eq '---')	# Style 2
@@ -152,9 +199,32 @@ foreach my $argv (@ARGV) {
     }
     continue {
 	$prevline = $_;
-	$prevtype = $type;
+	$prevtype = $type || '';
 	$type = '';
     }
+
+    # special mode for patch sets from Chip
+    if ($in =~ m:[\\/]patch$:) {
+	my $is_chip;
+	my $chip;
+	my $dir; ($dir = $in) =~ s:[\\/]patch$::;
+	if (!$ls->{From} && (open(CHIP,"$dir/article") || open(CHIP,"$dir/bug"))) {
+	    get_meta_info($ls, $_) while (<CHIP>);
+	    $is_chip = 1;
+	}
+	if (open CHIP,"<$dir/from") {
+	    chop($chip = <CHIP>);
+	    $ls->{From} = { $chip => 1 };
+	    $is_chip = 1;
+	}
+	if (open CHIP,"<$dir/tag") {
+	    chop($chip = <CHIP>);
+	    $ls->{Title} = { $chip => 1 };
+	    $is_chip = 1;
+	}
+	$ls->{From} = { "Chip Salzenberg" => 1 } if $is_chip && !$ls->{From};
+    }
+
     # if we don't have a title for -m then use the file name
     $ls->{Title}{$in}=1 if $::opt_m
 	and !$ls->{Title} and $ls->{out};
@@ -170,13 +240,15 @@ print scalar(@ARGV)." files read.\n" if $::opt_v and @ARGV > 1;
 my @ls  = values %ls;
 
 if ($::opt_f) {		# filter out patches based on -f <regexp>
-    my $out;
     $::opt_f .= '$' unless $::opt_f =~ m:/:;
     @ls = grep {
-	my @out = keys %{$_->{out}};
 	my $match = 0;
-	for $out (@out) {
-	    ++$match if $out =~ m/$::opt_f/o;
+	if ($_->{is_in}) {
+	    my @out = keys %{ $_->{out} };
+	    $match=1 if grep { m/$::opt_f/o } @out;
+	}
+	else {
+	    $match=1 if $_->{in} =~ m/$::opt_f/o;
 	}
 	$match;
     } @ls;
@@ -190,35 +262,54 @@ if ($::opt_f) {		# filter out patches based on -f <regexp>
 # --- Handle special modes ---
 
 if ($::opt_4) {
-    print map { "p4 delete $_\n" } @removed if @removed;
-    print map { "p4 add    $_\n" } @added   if @added;
-    my @patches = grep { $_->{is_in} } @ls;
+    my $tail = ($::opt_5) ? "|| exit 1" : "";
+    print map { "p4 delete $_$tail\n" } @removed if @removed;
+    print map { "p4 add    $_$tail\n" } @added   if @added;
+    my @patches = sort grep { $_->{is_in} } @ls;
+    my @no_outs = grep { keys %{$_->{out}} == 0 } @patches;
+    warn "Warning: Some files contain no patches:",
+	join("\n\t", '', map { $_->{in} } @no_outs), "\n" if @no_outs;
     my %patched = map { ($_, 1) } map { keys %{$_->{out}} } @patches;
     delete @patched{@added};
     my @patched = sort keys %patched;
-    print map { "p4 edit   $_\n" } @patched if @patched;
-    exit 0;
+    foreach(@patched) {
+	my $edit = ($::opt_e && !-f $_) ? "add " : "edit";
+	print "p4 $edit   $_$tail\n";
+    }
+    exit 0 unless $::opt_C;
 }
 
+
 if ($::opt_I) {
     my $n_patches = 0;
     my($in,$out);
     my %all_out;
+    my @no_outs;
     foreach $in (@ls) {
 	next unless $in->{is_in};
 	++$n_patches;
 	my @outs = keys %{$in->{out}};
+	push @no_outs, $in unless @outs;
 	@all_out{@outs} = ($in->{in}) x @outs;
     }
     my @all_out = sort keys %all_out;
     my @missing = grep { ! -f $_ } @all_out;
     print "$n_patches patch files patch ".@all_out." files (".@missing." missing)\n";
+    print @no_outs." patch files don't contain patches.\n" if @no_outs;
     print "(use -v to list patches which patch 'missing' files)\n"
-	    if @missing && !$::opt_v;
+	    if (@missing || @no_outs) && !$::opt_v;
+    if ($::opt_v and @no_outs) {
+	print "Patch files which don't contain patches:\n";
+	foreach $out (@no_outs) {
+	    printf "  %-20s\n", $out->{in};
+	}
+    }
     if ($::opt_v and @missing) {
 	print "Missing files:\n";
 	foreach $out (@missing) {
-	    printf "  %-20s\t%s\n", $out, $all_out{$out};
+	    printf "  %-20s\t", $out	unless $::opt_h;
+	    print $all_out{$out}	unless $::opt_l;
+	    print "\n";
 	}
     }
     print "Added files:   @added\n"   if @added;
@@ -229,6 +320,7 @@ if ($::opt_I) {
 unless ($::opt_c and $::opt_m) {
     foreach $ls (@ls) {
 	next unless ($::opt_i) ? $ls->{is_out} : $ls->{is_in};
+	next if $::opt_X and keys %{$ls->{out}} <= 1;
 	list_files_by_patch($ls);
     }
 }
@@ -263,10 +355,13 @@ exit 0;
 
 sub add_file {
     my $ls = shift;
+	print "add_file '$_[0]'\n" if $::opt_d;
     my $out = trim_name(shift);
 
     $ls->{out}->{$out} = 1;
 
+    warn "$out patched but not present\n" if $::opt_e && !-f $out;
+
     # do the -i inverse as well, even if we're not doing -i
     my $i = $ls{$out} ||= {
 	is_out   => 1,
@@ -308,7 +403,8 @@ sub list_files_by_patch {
 	    my @list = sort keys %{$ls->{$meta}};
 	    push @meta, sprintf "%7s:  ", $meta;
 	    if ($meta eq 'Title') {
-		@list = map { s/\[?PATCH\]?:?\s*//g; "\"$_\""; } @list
+		@list = map { "\"$_\""; } @list;
+		push @list, "#$1" if $::opt_C && $ls->{in} =~ m:\b(\w\d+)/patch$:;
 	    }
 	    elsif ($meta eq 'From') {
 		# fix-up bizzare addresses from japan and ibm :-)
@@ -328,17 +424,27 @@ sub list_files_by_patch {
 	$name = "\n$name" if @meta and $name;
     }
     # don't print the header unless the file contains something interesting
-    return if !@meta and !$ls->{out};
-    print("$ls->{in}\n"),return  if $::opt_l;	# -l = no listing
+    return if !@meta and !$ls->{out} and !$::opt_v;
+    if ($::opt_l) {	# -l = no listing, just names
+	print "$ls->{in}";
+	my $n = keys %{ $ls->{out} };
+	print " ($n patches)" if $::opt_n and $n>1;
+	print "\n";
+	return;
+    }
 
     # a twisty maze of little options
     my $cat = ($ls->{category} and !$::opt_m) ? "\t$ls->{category}" : "";
     print "$name$cat: "	unless ($::opt_h and !$::opt_v) or !"$name$cat";
     print join('',"\n",@meta) if @meta;
 
+    return if $::opt_m && !$show_meta{Files};
     my @v = sort PATORDER keys %{ $ls->{out} };
-    my $v = "@v\n";
+    my $n = @v;
+    my $v = "@v";
     print $::opt_m ? "  Files:  ".my_wrap("","          ",$v) : $v;
+    print " ($n patches)" if $::opt_n and $n>1;
+    print "\n";
 }
 
 
@@ -364,8 +470,10 @@ sub categorize_files {
 	    if m:^(cygwin32|os2|plan9|qnx|vms)/:
 	    or m:^(hints|Porting|ext/DynaLoader)/:
 	    or m:^README\.:;
+	$c{EXT}  += 10,next
+	    if m:^(ext|lib/ExtUtils)/:;
 	$c{LIB}  += 10,next
-	    if m:^(lib|ext)/:;
+	    if m:^(lib)/:;
 	$c{'CORE'} += 15,next
 	    if m:^[^/]+[\._]([chH]|sym|pl)$:;
 	$c{BUILD} += 10,next
@@ -391,7 +499,7 @@ sub categorize_files {
     }
     else {
 	my($c, $v) = %c;
-	$c ||= 'OTHER'; $v ||= 0;
+	$c ||= 'UNKNOWN'; $v ||= 0;
 	print "  ".@$files." patches: $c: $v\n" if $verb;
 	return $c;
     }
diff --git a/gnu/usr.bin/perl/Porting/pumpkin.pod b/gnu/usr.bin/perl/Porting/pumpkin.pod
index 6706c6c3c42..335e49f2733 100644
--- a/gnu/usr.bin/perl/Porting/pumpkin.pod
+++ b/gnu/usr.bin/perl/Porting/pumpkin.pod
@@ -113,6 +113,8 @@ patch' entry in patchlevel.h.
 Watch for announcements of maintenance subversions in
 comp.lang.perl.announce.
 
+The first rule of maintenance work is "First, do no harm."
+
 =head2 Why such a complicated scheme?
 
 Two reasons, really.  At least.
@@ -217,9 +219,16 @@ patch these directly; patch the data files instead.
 
 F<Configure> and F<config_h.SH> are also automatically generated by
 B<metaconfig>.  In general, you should patch the metaconfig units
-instead of patching these files directly.  However, minor changes to
+instead of patching these files directly.  However, very minor changes to
 F<Configure> may be made in between major sync-ups with the metaconfig
-units, which tends to be complicated operations.
+units, which tends to be complicated operations.  But be careful, this
+can quickly spiral out of control.  Running metaconfig is not really
+hard.
+
+Finally, the sample files in the F<Porting/> subdirectory are
+generated automatically by the script F<U/mksample> included 
+with the metaconfig units.  See L<"run metaconfig"> below for
+information on obtaining the metaconfig units.
 
 =head1 How to Make a Distribution
 
@@ -273,16 +282,16 @@ change the appropriate metaconfig units instead, and regenerate Configure.
 
 	metaconfig -m
 
-will regenerate Configure and config_h.SH.  More information on
-obtaining and running metaconfig is in the F<U/README> file that comes
-with Perl's metaconfig units.  Perl's metaconfig units should be
-available the same place you found this file.  On CPAN, look under my
-directory F<authors/id/ANDYD/> for a file such as F<5.003_07-02.U.tar.gz>.
-That file should be unpacked in your main perl source directory.  It
-contains the files needed to run B<metaconfig> to reproduce Perl's
-Configure script.  (Those units are for 5.003_07.  There have been
-changes since then; please contact me if you want more recent
-versions, and I will try to point you in the right direction.)
+will regenerate Configure and config_h.SH.  Much more information
+on obtaining and running metaconfig is in the F<U/README> file
+that comes with Perl's metaconfig units.  Perl's metaconfig units
+should be available on CPAN.  A set of units that will work with
+perl5.005 is in the file F<mc_units-5.005_00-01.tar.gz> under
+http://www.perl.com/CPAN/authors/id/ANDYD/ .  The mc_units tar file
+should be unpacked in your main perl source directory.  Note: those
+units were for use with 5.005.  There may have been changes since then.
+Check for later versions or contact perl5-porters@perl.org to obtain a
+pointer to the current version.
 
 Alternatively, do consider if the F<*ish.h> files might be a better
 place for your changes.
@@ -297,17 +306,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
@@ -320,14 +319,15 @@ learned how to use the full suite of tools in the dist distribution.
 All the tests in the t/ directory ought to be executable.  The
 main makefile used to do a 'chmod t/*/*.t', but that resulted in
 a self-modifying distribution--something some users would strongly
-prefer to avoid.  Probably, the F<t/TEST> script should check for this
-and do the chmod if needed, but it doesn't currently.
+prefer to avoid.  The F<t/TEST> script will check for this
+and do the chmod if needed, but the tests still ought to be
+executable.
 
 In all, the following files should probably be executable:
 
     Configure
     configpm
-    configure
+    configure.gnu
     embed.pl
     installperl
     installman
@@ -340,7 +340,6 @@ In all, the following files should probably be executable:
     *.SH
     vms/ext/Stdio/test.pl
     vms/ext/filespec.t
-    vms/fndvers.com
     x2p/*.SH
 
 Other things ought to be readable, at least :-).
@@ -355,18 +354,43 @@ permissions for system files; something like that might be appropriate.
 =head2 Run Configure
 
 This will build a config.sh and config.h.  You can skip this if you haven't
-changed Configure or config_h.SH at all.
-
-=head2 Update config_H
-
-The config_H file is provided to help those folks who can't run Configure.
-It is important to keep it up-to-date.  If you have changed config_h.SH,
-those changes must be reflected in config_H as well.  (The name config_H was
-chosen to distinguish the file from config.h even on case-insensitive file
-systems.)  Simply edit the existing config_H file; keep the first few
-explanatory lines and then copy your new config.h below.
-
-It may also be necessary to update vms/config.vms and
+changed Configure or config_h.SH at all.  I use the following command
+
+    sh Configure -Dprefix=/opt/perl -Doptimize=-O -Dusethreads \
+	-Dcf_by='yourname' \
+	-Dcf_email='yourname@yourhost.yourplace.com' \
+	-Dperladmin='yourname@yourhost.yourplace.com' \
+	-Dmydomain='.yourplace.com' \
+	-Dmyhostname='yourhost' \
+	-des
+
+=head2 Update Porting/config.sh and Porting/config_H
+
+[XXX 
+This section needs revision.  We're currently working on easing
+the task of keeping the vms, win32, and plan9 config.sh info
+up-to-date.  The plan is to use keep up-to-date 'canned' config.sh
+files in the appropriate subdirectories and then generate 'canned'
+config.h files for vms, win32, etc. from the generic config.sh file.
+This is to ease maintenance.  When Configure gets updated, the parts
+sometimes get scrambled around, and the changes in config_H can
+sometimes be very hard to follow.  config.sh, on the other hand, can
+safely be sorted, so it's easy to track (typically very small) changes
+to config.sh and then propoagate them to a canned 'config.h' by any
+number of means, including a perl script in win32/ or carrying 
+config.sh and config_h.SH to a Unix system and running sh
+config_h.SH.)
+XXX]
+
+The Porting/config.sh and Porting/config_H files are provided to
+help those folks who can't run Configure.  It is important to keep
+them up-to-date.  If you have changed config_h.SH, those changes must
+be reflected in config_H as well.  (The name config_H was chosen to
+distinguish the file from config.h even on case-insensitive file systems.)
+Simply edit the existing config_H file; keep the first few explanatory
+lines and then copy your new config.h below.
+
+It may also be necessary to update win32/config.?c, vms/config.vms and
 plan9/config.plan9, though you should be quite careful in doing so if
 you are not familiar with those systems.  You might want to issue your
 patch with a promise to quickly issue a follow-up that handles those
@@ -389,13 +413,13 @@ task.
 
 Some additional notes from Larry on this:
 
-Don't forget to regenerate perly.c.diff.
+Don't forget to regenerate perly_c.diff.
 
     byacc -d perly.y
     mv y.tab.c perly.c
-    patch perly.c <perly.c.diff
+    patch perly.c <perly_c.diff
     # manually apply any failed hunks
-    diff -c2 perly.c.orig perly.c >perly.c.diff
+    diff -c2 perly.c.orig perly.c >perly_c.diff
 
 One chunk of lines that often fails begins with
 
@@ -467,6 +491,23 @@ ought to go in the Changes file or whether they ought to be available
 separately in the patch file (or both).  There is no disagreement that
 detailed descriptions ought to be easily available somewhere.
 
+=head2 Todo
+
+The F<Todo> file contains a roughly-catgorized unordered list of
+aspects of Perl that could use enhancement, features that could be
+added, areas that could be cleaned up, and so on.  During your term as
+pumpkin-holder, you will probably address some of these issues, and
+perhaps identify others which, while you decide not to address them
+this time around, may be tackled in the future.  Update the file
+reflect the situation as it stands when you hand over the pumpkin.
+
+You might like, early in your pumpkin-holding career, to see if you
+can find champions for partiticular issues on the to-do list: an issue
+owned is an issue more likely to be resolved.
+
+There are also some more porting-specific L<Todo> items later in this
+file.
+
 =head2 OS/2-specific updates
 
 In the os2 directory is F<diff.configure>, a set of OS/2-specific
@@ -1030,6 +1071,62 @@ distribution modules.  If you do
 
 then perl.c will put /my/override ahead of ARCHLIB and PRIVLIB.
 
+=head2 Shared libperl.so location
+
+Why isn't the shared libperl.so installed in /usr/lib/ along
+with "all the other" shared libraries?  Instead, it is installed
+in $archlib, which is typically something like
+
+	/usr/local/lib/perl5/archname/5.00404
+
+and is architecture- and version-specific.
+
+The basic reason why a shared libperl.so gets put in $archlib is so that
+you can have more than one version of perl on the system at the same time,
+and have each refer to its own libperl.so.
+
+Three examples might help.  All of these work now; none would work if you
+put libperl.so in /usr/lib.
+
+=over
+
+=item 1.
+
+Suppose you want to have both threaded and non-threaded perl versions
+around.  Configure will name both perl libraries "libperl.so" (so that
+you can link to them with -lperl).  The perl binaries tell them apart
+by having looking in the appropriate $archlib directories.
+
+=item 2.
+
+Suppose you have perl5.004_04 installed and you want to try to compile
+it again, perhaps with different options or after applying a patch.
+If you already have libperl.so installed in /usr/lib/, then it may be
+either difficult or impossible to get ld.so to find the new libperl.so
+that you're trying to build.  If, instead, libperl.so is tucked away in
+$archlib, then you can always just change $archlib in the current perl
+you're trying to build so that ld.so won't find your old libperl.so.
+(The INSTALL file suggests you do this when building a debugging perl.)
+
+=item 3.
+
+The shared perl library is not a "well-behaved" shared library with
+proper major and minor version numbers, so you can't necessarily
+have perl5.004_04 and perl5.004_05 installed simultaneously.  Suppose
+perl5.004_04 were to install /usr/lib/libperl.so.4.4, and perl5.004_05
+were to install /usr/lib/libperl.so.4.5.  Now, when you try to run
+perl5.004_04, ld.so might try to load libperl.so.4.5, since it has
+the right "major version" number.  If this works at all, it almost
+certainly defeats the reason for keeping perl5.004_04 around.  Worse,
+with development subversions, you certaily can't guarantee that
+libperl.so.4.4 and libperl.so.4.55 will be compatible.
+
+Anyway, all this leads to quite obscure failures that are sure to drive
+casual users crazy.  Even experienced users will get confused :-).  Upon
+reflection, I'd say leave libperl.so in $archlib.
+
+=back
+
 =head1 Upload Your Work to CPAN
 
 You can upload your work to CPAN if you have a CPAN id.  Check out
@@ -1073,12 +1170,23 @@ described in F<INSTALL>.  AFS users also are treated specially.
 We should probably duplicate the metaconfig prefix stuff for an
 install prefix.
 
-=item Configure -Dsrcdir=/blah/blah
+=item Configure -Dsrc=/blah/blah
 
 We should be able to emulate B<configure --srcdir>.  Tom Tromey
 tromey@creche.cygnus.com has submitted some patches to
-the dist-users mailing list along these lines.  Eventually, they ought
-to get folded back into the main distribution.
+the dist-users mailing list along these lines.  They have been folded
+back into the main distribution, but various parts of the perl
+Configure/build/install process still assume src='.'.
+
+=item Directory for vendor-supplied modules?
+
+If a vendor supplies perl, but wants to leave $siteperl and $sitearch
+for the local user to use, where should the vendor put vendor-supplied
+modules (such as Tk.so?)  If the vendor puts them in $archlib, then
+they need to be updated each time the perl version is updated.
+Perhaps we need a set of libries $vendorperl and $vendorarch that
+track $apiversion (like the $sitexxx directories do) rather than
+just $version (like the main perl directory).
 
 =item Hint file fixes
 
@@ -1090,6 +1198,47 @@ Configure so that most of them aren't needed.
 Some of the hint file information (particularly dynamic loading stuff)
 ought to be fed back into the main metaconfig distribution.
 
+=item Catch GNU Libc "Stub" functions
+
+Some functions (such as lchown()) are present in libc, but are
+unimplmented.  That is, they always fail and set errno=ENOSYS.
+
+Thomas Bushnell provided the following sample code and the explanation
+that follows:
+
+    /* System header to define __stub macros and hopefully few prototypes,
+	which can conflict with char FOO(); below.  */
+    #include <assert.h>
+    /* Override any gcc2 internal prototype to avoid an error.  */
+    /* We use char because int might match the return type of a gcc2
+	builtin and then its argument prototype would still apply.  */
+    char FOO();
+
+    int main() {
+
+    /* The GNU C library defines this for functions which it implements
+	to always fail with ENOSYS.  Some functions are actually named
+	something starting with __ and the normal name is an alias.  */
+    #if defined (__stub_FOO) || defined (__stub___FOO)
+    choke me
+    #else
+    FOO();
+    #endif
+
+    ; return 0; }
+
+The choice of <assert.h> is essentially arbitrary.  The GNU libc
+macros are found in <gnu/stubs.h>.  You can include that file instead
+of <assert.h> (which itself includes <gnu/stubs.h>) if you test for
+its existence first.  <assert.h> is assumed to exist on every system,
+which is why it's used here.  Any GNU libc header file will include
+the stubs macros.  If either __stub_NAME or __stub___NAME is defined,
+then the function doesn't actually exist.  Tests using <assert.h> work
+on every system around.
+
+The declaration of FOO is there to override builtin prototypes for
+ANSI C functions.
+
 =back
 
 =head2 Probably good ideas waiting for round tuits
@@ -1135,12 +1284,6 @@ Get some of the Macintosh stuff folded back into the main distribution.
 Maybe include a replacement function that doesn't lose data in rare
 cases of coercion between string and numerical values.
 
-=item long long
-
-Can we support C<long long> on systems where C<long long> is larger
-than what we've been using for C<IV>?  What if you can't C<sprintf>
-a C<long long>?
-
 =item Improve makedepend
 
 The current makedepend process is clunky and annoyingly slow, but it
@@ -1177,4 +1320,4 @@ All opinions expressed herein are those of the authorZ<>(s).
 
 =head1 LAST MODIFIED
 
-$Id: pumpkin.pod,v 1.13 1997/08/28 18:26:40 doughera Released $
+$Id: pumpkin.pod,v 1.22 1998/07/22 16:33:55 doughera Released $