This patch documents DJGPP specific changes and has
already been submitted to the GNU gettext maintainer
for inclusion in the next official gettext release.


diff -acprNC5 gettext-0.10.39.orig/djgpp/config.bat gettext-0.10.39.djgpp/djgpp/config.bat
*** gettext-0.10.39.orig/djgpp/config.bat	Fri Mar 16 18:35:30 2001
--- gettext-0.10.39.djgpp/djgpp/config.bat	Wed Aug  1 00:32:44 2001
***************
*** 1,47 ****
  @echo off
  echo Configuring GNU Gettext for DJGPP v2.x...
  Rem The SmallEnv tests protect against fixed and too small size
  Rem of the environment in stock DOS shell.
  
! Rem Find out if NLS is wanted or not
  Rem and where the sources are.
! Rem We always default to NLS support
! Rem and to in place configuration.
  set NLS=enabled
  if not "%NLS%" == "enabled" goto SmallEnv
  set XSRC=.
  if not "%XSRC%" == "." goto SmallEnv
  
! Rem This checks the case:
! Rem   %1 contains the NLS option.
! Rem   %2 contains the src path option.
! if "%1" == "" goto InPlace
! if "%1" == "NLS" goto SrcDir2
! if not "%1" == "no-NLS" goto SrcDir1
! set NLS=disabled
  if not "%NLS%" == "disabled" goto SmallEnv
! :SrcDir2
! Rem Find out where the sources are
! if "%2" == "" goto InPlace
! set XSRC=%2
! if not "%XSRC%" == "%2" goto SmallEnv
! goto NotInPlace
! 
! Rem This checks the case:
! Rem   %1 contains the src path option.
! Rem   %2 contains the NLS option.
! :SrcDir1
! Rem Find out where the sources are
! if "%1" == "" goto InPlace
  set XSRC=%1
  if not "%XSRC%" == "%1" goto SmallEnv
! if "%2" == "" goto NotInPlace
! if "%2" == "NLS" goto NotInPlace
! if not "%2" == "no-NLS" goto NotInPlace
! set NLS=disabled
! if not "%NLS%" == "disabled" goto SmallEnv
  
  :NotInPlace
  redir -e /dev/null update %XSRC%/configure.orig ./configure
  test -f ./configure
  if errorlevel 1 update %XSRC%/configure ./configure
--- 1,73 ----
  @echo off
  echo Configuring GNU Gettext for DJGPP v2.x...
  Rem The SmallEnv tests protect against fixed and too small size
  Rem of the environment in stock DOS shell.
  
! Rem Find out if NLS is wanted or not,
! Rem if static or shared libraries are wanted
  Rem and where the sources are.
! Rem We always default to NLS support,
! Rem static libraries, and to in place configuration.
! set ARGS=
  set NLS=enabled
  if not "%NLS%" == "enabled" goto SmallEnv
+ set STATIC_LIBS=enabled
+ if not "%STATIC_LIBS%" == "enabled" goto SmallEnv
  set XSRC=.
  if not "%XSRC%" == "." goto SmallEnv
  
! Rem Loop over all arguments.
! Rem Special arguments are: NLS, XSRC and STATIC_LIBS.
! Rem All other arguments are stored unchanged into ARGS.
! :ArgLoop
! set ARGSFLAG=1
! if not "%ARGSFLAG%" == "1" goto SmallEnv
! if not "%1" == "NLS" if not "%1" == "nls" if not "%1" == "NO-NLS" if not "%1" == "no-NLS" if not "%1" == "no-nls" goto StaticLibsOpt
! if "%1" == "no-nls" set NLS=disabled
! if "%1" == "no-NLS" set NLS=disabled
! if "%1" == "NO-NLS" set NLS=disabled
  if not "%NLS%" == "disabled" goto SmallEnv
! set ARGSFLAG=0
! if not "%ARGSFLAG%" == "0" goto SmallEnv
! shift
! :StaticLibsOpt
! set ARGSFLAG=1
! if not "%ARGSFLAG%" == "1" goto SmallEnv
! if not "%1" == "static" if not "%1" == "STATIC" if not "%1" == "shared" if not "%1" == "SHARED" goto SrcDirOpt
! if "%1" == "shared" set STATIC_LIBS=disabled
! if "%1" == "SHARED" set STATIC_LIBS=disabled
! if not "%STATIC_LIBS%" == "disabled" goto SmallEnv
! set ARGSFLAG=0
! if not "%ARGSFLAG%" == "0" goto SmallEnv
! shift
! :SrcDirOpt
! set ARGSFLAG=1
! if not "%ARGSFLAG%" == "1" goto SmallEnv
! echo %1 | grep -q "/"
! if errorlevel 1 goto NextArg
  set XSRC=%1
  if not "%XSRC%" == "%1" goto SmallEnv
! set ARGSFLAG=0
! if not "%ARGSFLAG%" == "0" goto SmallEnv
! :NextArg
! if "%ARGSFLAG%" == "1" set _ARGS=%ARGS% %1
! if "%ARGSFLAG%" == "1" if not "%_ARGS%" == "%ARGS% %1" goto SmallEnv
! set ARGS=%_ARGS%
! set _ARGS=
! shift
! if not "%1" == "" goto ArgLoop
! set ARGSFLAG=
! 
! if "%STATIC_LIBS%" == "enabled" set _ARGS=--enable-static --disable-shared %ARGS%
! if not "%_ARGS%" == "--enable-static --disable-shared %ARGS%" goto SmallEnv
! if "%STATIC_LIBS%" == "disabled" set _ARGS=--disable-static --enable-shared %ARGS%
! if "%STATIC_LIBS%" == "disabled" if not "%_ARGS%" == "--disable-static --enable-shared %ARGS%" goto SmallEnv
! set ARGS=%_ARGS%
! set _ARGS=
! 
! if "%XSRC%" == "." goto InPlace
  
  :NotInPlace
  redir -e /dev/null update %XSRC%/configure.orig ./configure
  test -f ./configure
  if errorlevel 1 update %XSRC%/configure ./configure
*************** Rem Make sure crucial file names are not
*** 62,90 ****
  test -f %XSRC%/config.h.in
  if not errorlevel 1 mv -f %XSRC%/config.h.in %XSRC%/config.h-in
  test -f %XSRC%/po/Makefile.in.in
  if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in
  
- Rem Let libtool use _libs all the time.
- test -f %XSRC%/ltconfig.orig
- if errorlevel 1 update %XSRC%/ltconfig %XSRC%/ltconfig.orig
- sed "/objdir=/s|\.libs|_libs|" %XSRC%/ltconfig > ltconfig.tmp
- if errorlevel 1 goto SedError
- update ltconfig.tmp %XSRC%/ltconfig
- rm ltconfig.tmp
- 
  Rem While building the binaries in src/ subdir an intermediary
  Rem file called po-gram-gen2.h is generated from po-gram-gen.h.
  Rem Both resolve to the same 8.3 filename. po-gram-gen2.h will
  Rem be renamed to po-gram_gen2.h and src/po-lex.c must be fixed
  Rem accordingly.
  test -f %XSRC%/src/po-lex.orig
  if errorlevel 1 update %XSRC%/src/po-lex.c %XSRC%/src/po-lex.orig
! sed "s/po-gram-gen2.h/po-gram_gen2.h/g" %XSRC%/src/po-lex.c > po-lex.tmp
  if errorlevel 1 goto SedError
! update ./po-lex.tmp %XSRC%/src/po-lex.c
! rm ./po-lex.tmp
  
  Rem This is required because DOS/Windows are case-insensitive
  Rem to file names, and "make install" will do nothing if Make
  Rem finds a file called `install'.
  if exist INSTALL mv -f INSTALL INSTALL.txt
--- 88,107 ----
  test -f %XSRC%/config.h.in
  if not errorlevel 1 mv -f %XSRC%/config.h.in %XSRC%/config.h-in
  test -f %XSRC%/po/Makefile.in.in
  if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in
  
  Rem While building the binaries in src/ subdir an intermediary
  Rem file called po-gram-gen2.h is generated from po-gram-gen.h.
  Rem Both resolve to the same 8.3 filename. po-gram-gen2.h will
  Rem be renamed to po-gram_gen2.h and src/po-lex.c must be fixed
  Rem accordingly.
  test -f %XSRC%/src/po-lex.orig
  if errorlevel 1 update %XSRC%/src/po-lex.c %XSRC%/src/po-lex.orig
! sed "s/po-gram-gen2.h/po-gram_gen2.h/g" %XSRC%/src/po-lex.orig > po-lex.tmp
  if errorlevel 1 goto SedError
! mv ./po-lex.tmp %XSRC%/src/po-lex.c
  
  Rem This is required because DOS/Windows are case-insensitive
  Rem to file names, and "make install" will do nothing if Make
  Rem finds a file called `install'.
  if exist INSTALL mv -f INSTALL INSTALL.txt
*************** set HOSTNAME=%_HOSTNAME%
*** 129,146 ****
  set _HOSTNAME=
  set OS=
  
  if "%NLS%" == "disabled" goto WithoutNLS
  echo Running the ./configure script...
! sh ./configure --srcdir=%XSRC% --enable-nls --with-included-gettext
  if errorlevel 1 goto CfgError
  echo Done.
  goto ScriptEditing
  
  :WithoutNLS
  echo Running the ./configure script...
! sh ./configure --srcdir=%XSRC% --disable-nls
  if errorlevel 1 goto CfgError
  echo Done.
  
  :ScriptEditing
  Rem DJGPP specific editing of test scripts.
--- 146,163 ----
  set _HOSTNAME=
  set OS=
  
  if "%NLS%" == "disabled" goto WithoutNLS
  echo Running the ./configure script...
! sh ./configure --srcdir=%XSRC% --enable-nls --with-included-gettext %ARGS%
  if errorlevel 1 goto CfgError
  echo Done.
  goto ScriptEditing
  
  :WithoutNLS
  echo Running the ./configure script...
! sh ./configure --srcdir=%XSRC% --disable-nls %ARGS%
  if errorlevel 1 goto CfgError
  echo Done.
  
  :ScriptEditing
  Rem DJGPP specific editing of test scripts.
*************** echo Configuration NOT done!
*** 177,185 ****
--- 194,203 ----
  test -f %XSRC%/install-sh.sh
  if not errorlevel 1 goto NoRen1
  test -f %XSRC%/install-sh
  if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh
  :NoRen1
+ set ARGS=
  set CONFIG_SITE=
  set HOSTNAME=
  set NLS=
  set XSRC=
diff -acprNC5 gettext-0.10.39.orig/djgpp/config.in gettext-0.10.39.djgpp/djgpp/config.in
*** gettext-0.10.39.orig/djgpp/config.in	Fri Mar 23 15:36:48 2001
--- gettext-0.10.39.djgpp/djgpp/config.in	Wed Aug  1 00:32:44 2001
***************
*** 3,42 ****
  /@MSGFMT@/ s,\$MSGFMT,msgfmt,
  /@XGETTEXT@/ s,\$XGETTEXT,xgettext,
  /ac_given_INSTALL=/,/^CEOF/ {
    /^CEOF$/ i\
  # DJGPP specific Makefile changes.\
!   /^aliaspath *	*=/s,:,";",g\
!   /^lispdir *	*=/ c\\\\\
  lispdir = \\$(prefix)/gnu/emacs/site-lisp\
!   /TEXINPUTS=/s,:,";",g\
!   /PATH=/s,:,";",g\
    s,\\.new\\.,_new.,g\
    s,\\.old\\.,_old.,g\
    s,\\.tab\\.c,_tab.c,g\
    s,\\.tab\\.h,_tab.h,g\
    @append_list_of_renamed_files@
    /^TESTS[ 	]*=/ s,plural-\\([1-9]\\+\\),plural.\\1,g\
    /^install-info-am:/,/^$/ {\
      /@list=/ s,\\\$(INFO_DEPS),& gettext.i,\
      s,file-\\[0-9\\]\\[0-9\\],& \\$\\$file[0-9] \\$\\$file[0-9][0-9],\
    }\
!   /^iso-apdx\\.texi *	*:.*$/ {\
!     s,iso-apdx,\\$(srcdir)/&,g\
      s,ISO_639,\\$(srcdir)/&,\
    }\
    /^# Some rules for yacc handling\\./,$ {\
      /\\\$(YACC)/ a\\\\\
  	-@test -f y.tab.c && mv -f y.tab.c y_tab.c\\\\\
  	-@test -f y.tab.h && mv -f y.tab.h y_tab.h\
    }\
    /^POTFILES:/,/^$/ s,\\\$@-t,t-\\$@,g\
    s,basename\\.o,,g\
    s,po-gram-gen2\\.h,po-gram_gen2.h,g\
    /^Makefile[ 	]*:/,/^$/ {\
      /CONFIG_FILES=/ s,\\\$(subdir)/\\\$@\\.in,&:\\$(subdir)/\\$@.in-in,\
!   }
  }
  
  # Makefile.in.in is renamed to Makefile.in-in...
  /^CONFIG_FILES=/,/^EOF/ {
    s|po/Makefile\.in|&:po/Makefile.in-in|
--- 3,51 ----
  /@MSGFMT@/ s,\$MSGFMT,msgfmt,
  /@XGETTEXT@/ s,\$XGETTEXT,xgettext,
  /ac_given_INSTALL=/,/^CEOF/ {
    /^CEOF$/ i\
  # DJGPP specific Makefile changes.\
!   /^aliaspath[ 	]*=/s,:,";",g\
!   /^lispdir[ 	]*=/ c\\\\\
  lispdir = \\$(prefix)/gnu/emacs/site-lisp\
!   /TEXINPUTS[ 	]*=/s,:,";",g\
!   /PATH[ 	]*=/s,:,";",g\
    s,\\.new\\.,_new.,g\
    s,\\.old\\.,_old.,g\
    s,\\.tab\\.c,_tab.c,g\
    s,\\.tab\\.h,_tab.h,g\
+   s,\\([1-9]\\)\\.html,\\1-html,g\
+   s,\\([1-9]\\)\\.in,\\1-in,g\
+   s,gettext_\\*\\.,gettext.*-,g\
    @append_list_of_renamed_files@
    /^TESTS[ 	]*=/ s,plural-\\([1-9]\\+\\),plural.\\1,g\
    /^install-info-am:/,/^$/ {\
      /@list=/ s,\\\$(INFO_DEPS),& gettext.i,\
      s,file-\\[0-9\\]\\[0-9\\],& \\$\\$file[0-9] \\$\\$file[0-9][0-9],\
    }\
!   /^iso-639\\.texi[ 	]*:.*$/ {\
!     s,iso-639,\\$(srcdir)/&,g\
      s,ISO_639,\\$(srcdir)/&,\
    }\
+   /^iso-3166\\.texi[ 	]*:.*$/ {\
+     s,iso-3166,\\$(srcdir)/&,g\
+     s,ISO_3166,\\$(srcdir)/&,\
+   }\
    /^# Some rules for yacc handling\\./,$ {\
      /\\\$(YACC)/ a\\\\\
  	-@test -f y.tab.c && mv -f y.tab.c y_tab.c\\\\\
  	-@test -f y.tab.h && mv -f y.tab.h y_tab.h\
    }\
    /^POTFILES:/,/^$/ s,\\\$@-t,t-\\$@,g\
    s,basename\\.o,,g\
    s,po-gram-gen2\\.h,po-gram_gen2.h,g\
    /^Makefile[ 	]*:/,/^$/ {\
      /CONFIG_FILES=/ s,\\\$(subdir)/\\\$@\\.in,&:\\$(subdir)/\\$@.in-in,\
!   }\
!   /html:/ s,split$,monolithic,g\
!   /^TEXI2HTML[ 	]*=/ s,=[ 	]*,&-,
  }
  
  # Makefile.in.in is renamed to Makefile.in-in...
  /^CONFIG_FILES=/,/^EOF/ {
    s|po/Makefile\.in|&:po/Makefile.in-in|
*************** lispdir = \\$(prefix)/gnu/emacs/site-lis
*** 58,74 ****
  /# Handling of arguments./,/^$/ {
    s|po/Makefile\.in|&:po/Makefile.in-in|2
    s|config\.h|&:config.h-in|2
  }
  
! # Replace (command) > /dev/null with `command > /dev/null`, since
  # parenthesized commands always return zero status in the ported Bash,
  # even if the named command doesn't exist
! /if ([^|;]*null/{
!   s,(,`,
!   s,),,
!   s,;  *then,`; then,
  }
  
  # DOS-style absolute file names should be supported as well
  /\*) srcdir=/s,/\*,[\\\\/]* | [A-z]:[\\\\/]*,
  /\$]\*) INSTALL=/s,\[/\$\]\*,[\\\\/$]* | [A-z]:[\\\\/]*,
--- 67,84 ----
  /# Handling of arguments./,/^$/ {
    s|po/Makefile\.in|&:po/Makefile.in-in|2
    s|config\.h|&:config.h-in|2
  }
  
! # Replace `(command) > /dev/null` with `command > /dev/null`, since
  # parenthesized commands always return zero status in the ported Bash,
  # even if the named command doesn't exist
! /if [^{].*null/,/ then/ {
!   /test .*null/ {
!     s,(,,
!     s,),,
!   }
  }
  
  # DOS-style absolute file names should be supported as well
  /\*) srcdir=/s,/\*,[\\\\/]* | [A-z]:[\\\\/]*,
  /\$]\*) INSTALL=/s,\[/\$\]\*,[\\\\/$]* | [A-z]:[\\\\/]*,
*************** lispdir = \\$(prefix)/gnu/emacs/site-lis
*** 103,107 ****
--- 113,120 ----
  
  #  2) We need links across partitions, so we will use "cp -pf" instead of "ln".
  /# Make a symlink if possible; otherwise try a hard link./,/EOF/ {
    s,;.*then, 2>/dev/null || cp -pf \$srcdir/\$ac_source \$ac_dest&,
  }
+ 
+ # Let libtool use _libs all the time.
+ /objdir=/s,\.libs,_libs,
diff -acprNC5 gettext-0.10.39.orig/djgpp/config.site gettext-0.10.39.djgpp/djgpp/config.site
*** gettext-0.10.39.orig/djgpp/config.site	Fri Mar 16 18:29:20 2001
--- gettext-0.10.39.djgpp/djgpp/config.site	Wed Aug  1 00:32:44 2001
*************** test "x$prefix" = xNONE && prefix='/dev/
*** 22,42 ****
  # package was configured.
  # $INSTALL must be an absolute path name, otherwise config.status
  # will try to prepend ./ and ../ to it when it goes into subdirs.
  INSTALL=${INSTALL='/dev/env/DJDIR/bin/ginstall -c'}
  RANLIB=${RANLIB='ranlib'}
  
  # A sane defualt for emacs.
  ac_cv_path_EMACS=${EMACS='/dev/env/DJDIR/gnu/emacs/bin/emacs'}
  
  # These are set here so the generated libtool will be good
  # for every DJGPP installation, not only the one where the
  # package was configured.
  NM=${NM='nm'}
  LD=${LD='ld'}
  
- # We always use our own binaries.
- GMSGFMT=${GMSGFMT='msgfmt'}
- MSGFMT=${MSGFMT='msgfmt'}
- 
  # Force the test for 'ln -s' to report 'cp -p'.
  ac_cv_prog_LN_S='cp -p'
--- 22,45 ----
  # package was configured.
  # $INSTALL must be an absolute path name, otherwise config.status
  # will try to prepend ./ and ../ to it when it goes into subdirs.
  INSTALL=${INSTALL='/dev/env/DJDIR/bin/ginstall -c'}
  RANLIB=${RANLIB='ranlib'}
+ DVIPS=${DVIPS='/dev/env/DJDIR/bin/dvips'}
+ TEXI2PDF=${TEXI2PDF='/dev/env/DJDIR/bin/texi2pdf'}
+ 
+ # The texi2html perl script is usualy not available on stock
+ # DJGPP installations, so one will be distributed with the
+ # official DJGPP source zip file.
+ TEXI2HTML=${TEXI2HTML='/dev/env/DJDIR/bin/perl $(top_srcdir)/djgpp/texi2html'}
  
  # A sane defualt for emacs.
  ac_cv_path_EMACS=${EMACS='/dev/env/DJDIR/gnu/emacs/bin/emacs'}
  
  # These are set here so the generated libtool will be good
  # for every DJGPP installation, not only the one where the
  # package was configured.
  NM=${NM='nm'}
  LD=${LD='ld'}
  
  # Force the test for 'ln -s' to report 'cp -p'.
  ac_cv_prog_LN_S='cp -p'
diff -acprNC5 gettext-0.10.39.orig/djgpp/fnchange.in gettext-0.10.39.djgpp/djgpp/fnchange.in
*** gettext-0.10.39.orig/djgpp/fnchange.in	Fri Mar 23 15:36:48 2001
--- gettext-0.10.39.djgpp/djgpp/fnchange.in	Wed Aug  1 00:32:44 2001
***************
*** 1,29 ****
  # This is a template from which fnchange.lst is generated.
! @V@/config.h.in           @V@/config.h-in
! @V@/po/Makefile.in.in     @V@/po/Makefile.in-in
! @V@/tests/gettext-1       @V@/tests/gettext.1
! @V@/tests/gettext-2       @V@/tests/gettext.2
! @V@/tests/msgcmp-1        @V@/tests/msgcmp.1
! @V@/tests/msgcmp-2        @V@/tests/msgcmp.2
! @V@/tests/msgfmt-1        @V@/tests/msgfmt.1
! @V@/tests/msgfmt-2        @V@/tests/msgfmt.2
! @V@/tests/msgfmt-3        @V@/tests/msgfmt.3
! @V@/tests/msgfmt-4        @V@/tests/msgfmt.4
! @V@/tests/msgmerge-1      @V@/tests/msgmerge.1
! @V@/tests/msgmerge-2      @V@/tests/msgmerge.2
! @V@/tests/msgmerge-3      @V@/tests/msgmerge.3
! @V@/tests/msgmerge-4      @V@/tests/msgmerge.4
! @V@/tests/msgmerge-5      @V@/tests/msgmerge.5
! @V@/tests/msgunfmt-1      @V@/tests/msgunfmt.1
! @V@/tests/xgettext-1      @V@/tests/xgettext.1
! @V@/tests/xgettext-2      @V@/tests/xgettext.2
! @V@/tests/xgettext-3      @V@/tests/xgettext.3
! @V@/tests/xgettext-4      @V@/tests/xgettext.4
! @V@/tests/xgettext-5      @V@/tests/xgettext.5
! @V@/tests/xgettext-6      @V@/tests/xgettext.6
! @V@/tests/xgettext-7      @V@/tests/xgettext.7
! @V@/tests/xgettext-8      @V@/tests/xgettext.8
! @V@/tests/xgettext-9      @V@/tests/xgettext.9
! @V@/tests/xg-test1.ok.po  @V@/tests/xg-test1.ok-po
! @V@/tests/plural-1        @V@/tests/plural.1
! @V@/tests/plural-2        @V@/tests/plural.2
--- 1,55 ----
  # This is a template from which fnchange.lst is generated.
! @V@/config.h.in                         @V@/config.h-in
! @V@/doc/gettext_1.html                  @V@/doc/gettext.1-html
! @V@/doc/gettext_10.html                 @V@/doc/gettext.10-html
! @V@/doc/gettext_11.html                 @V@/doc/gettext.11-html
! @V@/doc/gettext_12.html                 @V@/doc/gettext.12-html
! @V@/doc/gettext_13.html                 @V@/doc/gettext.13-html
! @V@/doc/gettext_14.html                 @V@/doc/gettext.14-html
! @V@/doc/gettext_2.html                  @V@/doc/gettext.2-html
! @V@/doc/gettext_3.html                  @V@/doc/gettext.3-html
! @V@/doc/gettext_4.html                  @V@/doc/gettext.4-html
! @V@/doc/gettext_5.html                  @V@/doc/gettext.5-html
! @V@/doc/gettext_6.html                  @V@/doc/gettext.6-html
! @V@/doc/gettext_7.html                  @V@/doc/gettext.7-html
! @V@/doc/gettext_8.html                  @V@/doc/gettext.8-html
! @V@/doc/gettext_9.html                  @V@/doc/gettext.9-html
! @V@/doc/gettext_foot.html               @V@/doc/gettext.foot-html
! @V@/doc/gettext_toc.html                @V@/doc/gettext.toc-html
! @V@/man/gettext.3.html                  @V@/man/gettext.3-html
! @V@/man/ngettext.3.html                 @V@/man/ngettext.3-html
! @V@/man/textdomain.3.html               @V@/man/textdomain.3-html
! @V@/man/bindtextdomain.3.html           @V@/man/bindtextdomain.3-html
! @V@/man/bind_textdomain_codeset.3.html  @V@/man/bind_textdomain_codeset.3-html
! @V@/man/gettext.3.in                    @V@/man/gettext.3-in
! @V@/man/ngettext.3.in                   @V@/man/ngettext.3-in
! @V@/man/textdomain.3.in                 @V@/man/textdomain.3-in
! @V@/man/bindtextdomain.3.in             @V@/man/bindtextdomain.3-in
! @V@/man/bind_textdomain_codeset.3.in    @V@/man/bind_textdomain_codeset.3-in
! @V@/po/Makefile.in.in                   @V@/po/Makefile.in-in
! @V@/tests/gettext-1                     @V@/tests/gettext.1
! @V@/tests/gettext-2                     @V@/tests/gettext.2
! @V@/tests/msgcmp-1                      @V@/tests/msgcmp.1
! @V@/tests/msgcmp-2                      @V@/tests/msgcmp.2
! @V@/tests/msgfmt-1                      @V@/tests/msgfmt.1
! @V@/tests/msgfmt-2                      @V@/tests/msgfmt.2
! @V@/tests/msgfmt-3                      @V@/tests/msgfmt.3
! @V@/tests/msgfmt-4                      @V@/tests/msgfmt.4
! @V@/tests/msgmerge-1                    @V@/tests/msgmerge.1
! @V@/tests/msgmerge-2                    @V@/tests/msgmerge.2
! @V@/tests/msgmerge-3                    @V@/tests/msgmerge.3
! @V@/tests/msgmerge-4                    @V@/tests/msgmerge.4
! @V@/tests/msgmerge-5                    @V@/tests/msgmerge.5
! @V@/tests/msgunfmt-1                    @V@/tests/msgunfmt.1
! @V@/tests/xgettext-1                    @V@/tests/xgettext.1
! @V@/tests/xgettext-2                    @V@/tests/xgettext.2
! @V@/tests/xgettext-3                    @V@/tests/xgettext.3
! @V@/tests/xgettext-4                    @V@/tests/xgettext.4
! @V@/tests/xgettext-5                    @V@/tests/xgettext.5
! @V@/tests/xgettext-6                    @V@/tests/xgettext.6
! @V@/tests/xgettext-7                    @V@/tests/xgettext.7
! @V@/tests/xgettext-8                    @V@/tests/xgettext.8
! @V@/tests/xgettext-9                    @V@/tests/xgettext.9
! @V@/tests/xg-test1.ok.po                @V@/tests/xg-test1.ok-po
! @V@/tests/plural-1                      @V@/tests/plural.1
! @V@/tests/plural-2                      @V@/tests/plural.2
diff -acprNC5 gettext-0.10.39.orig/djgpp/README.in gettext-0.10.39.djgpp/djgpp/README.in
*** gettext-0.10.39.orig/djgpp/README.in	Fri Mar 16 18:28:54 2001
--- gettext-0.10.39.djgpp/djgpp/README.in	Wed Aug  1 00:32:44 2001
*************** This is a port of GNU Gettext @VER@ to M
*** 37,53 ****
       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)
            fileutils-3.16 (fil316s.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 (sed-3.02.80.tar.gz from ftp://alpha.gnu.org/pub/gnu/sed)
            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)
--- 37,55 ----
       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)
+           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)
*************** This is a port of GNU Gettext @VER@ to M
*** 55,84 ****
  
          See section #4 for further information about this issue.
          To implement NLS support for one of those packages you will also need
          to download the following packages:
            gtxt@packageversion@b.zip (binaries of GNU Gettext @VER@)
!           licv16b.zip (binaries of GNU libiconv 1.6)
!           fil316b.zip  (binaries of GNU Fileutils 3.16 Date: 2000-05-30)
!           shl112b.zip  (binaries of GNU Sh-utils 1.12  Date: 2000-08-11)
  
  
  2.:     Installing the binary package.
          ==============================
  
! 2.1.:   To use this binary package you **MUST** install licv16b.zip or later
!         first. licv16b.zip provides the required functionality to recode the
!         .mo files on-the-fly from the unix charsets used to create them to the
          dos codepages used to display them. Copy the binary distribution into
          the top DJGPP installation directory. If you are installing Gettext on
!         a dual DOS/WINDOWS 9X systems, you should first turn off the generation
          of numeric tails for 8.3 aliases Windows creats for long file names.
          For information about how to do this, please read the DJGPP FAQ List
          V 2.30, chapter 22.19: "How to Set Up a Dual DOS/Windows Installation".
          It should be noticed that neither the libintl.a library nor the
          binaries (xgettext.exe, gettext.exe, etc.) contain any code to handle
!         nuneric tails in short file names. This implies that if you install
          the binary packages in a DOS box of Win9X (LFN) **WITHOUT** turning
          off the numeric tail generation you will **NOT** be able to use NLS
          on plain DOS. Once again: if you want NLS support on both Win9X **AND**
          on plain DOS you **MUST** turn off the numeric tail generation **BEFORE**
          installing the binary package. After having installed the package
--- 57,86 ----
  
          See section #4 for further information about this issue.
          To implement NLS support for one of those packages you will also need
          to download the following packages:
            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)
  
  
  2.:     Installing the binary package.
          ==============================
  
! 2.1.:   To use this binary package you **MUST** install licv17b.zip or later
!         first. licv17b.zip provides the required functionality to recode the
!         .mo files at run time from the unix charsets used to create them to the
          dos codepages used to display them. Copy the binary distribution into
          the top DJGPP installation directory. If you are installing Gettext on
!         a dual DOS/WINDOWS 9X systems, you *MUST* first turn off the generation
          of numeric tails for 8.3 aliases Windows creats for long file names.
          For information about how to do this, please read the DJGPP FAQ List
          V 2.30, chapter 22.19: "How to Set Up a Dual DOS/Windows Installation".
          It should be noticed that neither the libintl.a library nor the
          binaries (xgettext.exe, gettext.exe, etc.) contain any code to handle
!         nuneric tails of short file names. This implies that if you install
          the binary packages in a DOS box of Win9X (LFN) **WITHOUT** turning
          off the numeric tail generation you will **NOT** be able to use NLS
          on plain DOS. Once again: if you want NLS support on both Win9X **AND**
          on plain DOS you **MUST** turn off the numeric tail generation **BEFORE**
          installing the binary package. After having installed the package
*************** This is a port of GNU Gettext @VER@ to M
*** 87,124 ****
          NLS support. You **MUST** turn off numeric tail generation every time
          you install a package that has been compiled with NLS or the binaries
          will **NOT** be able to find their .mo files (translations) when you
          switch to plain DOS.
  
! 2.2.:   If you download the source distribution from one of the DJGPP archives,
          just unzip it preserving the directory structure running *ONE* of the
          following commands:
            unzip32 gtxt@packageversion@b.zip      or
            djtarx gtxt@packageversion@b.zip       or
            pkunzip -d gtxt@packageversion@b.zip
  
-         Source distributions downloaded from one of the GNU FTP sites need
-         some more work to unpack.  First, you *MUST* use the `djtar' program
-         to unzip the package.  That's because some file names in the official
-         distributions need to be changed to avoid problems on the various
-         platforms supported by DJGPP.  `djtar' can rename files on the fly
-         given a file with name mappings.  The distribution includes a file
-         `djgpp/fnchange.lst' with the necessary mappings.  So you need first
-         to retrieve that file, and then invoke `djtar' to unpack the
-         distribution.  Here's how:
- 
-           djtar -x -p -o @V@/djgpp/fnchange.lst @V@.tar.gz > lst
-           djtar -x -n lst @V@.tar.gz
- 
-         (The name of the distribution archive and the top-level directory will
-         be different for versions other than @VER@.)
- 
-         It is always recommended to download the DJGPP packages from some
-         Simtel.NET mirror and *not* the original GNU distribution because
-         only the binary distribution of the DJGPP port will contain the
-         files needed to patch libc.a. This are: conio.h and conio.o.
- 
  2.3.:   Changing libc.a and conio.h.
          Apart from the ussual directories, the binary package will create the
          following directory:
            %DJDIR%/gnu/gtxt-@treeversion@/djgpp/djdev-2.03
          where %DJDIR% stands for the root of your DJGPP installation tree.
--- 89,105 ----
          NLS support. You **MUST** turn off numeric tail generation every time
          you install a package that has been compiled with NLS or the binaries
          will **NOT** be able to find their .mo files (translations) when you
          switch to plain DOS.
  
! 2.2.:   Copy the binary distribution into the top DJGPP installation directory,
          just unzip it preserving the directory structure running *ONE* of the
          following commands:
            unzip32 gtxt@packageversion@b.zip      or
            djtarx gtxt@packageversion@b.zip       or
            pkunzip -d gtxt@packageversion@b.zip
  
  2.3.:   Changing libc.a and conio.h.
          Apart from the ussual directories, the binary package will create the
          following directory:
            %DJDIR%/gnu/gtxt-@treeversion@/djgpp/djdev-2.03
          where %DJDIR% stands for the root of your DJGPP installation tree.
*************** This is a port of GNU Gettext @VER@ to M
*** 131,163 ****
          This file is not needed by the average user. conio.h is the modified header
          and conio.o is the recompiled new conio.c file that will replace the old
          conio.o contained in libc.a.
  
          For all commands that will follow now I will assume that you have
!         cd'ed into the %DJDIR%/gnu/gtxt-@treeversion@/djgpp/djdev-2.03 directory.
!         First, you should backup your old header and library. For this task,
!         run the commands:
!           copy %DJDIR%\include\conio.h %DJDIR%\include\conio.bak
!           copy %DJDIR%\lib\libc.a %DJDIR%\lib\libc.bak
!         Substitute %DJDIR% by the path to your DJGPP installation.
  
          Now you can copy the new header into your include directory
          running the command:
!           copy conio.h %DJDIR%\include
!         Substitute %DJDIR% by the path to your DJGPP installation.
  
          Now you can substitute the old conio.o file in libc.a with the new one.
          For this task you will need the ar program from binutils.
          Run the command:
!           ar -rv %DJDIR%\lib\libc.a conio.o
!         Substitute %DJDIR% by the path to your DJGPP installation.
          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
--- 112,142 ----
          This file is not needed by the average user. conio.h is the modified header
          and conio.o is the recompiled new conio.c file that will replace the old
          conio.o contained in libc.a.
  
          For all commands that will follow now I will assume that you have
!         cd'ed into the %DJDIR%/gnu/gtxt-@treeversion@/djgpp/djdev-2.03 directory,
!         where %DJDIR% represents the path to your DJGPP installation. First,
!         you should backup your old header and library. For this task, run the
!         following command sequence (cp is the copy program from fil40b.zip):
!           cp /dev/env/DJDIR/include/conio.h /dev/env/DJDIR/include/conio.bak
!           cp /dev/env/DJDIR/lib/libc.a /dev/env/DJDIR/lib/libc.bak
  
          Now you can copy the new header into your include directory
          running the command:
!           cp conio.h /dev/env/DJDIR/include
  
          Now you can substitute the old conio.o file in libc.a with the new one.
          For this task you will need the ar program from binutils.
          Run the command:
!           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
*************** This is a port of GNU Gettext @VER@ to M
*** 194,204 ****
  
  +LANG=es
  +LANGUAGE=de:es
  
          Please note that if you omit the LANG environment variable, the
!         LANGUAGE variable will not be honuored 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
          select 'C' as your catalog:
  +LANG=C
--- 173,183 ----
  
  +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
          select 'C' as your catalog:
  +LANG=C
*************** This is a port of GNU Gettext @VER@ to M
*** 221,266 ****
  
  3.:     Building the binaries from sources.
          ===================================
  
  3.1.:   To build the binaries you will need the following binary packages:
!           djdev203.zip (NOT a prior version)
!           bsh203b.zip  (NOT a prior version)
!           gcc2952b.zip, bnu2951b.zip, mak3791b.zip,
!           fil316b.zip, shl112b.zip, txt20b.zip,
            txi40b.zip, grep24b.zip, sed302b.zip,
!           licv16b.zip
  
          If you want to run the check you will need also:
            dif272b.zip
  
          All this packages can be found in the v2gnu directory of any
          Simtel.NET mirror.
!         You must have licv16b.zip installed before 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 and *NOT* a prior version or the build will fail.
!         The same applies to djdev203.zip. You *MUST* use the updated version of
!         fil316b.zip (date: 2000-05-30) and shl112b.zip (date: 2000-08-11).
          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
          sources. Previuos versions of this packages may do the job as well but
          I have not tested this.
  
! 3.2.:   Create a temporary directory. Copy the source package: gtxt@packageversion@s.zip
!         into the directory and unzip it runnig ONE of the following commands:
            unzip32 gtxt@packageversion@s.zip      or
            djtarx gtxt@packageversion@s.zip       or
            pkunzip -d gtxt@packageversion@s.zip
  
! 3.3.:   This package is preconfigured for NLS support and for on-the-fly
!         recoding with the functionality provided by libiconv.a from licv16b.zip.
!         This implies that licv16b.zip *MUST* be installed *before* you try to
          compile the package or the build process will fail.
          It should be noticed that when you compile your own binaries with NLS
!         you must *always* link with libiconv.a
          If you compile this package with a later version of libc.a or if you
          prefer no NLS support at all you will have to reconfigure this package.
          The configuration batch file of this package, located in the djgpp
          directory, allows you to enable or disable NLS support and to compile
          from a different partition than from where the sources are located.
--- 200,272 ----
  
  3.:     Building the binaries from sources.
          ===================================
  
  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,
!           licv17b.zip
  
          If you want to run the check you will need also:
            dif272b.zip
  
+         If you want to recreate the html docs you will also need:
+           gro116b.zip  (or a later but NOT a prior version)
+           perl561b.zip (or a later but NOT a prior version)
+ 
          All this packages can be found in the v2gnu directory of any
          Simtel.NET mirror.
!         You must have licv17b.zip or a later version installed before
!         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).
          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
          sources. Previuos versions of this packages may do the job as well but
          I have not tested this.
  
! 3.2.:   Create a temporary directory and copy the source package into the
!         directory. If you download the source distribution from one of the
!         DJGPP archives, just unzip it preserving the directory structure
!         running *ONE* of the following commands:
            unzip32 gtxt@packageversion@s.zip      or
            djtarx gtxt@packageversion@s.zip       or
            pkunzip -d gtxt@packageversion@s.zip
  
!         Source distributions downloaded from one of the GNU FTP sites need
!         some more work to unpack. First, you *MUST* use the `djtar' program
!         to unzip the package.  That is because some file names in the official
!         distributions need to be changed to avoid problems on the various
!         platforms supported by DJGPP. `djtar' can rename files on the fly given
!         a file with name mappings. The distribution includes a file
!         `djgpp/fnchange.lst' with the necessary mappings. So you need first
!         to retrieve that file, and then invoke `djtar' to unpack the
!         distribution. Here is how:
! 
!           djtar -x -p -o @V@/djgpp/fnchange.lst @V@.tar.gz > lst
!           djtar -x -n lst @V@.tar.gz
! 
!         (The name of the distribution archive and the top-level directory will
!         be different for versions other than @VER@.)
! 
!         It is always recommended to download the DJGPP packages from some
!         Simtel.NET mirror and *NOT* the original GNU distribution because
!         only the binary distribution of the DJGPP port will contain the
!         files needed to patch libc.a. This are: conio.h and conio.o.
! 
! 3.3.:   This package is preconfigured for NLS support and for run time recoding
!         due to the functionality provided by libiconv.a from licv17b.zip.
!         This implies that licv17b.zip *MUST* be installed *before* you try to
          compile the package or the build process will fail.
          It should be noticed that when you compile your own binaries with NLS
!         you must also *always* link with libiconv.a
          If you compile this package with a later version of libc.a or if you
          prefer no NLS support at all you will have to reconfigure this package.
          The configuration batch file of this package, located in the djgpp
          directory, allows you to enable or disable NLS support and to compile
          from a different partition than from where the sources are located.
*************** This is a port of GNU Gettext @VER@ to M
*** 334,350 ****
          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)
            fileutils-3.16 (fil316s.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 (sed-3.02.80.tar.gz from ftp://alpha.gnu.org/pub/gnu/sed)
            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)
--- 340,358 ----
          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)
+           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)
*************** This is a port of GNU Gettext @VER@ to M
*** 359,374 ****
          in reconfigure the package for NLS support.
          Please inspect the tree NLS_for_djgpp_packages to see what files will
          be replaced.
  
  4.1.:   To reconfigure and recompile a source package with NLS support you
!         *MUST* install the gtxt@packageversion@b.zip and licv16b.zip packages
          first. NLS support will **NOT** work with any prior version of the above
!         mentioned packages. Before installing gtxt@packageversion@b.zip and licv16b.zip
          you *MUST* deinstall the old packages if you ever have installed them.
          For this purpose use the provided manifest files from the old packages.
!         Old packages means previous beta releases of gtxt@packageversion@b.zip and licv16b.zip
          *AND* also previous versions of gettext like gettext 0.10.32, etc.
  
  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
--- 367,382 ----
          in reconfigure the package for NLS support.
          Please inspect the tree NLS_for_djgpp_packages to see what files will
          be replaced.
  
  4.1.:   To reconfigure and recompile a source package with NLS support you
!         *MUST* install the gtxt@packageversion@b.zip and licv17b.zip packages
          first. NLS support will **NOT** work with any prior version of the above
!         mentioned packages. Before installing gtxt@packageversion@b.zip and licv17b.zip
          you *MUST* deinstall the old packages if you ever have installed them.
          For this purpose use the provided manifest files from the old packages.
!         Old packages means previous beta releases of gtxt@packageversion@b.zip and licv17b.zip
          *AND* also previous versions of gettext like gettext 0.10.32, etc.
  
  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
