Convert to USE_NEW_TEXINFO.

4 files changed, 10 insertions, 19 deletions

diff --git a/sysutils/cfengine2-doc/Makefile b/sysutils/cfengine2-doc/Makefile
index cb7d2ec06b5..0a88a5229f3 100644
--- a/sysutils/cfengine2-doc/Makefile
+++ b/sysutils/cfengine2-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/03/28 21:14:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/08/05 13:51:21 seb Exp $
 #
 
 PKGNAME=	cfengine-doc-${CFENGINE_VERSION}
@@ -9,6 +9,9 @@ COMMENT=	Documentation for cfengine
 
 NO_CONFIGURE=   yes
 NO_BUILD=       yes
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	cfengine-Reference.info cfengine-Tutorial.info
+INFO_FILES+=	cfengine-Anomalies.info
 
 do-install:
 	${INSTALL_MAN_DIR} ${PREFIX}/man/man8
@@ -17,10 +20,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/cfengine
 	${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.html ${PREFIX}/share/doc/html/cfengine
 
-post-install:
-	${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/cfengine-Reference.info
-	${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/cfengine-Tutorial.info
-	${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/cfengine-Anomalies.info
-
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cfengine2-doc/PLIST b/sysutils/cfengine2-doc/PLIST
index 7fc141a65a9..b4a31e90e96 100644
--- a/sysutils/cfengine2-doc/PLIST
+++ b/sysutils/cfengine2-doc/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/22 13:08:59 seb Exp $
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cfengine-Anomalies.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cfengine-Reference.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cfengine-Tutorial.info
+@comment $NetBSD: PLIST,v 1.2 2003/08/05 13:51:21 seb Exp $
 info/cfengine-Anomalies.info
 info/cfengine-Reference.info
 info/cfengine-Reference.info-1
@@ -19,9 +16,6 @@ info/cfengine-Tutorial.info-3
 info/cfengine-Tutorial.info-4
 info/cfengine-Tutorial.info-5
 info/cfengine-Tutorial.info-6
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cfengine-Anomalies.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cfengine-Reference.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cfengine-Tutorial.info
 man/man8/cfengine.8
 share/doc/html/cfengine/cfengine-Reference.html
 share/doc/html/cfengine/cfengine-Tutorial.html
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 8a8f2f800bc..fb090fdc37c 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/05 13:59:58 seb Exp $
 
 DISTNAME=	coreutils-5.0
 PKGREVISION=	2
@@ -18,6 +18,9 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PERL5=		build
 
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	coreutils.info
+
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS=		--program-prefix=${GNU_PROGRAM_PREFIX}
@@ -36,5 +39,4 @@ BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/coreutils/PLIST b/sysutils/coreutils/PLIST
index 3c7e6fe99ce..7caef250258 100644
--- a/sysutils/coreutils/PLIST
+++ b/sysutils/coreutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/10 13:18:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/08/05 13:59:58 seb Exp $
 bin/${GNU_PROGRAM_PREFIX}basename
 bin/${GNU_PROGRAM_PREFIX}cat
 bin/${GNU_PROGRAM_PREFIX}chgrp
@@ -88,9 +88,7 @@ bin/${GNU_PROGRAM_PREFIX}wc
 bin/${GNU_PROGRAM_PREFIX}who
 bin/${GNU_PROGRAM_PREFIX}whoami
 bin/${GNU_PROGRAM_PREFIX}yes
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/coreutils.info
 info/coreutils.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/coreutils.info
 @comment belongs to libiconv: lib/charset.alias
 man/man1/${GNU_PROGRAM_PREFIX}basename.1
 man/man1/${GNU_PROGRAM_PREFIX}cat.1