...and kill a few more files, corresponding to an update of gettext.

With this, merge of texinfo 4.2 should be complete.

10 files changed, 0 insertions, 1501 deletions

diff --git a/gnu/usr.bin/texinfo/doc/stamp-vti.1 b/gnu/usr.bin/texinfo/doc/stamp-vti.1
deleted file mode 100644
index 6a12e306559..00000000000
--- a/gnu/usr.bin/texinfo/doc/stamp-vti.1
+++ /dev/null
@@ -1,3 +0,0 @@
-@set UPDATED 22 March 1999
-@set EDITION 3.12g
-@set VERSION 3.12g
diff --git a/gnu/usr.bin/texinfo/intl/cat-compat.c b/gnu/usr.bin/texinfo/intl/cat-compat.c
deleted file mode 100644
index 4a9a1d898f4..00000000000
--- a/gnu/usr.bin/texinfo/intl/cat-compat.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* Compatibility code for gettext-using-catgets interface.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# endif
-#endif
-
-#ifdef HAVE_NL_TYPES_H
-# include <nl_types.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-/* The catalog descriptor.  */
-static nl_catd catalog = (nl_catd) -1;
-
-/* Name of the default catalog.  */
-static const char default_catalog_name[] = "messages";
-
-/* Name of currently used catalog.  */
-static const char *catalog_name = default_catalog_name;
-
-/* Get ID for given string.  If not found return -1.  */
-static int msg_to_cat_id PARAMS ((const char *msg));
-
-/* Substitution for systems lacking this function in their C library.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-#endif
-
-
-/* Set currently used domain/catalog.  */
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  nl_catd new_catalog;
-  char *new_name;
-  size_t new_name_len;
-  char *lang;
-
-#if HAVE_SETLOCALE && HAVE_LC_MESSAGES && HAVE_SETLOCALE_NULL
-  lang = setlocale (LC_MESSAGES, NULL);
-#else
-  lang = getenv ("LC_ALL");
-  if (lang == NULL || lang[0] == '\0')
-    {
-      lang = getenv ("LC_MESSAGES");
-      if (lang == NULL || lang[0] == '\0')
-	lang = getenv ("LANG");
-    }
-#endif
-  if (lang == NULL || lang[0] == '\0')
-    lang = "C";
-
-  /* See whether name of currently used domain is asked.  */
-  if (domainname == NULL)
-    return (char *) catalog_name;
-
-  if (domainname[0] == '\0')
-    domainname = default_catalog_name;
-
-  /* Compute length of added path element.  */
-  new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
-		 + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
-		 + sizeof (".cat");
-
-  new_name = (char *) malloc (new_name_len);
-  if (new_name == NULL)
-    return NULL;
-
-  strcpy (new_name, PACKAGE);
-  new_catalog = catopen (new_name, 0);
-
-  if (new_catalog == (nl_catd) -1)
-    {
-      /* NLSPATH search didn't work, try absolute path */
-      sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
-	       PACKAGE);
-      new_catalog = catopen (new_name, 0);
-
-      if (new_catalog == (nl_catd) -1)
-	{
-	  free (new_name);
-	  return (char *) catalog_name;
-	}
-    }
-
-  /* Close old catalog.  */
-  if (catalog != (nl_catd) -1)
-    catclose (catalog);
-  if (catalog_name != default_catalog_name)
-    free ((char *) catalog_name);
-
-  catalog = new_catalog;
-  catalog_name = new_name;
-
-  return (char *) catalog_name;
-}
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-#if HAVE_SETENV || HAVE_PUTENV
-  char *old_val, *new_val, *cp;
-  size_t new_val_len;
-
-  /* This does not make much sense here but to be compatible do it.  */
-  if (domainname == NULL)
-    return NULL;
-
-  /* Compute length of added path element.  If we use setenv we don't need
-     the first byts for NLSPATH=, but why complicate the code for this
-     peanuts.  */
-  new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
-		+ sizeof ("/%L/LC_MESSAGES/%N.cat");
-
-  old_val = getenv ("NLSPATH");
-  if (old_val == NULL || old_val[0] == '\0')
-    {
-      old_val = NULL;
-      new_val_len += 1 + sizeof (LOCALEDIR) - 1
-	             + sizeof ("/%L/LC_MESSAGES/%N.cat");
-    }
-  else
-    new_val_len += strlen (old_val);
-
-  new_val = (char *) malloc (new_val_len);
-  if (new_val == NULL)
-    return NULL;
-
-# if HAVE_SETENV
-  cp = new_val;
-# else
-  cp = stpcpy (new_val, "NLSPATH=");
-# endif
-
-  cp = stpcpy (cp, dirname);
-  cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
-
-  if (old_val == NULL)
-    {
-# if __STDC__
-      stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
-# else
-
-      cp = stpcpy (cp, LOCALEDIR);
-      stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
-# endif
-    }
-  else
-    stpcpy (cp, old_val);
-
-# if HAVE_SETENV
-  setenv ("NLSPATH", new_val, 1);
-  free (new_val);
-# else
-  putenv (new_val);
-  /* Do *not* free the environment entry we just entered.  It is used
-     from now on.   */
-# endif
-
-#endif
-
-  return (char *) domainname;
-}
-
-#undef gettext
-char *
-gettext (msg)
-     const char *msg;
-{
-  int msgid;
-
-  if (msg == NULL || catalog == (nl_catd) -1)
-    return (char *) msg;
-
-  /* Get the message from the catalog.  We always use set number 1.
-     The message ID is computed by the function `msg_to_cat_id'
-     which works on the table generated by `po-to-tbl'.  */
-  msgid = msg_to_cat_id (msg);
-  if (msgid == -1)
-    return (char *) msg;
-
-  return catgets (catalog, 1, msgid, (char *) msg);
-}
-
-/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
-   for the one equal to msg.  If it is found return the ID.  In case when
-   the string is not found return -1.  */
-static int
-msg_to_cat_id (msg)
-     const char *msg;
-{
-  int cnt;
-
-  for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
-    if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
-      return _msg_tbl[cnt]._msg_number;
-
-  return -1;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/gnu/usr.bin/texinfo/intl/gettext.h b/gnu/usr.bin/texinfo/intl/gettext.h
deleted file mode 100644
index 5190f09447f..00000000000
--- a/gnu/usr.bin/texinfo/intl/gettext.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* gettext.h - internal header for GNU gettext internationalization functions
-   Copyright (C) 1995 Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#include <stdio.h>
-
-#if HAVE_LIMITS_H || _LIBC
-# include <limits.h>
-#endif
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format.  */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   doing that would require that the configure script compile and *run*
-   the resulting executable.  Locally running cross-compiled executables
-   is usually not possible.  */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-#  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
-#  endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.  */
-  nls_uint32 magic;
-  /* The revision number of the file format.  */
-  nls_uint32 revision;
-  /* The number of strings pairs.  */
-  nls_uint32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
-  nls_uint32 trans_tab_offset;
-  /* Size of hashing table.  */
-  nls_uint32 hash_tab_size;
-  /* Offset of first hashing entry.  */
-  nls_uint32 hash_tab_offset;
-};
-
-struct string_desc
-{
-  /* Length of addressed string.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* @@ begin of epilog @@ */
-
-#endif	/* gettext.h  */
diff --git a/gnu/usr.bin/texinfo/intl/libgettext.h b/gnu/usr.bin/texinfo/intl/libgettext.h
deleted file mode 100644
index c9212aac539..00000000000
--- a/gnu/usr.bin/texinfo/intl/libgettext.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* libgettext.h -- Message catalogs for internationalization.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Because on some systems (e.g. Solaris) we sometimes have to include
-   the systems libintl.h as well as this file we have more complex
-   include protection above.  But the systems header might perhaps also
-   define _LIBINTL_H and therefore we have to protect the definition here.  */
-
-#if !defined (_LIBINTL_H) || !defined (_LIBGETTEXT_H)
-#if !defined (_LIBINTL_H)
-# define _LIBINTL_H	1
-#endif
-#define _LIBGETTEXT_H	1
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-#include <sys/types.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef NULL
-# if !defined __cplusplus || defined __GNUC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL (0)
-# endif
-#endif
-
-#if !HAVE_LC_MESSAGES
-/* This value determines the behaviour of the gettext() and dgettext()
-   function.  But some system does not have this defined.  Define it
-   to a default value.  */
-# define LC_MESSAGES (-1)
-#endif
-
-
-/* Declarations for gettext-using-catgets interface.  Derived from
-   Jim Meyering's libintl.h.  */
-struct _msg_ent
-{
-  const char *_msg;
-  int _msg_number;
-};
-
-
-#if HAVE_CATGETS
-/* These two variables are defined in the automatically by po-to-tbl.sed
-   generated file `cat-id-tbl.c'.  */
-extern const struct _msg_ent _msg_tbl[];
-extern int _msg_tbl_length;
-#endif
-
-
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-extern char *gettext__ PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				  const char *__dirname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				    const char *__dirname));
-
-#if ENABLE_NLS
-
-/* Solaris 2.3 has the gettext function but dcgettext is missing.
-   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
-   has dcgettext.  */
-# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
-
-#  define gettext(Msgid)						      \
-     dgettext (NULL, Msgid)
-
-#  define dgettext(Domainname, Msgid)					      \
-     dcgettext (Domainname, Msgid, LC_MESSAGES)
-
-#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-/* This global variable is defined in loadmsgcat.c.  We need a sign,
-   whether a new catalog was loaded, which can be associated with all
-   translations.  */
-extern int _nl_msg_cat_cntr;
-
-#   define dcgettext(Domainname, Msgid, Category)			      \
-  (__extension__							      \
-   ({									      \
-     char *__result;							      \
-     if (__builtin_constant_p (Msgid))					      \
-       {								      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       dcgettext__ ((Domainname), (Msgid), (Category));		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 __result = __translation__;					      \
-       }								      \
-     else								      \
-       __result = dcgettext__ ((Domainname), (Msgid), (Category));	      \
-     __result;								      \
-    }))
-#  endif
-# endif
-
-#else
-
-# define gettext(Msgid) (Msgid)
-# define dgettext(Domainname, Msgid) (Msgid)
-# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) while (0) /* nothing */
-# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
-
-#endif
-
-/* @@ begin of epilog @@ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/gnu/usr.bin/texinfo/intl/linux-msg.sed b/gnu/usr.bin/texinfo/intl/linux-msg.sed
deleted file mode 100644
index 5918e720a9a..00000000000
--- a/gnu/usr.bin/texinfo/intl/linux-msg.sed
+++ /dev/null
@@ -1,100 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# Mitch's old catalog format does not allow comments.
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-  s/msgid[ 	]*"//
-#
-# This does not work now with the new format.
-# /"$/! {
-#   s/\\$//
-#   s/$/ ... (more lines following)"/
-# }
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/# \1/
-# Clear substitution flag.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that D includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
diff --git a/gnu/usr.bin/texinfo/intl/po2tbl.sed.in b/gnu/usr.bin/texinfo/intl/po2tbl.sed.in
deleted file mode 100644
index b3bcca4d730..00000000000
--- a/gnu/usr.bin/texinfo/intl/po2tbl.sed.in
+++ /dev/null
@@ -1,102 +0,0 @@
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-1 {
-  i\
-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
-\
-#if HAVE_CONFIG_H\
-# include <config.h>\
-#endif\
-\
-#include "libgettext.h"\
-\
-const struct _msg_ent _msg_tbl[] = {
-  h
-  s/.*/0/
-  x
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
-  s/msgid[ 	]*\(".*"\)/  {\1/
-  tb
-# Append the next line
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
-  ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line.  So it's safe to ignore
-# it.
-  s/\(.*\)\n.*/\1/
-  bc
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
-  tb
-# Not reached
-  :c
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-  s/\(.*\)"$/\1/
-  p
-}
-#
-# Last line.
-#
-$ {
-  i\
-};\
-
-  g
-  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d
diff --git a/gnu/usr.bin/texinfo/intl/xopen-msg.sed b/gnu/usr.bin/texinfo/intl/xopen-msg.sed
deleted file mode 100644
index b19c0bbd0ec..00000000000
--- a/gnu/usr.bin/texinfo/intl/xopen-msg.sed
+++ /dev/null
@@ -1,104 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# We copy all comments into the .msg file.  Perhaps they can help.
-#
-/^#/ s/^#[ 	]*/$ /p
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-# Does not work now
-#  /"$/! {
-#    s/\\$//
-#    s/$/ ... (more lines following)"/
-#  }
-  s/^msgid[ 	]*"\(.*\)"$/$ Original Message: \1/
-  p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/\1/
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-# Bring the line in the format `<number> <message>'
-  G
-  s/^[^\n]*$/& /
-  s/\(.*\)\n\([0-9]*\)/\2 \1/
-# Clear flag from last substitution.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is a continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that `D' includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use the sed command `D' here
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
diff --git a/gnu/usr.bin/texinfo/po/cat-id-tbl.c b/gnu/usr.bin/texinfo/po/cat-id-tbl.c
deleted file mode 100644
index b4c31351087..00000000000
--- a/gnu/usr.bin/texinfo/po/cat-id-tbl.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/* Automatically generated by po2tbl.sed from texinfo.pot.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "libgettext.h"
-
-const struct _msg_ent _msg_tbl[] = {
-  {"", 1},
-  {"Move forward a character", 2},
-  {"Move backward a character", 3},
-  {"Move to the start of this line", 4},
-  {"Move to the end of this line", 5},
-  {"Move forward a word", 6},
-  {"Move backward a word", 7},
-  {"Delete the character under the cursor", 8},
-  {"Delete the character behind the cursor", 9},
-  {"Cancel or quit operation", 10},
-  {"Accept (or force completion of) this line", 11},
-  {"Insert next character verbatim", 12},
-  {"Insert this character", 13},
-  {"Insert a TAB character", 14},
-  {"Transpose characters at point", 15},
-  {"Yank back the contents of the last kill", 16},
-  {"Kill ring is empty", 17},
-  {"Yank back a previous kill", 18},
-  {"Kill to the end of the line", 19},
-  {"Kill to the beginning of the line", 20},
-  {"Kill the word following the cursor", 21},
-  {"Kill the word preceding the cursor", 22},
-  {"Not complete", 23},
-  {"List possible completions", 24},
-  {"No completions", 25},
-  {"Sole completion", 26},
-  {"One completion:\n", 27},
-  {"%d completions:\n", 28},
-  {"Insert completion", 29},
-  {"Building completions...", 30},
-  {"Scroll the completions window", 31},
-  {"Footnotes could not be displayed", 32},
-  {"Show the footnotes associated with this node in another window", 33},
-  {"Look up a string in the index for this file", 34},
-  {"Finding index entries...", 35},
-  {"No indices found.", 36},
-  {"Index entry: ", 37},
-  {"\
-Go to the next matching index item from the last `\\[index-search]' command", 38},
-  {"No previous index search string.", 39},
-  {"No index entries.", 40},
-  {"No %sindex entries containing \"%s\".", 41},
-  {"more ", 42},
-  {"CAN'T SEE THIS", 43},
-  {"Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)", 44},
-  {"Scanning indices of \"%s\"...", 45},
-  {"Grovel all known info file's indices for a string and build a menu", 46},
-  {"Index apropos: ", 47},
-  {"\
-\n\
-* Menu: Nodes whoses indices contain \"%s\":\n", 48},
-  {"Try --help for more information.\n", 49},
-  {"\
-Copyright (C) %s Free Software Foundation, Inc.\n\
-There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n", 50},
-  {"no index entries found for `%s'\n", 51},
-  {"\
-Usage: %s [OPTION]... [MENU-ITEM...]\n\
-\n\
-Read documentation in Info format.\n\
-\n\
-Options:\n\
- --apropos=SUBJECT        look up SUBJECT in all indices of all manuals.\n\
- --directory=DIR          add DIR to INFOPATH.\n\
- --dribble=FILENAME       remember user keystrokes in FILENAME.\n\
- --file=FILENAME          specify Info file to visit.\n\
- --help                   display this help and exit.\n\
- --index-search=STRING    go to node pointed by index entry STRING.\n\
- --node=NODENAME          specify nodes in first visited Info file.\n\
- --output=FILENAME        output selected nodes to FILENAME.\n\
- --restore=FILENAME       read initial keystrokes from FILENAME.\n\
- --show-options, --usage  go to command-line options node.\n\
- --subnodes               recursively output menu items.\n\
-%s --vi-keys                use vi-like and less-like key bindings.\n\
- --version                display version information and exit.\n\
-\n\
-The first non-option argument, if present, is the menu entry to start from;\n\
-it is searched for in all `dir' files along INFOPATH.\n\
-If it is not present, info merges all `dir' files and shows the result.\n\
-Any remaining arguments are treated as the names of menu\n\
-items relative to the initial node visited.\n\
-\n\
-Examples:\n\
-  info                       show top-level dir menu\n\
-  info emacs                 start at emacs node from top-level dir\n\
-  info emacs buffers         start at buffers node within emacs manual\n\
-  info --show-options emacs  start at node with emacs' command line options\n\
-  info -f ./foo.info         show file ./foo.info, not searching dir\n\
-\n\
-Email bug reports to bug-texinfo@gnu.org,\n\
-general questions and discussion to help-texinfo@gnu.org.\n", 52},
-  {"Cannot find node `%s'.", 53},
-  {"Cannot find node `(%s)%s'.", 54},
-  {"Cannot find a window!", 55},
-  {"Point doesn't appear within this window's node!", 56},
-  {"Cannot delete the last window.", 57},
-  {"No menu in this node.", 58},
-  {"No footnotes in this node.", 59},
-  {"No cross references in this node.", 60},
-  {"No `%s' pointer for this node.", 61},
-  {"Unknown Info command `%c'; try `?' for help.", 62},
-  {"Terminal type `%s' is not smart enough to run Info.", 63},
-  {"You are already at the last page of this node.", 64},
-  {"You are already at the first page of this node.", 65},
-  {"Only one window.", 66},
-  {"Resulting window would be too small.", 67},
-  {"Not enough room for a help window, please delete a window.", 68},
-  {"Basic Commands in Info Windows\n", 69},
-  {"******************************\n", 70},
-  {"  %-10s  Quit this help.\n", 71},
-  {"  %-10s  Quit Info altogether.\n", 72},
-  {"  %-10s  Invoke the Info tutorial.\n", 73},
-  {"Moving within a node:\n", 74},
-  {"---------------------\n", 75},
-  {"  %-10s  Scroll forward a page.\n", 76},
-  {"  %-10s  Scroll backward a page.\n", 77},
-  {"  %-10s  Go to the beginning of this node.\n", 78},
-  {"  %-10s  Go to the end of this node.\n", 79},
-  {"  %-10s  Scroll forward 1 line.\n", 80},
-  {"  %-10s  Scroll backward 1 line.\n", 81},
-  {"Selecting other nodes:\n", 82},
-  {"----------------------\n", 83},
-  {"  %-10s  Move to the `next' node of this node.\n", 84},
-  {"  %-10s  Move to the `previous' node of this node.\n", 85},
-  {"  %-10s  Move `up' from this node.\n", 86},
-  {"  %-10s  Pick menu item specified by name.\n", 87},
-  {"              Picking a menu item causes another node to be selected.\n", 88},
-  {"  %-10s  Follow a cross reference.  Reads name of reference.\n", 89},
-  {"  %-10s  Move to the last node seen in this window.\n", 90},
-  {"  %-10s  Skip to next hypertext link within this node.\n", 91},
-  {"  %-10s  Follow the hypertext link under cursor.\n", 92},
-  {"  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n", 93},
-  {"  %-10s  Move to the Top node.  Equivalent to `g Top'.\n", 94},
-  {"Other commands:\n", 95},
-  {"---------------\n", 96},
-  {"  %-10s  Pick first ... ninth item in node's menu.\n", 97},
-  {"  %-10s  Pick last item in node's menu.\n", 98},
-  {"\
-  %-10s  Search for a specified string in the index entries of this Info\n", 99},
-  {"\
-              file, and select the node referenced by the first entry \
-found.\n", 100},
-  {"  %-10s  Move to node specified by name.\n", 101},
-  {"\
-              You may include a filename as well, as in (FILENAME)NODENAME.\n", 102},
-  {"\
-  %-10s  Search forward through this Info file for a specified string,\n", 103},
-  {"\
-              and select the node in which the next occurrence is found.\n", 104},
-  {"  %-10s  Search backward in this Info file for a specified string,\n", 105},
-  {"The current search path is:\n", 106},
-  {"\
-Commands available in Info windows:\n\
-\n", 107},
-  {"\
-Commands available in the echo area:\n\
-\n", 108},
-  {"\
-The following commands can only be invoked via M-x:\n\
-\n", 109},
-  {"--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n", 110},
-  {"Display help message", 111},
-  {"Visit Info node `(info)Help'", 112},
-  {"Print documentation for KEY", 113},
-  {"Describe key: %s", 114},
-  {"ESC %s is undefined.", 115},
-  {"%s is undefined.", 116},
-  {"%s is defined to %s.", 117},
-  {"Show what to type to execute a given command", 118},
-  {"Where is command: ", 119},
-  {"`%s' is not on any keys", 120},
-  {"%s can only be invoked via %s.", 121},
-  {"%s can be invoked via %s.", 122},
-  {"There is no function named `%s'", 123},
-  {"Read the name of an Info command and describe it", 124},
-  {"Describe command: ", 125},
-  {"Read a command name in the echo area and execute it", 126},
-  {"Cannot execute an `echo-area' command here.", 127},
-  {"Set the height of the displayed window", 128},
-  {"Set screen height to (%d): ", 129},
-  {"\
-   Source files groveled to make this file include:\n\
-\n", 130},
-  {"Couldn't manipulate the file %s.\n", 131},
-  {"\
-\n\
-* Menu:\n\
-  (File)Node                        Lines   Size   Containing File\n\
-  ----------                        -----   ----   ---------------", 132},
-  {"\
-Here is the menu of nodes you have recently visited.\n\
-Select one from this menu, or use `\\[history-node]' in another window.\n", 133},
-  {"Make a window containing a menu of all of the currently visited nodes", 134},
-  {"Select a node which has been previously visited in a visible window", 135},
-  {"Select visited node: ", 136},
-  {"The reference disappeared! (%s).", 137},
-  {"\
-Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] \
-for menu item.", 138},
-  {"Move down to the next line", 139},
-  {"Move up to the previous line", 140},
-  {"Move to the end of the line", 141},
-  {"Move to the start of the line", 142},
-  {"Next", 143},
-  {"Following Next node...", 144},
-  {"Selecting first menu item...", 145},
-  {"Selecting Next node...", 146},
-  {"Moving Up %d time(s), then Next.", 147},
-  {"No more nodes within this document.", 148},
-  {"No `Prev' for this node.", 149},
-  {"Moving Prev in this window.", 150},
-  {"No `Prev' or `Up' for this node within this document.", 151},
-  {"Moving Up in this window.", 152},
-  {"Moving to `Prev's last menu item.", 153},
-  {"Move forwards or down through node structure", 154},
-  {"Move backwards or up through node structure", 155},
-  {"Scroll forward in this window", 156},
-  {"Scroll forward in this window and set default window size", 157},
-  {"Scroll backward in this window", 158},
-  {"Scroll backward in this window and set default window size", 159},
-  {"Move to the start of this node", 160},
-  {"Move to the end of this node", 161},
-  {"Scroll down by lines", 162},
-  {"Scroll up by lines", 163},
-  {"Scroll down by half screen size", 164},
-  {"Scroll up by half screen size", 165},
-  {"Select the next window", 166},
-  {"Select the previous window", 167},
-  {"Split the current window", 168},
-  {"Delete the current window", 169},
-  {"Cannot delete a permanent window", 170},
-  {"Delete all other windows", 171},
-  {"Scroll the other window", 172},
-  {"Scroll the other window backward", 173},
-  {"Grow (or shrink) this window", 174},
-  {"Divide the available screen space among the visible windows", 175},
-  {"Toggle the state of line wrapping in the current window", 176},
-  {"Select the Next node", 177},
-  {"Select the Prev node", 178},
-  {"Select the Up node", 179},
-  {"Select the last node in this file", 180},
-  {"This window has no additional nodes", 181},
-  {"Select the first node in this file", 182},
-  {"Select the last item in this node's menu", 183},
-  {"Select this menu item", 184},
-  {"There aren't %d items in this menu.", 185},
-  {"Menu item (%s): ", 186},
-  {"Menu item: ", 187},
-  {"Follow xref (%s): ", 188},
-  {"Follow xref: ", 189},
-  {"Read a menu item and select its node", 190},
-  {"Read a footnote or cross reference and select its node", 191},
-  {"Move to the start of this node's menu", 192},
-  {"Visit as many menu items at once as possible", 193},
-  {"Read a node name and select it", 194},
-  {"Goto node: ", 195},
-  {"No menu in node `%s'.", 196},
-  {"No menu item `%s' in node `%s'.", 197},
-  {"Unable to find node referenced by `%s' in `%s'.", 198},
-  {"Read a list of menus starting from dir and follow them", 199},
-  {"Follow menus: ", 200},
-  {"Find the node describing program invocation", 201},
-  {"Find Invocation node of [%s]: ", 202},
-  {"Read a manpage reference and select it", 203},
-  {"Get Manpage: ", 204},
-  {"Select the node `Top' in this file", 205},
-  {"Select the node `(dir)'", 206},
-  {"Kill node (%s): ", 207},
-  {"Cannot kill node `%s'", 208},
-  {"Cannot kill the last node", 209},
-  {"Select the most recently selected node", 210},
-  {"Kill this node", 211},
-  {"Read the name of a file and select it", 212},
-  {"Find file: ", 213},
-  {"Cannot find `%s'.", 214},
-  {"Could not create output file `%s'.", 215},
-  {"Done.", 216},
-  {"Writing node %s...", 217},
-  {"Pipe the contents of this node through INFO_PRINT_COMMAND", 218},
-  {"Cannot open pipe to `%s'.", 219},
-  {"Printing node %s...", 220},
-  {"Searching subfile %s ...", 221},
-  {"Read a string and search for it case-sensitively", 222},
-  {"Read a string and search for it", 223},
-  {"Read a string and search backward for it", 224},
-  {"%s%sfor string [%s]: ", 225},
-  {"Search backward", 226},
-  {"Search", 227},
-  {" case-sensitively ", 228},
-  {" ", 229},
-  {"Search failed.", 230},
-  {"Repeat last search in the same direction", 231},
-  {"No previous search string", 232},
-  {"Repeat last search in the reverse direction", 233},
-  {"Search interactively for a string as you type it", 234},
-  {"I-search backward: ", 235},
-  {"I-search: ", 236},
-  {"Failing ", 237},
-  {"Move to the previous cross reference", 238},
-  {"Move to the next cross reference", 239},
-  {"Select reference or menu item appearing on this line", 240},
-  {"Cancel current operation", 241},
-  {"Quit", 242},
-  {"Move the cursor to a specific line of the window", 243},
-  {"Redraw the display", 244},
-  {"Quit using Info", 245},
-  {"Unknown command (%s).", 246},
-  {"\"\" is invalid", 247},
-  {"\"%s\" is invalid", 248},
-  {"Add this digit to the current numeric argument", 249},
-  {"Start (or multiply by 4) the current numeric argument", 250},
-  {"Internally used by \\[universal-argument]", 251},
-  {"readline: Out of virtual memory!\n", 252},
-  {"When \"On\", footnotes appear and disappear automatically", 253},
-  {"When \"On\", creating or deleting a window resizes other windows", 254},
-  {"When \"On\", flash the screen instead of ringing the bell", 255},
-  {"When \"On\", errors cause the bell to ring", 256},
-  {"When \"On\", Info garbage collects files which had to be uncompressed", 257},
-  {"When \"On\", the portion of the matched search string is highlighted", 258},
-  {"Controls what happens when scrolling is requested at the end of a node", 259},
-  {"The number lines to scroll when the cursor moves out of the window", 260},
-  {"When \"On\", Info accepts and displays ISO Latin characters", 261},
-  {"Explain the use of a variable", 262},
-  {"Describe variable: ", 263},
-  {"Set the value of an Info variable", 264},
-  {"Set variable: ", 265},
-  {"Set %s to value (%d): ", 266},
-  {"Set %s to value (%s): ", 267},
-  {"--*** Tags out of Date ***", 268},
-  {"-----Info: (), lines ----, ", 269},
-  {"-%s---Info: %s, %d lines --%s--", 270},
-  {"-%s%s-Info: (%s)%s, %d lines --%s--", 271},
-  {" Subfile: %s", 272},
-  {"%s: option `%s' is ambiguous\n", 273},
-  {"%s: option `--%s' doesn't allow an argument\n", 274},
-  {"%s: option `%c%s' doesn't allow an argument\n", 275},
-  {"%s: option `%s' requires an argument\n", 276},
-  {"%s: unrecognized option `--%s'\n", 277},
-  {"%s: unrecognized option `%c%s'\n", 278},
-  {"%s: illegal option -- %c\n", 279},
-  {"%s: invalid option -- %c\n", 280},
-  {"%s: option requires an argument -- %c\n", 281},
-  {"%s: option `-W %s' is ambiguous\n", 282},
-  {"%s: option `-W %s' doesn't allow an argument\n", 283},
-  {"January", 284},
-  {"February", 285},
-  {"March", 286},
-  {"April", 287},
-  {"May", 288},
-  {"June", 289},
-  {"July", 290},
-  {"August", 291},
-  {"September", 292},
-  {"October", 293},
-  {"November", 294},
-  {"December", 295},
-  {"unlikely character %c in @var", 296},
-  {"@sc argument all uppercase, thus no effect", 297},
-  {"%c%s is obsolete", 298},
-  {"@sp requires a positive numeric argument, not `%s'", 299},
-  {"Bad argument to %c%s", 300},
-  {"asis", 301},
-  {"none", 302},
-  {"Missing `}' in @def arg", 303},
-  {"Function", 304},
-  {"Macro", 305},
-  {"Special Form", 306},
-  {"Variable", 307},
-  {"User Option", 308},
-  {"Instance Variable", 309},
-  {"Method", 310},
-  {"of", 311},
-  {"on", 312},
-  {"Must be in `%s' insertion to use `%sx'", 313},
-  {"%s: getwd: %s, %s\n", 314},
-  {"`%c%s' needs an argument `{...}', not just `%s'", 315},
-  {"No closing brace for footnote `%s'", 316},
-  {"Footnote defined without parent node", 317},
-  {"Footnotes", 318},
-  {"Untitled", 319},
-  {"Unknown index `%s'", 320},
-  {"Index `%s' already exists", 321},
-  {"Unknown index `%s' and/or `%s' in @synindex", 322},
-  {"Unknown index `%s' in @printindex", 323},
-  {"Entry for index `%s' outside of any node", 324},
-  {"(outside of any node)", 325},
-  {"Broken-Type in insertion_type_pname", 326},
-  {"Enumeration stack overflow", 327},
-  {"lettering overflow, restarting at %c", 328},
-  {"%s requires an argument: the formatter for %citem", 329},
-  {"`@end' expected `%s', but saw `%s'", 330},
-  {"No matching `%cend %s'", 331},
-  {"%s requires letter or digit", 332},
-  {"@menu seen before first @node, creating `Top' node", 333},
-  {"\
-perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?", 334},
-  {"@detailmenu seen before first node, creating `Top' node", 335},
-  {"Unmatched `%c%s'", 336},
-  {"`%c%s' needs something after it", 337},
-  {"Bad argument to `%s', `%s', using `%s'", 338},
-  {"@%s not meaningful inside `@%s' block", 339},
-  {"@itemx not meaningful inside `%s' block", 340},
-  {"%c%s found outside of an insertion block", 341},
-  {"%s is not a valid ISO 639 language code", 342},
-  {"%c%s expects `i' or `j' as argument, not `%c'", 343},
-  {"%c%s expects a single character `i' or `j' as argument", 344},
-  {"macro `%s' previously defined", 345},
-  {"here is the previous definition of `%s'", 346},
-  {"\\ in macro expansion followed by `%s' instead of \\ or parameter name", 347},
-  {"Macro `%s' called on line %d with too many args", 348},
-  {"%cend macro not found", 349},
-  {"@quote-arg only useful for single-argument macros", 350},
-  {"mismatched @end %s with @%s", 351},
-  {"%s:%d: warning: ", 352},
-  {"Too many errors!  Gave up.\n", 353},
-  {"Misplaced %c", 354},
-  {"Try `%s --help' for more information.\n", 355},
-  {"\
-Usage: %s [OPTION]... TEXINFO-FILE...\n\
-\n\
-Translate Texinfo source documentation to various other formats:\n\
-Info files suitable for reading online with Emacs or standalone GNU Info\n\
-(by default); plain text (with --no-headers); or HTML (with --html).\n\
-\n\
-Options:\n\
- --commands-in-node-names  allow @ commands in node names.\n\
- -D VAR                    define a variable, as with @set.\n\
- -E, --macro-expand FILE   output macro-expanded source to FILE.\n\
- --error-limit=NUM         quit after NUM errors (default %d).\n\
- --fill-column=NUM         break Info lines at NUM characters (default %d).\n\
- --footnote-style=STYLE    output footnotes according to STYLE:\n\
-                            `separate' to place footnotes in their own \
-node,\n\
-                            `end' to place the footnotes at the end of the\n\
-                             node in which they are defined (the default).\n\
- --force                   preserve output even if errors.\n\
- --help                    display this help and exit.\n\
- --html                    output HTML rather than Info format;\n\
- -I DIR                    append DIR to the @include search path.\n\
- --ifhtml                  process @ifhtml and @html text even when not\n\
-                             generating HTML.\n\
- --ifinfo                  process @ifinfo text even when generating HTML.\n\
- --iftex                   process @iftex and @tex text.\n\
-                             implies --no-split.\n", 356},
-  {"\
- --no-headers              suppress Info node separators and Node: lines \
-and\n\
-                             write to standard output without --output.\n\
- --no-ifhtml               do not process @ifhtml and @html text.\n\
- --no-ifinfo               do not process @ifinfo text.\n\
- --no-iftex                do not process @iftex and @tex text.\n\
- --no-split                suppress splitting of large Info output files or\n\
-                           generation of one HTML file per node.\n\
- --no-validate             suppress node cross-reference validation.\n\
- --no-warn                 suppress warnings (but not errors).\n\
- --number-sections         include chapter, section, etc. numbers in \
-output.\n\
- -o, --output=FILE         output to FILE, ignoring any @setfilename.\n\
- -P DIR                    prepend DIR to the @include search path.\n\
- --paragraph-indent=VAL    indent Info paragraphs by VAL spaces (default \
-%d).\n\
-                             if VAL is `none', do not indent;\n\
-                             if VAL is `asis', preserve existing \
-indentation.\n\
- --reference-limit=NUM     warn about at most NUM references (default %d).\n\
- -U VAR                    undefine a variable, as with @clear.\n\
- -v, --verbose             explain what is being done.\n\
- --version                 display version information and exit.\n", 357},
-  {"\
-\n\
-The defaults for the @if... conditionals depend on the output format:\n\
-if generating HTML, --ifhtml is on and the others are off;\n\
-if generating Info or plain text, --ifinfo is on and the others are off.\n\
-\n\
-Examples:\n\
-  makeinfo foo.texi                    write Info to foo's @setfilename\n\
-  makeinfo --html foo.texi             write HTML to foo's @setfilename\n\
-  makeinfo --no-headers -o - foo.texi  write plain text to standard output\n\
-  makeinfo --number-sections foo.texi  write Info with numbered sections\n\
-  makeinfo --no-split foo.texi         write one Info file however big\n\
-\n\
-Email bug reports to bug-texinfo@gnu.org,\n\
-general questions and discussion to help-texinfo@gnu.org.", 358},
-  {"%s: %s arg must be numeric, not `%s'.\n", 359},
-  {"Couldn't open macro expansion output `%s'", 360},
-  {"Cannot specify more than one macro expansion output", 361},
-  {"%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n", 362},
-  {"%s: --footnote-style arg must be `separate' or `end', not `%s'.\n", 363},
-  {"%s: missing file argument.\n", 364},
-  {"Expected `%s'", 365},
-  {"No `%s' found in `%s'", 366},
-  {"%s: Skipping macro expansion to stdout as Info output is going there.\n", 367},
-  {"Making %s file `%s' from `%s'.\n", 368},
-  {"This is %s, produced by makeinfo version %s from %s.\n", 369},
-  {"\
-%s: Removing macro output file `%s' due to errors; use --force to preserve.\n", 370},
-  {"%s: Removing output file `%s' due to errors; use --force to preserve.\n", 371},
-  {"Unknown command `%s'", 372},
-  {"Use braces to give a command as an argument to @%s", 373},
-  {"%c%s expected `{...}'", 374},
-  {"Unmatched }", 375},
-  {"NO_NAME!", 376},
-  {"%c%s missing close brace", 377},
-  {"see ", 378},
-  {"See ", 379},
-  {"`.' or `,' must follow cross reference, not %c", 380},
-  {"No .png or .jpg for `%s'", 381},
-  {"@image file `%s' unreadable: %s", 382},
-  {"@image missing filename argument", 383},
-  {"{No value for `%s'}", 384},
-  {"%c%s requires a name", 385},
-  {"Reached eof before matching @end %s", 386},
-  {"Missing } in @multitable template", 387},
-  {"ignoring stray text `%s' after @multitable", 388},
-  {"Too many columns in multitable item (max %d)", 389},
-  {"Cannot select column #%d in multitable", 390},
-  {"ignoring @tab outside of multitable", 391},
-  {"** Multicolumn output from last row:\n", 392},
-  {"* column #%d: output = %s\n", 393},
-  {"Node `%s' previously defined at line %d", 394},
-  {"Formatting node %s...\n", 395},
-  {"Node `%s' requires a sectioning command (e.g. %c%s)", 396},
-  {"No node name specified for `%c%s' command", 397},
-  {"Node:", 398},
-  {"Next:", 399},
-  {"Previous:", 400},
-  {"Up:", 401},
-  {"%s reference to nonexistent node `%s'", 402},
-  {"Menu", 403},
-  {"Cross", 404},
-  {"Next field of node `%s' not pointed to", 405},
-  {"This node (%s) has the bad Prev", 406},
-  {"Prev", 407},
-  {"Prev field of node `%s' not pointed to", 408},
-  {"This node (%s) has the bad Next", 409},
-  {"`%s' has no Up field", 410},
-  {"Up", 411},
-  {"Node `%s' lacks menu item for `%s' despite being its Up target", 412},
-  {"node `%s' has been referenced %d times", 413},
-  {"unreferenced node `%s'", 414},
-  {"Appendix %c ", 415},
-  {"Internal error (search_sectioning) \"%s\"!", 416},
-  {"%c%s is obsolete; use %c%s instead", 417},
-  {"Node with %ctop as a section already exists", 418},
-  {"Here is the %ctop node", 419},
-  {"%ctop used before %cnode, defaulting to %s", 420},
-  {"Table of Contents", 421},
-  {"Short Contents", 422},
-  {"%s: TOC should be here, but it was not found", 423},
-  {"%s: warning: ", 424},
-  {"virtual memory exhausted", 425},
-  {" for %s", 426},
-  {"\tTry `%s --help' for a complete list of options.\n", 427},
-  {"\
-Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n\
-\n\
-Install or delete dir entries from INFO-FILE in the Info directory file\n\
-DIR-FILE.\n\
-\n\
-Options:\n\
- --delete          delete existing entries for INFO-FILE from DIR-FILE;\n\
-                     don't insert any new entries.\n\
- --dir-file=NAME   specify file name of Info directory file.\n\
-                     This is equivalent to using the DIR-FILE argument.\n\
- --entry=TEXT      insert TEXT as an Info directory entry.\n\
-                     TEXT should have the form of an Info menu item line\n\
-                     plus zero or more extra lines starting with \
-whitespace.\n\
-                     If you specify more than one entry, they are all \
-added.\n\
-                     If you don't specify any entries, they are determined\n\
-                     from information in the Info file itself.\n\
- --help            display this help and exit.\n\
- --info-file=FILE  specify Info file to install in the directory.\n\
-                     This is equivalent to using the INFO-FILE argument.\n\
- --info-dir=DIR    same as --dir-file=DIR/dir.\n\
- --item=TEXT       same as --entry TEXT.\n\
-                     An Info directory entry is actually a menu item.\n\
- --quiet           suppress warnings.\n\
- --remove          same as --delete.\n\
- --section=SEC     put this file's entries in section SEC of the directory.\n\
-                     If you specify more than one section, all the entries\n\
-                     are added in each of the sections.\n\
-                     If you don't specify any sections, they are determined\n\
-                     from information in the Info file itself.\n\
- --version         display version information and exit.\n\
-\n\
-Email bug reports to bug-texinfo@gnu.org,\n\
-general questions and discussion to help-texinfo@gnu.org.\n", 428},
-  {"\
-This is the file .../info/dir, which contains the\n\
-topmost node of the Info hierarchy, called (dir)Top.\n\
-The first time you invoke Info you start off looking at this node.\n\
-\n\
-%s\tThis is the top of the INFO tree\n\
-\n\
-  This (the Directory node) gives a menu of major topics.\n\
-  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\
-  \"h\" gives a primer for first-timers,\n\
-  \"mEmacs<Return>\" visits the Emacs manual, etc.\n\
-\n\
-  In Emacs, you can click mouse button 2 on a menu item or cross reference\n\
-  to select it.\n\
-\n\
-* Menu:\n", 429},
-  {"%s: could not read (%s) and could not create (%s)\n", 430},
-  {"%s: empty file", 431},
-  {"START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY", 432},
-  {"END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY", 433},
-  {"%s: Specify the Info directory only once.\n", 434},
-  {"%s: Specify the Info file only once.\n", 435},
-  {"excess command line argument `%s'", 436},
-  {"No input file specified; try --help for more information.", 437},
-  {"No dir file specified; try --help for more information.", 438},
-  {"no info dir entry in `%s'", 439},
-  {"menu item `%s' already exists, for file `%s'", 440},
-  {"no entries found for `%s'; nothing deleted", 441},
-  {"display this help and exit", 442},
-  {"keep temporary files around after processing", 443},
-  {"do not keep temporary files around after processing (default)", 444},
-  {"send output to FILE", 445},
-  {"display version information and exit", 446},
-  {"Usage: %s [OPTION]... FILE...\n", 447},
-  {"Generate a sorted index for each TeX output FILE.\n", 448},
-  {"Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n", 449},
-  {"\
-\n\
-Options:\n", 450},
-  {"\
-\n\
-Email bug reports to bug-texinfo@gnu.org,\n\
-general questions and discussion to help-texinfo@gnu.org.\n", 451},
-  {"%s: not a texinfo index file", 452},
-  {"failure reopening %s", 453},
-  {"No page number in %s", 454},
-  {"entry %s follows an entry with a secondary name", 455},
-  {"%s; for file `%s'.\n", 456},
-};
-
-int _msg_tbl_length = 456;
diff --git a/gnu/usr.bin/texinfo/po/stamp-cat-id b/gnu/usr.bin/texinfo/po/stamp-cat-id
deleted file mode 100644
index 9788f70238c..00000000000
--- a/gnu/usr.bin/texinfo/po/stamp-cat-id
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/gnu/usr.bin/texinfo/stamp-h.in b/gnu/usr.bin/texinfo/stamp-h.in
deleted file mode 100644
index 9788f70238c..00000000000
--- a/gnu/usr.bin/texinfo/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp