From 331973aa91c77c40738df4149b9fc6c20cccacc6 Mon Sep 17 00:00:00 2001
From: seb <seb@pkgsrc.org>
Date: Mon, 23 Jun 2003 10:57:27 +0000
Subject: Convert to USE_NEW_TEXINFO.

---
 devel/gettext/Makefile | 5 ++---
 devel/gettext/PLIST    | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'devel/gettext')

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
-- 
cgit v1.2.3