Convert to USE_NEW_TEXINFO.

6 files changed, 23 insertions, 12 deletions

diff --git a/devel/libtool-info/Makefile b/devel/libtool-info/Makefile
index 145faf6fa7b..a099a39914e 100644
--- a/devel/libtool-info/Makefile
+++ b/devel/libtool-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/04/17 13:24:24 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/06/23 11:29:27 seb Exp $
 #
 
 .include "../libtool/Makefile.common"
@@ -10,7 +10,9 @@ COMMENT=	Generic shared library support script - info pages
 
 CONFLICTS+=	libtool<1.3.5nb11
 
-TEXINFO_OVERRIDE=	YES
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=	YES
+INFO_FILES=	libtool.info
 
 # It seems the info-files distributed with libtool 1.3.5 are broken.
 # To test, type "info libtool|" and hold down space. See it stop with a
@@ -25,5 +27,4 @@ do-build:
 do-install:
 	cd ${WRKSRC}/doc ; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libtool-info/PLIST b/devel/libtool-info/PLIST
index 23fdc68a7a5..2fb5055453b 100644
--- a/devel/libtool-info/PLIST
+++ b/devel/libtool-info/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 16:42:27 seb Exp $
-@unexec ${INSTALL_INFO} --delete %D/info/libtool.info %D/info/dir
+@comment $NetBSD: PLIST,v 1.3 2003/06/23 11:29:28 seb Exp $
 info/libtool.info
 info/libtool.info-1
 info/libtool.info-2
 info/libtool.info-3
 info/libtool.info-4
 info/libtool.info-5
-@exec ${INSTALL_INFO} %D/info/libtool.info %D/info/dir
diff --git a/devel/nana/Makefile b/devel/nana/Makefile
index d3bbc827059..84ccc81af39 100644
--- a/devel/nana/Makefile
+++ b/devel/nana/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:14 seb Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/23 11:32:00 seb Exp $
 
 DISTNAME=	nana-2.4
 CATEGORIES=	devel
@@ -9,6 +9,7 @@ HOMEPAGE=	http://www.cs.ntu.edu.au/homepages/pjm/nana-home/
 COMMENT=	improved support for assertions and logging in C and C++
 
 GNU_CONFIGURE=	yes
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	nana.info
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nana/PLIST b/devel/nana/PLIST
index b6a372fa4c0..1aa607c3a48 100644
--- a/devel/nana/PLIST
+++ b/devel/nana/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:14 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/06/23 11:32:00 seb Exp $
 bin/nana
 bin/nana-c++lg
 bin/nana-clg
@@ -23,12 +23,10 @@ include/nana-config.h
 include/nana.h
 include/nana_error.h
 include/now.h
-@unexec	${INSTALL_INFO} --delete %D/info/nana.info %D/info/dir
 info/nana.info
 info/nana.info-1
 info/nana.info-2
 info/nana.info-3
-@exec	${INSTALL_INFO} %D/info/nana.info %D/info/dir
 lib/libnana.a
 libexec/nana-trace.gdb
 libexec/nanafilter
diff --git a/devel/nana/distinfo b/devel/nana/distinfo
index ed2d57448d0..b88eed9e9f1 100644
--- a/devel/nana/distinfo
+++ b/devel/nana/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:31 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/06/23 11:32:01 seb Exp $
 
 SHA1 (nana-2.4.tar.gz) = a1679889fe43da2d25e70974ace6d1f2a44568e0
 Size (nana-2.4.tar.gz) = 345014 bytes
+SHA1 (patch-aa) = e16c34a228037451fba97f8fc653f9b9000149c0
diff --git a/devel/nana/patches/patch-aa b/devel/nana/patches/patch-aa
new file mode 100644
index 00000000000..566b881ec12
--- /dev/null
+++ b/devel/nana/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2003/06/23 11:32:02 seb Exp $
+
+--- doc/Makefile.in.orig	1999-05-03 10:29:55.000000000 +0000
++++ doc/Makefile.in
+@@ -73,7 +73,6 @@ FIND = @FIND@
+ FMT = @FMT@
+ GDB = @GDB@
+ HAVE_RDTSC = @HAVE_RDTSC@
+-MAKEINFO = @MAKEINFO@
+ PACKAGE = @PACKAGE@
+ PREV_VERSION = @PREV_VERSION@
+ RANLIB = @RANLIB@