This is my patch patch.1j for perl5.001.

To apply, change to your perl directory and apply with
    patch -p1 -N  < thispatch.

After you apply this patch, I would recommend:
    rm config.sh
    sh Configure [whatever options you use]
    make depend
    make 
    make test

Here are the highlights:
    Linux fixes:  Now correctly sets & uses stdio _ptr and _cnt
    tricks only when feasible (Configure, config_h.SH, config_H,
    doio.c, sv.c x2p/str.c)

    #!path-to-perl fixed to use $binexp instead of $bin.  This should
    really be fixed to do the correct perl start-up stuff.  Volunteers?
    (c2ph.SH, h2ph.SH, h2xs.SH, makeaperl.SH, perldoc.SH,
    pod/pod2*.SH, x2p/find2perl.SH, x2p/s2p.SH)

    hint updates:  hints/apollo.sh, hints/linux.sh, hints/freebsd.sh,
    hints/sco_3.sh.

    xsubpp version 1.7.  (includes CASE support)

    pod/perlbot updates.

    my lib/AutoLoader patch (to use @INC).

    [ON]DBM_File/Makefile.PL now have a few hint files.

    Other sundry small things.

Patch and enjoy,

	Andy Dougherty		doughera@lafcol.lafayette.edu
	Dept. of Physics
	Lafayette College	Easton, PA  18042

Here's the file-by-file breakdown of what's included:

Configure
    Checks if File_ptr(fp) and File_cnt(fp) can be assigned to.

    Fix typo:  s/sytem/system/

MANIFEST
    Include new extension hint files.

README
    Some clarifications, thanks to John Stoeffel.  Tell users how to
    not use dynamic loading.

c2ph.SH
    Use $binexp instead of $bin.

config_H
    Updated to match config_h.SH.

config_h.SH
    Include defines for whether File_ptr(fp) and File_cnt(fp)
    can be assigned to.

doio.c
    Use defines for whether File_ptr(fp) and File_cnt(fp) can be assigned to.

ext/DynaLoader/DynaLoader.pm
    Improve error messages and a little documentation.

ext/NDBM_File/hints/solaris.pl
    New hint file.

ext/ODBM_File/Makefile.PL
    Removed -ldbm.nfs, since it's now in the sco hint file.

ext/ODBM_File/hints/sco.pl
ext/ODBM_File/hints/solaris.pl
ext/ODBM_File/hints/svr4.pl
    New hint files.

h2ph.SH
h2xs.SH
    Use $binexp instead of $bin.

hints/apollo.sh
hints/freebsd.sh
hints/linux.sh
hints/sco_3.sh
    Updated.

lib/AutoLoader.pm
    Eliminate else clause in sub import.

    Handle case where @INC contains relative paths.

lib/ExtUtils/xsubpp
    Update to version 1.7.  This includes CASE support.

lib/I18N/Collate.pm
    Updated documentation.

lib/ftp.pl
    Look for socket.ph or sys/socket.ph

lib/getcwd.pl
    Use defined().
   
makeaperl.SH
    Use $binexp instead of $bin.

perl.c
    fputs("\tUnofficial patchlevel 1j.\n",stdout);
  	
perldoc.SH
    Use $binexp instead of $bin.

    Turn off debugging messages.

pod/perlbot.pod
    Updated.

pod/pod2html.SH
pod/pod2latex.SH
pod/pod2man.SH
    Use $binexp instead of $bin.

sv.c
    Use defines for whether File_ptr(fp) and File_cnt(fp) can be assigned to.

toke.c
    Fix spelling of ambiguous.

x2p/find2perl.SH
x2p/s2p.SH
    Use $binexp instead of $bin.

x2p/str.c
    Use defines for whether File_ptr(fp) and File_cnt(fp) can be assigned to.

1 files changed, 22 insertions, 8 deletions

diff --git a/lib/I18N/Collate.pm b/lib/I18N/Collate.pm
index 35c8025367..170032c1b3 100644
--- a/lib/I18N/Collate.pm
+++ b/lib/I18N/Collate.pm
@@ -23,14 +23,21 @@ You can compare $s1 and $s2 above with
 
 to extract the data itself, you'll need a dereference: $$s1
 
-This uses POSIX::setlocale The basic collation conversion is done by
+This uses POSIX::setlocale. The basic collation conversion is done by
 strxfrm() which terminates at NUL characters being a decent C routine.
 collate_xfrm() handles embedded NUL characters gracefully.  Due to C<cmp>
 and overload magic, C<lt>, C<le>, C<eq>, C<ge>, and C<gt> work also.  The
 available locales depend on your operating system; try whether C<locale
--a> shows them or the more direct approach C<ls /usr/lib/nls/loc> or C<ls
-/usr/lib/nls>.  The locale names are probably something like
-"xx_XX.(ISO)?8859-N".
+-a> shows them or man pages for "locale" or "nlsinfo" or
+the direct approach C<ls /usr/lib/nls/loc> or C<ls
+/usr/lib/nls>.  Not all the locales that your vendor supports
+are necessarily installed: please consult your operating system's
+documentation.
+
+The locale names are probably something like
+C<"xx_XX.(ISO)?8859-N"> or C<"xx_XX.(ISO)?8859N">, for example
+C<"fr_CH.ISO8859-1"> is the Swiss (CH) variant of French (fr),
+ISO Latin (8859) 1 (-1) which is the Western European character set.
 
 =cut
 
@@ -54,7 +61,7 @@ available locales depend on your operating system; try whether C<locale
 # Overloads:	cmp # 3)
 #
 # Usage:	use Collate;
-#	        setlocale(&LC_COLLATE, 'locale-of-your-choice'); # 4)
+#	        setlocale(LC_COLLATE, 'locale-of-your-choice'); # 4)
 #		$s1 = new Collate "scalar_data_1";
 #		$s2 = new Collate "scalar_data_2";
 #		
@@ -68,12 +75,19 @@ available locales depend on your operating system; try whether C<locale
 #		   collate_xfrm handles embedded NUL characters gracefully.
 #		3) due to cmp and overload magic, lt le eq ge gt work also
 #		4) the available locales depend on your operating system;
-#		   try whether "locale -a" shows them or the more direct
+#		   try whether "locale -a" shows them or man pages for
+#		   "locale" or "nlsinfo" work or the more direct
 #		   approach "ls /usr/lib/nls/loc" or "ls /usr/lib/nls".
+#		   Not all the locales that your vendor supports
+#		   are necessarily installed: please consult your
+#		   operating system's documentation.
 #		   The locale names are probably something like
-#		   'xx_XX.(ISO)?8859-N'.
+#		   'xx_XX.(ISO)?8859-N' or 'xx_XX.(ISO)?8859N',
+#		   for example 'fr_CH.ISO8859-1' is the Swiss (CH)
+#		   variant of French (fr), ISO Latin (8859) 1 (-1)
+#		   which is the Western European character set.
 #
-# Updated:	19940913 1341 GMT
+# Updated:	19950602 1601 GMT
 #
 # ---