Update gtexinfo to 4.11.

Based on patch provided by Magnus Henoch in PR 37481.
I made some modification:
  * keep and update patch-ac (need to pick up pkgsrc info files).
  * fixes PLIST, missing some entries.
  * portability fix in texi2dvi (patch-am).
  * DESTDIR support.

Changes:
4.11 (9 September 2007)

* Language:
  . @documentlanguage now supports an optional country code
    specification after the language code, a la gettext.
  . new command @allowcodebreaks controls breaks at _ and - within @code.
  . new command @frenchspacing controls spacing after sentences.
  . new command @fonttextsize allows changing body text font size to 10pt.
  . new command @textdegree{} produces the normal degrees symbol.
  . new command @thischapternum can be used in TeX headers/footers.
  . new commands for quotes: @quotedblleft @quotedblright
     @quoteleft @quoteright  @quotedblbase @quotesinglbase
     @guillemetleft @guillemetright @guilsinglleft @guilsinglright.
  . new option @set txicodequoteundirected produces an undirected quote
    in code and example output, instead of the regular right quote.
  . new option @set txicodequotebacktick produces a grave accent in
    code and example output, instead of the regular left quote.
* makeinfo:
  . The @documentlanguage locale is used to translate various document strings.
  . --enable-encoding is now the default, meaning Info and plain text
    output use 8-bit characters given a supported @documentencoding.
  . new option --css-ref=URL for creating a stylesheet <link> in HTML output.
  . new option --transliterate-file-names to use a reduction-to-ASCII
    algorithm for split HTML file names, useful for non-Latin-based languages.
  . @enddots{} outputs three dots instead of four, for consistency with
    texinfo.tex.
  . the Local Variables coding: setting written by --enable-encoding now
    comes at the very end, after the tags table, so that Emacs can find
    it in more cases.
  . @allow-recursion (never documented) is deprecated and produces a warning.
  . @quote-args (never documented) is now the default behavior.
  . centering and such take account of character widths.
  . the --reference-limit option is now a no-op.
  . improvements to XML and Docbook output and the DTD.
* texinfo.tex:
  . @thissection can now be used in custom headings, and @thischapter
    works reliably even without @set chapternewpage.  Custom headings
    have additional flexibility as well.
* texi2dvi:
  . pdftexi2dvi is a new wrapper to `texi2dvi --pdf', equal to texi2pdf,
    for the sake of AUC-TeX which prepends `pdf' to the compilation
    command when requested to produce PDF.
* info:
  . look for info files in the current directory first, by default.
  . when calling man, use -a if no explicit section is found.
  . avoid showing the top(1) man page for nonexistent info files.
* install-info:
  . new options --section-regex, --remove-exactly, --debug, --test.
* Distribution:
  . autoconf 2.60, automake 1.10, gettext 0.16.1.
  . gettext support now [external].
  . new translations: hu (Hungarian), rw (Kinyarwandan), vi (Vietnamese).
  . most common sources imported from gnulib.

4.10 (omitted)

4.9 (29 June 2007)
* GPLv3.
* texi2dvi:
  . new mode --build=tidy which supports compilation in a separate
    directory, where intermediate files are preserved.
  . new option --build-dir, to specify where the tidy build will take
    place, either locally or globally.  This allows avoiding the clutter
    while preserving auxiliary files.
  . new support for AUC-TeX: texi2dvi (weakly) supports arguments a la
    TeX such as `\nonstopmode\input{file.tex}'.
  . new options --ps and --dvipdf, useful especially for pstricks documents.
  . new option --src-specials, passed to TeX.
* texinfo.tex:
  . Latin1, Latin2, Latin9, and UTF-8 are supported -- only as well as
    the Computer Modern fonts can manage, which means primarily English
    and western European languages, to a limited extent.
  . png and jpg images supported in pdf output.
  . new Russian, Serbian, and Ukrainian translations for texinfo.tex:
    txi-ru.tex, txi-sr.tex, txi-uk.tex.
  . section names with \ characters work properly in pdf outlines.
  . have .toc files use @ as the escape character, instead of \.

11 files changed, 66 insertions, 133 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index fff2caf6fdd..65c7f077b7b 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2007/06/30 14:24:14 tnn Exp $
+# $NetBSD: Makefile,v 1.69 2008/01/30 08:19:24 obache Exp $
 
-DISTNAME=		texinfo-4.8
+DISTNAME=		texinfo-4.11
 PKGNAME=		g${DISTNAME}
-PKGREVISION=		7
 CATEGORIES=		devel sysutils
 MASTER_SITES=		${MASTER_SITE_GNU:=texinfo/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,8 +12,10 @@ COMMENT=		GNU info documentation utilities
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
-INFO_FILES=		# PLIST
+INFO_FILES=		yes
 TEST_TARGET=		check
 PLIST_SRC=		${PKGDIR}/PLIST
 
diff --git a/devel/gtexinfo/PLIST.locale b/devel/gtexinfo/PLIST.locale
index 8015a4d6ed2..75bd8898e31 100644
--- a/devel/gtexinfo/PLIST.locale
+++ b/devel/gtexinfo/PLIST.locale
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.locale,v 1.3 2006/04/17 07:07:16 jlam Exp $
+@comment $NetBSD: PLIST.locale,v 1.4 2008/01/30 08:19:24 obache Exp $
 share/locale/cs/LC_MESSAGES/texinfo.mo
 share/locale/da/LC_MESSAGES/texinfo.mo
 share/locale/de/LC_MESSAGES/texinfo.mo
@@ -7,6 +7,7 @@ share/locale/eo/LC_MESSAGES/texinfo.mo
 share/locale/fr/LC_MESSAGES/texinfo.mo
 share/locale/he/LC_MESSAGES/texinfo.mo
 share/locale/hr/LC_MESSAGES/texinfo.mo
+share/locale/hu/LC_MESSAGES/texinfo.mo
 share/locale/ja/LC_MESSAGES/texinfo.mo
 share/locale/nb/LC_MESSAGES/texinfo.mo
 share/locale/nl/LC_MESSAGES/texinfo.mo
@@ -14,7 +15,9 @@ share/locale/no/LC_MESSAGES/texinfo.mo
 share/locale/pl/LC_MESSAGES/texinfo.mo
 share/locale/ro/LC_MESSAGES/texinfo.mo
 share/locale/ru/LC_MESSAGES/texinfo.mo
+share/locale/rw/LC_MESSAGES/texinfo.mo
 share/locale/sv/LC_MESSAGES/texinfo.mo
 share/locale/tr/LC_MESSAGES/texinfo.mo
+share/locale/vi/LC_MESSAGES/texinfo.mo
 share/locale/zh_CN/LC_MESSAGES/texinfo.mo
 share/locale/zh_TW/LC_MESSAGES/texinfo.mo
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index f7e2752ba39..73abf33b39b 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.28 2008/01/30 07:21:33 obache Exp $
+$NetBSD: distinfo,v 1.29 2008/01/30 08:19:25 obache Exp $
 
-SHA1 (texinfo-4.8.tar.bz2) = b19e906f7220294c1e8b087d583c50f5c4d7c420
-RMD160 (texinfo-4.8.tar.bz2) = 5cb82cd240d1f22da813c7142df8828b4f6f1ea4
-Size (texinfo-4.8.tar.bz2) = 1521822 bytes
-SHA1 (patch-aa) = 2c6d6a812fcf3b1aa944832601c3415548e763f5
-SHA1 (patch-ab) = 299ae7a5001c6ab42cca7c6278ae1edb3b348511
-SHA1 (patch-ac) = 01baf8634edcecab0b5edaeddf1e38811cab490d
-SHA1 (patch-ad) = c5c3374322eb8a2c8dfc7871971b73194ab1b14c
-SHA1 (patch-aj) = d9071c62c993550d253c9e1889880d4fccf7d278
-SHA1 (patch-ak) = 2cef2ae464ddb5324acae000420017d4faf7b145
-SHA1 (patch-al) = 5cbae19a93752d37eac70dee454af716b7b35a9c
+SHA1 (texinfo-4.11.tar.bz2) = 915a42e1278860b0fa64e4ef9d5ad4488d3b23a0
+RMD160 (texinfo-4.11.tar.bz2) = d07dbc50f98dd8f9f4088b58781abdebfb7f5781
+Size (texinfo-4.11.tar.bz2) = 1659601 bytes
+SHA1 (patch-aa) = eae1ca11ad9ce1df98d3df43893c80eb8809e56c
+SHA1 (patch-ab) = 464d9ca66dd0ba5c09e9cbd2dbc19d0a8156eb9b
+SHA1 (patch-ac) = 5550c4797cbaec7f133c8fc35fc15f96dc7bc77f
+SHA1 (patch-ad) = 39ef71c532f8d5dca1ef683a2a841fb79fe769b0
+SHA1 (patch-aj) = daab8068ee204ddcdca01d72879d099c38e931c3
+SHA1 (patch-ak) = 92daf86e90d6c3c4c5c1c83200371d19049ac65b
+SHA1 (patch-am) = 7d20c085b7d4219d323a690874f1a88796186c90
diff --git a/devel/gtexinfo/patches/patch-aa b/devel/gtexinfo/patches/patch-aa
index e01e5caab20..2fe0201cfb7 100644
--- a/devel/gtexinfo/patches/patch-aa
+++ b/devel/gtexinfo/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.14 2005/02/28 13:06:46 wiz Exp $
+$NetBSD: patch-aa,v 1.15 2008/01/30 08:19:25 obache Exp $
 
---- util/Makefile.in.orig	2005-02-28 13:54:04.000000000 +0100
+--- util/Makefile.in.orig	2007-09-10 02:37:45.000000000 +0200
 +++ util/Makefile.in
-@@ -235,7 +235,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+@@ -385,7 +385,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--bin_SCRIPTS = texi2dvi texi2pdf
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi
 +bin_SCRIPTS = texi2dvi
  
  # Use `ginstall-info' in the definition of PROGRAMS and in dependencies
diff --git a/devel/gtexinfo/patches/patch-ab b/devel/gtexinfo/patches/patch-ab
index f4880c7e9f4..d0e555075f4 100644
--- a/devel/gtexinfo/patches/patch-ab
+++ b/devel/gtexinfo/patches/patch-ab
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.10 2005/02/28 13:06:46 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2008/01/30 08:19:25 obache Exp $
 
---- info/Makefile.in.orig	2004-12-31 19:01:48.000000000 +0100
+--- info/Makefile.in.orig	2007-09-10 02:37:45.000000000 +0200
 +++ info/Makefile.in
-@@ -136,7 +136,7 @@ CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \
--	-DINFODIR2=\"$(infodir2)\"
-+	-DINFODIR2=\"$(infodir2)\" -DPKGSRC_INFOPATH=\"$(PKGSRC_INFOPATH)\"
- DEPDIR = @DEPDIR@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
+@@ -391,7 +391,8 @@ AM_CPPFLAGS = \
+   -I$(top_builddir)/gnulib/lib			\
+   -DLOCALEDIR=\"$(localedir)\" 			\
+   -DINFODIR=\"$(infodir)\"			\
+-  -DINFODIR2=\"$(infodir2)\"
++  -DINFODIR2=\"$(infodir2)\"			\
++  -DPKGSRC_INFOPATH=\"$(PKGSRC_INFOPATH)\"
+ 
+ LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a \
+         $(TERMLIBS) $(LIBINTL)
diff --git a/devel/gtexinfo/patches/patch-ac b/devel/gtexinfo/patches/patch-ac
index 1cd848ab23f..32dfc670c82 100644
--- a/devel/gtexinfo/patches/patch-ac
+++ b/devel/gtexinfo/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.9 2004/07/04 23:17:59 wiz Exp $
+$NetBSD: patch-ac,v 1.10 2008/01/30 08:19:25 obache Exp $
 
---- info/filesys.h.orig	2004-03-14 01:57:29.000000000 +0100
+--- info/filesys.h.orig	2007-07-01 21:20:29.000000000 +0000
 +++ info/filesys.h
 @@ -78,7 +78,7 @@ extern int is_dir_name (char *filename);
  
  /* The default value of INFOPATH. */
  #if !defined (DEFAULT_INFOPATH)
--#  define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
-+#  define DEFAULT_INFOPATH PKGSRC_INFOPATH ":" "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
+-#  define DEFAULT_INFOPATH ".:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info"
++#  define DEFAULT_INFOPATH ".:" PKGSRC_INFOPATH ":/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info"
  #endif /* !DEFAULT_INFOPATH */
  
  #if !defined (S_ISREG) && defined (S_IFREG)
diff --git a/devel/gtexinfo/patches/patch-ad b/devel/gtexinfo/patches/patch-ad
index 421d90bf11c..98ae1eb6d2a 100644
--- a/devel/gtexinfo/patches/patch-ad
+++ b/devel/gtexinfo/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2004/07/04 23:17:59 wiz Exp $
+$NetBSD: patch-ad,v 1.8 2008/01/30 08:19:25 obache Exp $
 
---- info/terminal.c.orig	2004-03-27 16:35:55.000000000 +0100
+--- info/terminal.c.orig	2007-07-01 23:20:31.000000000 +0200
 +++ info/terminal.c
-@@ -31,13 +31,17 @@
+@@ -30,13 +30,17 @@
  #ifdef HAVE_NCURSES_TERMCAP_H
  #include <ncurses/termcap.h>
  #else
@@ -21,7 +21,7 @@ $NetBSD: patch-ad,v 1.7 2004/07/04 23:17:59 wiz Exp $
  /* Termcap requires these variables, whether we access them or not. */
  char *BC, *UP;
  char PC;      /* Pad character */
-@@ -112,11 +116,17 @@ static char *term_invend;
+@@ -111,11 +115,17 @@ static char *term_invend;
  /* Although I can't find any documentation that says this is supposed to
     return its argument, all the code I've looked at (termutils, less)
     does so, so fine.  */
diff --git a/devel/gtexinfo/patches/patch-aj b/devel/gtexinfo/patches/patch-aj
index b5017acfa70..aaa7b69b52b 100644
--- a/devel/gtexinfo/patches/patch-aj
+++ b/devel/gtexinfo/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.5 2005/02/28 13:06:46 wiz Exp $
+$NetBSD: patch-aj,v 1.6 2008/01/30 08:19:25 obache Exp $
 
---- configure.ac.orig	2004-12-31 19:00:48.000000000 +0100
+--- configure.ac.orig	2007-09-10 02:36:29.000000000 +0200
 +++ configure.ac
-@@ -119,7 +119,7 @@ AM_CONDITIONAL(TOOLS_ONLY, [[test "x$too
+@@ -130,7 +130,7 @@ AM_CONDITIONAL(TOOLS_ONLY, [[test "x$too
  # rather ncurses.  So we check for it.
  TERMLIBS=
  # Check for termlib before termcap because Solaris termcap needs libucb.
diff --git a/devel/gtexinfo/patches/patch-ak b/devel/gtexinfo/patches/patch-ak
index 219c8694458..0a779f933a4 100644
--- a/devel/gtexinfo/patches/patch-ak
+++ b/devel/gtexinfo/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2005/02/28 13:06:46 wiz Exp $
+$NetBSD: patch-ak,v 1.4 2008/01/30 08:19:25 obache Exp $
 
---- configure.orig	2004-12-31 19:01:50.000000000 +0100
+--- configure.orig	2007-09-10 02:37:46.000000000 +0200
 +++ configure
-@@ -6382,7 +6382,7 @@ fi
+@@ -15966,7 +15966,7 @@ fi
  # rather ncurses.  So we check for it.
  TERMLIBS=
  # Check for termlib before termcap because Solaris termcap needs libucb.
@@ -10,4 +10,4 @@ $NetBSD: patch-ak,v 1.3 2005/02/28 13:06:46 wiz Exp $
 +TERMLIB_VARIANTS="curses termlib termcap terminfo ncurses"
  for termlib in ${TERMLIB_VARIANTS}; do
    as_ac_Lib=`echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
+ { echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5
diff --git a/devel/gtexinfo/patches/patch-al b/devel/gtexinfo/patches/patch-al
deleted file mode 100644
index 1e7f9955065..00000000000
--- a/devel/gtexinfo/patches/patch-al
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-al,v 1.5 2007/01/08 08:50:51 rillig Exp $
-
-Security fix for CAN-2005-3001 and CVE-2006-4810
-
---- util/texindex.c.orig	2004-04-11 19:56:47.000000000 +0200
-+++ util/texindex.c	2007-01-08 09:41:42.000000000 +0100
-@@ -387,14 +387,15 @@ For more information about these matters
- /* Return a name for temporary file COUNT. */
- 
- static char *
--maketempname (int count)
-+maketempname (int count, int can_exist)
- {
-   static char *tempbase = NULL;
-+  char *tempname;
-   char tempsuffix[10];
-+  int fd;
- 
-   if (!tempbase)
-     {
--      int fd;
-       tempbase = concat (tempdir, "txidxXXXXXX");
- 
-       fd = mkstemp (tempbase);
-@@ -403,7 +404,14 @@ maketempname (int count)
-     }
- 
-   sprintf (tempsuffix, ".%d", count);
--  return concat (tempbase, tempsuffix);
-+  tempname = concat (tempbase, tempsuffix);
-+  if (!can_exist) {
-+    fd = open (tempname, O_CREAT|O_EXCL|O_WRONLY, 0600);
-+    if (fd == -1)
-+      pfatal_with_name (tempname);
-+    close (fd);
-+  }
-+  return tempname;
- }
- 
- 
-@@ -415,7 +423,7 @@ flush_tempfiles (int to_count)
-   if (keep_tempfiles)
-     return;
-   while (last_deleted_tempcount < to_count)
--    unlink (maketempname (++last_deleted_tempcount));
-+    unlink (maketempname (++last_deleted_tempcount, 1));
- }
- 
- 
-@@ -837,7 +845,7 @@ readline (struct linebuffer *linebuffer,
-         {
-           buffer = (char *) xrealloc (buffer, linebuffer->size *= 2);
-           p += buffer - linebuffer->buffer;
--          end += buffer - linebuffer->buffer;
-+          end = buffer + linebuffer->size;
-           linebuffer->buffer = buffer;
-         }
-       if (c < 0 || c == '\n')
-@@ -882,7 +890,7 @@ sort_offline (char *infile, off_t total,
- 
-   for (i = 0; i < ntemps; i++)
-     {
--      char *outname = maketempname (++tempcount);
-+      char *outname = maketempname (++tempcount, 0);
-       FILE *ostream = fopen (outname, "w");
-       long tempsize = 0;
- 
-@@ -930,7 +938,7 @@ fail:
- 
-   for (i = 0; i < ntemps; i++)
-     {
--      char *newtemp = maketempname (++tempcount);
-+      char *newtemp = maketempname (++tempcount, 0);
-       sort_in_core (tempfiles[i], MAX_IN_CORE_SORT, newtemp);
-       if (!keep_tempfiles)
-         unlink (tempfiles[i]);
-@@ -1400,7 +1408,7 @@ merge_files (char **infiles, int nfiles,
-       int nf = MAX_DIRECT_MERGE;
-       if (i + 1 == ntemps)
-         nf = nfiles - i * MAX_DIRECT_MERGE;
--      tempfiles[i] = maketempname (++tempcount);
-+      tempfiles[i] = maketempname (++tempcount, 0);
-       value |= merge_direct (&infiles[i * MAX_DIRECT_MERGE], nf, tempfiles[i]);
-     }
- 
diff --git a/devel/gtexinfo/patches/patch-am b/devel/gtexinfo/patches/patch-am
new file mode 100644
index 00000000000..134f2818de5
--- /dev/null
+++ b/devel/gtexinfo/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2008/01/30 08:19:26 obache Exp $
+
+--- util/texi2dvi.orig	2007-09-10 00:36:30.000000000 +0000
++++ util/texi2dvi
+@@ -1037,7 +1037,7 @@ uncomment_iftex='s/^@c texi2dvi//'
+ # main info output, the user asked to run TeX, not makeinfo.
+ run_makeinfo ()
+ {
+-  test $in_lang == texinfo ||
++  test $in_lang = texinfo ||
+     return 0
+ 
+   # Unless required by the user, makeinfo expansion is wanted only