Convert to USE_NEW_TEXINFO.

While here fix a info directory entry in gawk.{texi,info}.

5 files changed, 34 insertions, 8 deletions

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index bd2e81c692b..39ef6e2a164 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/06/07 16:03:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/04 20:57:21 seb Exp $
 # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
 
 DISTNAME=	gawk-3.1.1
@@ -21,6 +21,9 @@ EVAL_PREFIX+=		GETTEXT_PREFIX=gettext
 TEST_DIRS=		${WRKSRC}
 TEST_TARGET=		check
 
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	gawk.info gawkinet.info
+
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 .include "../../mk/bsd.prefs.mk"
@@ -36,5 +39,4 @@ pre-configure:
 		 ${WRKSRC}/po/Makefile.in.in
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST
index 4662d83b5f5..77c25bcb9c9 100644
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,15 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/12 03:17:13 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/04 20:57:21 seb Exp $
 bin/gawk
 bin/${PKGNAME}
 bin/igawk
 bin/pgawk
 bin/p${PKGNAME}
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gawk.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gawkinet.info
 info/gawk.info
 info/gawkinet.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gawk.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gawkinet.info
 libexec/awk/grcat
 libexec/awk/pwcat
 man/man1/gawk.1
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index cd9535fdc40..eef5612b280 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2003/06/07 16:03:05 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2003/07/04 20:57:22 seb Exp $
 
 SHA1 (gawk-3.1.1.tar.gz) = 0cdfff32cebd43519dc6027424b74439d98cc5db
 Size (gawk-3.1.1.tar.gz) = 1875134 bytes
@@ -8,3 +8,5 @@ SHA1 (patch-ac) = 5bc12ac7dbf7cbd1d5fd70ffde78e42074069468
 SHA1 (patch-ad) = 81ed27305a80da999fa47c3287f6a4a49f189f25
 SHA1 (patch-ae) = 654beb3821050557102dfd6236ae663ee0fe9082
 SHA1 (patch-af) = dac29f99def7a70f17aaeb1cb3662ce48008755c
+SHA1 (patch-ag) = da832e4c992f7cd97dd30aa450eafac1e98c482a
+SHA1 (patch-ah) = 2071627abc6a57eb5ebb866525c642c270681d5b
diff --git a/lang/gawk/patches/patch-ag b/lang/gawk/patches/patch-ag
new file mode 100644
index 00000000000..bbd02c800c3
--- /dev/null
+++ b/lang/gawk/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2003/07/04 20:57:22 seb Exp $
+
+--- doc/gawk.texi.orig	2002-04-22 11:26:20.000000000 +0000
++++ doc/gawk.texi
+@@ -10,7 +10,7 @@
+ @end direntry
+ @dircategory Individual utilities
+ @direntry
+-* awk: (gawk)Invoking gawk.           Text scanning and processing.
++* awk: (gawk)Invoking Gawk.           Text scanning and processing.
+ @end direntry
+ 
+ @c @set xref-automatic-section-title
diff --git a/lang/gawk/patches/patch-ah b/lang/gawk/patches/patch-ah
new file mode 100644
index 00000000000..e57bbafdf58
--- /dev/null
+++ b/lang/gawk/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2003/07/04 20:57:23 seb Exp $
+
+--- doc/gawk.info.orig	2002-04-22 11:42:48.000000000 +0000
++++ doc/gawk.info
+@@ -6,7 +6,7 @@ START-INFO-DIR-ENTRY
+ END-INFO-DIR-ENTRY
+ INFO-DIR-SECTION Individual utilities
+ START-INFO-DIR-ENTRY
+-* awk: (gawk)Invoking gawk.           Text scanning and processing.
++* awk: (gawk)Invoking Gawk.           Text scanning and processing.
+ END-INFO-DIR-ENTRY
+ 
+ Copyright (C) 1989, 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000,