Convert to USE_NEW_TEXINFO.

4 files changed, 6 insertions, 14 deletions

diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index efe6a2d7872..bf724dad272 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/06/02 01:20:15 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2003/06/25 11:32:38 seb Exp $
 #
 
 DISTNAME=	readline-4.3
@@ -16,7 +16,7 @@ USE_LIBTOOL=		# defined
 ALL_TARGET=		all-la
 INSTALL_TARGET=		install-la
 
+USE_NEW_TEXINFO=	YES
 INFO_FILES=		readline.info history.info rluserman.info
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/readline/PLIST b/devel/readline/PLIST
index 0df4f755a1b..aeeaa02fdc3 100644
--- a/devel/readline/PLIST
+++ b/devel/readline/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/07 17:39:47 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/25 11:32:38 seb Exp $
 include/readline/chardefs.h
 include/readline/history.h
 include/readline/keymaps.h
@@ -7,15 +7,9 @@ include/readline/rlconf.h
 include/readline/rlstdc.h
 include/readline/rltypedefs.h
 include/readline/tilde.h
-@unexec ${INSTALL_INFO} --delete %D/info/history.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/readline.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/rluserman.info %D/info/dir
 info/history.info
 info/readline.info
 info/rluserman.info
-@exec ${INSTALL_INFO} %D/info/history.info %D/info/dir
-@exec ${INSTALL_INFO} %D/info/readline.info %D/info/dir
-@exec ${INSTALL_INFO} %D/info/rluserman.info %D/info/dir
 lib/libhistory.a
 lib/libhistory.la
 lib/libhistory.so
diff --git a/devel/rx/Makefile b/devel/rx/Makefile
index e4d834f2900..91672c6e299 100644
--- a/devel/rx/Makefile
+++ b/devel/rx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/11/23 22:24:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/06/25 11:41:05 seb Exp $
 
 DISTNAME=	rx-1.5
 CATEGORIES=	devel
@@ -13,6 +13,7 @@ USE_BUILDLINK2=	# defined
 USE_LIBTOOL=	# defined
 GNU_CONFIGURE=	# defined
 
+USE_NEW_TEXINFO=	YES
 INFO_FILES=	rx.info
 
 # When the API changes and breaks binary-compatibility with the previous
@@ -26,5 +27,4 @@ MAKE_ENV+=	RX_MAJOR="${RX_MAJOR}" RX_MINOR="${RX_MINOR}"
 post-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rx/PLIST b/devel/rx/PLIST
index c90e072c04a..8a69b54c88c 100644
--- a/devel/rx/PLIST
+++ b/devel/rx/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:15 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/06/25 11:41:05 seb Exp $
 include/rxposix.h
-@unexec	${INSTALL_INFO} --delete	%D/info/rx.info %D/info/dir
 info/rx.info
-@exec	${INSTALL_INFO}		%D/info/rx.info %D/info/dir
 lib/librx.a
 lib/librx.la
 lib/librx.so