pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/pvs Convert to use the emulator framework and pr...
details: https://anonhg.NetBSD.org/pkgsrc/rev/61dee43d5f45
branches: trunk
changeset: 532528:61dee43d5f45
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Aug 22 17:28:08 2007 +0000
description:
Convert to use the emulator framework and properly support the
"solaris-sparc" emulation so that NetBSD/sparc and NetBSD/sparc64 and
use this package.
diffstat:
devel/pvs/MESSAGE.linux-i386 | 10 ++++++++
devel/pvs/Makefile | 49 +++++++++++++++---------------------------
devel/pvs/PLIST | 12 +---------
devel/pvs/PLIST.linux-i386 | 11 +++++++++
devel/pvs/PLIST.solaris-sparc | 11 +++++++++
devel/pvs/distinfo | 13 +++++++----
devel/pvs/files/MESSAGE | 7 ------
devel/pvs/patches/patch-aa | 34 +++++++++++++++++++++--------
8 files changed, 83 insertions(+), 64 deletions(-)
diffs (237 lines):
diff -r 95a08c0a5abf -r 61dee43d5f45 devel/pvs/MESSAGE.linux-i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pvs/MESSAGE.linux-i386 Wed Aug 22 17:28:08 2007 +0000
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE.linux-i386,v 1.1 2007/08/22 17:28:08 jlam Exp $
+
+The PVS Specification and Verification System requires that the kernel
+be built with the PROCFS option and that a procfs be mounted, e.g. add
+the following line to /etc/fstab:
+
+ procfs /emul/linux/proc procfs rw,linux
+
+===========================================================================
diff -r 95a08c0a5abf -r 61dee43d5f45 devel/pvs/Makefile
--- a/devel/pvs/Makefile Wed Aug 22 16:43:31 2007 +0000
+++ b/devel/pvs/Makefile Wed Aug 22 17:28:08 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:24 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/08/22 17:28:09 jlam Exp $
#
DISTNAME= pvs-${VERSION}
@@ -13,50 +13,37 @@
pvs-${VERSION}-system${EXTRACT_SUFX} \
pvs-${VERSION}-libraries${EXTRACT_SUFX}
+LICENSE= pvs-license
+# not quite sure about this, but to be on the safe side:
+RESTRICTED= Redistribution not permitted - see ${HOMEPAGE}license.html
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+
MAINTAINER= jschauma%NetBSD.org@localhost
HOMEPAGE= http://pvs.csl.sri.com/
COMMENT= The PVS Specification and Verification System
DEPENDS+= tk>=8.0:../../x11/tk
+EMUL_PLATFORMS+= linux-i386 solaris-sparc
+
WRKSRC= ${WRKDIR}
VERSION= 3.2
-NO_BUILD= yes
-CHECK_SHLIBS_SUPPORTED= no
INFO_FILES= # PLIST
TEX_ACCEPTED= teTeX3
-LICENSE= pvs-license
-# not quite sure about this, but to be on the safe side:
-RESTRICTED= Redistribution not permitted - see ${HOMEPAGE}license.html
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-
-ONLY_FOR_PLATFORM= NetBSD-1.6*-* NetBSD-[2-9]*-* Linux-*-* SunOS-*-*
-ONLY_FOR_PLATFORM+= DragonFly-*-*
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc") || ${OPSYS} != "SunOS"
-MAINFILEEXT= linux
-.else
-MAINFILEEXT= solaris
-.endif
-
-.if ${OPSYS} == "NetBSD"
-MESSAGE_SRC= ${FILESDIR}/MESSAGE
-.endif
+MESSAGE_SRC= ${PKGDIR}/MESSAGE.${EMUL_PLATFORM}
+MAINFILEEXT= ${EMUL_OPSYS}
INSTALLATION_DIRS= bin
-post-patch:
- ${SED} -e "s|@PREFIX@|${PREFIX}|" ${WRKSRC}/pvs > \
- ${WRKSRC}/pvs.tmp
- ${MV} ${WRKSRC}/pvs.tmp ${WRKSRC}/pvs
- ${RM} ${WRKSRC}/pvs.orig
- ${RM} ${WRKSRC}/doc/release-notes/pvs-release-notes.info.orig
+do-build:
+ ${SED} -e "s|@PREFIX@|${PREFIX}|" ${WRKSRC}/pvs > ${WRKSRC}/pvs.tmp
+ ${MV} -f ${WRKSRC}/pvs.tmp ${WRKSRC}/pvs
+ ${RM} -f ${WRKSRC}/pvs.orig
+ ${RM} -f ${WRKSRC}/doc/release-notes/pvs-release-notes.info.orig
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/pvs ${PREFIX}/bin/pvs
diff -r 95a08c0a5abf -r 61dee43d5f45 devel/pvs/PLIST
--- a/devel/pvs/PLIST Wed Aug 22 16:43:31 2007 +0000
+++ b/devel/pvs/PLIST Wed Aug 22 17:28:08 2007 +0000
@@ -1,14 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:15:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/08/22 17:28:09 jlam Exp $
bin/pvs
pvs/README
-pvs/bin/ix86-redhat5/runtime/file_utils.so
-pvs/bin/ix86-redhat5/runtime/files.bu
-pvs/bin/ix86-redhat5/runtime/libacl623.so
-pvs/bin/ix86-redhat5/runtime/mu.so
-pvs/bin/ix86-redhat5/runtime/pvs-allegro6.2
-pvs/bin/ix86-redhat5/runtime/pvs-allegro6.dxl
-pvs/bin/ix86-redhat5/runtime/pvs-allegro6.lic
-pvs/bin/ix86-redhat5/runtime/ws1s.so
pvs/bin/pvs-platform
pvs/bin/relocate
pvs/bin/tarmail
@@ -541,8 +533,6 @@
@dirrm pvs/emacs
@dirrm pvs/doc/release-notes
@dirrm pvs/doc
-@dirrm pvs/bin/ix86-redhat5/runtime
-@dirrm pvs/bin/ix86-redhat5
@dirrm pvs/bin
@exec ${MKDIR} %D/pvs/Examples
@dirrm pvs/Examples
diff -r 95a08c0a5abf -r 61dee43d5f45 devel/pvs/PLIST.linux-i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pvs/PLIST.linux-i386 Wed Aug 22 17:28:08 2007 +0000
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/08/22 17:28:09 jlam Exp $
+pvs/bin/ix86-redhat5/runtime/file_utils.so
+pvs/bin/ix86-redhat5/runtime/files.bu
+pvs/bin/ix86-redhat5/runtime/libacl623.so
+pvs/bin/ix86-redhat5/runtime/mu.so
+pvs/bin/ix86-redhat5/runtime/pvs-allegro6.2
+pvs/bin/ix86-redhat5/runtime/pvs-allegro6.dxl
+pvs/bin/ix86-redhat5/runtime/pvs-allegro6.lic
+pvs/bin/ix86-redhat5/runtime/ws1s.so
+@dirrm pvs/bin/ix86-redhat5/runtime
+@dirrm pvs/bin/ix86-redhat5
diff -r 95a08c0a5abf -r 61dee43d5f45 devel/pvs/PLIST.solaris-sparc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pvs/PLIST.solaris-sparc Wed Aug 22 17:28:08 2007 +0000
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/08/22 17:28:09 jlam Exp $
+pvs/bin/sun4-SunOS5/runtime/file_utils.so
+pvs/bin/sun4-SunOS5/runtime/files.bu
+pvs/bin/sun4-SunOS5/runtime/libacl623.so
+pvs/bin/sun4-SunOS5/runtime/mu.so
+pvs/bin/sun4-SunOS5/runtime/pvs-allegro6.2
+pvs/bin/sun4-SunOS5/runtime/pvs-allegro6.dxl
+pvs/bin/sun4-SunOS5/runtime/pvs-allegro6.lic
+pvs/bin/sun4-SunOS5/runtime/ws1s.so
+@dirrm pvs/bin/sun4-SunOS5/runtime
+@dirrm pvs/bin/sun4-SunOS5
diff -r 95a08c0a5abf -r 61dee43d5f45 devel/pvs/distinfo
--- a/devel/pvs/distinfo Wed Aug 22 16:43:31 2007 +0000
+++ b/devel/pvs/distinfo Wed Aug 22 17:28:08 2007 +0000
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.6 2005/09/02 02:27:11 jschauma Exp $
+$NetBSD: distinfo,v 1.7 2007/08/22 17:28:09 jlam Exp $
+SHA1 (pvs-3.2-libraries.tgz) = 72fce592786a9d686e44aecd3c5355118aa15e02
+RMD160 (pvs-3.2-libraries.tgz) = 2087d70ebce0b4538f046ae0125b5c9db58f4d77
+Size (pvs-3.2-libraries.tgz) = 3719266 bytes
SHA1 (pvs-3.2-linux.tgz) = 10b2db78aebfe0a66da514ebdc0180f57c686979
RMD160 (pvs-3.2-linux.tgz) = d340cd68341ff845e00a1d940a4d315615eaf99a
Size (pvs-3.2-linux.tgz) = 12350949 bytes
+SHA1 (pvs-3.2-solaris.tgz) = d5d9c99d39aa5adbaa846a21c5856592342a26c2
+RMD160 (pvs-3.2-solaris.tgz) = abeee88a90d5592ba58c1e13d5860e5c53a65d2c
+Size (pvs-3.2-solaris.tgz) = 13074938 bytes
SHA1 (pvs-3.2-system.tgz) = be9a57267ddc3ad241b1e26c55f2a60cff16d787
RMD160 (pvs-3.2-system.tgz) = e69c8e0448e5973832912cf7f9a7cdf35612d705
Size (pvs-3.2-system.tgz) = 1463623 bytes
-SHA1 (pvs-3.2-libraries.tgz) = 72fce592786a9d686e44aecd3c5355118aa15e02
-RMD160 (pvs-3.2-libraries.tgz) = 2087d70ebce0b4538f046ae0125b5c9db58f4d77
-Size (pvs-3.2-libraries.tgz) = 3719266 bytes
-SHA1 (patch-aa) = 10c4eaffbf6f0b571b2077958187e2abfae487f6
+SHA1 (patch-aa) = 17983e62d6dda7f3ce7a9d55cd8ee65721c7f7cb
SHA1 (patch-ab) = 2e626ed30fca3dffb708634b7b2a98c7359184ed
diff -r 95a08c0a5abf -r 61dee43d5f45 devel/pvs/files/MESSAGE
--- a/devel/pvs/files/MESSAGE Wed Aug 22 16:43:31 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/09/02 02:27:11 jschauma Exp $
-
- The PVS Specification and Verification System requires a kernel
- built with 'COMPAT_LINUX' and 'PROCFS' enabled.
-
-===========================================================================
diff -r 95a08c0a5abf -r 61dee43d5f45 devel/pvs/patches/patch-aa
--- a/devel/pvs/patches/patch-aa Wed Aug 22 16:43:31 2007 +0000
+++ b/devel/pvs/patches/patch-aa Wed Aug 22 17:28:08 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2005/09/02 02:27:12 jschauma Exp $
+$NetBSD: patch-aa,v 1.5 2007/08/22 17:28:09 jlam Exp $
--- pvs.orig 2004-10-05 20:04:54.000000000 -0400
-+++ pvs 2005-09-01 10:51:21.000000000 -0400
++++ pvs
@@ -45,7 +45,7 @@
# PVSPATH should be set after installation by <PVS>/bin/relocate or by hand
@@ -11,16 +11,30 @@
#-------------------------------------------------
# Nothing below this line should need modification
-@@ -162,7 +162,7 @@
- then echo "PVS 3.0 only runs under Solaris or Linux"; exit 1
- fi
+@@ -155,12 +155,18 @@ done
+
+ PVSEMACS=${PVSEMACS:-"emacs"}
+
++# Handle NetBSD binary emulation.
++case $opsys in
++ NetBSD) arch=`uname -p`
++ case $arch in
++ *86*) opsys=Linux ;;
++ sparc*) opsys=SunOS ;;
++ esac ;;
++esac
++
+ # Determine the system type and set PVSARCH accordingly
+ case $opsys in
+- SunOS) majvers=`uname -r | cut -d"." -f1`
+- if [ $majvers = 4 ]
+- then echo "PVS 3.0 only runs under Solaris or Linux"; exit 1
+- fi
++ SunOS) majvers=5
PVSARCH=sun4;;
-- Linux) # If Linux, we need to determine the Redhat version to use.
-+ Linux|NetBSD) # If Linux, we need to determine the Redhat version to use.
+ Linux) # If Linux, we need to determine the Redhat version to use.
opsys=redhat
- majvers=5
- othervers=4
-@@ -215,8 +215,15 @@
+@@ -215,8 +221,15 @@ PVSVERBOSE=${PVSVERBOSE:-0}
PVSIMAGE="$PVSLISP"
export ALLEGRO_CL_HOME DISPLAY LD_LIBRARY_PATH
Home |
Main Index |
Thread Index |
Old Index