Convert to USE_NEW_TEXINFO.

6 files changed, 9 insertions, 15 deletions

diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index 89e2a4848e9..1fef6740c70 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/06/05 05:03:58 uebayasi Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/05 14:50:17 seb Exp $
 
 DISTNAME=		guile-1.4.1
 PKGNAME=		guile14-1.4.1
@@ -22,6 +22,7 @@ LIBTOOL_OVERRIDE+=	${WRKSRC}/libltdl/libtool
 
 USE_GNU_READLINE=	YES
 
+USE_NEW_TEXINFO=	YES
 INFO_FILES=		guile.info
 
 # Link the native thread so that Guile processes won't die when libpthread.so
@@ -32,7 +33,6 @@ CFLAGS+=		${PTHREAD_CFLAGS}
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX=			${LOCALBASE}/guile/1.4
diff --git a/lang/guile14/PLIST b/lang/guile14/PLIST
index d41aab56eaa..a01b87b1c67 100644
--- a/lang/guile14/PLIST
+++ b/lang/guile14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/07 00:58:28 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/05 14:50:17 seb Exp $
 bin/guile
 bin/guile-config
 bin/guile-snarf
@@ -89,11 +89,9 @@ include/libguile/vectors.h
 include/libguile/version.h
 include/libguile/vports.h
 include/libguile/weaks.h
-@unexec ${INSTALL_INFO} --delete %D/info/guile.info %D/info/dir
 info/guile.info
 info/guile.info-1
 info/guile.info-2
-@exec ${INSTALL_INFO} %D/info/guile.info %D/info/dir
 lib/libguile.a
 lib/libguile.la
 lib/libguile.so
diff --git a/lang/inform/Makefile b/lang/inform/Makefile
index 7a61d96408d..892941a8e4a 100644
--- a/lang/inform/Makefile
+++ b/lang/inform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:25 seb Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/05 14:56:24 seb Exp $
 
 DISTNAME=	inform-6.21.2
 CATEGORIES=	lang
@@ -12,7 +12,7 @@ LICENSE=	no-profit
 
 GNU_CONFIGURE=	yes
 
+USE_NEW_TEXINFO=	YES
 INFO_FILES=	inform
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/inform/PLIST b/lang/inform/PLIST
index a3a3291d27f..fbd4d3c24de 100644
--- a/lang/inform/PLIST
+++ b/lang/inform/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:25 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/07/05 14:56:24 seb Exp $
 bin/inform
 bin/inform-6.21
-@unexec ${INSTALL_INFO} --delete %D/info/inform %D/info/dir
 info/inform
 info/inform-1
 info/inform-2
@@ -17,7 +16,6 @@ info/inform-11
 info/inform-12
 info/inform-13
 info/inform-14
-@exec ${INSTALL_INFO} %D/info/inform %D/info/dir
 share/inform/6.21/module/parserm.m5
 share/inform/6.21/module/verblibm.m5
 share/inform/6.21/module/english.h
diff --git a/lang/ja-gawk/Makefile b/lang/ja-gawk/Makefile
index 6c1c98b21c3..7cd5466d208 100644
--- a/lang/ja-gawk/Makefile
+++ b/lang/ja-gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:45 seb Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/05 15:06:09 seb Exp $
 # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
 
 DISTNAME=	gawk-3.0.4
@@ -14,6 +14,7 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/gawk/gawk.html
 COMMENT=	GNU awk + multi-byte extension
 
+USE_NEW_TEXINFO=	YES
 INFO_FILES=	gawk.info
 
 GNU_CONFIGURE=	yes
@@ -23,5 +24,4 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/ja-gawk
 	@${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-gawk
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ja-gawk/PLIST b/lang/ja-gawk/PLIST
index ae4778161e3..e8737ba805c 100644
--- a/lang/ja-gawk/PLIST
+++ b/lang/ja-gawk/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:45 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/05 15:06:09 seb Exp $
 bin/jgawk
 bin/jigawk
-@unexec ${INSTALL_INFO} --delete %D/info/gawk.info %D/info/dir
 info/gawk.info
-@exec ${INSTALL_INFO} %D/info/gawk.info %D/info/dir
 libexec/awk/grcat
 libexec/awk/pwcat
 man/man1/jgawk.1