Upgrade to 3.1, a bug-fix release. (Not much more information available

from the website.)

4 files changed, 27 insertions, 28 deletions

diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index 8fc1d9cc953..add8a7a654a 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/31 20:49:36 jschauma Exp $
 #
 
 DISTNAME=		pvs-${VERSION}
-PKGREVISION=		1
 WRKSRC=			${WRKDIR}
 CATEGORIES=		devel lang
 MASTER_SITES=		ftp://pvs.csl.sri.com/pub/pvs/pvs${VERSION}/ \
@@ -10,9 +9,9 @@ MASTER_SITES=		ftp://pvs.csl.sri.com/pub/pvs/pvs${VERSION}/ \
 			ftp://ftp.informatik.uni-ulm.de/pub/KI/pvs/pvs${VERSION}/
 EXTRACT_SUFX=		.tgz
 DISTFILES=		${DISTNAME}-${MAINFILEEXT}${EXTRACT_SUFX} \
-			pvs-3.0-system${EXTRACT_SUFX} \
-			pvs-3.0-emacs19${EXTRACT_SUFX} \
-			pvs-3.0-libraries${EXTRACT_SUFX}
+			pvs-${VERSION}-system${EXTRACT_SUFX} \
+			pvs-${VERSION}-emacs19${EXTRACT_SUFX} \
+			pvs-${VERSION}-libraries${EXTRACT_SUFX}
 
 MAINTAINER=		jschauma@netbsd.org
 HOMEPAGE=		http://pvs.csl.sri.com/
@@ -20,11 +19,11 @@ COMMENT=		The PVS Specification and Verification System
 
 DEPENDS+=		teTeX>=1.0.7:../../print/teTeX
 
-VERSION=		3.0
+VERSION=		3.1
 NO_BUILD=		# defined
 CHECK_SHLIBS=		NO
 SHLIB_HANDLING=		NO
-USE_BUILDLINK2=		yes
+USE_BUILDLINK2=		YES
 
 LICENSE=        	pvs-license
 # not quite sure about this, but to be on the safe side:
@@ -39,7 +38,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.[6-9]*-* Linux-*-* SunOS-*-*
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc") || ${OPSYS} != "SunOS"
-MAINFILEEXT=		redhat5
+MAINFILEEXT=		linux
 .else
 MAINFILEEXT=		solaris
 .endif
diff --git a/devel/pvs/PLIST b/devel/pvs/PLIST
index f9b787d137c..e2ddd1ac0dc 100644
--- a/devel/pvs/PLIST
+++ b/devel/pvs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/20 21:37:38 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/31 20:49:36 jschauma Exp $
 bin/pvs
 pvs/Examples/README
 pvs/Examples/ackerman.pvs
@@ -23,13 +23,12 @@ pvs/bin/pvs-platform
 pvs/bin/relocate
 pvs/bin/tarmail
 pvs/bin/untarmail
-pvs/doc/release-notes/pvs3.0-release-notes.html
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/pvs/doc/release-notes/pvs3.0-release-notes.info
-pvs/doc/release-notes/pvs3.0-release-notes.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/pvs/doc/release-notes/pvs3.0-release-notes.info
-pvs/doc/release-notes/pvs3.0-release-notes.pdf
-pvs/doc/release-notes/pvs3.0-release-notes.ps
-pvs/doc/release-notes/pvs3.0-release-notes.texi
+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
 pvs/emacs/emacs-src/ilisp/comint-ipc.el
 pvs/emacs/emacs-src/ilisp/completer.el
@@ -571,6 +570,7 @@ pvs/lib/bitvectors/mod.pvs
 pvs/lib/bitvectors/mod_rules.bin
 pvs/lib/bitvectors/mod_rules.prf
 pvs/lib/bitvectors/mod_rules.pvs
+pvs/lib/bitvectors/orphaned-proofs.prf
 pvs/lib/bitvectors/sums.bin
 pvs/lib/bitvectors/sums.prf
 pvs/lib/bitvectors/sums.pvs
diff --git a/devel/pvs/distinfo b/devel/pvs/distinfo
index 6a10dfaf34a..dbccf2ce895 100644
--- a/devel/pvs/distinfo
+++ b/devel/pvs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2002/12/20 21:37:38 jschauma Exp $
+$NetBSD: distinfo,v 1.3 2003/03/31 20:49:36 jschauma Exp $
 
-SHA1 (pvs-3.0-redhat5.tgz) = d075d99f566cb638d5ca981a0160b27b8c7008f5
-Size (pvs-3.0-redhat5.tgz) = 12626606 bytes
-SHA1 (pvs-3.0-system.tgz) = ac2502f0aace86f0c44110bee5123fee875a2bee
-Size (pvs-3.0-system.tgz) = 1291673 bytes
-SHA1 (pvs-3.0-emacs19.tgz) = d4aeb58a995257e96e16350fc6ad52c963dc7308
-Size (pvs-3.0-emacs19.tgz) = 360087 bytes
-SHA1 (pvs-3.0-libraries.tgz) = f5989c0c0b92a24fb0740c45b70f0961d026c679
-Size (pvs-3.0-libraries.tgz) = 1459536 bytes
-SHA1 (patch-aa) = dc2e51855dae92e6b5e8fb1c97fe34186893e1f2
+SHA1 (pvs-3.1-linux.tgz) = 58a24515d06ab2a476efad593bd5b3768660797d
+Size (pvs-3.1-linux.tgz) = 13398586 bytes
+SHA1 (pvs-3.1-system.tgz) = 817736af58902c10e872e86981e767de93ae204d
+Size (pvs-3.1-system.tgz) = 1306332 bytes
+SHA1 (pvs-3.1-emacs19.tgz) = fe936a5edbc3b3c5ce4d5131ca992ee275168d56
+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
diff --git a/devel/pvs/patches/patch-aa b/devel/pvs/patches/patch-aa
index ceff428c0f9..3c2434ffcb5 100644
--- a/devel/pvs/patches/patch-aa
+++ b/devel/pvs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/12/20 21:37:40 jschauma Exp $
+$NetBSD: patch-aa,v 1.3 2003/03/31 20:49:36 jschauma Exp $
 
 --- pvs.orig	Thu Dec 19 22:38:25 2002
 +++ pvs	Thu Dec 19 22:42:32 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2002/12/20 21:37:40 jschauma Exp $
  # PVSPATH should be set after installation by <PVS>/bin/relocate or by hand
  # to the location of the PVS installation
 -PVSPATH=/project/pvs/pvs3.0
-+PVSPATH=@PREFIX@/pvs/
++PVSPATH=@PREFIX@/pvs
  
  #-------------------------------------------------
  # Nothing below this line should need modification