Convert to USE_NEW_TEXINFO.

Set the INFO_DIR to pvs/doc/release-notes where the info file
pvs-release-notes.info gets installed.
Patch the info file so install-info finds a section and an entry in it
for the directory file.

4 files changed, 26 insertions, 6 deletions

diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index add8a7a654a..9a0d0a1ea42 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/03/31 20:49:36 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/25 21:01:35 seb Exp $
 #
 
 DISTNAME=		pvs-${VERSION}
@@ -24,6 +24,9 @@ NO_BUILD=		# defined
 CHECK_SHLIBS=		NO
 SHLIB_HANDLING=		NO
 USE_BUILDLINK2=		YES
+USE_NEW_TEXINFO=	YES
+INFO_DIR=		pvs/doc/release-notes
+INFO_FILES=		pvs-release-notes.info
 
 LICENSE=        	pvs-license
 # not quite sure about this, but to be on the safe side:
@@ -52,6 +55,7 @@ post-patch:
 		${WRKSRC}/pvs.tmp
 	${MV} ${WRKSRC}/pvs.tmp ${WRKSRC}/pvs
 	${RM} ${WRKSRC}/pvs.orig
+	${RM} ${WRKSRC}/doc/release-notes/pvs-release-notes.info.orig
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pvs ${PREFIX}/bin/pvs
@@ -61,5 +65,4 @@ do-install:
 
 .include "../../x11/tk/buildlink2.mk"
 .include "../../mk/emacs.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pvs/PLIST b/devel/pvs/PLIST
index e2ddd1ac0dc..c5989e7ec8c 100644
--- a/devel/pvs/PLIST
+++ b/devel/pvs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/31 20:49:36 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/25 21:01:35 seb Exp $
 bin/pvs
 pvs/Examples/README
 pvs/Examples/ackerman.pvs
@@ -24,9 +24,7 @@ pvs/bin/relocate
 pvs/bin/tarmail
 pvs/bin/untarmail
 pvs/doc/release-notes/pvs-release-notes.html
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/pvs/doc/release-notes/pvs-release-notes.info
 pvs/doc/release-notes/pvs-release-notes.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/pvs/doc/release-notes/pvs-release-notes.info
 pvs/doc/release-notes/pvs-release-notes.pdf
 pvs/doc/release-notes/pvs-release-notes.ps
 pvs/emacs/README
diff --git a/devel/pvs/distinfo b/devel/pvs/distinfo
index dbccf2ce895..30d3167ffb0 100644
--- a/devel/pvs/distinfo
+++ b/devel/pvs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/03/31 20:49:36 jschauma Exp $
+$NetBSD: distinfo,v 1.4 2003/06/25 21:01:35 seb Exp $
 
 SHA1 (pvs-3.1-linux.tgz) = 58a24515d06ab2a476efad593bd5b3768660797d
 Size (pvs-3.1-linux.tgz) = 13398586 bytes
@@ -9,3 +9,4 @@ Size (pvs-3.1-emacs19.tgz) = 360407 bytes
 SHA1 (pvs-3.1-libraries.tgz) = c8e9b79347d335eb7c8bd9dc489cef2073472509
 Size (pvs-3.1-libraries.tgz) = 1457926 bytes
 SHA1 (patch-aa) = 7199e499e1cd85da0c726b26416934fc222b3b46
+SHA1 (patch-ab) = b0f918f5fe054da223ea4c2698e1b9f58c5a684f
diff --git a/devel/pvs/patches/patch-ab b/devel/pvs/patches/patch-ab
new file mode 100644
index 00000000000..c10d48ba9f2
--- /dev/null
+++ b/devel/pvs/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2003/06/25 21:01:36 seb Exp $
+
+--- doc/release-notes/pvs-release-notes.info.orig	Sat Feb 15 05:37:27 2003
++++ doc/release-notes/pvs-release-notes.info
+@@ -1,6 +1,13 @@
+ This is pvs-release-notes.info, produced by makeinfo version 4.0 from
+ pvs-release-notes.texi.
+ 
++INFO-DIR-SECTION Programming & development tools
++START-INFO-DIR-ENTRY
++* PVS Release notes: (pvs-release-notes).      PVS Specification and
++                                               Verification System release
++                                               notes.
++END-INFO-DIR-ENTRY
++
+ This file contains the release notes for PVS version 3.0
+ 
+ Copyright 2002 SRI International