svn commit: r364193 - in head/devel/spin: . files
Vanilla I. Shu
vanilla at FreeBSD.org
Wed Aug 6 15:24:39 UTC 2014
Author: vanilla
Date: Wed Aug 6 15:24:38 2014
New Revision: 364193
URL: http://svnweb.freebsd.org/changeset/ports/364193
QAT: https://qat.redports.org/buildarchive/r364193/
Log:
1: Upgrade to 6.3.2.
2: Stagify.
Deleted:
head/devel/spin/files/
Modified:
head/devel/spin/Makefile
head/devel/spin/distinfo
head/devel/spin/pkg-plist
Modified: head/devel/spin/Makefile
==============================================================================
--- head/devel/spin/Makefile Wed Aug 6 15:21:53 2014 (r364192)
+++ head/devel/spin/Makefile Wed Aug 6 15:24:38 2014 (r364193)
@@ -2,27 +2,28 @@
# $FreeBSD$
PORTNAME= spin
-PORTVERSION= 5.2.2
+PORTVERSION= 6.3.2
CATEGORIES= devel
MASTER_SITES= http://spinroot.com/spin/Src/
DISTNAME= spin${PORTVERSION:S/.//g}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= On-the-fly verification system for asynchronous concurrent systems
-OPTIONS_DEFINE= XSPIN DOCS
-OPTIONS_DEFAULT= XSPIN
-XSPIN_DESC= Install xspin and TCL/Tk dependency
+OPTIONS_DEFINE= ISPIN DOCS
+OPTIONS_DEFAULT= ISPIN
+ISPIN_DESC= Install xspin and TCL/Tk dependency
-NO_STAGE= yes
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MXSPIN}
-RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
-PLIST_SUB+= XSPIN=""
-XSPIN_TCL= ${WRKDIR}/Spin/Xspin5.2/xspin521.tcl
+.if ${PORT_OPTIONS:MISPIN}
+USES= shebangfix tk
+SHEBANG_FILES= ../iSpin/ispin.tcl
+tk_OLD_CMD= /bin/sh
+tk_CMD= ${WISH} -f
+PLIST_SUB+= ISPIN=""
.else
-PLIST_SUB+= XSPIN="@comment "
+PLIST_SUB+= ISPIN="@comment "
.endif
DIST_SUBDIR= spin
@@ -30,45 +31,23 @@ WRKSRC= ${WRKDIR}/Spin/Src${PORTVERSION
MAKEFILE= makefile
ALL_TARGET= spin
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DNXT"
-MAKE_JOBS_UNSAFE=yes
-post-extract:
- @${ECHO_MSG} "Unbundling promela example files..."
- @cd ${WRKDIR}/Spin/Test && ${SH} ${WRKDIR}/Spin/Test/examples
-
-.if ${PORT_OPTIONS:MXSPIN}
-pre-patch:
- @${TR} -d '\r' < ${XSPIN_TCL} > ${XSPIN_TCL}.tmp
- @${MV} -f ${XSPIN_TCL}.tmp ${XSPIN_TCL}
-.endif
-
-.if ${PORT_OPTIONS:MXSPIN}
post-patch:
- @${REINPLACE_CMD} \
- -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" \
- -e "s|%%WISH%%|wish8.4|g" ${XSPIN_TCL}
-.endif
+ ${REINPLACE_CMD} -e "s|exec wish|#exec wish|" ${WRKDIR}/Spin/iSpin/ispin.tcl
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/spin ${PREFIX}/bin
-.if ${PORT_OPTIONS:MXSPIN}
- ${INSTALL_SCRIPT} ${XSPIN_TCL} ${PREFIX}/bin/xspin
-.endif
-.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}/Doc
- ${MKDIR} ${DOCSDIR}/Examples
- ${MKDIR} ${DOCSDIR}/Test
- ${INSTALL_DATA} ${WRKDIR}/Spin/Doc/* ${DOCSDIR}/Doc
- ${INSTALL_DATA} ${WRKDIR}/Spin/Test/ex.* ${DOCSDIR}/Examples
-.for i in README.tests abp eratosthenes hello leader leader.ltl leader2 \
- leader_trace loops mobile1 mobile1.ltl mobile2 mobile2.ltl \
- pathfinder peterson petersonN pftp priorities snoopy sort wordcount
- ${INSTALL_DATA} ${WRKDIR}/Spin/Test/$i ${DOCSDIR}/Test
-.endfor
- ${INSTALL_MAN} ${WRKDIR}/Spin/Man/spin.1 ${PREFIX}/man/man1
-
-MANPAGE_WRKSRC= ${WRKDIR}/Spin/Man
-MAN1= spin.1
-.endif
+ ${INSTALL_PROGRAM} ${WRKSRC}/spin ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/../iSpin/ispin.tcl ${STAGEDIR}${PREFIX}/bin/ispin
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/Doc
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/Examples
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/Examples/Book_1991
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/Examples/Exercises
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/Examples/LTL
+ ${INSTALL_DATA} ${WRKDIR}/Spin/Doc/* ${STAGEDIR}${DOCSDIR}/Doc
+ (cd ${WRKDIR}/Spin/Examples && ${FIND} . -type f | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}/Examples)
+ (cd ${WRKDIR}/Spin/Examples/Book_1991 && ${FIND} . -type f | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}/Examples/Book_1991)
+ (cd ${WRKDIR}/Spin/Examples/Exercises && ${FIND} . -type f | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}/Examples/Exercises)
+ (cd ${WRKDIR}/Spin/Examples/LTL && ${FIND} . -type f | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}/Examples/LTL)
+ ${INSTALL_MAN} ${WRKDIR}/Spin/Man/spin.1 ${STAGEDIR}${PREFIX}/man/man1
.include <bsd.port.mk>
Modified: head/devel/spin/distinfo
==============================================================================
--- head/devel/spin/distinfo Wed Aug 6 15:21:53 2014 (r364192)
+++ head/devel/spin/distinfo Wed Aug 6 15:24:38 2014 (r364193)
@@ -1,2 +1,2 @@
-SHA256 (spin/spin522.tar.gz) = 75bf9daf8867b71be6d8c73cdeee9f26a2b674efc4ddff943e4eabd94a677098
-SIZE (spin/spin522.tar.gz) = 408953
+SHA256 (spin/spin632.tar.gz) = be2c002e85299af82304e1162d822cb50d75391f511450f58629656e6bd89ad2
+SIZE (spin/spin632.tar.gz) = 557006
Modified: head/devel/spin/pkg-plist
==============================================================================
--- head/devel/spin/pkg-plist Wed Aug 6 15:21:53 2014 (r364192)
+++ head/devel/spin/pkg-plist Wed Aug 6 15:24:38 2014 (r364193)
@@ -1,57 +1,124 @@
bin/spin
-%%XSPIN%%bin/xspin
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book.Ch6.add
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book.Errata
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book.answers
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book.samples
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book2003Errata.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book91_Ch6_add.txt
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book91_Errata.txt
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book91_answers.txt
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book91_samples_bundle
+%%ISPIN%%bin/ispin
+man/man1/spin.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/Doc/1_Exercises.html
+%%PORTDOCS%%%%DOCSDIR%%/Doc/3_SpinGUI.html
+%%PORTDOCS%%%%DOCSDIR%%/Doc/4_SpinVerification.html
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Book1991_Ch6_add.txt
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Book1991_Errata.txt
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Book1991_answers.txt
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Book2003_Errata.html
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Intro.html
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Manual.html
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Pan.html
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Quick.html
+%%PORTDOCS%%%%DOCSDIR%%/Doc/README.html
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Spin.html
%%PORTDOCS%%%%DOCSDIR%%/Doc/V1.Updates
%%PORTDOCS%%%%DOCSDIR%%/Doc/V2.Updates
%%PORTDOCS%%%%DOCSDIR%%/Doc/V3.Updates
%%PORTDOCS%%%%DOCSDIR%%/Doc/V4.Updates
%%PORTDOCS%%%%DOCSDIR%%/Doc/V5.Updates
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.1a
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.1b
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.1c
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.2
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.3
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.4b
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.4c
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.5a
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.5b
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.6
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.7
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.8
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.9
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.9b
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.9c
-%%PORTDOCS%%%%DOCSDIR%%/Examples/ex.readme
-%%PORTDOCS%%%%DOCSDIR%%/Test/README.tests
-%%PORTDOCS%%%%DOCSDIR%%/Test/abp
-%%PORTDOCS%%%%DOCSDIR%%/Test/eratosthenes
-%%PORTDOCS%%%%DOCSDIR%%/Test/hello
-%%PORTDOCS%%%%DOCSDIR%%/Test/leader
-%%PORTDOCS%%%%DOCSDIR%%/Test/leader.ltl
-%%PORTDOCS%%%%DOCSDIR%%/Test/leader2
-%%PORTDOCS%%%%DOCSDIR%%/Test/leader_trace
-%%PORTDOCS%%%%DOCSDIR%%/Test/loops
-%%PORTDOCS%%%%DOCSDIR%%/Test/mobile1
-%%PORTDOCS%%%%DOCSDIR%%/Test/mobile1.ltl
-%%PORTDOCS%%%%DOCSDIR%%/Test/mobile2
-%%PORTDOCS%%%%DOCSDIR%%/Test/mobile2.ltl
-%%PORTDOCS%%%%DOCSDIR%%/Test/pathfinder
-%%PORTDOCS%%%%DOCSDIR%%/Test/peterson
-%%PORTDOCS%%%%DOCSDIR%%/Test/petersonN
-%%PORTDOCS%%%%DOCSDIR%%/Test/pftp
-%%PORTDOCS%%%%DOCSDIR%%/Test/priorities
-%%PORTDOCS%%%%DOCSDIR%%/Test/snoopy
-%%PORTDOCS%%%%DOCSDIR%%/Test/sort
-%%PORTDOCS%%%%DOCSDIR%%/Test/wordcount
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Test
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/Doc/V6.Updates
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.datalink.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.defines.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.flow_cl.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.fserver.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.pftp.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.present.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.session.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.user.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p101.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p102.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p104.1.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p104.2.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p105.1.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p105.2.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p107.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p108.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p116.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p117.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p123.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p248.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p312.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p319.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p320.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p325.test.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p327.upper.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p329.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p330.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.defines2.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.fserver.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.pftp.ses.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.session.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.user.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p342.pftp.ses1.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p343.claim.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p347.pftp.ses5.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p347.pres.sim.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p347.session.prog.h
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p94.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p95.1.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p95.2.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p96.1.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p96.2.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p97.1.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p97.2.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p99.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_1a.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_1f.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_2.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_3a.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_3b.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_3c.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_4.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_5.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_6.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/bakery.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/diskhead.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/leader.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/leader_pre.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/ltl_always_eventually.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/ltl_example.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/ltl_gen.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/mobile1.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/mobile2.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/patterns.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/petersonN.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/pftp.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/salesman1.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/salesman2.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/train.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/zune.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/README_tests.txt
+%%PORTDOCS%%%%DOCSDIR%%/Examples/abp.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/calculator.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/cambridge.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/dtp.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/eratosthenes.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/for_example.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/for_select_example.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/hajek.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/hello.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/leader0.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/leader_trace.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/life.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/loops.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/manna_pnueli.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/pathfinder.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/peterson.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/priorities.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/rtos1.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/sat.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/snoopy.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/sort.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/welfare.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/werkplaats.pml
+%%PORTDOCS%%%%DOCSDIR%%/Examples/wordcount.pml
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/Doc
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/Examples/Book_1991
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/Examples/Exercises
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/Examples/LTL
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/Examples
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
More information about the svn-ports-head
mailing list