setlocale(3) has been fixed to match POSIX standard:

LC_ALL takes precedence over other LC_* envariables.

4 files changed, 7 insertions, 19 deletions

diff --git a/gnu/usr.bin/man/catman/catman.perl b/gnu/usr.bin/man/catman/catman.perl
index 3eeafed..26ef427 100644
--- a/gnu/usr.bin/man/catman/catman.perl
+++ b/gnu/usr.bin/man/catman/catman.perl
@@ -46,14 +46,8 @@ sub variables {
     $remove = 0;		# unlink forgotten man/catpages
     $locale = 0;		# go through localized man directories only
 
-    # choose localized man directories suffix. If $LC_CTYPE is set, then
-    # its value should be used as suffix, otherwise $LANG (if set)
-    $local_suffix = "";
-    if ($ENV{'LC_CTYPE'}) {
-	$local_suffix = $ENV{'LC_CTYPE'}
-    } elsif ($ENV{'LANG'}) {
-	$local_suffix = $ENV{'LANG'}
-    }
+    # choose localized man directories suffix.
+    $local_suffix = $ENV{'LC_ALL'} || $ENV{'LC_CTYPE'} || $ENV{'LANG'};
 
     # if no argument for directories given
     @defaultmanpath = ( '/usr/share/man' ); 
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.perl b/gnu/usr.bin/man/makewhatis/makewhatis.perl
index 2080aa5..4a4ab44 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.perl
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.perl
@@ -433,14 +433,8 @@ sub variables {
     $append = 0;		# Don't delete old entries
     $locale = 0;		# Build DB only for localized man directories
 
-    # choose localized man direcotries suffixs. If $LC_CTYPE is set, then 
-    # its value will be used as suffix, otherwise $LANG value (if set)
-    $local_suffix = "";
-    if ($ENV{'LC_CTYPE'}) {
-	$local_suffix = $ENV{'LC_CTYPE'};
-    } elsif ($ENV{'LANG'}) {
-	$local_suffix = $ENV{'LANG'}
-    }
+    # choose localized man directories suffix.
+    $local_suffix = $ENV{'LC_ALL'} || $ENV{'LC_CTYPE'} || $ENV{'LANG'};
 
     # if no argument for directories given
     @defaultmanpath = ( '/usr/share/man' );
diff --git a/gnu/usr.bin/man/man/man.man b/gnu/usr.bin/man/man/man.man
index 296db4d..bd2e4ce 100644
--- a/gnu/usr.bin/man/man/man.man
+++ b/gnu/usr.bin/man/man/man.man
@@ -112,7 +112,7 @@ component.
 .Pp
 Locale name is taken from the first of three environment variables
 with a nonempty value:
-.Ev LC_CTYPE , LC_ALL ,
+.Ev LC_ALL , LC_CTYPE ,
 or
 .Ev LANG ,
 in the specified order.
@@ -179,7 +179,7 @@ the files that would be formatted or displayed.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width MANROFFSEQ
-.It Ev LC_CTYPE , LC_ALL , LANG
+.It Ev LC_ALL , LC_CTYPE , LANG
 These variables specify the preferred language for manual pages.
 (See the
 .Fl o
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
index 9cb34bb..be79406 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
+++ b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
@@ -28,7 +28,7 @@
 PATH=/bin:/usr/bin:$PATH
 export PATH
 
-DATE=`LC_TIME=C date` || exit
+DATE=`LC_ALL=C date` || exit
 # Check whether we have an RCS subdirectory, so we can have the right
 # prefix for our paths.
 if test -d RCS