Update to 3.4.1

PR:		21181
Submitted by:	maintainer

5 files changed, 24 insertions, 17 deletions

diff --git a/devel/spin/Makefile b/devel/spin/Makefile
index 9323a74dbf5a..3a4e7b1a4036 100644
--- a/devel/spin/Makefile
+++ b/devel/spin/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	spin
-PORTVERSION=	3.3.10
+PORTVERSION=	3.4.1
 CATEGORIES=	math
 MASTER_SITES=	ftp://netlib.bell-labs.com/netlib/spin/ \
 		ftp://www.netlib.org/spin/ \
 		ftp://ftp.freesoftware.com/pub/netlib/spin/
-DISTFILES=	spin3310.tar.gz html.tar.gz
+DISTFILES=	spin341.tar.gz html.tar.gz
 
 MAINTAINER=	jhanna@home.com
 
 DIST_SUBDIR=	spin
-WRKSRC=		${WRKDIR}/Src3.3
+WRKSRC=		${WRKDIR}/Src3.4
 MAKEFILE=	makefile
 ALL_TARGET=	spin
 
@@ -24,16 +24,16 @@ post-extract:
 	@cd ${WRKDIR}/Test && ${SH} ${WRKDIR}/Test/examples
 
 post-patch:
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKDIR}/Xspin3.3/xspin3310.tcl
+	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKDIR}/Xspin3.4/xspin341.tcl
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE} clean
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spin ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/Xspin3.3/xspin3310.tcl ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/Xspin3.4/xspin341.tcl ${PREFIX}/bin
 	${RM} -f ${PREFIX}/bin/xspin
-	${LN} -s ${PREFIX}/bin/xspin3310.tcl ${PREFIX}/bin/xspin
+	${LN} -s ${PREFIX}/bin/xspin341.tcl ${PREFIX}/bin/xspin
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/spin/Doc
@@ -44,7 +44,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 petersonN pftp priorities snoopy sort
+	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
 .endfor
 .endif
diff --git a/devel/spin/distinfo b/devel/spin/distinfo
index aa56077c6fb8..8c833de25857 100644
--- a/devel/spin/distinfo
+++ b/devel/spin/distinfo
@@ -1,2 +1,2 @@
-MD5 (spin/spin3310.tar.gz) = f65835381d2194288139d3fcc7d73b6b
-MD5 (spin/html.tar.gz) = 66686c33ab6213819fa08d41ed17bf8e
+MD5 (spin/spin341.tar.gz) = 6dcd7e5eef345e18390f6ad6dffbff16
+MD5 (spin/html.tar.gz) = 18fb3308fac90091de71235941fbdc20
diff --git a/devel/spin/files/patch-aa b/devel/spin/files/patch-aa
index 6eb41e379951..66cfed4a0eb3 100644
--- a/devel/spin/files/patch-aa
+++ b/devel/spin/files/patch-aa
@@ -1,5 +1,5 @@
---- ../Xspin3.3/xspin3310.tcl.orig	Wed Jun 23 18:29:29 1999
-+++ ../Xspin3.3/xspin3310.tcl	Wed Jun 23 18:30:51 1999
+--- ../Xspin3.4/xspin341.tcl.orig	Wed Jun 23 18:29:29 1999
++++ ../Xspin3.4/xspin341.tcl	Wed Jun 23 18:30:51 1999
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/wish -f
 +#!%%LOCALBASE%%/bin/wish8.0 -f
diff --git a/devel/spin/files/patch-ab b/devel/spin/files/patch-ab
index 8867ad2ed574..91869c5eed38 100644
--- a/devel/spin/files/patch-ab
+++ b/devel/spin/files/patch-ab
@@ -1,13 +1,15 @@
---- makefile.orig	Wed Jun 23 18:26:14 1999
-+++ makefile	Wed Jun 23 18:27:41 1999
-@@ -10,8 +10,8 @@
+--- makefile.orig	Sun Sep 10 19:59:06 2000
++++ makefile	Sun Sep 10 20:00:41 2000
+@@ -10,9 +10,10 @@
  # Send bug-reports and/or questions to: gerard@research.bell-labs.com
  # The book is available frm www.amazon.com
  
--CC=cc -O2 -DNXT	# or any other ansi compatible c compiler
+-CC=cc -g		# or any other ansi compatible c compiler
++# CC=cc -g		# or any other ansi compatible c compiler
+ # CC=cc -g -DNXT	# if you need the X operator in LTL
 -CFLAGS=-ansi -D_POSIX_SOURCE	# on some systems add: -I/usr/include
-+# CC=cc -O2 -DNXT	# or any other ansi compatible c compiler
 +# CFLAGS=-ansi -D_POSIX_SOURCE	# on some systems add: -I/usr/include
++CC += -DNXT
  
  #	on Solaris:	add -DSOLARIS
  #	on PCs:		add -DPC
diff --git a/devel/spin/pkg-plist b/devel/spin/pkg-plist
index c208155002ff..fd3ed8e6b4e8 100644
--- a/devel/spin/pkg-plist
+++ b/devel/spin/pkg-plist
@@ -1,6 +1,6 @@
 bin/spin
 bin/xspin
-bin/xspin3310.tcl
+bin/xspin341.tcl
 share/doc/spin/Doc/Book.Ch6.add
 share/doc/spin/Doc/Book.Errata
 share/doc/spin/Doc/Book.answers
@@ -116,6 +116,10 @@ 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
@@ -123,6 +127,7 @@ 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