Package-Name: coreutils
Gentoo-Package: sys-apps/coreutils
Requires: glibc
Compile-Requires: gcc binutils make
Homepage: http://www.gnu.org/software/coreutils/
Source: gnu:///coreutils/coreutils-(\d+.\d+(.\d+)?).tar.gz $1
Repack:
	tar xzvfp "$(SOURCE)"
Compile:
	cp -p AUTHORS COPYING ChangeLog* NEWS README THANKS* TODO "$(PREFIX)/"
# We don't need nanosecond resolution!
	ac_cv_search_clock_gettime=no $(MAKE) -f ../Makefile configure CONFIGURE_OPTS="--infodir='$(PREFIX)/info' --mandir='$(PREFIX)/man'"
	$(MAKE)
	$(MAKE) install
	rm -f "$(PREFIX)"/bin{,-static}/{dir,vdir}
	rm -f "$(PREFIX)"/man/man1/{dir,vdir}.1
Install:
# Deliberately ignored: [ link stat unlink
	chown root.console "$(PREFIX)"/bin/su
	chmod 4750 "$(PREFIX)"/bin/su
	mv -f "$(PREFIX)"/bin/{cat,chgrp,chmod,chown,cp,dd,df,dircolors,du,echo,ln,ls,mkdir,mkfifo,mknod,mv,pwd,rm,rmdir,shred,sync,touch,uname} /bin/
# We use uptime from procps instead
	$(MAKE) instbin BIN="base64 basename chroot cksum comm csplit cut date dirname env expand expr factor false fmt fold groups head hostid id install join kill logname md5sum nice nl nohup od paste pathchk pinky pr printenv printf ptx readlink seq sha1sum sha224sum sha256sum sha384sum sha512sum shuf sleep sort split stty su sum tac tail tee test tr true tsort tty unexpand uniq users wc who whoami yes"
	ln -fs /bin/cat /usr/bin/  # some people want it here
	$(MAKE) instlocale FILE=coreutils
	$(MAKE) instinfo INFO=coreutils
# FIXME: dir_colors.5 is in man-pages
	$(MAKE) instman SECTION=1 MAN="base64 basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd df dircolors dirname du echo env expand expr factor false fmt fold groups head hostid id install join kill ln logname ls md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum sha256sum sha384sum sha512sum shuf shred sleep sort split stty su sum sync tac tail tee test touch tr true tsort tty uname unexpand uniq users wc who whoami yes"
Patch: <<EOT
######## begin dd-noxfer-default.diff
--- ../coreutils-6.9-orig/src/dd.c	2007-03-19 06:36:43 +0900
+++ src/dd.c	2007-11-25 00:05:59 +0900
@@ -123,6 +123,7 @@
 /* Status bit masks.  */
 enum
   {
+    STATUS_XFER = 0x80000000,
     STATUS_NOXFER = 01
   };
 
@@ -278,6 +279,7 @@
 /* Status, for status="...".  */
 static struct symbol_value const statuses[] =
 {
+  {"xfer",	STATUS_XFER},
   {"noxfer",	STATUS_NOXFER},
   {"",		0}
 };
@@ -423,7 +425,7 @@
   oflag=FLAGS     write as per the comma separated symbol list\n\
   seek=BLOCKS     skip BLOCKS obs-sized blocks at start of output\n\
   skip=BLOCKS     skip BLOCKS ibs-sized blocks at start of input\n\
-  status=noxfer   suppress transfer statistics\n\
+  status=xfer     display transfer statistics when finished\n\
 "), stdout);
       fputs (_("\
 \n\
@@ -493,7 +495,7 @@
 Sending a %s signal to a running `dd' process makes it\n\
 print I/O statistics to standard error and then resume copying.\n\
 \n\
-  $ dd if=/dev/zero of=/dev/null& pid=$!\n\
+  $ dd if=/dev/zero of=/dev/null status=xfer& pid=$!\n\
   $ kill -%s $pid; sleep 1; kill $pid\n\
   18335302+0 records in\n\
   18335302+0 records out\n\
@@ -555,7 +557,7 @@
 		       select_plural (r_truncate)),
 	     r_truncate);
 
-  if (status_flags & STATUS_NOXFER)
+  if (!(status_flags & STATUS_XFER))
     return;
 
   /* Use integer arithmetic to compute the transfer rate,
--- ../coreutils-6.9-orig/man/dd.1	2007-03-23 06:21:48 +0900
+++ man/dd.1	2007-11-25 00:09:27 +0900
@@ -49,8 +49,8 @@
 skip=BLOCKS
 skip BLOCKS ibs\-sized blocks at start of input
 .TP
-status=noxfer
-suppress transfer statistics
+status=xfer
+display transfer statistics when finished
 .PP
 BLOCKS and BYTES may be followed by the following multiplicative suffixes:
 xM M, c 1, w 2, b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,
######## end dd-noxfer-default.diff
######## begin tail-classic-syntax.diff
--- ../coreutils-6.9-orig/src/tail.c	2007-03-19 06:36:43 +0900
+++ src/tail.c	2007-11-25 00:14:12 +0900
@@ -1382,7 +1382,7 @@
 	 || (3 <= argc && argc <= 4 && STREQ (argv[2], "--"))))
     return false;
 
-  obsolete_usage = (posix2_version () < 200112);
+  obsolete_usage = 1;
   p = argv[1];
 
   switch (*p++)
######## end tail-classic-syntax.diff
######## begin ls-enforce-min-column-width.diff
--- ../coreutils-6.9-orig/src/ls.c	2007-03-19 06:36:43 +0900
+++ src/ls.c	2007-11-25 00:17:54 +0900
@@ -2524,13 +2524,13 @@
 #endif
   inode_number_width = 0;
   block_size_width = 0;
-  nlink_width = 0;
-  owner_width = 0;
-  group_width = 0;
+  nlink_width = 3;
+  owner_width = 8;
+  group_width = 8;
   author_width = 0;
-  major_device_number_width = 0;
-  minor_device_number_width = 0;
-  file_size_width = 0;
+  major_device_number_width = 3;
+  minor_device_number_width = 3;
+  file_size_width = 8;
 }
 
 /* Add a file to the current table of files.
######## end ls-enforce-min-column-width.diff
######## remainder is local changes
--- ../coreutils-6.6-orig/configure	2006-11-22 20:42:04 +0900
+++ configure	2006-12-08 10:14:31 +0900
@@ -27829,7 +27829,7 @@
        mint*)		os='MiNT';;
        mingw*)		os='MinGW';;
        lynxos*)		os='LynxOS';;
-       linux*)		os='GNU/Linux';;
+       linux*)		os='Linux';;
        hpux*)		os='HP-UX';;
        hiux*)		os='HI-UX';;
        gnu*)		os='GNU';;
@@ -36482,7 +36482,7 @@
 	    #if HAVE_LOCALE_H
 	      /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html
 		 This test needs valgrind to catch the bug on Debian
-		 GNU/Linux 3.1 x86, but it might catch the bug better
+		 Linux 3.1 x86, but it might catch the bug better
 		 on other platforms and it shouldn't hurt to try the
 		 test here.  */
 	      if (setlocale (LC_ALL, "en_US.UTF-8"))
diff -urN ../coreutils-6.6-orig/doc/coreutils.info doc/coreutils.info
--- ../coreutils-6.6-orig/doc/coreutils.info	2006-11-22 19:03:26 +0900
+++ doc/coreutils.info	2006-12-08 10:14:31 +0900
@@ -5951,7 +5951,7 @@
     `noctty'
           Do not assign the file to be a controlling terminal for `dd'.
           This has no effect when the file is not a terminal.  On many
-          hosts (e.g., GNU/Linux hosts), this option has no effect at
+          hosts (e.g., Linux hosts), this option has no effect at
           all.
 
     `nofollow'
@@ -10312,7 +10312,7 @@
 `2.2.18ss.e820-bda652a #4 SMP Tue Jun 5 11:24:08 PDT 2001':
 
      uname -a
-     => Linux dum 2.2.18 #4 SMP Tue Jun 5 11:24:08 PDT 2001 i686 unknown unknown GNU/Linux
+     => Linux dum 2.2.18 #4 SMP Tue Jun 5 11:24:08 PDT 2001 i686 unknown unknown Linux
 
    The program accepts the following options.  Also see *Note Common
 options::.
@@ -10361,7 +10361,7 @@
      system name printed by the `-o' or `--operating-system' option,
      but it might differ.  Some operating systems (e.g., FreeBSD,
      HP-UX) have the same name as their underlying kernels; others
-     (e.g., GNU/Linux, Solaris) do not.
+     (e.g., Linux, Solaris) do not.
 
 `-v'
 `--kernel-version'
@@ -11257,7 +11257,7 @@
 set using programs specific to the file system.  For example:
 
 ext2
-     On GNU and GNU/Linux the file attributes specific to the ext2 file
+     On GNU and Linux the file attributes specific to the ext2 file
      system are set using `chattr'.
 
 FFS
@@ -12163,7 +12163,7 @@
 ====================
 
 This month's column is only peripherally related to the GNU Project, in
-that it describes a number of the GNU tools on your GNU/Linux system
+that it describes a number of the GNU tools on your Linux system
 and how they might be used.  What it's really about is the "Software
 Tools" philosophy of program development and usage.
 
@@ -12571,7 +12571,7 @@
 you have to do is look it up in a dictionary.  If it is not there, then
 chances are that your spelling is incorrect.  So, we need a dictionary.
 The conventional location for a dictionary is `/usr/dict/words'.  On my
-GNU/Linux system,(1) this is a is a sorted, 45,402 word dictionary.
+Linux system,(1) this is a is a sorted, 45,402 word dictionary.
 
    Now, how to compare our file with the dictionary?  As before, we
 generate a sorted list of words, one per line:
diff -urN ../coreutils-6.6-orig/doc/coreutils.texi doc/coreutils.texi
--- ../coreutils-6.6-orig/doc/coreutils.texi	2006-10-27 23:30:48 +0900
+++ doc/coreutils.texi	2006-12-08 10:14:31 +0900
@@ -12847,7 +12847,7 @@
 
 @smallexample
 uname -a
-@result{} Linux dum 2.2.18 #4 SMP Tue Jun 5 11:24:08 PDT 2001 i686 unknown unknown GNU/Linux
+@result{} Linux dum 2.2.18 #4 SMP Tue Jun 5 11:24:08 PDT 2001 i686 unknown unknown Linux
 @end smallexample
 
 
@@ -12931,7 +12931,7 @@
 The kernel name might be the same as the operating system name printed
 by the @option{-o} or @option{--operating-system} option, but it might
 differ.  Some operating systems (e.g., FreeBSD, HP-UX) have the same
-name as their underlying kernels; others (e.g., GNU/Linux, Solaris)
+name as their underlying kernels; others (e.g., Linux, Solaris)
 do not.
 
 @item -v
@@ -13938,7 +13938,7 @@
 @unnumberedsec Toolbox Introduction
 
 This month's column is only peripherally related to the GNU Project, in
-that it describes a number of the GNU tools on your GNU/Linux system and how they
+that it describes a number of the GNU tools on your Linux system and how they
 might be used.  What it's really about is the ``Software Tools'' philosophy
 of program development and usage.
 
@@ -14370,7 +14370,7 @@
 do is look it up in a dictionary.  If it is not there, then chances are
 that your spelling is incorrect.  So, we need a dictionary.
 The conventional location for a dictionary is @file{/usr/dict/words}.
-On my GNU/Linux system,@footnote{Redhat Linux 6.1, for the November 2000
+On my Linux system,@footnote{Redhat Linux 6.1, for the November 2000
 revision of this article.}
 this is a is a sorted, 45,402 word dictionary.
 
diff -urN ../coreutils-6.6-orig/m4/host-os.m4 m4/host-os.m4
--- ../coreutils-6.6-orig/m4/host-os.m4	2006-09-26 19:22:21 +0900
+++ m4/host-os.m4	2006-12-08 10:14:31 +0900
@@ -47,7 +47,7 @@
        mint*)		os='MiNT';;
        mingw*)		os='MinGW';;
        lynxos*)		os='LynxOS';;
-       linux*)		os='GNU/Linux';;
+       linux*)		os='Linux';;
        hpux*)		os='HP-UX';;
        hiux*)		os='HI-UX';;
        gnu*)		os='GNU';;
diff -urN ../coreutils-6.6-orig/lib/hard-locale.c lib/hard-locale.c
--- ../coreutils-6.6-orig/lib/hard-locale.c	2006-09-14 18:53:58 +0900
+++ lib/hard-locale.c	2006-12-08 10:17:17 +0900
@@ -38,6 +38,10 @@
 bool
 hard_locale (int category)
 {
+#if !ENABLE_NLS
+  return 0;
+#else
+
   bool hard = true;
   char const *p = setlocale (category, NULL);
 
@@ -70,4 +74,6 @@
     }
 
   return hard;
+
+#endif
 }
diff -urN ../coreutils-6.6-orig/lib/human.c lib/human.c
--- ../coreutils-6.6-orig/lib/human.c	2006-10-06 15:12:47 +0900
+++ lib/human.c	2006-12-08 10:17:17 +0900
@@ -23,7 +23,9 @@
 
 #include "human.h"
 
-#include <locale.h>
+#if ENABLE_NLS
+# include <locale.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -180,6 +182,7 @@
   size_t decimal_pointlen = 1;
   char const *grouping = "";
   char const *thousands_sep = "";
+#if ENABLE_NLS
   struct lconv const *l = localeconv ();
   size_t pointlen = strlen (l->decimal_point);
   if (0 < pointlen && pointlen <= MB_LEN_MAX)
@@ -190,6 +193,7 @@
   grouping = l->grouping;
   if (strlen (l->thousands_sep) <= MB_LEN_MAX)
     thousands_sep = l->thousands_sep;
+#endif
 
   psuffix = buf + LONGEST_HUMAN_READABLE - HUMAN_READABLE_SUFFIX_LENGTH_MAX;
   p = psuffix;
diff -urN ../coreutils-6.6-orig/src/basename.c src/basename.c
--- ../coreutils-6.6-orig/src/basename.c	2006-10-23 01:54:15 +0900
+++ src/basename.c	2006-12-08 10:18:32 +0900
@@ -101,9 +101,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/cat.c src/cat.c
--- ../coreutils-6.6-orig/src/cat.c	2006-10-25 07:33:48 +0900
+++ src/cat.c	2006-12-08 10:18:32 +0900
@@ -566,9 +566,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   /* Arrange to close stdout if we exit via the
      case_GETOPT_HELP_CHAR or case_GETOPT_VERSION_CHAR code.
diff -urN ../coreutils-6.6-orig/src/chmod.c src/chmod.c
--- ../coreutils-6.6-orig/src/chmod.c	2006-10-23 01:54:15 +0900
+++ src/chmod.c	2006-12-08 10:18:32 +0900
@@ -386,9 +386,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/chown.c src/chown.c
--- ../coreutils-6.6-orig/src/chown.c	2006-10-23 01:54:15 +0900
+++ src/chown.c	2006-12-08 10:18:32 +0900
@@ -186,9 +186,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/chroot.c src/chroot.c
--- ../coreutils-6.6-orig/src/chroot.c	2006-10-23 01:54:15 +0900
+++ src/chroot.c	2006-12-08 10:18:32 +0900
@@ -67,9 +67,11 @@
 {
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   initialize_exit_failure (EXIT_FAIL);
   atexit (close_stdout);
diff -urN ../coreutils-6.6-orig/src/cksum.c src/cksum.c
--- ../coreutils-6.6-orig/src/cksum.c	2006-10-23 01:54:15 +0900
+++ src/cksum.c	2006-12-08 10:18:32 +0900
@@ -286,9 +286,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/cp.c src/cp.c
--- ../coreutils-6.6-orig/src/cp.c	2006-10-23 01:54:15 +0900
+++ src/cp.c	2006-12-08 10:18:32 +0900
@@ -835,9 +835,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/csplit.c src/csplit.c
--- ../coreutils-6.6-orig/src/csplit.c	2006-11-14 17:04:38 +0900
+++ src/csplit.c	2006-12-08 10:18:32 +0900
@@ -1330,9 +1330,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/cut.c src/cut.c
--- ../coreutils-6.6-orig/src/cut.c	2006-10-25 07:45:54 +0900
+++ src/cut.c	2006-12-08 10:18:32 +0900
@@ -748,9 +748,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/date.c src/date.c
--- ../coreutils-6.6-orig/src/date.c	2006-10-23 01:54:15 +0900
+++ src/date.c	2006-12-08 10:18:32 +0900
@@ -321,9 +321,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
@@ -545,12 +547,16 @@
       return false;
     }
 
+#if ENABLE_NLS
   if (format == rfc_2822_format)
     setlocale (LC_TIME, "C");
+#endif
   fprintftime (stdout, format, tm, 0, when.tv_nsec);
   fputc ('\n', stdout);
+#if ENABLE_NLS
   if (format == rfc_2822_format)
     setlocale (LC_TIME, "");
+#endif
 
   return true;
 }
diff -urN ../coreutils-6.6-orig/src/dd.c src/dd.c
--- ../coreutils-6.6-orig/src/dd.c	2006-12-08 10:10:15 +0900
+++ src/dd.c	2006-12-08 10:18:32 +0900
@@ -1632,9 +1632,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   /* Arrange to close stdout if parse_long_options exits.  */
   atexit (close_stdout);
diff -urN ../coreutils-6.6-orig/src/df.c src/df.c
--- ../coreutils-6.6-orig/src/df.c	2006-10-23 01:54:15 +0900
+++ src/df.c	2006-12-08 10:18:32 +0900
@@ -785,9 +785,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/dircolors.c src/dircolors.c
--- ../coreutils-6.6-orig/src/dircolors.c	2006-10-25 07:35:16 +0900
+++ src/dircolors.c	2006-12-08 10:18:32 +0900
@@ -405,9 +405,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/dirname.c src/dirname.c
--- ../coreutils-6.6-orig/src/dirname.c	2006-10-23 01:54:15 +0900
+++ src/dirname.c	2006-12-08 10:18:32 +0900
@@ -78,9 +78,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/du.c src/du.c
--- ../coreutils-6.6-orig/src/du.c	2006-10-23 01:54:15 +0900
+++ src/du.c	2006-12-08 10:18:32 +0900
@@ -694,9 +694,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/echo.c src/echo.c
--- ../coreutils-6.6-orig/src/echo.c	2006-10-23 01:54:15 +0900
+++ src/echo.c	2006-12-08 10:18:32 +0900
@@ -135,9 +135,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/env.c src/env.c
--- ../coreutils-6.6-orig/src/env.c	2006-10-23 01:54:15 +0900
+++ src/env.c	2006-12-08 10:18:32 +0900
@@ -143,9 +143,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   initialize_exit_failure (EXIT_FAIL);
   atexit (close_stdout);
diff -urN ../coreutils-6.6-orig/src/expand.c src/expand.c
--- ../coreutils-6.6-orig/src/expand.c	2006-10-23 01:54:15 +0900
+++ src/expand.c	2006-12-08 10:18:32 +0900
@@ -372,9 +372,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/expr.c src/expr.c
--- ../coreutils-6.6-orig/src/expr.c	2006-11-22 18:11:00 +0900
+++ src/expr.c	2006-12-08 10:18:32 +0900
@@ -189,9 +189,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   initialize_exit_failure (EXPR_FAILURE);
   atexit (close_stdout);
diff -urN ../coreutils-6.6-orig/src/factor.c src/factor.c
--- ../coreutils-6.6-orig/src/factor.c	2006-10-23 01:54:15 +0900
+++ src/factor.c	2006-12-08 10:18:32 +0900
@@ -194,9 +194,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/fmt.c src/fmt.c
--- ../coreutils-6.6-orig/src/fmt.c	2006-10-23 01:54:15 +0900
+++ src/fmt.c	2006-12-08 10:18:32 +0900
@@ -326,9 +326,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/fold.c src/fold.c
--- ../coreutils-6.6-orig/src/fold.c	2006-10-25 07:35:57 +0900
+++ src/fold.c	2006-12-08 10:18:32 +0900
@@ -249,9 +249,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/head.c src/head.c
--- ../coreutils-6.6-orig/src/head.c	2006-10-23 01:54:15 +0900
+++ src/head.c	2006-12-08 10:18:32 +0900
@@ -918,9 +918,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/hostid.c src/hostid.c
--- ../coreutils-6.6-orig/src/hostid.c	2006-10-23 01:54:15 +0900
+++ src/hostid.c	2006-12-08 10:18:32 +0900
@@ -66,9 +66,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/hostname.c src/hostname.c
--- ../coreutils-6.6-orig/src/hostname.c	2006-10-23 01:54:15 +0900
+++ src/hostname.c	2006-12-08 10:18:32 +0900
@@ -83,9 +83,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/id.c src/id.c
--- ../coreutils-6.6-orig/src/id.c	2006-10-23 01:54:15 +0900
+++ src/id.c	2006-12-08 10:18:32 +0900
@@ -113,9 +113,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/install.c src/install.c
--- ../coreutils-6.6-orig/src/install.c	2006-10-23 01:54:15 +0900
+++ src/install.c	2006-12-08 10:18:32 +0900
@@ -225,9 +225,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/ln.c src/ln.c
--- ../coreutils-6.6-orig/src/ln.c	2006-11-19 03:57:39 +0900
+++ src/ln.c	2006-12-08 10:18:32 +0900
@@ -395,9 +395,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/logname.c src/logname.c
--- ../coreutils-6.6-orig/src/logname.c	2006-10-23 01:54:15 +0900
+++ src/logname.c	2006-12-08 10:18:32 +0900
@@ -60,9 +60,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/ls.c src/ls.c
--- ../coreutils-6.6-orig/src/ls.c	2006-12-08 10:12:32 +0900
+++ src/ls.c	2006-12-08 10:19:28 +0900
@@ -1123,9 +1123,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   initialize_exit_failure (LS_FAILURE);
   atexit (close_stdout);
@@ -3595,6 +3597,7 @@
 		case 'p': case 'q': case 'r': case 's': case 't':
 		case 'u': case 'v': case 'w': case 'x': case 'y':
 		case 'z': case '{': case '|': case '}': case '~':
+		case -0x80 ... -0x02:
 		  /* These characters are printable ASCII characters.  */
 		  *q++ = *p++;
 		  displayed_width += 1;
@@ -3674,7 +3677,7 @@
 
 	  while (p < plimit)
 	    {
-	      if (! isprint (to_uchar (*p)))
+	      if (! isprint (to_uchar (*p)) && !(*p >= -0x80 && *p <= -2))
 		*p = '?';
 	      p++;
 	    }
diff -urN ../coreutils-6.6-orig/src/md5sum.c src/md5sum.c
--- ../coreutils-6.6-orig/src/md5sum.c	2006-10-23 01:54:15 +0900
+++ src/md5sum.c	2006-12-08 10:18:32 +0900
@@ -600,9 +600,11 @@
   /* Setting values of global variables.  */
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/mkdir.c src/mkdir.c
--- ../coreutils-6.6-orig/src/mkdir.c	2006-10-23 01:54:15 +0900
+++ src/mkdir.c	2006-12-08 10:18:32 +0900
@@ -148,9 +148,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/mkfifo.c src/mkfifo.c
--- ../coreutils-6.6-orig/src/mkfifo.c	2006-10-23 01:54:15 +0900
+++ src/mkfifo.c	2006-12-08 10:18:32 +0900
@@ -79,9 +79,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/mknod.c src/mknod.c
--- ../coreutils-6.6-orig/src/mknod.c	2006-10-23 01:54:15 +0900
+++ src/mknod.c	2006-12-08 10:18:32 +0900
@@ -95,9 +95,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/mv.c src/mv.c
--- ../coreutils-6.6-orig/src/mv.c	2006-10-23 18:09:10 +0900
+++ src/mv.c	2006-12-08 10:18:32 +0900
@@ -349,9 +349,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/nice.c src/nice.c
--- ../coreutils-6.6-orig/src/nice.c	2006-10-23 01:54:15 +0900
+++ src/nice.c	2006-12-08 10:18:32 +0900
@@ -101,9 +101,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   initialize_exit_failure (EXIT_FAIL);
   atexit (close_stdout);
diff -urN ../coreutils-6.6-orig/src/nl.c src/nl.c
--- ../coreutils-6.6-orig/src/nl.c	2006-10-25 07:38:35 +0900
+++ src/nl.c	2006-12-08 10:18:32 +0900
@@ -460,9 +460,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/od.c src/od.c
--- ../coreutils-6.6-orig/src/od.c	2006-11-17 03:15:30 +0900
+++ src/od.c	2006-12-08 10:18:32 +0900
@@ -1568,9 +1568,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/paste.c src/paste.c
--- ../coreutils-6.6-orig/src/paste.c	2006-10-25 07:22:42 +0900
+++ src/paste.c	2006-12-08 10:18:32 +0900
@@ -448,9 +448,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/pathchk.c src/pathchk.c
--- ../coreutils-6.6-orig/src/pathchk.c	2006-10-23 01:54:15 +0900
+++ src/pathchk.c	2006-12-08 10:18:32 +0900
@@ -121,9 +121,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/pinky.c src/pinky.c
--- ../coreutils-6.6-orig/src/pinky.c	2006-10-23 01:54:15 +0900
+++ src/pinky.c	2006-12-08 10:18:32 +0900
@@ -543,9 +543,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/pr.c src/pr.c
--- ../coreutils-6.6-orig/src/pr.c	2006-10-25 07:59:25 +0900
+++ src/pr.c	2006-12-08 10:18:32 +0900
@@ -871,9 +871,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/printenv.c src/printenv.c
--- ../coreutils-6.6-orig/src/printenv.c	2006-10-23 01:54:15 +0900
+++ src/printenv.c	2006-12-08 10:18:32 +0900
@@ -83,9 +83,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   initialize_exit_failure (PRINTENV_FAILURE);
   atexit (close_stdout);
diff -urN ../coreutils-6.6-orig/src/printf.c src/printf.c
--- ../coreutils-6.6-orig/src/printf.c	2006-10-25 07:42:56 +0900
+++ src/printf.c	2006-12-08 10:18:32 +0900
@@ -639,9 +639,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/ptx.c src/ptx.c
--- ../coreutils-6.6-orig/src/ptx.c	2006-10-23 01:54:15 +0900
+++ src/ptx.c	2006-12-08 10:18:32 +0900
@@ -1977,9 +1977,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/pwd.c src/pwd.c
--- ../coreutils-6.6-orig/src/pwd.c	2006-10-23 01:54:15 +0900
+++ src/pwd.c	2006-12-08 10:18:32 +0900
@@ -291,9 +291,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/rm.c src/rm.c
--- ../coreutils-6.6-orig/src/rm.c	2006-10-25 04:42:06 +0900
+++ src/rm.c	2006-12-08 10:18:32 +0900
@@ -235,9 +235,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/rmdir.c src/rmdir.c
--- ../coreutils-6.6-orig/src/rmdir.c	2006-10-23 01:54:15 +0900
+++ src/rmdir.c	2006-12-08 10:18:32 +0900
@@ -165,9 +165,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/seq.c src/seq.c
--- ../coreutils-6.6-orig/src/seq.c	2006-11-14 16:47:58 +0900
+++ src/seq.c	2006-12-08 10:18:32 +0900
@@ -272,9 +272,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/shred.c src/shred.c
--- ../coreutils-6.6-orig/src/shred.c	2006-10-23 01:54:15 +0900
+++ src/shred.c	2006-12-08 10:18:32 +0900
@@ -1100,9 +1100,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/sleep.c src/sleep.c
--- ../coreutils-6.6-orig/src/sleep.c	2006-10-23 01:54:15 +0900
+++ src/sleep.c	2006-12-08 10:18:32 +0900
@@ -106,9 +106,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/split.c src/split.c
--- ../coreutils-6.6-orig/src/split.c	2006-10-23 01:54:15 +0900
+++ src/split.c	2006-12-08 10:18:32 +0900
@@ -389,9 +389,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/stty.c src/stty.c
--- ../coreutils-6.6-orig/src/stty.c	2006-10-23 01:54:15 +0900
+++ src/stty.c	2006-12-08 10:18:32 +0900
@@ -748,9 +748,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/su.c src/su.c
--- ../coreutils-6.6-orig/src/su.c	2006-10-23 01:54:15 +0900
+++ src/su.c	2006-12-08 10:18:32 +0900
@@ -416,9 +416,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   initialize_exit_failure (EXIT_FAIL);
   atexit (close_stdout);
diff -urN ../coreutils-6.6-orig/src/sum.c src/sum.c
--- ../coreutils-6.6-orig/src/sum.c	2006-10-23 01:54:15 +0900
+++ src/sum.c	2006-12-08 10:18:32 +0900
@@ -227,9 +227,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/sync.c src/sync.c
--- ../coreutils-6.6-orig/src/sync.c	2006-10-23 01:54:15 +0900
+++ src/sync.c	2006-12-08 10:18:32 +0900
@@ -59,9 +59,11 @@
 {
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/tac.c src/tac.c
--- ../coreutils-6.6-orig/src/tac.c	2006-10-25 07:47:33 +0900
+++ src/tac.c	2006-12-08 10:18:32 +0900
@@ -575,9 +575,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/tail.c src/tail.c
--- ../coreutils-6.6-orig/src/tail.c	2006-12-08 10:11:50 +0900
+++ src/tail.c	2006-12-08 10:18:32 +0900
@@ -1595,9 +1595,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/tee.c src/tee.c
--- ../coreutils-6.6-orig/src/tee.c	2006-10-23 01:54:15 +0900
+++ src/tee.c	2006-12-08 10:18:32 +0900
@@ -85,9 +85,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/touch.c src/touch.c
--- ../coreutils-6.6-orig/src/touch.c	2006-10-23 01:54:15 +0900
+++ src/touch.c	2006-12-08 10:18:32 +0900
@@ -275,9 +275,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/tr.c src/tr.c
--- ../coreutils-6.6-orig/src/tr.c	2006-10-25 07:44:58 +0900
+++ src/tr.c	2006-12-08 10:18:32 +0900
@@ -1675,9 +1675,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/true.c src/true.c
--- ../coreutils-6.6-orig/src/true.c	2006-10-23 01:54:15 +0900
+++ src/true.c	2006-12-08 10:18:32 +0900
@@ -60,9 +60,11 @@
 {
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/tsort.c src/tsort.c
--- ../coreutils-6.6-orig/src/tsort.c	2006-10-23 01:54:15 +0900
+++ src/tsort.c	2006-12-08 10:18:32 +0900
@@ -536,9 +536,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/tty.c src/tty.c
--- ../coreutils-6.6-orig/src/tty.c	2006-10-23 01:54:15 +0900
+++ src/tty.c	2006-12-08 10:18:32 +0900
@@ -87,9 +87,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   initialize_exit_failure (TTY_WRITE_ERROR);
   atexit (close_stdout);
diff -urN ../coreutils-6.6-orig/src/uname.c src/uname.c
--- ../coreutils-6.6-orig/src/uname.c	2006-10-23 01:54:15 +0900
+++ src/uname.c	2006-12-08 10:18:32 +0900
@@ -162,9 +162,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/unexpand.c src/unexpand.c
--- ../coreutils-6.6-orig/src/unexpand.c	2006-10-23 01:54:15 +0900
+++ src/unexpand.c	2006-12-08 10:18:32 +0900
@@ -466,9 +466,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/uniq.c src/uniq.c
--- ../coreutils-6.6-orig/src/uniq.c	2006-10-23 01:54:15 +0900
+++ src/uniq.c	2006-12-08 10:18:32 +0900
@@ -401,10 +401,12 @@
   file[0] = file[1] = "-";
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
   hard_LC_COLLATE = hard_locale (LC_COLLATE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/uptime.c src/uptime.c
--- ../coreutils-6.6-orig/src/uptime.c	2006-10-23 01:54:15 +0900
+++ src/uptime.c	2006-12-08 10:18:32 +0900
@@ -215,9 +215,11 @@
 {
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/users.c src/users.c
--- ../coreutils-6.6-orig/src/users.c	2006-10-23 01:54:15 +0900
+++ src/users.c	2006-12-08 10:18:32 +0900
@@ -124,9 +124,11 @@
 {
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/wc.c src/wc.c
--- ../coreutils-6.6-orig/src/wc.c	2006-10-23 01:54:15 +0900
+++ src/wc.c	2006-12-08 10:18:32 +0900
@@ -583,9 +583,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/who.c src/who.c
--- ../coreutils-6.6-orig/src/who.c	2006-10-23 01:54:15 +0900
+++ src/who.c	2006-12-08 10:18:32 +0900
@@ -678,9 +678,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/whoami.c src/whoami.c
--- ../coreutils-6.6-orig/src/whoami.c	2006-10-23 01:54:15 +0900
+++ src/whoami.c	2006-12-08 10:18:32 +0900
@@ -68,9 +68,11 @@
 
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
diff -urN ../coreutils-6.6-orig/src/yes.c src/yes.c
--- ../coreutils-6.6-orig/src/yes.c	2006-10-23 01:54:15 +0900
+++ src/yes.c	2006-12-08 10:18:32 +0900
@@ -65,9 +65,11 @@
 {
   initialize_main (&argc, &argv);
   program_name = argv[0];
+#if defined(ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   atexit (close_stdout);
 
EOT

-/etc/shells
/bin/cat
/bin/chgrp
/bin/chmod
/bin/chown
/bin/cp
/bin/dd
/bin/df
/bin/dircolors
/bin/du
/bin/echo
/bin/ln
/bin/ls
/bin/mkdir
/bin/mkfifo
/bin/mknod
/bin/mv
/bin/pwd
/bin/rm
/bin/rmdir
/bin/shred
/bin/static/chgrp
/bin/static/chmod
/bin/static/chown
/bin/static/cp
/bin/static/dd
/bin/static/df
/bin/static/dircolors
/bin/static/du
/bin/static/install
/bin/static/ln
/bin/static/ls
/bin/static/mkdir
/bin/static/mkfifo
/bin/static/mknod
/bin/static/mv
/bin/static/rm
/bin/static/rmdir
/bin/static/shred
/bin/static/sync
/bin/static/touch
/bin/sync
/bin/touch
/bin/uname
/etc/shells
/pkg/coreutils/
/usr/bin/base64
/usr/bin/basename
/usr/bin/cat
/usr/bin/chroot
/usr/bin/cksum
/usr/bin/comm
/usr/bin/csplit
/usr/bin/cut
/usr/bin/date
/usr/bin/dirname
/usr/bin/env
/usr/bin/expand
/usr/bin/expr
/usr/bin/factor
/usr/bin/false
/usr/bin/fmt
/usr/bin/fold
/usr/bin/groups
/usr/bin/head
/usr/bin/hostid
/usr/bin/id
/usr/bin/install
/usr/bin/join
/usr/bin/logname
/usr/bin/md5sum
/usr/bin/nice
/usr/bin/nl
/usr/bin/nohup
/usr/bin/od
/usr/bin/paste
/usr/bin/pathchk
/usr/bin/pinky
/usr/bin/pr
/usr/bin/printenv
/usr/bin/printf
/usr/bin/ptx
/usr/bin/readlink
/usr/bin/seq
/usr/bin/sha1sum
/usr/bin/sha224sum
/usr/bin/sha256sum
/usr/bin/sha384sum
/usr/bin/sha512sum
/usr/bin/shuf
/usr/bin/sleep
/usr/bin/sort
/usr/bin/split
/usr/bin/stty
/usr/bin/su
/usr/bin/sum
/usr/bin/tac
/usr/bin/tail
/usr/bin/tee
/usr/bin/test
/usr/bin/tr
/usr/bin/true
/usr/bin/tsort
/usr/bin/tty
/usr/bin/unexpand
/usr/bin/uniq
/usr/bin/users
/usr/bin/wc
/usr/bin/who
/usr/bin/whoami
/usr/bin/yes
/usr/info/coreutils.info*.gz
/usr/man/man1/base64.1.gz
/usr/man/man1/basename.1.gz
/usr/man/man1/cat.1.gz
/usr/man/man1/chgrp.1.gz
/usr/man/man1/chmod.1.gz
/usr/man/man1/chown.1.gz
/usr/man/man1/chroot.1.gz
/usr/man/man1/cksum.1.gz
/usr/man/man1/comm.1.gz
/usr/man/man1/cp.1.gz
/usr/man/man1/csplit.1.gz
/usr/man/man1/cut.1.gz
/usr/man/man1/date.1.gz
/usr/man/man1/dd.1.gz
/usr/man/man1/df.1.gz
/usr/man/man1/dircolors.1.gz
/usr/man/man1/dirname.1.gz
/usr/man/man1/du.1.gz
/usr/man/man1/echo.1.gz
/usr/man/man1/env.1.gz
/usr/man/man1/expand.1.gz
/usr/man/man1/expr.1.gz
/usr/man/man1/factor.1.gz
/usr/man/man1/false.1.gz
/usr/man/man1/fmt.1.gz
/usr/man/man1/fold.1.gz
/usr/man/man1/groups.1.gz
/usr/man/man1/head.1.gz
/usr/man/man1/hostid.1.gz
/usr/man/man1/id.1.gz
/usr/man/man1/install.1.gz
/usr/man/man1/join.1.gz
/usr/man/man1/ln.1.gz
/usr/man/man1/logname.1.gz
/usr/man/man1/ls.1.gz
/usr/man/man1/md5sum.1.gz
/usr/man/man1/mkdir.1.gz
/usr/man/man1/mkfifo.1.gz
/usr/man/man1/mknod.1.gz
/usr/man/man1/mv.1.gz
/usr/man/man1/nice.1.gz
/usr/man/man1/nl.1.gz
/usr/man/man1/nohup.1.gz
/usr/man/man1/od.1.gz
/usr/man/man1/paste.1.gz
/usr/man/man1/pathchk.1.gz
/usr/man/man1/pinky.1.gz
/usr/man/man1/pr.1.gz
/usr/man/man1/printenv.1.gz
/usr/man/man1/printf.1.gz
/usr/man/man1/ptx.1.gz
/usr/man/man1/pwd.1.gz
/usr/man/man1/rm.1.gz
/usr/man/man1/rmdir.1.gz
/usr/man/man1/seq.1.gz
/usr/man/man1/sha1sum.1.gz
/usr/man/man1/sha224sum.1.gz
/usr/man/man1/sha256sum.1.gz
/usr/man/man1/sha384sum.1.gz
/usr/man/man1/sha512sum.1.gz
/usr/man/man1/shred.1.gz
/usr/man/man1/shuf.1.gz
/usr/man/man1/sleep.1.gz
/usr/man/man1/sort.1.gz
/usr/man/man1/split.1.gz
/usr/man/man1/stty.1.gz
/usr/man/man1/su.1.gz
/usr/man/man1/sum.1.gz
/usr/man/man1/sync.1.gz
/usr/man/man1/tac.1.gz
/usr/man/man1/tail.1.gz
/usr/man/man1/tee.1.gz
/usr/man/man1/test.1.gz
/usr/man/man1/touch.1.gz
/usr/man/man1/tr.1.gz
/usr/man/man1/true.1.gz
/usr/man/man1/tsort.1.gz
/usr/man/man1/tty.1.gz
/usr/man/man1/uname.1.gz
/usr/man/man1/unexpand.1.gz
/usr/man/man1/uniq.1.gz
/usr/man/man1/users.1.gz
/usr/man/man1/wc.1.gz
/usr/man/man1/who.1.gz
/usr/man/man1/whoami.1.gz
/usr/man/man1/yes.1.gz
/usr/share/locale/*/LC_MESSAGES/coreutils.mo
