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.

11 files changed, 144 insertions, 160 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"
diff --git a/devel/gtexinfo/PLIST b/devel/gtexinfo/PLIST
index 9acfe92f318..749b6c25a25 100644
--- a/devel/gtexinfo/PLIST
+++ b/devel/gtexinfo/PLIST
@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/05 10:34:52 seb Exp $
-bin/makeinfo
+@comment $NetBSD: PLIST,v 1.4 2002/10/03 02:06:31 seb Exp $
+bin/info
+bin/infokey
 @unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/info-stnd.info
 @unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/info.info
 @unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/texinfo
+bin/install-info
+bin/makeinfo
 bin/texi2dvi
 bin/texindex
-bin/install-info
-bin/info
 info/info-stnd.info
 info/info-stnd.info-1
 info/info-stnd.info-2
+info/info-stnd.info-3
 info/info.info
 info/texinfo
 info/texinfo-1
@@ -17,6 +19,7 @@ info/texinfo-10
 info/texinfo-11
 info/texinfo-12
 info/texinfo-13
+info/texinfo-14
 info/texinfo-2
 info/texinfo-3
 info/texinfo-4
@@ -36,10 +39,19 @@ man/man1/texindex.1
 man/man5/info.5
 man/man5/texinfo.5
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/de_AT/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/texinfo.mo
 ${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/nl/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/texinfo.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/texinfo.mo
+share/texinfo/texinfo.dtd
+share/texinfo/texinfo.xsl
+@dirrm share/texinfo
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index 6a72b1b01b3..05338d0cf61 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.6 2002/08/10 23:22:02 rh Exp $
+$NetBSD: distinfo,v 1.7 2002/10/03 02:06:31 seb Exp $
 
-SHA1 (texinfo-4.0.tar.gz) = 09e944520672fcd8384f7b9fa96a20d9ec2b54c9
-Size (texinfo-4.0.tar.gz) = 1133487 bytes
-SHA1 (patch-aa) = 09fb1b3eb0cd689bd9214e5c5b3c58f76f4d7c4a
-SHA1 (patch-ab) = be452b7e30edf9eae26875422efbe45e3ddc4caf
-SHA1 (patch-ac) = e884e0532808d7915d4730223753c696d398355d
-SHA1 (patch-ad) = 26cd8dca34b816dc8cff224021e818225eedb716
-SHA1 (patch-ae) = 5b81d7eee82a745f297ce890940e99a591512461
-SHA1 (patch-af) = aaf33281da19658906eee6a922397968a200f186
-SHA1 (patch-ag) = 986c7172e0f71f1d107a59e89f0a74330d91cd40
-SHA1 (patch-ah) = 3dd7525fec5f9db2708c59a775a367cbd030c3c4
+SHA1 (texinfo-4.2.tar.gz) = 58666acc8bcf21fe9d546c1ab08adb36a7505a17
+Size (texinfo-4.2.tar.gz) = 1666333 bytes
+SHA1 (patch-aa) = ea0bd5159fe20c0f0cd5b2f98bbaca55e008a854
+SHA1 (patch-ab) = da79ca95ce12ebb31e7bf47a74ef2b000bbe1285
+SHA1 (patch-ac) = bf22fe2b8920c88a357ce9c1202690ed291c5b92
+SHA1 (patch-ad) = 1c998cdb8b0831e15eef7df6c4f8ef108455619e
+SHA1 (patch-ae) = bbbad93c955a9ec4ec007cf8748f63087c164ce1
+SHA1 (patch-af) = 3dbe7d2b5cbe5927be56b318ea87da920536a8d2
+SHA1 (patch-ag) = ae916185ffe264030a958e5bb4d4ed693b36aa74
+SHA1 (patch-ah) = 412510ca940ed4234a0290455e5358a68974442f
 SHA1 (patch-ai) = 8a1e92497d3a6cd5dec50ec9e9cf35046d214c8c
diff --git a/devel/gtexinfo/patches/patch-aa b/devel/gtexinfo/patches/patch-aa
index a031a2f9f5c..0a649565cfb 100644
--- a/devel/gtexinfo/patches/patch-aa
+++ b/devel/gtexinfo/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2001/12/25 14:48:38 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2002/10/03 02:06:32 seb Exp $
 
---- util/Makefile.in.orig	Tue Sep 28 21:40:56 1999
-+++ util/Makefile.in
-@@ -48,7 +48,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- transform = @program_transform_name@
+--- info/Makefile.am.orig	Fri Mar 22 22:26:49 2002
++++ info/Makefile.am
+@@ -18,7 +18,7 @@
+ bin_PROGRAMS = ginfo infokey
+ transform = s/ginfo/info/; @program_transform_name@
  
- NORMAL_INSTALL = :
+-localedir = $(datadir)/locale
++localedir = $(PKGLOCALEDIR)
+ 
+ # -I. for funs.h.
+ # Automake puts -I.. and -I$(srcdir) into DEFS by default, but
diff --git a/devel/gtexinfo/patches/patch-ab b/devel/gtexinfo/patches/patch-ab
index f4b944e069c..2b5fb9d9234 100644
--- a/devel/gtexinfo/patches/patch-ab
+++ b/devel/gtexinfo/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2001/12/25 14:48:38 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2002/10/03 02:06:32 seb Exp $
 
---- info/Makefile.in.orig	Tue Sep 28 21:40:50 1999
+--- info/Makefile.in.orig	Mon Apr  1 16:13:22 2002
 +++ info/Makefile.in
-@@ -97,7 +97,7 @@
- # Automake puts -I.. and -I$(srcdir) into DEFS by default, but
- # we need to override it, so include them ourselves.
- INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
--DEFS = -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
-+DEFS = -DPORTSINFODIR=\"$(prefix)/info\" -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
- LDADD = ../lib/libtxi.a @TERMLIBS@ @INTLLIBS@
+@@ -119,7 +119,7 @@
+ # user-specified name transformations.
+ bin_PROGRAMS = ginfo infokey
+ 
+-localedir = $(datadir)/locale
++localedir = $(PKGLOCALEDIR)
  
- EXTRA_DIST = README pcterm.c
+ # -I. for funs.h.
+ # Automake puts -I.. and -I$(srcdir) into DEFS by default, but
diff --git a/devel/gtexinfo/patches/patch-ac b/devel/gtexinfo/patches/patch-ac
index 578c4b568cb..b87527bf121 100644
--- a/devel/gtexinfo/patches/patch-ac
+++ b/devel/gtexinfo/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2001/12/25 14:48:38 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2002/10/03 02:06:32 seb Exp $
 
 --- info/filesys.h.orig	Wed Jul 22 00:25:44 1998
 +++ info/filesys.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.6 2001/12/25 14:48:38 wiz Exp $
  /* 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 "@PREFIX@/info:@X11BASE@/info:@LOCALBASE@/info:/usr/local/info:/usr/share/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 "@PREFIX@/info:@X11BASE@/info:@LOCALBASE@/info:/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 7aa74bf5d2f..13715ae07d3 100644
--- a/devel/gtexinfo/patches/patch-ad
+++ b/devel/gtexinfo/patches/patch-ad
@@ -1,15 +1,42 @@
-$NetBSD: patch-ad,v 1.5 2002/01/05 18:42:55 tron Exp $
+$NetBSD: patch-ad,v 1.6 2002/10/03 02:06:32 seb Exp $
 
---- po/Makefile.in.in.orig	Thu Mar  4 00:04:29 1999
-+++ po/Makefile.in.in	Sat Jan  5 19:05:40 2002
-@@ -20,8 +20,8 @@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
- localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
--gettextsrcdir = $(prefix)/share/gettext/po
-+gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale
-+gettextsrcdir = $(prefix)/$(PKGLOCALEDIR)/gettext/po
- subdir = po
+--- info/terminal.c.orig	Sat Nov 17 00:16:04 2001
++++ info/terminal.c
+@@ -31,13 +31,17 @@
+ #ifdef HAVE_NCURSES_TERMCAP_H
+ #include <ncurses/termcap.h>
+ #else
+-#ifdef HAVE_TERMCAP_H
++#if defined(HAVE_TERMCAP_H) && !defined(__NetBSD__)
+ #include <termcap.h>
+ #else
+ /* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
+    Unfortunately, PC is a global variable used by the termcap library. */
+ #undef PC
  
- INSTALL = @INSTALL@
++#if defined(__NetBSD__)
++#include <termcap.h>
++#endif
++
+ /* Termcap requires these variables, whether we access them or not. */
+ char *BC, *UP;
+ char PC;      /* Pad character */
+@@ -115,12 +119,18 @@
+ /* 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
++#else
+ static int
++#endif
+ output_character_function (c)
+      int c;
+ {
+   putc (c, stdout);
++#ifndef __NetBSD__
+   return c;
++#endif
+ }
+ 
+ /* Macro to send STRING to the terminal. */
diff --git a/devel/gtexinfo/patches/patch-ae b/devel/gtexinfo/patches/patch-ae
index 63290022c92..5658ea6c472 100644
--- a/devel/gtexinfo/patches/patch-ae
+++ b/devel/gtexinfo/patches/patch-ae
@@ -1,42 +1,13 @@
-$NetBSD: patch-ae,v 1.6 2001/12/25 14:48:39 wiz Exp $
+$NetBSD: patch-ae,v 1.7 2002/10/03 02:06:32 seb Exp $
 
---- info/terminal.c.orig	Mon Sep 20 14:28:54 1999
-+++ info/terminal.c
-@@ -32,13 +32,17 @@
- #ifdef HAVE_NCURSES_TERMCAP_H
- #include <ncurses/termcap.h>
- #else
--#ifdef HAVE_TERMCAP_H
-+#if defined(HAVE_TERMCAP_H) && !defined(__NetBSD__)
- #include <termcap.h>
- #else
- /* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
-    Unfortunately, PC is a global variable used by the termcap library. */
- #undef PC
+--- makeinfo/Makefile.am.orig	Fri Mar  8 20:43:31 2002
++++ makeinfo/Makefile.am
+@@ -12,7 +12,7 @@
  
-+#if defined(__NetBSD__)
-+#include <termcap.h>
-+#endif
-+
- /* Termcap requires these variables, whether we access them or not. */
- char *BC, *UP;
- char PC;      /* Pad character */
-@@ -116,12 +120,18 @@
- /* 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
-+#else
- static int
-+#endif
- output_character_function (c)
-      int c;
- {
-   putc (c, stdout);
-+#ifndef __NetBSD__
-   return c;
-+#endif
- }
+ bin_PROGRAMS = makeinfo
+ 
+-localedir = $(datadir)/locale
++localedir = $(PKGLOCALEDIR)
+ INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+ LDADD = ../lib/libtxi.a @LIBINTL@
  
- /* Macro to send STRING to the terminal. */
diff --git a/devel/gtexinfo/patches/patch-af b/devel/gtexinfo/patches/patch-af
index e6f396cdee5..41ead088343 100644
--- a/devel/gtexinfo/patches/patch-af
+++ b/devel/gtexinfo/patches/patch-af
@@ -1,30 +1,13 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:40:25 agc Exp $
+$NetBSD: patch-af,v 1.3 2002/10/03 02:06:32 seb Exp $
 
---- intl/xopen-msg.sed.orig	Thu Jun 18 13:21:49 1998
-+++ intl/xopen-msg.sed	Thu Jun 18 13:32:08 1998
-@@ -81,6 +81,8 @@
-   G
-   s/^[^\n]*$/& /
-   s/\(.*\)\n\([0-9]*\)/\2 \1/
-+# Change escaped quotes into regular quotes.
-+  s/\\"/"/g
- # Clear flag from last substitution.
-   tb
- # Append the next line.
-@@ -90,12 +92,16 @@
-   s/\(.*\n\)"\(.*\)"/\1\2/
- # Yes, then branch.
-   ta
-+# Comment out if no message exists.
-+  s/^\([0-9]* *\n\)/$ \1/
-   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/
-+# Change escaped quotes into regular quotes.
-+  s/\\"/"/g
-   P
- # We cannot use the sed command `D' here
-   s/.*\n\(.*\)/\1/
+--- makeinfo/Makefile.in.orig	Mon Apr  1 16:13:44 2002
++++ makeinfo/Makefile.in
+@@ -114,7 +114,7 @@
+ 
+ bin_PROGRAMS = makeinfo
+ 
+-localedir = $(datadir)/locale
++localedir = $(PKGLOCALEDIR)
+ INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+ LDADD = ../lib/libtxi.a @LIBINTL@
+ 
diff --git a/devel/gtexinfo/patches/patch-ag b/devel/gtexinfo/patches/patch-ag
index 94fc3af04a2..cfbcf2f13dc 100644
--- a/devel/gtexinfo/patches/patch-ag
+++ b/devel/gtexinfo/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.6 2001/12/25 14:48:39 wiz Exp $
+$NetBSD: patch-ag,v 1.7 2002/10/03 02:06:32 seb Exp $
 
---- configure.orig	Tue Sep 28 21:39:56 1999
-+++ configure
-@@ -4019,7 +4019,7 @@
- 		 USE_INCLUDED_LIBINTL=yes
- 		 CATOBJEXT=.cat
- 		 INSTOBJEXT=.cat
--		 DATADIRNAME=lib
-+		 DATADIRNAME=${PKGLOCALEDIR}
- 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
- 		 INTLLIBS=$INTLDEPS
- 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+--- util/Makefile.am.orig	Fri Mar  8 20:44:13 2002
++++ util/Makefile.am
+@@ -13,7 +13,7 @@
+ bin_PROGRAMS = install-info texindex
+ bin_SCRIPTS = texi2dvi
+ 
+-localedir = $(datadir)/locale
++localedir = $(PKGLOCALEDIR)
+ INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+ LDADD = ../lib/libtxi.a @LIBINTL@
+ 
diff --git a/devel/gtexinfo/patches/patch-ah b/devel/gtexinfo/patches/patch-ah
index 53d3639cdeb..a57f6949f20 100644
--- a/devel/gtexinfo/patches/patch-ah
+++ b/devel/gtexinfo/patches/patch-ah
@@ -1,19 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2002/08/10 23:22:02 rh Exp $
+$NetBSD: patch-ah,v 1.2 2002/10/03 02:06:32 seb Exp $
 
---- lib/system.h.orig	Sun Jul 18 07:11:34 1999
-+++ lib/system.h
-@@ -192,10 +192,10 @@
- struct passwd *getpwnam ();
+--- util/Makefile.in.orig	Mon Apr  1 16:14:18 2002
++++ util/Makefile.in
+@@ -115,7 +115,7 @@
+ bin_PROGRAMS = install-info texindex
+ bin_SCRIPTS = texi2dvi
  
- /* Our library routines not included in any system library.  */
--extern void *xmalloc (), *xrealloc ();
--extern char *xstrdup ();
--extern void xexit ();
--extern char *substring ();
-+extern void *xmalloc (unsigned), *xrealloc (void *, unsigned);
-+extern char *xstrdup (char *);
-+extern void xexit (int);
-+extern char *substring (char *, char *);
+-localedir = $(datadir)/locale
++localedir = $(PKGLOCALEDIR)
+ INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+ LDADD = ../lib/libtxi.a @LIBINTL@
  
- /* For convenience.  */
- #define STREQ(s1,s2) (strcmp (s1, s2) == 0)