Update to 4.7:

4.7 (9 April 2004)
* Language:
  . new commands @float, @caption, @shortcaption, @listoffloats for
    initial implementation of floating material (figures, tables, etc).
    Ironically, they do not yet actually float anywhere.
  . new commands @docbook, @ifdocbook, @ifnotdocbook for conditional Docbook.
  . new commands @ordf{} and @ordm{} for Spanish feminine/masculine ordinals.
  . new commands @deftypecv[x] for class variables in typed OO languages.
  . new command @registeredsymbol for the r-in-a-circle symbol.
  . new command @headitem to make a heading row in @multitable.
  . new command @LaTeX{} for the LaTeX logo.
  . new command @comma{} to avoid comma-parsing problems.
  . @url is now a synonym for @uref; new command @indicateurl has the
    old meaning of just displaying a url as text.
  . @quotation now accepts an optional argument for labelling the text
      as a `Note', `Tip', etc.
  . @defun (et al.) heading lines can now be continued with a lone @.
  . @acronym accepts an optional argument for the meaning of the acronym.
* makeinfo:
  . New environment variable TEXINFO_OUTPUT_FORMAT determines the output
    format at runtime, if no options are specified.
  . New option --plaintext, equivalent to --no-headers with Info output.
  . All outputs:
    - sections are numbered by default.
  . Info output:
    - punctuation is inserted after @pxref and @ref, if needed to make
      cross-references valid.
    - line numbers included in index menus, so Info readers can go to
      the exact line of an entry, not just a node.  Also in plaintext output.
    - ^@^H[index^@^H] cookie included in index menus, so Info readers
      can handle the ] etc. commands better.
  . HTML output:
    - new algorithm for cross-references to other manuals, for maximum
      portability and stability.
    - include node name in <title> with split output.
    - @multicolumn fractions become percentages.
    - entities used for bullets, quotes, dashes, and others.
    - index entries are links to the exact locations.
    - <h4> and <h5> used for @sub and @subsubsections again.
    - accented dotless i supported.
  . XML output: many new tags and structure to preserve more source features.
  . Docbook output:
    - upgraded DTD to Docbook XML 4.2, no longer using Docbook SGML.
    - improved translation in general, for instance:
    - line annotations and marked quotations.
* texi2dvi:
  . if available, use etex (pdfetex if --pdf) by default.
  . if the input file includes thumbpdf.sty (for LaTeX), then run thumbpdf.
  . more output if --debug.
* texinfo.tex:
  . @defun names are now printed in typewriter (instead of bold), and
    within the arguments, @var text is printed in slanted typewriter.
  . @tex code is executed inside a TeX group, so that any changes must
    be prefixed with \global (or the equivalent) to be effective.  (This
    change was actually made years ago, but never made it into the NEWS.)
* info:
  . new option --where (aka --location, -w) to report where an Info file
    would be found, instead of reading it.
  . by default, output ANSI terminal escape sequences as-is; new option
    --no-raw-escapes overrides this.
  . use the newly-generated index line numbers.
* Distribution:
  . new script gendocs.sh (not installed), for use by GNU maintainers in
    getting their manuals on the GNU web site.  Documented in
    maintain.texi (http://www.gnu.org/prep/maintain_toc.html).
  . Most code uses ANSI C prototypes, to some extent.
  . New translation: nb.
  . automake 1.8.3, autoconf 2.59, gettext 0.14.1.

9 files changed, 38 insertions, 36 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index ac555ca019b..e7c3f533a7a 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2004/05/08 02:50:03 reed Exp $
+# $NetBSD: Makefile,v 1.53 2004/07/04 23:17:59 wiz Exp $
 
-DISTNAME=		texinfo-4.6
+DISTNAME=		texinfo-4.7
 PKGNAME=		g${DISTNAME}
-PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=texinfo/}
 EXTRACT_SUFX=		.tar.bz2
@@ -14,6 +13,7 @@ COMMENT=		GNU info file manipulation utilities
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 INFO_FILES=		info-stnd.info info.info texinfo
 TEST_TARGET=		check
diff --git a/devel/gtexinfo/PLIST b/devel/gtexinfo/PLIST
index 52d7657aea5..bd13d344563 100644
--- a/devel/gtexinfo/PLIST
+++ b/devel/gtexinfo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/04/24 19:47:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/07/04 23:17:59 wiz Exp $
 bin/info
 bin/infokey
 bin/install-info
@@ -6,12 +6,14 @@ bin/makeinfo
 bin/texi2dvi
 bin/texindex
 man/man1/info.1
+man/man1/infokey.1
 man/man1/install-info.1
 man/man1/makeinfo.1
 man/man1/texi2dvi.1
 man/man1/texindex.1
 man/man5/info.5
 man/man5/texinfo.5
+share/texinfo/texinfo.cat
 share/texinfo/texinfo.dtd
 share/texinfo/texinfo.xsl
 @dirrm share/texinfo
diff --git a/devel/gtexinfo/PLIST.locale b/devel/gtexinfo/PLIST.locale
index e944b746c52..c2fad1ff008 100644
--- a/devel/gtexinfo/PLIST.locale
+++ b/devel/gtexinfo/PLIST.locale
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.locale,v 1.1 2004/04/24 19:47:44 jlam Exp $
+@comment $NetBSD: PLIST.locale,v 1.2 2004/07/04 23:17:59 wiz Exp $
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/texinfo.mo
@@ -8,8 +8,10 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/texinfo.mo
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index 54b9e7e8b34..321ebea9e24 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.16 2004/04/02 02:01:34 jlam Exp $
+$NetBSD: distinfo,v 1.17 2004/07/04 23:17:59 wiz Exp $
 
-SHA1 (texinfo-4.6.tar.bz2) = 52103579a90d49229fb30968bbe4e55a502857d3
-Size (texinfo-4.6.tar.bz2) = 1348113 bytes
-SHA1 (patch-ab) = d48b65a04dd6b93143e49ce49d93338463f4301d
-SHA1 (patch-ac) = f4e45e38fe42f38db52b4fe33d918f104ba1de05
-SHA1 (patch-ad) = 1c998cdb8b0831e15eef7df6c4f8ef108455619e
-SHA1 (patch-ai) = 8a1e92497d3a6cd5dec50ec9e9cf35046d214c8c
-SHA1 (patch-aj) = ccd515134e442e2ed5354c8151ed3dc8a3efaecd
-SHA1 (patch-ak) = 54fceadde7649726f1595b2a9dda8225967c0a4a
+SHA1 (texinfo-4.7.tar.bz2) = c0e7d2d40b4fa12278fd1da4fd57159289799504
+Size (texinfo-4.7.tar.bz2) = 1418717 bytes
+SHA1 (patch-ab) = c07560dfd7a64aa2202c02f18f47861a993729a0
+SHA1 (patch-ac) = 01baf8634edcecab0b5edaeddf1e38811cab490d
+SHA1 (patch-ad) = c5c3374322eb8a2c8dfc7871971b73194ab1b14c
+SHA1 (patch-aj) = f827226cf8099e98f3359012d46cd53b8b724da4
+SHA1 (patch-ak) = 17a14166581dcdd7605cea1cab41f3231b0ffb0f
diff --git a/devel/gtexinfo/patches/patch-ab b/devel/gtexinfo/patches/patch-ab
index 0a571104185..8736c59cf61 100644
--- a/devel/gtexinfo/patches/patch-ab
+++ b/devel/gtexinfo/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2004/04/02 02:01:34 jlam Exp $
+$NetBSD: patch-ab,v 1.9 2004/07/04 23:17:59 wiz Exp $
 
---- info/Makefile.in.orig	Tue Jun 10 16:51:39 2003
+--- info/Makefile.in.orig	2004-04-09 23:25:01.000000000 +0200
 +++ info/Makefile.in
-@@ -66,7 +66,7 @@ CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
+@@ -147,7 +147,7 @@ CPPFLAGS = @CPPFLAGS@
  CYGPATH_W = @CYGPATH_W@
  DATADIRNAME = @DATADIRNAME@
--DEFS = @DEFS@ -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\"
-+DEFS = @DEFS@ -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" -DPKGSRC_INFOPATH=\"$(PKGSRC_INFOPATH)\"
+ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \
+-	-DINFODIR2=\"$(infodir2)\"
++	-DINFODIR2=\"$(infodir2)\" -DPKGSRC_INFOPATH=\"$(PKGSRC_INFOPATH)\"
+ 
  DEPDIR = @DEPDIR@
  ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
diff --git a/devel/gtexinfo/patches/patch-ac b/devel/gtexinfo/patches/patch-ac
index 17ae7c95504..1cd848ab23f 100644
--- a/devel/gtexinfo/patches/patch-ac
+++ b/devel/gtexinfo/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2004/04/02 02:01:34 jlam Exp $
+$NetBSD: patch-ac,v 1.9 2004/07/04 23:17:59 wiz Exp $
 
---- info/filesys.h.orig	Wed Jul 22 00:25:44 1998
+--- info/filesys.h.orig	2004-03-14 01:57:29.000000000 +0100
 +++ info/filesys.h
-@@ -76,7 +76,7 @@
+@@ -78,7 +78,7 @@ extern int is_dir_name (char *filename);
  
  /* The default value of INFOPATH. */
  #if !defined (DEFAULT_INFOPATH)
diff --git a/devel/gtexinfo/patches/patch-ad b/devel/gtexinfo/patches/patch-ad
index 13715ae07d3..421d90bf11c 100644
--- a/devel/gtexinfo/patches/patch-ad
+++ b/devel/gtexinfo/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.6 2002/10/03 02:06:32 seb Exp $
+$NetBSD: patch-ad,v 1.7 2004/07/04 23:17:59 wiz Exp $
 
---- info/terminal.c.orig	Sat Nov 17 00:16:04 2001
+--- info/terminal.c.orig	2004-03-27 16:35:55.000000000 +0100
 +++ info/terminal.c
 @@ -31,13 +31,17 @@
  #ifdef HAVE_NCURSES_TERMCAP_H
@@ -21,17 +21,16 @@ $NetBSD: patch-ad,v 1.6 2002/10/03 02:06:32 seb Exp $
  /* Termcap requires these variables, whether we access them or not. */
  char *BC, *UP;
  char PC;      /* Pad character */
-@@ -115,12 +119,18 @@
+@@ -112,11 +116,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.  */
 +#ifdef __NetBSD__
-+void
++static void
 +#else
  static int
 +#endif
- output_character_function (c)
-      int c;
+ output_character_function (int c)
  {
    putc (c, stdout);
 +#ifndef __NetBSD__
diff --git a/devel/gtexinfo/patches/patch-aj b/devel/gtexinfo/patches/patch-aj
index 1dd93875d40..0dff6c914a6 100644
--- a/devel/gtexinfo/patches/patch-aj
+++ b/devel/gtexinfo/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.3 2003/07/09 13:11:02 grant Exp $
+$NetBSD: patch-aj,v 1.4 2004/07/04 23:17:59 wiz Exp $
 
---- configure.ac.orig	Wed Jun 11 06:50:03 2003
+--- configure.ac.orig	2004-04-09 23:21:56.000000000 +0200
 +++ configure.ac
-@@ -77,7 +77,7 @@ AC_CANONICAL_BUILD
+@@ -83,7 +83,7 @@ AC_CANONICAL_BUILD
  # 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 3cf9e4e5eb9..68901773ce0 100644
--- a/devel/gtexinfo/patches/patch-ak
+++ b/devel/gtexinfo/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2003/07/09 13:11:02 grant Exp $
+$NetBSD: patch-ak,v 1.2 2004/07/04 23:17:59 wiz Exp $
 
---- configure.orig	Wed Jun 11 06:51:21 2003
+--- configure.orig	2004-04-09 23:25:03.000000000 +0200
 +++ configure
-@@ -6214,7 +6214,7 @@ build_os=`echo $ac_cv_build | sed 's/^\(
+@@ -6317,7 +6317,7 @@ build_os=`echo $ac_cv_build | sed 's/^\(
  # rather ncurses.  So we check for it.
  TERMLIBS=
  # Check for termlib before termcap because Solaris termcap needs libucb.