4 files changed, 163 insertions, 154 deletions

diff --git a/devel/spin/Makefile b/devel/spin/Makefile
index e784df02618b..e4c032a88da0 100644
--- a/devel/spin/Makefile
+++ b/devel/spin/Makefile
@@ -6,17 +6,20 @@
 #
 
 PORTNAME=	spin
-PORTVERSION=	4.0.6
+PORTVERSION=	4.0.7
 CATEGORIES=	devel
-MASTER_SITES=	http://spinroot.com/spin/Src/ \
-		ftp://netlib.bell-labs.com/netlib/spin/ \
-		ftp://www.netlib.org/spin/
+MASTER_SITES=	http://spinroot.com/spin/Src/
 DISTFILES=	spin${PORTVERSION:S/.//g}.tar.gz html.tar.gz
 
 MAINTAINER=	jhanna@shaw.ca
 COMMENT=	An on-the-fly verification system for asynchronous concurrent systems
 
-BROKEN=		Checksum mismatch
+.if !defined(WITHOUT_XSPIN)
+RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+PLIST_SUB+=	XSPIN=""
+.else
+PLIST_SUB+=	XSPIN="@comment "
+.endif
 
 DIST_SUBDIR=	spin
 WRKSRC=		${WRKDIR}/Src${PORTVERSION}
@@ -24,6 +27,11 @@ MAKEFILE=	make_unix
 ALL_TARGET=	spin
 USE_REINPLACE=	yes
 
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Use WITHOUT_XSPIN=yes to suppress xspin (and TCL/Tk dependency)."
+	@${ECHO_MSG} ""
+
 post-extract:
 	@cd ${WRKDIR}/Test && ${SH} ${WRKDIR}/Test/examples
 
@@ -32,24 +40,25 @@ post-patch:
 	if [ -z "$$WISH" ] ; then WISH=wish8.0 ; fi ; \
 	${REINPLACE_CMD} \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g;" \
-		-e "s|%%WISH%%|$$WISH|g" ${WRKDIR}/Xspin4.0/xspin402.tcl
+		-e "s|%%WISH%%|$$WISH|g" ${WRKDIR}/Xspin4.0/xspin407.tcl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spin ${PREFIX}/bin
+.if !defined(WITHOUT_XSPIN)
 	${RM} -f ${PREFIX}/bin/xspin
-	${INSTALL_SCRIPT} ${WRKDIR}/Xspin4.0/xspin402.tcl ${PREFIX}/bin/xspin
-
+	${INSTALL_SCRIPT} ${WRKDIR}/Xspin4.0/xspin407.tcl ${PREFIX}/bin/xspin
+.endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/spin/Doc
-	${MKDIR} ${PREFIX}/share/doc/spin/Examples
-	${MKDIR} ${PREFIX}/share/doc/spin/HTML
-	${MKDIR} ${PREFIX}/share/doc/spin/Test
-	${INSTALL_DATA} ${WRKDIR}/Doc/* ${PREFIX}/share/doc/spin/Doc
-	${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 \
+	${MKDIR} ${DOCSDIR}/Doc
+	${MKDIR} ${DOCSDIR}/Examples
+	${MKDIR} ${DOCSDIR}/HTML
+	${MKDIR} ${DOCSDIR}/Test
+	${INSTALL_DATA} ${WRKDIR}/Doc/* ${DOCSDIR}/Doc
+	${INSTALL_DATA} ${WRKDIR}/Test/ex.* ${DOCSDIR}/Examples
+	${INSTALL_DATA} ${WRKDIR}/HTML/* ${DOCSDIR}/HTML
+.for i in README.tests abp eratosthenes hello leader leader.ltl leader2 \
 	loops mobile1 mobile1.ltl mobile2 mobile2.ltl pathfinder peterson petersonN pftp priorities snoopy sort wordcount
-	${INSTALL_DATA} ${WRKDIR}/Test/$i ${PREFIX}/share/doc/spin/Test
+	${INSTALL_DATA} ${WRKDIR}/Test/$i ${DOCSDIR}/Test
 .endfor
 .endif
 
diff --git a/devel/spin/distinfo b/devel/spin/distinfo
index 81c97e9767a6..4c53c30f5414 100644
--- a/devel/spin/distinfo
+++ b/devel/spin/distinfo
@@ -1,2 +1,2 @@
-MD5 (spin/spin406.tar.gz) = 8a598bbdc8ddb23dfe0b82b2130726ca
+MD5 (spin/spin407.tar.gz) = dfb9886dae7985bf08a1a345564581ed
 MD5 (spin/html.tar.gz) = 18fb3308fac90091de71235941fbdc20
diff --git a/devel/spin/files/patch-xspin b/devel/spin/files/patch-xspin
index 15eff25d550d..7361718c3277 100644
--- a/devel/spin/files/patch-xspin
+++ b/devel/spin/files/patch-xspin
@@ -1,5 +1,5 @@
---- ../Xspin4.0/xspin402.tcl.orig	Mon Apr  7 20:37:27 2003
-+++ ../Xspin4.0/xspin402.tcl	Mon Apr  7 20:40:10 2003
+--- ../Xspin4.0/xspin407.tcl.orig	Mon Apr  7 20:37:27 2003
++++ ../Xspin4.0/xspin407.tcl	Mon Apr  7 20:40:10 2003
 @@ -1,20 +1,4 @@
 -#!/bin/sh
 -# the next line restarts using wish \
diff --git a/devel/spin/pkg-plist b/devel/spin/pkg-plist
index 97c18aab4887..f6d8cd16c9bd 100644
--- a/devel/spin/pkg-plist
+++ b/devel/spin/pkg-plist
@@ -1,135 +1,135 @@
 bin/spin
-bin/xspin
-share/doc/spin/Doc/Book.Ch6.add
-share/doc/spin/Doc/Book.Errata
-share/doc/spin/Doc/Book.answers
-share/doc/spin/Doc/Book.samples
-share/doc/spin/Doc/V1.Updates
-share/doc/spin/Doc/V2.Updates
-share/doc/spin/Doc/V3.Updates
-share/doc/spin/Doc/V4.Updates
-share/doc/spin/Examples/ex.1a
-share/doc/spin/Examples/ex.1b
-share/doc/spin/Examples/ex.1c
-share/doc/spin/Examples/ex.2
-share/doc/spin/Examples/ex.3
-share/doc/spin/Examples/ex.4b
-share/doc/spin/Examples/ex.4c
-share/doc/spin/Examples/ex.5a
-share/doc/spin/Examples/ex.5b
-share/doc/spin/Examples/ex.6
-share/doc/spin/Examples/ex.7
-share/doc/spin/Examples/ex.8
-share/doc/spin/Examples/ex.9
-share/doc/spin/Examples/ex.9b
-share/doc/spin/Examples/ex.9c
-share/doc/spin/Examples/ex.readme
-share/doc/spin/HTML/Exercises.html
-share/doc/spin/HTML/GettingStarted.html
-share/doc/spin/HTML/Intro.html
-share/doc/spin/HTML/Manual.html
-share/doc/spin/HTML/Pan.html
-share/doc/spin/HTML/Quick.html
-share/doc/spin/HTML/README.html
-share/doc/spin/HTML/Roadmap.html
-share/doc/spin/HTML/Spin.html
-share/doc/spin/HTML/WhatsNew.html
-share/doc/spin/HTML/_.html
-share/doc/spin/HTML/_last.html
-share/doc/spin/HTML/_pid.html
-share/doc/spin/HTML/accept.html
-share/doc/spin/HTML/active.html
-share/doc/spin/HTML/arrays.html
-share/doc/spin/HTML/assert.html
-share/doc/spin/HTML/assign.html
-share/doc/spin/HTML/atomic.html
-share/doc/spin/HTML/break.html
-share/doc/spin/HTML/chan.html
-share/doc/spin/HTML/comments.html
-share/doc/spin/HTML/cond_expr.html
-share/doc/spin/HTML/condition.html
-share/doc/spin/HTML/d_step.html
-share/doc/spin/HTML/datatypes.html
-share/doc/spin/HTML/do.html
-share/doc/spin/HTML/else.html
-share/doc/spin/HTML/empty.html
-share/doc/spin/HTML/enabled.html
-share/doc/spin/HTML/end.html
-share/doc/spin/HTML/eval.html
-share/doc/spin/HTML/false.html
-share/doc/spin/HTML/float.html
-share/doc/spin/HTML/full.html
-share/doc/spin/HTML/goto.html
-share/doc/spin/HTML/grammar.html
-share/doc/spin/HTML/hidden.html
-share/doc/spin/HTML/hierarchy.html
-share/doc/spin/HTML/if.html
-share/doc/spin/HTML/index.html
-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
-share/doc/spin/HTML/nempty.html
-share/doc/spin/HTML/never.html
-share/doc/spin/HTML/nfull.html
-share/doc/spin/HTML/notrace.html
-share/doc/spin/HTML/np_.html
-share/doc/spin/HTML/pc_value.html
-share/doc/spin/HTML/pointers.html
-share/doc/spin/HTML/poll.html
-share/doc/spin/HTML/printf.html
-share/doc/spin/HTML/priority.html
-share/doc/spin/HTML/probabilities.html
-share/doc/spin/HTML/procedures.html
-share/doc/spin/HTML/proctype.html
-share/doc/spin/HTML/progress.html
-share/doc/spin/HTML/promela.html
-share/doc/spin/HTML/provided.html
-share/doc/spin/HTML/rand.html
-share/doc/spin/HTML/realtime.html
-share/doc/spin/HTML/receive.html
-share/doc/spin/HTML/remoterefs.html
-share/doc/spin/HTML/run.html
-share/doc/spin/HTML/scanf.html
-share/doc/spin/HTML/send.html
-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
-share/doc/spin/HTML/typedef.html
-share/doc/spin/HTML/unless.html
-share/doc/spin/HTML/xr.html
-share/doc/spin/HTML/xs.html
-share/doc/spin/Test/README.tests
-share/doc/spin/Test/abp
-share/doc/spin/Test/erathostenes
-share/doc/spin/Test/hello
-share/doc/spin/Test/leader
-share/doc/spin/Test/leader.ltl
-share/doc/spin/Test/leader2
-share/doc/spin/Test/loops
-share/doc/spin/Test/mobile1
-share/doc/spin/Test/mobile1.ltl
-share/doc/spin/Test/mobile2
-share/doc/spin/Test/mobile2.ltl
-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
-share/doc/spin/Test/sort
-share/doc/spin/Test/wordcount
-@dirrm share/doc/spin/Test
-@dirrm share/doc/spin/HTML
-@dirrm share/doc/spin/Examples
-@dirrm share/doc/spin/Doc
-@dirrm share/doc/spin
+%%XSPIN%%bin/xspin
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Book91.Errata
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Book91.answers
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Book91.samples
+%%PORTDOCS%%%%DOCSDIR%%/Doc/Book91_Ch6.add
+%%PORTDOCS%%%%DOCSDIR%%/Doc/V1.Updates
+%%PORTDOCS%%%%DOCSDIR%%/Doc/V2.Updates
+%%PORTDOCS%%%%DOCSDIR%%/Doc/V3.Updates
+%%PORTDOCS%%%%DOCSDIR%%/Doc/V4.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%%/HTML/Exercises.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/GettingStarted.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/Intro.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/Manual.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/Pan.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/Quick.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/README.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/Roadmap.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/Spin.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/WhatsNew.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/_.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/_last.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/_pid.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/accept.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/active.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/arrays.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/assert.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/assign.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/atomic.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/break.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/chan.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/comments.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/cond_expr.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/condition.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/d_step.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/datatypes.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/do.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/else.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/empty.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/enabled.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/end.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/eval.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/false.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/float.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/full.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/goto.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/grammar.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/hidden.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/hierarchy.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/if.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/index.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/init.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/inline.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/labels.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/len.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/local.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/ltl.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/macros.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/mtype.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/nempty.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/never.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/nfull.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/notrace.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/np_.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/pc_value.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/pointers.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/poll.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/printf.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/priority.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/probabilities.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/procedures.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/proctype.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/progress.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/promela.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/provided.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/rand.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/realtime.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/receive.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/remoterefs.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/run.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/scanf.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/send.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/separators.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/sequence.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/show.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/skip.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/stdin.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/timeout.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/trace.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/true.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/typedef.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/unless.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/xr.html
+%%PORTDOCS%%%%DOCSDIR%%/HTML/xs.html
+%%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/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
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/Test
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/HTML
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/Examples
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/Doc
+@dirrm %%PORTDOCS%%%%DOCSDIR%%