[inseparable changes from patch to perl 5.004_04]perl-5.004_04

[editor's note: this one imported like a charm!]

 TESTS  -

Subject: Improve pragma/locale test 102 - and don't fail, just warn
From: Jarkko Hietaniemi <jhi@anna.in-berlin.de>
Files: t/pragma/locale.t

Subject: Invalid test output in t/op/taint.t in trial 1
From: Dan Sugalski <sugalsd@lbcc.cc.or.us>
Files: t/op/taint.t

    t/op/taint.t prints out invalid ok messages for tests it skips.
    Rather than printing "ok 136" it prints "136 ok".
    
    p5p-msgid: 3.0.3.32.19970919160918.00857a50@stargate.lbcc.cc.or.us

 UTILITIES  -

Subject: Perldoc tiny patch to avoid $0
From: Ilya Zakharevich <ilya@math.ohio-state.edu>
Files: utils/perldoc.PL
Msg-ID: 199709122141.RAA16846@monk.mps.ohio-state.edu

    (applied based on p5p patch as commit 0b166b6635cf199f072db516b2a523ee659394d5)

Subject: h2ph broken in 5.004_02
From: David Mazieres <dm@reeducation-labor.lcs.mit.edu>
Files: utils/h2ph.PL
Msg-ID: 199708201700.KAA02621@www.chapin.edu

    (applied based on p5p patch as commit 4a8e146e38ec2045f1f817a7cb578e1b1f80f39f)

Subject: add key_t caddr_t to h2ph
From: Tony Sanders <sanders@bsdi.com>
Files: eg/sysvipc/ipcsem utils/h2ph.PL
Msg-ID: 199708272301.RAA12803@austin.bsdi.com

    (applied based on p5p patch as commit 0806a92ffc3a74ca70aa81051cdf2a306cd0a8af)

Subject: perldoc search ., lib and blib/* if -f 'Makefile.PL'
From: Tim Bunce <Tim.Bunce@ig.co.uk>
Files: utils/perldoc.PL

    Subject: perldoc finds wrong pod2man
    
    (from perldoc source)
    
        # We must look both in @INC for library modules and in PATH
        # for executables, like h2xs or perldoc itself.
    
    Unfortunately, searching PATH for installed perl executables like
    pod2man is INCORRECT.  perldoc should start by searching the
    directory it was executed from, which might not be in the PATH
    at all.
    
    Credited: Joseph "Moof-in'" Hall <joseph@cscaper.com>
    
    p5p-msgid: 199708251732.KAA19299@gadget.cscaper.com

Subject: 5.004m4t1: perlbug: NIS domainname gets into wrong places
From: Andreas J. Koenig <koenig@anna.mind.de>
Files: utils/perlbug.PL
Msg-ID: sfcg1qy38as.fsf@anna.in-berlin.de

    (applied based on p5p patch as commit 41f926b844140b7f7eaa9302113e45df3a9f9ff4)

Subject: add better local patch info to perlbug
From: Tim Bunce <Tim.Bunce@ig.co.uk>
Files: utils/perlbug.PL

Subject: perldoc - suggest modules if requested module not found
From: Anthony David <adavid@netinfo.com.au>
Files: utils/perldoc.PL

    private-msgid: 3439CD83.6969@netinfo.com.au

Subject: perldoc mail::foo tries to read binary /usr/ucb/mail
From: Tim Bunce <Tim.Bunce@ig.co.uk>
Files: utils/perldoc.PL

    Subject: perldoc weirdness
    
    perldoc mail::imap yields:
    
    {joseph}:79% perldoc mail::foo
    can't open /usr/ucb/mail: Permission denied at ./pod2man line 362.
    
    Credited: Joseph "Moof-in'" Hall <joseph@cscaper.com>
    
    p5p-msgid: 199710082014.NAA00808@gadget.cscaper.com

Subject: perldoc -f setpwent (for example) returns no descriptive text
From: Tim Bunce <Tim.Bunce@ig.co.uk>
Files: utils/perldoc.PL

Subject: perldoc diffs: don't search auto - much faster
From: "Joseph N. Hall" <joseph@5sigma.com>
Files: utils/perldoc.PL
Msg-ID: MailDrop1.2d7dPPC.971012211957@screechy.cscaper.com

    (applied based on p5p patch as commit 62b753c6ae4ab9bf22fbb6ec7ceac820bcef8fe4)

2 files changed, 60 insertions, 110 deletions

diff --git a/hints/bsdos.sh b/hints/bsdos.sh
index ef98ace43f..53adfa3b50 100644
--- a/hints/bsdos.sh
+++ b/hints/bsdos.sh
@@ -1,39 +1,60 @@
 # hints/bsdos.sh
 #
-# hints file for BSD/OS 2.x (adapted from bsd386.sh)
-# Original by Neil Bowers <neilb@khoros.unm.edu>
-#     Tue Oct  4 12:01:34 EDT 1994
-# Updated by Tony Sanders <sanders@bsdi.com>
-#     Mon Nov 27 17:25:51 CST 1995
+# hints file for BSD/OS (adapted from bsd386.sh)
+# Original by Neil Bowers <neilb@khoros.unm.edu>; Tue Oct  4 12:01:34 EDT 1994
+# Updated by Tony Sanders <sanders@bsdi.com>; Sat Aug 23 12:47:45 MDT 1997
+#     Added 3.1 with ELF dynamic libraries
+#     SYSV IPC tested Ok so I re-enabled.
 #
-# You can override the compiler and loader on the Configure command line:
-#     ./Configure -Dcc=shlicc2 -Dld=shlicc2
-
-# filename extension for shared library objects
-so='o'
+# To override the compiler on the command line:
+#     ./Configure -Dcc=gcc2
+#
+# The BSD/OS distribution is built with:
+#     ./Configure -des -Dbsdos_distribution=defined
 
-# Don't use this for Perl 5.002, which needs parallel sig_name and sig_num lists
-#sig_name='ZERO HUP INT QUIT ILL TRAP IOT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM URG STOP TSTP CONT CHLD TTIN TTOU IO XCPU XFSZ VTALRM PROF WINCH INFO USR1 USR2 '
 signal_t='void'
 d_voidsig='define'
 
+usemymalloc='n'
+
+# setre?[ug]id() have been replaced by the _POSIX_SAVED_IDS versions.
+# See http://www.bsdi.com/bsdi-man?setuid(2)
+d_setregid='undef'
+d_setreuid='undef'
+d_setrgid='undef'
+d_setruid='undef'
+
 # we don't want to use -lnm, since exp() is busted (in 1.1 anyway)
 set `echo X "$libswanted "| sed -e 's/ nm / /'`
 shift
 libswanted="$*"
 
-# BSD/OS X libraries are in their own tree
+# X libraries are in their own tree
 glibpth="$glibpth /usr/X11/lib"
 ldflags="$ldflags -L/usr/X11/lib"
 
 # Avoid telldir prototype conflict in pp_sys.c
 pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
 
+case "$optimize" in
+'')     optimize='-O2' ;;
+esac
+
 case "$bsdos_distribution" in
-defined)
-	d_portable='no'
+''|undef|false)	;;
+*)
+	d_dosuid='define'
+	d_portable='undef'
 	prefix='/usr/contrib'
+	perlpath='/usr/bin/perl5'
+	startperl='#!/usr/bin/perl5'
+	scriptdir='/usr/contrib/bin'
+	privlib='/usr/libdata/perl5'
+	man1dir='/usr/contrib/man/man1'
 	man3dir='/usr/contrib/man/man3'
+	# phlib added by BSDI -- we share the *.ph include dir with perl4
+	phlib="/usr/libdata/perl5/site_perl/$(arch)-$osname/include"
+	phlibexp="/usr/libdata/perl5/site_perl/$(arch)-$osname/include"
 	;;
 esac
 
@@ -48,120 +69,41 @@ case "$osvers" in
 	'')	cc='gcc2' ;;
 	esac
 	;;
-2.0*)
-	# default to GCC 2.X w/shared libraries
-	case "$cc" in
-	'')	cc='shlicc2' ;;
-	esac
-
-	# default ld to shared library linker
-	case "$ld" in
-	'')	ld='shlicc2' ;;
-	esac
-
-	# setre?[ug]id() have been replaced by the _POSIX_SAVED_IDS stuff
-	# in 4.4BSD-based systems (including BSD/OS 2.0 and later).
-	# See http://www.bsdi.com/bsdi-man?setuid(2)
-	d_setregid='undef'
-	d_setreuid='undef'
-	d_setrgid='undef'
-	d_setruid='undef'
-	;;
-2.1*)
-	# Use 2.1's shlicc2 for dynamic linking
-	# Since cc -o is linking, use it for compiling too.
-	# I'm not sure whether Configure is careful about
-	# distinguishing between the two.
+2.0*|2.1*|3.0*)
+	so='o'
 
+	# default to GCC 2.X w/shared libraries
 	case "$cc" in
 	'')	cc='shlicc2'
 		cccdlflags=' ' ;; # Avoid the dreaded -fpic
 	esac
 
-	# Link with shared libraries in 2.1
-	# Turns out that shlicc2 will automatically use the
-	# shared libs, so don't explicitly specify -lc_s.2.1.*
+	# default ld to shared library linker
 	case "$ld" in
 	'')	ld='shlicc2'
 		lddlflags='-r' ;; # this one is necessary
 	esac
 
-	# setre?[ug]id() have been replaced by the _POSIX_SAVED_IDS  stuff
-	# in 4.4BSD-based systems (including BSD/OS 2.0 and later).
-	# See http://www.bsdi.com/bsdi-man?setuid(2)
-	# This stuff may or may not be right, but it works.
-	d_setregid='undef'
-	d_setreuid='undef'
-	d_setrgid='undef'
-	d_setruid='undef'
-
-	# based on the 5.001m hints file from BSD/OS source disk
-	# (this is needed for pTk to work)
-
-	# BSD/OS 2.1 doesn't (yet) support true dynamic linking.
-	# So we "preload' the shared libraries by linking against
-	# them, even though we don't pull in any symbols thereby.
+	# Must preload the static shared libraries.
 	libswanted="Xpm Xaw Xmu Xt SM ICE Xext X11 $libswanted"
 	libswanted="rpc curses termcap $libswanted"
-
 	;;
-3.0*)
-	# adapted from 2.1 entry by Christopher Davis <ckd@kei.com
-	# Use 3.0's shlicc2 for dynamic linking
-	# Since cc -o is linking, use it for compiling too.
-	# I'm not sure whether Configure is careful about
-	# distinguishing between the two.
+3.1*)
+	# ELF dynamic link libraries starting in 3.1
+        useshrplib='true'
+	so='so'
+	dlext='so'
 
 	case "$cc" in
-	'')	cc='shlicc2'
-		cccdlflags=' ' ;; # Avoid the dreaded -fpic
+	'')	cc='cc'			# cc is gcc2 in 3.1
+		cccdlflags="-fPIC"
+		ccdlflags=" " ;;
 	esac
 
-	# Link with shared libraries in 3.0
-	# Turns out that shlicc2 will automatically use the
-	# shared libs, so don't explicitly specify them
 	case "$ld" in
-	'')	ld='shlicc2'
-		lddlflags='-r' ;; # this one is necessary
+	'')	ld='ld'
+		lddlflags="-shared -x $lddlflags" ;;
 	esac
-
-	# setre?[ug]id() have been replaced by the _POSIX_SAVED_IDS  stuff
-	# in 4.4BSD-based systems (including BSD/OS 2.0 and later).
-	# See http://www.bsdi.com/bsdi-man?setuid(2)
-	# This stuff may or may not be right, but it works.
-	d_setregid='undef'
-	d_setreuid='undef'
-	d_setrgid='undef'
-	d_setruid='undef'
-
-	# this may still be needed for Tk and such
-	# BSD/OS doesn't (yet) support true dynamic linking.
-	# So we "preload' the shared libraries by linking against
-	# them, even though we don't pull in any symbols thereby.
-	libswanted="Xpm Xaw Xmu Xt SM ICE Xext X11 $libswanted"
-	libswanted="rpc curses termcap $libswanted"
-
-	# the IPC stuff doesn't work the way perl expects
-	d_msg='undef'
-	d_msgctl='undef'
-	d_msgget='undef'
-	d_msgrcv='undef'
-	d_msgsnd='undef'
-	d_sem='undef'
-	d_semctl='undef'
-	d_semget='undef'
-	d_semop='undef'
-	d_shm='undef'
-	d_shmat='undef'
-	d_shmatprototype='undef'
-	d_shmctl='undef'
-	d_shmdt='undef'
-	d_shmget='undef'
-
-	# use system malloc instead of perl's
-	d_mymalloc='undef'
-	i_malloc='undef'
-	usemymalloc='n'
-
 	;;
 esac
+
diff --git a/hints/linux.sh b/hints/linux.sh
index 6a11a42cc3..8ddb765e1e 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -29,6 +29,14 @@ esac
 # gcc-2.6.3 defines _G_HAVE_BOOL to 1, but doesn't actually supply bool.
 ccflags="-Dbool=char -DHAS_BOOL $ccflags"
 
+# libc6, aka glibc2, seems to need STRUCT_TM_HASZONE defined.
+# Thanks to Bart Schuller <schuller@Lunatech.com>
+# See Message-ID: <19971009002636.50729@tanglefoot>
+# This is currently commented out for maintenance releases
+# but should probably be uncommented for 5.005 or after
+# more widespread testing.
+#POSIX_cflags='ccflags="$ccflags -DSTRUCT_TM_HASZONE"'
+
 # BSD compatability library no longer needed
 set `echo X "$libswanted "| sed -e 's/ bsd / /'`
 shift