Convert to USE_NEW_TEXINFO.

4 files changed, 9 insertions, 10 deletions

diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile
index 1ca5f46f539..310bf548453 100644
--- a/devel/libg++/Makefile
+++ b/devel/libg++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/06/02 01:20:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.25 2003/06/23 11:23:25 seb Exp $
 #
 
 DISTNAME=	libg++-${GXXVERSION}
@@ -18,6 +18,8 @@ GXXVERSION=	2.8.1.1a
 MAKE_ENV+=	GXXVERSION="${GXXVERSION}" NOPROFILE=1 NOGCCERROR=1
 PLIST_SRC=	${WRKSRC}/.PLIST
 
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=	YES
 INFO_FILES=	libg++.info
 
 do-configure:
@@ -33,5 +35,4 @@ post-install:
 		/bin/ls 2>/dev/null -1d lib/libg++*.a lib/libg++.so*) \
 		>${PLIST_SRC}
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libg++/PLIST.pre b/devel/libg++/PLIST.pre
index 42d394e2060..4459eb7ce44 100644
--- a/devel/libg++/PLIST.pre
+++ b/devel/libg++/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.2 2002/02/18 15:14:13 seb Exp $
+@comment $NetBSD: PLIST.pre,v 1.3 2003/06/23 11:23:25 seb Exp $
 bin/genclass
 include/g++/gen/AVLMap.hP
 include/g++/gen/AVLSet.hP
@@ -172,6 +172,4 @@ include/g++/sysent.h
 include/g++/typemacros.h
 @dirrm include/g++/gen
 @dirrm include/g++
-@unexec ${INSTALL_INFO} --delete %D/info/libg++.info %D/info/dir
 info/libg++.info
-@exec ${INSTALL_INFO} %D/info/libg++.info %D/info/dir
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 5908e38d888..a43f50c5ce5 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2003/06/11 20:50:52 abs Exp $
+# $NetBSD: Makefile,v 1.70 2003/06/23 11:24:13 seb Exp $
 
 DISTNAME=		libgtop-1.0.13
 PKGREVISION=		2
@@ -37,6 +37,9 @@ USE_X11BASE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=		YES
+INFO_FILES=		libgtop.info
 
 # The following flags are for debugging purposes.  They don't need to
 # be used unless you are actively developing/debugging libgtop.
@@ -51,5 +54,4 @@ CONFIGURE_ENV+=		AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgtop/PLIST b/devel/libgtop/PLIST
index 792c9bc46a5..b593647dbd1 100644
--- a/devel/libgtop/PLIST
+++ b/devel/libgtop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/11/04 00:48:32 rh Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/06/23 11:24:13 seb Exp $
 bin/libgtop-config
 bin/libgtop_daemon
 bin/libgtop_server
@@ -46,9 +46,7 @@ include/libgtop-1.0/glibtop/xmalloc.h
 include/libgtop-1.0/glibtop_machine.h
 include/libgtop-1.0/glibtop_server.h
 include/libgtop-1.0/glibtop_suid.h
-@unexec ${INSTALL_INFO} --delete %D/info/libgtop.info %D/info/dir
 info/libgtop.info
-@exec ${INSTALL_INFO} %D/info/libgtop.info %D/info/dir
 lib/libgtop-features.def
 lib/libgtop.a
 lib/libgtop.la