Update to 6.0

Changelog:
6.0 (26 June 2015)
* Language:
  . new commands @sub and @sup, for textual subscripts and superscripts.
  . new command @U to insert a Unicode character by code point.

* texinfo.tex:
  . @url/@uref output in PDF now the same as in DVI, showing the url
    even if the second argument is given, not just as a link target.
    TeX option \urefurlonlylinktrue gives previous behavior, of invisible urls.
    PDF-only \linkcolor and \urlcolor specify colors (default black).

* texi2any:
  . customization variable TOP_NODE_UP_URL now replaces all (dir) references;
    recommended setting for GNU packages is /manual/.
  . new customization variable INDEX_SPECIAL_CHARS_WARNING to complain
    when index entries contain a colon.
  . Docbook output no longer uses <lineannotation> for @r.
  . -D'var val' on the command line works as intended again.
  . --plaintext output can be split.
  . a bit faster.

* info:
  . invoking as `info foo bar' looks for bar as an index entry in manual
    foo, if not found as a top-level menu item.
  . invoking info with an absolute or explicitly relative file name
    (./foo.info, /tmp/foo.info, etc.) just visits that file.
  . separate `infokey' program has been removed - the .infokey file is
    now read directly by Info.
  . new option --init-file allows overriding ~/.infokey.
  . new variable `highlight-searches' allows highlighting results from a
    search
  . support for mouse scrollwheel, controlled by `mouse' variable.
  . new variable `key_time' to control how long to wait for byte
    sequences sent by special keys.
  . new variable `hide-note-references' alters appearance of displayed nodes
  . new variable `infopath-no-defaults' allows omitting the compile-time
    Info directory from the Info search path.
  . support input of multibyte characters for searches in a UTF-8 locale.
  . if reading an Info file that is known to be in a different character
    encoding to that of the user's environment, convert its contents
    when displayed and substitute missing characters
  . new command M-x info-version.
  . the M-x kill-node command has been removed.
  . test suite at build time.

* texindex:
  . completely new implementation as a literate program using Texinfo
    and (portable) awk (called TexiWeb Jr.), thanks to Arnold Robbins.
    (Requires gawk 4.0+ if .twjr source is modified.)
  . the -o (--output) is not supported, unless we hear of someone using it.
  . duplicated sort keys with different display texts result in one
    merged index entry, using the first display text.
  . better sorting and parsing in unusual cases; most notably, { and }
    characters can appear as initials.

* install-info:
  . handle compressed input file names containing spaces.
  . exit successfully if --remove is given and the dir file does not exist.
  . new option --defsection, to be used instead of "Miscellaneous" when
    a section is not present in the Info file.

* texi2dvi:
  . look for the environment variable THUMBPDF_CMD instead of THUMBPDF,
    since thumbpdf itself has used THUMBPDF for options since 2000.
  . remove --recode and --recode-from options, since they haven't
    worked as intended for years, so evidently no one needs them.

* Distribution:
  . new translation ca (catalan).
  . automake-1.15, gettext-0.19.4.

7 files changed, 33 insertions, 42 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index 190c8d7f6ee..b4401231f19 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2015/06/12 10:48:50 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2015/06/30 11:00:32 ryoon Exp $
 
-DISTNAME=		texinfo-5.2
+DISTNAME=		texinfo-6.0
 PKGNAME=		g${DISTNAME}
-PKGREVISION=		2
 CATEGORIES=		devel sysutils
 MASTER_SITES=		${MASTER_SITE_GNU:=texinfo/}
 
diff --git a/devel/gtexinfo/PLIST b/devel/gtexinfo/PLIST
index f50731b08c7..32fe655326c 100644
--- a/devel/gtexinfo/PLIST
+++ b/devel/gtexinfo/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.17 2013/10/06 16:12:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/06/30 11:00:32 ryoon Exp $
 bin/info
-bin/infokey
 bin/install-info
 bin/makeinfo
 bin/pdftexi2dvi
@@ -13,7 +12,6 @@ info/info-stnd.info
 info/info.info
 info/texinfo.info
 man/man1/info.1
-man/man1/infokey.1
 man/man1/install-info.1
 man/man1/makeinfo.1
 man/man1/pdftexi2dvi.1
@@ -57,4 +55,5 @@ share/texinfo/init/chm.pm
 share/texinfo/init/html32.pm
 share/texinfo/init/latex2html.pm
 share/texinfo/init/tex4ht.pm
+share/texinfo/texindex.awk
 share/texinfo/texinfo.dtd
diff --git a/devel/gtexinfo/PLIST.locale b/devel/gtexinfo/PLIST.locale
index d2ff77fb21d..f525929f755 100644
--- a/devel/gtexinfo/PLIST.locale
+++ b/devel/gtexinfo/PLIST.locale
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST.locale,v 1.6 2013/07/04 16:19:16 wiz Exp $
+@comment $NetBSD: PLIST.locale,v 1.7 2015/06/30 11:00:32 ryoon Exp $
+share/locale/ca.us-ascii/LC_MESSAGES/texinfo_document.mo
+share/locale/ca/LC_MESSAGES/texinfo.mo
 share/locale/cs/LC_MESSAGES/texinfo.mo
 share/locale/da/LC_MESSAGES/texinfo.mo
 share/locale/de.us-ascii/LC_MESSAGES/texinfo_document.mo
@@ -6,8 +8,8 @@ share/locale/de/LC_MESSAGES/texinfo.mo
 share/locale/de_AT/LC_MESSAGES/texinfo.mo
 share/locale/eo/LC_MESSAGES/texinfo.mo
 share/locale/eo/LC_MESSAGES/texinfo_document.mo
-share/locale/es.us-ascii/LC_MESSAGES/texinfo_document.mo
 share/locale/es/LC_MESSAGES/texinfo.mo
+share/locale/es/LC_MESSAGES/texinfo_document.mo
 share/locale/fr/LC_MESSAGES/texinfo.mo
 share/locale/fr/LC_MESSAGES/texinfo_document.mo
 share/locale/he/LC_MESSAGES/texinfo.mo
@@ -26,6 +28,7 @@ share/locale/pl/LC_MESSAGES/texinfo.mo
 share/locale/pl/LC_MESSAGES/texinfo_document.mo
 share/locale/pt.us-ascii/LC_MESSAGES/texinfo_document.mo
 share/locale/pt_BR.us-ascii/LC_MESSAGES/texinfo_document.mo
+share/locale/pt_BR/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
@@ -33,6 +36,7 @@ share/locale/sl/LC_MESSAGES/texinfo.mo
 share/locale/sv/LC_MESSAGES/texinfo.mo
 share/locale/tr/LC_MESSAGES/texinfo.mo
 share/locale/uk/LC_MESSAGES/texinfo.mo
+share/locale/uk/LC_MESSAGES/texinfo_document.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 168cb75ca49..ed263e1cfd3 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.41 2014/07/17 12:56:23 ryoon Exp $
+$NetBSD: distinfo,v 1.42 2015/06/30 11:00:32 ryoon Exp $
 
-SHA1 (texinfo-5.2.tar.gz) = dc54edfbb623d46fb400576b3da181f987e63516
-RMD160 (texinfo-5.2.tar.gz) = f5df93674e520507c6bd5b2c47de7a02ad7e2fe3
-Size (texinfo-5.2.tar.gz) = 7672236 bytes
-SHA1 (patch-ab) = 89a06d42120c3b4a7d90b991add8973e80077187
-SHA1 (patch-ac) = 3fb50380e0406a9ee81db92e5ce1e2f6bd87701a
+SHA1 (texinfo-6.0.tar.gz) = 110d45256c4219c88dc2fdb8c9c1a20749e4e7c5
+RMD160 (texinfo-6.0.tar.gz) = 13e4b6d95ee71d0acd5f59a4ee7aff6dd8bd5f18
+Size (texinfo-6.0.tar.gz) = 8349669 bytes
+SHA1 (patch-ab) = 4fd54f537470642394292f35539cf308873e156a
+SHA1 (patch-ac) = 7f7226ee521fddba9f967be4fe199f6bedcfa148
 SHA1 (patch-gnulib_lib_mbiter.h) = 34c291e6994c6eb51aba803f3ebf5f09d46e9bdd
 SHA1 (patch-gnulib_lib_mbuiter.h) = be293674c37cb91746527be07aa40acbd285d2f4
-SHA1 (patch-util_texi2dvi) = 88548d1374d62756a902adceb3e37a0a61bcafa0
+SHA1 (patch-util_texi2dvi) = d17608312d4b5546a2295e1be2b193124ad97256
diff --git a/devel/gtexinfo/patches/patch-ab b/devel/gtexinfo/patches/patch-ab
index 771be93623d..24a20b8d4e8 100644
--- a/devel/gtexinfo/patches/patch-ab
+++ b/devel/gtexinfo/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.13 2013/07/04 16:19:16 wiz Exp $
+$NetBSD: patch-ab,v 1.14 2015/06/30 11:00:33 ryoon Exp $
 
---- info/Makefile.in.orig	2013-03-12 22:56:43.000000000 +0000
+--- info/Makefile.in.orig	2015-06-26 12:51:08.000000000 +0000
 +++ info/Makefile.in
-@@ -942,7 +942,8 @@ AM_CPPFLAGS = \
-   -I$(top_builddir)/gnulib/lib			\
-   -DLOCALEDIR=\"$(localedir)\" 			\
-   -DINFODIR=\"$(infodir)\"			\
--  -DINFODIR2=\"$(infodir2)\"
-+  -DINFODIR2=\"$(infodir2)\"			\
+@@ -1618,7 +1618,8 @@ AM_CPPFLAGS = \
+   -I$(top_builddir)/gnulib/lib                  \
+   -DLOCALEDIR=\"$(datadir)/locale\"             \
+   -DINFODIR=\"$(infodir)\"                      \
+-  -DINFODIR2=\"$(datadir)/info\"
++  -DINFODIR2=\"$(datadir)/info\"		\
 +  -DPKGSRC_INFOPATH=\"$(PKGSRC_INFOPATH)\"
  
- LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(TERMLIBS) $(LIBINTL)
- infokey_LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
+ LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(TERMLIBS) $(LIBINTL) $(LIBICONV)
+ EXTRA_DIST = README pcterm.c $(TESTS) $(XFAIL_TESTS) t/README \
diff --git a/devel/gtexinfo/patches/patch-ac b/devel/gtexinfo/patches/patch-ac
index 2230aecd050..a464a4403cc 100644
--- a/devel/gtexinfo/patches/patch-ac
+++ b/devel/gtexinfo/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.12 2013/07/04 16:19:16 wiz Exp $
+$NetBSD: patch-ac,v 1.13 2015/06/30 11:00:33 ryoon Exp $
 
---- info/filesys.h.orig	2013-02-23 00:11:25.000000000 +0000
+--- info/filesys.h.orig	2014-12-29 11:29:54.000000000 +0000
 +++ info/filesys.h
-@@ -78,7 +78,7 @@ extern int is_dir_name (char *filename);
+@@ -68,7 +68,7 @@ extern int is_dir_name (char *filename);
  
  /* The default value of INFOPATH. */
  #if !defined (DEFAULT_INFOPATH)
--#  define DEFAULT_INFOPATH ".:PATH:/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 "PATH:/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 ":PATH:/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 */
  
diff --git a/devel/gtexinfo/patches/patch-util_texi2dvi b/devel/gtexinfo/patches/patch-util_texi2dvi
index a72a0d75982..e4aa6196b03 100644
--- a/devel/gtexinfo/patches/patch-util_texi2dvi
+++ b/devel/gtexinfo/patches/patch-util_texi2dvi
@@ -1,12 +1,10 @@
-$NetBSD: patch-util_texi2dvi,v 1.4 2014/07/17 12:56:23 ryoon Exp $
+$NetBSD: patch-util_texi2dvi,v 1.5 2015/06/30 11:00:33 ryoon Exp $
 
 As indicated in pkg/48075, pdksh doesn't support double-parens
 if not containing an arithmetic expression of a particular form.
 Older bash and ast-ksh apparently also had problems with this.
 
-Second part: fix PR pkg/48075. This should work with pdksh.
- 
---- util/texi2dvi.orig	2013-09-26 23:04:02.000000000 +0000
+--- util/texi2dvi.orig	2015-06-26 12:49:37.000000000 +0000
 +++ util/texi2dvi
 @@ -25,10 +25,10 @@
  # If possible, please send a copy of the output of the script called with
@@ -23,12 +21,3 @@ Second part: fix PR pkg/48075. This should work with pdksh.
  
  # No failure shall remain unpunished.
  set -e
-@@ -1103,7 +1103,7 @@ run_bibtex ()
-   # bibtex would never be run.
-   if test -r "$in_noext.aux" \
-      && test -r "$in_noext.log" \
--     && ((grep 'Warning:.*Citation.*undefined' "$in_noext.log" \
-+     && ( (grep 'Warning:.*Citation.*undefined' "$in_noext.log" \
-           || grep '.*Undefined citation' "$in_noext.log" \
-           || grep 'No file .*\.bbl\.' "$in_noext.log") \
-           || (grep 'No \.aux file' "$in_noext.log" \