Convert to USE_NEW_TEXINFO.

16 files changed, 40 insertions, 47 deletions

diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 02818439d31..e55363807ef 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/05/02 11:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/06/23 10:57:27 seb Exp $
 
 DISTNAME=		gcvs-1.0a7
 PKGREVISION=		1
@@ -15,7 +15,9 @@ USE_BUILDLINK2=		yes
 USE_X11=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-TEXINFO_OVERRIDE=	YES
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=		yes
+INFO_FILES=		cvs.info cvsclient.info
 
 CONFIGURE_ARGS+=	--with-tclinclude="${BUILDLINK_PREFIX.tcl}/include" \
 			--with-tcllib="${BUILDLINK_PREFIX.tcl}/lib"
@@ -23,5 +25,4 @@ CONFIGURE_ARGS+=	--with-tclinclude="${BUILDLINK_PREFIX.tcl}/include" \
 .include "../../lang/tcl/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gcvs/PLIST b/devel/gcvs/PLIST
index 87e2a2232dc..0ecae83e730 100644
--- a/devel/gcvs/PLIST
+++ b/devel/gcvs/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:10 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/06/23 10:57:27 seb Exp $
 bin/cvs
 bin/cvsbug
 bin/cvstree
 bin/gcvs
 bin/rcs2log
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cvs.info
 info/cvs.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cvs.info
 info/cvs.info-1
 info/cvs.info-2
 info/cvs.info-3
@@ -16,9 +14,7 @@ info/cvs.info-6
 info/cvs.info-7
 info/cvs.info-8
 info/cvs.info-9
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cvsclient.info
 info/cvsclient.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cvsclient.info
 info/cvsclient.info-1
 info/cvsclient.info-2
 info/cvsclient.info-3
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 419e70e0595..d62a3fc180d 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2003/06/02 01:20:48 jschauma Exp $
+# $NetBSD: Makefile,v 1.47 2003/06/23 10:58:26 seb Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -24,8 +24,8 @@ CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 USE_GNU_GETTEXT=	yes
 CONFIGURE_ARGS+=	--without-included-gettext
 
+USE_NEW_TEXINFO=	YES
 INFO_FILES=		gettext.info
-TEXINFO_OVERRIDE=	YES
 
 CONFIGURE_ENV+=		GCJ= ac_cv_prog_GCJ=
 CONFIGURE_ENV+=		HAVE_GCJ_IN_PATH=
@@ -36,5 +36,4 @@ post-install:
 	cd ${WRKSRC}/intl; ${MAKE_PROGRAM} install-data
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext/PLIST b/devel/gettext/PLIST
index e890f19a284..ed3ebe12db1 100644
--- a/devel/gettext/PLIST
+++ b/devel/gettext/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/04/27 19:18:20 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/06/23 10:58:26 seb Exp $
 bin/autopoint
 bin/gettext
 bin/gettextize
@@ -18,7 +18,6 @@ bin/msgunfmt
 bin/msguniq
 bin/ngettext
 bin/xgettext
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gettext.info
 info/gettext.info
 info/gettext.info-1
 info/gettext.info-10
@@ -30,7 +29,6 @@ info/gettext.info-6
 info/gettext.info-7
 info/gettext.info-8
 info/gettext.info-9
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gettext.info
 lib/gettext/hostname
 lib/gettext/project-id
 lib/gettext/urlget
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index ec47bb5d8b2..00cf8ca8f18 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/06/02 01:20:47 jschauma Exp $
+# $NetBSD: Makefile,v 1.30 2003/06/23 10:59:28 seb Exp $
 #
 
 DISTNAME=	indent-2.2.8a
@@ -15,6 +15,7 @@ USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 USE_PKGLOCALEDIR=	# defined
 
+USE_NEW_TEXINFO=	YES
 INFO_FILES=	indent.info
 
 .include "../../mk/bsd.prefs.mk"
@@ -26,5 +27,4 @@ PLIST_SUBST+=	GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
 BUILD_DEFS+=	GNU_PROGRAM_PREFIX
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gindent/PLIST b/devel/gindent/PLIST
index 8b047f1aca8..f45b3a67d56 100644
--- a/devel/gindent/PLIST
+++ b/devel/gindent/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/23 19:12:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/06/23 10:59:28 seb Exp $
 bin/${GNU_PROGRAM_PREFIX}indent
 bin/${GNU_PROGRAM_PREFIX}texinfo2man
 man/man1/${GNU_PROGRAM_PREFIX}indent.1
-@unexec ${INSTALL_INFO} --delete %D/info/indent.info %D/info/dir
 info/indent.info
-@exec ${INSTALL_INFO} %D/info/indent.info %D/info/dir
 share/doc/indent/indent.html
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/indent.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/indent.mo
diff --git a/devel/global/Makefile b/devel/global/Makefile
index 735014475fc..9aaaf6229a3 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/05/04 23:36:12 seb Exp $
+# $NetBSD: Makefile,v 1.13 2003/06/23 11:00:22 seb Exp $
 #
 
 DISTNAME=	global-4.5
@@ -11,7 +11,8 @@ COMMENT=	Source code tag system including web browser output
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-TEXINFO_OVERRIDE=	YES
+USE_NEW_TEXINFO=	YES
+INFO_FILES=		global.info
 
 LDFLAGS+=	-L../libutil
 MAKE_ENV+=      LIBDIR="${PREFIX}/lib"
@@ -23,5 +24,4 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libdata/lint
 
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/global/PLIST b/devel/global/PLIST
index 6c60e18cf0f..c583997aeaa 100644
--- a/devel/global/PLIST
+++ b/devel/global/PLIST
@@ -1,16 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2003/05/04 23:36:12 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/06/23 11:00:22 seb Exp $
 bin/btreeop
 bin/gctags
 bin/global
 bin/gozilla
 bin/gtags
 bin/htags
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/global.info
 info/global.info
 info/global.info-1
 info/global.info-2
 info/global.info-3
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/global.info
 man/man1/btreeop.1
 man/man1/gctags.1
 man/man1/global.1
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 53adaacded8..67159eec804 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2003/06/02 01:20:46 jschauma Exp $
+# $NetBSD: Makefile,v 1.46 2003/06/23 11:01:39 seb Exp $
 
 DISTNAME=	make-3.80
 PKGNAME=	gmake-3.80
@@ -13,8 +13,10 @@ COMMENT=	GNU version of 'make' utility
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
-TEXINFO_OVERRIDE=	YES
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=		YES
 TEXINFO_REQD=		4.0
+INFO_FILES=		make.info
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -46,5 +48,4 @@ test: build
 		tee ${WRKDIR}/tests.log
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gmake/PLIST b/devel/gmake/PLIST
index 3927d5811e6..30c7738ff11 100644
--- a/devel/gmake/PLIST
+++ b/devel/gmake/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/23 20:30:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/06/23 11:01:39 seb Exp $
 bin/${GNU_PROGRAM_PREFIX}make
 ${GMAKE_LINK}bin/gmake
-@unexec ${INSTALL_INFO} --delete %D/info/make.info %D/info/dir
 info/make.info
 info/make.info-1
 info/make.info-2
@@ -14,7 +13,6 @@ info/make.info-8
 info/make.info-9
 info/make.info-10
 info/make.info-11
-@exec ${INSTALL_INFO} %D/info/make.info %D/info/dir
 man/man1/${GNU_PROGRAM_PREFIX}make.1
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/make.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/make.mo
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 78fb5f3e2d3..421fe85a065 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/02/21 12:25:22 mycroft Exp $
+# $NetBSD: Makefile,v 1.17 2003/06/23 11:02:22 seb Exp $
 #
 
 DISTNAME=		gmp-4.1.2
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	--enable-cxx --without-readline
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 M4=			${PREFIX}/bin/gm4
+USE_NEW_TEXINFO=	YES
 INFO_FILES=		gmp.info
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gmp/PLIST b/devel/gmp/PLIST
index 2751cbae2ba..7987d1eebec 100644
--- a/devel/gmp/PLIST
+++ b/devel/gmp/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2003/02/21 12:25:22 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/06/23 11:02:22 seb Exp $
 include/gmp.h
 include/gmpxx.h
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gmp.info
 info/gmp.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gmp.info
 info/gmp.info-1
 info/gmp.info-2
 info/gmp.info-3
diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index e7e87616710..21886e68735 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/06/02 01:20:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/06/23 11:06:23 seb Exp $
 #
 
 DISTNAME=	gperf-2.7.2
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@netbsd.org
 COMMENT=	GNU perfect hash function generator
 
 GNU_CONFIGURE=	yes
+USE_NEW_TEXINFO=	YES
 INFO_FILES=	gperf.info
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gperf/PLIST b/devel/gperf/PLIST
index cdeeaa6a977..5eea7537d40 100644
--- a/devel/gperf/PLIST
+++ b/devel/gperf/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:12 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/06/23 11:06:23 seb Exp $
 bin/gperf
-@unexec ${INSTALL_INFO} --delete %D/info/gperf.info %D/info/dir
 info/gperf.info
-@exec ${INSTALL_INFO} %D/info/gperf.info %D/info/dir
 man/man1/gperf.1.gz
diff --git a/devel/gperf/distinfo b/devel/gperf/distinfo
index 3f76fd67f1e..572678f819c 100644
--- a/devel/gperf/distinfo
+++ b/devel/gperf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:21 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/06/23 11:06:23 seb Exp $
 
 SHA1 (gperf-2.7.2.tar.gz) = a8a096093d9f94650bac1e90c8c8bccf49529444
 Size (gperf-2.7.2.tar.gz) = 450996 bytes
-SHA1 (patch-aa) = dffce45a5e65e9de150901ed88446d66564a8fc7
+SHA1 (patch-aa) = e54de8ba488ed99601526f8288a48864e59139f6
diff --git a/devel/gperf/patches/patch-aa b/devel/gperf/patches/patch-aa
index 6d3c50f040b..265991c12c2 100644
--- a/devel/gperf/patches/patch-aa
+++ b/devel/gperf/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2000/11/25 03:17:10 mycroft Exp $
+$NetBSD: patch-aa,v 1.4 2003/06/23 11:06:24 seb Exp $
 
---- doc/Makefile.in.orig	Tue Sep 26 11:32:31 2000
-+++ doc/Makefile.in	Sat Nov 25 03:14:35 2000
-@@ -101,15 +101,15 @@
+--- doc/Makefile.in.orig	2000-09-26 11:32:31.000000000 +0000
++++ doc/Makefile.in
+@@ -44,7 +44,6 @@ RM = rm -f
+ TEX = tex
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips -D600
+-MAKEINFO = LANG= LANGUAGE= makeinfo
+ TEXI2HTML = texi2html
+ 
+ # Programs used by "make install":
+@@ -101,15 +100,15 @@ install : all force
  #	$(INSTALL_DATA) $(srcdir)/gperf.dvi $(DESTDIR)$(dvidir)/gperf.dvi
  #	$(MKINSTALLDIRS) $(DESTDIR)$(psdir)
  #	$(INSTALL_DATA) $(srcdir)/gperf.ps $(DESTDIR)$(dvidir)/gperf.ps