From df0bac14de9e862dd52a99592e838c0eb22d25c0 Mon Sep 17 00:00:00 2001 From: Chris Piazza Date: Fri, 25 Jun 1999 03:51:43 +0000 Subject: [PATCH] Update spin to 3.30. PR: 12373 Submitted by: maintainer --- devel/spin/Makefile | 16 ++++++++-------- devel/spin/distinfo | 4 ++-- devel/spin/files/patch-aa | 4 ++-- devel/spin/files/patch-ab | 12 ++++++------ devel/spin/files/patch-ac | 11 +++++++++++ devel/spin/pkg-descr | 2 ++ devel/spin/pkg-plist | 5 ++++- math/spin/Makefile | 16 ++++++++-------- math/spin/distinfo | 4 ++-- math/spin/files/patch-aa | 4 ++-- math/spin/files/patch-ab | 12 ++++++------ math/spin/files/patch-ac | 11 +++++++++++ math/spin/pkg-descr | 2 ++ math/spin/pkg-plist | 5 ++++- 14 files changed, 70 insertions(+), 38 deletions(-) create mode 100644 devel/spin/files/patch-ac create mode 100644 math/spin/files/patch-ac diff --git a/devel/spin/Makefile b/devel/spin/Makefile index f3e73db31d4c..876827714e25 100644 --- a/devel/spin/Makefile +++ b/devel/spin/Makefile @@ -1,23 +1,23 @@ # Ports collection makefile for: spin -# Version required: 3.24 +# Version required: 3.3.0 # Date created: Oct 23, 1997 # Whom: jhanna@home.com # -# $Id: Makefile,v 1.1.1.1 1998/12/12 22:17:48 jseger Exp $ +# $Id: Makefile,v 1.2 1999/02/12 02:48:55 asami Exp $ # -DISTNAME= spin-3.24 +DISTNAME= spin-3.30 CATEGORIES= math MASTER_SITES= ftp://netlib.bell-labs.com/netlib/spin/ \ ftp://www.netlib.org/spin/ \ ftp://www.enseeiht.fr/NetLib/spin/ \ ftp://wcarchive.cdrom.com/netlib/spin/ -DISTFILES= spin324.tar.gz html.tar.gz +DISTFILES= spin330.tar.gz html.tar.gz MAINTAINER= jhanna@home.com DIST_SUBDIR= spin -WRKSRC= ${WRKDIR}/Src3.2 +WRKSRC= ${WRKDIR}/Src3.3 MAKEFILE= makefile ALL_TARGET= spin @@ -29,9 +29,9 @@ pre-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/spin ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/Xspin3.2/xspin324.tcl ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/Xspin3.3/xspin330.tcl ${PREFIX}/bin ${RM} -f ${PREFIX}/bin/xspin - ln -s ${PREFIX}/bin/xspin324.tcl ${PREFIX}/bin/xspin + ln -s ${PREFIX}/bin/xspin330.tcl ${PREFIX}/bin/xspin .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/spin/Doc @@ -42,7 +42,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/Test/ex.* ${PREFIX}/share/doc/spin/Examples ${INSTALL_DATA} ${WRKDIR}/HTML/* ${PREFIX}/share/doc/spin/HTML .for i in README.tests abp erathostenes hello leader leader.ltl leader2 \ - loops pathfinder peterson pftp priorities snoopy sort + loops pathfinder peterson petersonN pftp priorities snoopy sort ${INSTALL_DATA} ${WRKDIR}/Test/$i ${PREFIX}/share/doc/spin/Test .endfor .endif diff --git a/devel/spin/distinfo b/devel/spin/distinfo index a51a4164b8ca..c598a32818e1 100644 --- a/devel/spin/distinfo +++ b/devel/spin/distinfo @@ -1,2 +1,2 @@ -MD5 (spin/spin324.tar.gz) = 0c33f508099c5cfd502916ec570c2952 -MD5 (spin/html.tar.gz) = 497775584f1d4b55b1d3041311c3d947 +MD5 (spin/spin330.tar.gz) = 976613a7a02486d8daca4cd2cf6a3886 +MD5 (spin/html.tar.gz) = 66686c33ab6213819fa08d41ed17bf8e diff --git a/devel/spin/files/patch-aa b/devel/spin/files/patch-aa index b67c3d8ab549..7a270f9808c7 100644 --- a/devel/spin/files/patch-aa +++ b/devel/spin/files/patch-aa @@ -1,5 +1,5 @@ ---- ../Xspin3.2/xspin324.tcl.orig Wed Jan 27 12:23:13 1999 -+++ ../Xspin3.2/xspin324.tcl Wed Jan 27 12:23:32 1999 +--- ../Xspin3.3/xspin330.tcl.orig Wed Jun 23 18:29:29 1999 ++++ ../Xspin3.3/xspin330.tcl Wed Jun 23 18:30:51 1999 @@ -1,4 +1,4 @@ -#!/usr/local/bin/wish -f +#!/usr/local/bin/wish8.0 -f diff --git a/devel/spin/files/patch-ab b/devel/spin/files/patch-ab index 1fa5be43341a..3c53dabe0e5b 100644 --- a/devel/spin/files/patch-ab +++ b/devel/spin/files/patch-ab @@ -1,12 +1,12 @@ ---- makefile.orig Wed Jan 27 12:28:31 1999 -+++ makefile Wed Jan 27 12:29:14 1999 -@@ -9,8 +9,8 @@ - # 1991, Prentice Hall, Englewood Cliffs, NJ, 07632 +--- makefile.orig Wed Jun 23 18:26:14 1999 ++++ makefile Wed Jun 23 18:27:41 1999 +@@ -10,8 +10,8 @@ # Send bug-reports and/or questions to: gerard@research.bell-labs.com + # The book is available frm www.amazon.com --CC=gcc -g # or any other ansi compatible c compiler +-CC=gcc -O2 -DNXT # or any other ansi compatible c compiler -CFLAGS=-ansi -D_POSIX_SOURCE # on some systems add: -I/usr/include -+# CC=gcc -g # or any other ansi compatible c compiler ++# CC=gcc -O2 -DNXT # or any other ansi compatible c compiler +# CFLAGS=-ansi -D_POSIX_SOURCE # on some systems add: -I/usr/include # on Solaris: add -DSOLARIS diff --git a/devel/spin/files/patch-ac b/devel/spin/files/patch-ac new file mode 100644 index 000000000000..fd8fa7d8833a --- /dev/null +++ b/devel/spin/files/patch-ac @@ -0,0 +1,11 @@ +--- ps_msc.c.orig Wed Jun 23 19:32:24 1999 ++++ ps_msc.c Wed Jun 23 19:33:57 1999 +@@ -13,7 +13,7 @@ + + #include "spin.h" + #include "version.h" +-#include ++#include + + static char *PsPre[] = { + "%%%%Pages: (atend)", diff --git a/devel/spin/pkg-descr b/devel/spin/pkg-descr index 5cd5f839e550..44738f1a2ec5 100644 --- a/devel/spin/pkg-descr +++ b/devel/spin/pkg-descr @@ -5,3 +5,5 @@ systems, database systems, etc. It can be used to prove both safety and liveness properties, including all correctness requirements expressible in linear time temporal logic. +Spin uses a high level language to specify systems descriptions, +called PROMELA (PROcess MEta LAnguage). diff --git a/devel/spin/pkg-plist b/devel/spin/pkg-plist index 6d4ca01e6bcc..0f6a1e35d910 100644 --- a/devel/spin/pkg-plist +++ b/devel/spin/pkg-plist @@ -1,6 +1,6 @@ bin/spin bin/xspin -bin/xspin324.tcl +bin/xspin330.tcl share/doc/spin/Doc/Book.Ch6.add share/doc/spin/Doc/Book.Errata share/doc/spin/Doc/Book.answers @@ -69,6 +69,7 @@ share/doc/spin/HTML/init.html share/doc/spin/HTML/inline.html share/doc/spin/HTML/labels.html share/doc/spin/HTML/len.html +share/doc/spin/HTML/local.html share/doc/spin/HTML/ltl.html share/doc/spin/HTML/macros.html share/doc/spin/HTML/mtype.html @@ -99,6 +100,7 @@ share/doc/spin/HTML/separators.html share/doc/spin/HTML/sequence.html share/doc/spin/HTML/show.html share/doc/spin/HTML/skip.html +share/doc/spin/HTML/stdin.html share/doc/spin/HTML/timeout.html share/doc/spin/HTML/trace.html share/doc/spin/HTML/true.html @@ -116,6 +118,7 @@ share/doc/spin/Test/leader2 share/doc/spin/Test/loops share/doc/spin/Test/pathfinder share/doc/spin/Test/peterson +share/doc/spin/Test/petersonN share/doc/spin/Test/pftp share/doc/spin/Test/priorities share/doc/spin/Test/snoopy diff --git a/math/spin/Makefile b/math/spin/Makefile index f3e73db31d4c..876827714e25 100644 --- a/math/spin/Makefile +++ b/math/spin/Makefile @@ -1,23 +1,23 @@ # Ports collection makefile for: spin -# Version required: 3.24 +# Version required: 3.3.0 # Date created: Oct 23, 1997 # Whom: jhanna@home.com # -# $Id: Makefile,v 1.1.1.1 1998/12/12 22:17:48 jseger Exp $ +# $Id: Makefile,v 1.2 1999/02/12 02:48:55 asami Exp $ # -DISTNAME= spin-3.24 +DISTNAME= spin-3.30 CATEGORIES= math MASTER_SITES= ftp://netlib.bell-labs.com/netlib/spin/ \ ftp://www.netlib.org/spin/ \ ftp://www.enseeiht.fr/NetLib/spin/ \ ftp://wcarchive.cdrom.com/netlib/spin/ -DISTFILES= spin324.tar.gz html.tar.gz +DISTFILES= spin330.tar.gz html.tar.gz MAINTAINER= jhanna@home.com DIST_SUBDIR= spin -WRKSRC= ${WRKDIR}/Src3.2 +WRKSRC= ${WRKDIR}/Src3.3 MAKEFILE= makefile ALL_TARGET= spin @@ -29,9 +29,9 @@ pre-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/spin ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/Xspin3.2/xspin324.tcl ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/Xspin3.3/xspin330.tcl ${PREFIX}/bin ${RM} -f ${PREFIX}/bin/xspin - ln -s ${PREFIX}/bin/xspin324.tcl ${PREFIX}/bin/xspin + ln -s ${PREFIX}/bin/xspin330.tcl ${PREFIX}/bin/xspin .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/spin/Doc @@ -42,7 +42,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/Test/ex.* ${PREFIX}/share/doc/spin/Examples ${INSTALL_DATA} ${WRKDIR}/HTML/* ${PREFIX}/share/doc/spin/HTML .for i in README.tests abp erathostenes hello leader leader.ltl leader2 \ - loops pathfinder peterson pftp priorities snoopy sort + loops pathfinder peterson petersonN pftp priorities snoopy sort ${INSTALL_DATA} ${WRKDIR}/Test/$i ${PREFIX}/share/doc/spin/Test .endfor .endif diff --git a/math/spin/distinfo b/math/spin/distinfo index a51a4164b8ca..c598a32818e1 100644 --- a/math/spin/distinfo +++ b/math/spin/distinfo @@ -1,2 +1,2 @@ -MD5 (spin/spin324.tar.gz) = 0c33f508099c5cfd502916ec570c2952 -MD5 (spin/html.tar.gz) = 497775584f1d4b55b1d3041311c3d947 +MD5 (spin/spin330.tar.gz) = 976613a7a02486d8daca4cd2cf6a3886 +MD5 (spin/html.tar.gz) = 66686c33ab6213819fa08d41ed17bf8e diff --git a/math/spin/files/patch-aa b/math/spin/files/patch-aa index b67c3d8ab549..7a270f9808c7 100644 --- a/math/spin/files/patch-aa +++ b/math/spin/files/patch-aa @@ -1,5 +1,5 @@ ---- ../Xspin3.2/xspin324.tcl.orig Wed Jan 27 12:23:13 1999 -+++ ../Xspin3.2/xspin324.tcl Wed Jan 27 12:23:32 1999 +--- ../Xspin3.3/xspin330.tcl.orig Wed Jun 23 18:29:29 1999 ++++ ../Xspin3.3/xspin330.tcl Wed Jun 23 18:30:51 1999 @@ -1,4 +1,4 @@ -#!/usr/local/bin/wish -f +#!/usr/local/bin/wish8.0 -f diff --git a/math/spin/files/patch-ab b/math/spin/files/patch-ab index 1fa5be43341a..3c53dabe0e5b 100644 --- a/math/spin/files/patch-ab +++ b/math/spin/files/patch-ab @@ -1,12 +1,12 @@ ---- makefile.orig Wed Jan 27 12:28:31 1999 -+++ makefile Wed Jan 27 12:29:14 1999 -@@ -9,8 +9,8 @@ - # 1991, Prentice Hall, Englewood Cliffs, NJ, 07632 +--- makefile.orig Wed Jun 23 18:26:14 1999 ++++ makefile Wed Jun 23 18:27:41 1999 +@@ -10,8 +10,8 @@ # Send bug-reports and/or questions to: gerard@research.bell-labs.com + # The book is available frm www.amazon.com --CC=gcc -g # or any other ansi compatible c compiler +-CC=gcc -O2 -DNXT # or any other ansi compatible c compiler -CFLAGS=-ansi -D_POSIX_SOURCE # on some systems add: -I/usr/include -+# CC=gcc -g # or any other ansi compatible c compiler ++# CC=gcc -O2 -DNXT # or any other ansi compatible c compiler +# CFLAGS=-ansi -D_POSIX_SOURCE # on some systems add: -I/usr/include # on Solaris: add -DSOLARIS diff --git a/math/spin/files/patch-ac b/math/spin/files/patch-ac new file mode 100644 index 000000000000..fd8fa7d8833a --- /dev/null +++ b/math/spin/files/patch-ac @@ -0,0 +1,11 @@ +--- ps_msc.c.orig Wed Jun 23 19:32:24 1999 ++++ ps_msc.c Wed Jun 23 19:33:57 1999 +@@ -13,7 +13,7 @@ + + #include "spin.h" + #include "version.h" +-#include ++#include + + static char *PsPre[] = { + "%%%%Pages: (atend)", diff --git a/math/spin/pkg-descr b/math/spin/pkg-descr index 5cd5f839e550..44738f1a2ec5 100644 --- a/math/spin/pkg-descr +++ b/math/spin/pkg-descr @@ -5,3 +5,5 @@ systems, database systems, etc. It can be used to prove both safety and liveness properties, including all correctness requirements expressible in linear time temporal logic. +Spin uses a high level language to specify systems descriptions, +called PROMELA (PROcess MEta LAnguage). diff --git a/math/spin/pkg-plist b/math/spin/pkg-plist index 6d4ca01e6bcc..0f6a1e35d910 100644 --- a/math/spin/pkg-plist +++ b/math/spin/pkg-plist @@ -1,6 +1,6 @@ bin/spin bin/xspin -bin/xspin324.tcl +bin/xspin330.tcl share/doc/spin/Doc/Book.Ch6.add share/doc/spin/Doc/Book.Errata share/doc/spin/Doc/Book.answers @@ -69,6 +69,7 @@ share/doc/spin/HTML/init.html share/doc/spin/HTML/inline.html share/doc/spin/HTML/labels.html share/doc/spin/HTML/len.html +share/doc/spin/HTML/local.html share/doc/spin/HTML/ltl.html share/doc/spin/HTML/macros.html share/doc/spin/HTML/mtype.html @@ -99,6 +100,7 @@ share/doc/spin/HTML/separators.html share/doc/spin/HTML/sequence.html share/doc/spin/HTML/show.html share/doc/spin/HTML/skip.html +share/doc/spin/HTML/stdin.html share/doc/spin/HTML/timeout.html share/doc/spin/HTML/trace.html share/doc/spin/HTML/true.html @@ -116,6 +118,7 @@ share/doc/spin/Test/leader2 share/doc/spin/Test/loops share/doc/spin/Test/pathfinder share/doc/spin/Test/peterson +share/doc/spin/Test/petersonN share/doc/spin/Test/pftp share/doc/spin/Test/priorities share/doc/spin/Test/snoopy