Update to version 4.2: lots of new features, see below.

buildlink1 -> buildlink2.

Changes:

*** IMPORTANT NEWS FOR ALL AUTHORS OF TEXINFO MANUALS ***

As of version 4.2, Texinfo has a new command @copying to define the
copyright and copying permissions for a manual.  It's important to
switch to using it as soon as possible (as in your next release),
because the historical method of doing copyright permissions using
@ifinfo failed to output copyright information in the HTML (or XML)
formats.  The manual has detailed explanations and examples.  For
convenience, here's a url to one of the relevant sections:
  http://texinfo.org/manual/Document-Permissions.html

4.2 (1 April 2002)
* Language:
  . new command @copying to define copying permissions.  See above.
  . new conditionals @ifplaintext, @ifnotplaintext for the plain text
    (--no-headers) output format.
  . new command @\ to produce literal \ inside @math, since \ by itself
    no longer works.
* makeinfo:
  . emit accesskey attributes for keyboard shortcuts to menu items.
  . @{even,every,odd}{footing,header} are ignored by makeinfo now, so
    they no longer need to be enclosed in @iftex.
* texinfo.tex:
  . bug fix for pdf-format table of contents.
* info:
  . bug fixes for -R (--raw-escapes).
  . --help shows short option names.
* Distribution:
  . the doc.c, funs.h, and key.c files in info/ are no longer generated
    at make time, to appease Automake's make distcheck.
  . gettext 0.11.1, autoconf 2.53, automake 1.6 (with install-info kludge).

4.1 (4 March 2002)
* Language:
  . new commands @verbatim and @verb for printing verbatim inserts.
  . new command @verbatiminclude for verbatim include of files.
  . new environment @documentdescription for defining the HTML description.
  . new command @afivepaper for the A5 paper size.
* makeinfo:
  . supports xml and docbook output.
  . supports HTML splitting by node, which is now the default.
  . new option --split-size to control maximum size of split info files.
* info:
  . user-specified key bindings supported.
  . ANSI escape sequences (as produced by groff) removed from man output
    by default; use --raw-escapes to let them through if your terminal
    supports them.
* texinfo.tex:
  . @math implies @tex, so all the usual plain TeX math is supported.
  . smaller fonts for @smallexample, in all page sizes.
  . improvements in the PDF support.
* texi2dvi:
  . new option -o to explicitly specify output filename.
* Distribution:
  . switch to GNU Free Documentation License (http://www.gnu.org/copyleft/).
  . update to GNU gettext 0.11, autoconf 2.52, and automake 1.5.
  . Danish, Swedish, and Hebrew message translations.

1 files changed, 10 insertions, 13 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index 92c53b8534b..6808bab43c6 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2002/08/10 23:22:02 rh Exp $
+# $NetBSD: Makefile,v 1.29 2002/10/03 02:06:31 seb Exp $
 #
 
-DISTNAME=		texinfo-4.0
+DISTNAME=		texinfo-4.2
 PKGNAME=		g${DISTNAME}
-PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=texinfo/}
 
@@ -11,13 +10,14 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/texinfo/texinfo.html
 COMMENT=		GNU info file manipulation utilities
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
+USE_GNU_GETTEXT=	yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-catgets
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-
-.include "../../devel/zlib/buildlink.mk"
+AUTOMAKE_PATTERNS+=	configure.ac
+AUTOMAKE_PATTERNS+=	config.in
 
 INSTALL_INFO=	${PREFIX}/bin/install-info
 
@@ -29,9 +29,6 @@ post-patch:
 		< ${WRKSRC}/info/filesys.h.orig		\
 		> ${WRKSRC}/info/filesys.h
 
-post-install:
-	${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/texinfo
-	${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/info.info
-	${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/info-stnd.info
-
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"