From c1aa2b8684af6038fd0f06a40036db7a811d5e24 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Sat, 2 Aug 2003 05:19:57 +0000
Subject: use new texinfo handling. minor whitespace fix.

---
 textproc/grep/Makefile | 12 +++++++-----
 textproc/grep/PLIST    |  4 +---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index 395f7b27052..d30ffe27eb3 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/30 17:00:04 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/02 05:19:57 grant Exp $
 #
 
 DISTNAME=	grep-2.5.1
@@ -11,15 +11,18 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/grep/grep.html
 COMMENT=	GNU grep
 
-USE_BUILDLINK2=         YES
+USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 BUILD_USES_MSGFMT=	YES
-TEXINFO_REQD=		4.0
-
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--disable-perl-regexp
 
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=		YES
+TEXINFO_REQD=		4.0
+INFO_FILES=		grep.info
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GNU_PROGRAM_PREFIX)
@@ -33,5 +36,4 @@ CONFIGURE_SCRIPT=	${SH} ./configure
 .endif
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/grep/PLIST b/textproc/grep/PLIST
index 5cb071a25b0..f91ab00edb9 100644
--- a/textproc/grep/PLIST
+++ b/textproc/grep/PLIST
@@ -1,16 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/25 19:50:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/08/02 05:19:57 grant Exp $
 bin/${GNU_PROGRAM_PREFIX}grep
 bin/${GNU_PROGRAM_PREFIX}egrep
 bin/${GNU_PROGRAM_PREFIX}fgrep
 man/man1/${GNU_PROGRAM_PREFIX}grep.1
 man/man1/${GNU_PROGRAM_PREFIX}fgrep.1
 man/man1/${GNU_PROGRAM_PREFIX}egrep.1
-@unexec ${INSTALL_INFO} --delete %D/info/grep.info %D/info/dir
 info/grep.info
 info/grep.info-1
 info/grep.info-2
 info/grep.info-3
-@exec ${INSTALL_INFO} %D/info/grep.info %D/info/dir
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/grep.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/grep.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/grep.mo
-- 
cgit v1.2.3