Update by Juan Manuel Guerrero.

1 files changed, 148 insertions, 76 deletions

diff --git a/djgpp/README.in b/djgpp/README.in
index a176f09..36bf3e3 100644
--- a/djgpp/README.in
+++ b/djgpp/README.in
@@ -6,7 +6,7 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
         TO LEARN HOW TO INSTALL THE GNU GETTEXT LIBRARY AND HOW TO CHANGE
         YOUR C-LIBRARY AND SYSTEM HEADER FILE.
         TO USE THE GNU GETTEXT LIBRARY YOU **MUST** DOWNLOAD AND INSTALL
-        LICV16B.ZIP TOO. THIS IS **NOT** OPTIONAL.
+        LICV17B.ZIP TOO. THIS IS **NOT** OPTIONAL.
         IT IS NOT RECOMMED TO DOWNLOAD THE GNU DISTRIBUTION OF GETTEXT
         BECAUSE ONLY THE DJGPP PORT WILL CONTAIN THE REQUIRED HEADER AND
         OBJECT FILE TO PATCH THE C LIBRARY.
@@ -36,20 +36,15 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
 
      2) The binary package gtxt@packageversion@b.zip contains all needed files to get NLS
         support for the following DJGPP ports:
-          bison-1.28 (bsn128s.zip)
-          enscript-1.5.0 (ens150s.zip)
-          enscript-1.6.1 (ens161s.zip)
+          bison-1.32 (bsn132s.zip)
           enscript-1.6.2 (ens162s.zip)
-          fileutils-3.16 (fil316s.zip)
           fileutils-4.0 (fil40s.zip)
           grep-2.4 (grep24s.zip)
           id-utils-3.2 (idu32s.zip)
           make-3.79.1 (mak3791s.zip)
-          recode-3.5 (rcode35s.zip)
           recode-3.6 (rcode36s.zip)
           sed-3.02.80 (sed3028s.zip)
           sharutils-4.2c (shar42cs.zip)
-          sh-utils-2.0i (shl20is.zip)
           sh-utils-2.0j (shl20js.zip)
           tar-1.12a (tar112as.zip)
           texinfo-4.0 (txi40s.zip)
@@ -61,7 +56,7 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
           gtxt@packageversion@b.zip (binaries of GNU Gettext @VER@)
           licv17b.zip (binaries of GNU libiconv 1.7)
           fil40b.zip  (binaries of GNU Fileutils 4.0)
-          shl112b.zip (binaries of GNU Sh-utils 1.12  Date: 2000-08-11)
+          shl20jb.zip (binaries of GNU Sh-utils 2.0j)
 
 
 2.:     Installing the binary package.
@@ -131,60 +126,143 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
           ar -rv /dev/env/DJDIR/lib/libc.a conio.o
         You are done.
 
-2.4.:   Edit the djgpp.env file which is located in the top DJGPP installation
-        directory. Move to the first or global part of your djgpp.env.
-        The global part of your djgpp.env is everything *BEFORE* the *FIRST*
-        line that looks like:
-[xxxx]
-        where xxxx stands for the name of some DJGPP binary (usually this is bison).
-        Add the following line to the first part of your djgpp.env:
-
-+LANG=xx
-+LANGUAGE=yy:zz
-
-        The line must be completely shifted to the left in your djgpp.env file.
-        Please note the plus sign at the beginning of the line. This plus sign
-        should **NOT** be omited or a lot of shell scripts, in this and in
-        other packages, that try to reset this value will stop working. The
-        LANG entry is obligatory, the LANGUAGE entry may be omited. The
-        LANGUAGE variable allows you to select an alternate catalog that the
-        one stipulated by LANG. Replace xx, yy and zz by the language code of
-        the catalogs you want to use.
+2.3.:   The NLS controling environment variables, LANG and LANGUAGE, must be
+        set to their appropiate values. The exact way how these variables
+        should be set depends on your operating system:
+
+        * For Windows 98 systems:
+          - Click START;
+          - Choose Programs->Accessories->System Tools->System Information;
+          - Click Tools in the menu-bar, then choose "System Configuration";
+          - Use the tab provided there for editing your AUTOEXEC.BAT as
+            explained below.
+
+        * For Windows NT systems:
+          - Right-click "My Computer", then select "Properties";
+          - Click the "Environment" tab;
+          - Add a new variables LANG and LANGUAGE and set their values to the
+            wanted language codes file as explained below.
+
+        * For all other systems (DOS, Windows 3.X and Windows 95): use any
+          text editor, e.g. the standard EDIT, to edit the file AUTOEXEC.BAT
+          in the root directory of the boot drive (usually, C:).
+
+        The values of the two environment variables LANG and LANGUAGE should be
+        set like this:
+
+          set LANG=xx
+          set LANGUAGE=yy:zz
+
+        xx, yy and zz are place holders for the wanted language codes. For
+        posible values, please read below.
+        The LANG entry is obligatory, the LANGUAGE entry may be omited. The
+        LANG variable selects the locale charsets (dos codepage) to be used to
+        display the program's output and the catalog (.mo file) that contains
+        the translated strings to be used. The LANGUAGE variable allows you to
+        select an alternate catalog than the one stipulated by LANG. Replace
+        xx, yy and zz by the language code of the catalogs you want to use. It
+        should be noticed that LANGUAGE has *ALWAYS* higher priority than LANG.
+        The LANG variable not only selects a catalog, it also specifies the dos
+        codepage that will be used as locale charset. All this means that the
+        translation strings contained in the catalogs (.mo files) will be
+        recoded at runtime to the dos codepage stipulated by the value of LANG.
+        This runtime recoding is needed because the .mo files may have been
+        written using a charset that is not compatible with the charset that
+        will be used on the machine and OS where the .mo files contents will be
+        displayed. The .po files of the GNU packages, from which the .mo files
+        are generated, are typical examples of this. Usualy, they have been
+        written using some ISO-8859-nn charset (an unix charset) and shall be
+        displayed on a DOS/WIN95 machine that uses some dos codepage.
 
         Some examples:
-        If you only want to use the catalog containig the translations for
+        If you only want to use the catalog containing the translations for
         your mother tongue (in my case the spanish translations) the above
         lines will only use the LANG variable and will look like this:
 
-+LANG=es
+          set LANG=es
 
-        If you want to use the spanish (es) and german (de) catalogs
-        the above lines will look like this:
+        In this case, LANG defines the locale charset (CP850 in this case) to
+        be used for the on-the-fly recoding of the catalog (.mo file) contents
+        **AND AT THE SAME TIME** the translation/language (.mo file) to be used.
 
-+LANG=es
-+LANGUAGE=es:de
+        If you want to use the spanish (es) and german (de) catalogs the above
+        lines will look like this:
+
+          set LANG=es
+          set LANGUAGE=es:de
 
         In this case a DJGPP binary that has been compiled with NLS support
-        will first search for the spanish translations. If this translations
-        can not be found it will search for the german translations and if
-        this can also not been found it will default to the build-in english
-        messages. If you want to reverse this search order the above lines
-        would look like this one:
-
-+LANG=es
-+LANGUAGE=de:es
-
-        Please note that if you omit the LANG environment variable, the
-        LANGUAGE variable will not be honored at all. The LANG varaiable must
-        always be set to your default catalog. With the aid of LANGUAGE you can
-        select other catalogs apart of the default one. If for some reason you
-        want to disable NLS, then you should comment out the LANG variable or
+        will first search for the spanish translation of a string. If a
+        translation for that particular string can not be found in the spanish
+        .mo file then it will search for a german translation of that string in
+        the german .mo file and if a german translation of that string can also
+        not been found it will default to display the build-in english string.
+        No mather if a spanish, a german or an english build-in string is
+        selected, the string is always recoded to the dos codepage stipulated
+        by LANG. In this case: CP850. In the above example, LANGUAGE defines
+        the set of languages to be used and their priority (from left to right).
+        At the same time, LANG defines the locale charset (dos codepage) to be
+        used to recode **ALL** translated string, no matter which language
+        (.mo file) is used.
+        If you want to reverse this search order the above lines would look
+        like this one:
+
+          set LANG=es
+          set LANGUAGE=de:es
+
+        Now let us assume that an user wants to use the swedish catalogs on
+        a machine that loads codepage CP437 when it is booted. It should be
+        noticed that the locale charset for Sweden is CP850 and not CP437.
+        In this case, the lines must look like this:
+
+          set LANG=en_US
+          set LANGUAGE=sv
+
+        LANG reflects the available codepage/charset and LANGUAGE selects the
+        wanted translation catalog. en_US means CP437. Now, the contents of the
+        catalog are recoded to CP437 instead to CP850 because CP437 is the
+        codepage used to display messages on screen. Of course, not every
+        combination of catalogs and locale charset (dos codepages) makes sense.
+        E.G.: selecting as locale charset chinese (LANG=zh_TW) and the french
+        translations (LANGUAGE=fr) will certainly not generate an usefull
+        screen output.
+
+        The content of LANG is a language code. Examples are fr for french,
+        en_US for US english, etc. This language code is an alias for the
+        locale charset to be used for runtime recoding. The complete list of
+        all available aliases can be found in %DJDIR%/lib/charset.alias. This
+        file is a table with two entries: left entry is the alias (en_US,
+        de_AT, etc.), right entry is the corresponding dos codepage that will
+        be used for that language code (alias). It should be noticed that it is
+        also possible to select a codepage directely. E.G.: Instead of setting:
+
+          set LANG=en_US
+
+        you may directely set:
+
+          set LANG=CP437
+
+        cp437 or 437 are also valid settings for CP437. This overwrites any
+        settings in charset.alias. The settings in the environment always
+        overwrite the settings in charset.alias. Please note that if you omit
+        LANG, LANGUAGE will not be honored at all. Because the information
+        about which locale charset shall be used for recoding is needed,
+        if LANG is omitted by the user this information will not be available
+        and consequently LANGUAGE will be ignored and no translation at all
+        will be done.
+        If for some reason you want to disable NLS, then you should comment
+        out the LANG variable or remove them from your AUTOEXEC.BAT file or
         select 'C' as your catalog:
-+LANG=C
 
-        Users not familiar with djgpp.env should refer to kb.info.
-        This document can be read running the command:
-          info -f kb -n DJGPP.ENV
+          set LANG=C
+
+        or clear it by setting:
+
+          set LANG=
+
+        You can also change during a DOS session in Win9X or on plain DOS the
+        values of the LANG and LANGUAGE variables by setting or clearing them
+        from the DOS prompt.
 
 2.5.:   To create an entry for the gettext info docs in your dir file
         run from the top DJGPP installation directory the command:
@@ -204,9 +282,9 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
 3.1.:   To build the binaries you will need the following binary packages:
           djdev203.zip (or a later but NOT a prior version)
           bsh203b.zip  (or a later but NOT a prior version)
-          gcc2953b.zip, bnu2112b.zip, mak3791b.zip,
-          fil40b.zip, shl112b.zip, txt20b.zip,
-          txi40b.zip, grep24b.zip, sed302b.zip,
+          gcc303b.zip, bnu2112b.zip, mak3791b.zip,
+          fil40b.zip, shl20jb.zip, txt20b.zip,
+          txi40b.zip, grep24b.zip, sed3028b.zip,
           licv17b.zip
 
         If you want to run the check you will need also:
@@ -222,8 +300,7 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
         configuring or compiling the package or the configuration and build
         process will fail due to unresolved references to libiconv.a
         You will need bsh203b.zip or later and *NOT* a prior version or the
-        build will fail. The same applies to djdev203.zip. You *MUST* use the
-        updated version of shl112b.zip (date: 2000-08-11).
+        build will fail. The same applies to djdev203.zip.
         This updated versions have been recompiled with djdev203.zip and know
         about the "/dev/env" functionality introduced with djdev203.zip. All the
         other packages are the ones I have used to build the binaries from this
@@ -339,27 +416,22 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
 
         This package contains all needed files to get NLS support for the
         following DJGPP ports:
-          bison-1.28 (bsn128s.zip)
-          enscript-1.5.0 (ens150s.zip)
-          enscript-1.6.1 (ens161s.zip)
+          bison-1.32 (bsn132s.zip)
           enscript-1.6.2 (ens162s.zip)
-          fileutils-3.16 (fil316s.zip)
           fileutils-4.0 (fil40s.zip)
           grep-2.4 (grep24s.zip)
           id-utils-3.2 (idu32s.zip)
           make-3.79.1 (mak3791s.zip)
-          recode-3.5 (rcode35s.zip)
           recode-3.6 (rcode36s.zip)
           sed-3.02.80 (sed3028s.zip)
           sharutils-4.2c (shar42cs.zip)
-          sh-utils-2.0i (shl20is.zip)
           sh-utils-2.0j (shl20js.zip)
           tar-1.12a (tar112as.zip)
           texinfo-4.0 (txi40s.zip)
           textutils-2.0 (txt20s.zip)
 
         The files needed are placed in the NLS_for_djgpp_packages tree located
-        in djgpp directory. I will explane this using bison-1.28 as example.
+        in djgpp directory. I will explane this using grep-2.4 as example.
         This means that file names or command names may change from port to port.
         The configuration batch files and the sed scripts of every package have
         the same name as the original ones that this ones will replace. If you
@@ -379,24 +451,24 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
 
 4.2.:   We will assume that the required sources will be unzipped into
         a directory called src.
-        Copy bsn128s.zip into /src and decompress them preserving the directory
+        Copy grep24s.zip into /src and decompress them preserving the directory
         structure running the command:
           unzip32 *.zip
         This will create the directory:
-          /src/gnu/bison-1.28
+          /src/gnu/grep-2.4
 
         The binary package gtxt@packageversion@b.zip will create the directory:
-          %DJDIR%/gnu/gtxt-@treeversion@/djgpp/NLS_for_djgpp_packages/bison-1.28
+          %DJDIR%/gnu/gtxt-@treeversion@/djgpp/NLS_for_djgpp_packages/grep-2.4
         This directory contains all needed files.
         The files are:
-          bison-1.28/djconfig.bat      (new .bat file that replaces the original one.)
-          bison-1.28/djgpp/config.sed  (sed script to modify configure.)
-          bison-1.28/djgpp/config.site (defaults for configure.)
+          grep-2.4/djgpp/config.bat  (new .bat file that replaces the original one.)
+          grep-2.4/djgpp/config.sed  (sed script needed to modify configure.)
+          grep-2.4/djgpp/config.site (defaults for configure.)
 
-        Now we will xcopy the needed files into the original bison-1.28 directory.
-        First we will cd into the bison-1.28 directory and then we will run the
+        Now we will xcopy the needed files into the original grep-2.4 directory.
+        First we will cd into the grep-2.4 directory and then we will run the
         following command:
-          xcopy %DJDIR%\gnu\gtxt-@treeversion@\djgpp\NLS_for_djgpp_packages\bison-1.28 /v/s/e
+          xcopy %DJDIR%\gnu\gtxt-@treeversion@\djgpp\NLS_for_djgpp_packages\grep-2.4 /v/s/e
 
 4.3.:   Before the package can be reconfigured, the old configuration must be
         cleared. Run the command:
@@ -407,9 +479,9 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
         used the "distclean" target.
 
 4.4.:   Now the package can be configured running the command:
-          djconfig
-        if you want to build the products in the /src/bison-1.28 directory, or:
-          c:\src\bison-1.28\djconfig c:/src/bison-1.28
+          djgpp\config
+        if you want to build the products in the /src/grep-2.4 directory, or:
+          c:\src\grep-2.4\djgpp\config c:/src/grep-2.4
         if you want to build the products on a different drive or directory.
         You can still configure without NLS support if you want. In this case
         simply add the option "no-NLS" to the above commands.
@@ -429,7 +501,7 @@ This is a port of GNU Gettext @VER@ to MSDOS/DJGPP.
         You can install into a temp directory if you want by specifying a prefix:
           make install prefix=z:/tmp CATALOGS="xx.gmo yy.gmo zz.gmo"
 
-4.7.:   Now you have to set the LANG environment variable.
+4.7.:   Now you have to set the LANG and LANGUAGE environment variable.
         Please refer to 2.4.