ports/55364: devel/spin update to 4.0.7 and fix of broken distfile

Fri Aug 8 05:20:14 UTC 2003

>Number:         55364
>Category:       ports
>Synopsis:       devel/spin update to 4.0.7 and fix of broken distfile
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 07 22:20:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Hanna
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD cub.pangolin-systems.com 4.8-STABLE FreeBSD 4.8-STABLE #10: Sun Jun 15 21:28:29 PDT 2003 jhanna at cub.pangolin-systems.com:/usr/obj/usr/src/sys/CUB i386


>Description:

A newer spin has been released. Also, the current spin suffers
from having been minorly updated without a distfile version bump.

Alternate master sites have been removed for now, they have not
been updated with the current version.

The patch also makes the xspin dependency on with8.4 explicit,
though xspin should work 8.3 as well.
xspin can now be suppressed with WITHOUT_XSPIN.

>How-To-Repeat:

>Fix:

diff -u -N -P -r spin.orig/Makefile spin/Makefile

--- spin.orig/Makefile	Wed Jun  4 07:43:05 2003
+++ spin/Makefile	Thu Aug  7 22:00:59 2003
@@ -6,22 +6,32 @@
 #
 
 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 at shaw.ca
 COMMENT=	An on-the-fly verification system for asynchronous concurrent systems
 
+.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}
 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
 
@@ -30,13 +40,14 @@
 	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
@@ -45,7 +56,7 @@
 	${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 \
+.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
 .endfor
diff -u -N -P -r spin.orig/distinfo spin/distinfo
--- spin.orig/distinfo	Wed Jun  4 07:43:05 2003
+++ spin/distinfo	Thu Aug  7 10:23:25 2003
@@ -1,2 +1,2 @@
-MD5 (spin/spin406.tar.gz) = 8a598bbdc8ddb23dfe0b82b2130726ca
+MD5 (spin/spin407.tar.gz) = dfb9886dae7985bf08a1a345564581ed
 MD5 (spin/html.tar.gz) = 18fb3308fac90091de71235941fbdc20
diff -u -N -P -r spin.orig/files/patch-xspin spin/files/patch-xspin
--- spin.orig/files/patch-xspin	Fri Apr 11 09:33:33 2003
+++ spin/files/patch-xspin	Thu Aug  7 10:25:03 2003
@@ -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 -u -N -P -r spin.orig/pkg-plist spin/pkg-plist
--- spin.orig/pkg-plist	Fri Apr 11 09:33:33 2003
+++ spin/pkg-plist	Thu Aug  7 14:41:58 2003
@@ -1,9 +1,9 @@
 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
+%%XSPIN%%bin/xspin
+share/doc/spin/Doc/Book91.Errata
+share/doc/spin/Doc/Book91.answers
+share/doc/spin/Doc/Book91.samples
+share/doc/spin/Doc/Book91_Ch6.add
 share/doc/spin/Doc/V1.Updates
 share/doc/spin/Doc/V2.Updates
 share/doc/spin/Doc/V3.Updates
@@ -110,7 +110,7 @@
 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/eratosthenes
 share/doc/spin/Test/hello
 share/doc/spin/Test/leader
 share/doc/spin/Test/leader.ltl
>Release-Note:
>Audit-Trail:
>Unformatted:

