sharutils-4.2.1 compilation problem

[Bruno Haible]

Hi,

Compiling sharutils-4.2.1 fails if you have the 'msgfmt' utility from
gettext-0.10.35 (or newer) installed.

$ make
....
making all in po
make[1]: Wechsel in das Verzeichnis Verzeichnis »/home/bin/sharutils-4.2.1/po«
/packages/libc6/bin/xgettext --default-domain=sharutils --directory=.. \
  --add-comments --keyword=_ --keyword=N_ \
  --files-from=./POTFILES.in
if cmp -s sharutils.po ./sharutils.pot; then \
  rm -f sharutils.po; \
else \
  rm -f ./sharutils.pot \
    && mv sharutils.po ./sharutils.pot; \
fi
rm -f cat-id-tbl.tmp.c
sed -f ../intl/po2tbl.sed ./sharutils.pot \
| sed -e "s/@PACKAGE NAME@/sharutils/" > cat-id-tbl.tmp.c
if cmp -s cat-id-tbl.tmp.c ./cat-id-tbl.c; then \
  rm cat-id-tbl.tmp.c; \
else \
  echo cat-id-tbl.c changed; \
  rm -f ./cat-id-tbl.c; \
  mv cat-id-tbl.tmp.c ./cat-id-tbl.c; \
fi
cat-id-tbl.c changed
cd . && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
/packages/libc6/bin/msgfmt -o de.mo de.po
/packages/libc6/bin/msgfmt -o fr.mo fr.po
/packages/libc6/bin/msgfmt -o nl.mo nl.po
nl.po:450: »msgid« und »msgstr« Eintrag endet nicht jeweils mit »\n«
es sind 1 fatale Fehler aufgetreten
make[1]: *** [nl.mo] Fehler 1

$ /packages/libc6/bin/msgfmt --version
msgfmt (GNU gettext) 0.10.35
Copyright © 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
Dies ist freie Software; in den Quellen befindet sich die Lizenzbedingung.
Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder
die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.
Geschrieben von Ulrich Drepper.

Furthermore, in a de_DE.UTF-8 locale, the --help messages are not converted
to UTF-8. The reason is that the PO files' header entry lacks the
charset=... specification.

The following patch fixes both problems for me:

*** sharutils-4.2.1/po/de.po.bak        Mon Dec  4 17:55:55 1995
--- sharutils-4.2.1/po/de.po    Sun May  6 15:53:20 2001
***************
*** 1,12 ****
  msgid ""
  msgstr ""
! "Date: 1995-08-02 02:00:57+0200\n"
! "From: Ulrich Drepper <address@hidden>\n"
! "Xgettext-Options: --default-domain=sharutils --output-dir=. --add-comments 
--keyword=_\n"
! "Files: ../../po/../lib/error.c ../../po/../lib/getopt.c\n"
! "      ../../po/../lib/xmalloc.c ../../po/../src/shar.c\n"
! "      ../../po/../src/unshar.c ../../po/../src/uudecode.c\n"
! "      ../../po/../src/uuencode.c\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
--- 1,13 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU sharutils 4.2.1\n"
! "POT-Creation-Date: Mon Dec 04 16:59:44 1995\n"
! "PO-Revision-Date: 1995-08-02 02:00:57+0200\n"
! "Last-Translator: Ulrich Drepper <address@hidden>\n"
! "Language-Team: German <address@hidden>\n"
! "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=ISO-8859-1\n"
! "Content-Transfer-Encoding: 8-bit\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
*** sharutils-4.2.1/po/fr.po.bak        Mon Dec  4 17:55:55 1995
--- sharutils-4.2.1/po/fr.po    Sun May  6 15:54:42 2001
***************
*** 1,12 ****
  msgid ""
  msgstr ""
! "Date: 1995-08-02 02:00:57+0200\n"
! "From: Francois Pinard <address@hidden>\n"
! "Xgettext-Options: --default-domain=sharutils --output-dir=. --add-comments 
--keyword=_\n"
! "Files: ../../po/../lib/error.c ../../po/../lib/getopt.c\n"
! "\t ../../po/../lib/xmalloc.c ../../po/../src/shar.c\n"
! "\t ../../po/../src/unshar.c ../../po/../src/uudecode.c\n"
! "\t ../../po/../src/uuencode.c\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
--- 1,13 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU sharutils 4.2.1\n"
! "POT-Creation-Date: Mon Dec 04 16:59:44 1995\n"
! "PO-Revision-Date: 1995-08-02 02:00:57+0200\n"
! "Last-Translator: Francois Pinard <address@hidden>\n"
! "Language-Team: French <address@hidden>\n"
! "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=ISO-8859-1\n"
! "Content-Transfer-Encoding: 8-bit\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
*** sharutils-4.2.1/po/ja_JP.EUC.po.bak Mon Dec  4 17:55:55 1995
--- sharutils-4.2.1/po/ja_JP.EUC.po     Sun May  6 15:59:13 2001
***************
*** 1,12 ****
  msgid ""
  msgstr ""
! "Date: 1995-11-14 13:00:00+0900\n"
! "From: SAKAI Kiyotaka <address@hidden>\n"
! "Xgettext-Options: --default-domain=sharutils --output-dir=. --add-comments 
--keyword=_\n"
! "Files: ../../po/../lib/error.c ../../po/../lib/getopt.c\n"
! "      ../../po/../lib/xmalloc.c ../../po/../src/shar.c\n"
! "      ../../po/../src/unshar.c ../../po/../src/uudecode.c\n"
! "      ../../po/../src/uuencode.c\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
--- 1,13 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU sharutils 4.2.1\n"
! "POT-Creation-Date: Mon Dec 04 16:59:44 1995\n"
! "PO-Revision-Date: 1995-11-14 13:00:00+0900\n"
! "Last-Translator: SAKAI Kiyotaka <address@hidden>\n"
! "Language-Team: Japanese <address@hidden>\n"
! "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=EUC-JP\n"
! "Content-Transfer-Encoding: 8-bit\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
*** sharutils-4.2.1/po/nl.po.bak        Mon Dec  4 17:55:56 1995
--- sharutils-4.2.1/po/nl.po    Sun May  6 15:55:47 2001
***************
*** 1,12 ****
  msgid ""
  msgstr ""
! "Date: 1995-08-02 02:00:57+0200\n"
! "From: Ulrich Drepper <address@hidden>\n"
! "Xgettext-Options: --default-domain=sharutils --output-dir=. --add-comments 
--keyword=_\n"
! "Files: ../../po/../lib/error.c ../../po/../lib/getopt.c\n"
! "      ../../po/../lib/xmalloc.c ../../po/../src/shar.c\n"
! "      ../../po/../src/unshar.c ../../po/../src/uudecode.c\n"
! "      ../../po/../src/uuencode.c\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
--- 1,13 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU sharutils 4.2.1\n"
! "POT-Creation-Date: Mon Dec 04 16:59:44 1995\n"
! "PO-Revision-Date: 1995-08-02 02:00:57+0200\n"
! "Last-Translator: Ulrich Drepper <address@hidden>\n"
! "Language-Team: Dutch <address@hidden>\n"
! "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=ISO-8859-1\n"
! "Content-Transfer-Encoding: 8-bit\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
***************
*** 448,454 ****
  
  #: src/shar.c:2121
  msgid "Created %d files\n"
! msgstr "%d bestand(en) aangemaakt"
  
  #: src/unshar.c:158
  msgid "Found no shell commands in %s"
--- 449,455 ----
  
  #: src/shar.c:2121
  msgid "Created %d files\n"
! msgstr "%d bestand(en) aangemaakt\n"
  
  #: src/unshar.c:158
  msgid "Found no shell commands in %s"
*** sharutils-4.2.1/po/pt.po.bak        Mon Dec  4 17:55:56 1995
--- sharutils-4.2.1/po/pt.po    Sun May  6 15:58:01 2001
***************
*** 1,12 ****
  msgid ""
  msgstr ""
! "Date: 1995-08-02 02:00:57+0200\n"
! "From: Ulrich Drepper <address@hidden>\n"
! "Xgettext-Options: --default-domain=sharutils --output-dir=. --add-comments 
--keyword=_\n"
! "Files: ../../po/../lib/error.c ../../po/../lib/getopt.c\n"
! "      ../../po/../lib/xmalloc.c ../../po/../src/shar.c\n"
! "      ../../po/../src/unshar.c ../../po/../src/uudecode.c\n"
! "      ../../po/../src/uuencode.c\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
--- 1,13 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU sharutils 4.2.1\n"
! "POT-Creation-Date: Mon Dec 04 16:59:44 1995\n"
! "PO-Revision-Date: 1995-08-02 02:00:57+0200\n"
! "Last-Translator: Ulrich Drepper <address@hidden>\n"
! "Language-Team: Portuguese <address@hidden>\n"
! "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=ISO-8859-1\n"
! "Content-Transfer-Encoding: 8-bit\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
***************
*** 413,423 ****
  
  #: src/shar.c:1819
  msgid "Hard limit %dk\n"
! msgstr "Limite tipo `hard' de %dk"
  
  #: src/shar.c:1886
  msgid "Soft limit %dk\n"
! msgstr "Limite tipo `soft' de %dk"
  
  #: src/shar.c:1987
  msgid "WARNING: No user interaction in vanilla mode"
--- 414,424 ----
  
  #: src/shar.c:1819
  msgid "Hard limit %dk\n"
! msgstr "Limite tipo `hard' de %dk\n"
  
  #: src/shar.c:1886
  msgid "Soft limit %dk\n"
! msgstr "Limite tipo `soft' de %dk\n"
  
  #: src/shar.c:1987
  msgid "WARNING: No user interaction in vanilla mode"
*** sharutils-4.2.1/po/sv.po.bak        Mon Dec  4 17:55:56 1995
--- sharutils-4.2.1/po/sv.po    Sun May  6 15:57:25 2001
***************
*** 1,12 ****
  msgid ""
  msgstr ""
! "Date: 1995-09-24 20:59:57+0200\n"
! "From: Jan Djarv <address@hidden>\n"
! "Xgettext-Options: --default-domain=sharutils --output-dir=. --add-comments 
--keyword=_\n"
! "Files: ../../po/../lib/error.c ../../po/../lib/getopt.c\n"
! "      ../../po/../lib/xmalloc.c ../../po/../src/shar.c\n"
! "      ../../po/../src/unshar.c ../../po/../src/uudecode.c\n"
! "      ../../po/../src/uuencode.c\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"
--- 1,13 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: GNU sharutils 4.2.1\n"
! "POT-Creation-Date: Mon Dec 04 16:59:44 1995\n"
! "PO-Revision-Date: 1995-09-24 20:59:57+0200\n"
! "Last-Translator: Jan Djarv <address@hidden>\n"
! "Language-Team: Swedish <address@hidden>\n"
! "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=ISO-8859-1\n"
! "Content-Transfer-Encoding: 8-bit\n"
  
  #: lib/error.c:73
  msgid "Unknown system error"