7 files changed, 45 insertions, 36 deletions

diff --git a/devel/spin/Makefile b/devel/spin/Makefile
index 2c3b6f988b56..07baec213c25 100644
--- a/devel/spin/Makefile
+++ b/devel/spin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spin
-PORTVERSION=	3.5.2
+PORTVERSION=	4.0.3
 CATEGORIES=	devel
 MASTER_SITES=	http://spinroot.com/spin/Src/ \
 		ftp://netlib.bell-labs.com/netlib/spin/ \
@@ -17,8 +17,8 @@ MAINTAINER=	jhanna@shaw.ca
 COMMENT=	An on-the-fly verification system for asynchronous concurrent systems
 
 DIST_SUBDIR=	spin
-WRKSRC=		${WRKDIR}/Src3.5.2
-MAKEFILE=	makefile
+WRKSRC=		${WRKDIR}/Src${PORTVERSION}
+MAKEFILE=	make_unix
 ALL_TARGET=	spin
 USE_REINPLACE=	yes
 
@@ -30,16 +30,12 @@ post-patch:
 	if [ -z "$$WISH" ] ; then WISH=wish8.0 ; fi ; \
 	${REINPLACE_CMD} \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g;" \
-		-e "s|%%WISH%%|$$WISH|g" ${WRKDIR}/Xspin3.5/xspin351.tcl
-
-pre-build:
-	cd ${WRKSRC} && ${MAKE} clean
+		-e "s|%%WISH%%|$$WISH|g" ${WRKDIR}/Xspin4.0/xspin402.tcl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spin ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/Xspin3.5/xspin351.tcl ${PREFIX}/bin
 	${RM} -f ${PREFIX}/bin/xspin
-	${LN} -s ${PREFIX}/bin/xspin351.tcl ${PREFIX}/bin/xspin
+	${INSTALL_SCRIPT} ${WRKDIR}/Xspin4.0/xspin402.tcl ${PREFIX}/bin/xspin
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/spin/Doc
diff --git a/devel/spin/distinfo b/devel/spin/distinfo
index 4283cc4039de..0d2736cbfdf7 100644
--- a/devel/spin/distinfo
+++ b/devel/spin/distinfo
@@ -1,2 +1,2 @@
-MD5 (spin/spin352.tar.gz) = 59cdbbc0c14cbf6c3c428c666c33dc35
+MD5 (spin/spin403.tar.gz) = 0f6c6bfd3be4091624a24b07afa08f86
 MD5 (spin/html.tar.gz) = 18fb3308fac90091de71235941fbdc20
diff --git a/devel/spin/files/patch-aa b/devel/spin/files/patch-aa
deleted file mode 100644
index 9e11a1538e21..000000000000
--- a/devel/spin/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../Xspin3.5/xspin351.tcl.orig	Wed Nov 27 13:45:12 2002
-+++ ../Xspin3.5/xspin351.tcl	Sat Dec  7 11:38:00 2002
-@@ -1,6 +1,6 @@
--#!/bin/sh
-+#!%%LOCALBASE%%/bin/%%WISH%% -f
- # the next line restarts using wish \
--exec wish c:/cygwin/bin/xspin -- $*
-+# exec wish c:/cygwin/bin/xspin -- $*
- 
- # adjust the first argument to wish above with the
- # location of xspin on your system, if different.
diff --git a/devel/spin/files/patch-ab b/devel/spin/files/patch-ab
deleted file mode 100644
index 0a9eb5915da3..000000000000
--- a/devel/spin/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- makefile.orig	Sun Sep 29 08:47:34 2002
-+++ makefile	Sun Oct  6 18:24:09 2002
-@@ -11,8 +11,9 @@
- # The book is available frm www.amazon.com
- 
- # CC=cc -g	# or any other ansi compatible c compiler
--CC=cc -g -DNXT	# enables the X operator in LTL
--CFLAGS=-ansi -D_POSIX_SOURCE	# on some systems add: -I/usr/include
-+# CC=cc -g -DNXT	# enables the X operator in LTL
-+# CFLAGS=-ansi -D_POSIX_SOURCE	# on some systems add: -I/usr/include
-+CFLAGS += -DNXT
- 
- #	on Solaris:	add -DSOLARIS
- #	on PCs:		add -DPC
diff --git a/devel/spin/files/patch-make_unix b/devel/spin/files/patch-make_unix
new file mode 100644
index 000000000000..4345af58a4cc
--- /dev/null
+++ b/devel/spin/files/patch-make_unix
@@ -0,0 +1,14 @@
+--- make_unix.orig	Mon Apr  7 20:30:46 2003
++++ make_unix	Mon Apr  7 20:31:36 2003
+@@ -12,8 +12,9 @@
+ # [a more up-to-date book documenting Spin will appear in 2003]
+ 
+ # CC=gcc		# or any other ansi compatible c compiler
+-CC=cc -g -DNXT 		# -DNXT enables the X operator in LTL
+-CFLAGS=-ansi -D_POSIX_SOURCE	# on some systems add: -I/usr/include
++# CC=cc -g -DNXT 		# -DNXT enables the X operator in LTL
++# CFLAGS=-ansi -D_POSIX_SOURCE	# on some systems add: -I/usr/include
++CFLAGS += -DNXT
+ 
+ #	on Solaris:	add -DSOLARIS
+ #	on PCs:		add -DPC
diff --git a/devel/spin/files/patch-xspin b/devel/spin/files/patch-xspin
new file mode 100644
index 000000000000..15eff25d550d
--- /dev/null
+++ b/devel/spin/files/patch-xspin
@@ -0,0 +1,24 @@
+--- ../Xspin4.0/xspin402.tcl.orig	Mon Apr  7 20:37:27 2003
++++ ../Xspin4.0/xspin402.tcl	Mon Apr  7 20:40:10 2003
+@@ -1,20 +1,4 @@
+-#!/bin/sh
+-# the next line restarts using wish \
+-exec wish c:/cygwin/bin/xspin -- $*
+-
+-# on PCs:
+-# adjust the first argument to wish above with the name and
+-# location of this tcl/tk file on your system, if different.
+-#
+-# Cygwin:
+-# if you use cygwin, do not refer to the file as /usr/bin/xspin
+-# /usr/bin is a symbolic link to /bin, which really
+-# lives in c:/cygwin, hence the contortions above
+-#
+-# on Unix/Linux/Solaris systems
+-# replace the first line with something like
+-#	#!/usr/bin/wish -f
+-# using the pathname for the wish executable on your system
++#!%%LOCALBASE%%/bin/%%WISH%% -f
+ 
+ #======================================================================#
+ # Tcl/Tk Spin Controller, Gerard J. Holzmann, Bell Laboratories, USA.  #
diff --git a/devel/spin/pkg-plist b/devel/spin/pkg-plist
index 907598fb1c58..97c18aab4887 100644
--- a/devel/spin/pkg-plist
+++ b/devel/spin/pkg-plist
@@ -1,6 +1,5 @@
 bin/spin
 bin/xspin
-bin/xspin351.tcl
 share/doc/spin/Doc/Book.Ch6.add
 share/doc/spin/Doc/Book.Errata
 share/doc/spin/Doc/Book.answers
@@ -8,6 +7,7 @@ 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