Convert to USE_NEW_TEXINFO.

4 files changed, 12 insertions, 29 deletions

diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 8a9bf872adb..bb4d142596d 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 22:54:07 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/08/03 00:30:43 seb Exp $
 # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
 #
 
@@ -57,18 +57,20 @@ USE_PKGINSTALL=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
-TEXINFO_OVERRIDE=	YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=	YES
+INFO_FILES=	eb-ja.info ebfont-ja.info ebfont.info ebinfo-ja.info
+INFO_FILES+=	ebinfo.info ebrefile-ja.info ebrefile.info ebzip-ja.info
+INFO_FILES+=	ebzip.info
+
 CONFIGURE_ARGS+=	--with-zlib
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 CONF_FILES=		${EGDIR}/eb.conf.default ${PKG_SYSCONFDIR}/eb.conf
 
-# For patterns like '... (install-info ...) ...'
-TEXINFO_SUBST_SED+=	-e "s!^\(	.*\)\([ 	'(]\)install-info\([ 	]\)!\1\2${INSTALL_INFO}\3!g"
-
 EB_APPENDIXDIR=	${PREFIX}/share/eb/appendix
 EGDIR=		${PREFIX}/share/examples/eb/
 
@@ -88,5 +90,4 @@ post-install:
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/eb/PLIST b/textproc/eb/PLIST
index 3a8d884d14d..0ef39b5adb6 100644
--- a/textproc/eb/PLIST
+++ b/textproc/eb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/04/13 01:29:15 salo Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/08/03 00:30:43 seb Exp $
 bin/ebappendix
 bin/ebfont
 bin/ebinfo
@@ -14,39 +14,21 @@ include/eb/error.h
 include/eb/font.h
 include/eb/text.h
 include/eb/zio.h
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/eb-ja.info
 info/eb-ja.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/eb-ja.info
 info/eb-ja.info-1
 info/eb-ja.info-2
 info/eb-ja.info-3
 info/eb-ja.info-4
 info/eb-ja.info-5
 info/eb-ja.info-6
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebfont-ja.info
 info/ebfont-ja.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebfont-ja.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebfont.info
 info/ebfont.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebfont.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebinfo-ja.info
 info/ebinfo-ja.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebinfo-ja.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebinfo.info
 info/ebinfo.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebinfo.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebrefile-ja.info
 info/ebrefile-ja.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebrefile-ja.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebrefile.info
 info/ebrefile.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebrefile.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebzip-ja.info
 info/ebzip-ja.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebzip-ja.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebzip.info
 info/ebzip.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebzip.info
 lib/libeb.a
 lib/libeb.la
 lib/libeb.so
diff --git a/textproc/eblook/Makefile b/textproc/eblook/Makefile
index 7c8b6b5f7b7..ee4cae40b7c 100644
--- a/textproc/eblook/Makefile
+++ b/textproc/eblook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:27:31 martti Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/03 00:36:50 seb Exp $
 #
 
 DISTNAME=	eblook-1.5.1
@@ -12,6 +12,8 @@ COMMENT=	Interactive command-line interface for EPWING electric dictionaries
 
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	eblook.info
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../textproc/eb/buildlink2.mk"
diff --git a/textproc/eblook/PLIST b/textproc/eblook/PLIST
index 5c8a1f9ef10..57980704b1b 100644
--- a/textproc/eblook/PLIST
+++ b/textproc/eblook/PLIST
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/12 01:31:02 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/08/03 00:36:51 seb Exp $
 bin/eblook
-@unexec install-info --delete %D/info/eblook.info %D/info/dir
 info/eblook.info
-@exec install-info %D/info/eblook.info %D/info/dir