From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 7 22:20:13 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C558D37B401 for ; Thu, 7 Aug 2003 22:20:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D08F43F75 for ; Thu, 7 Aug 2003 22:20:12 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h785KCUp071908 for ; Thu, 7 Aug 2003 22:20:12 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h785KCfW071907; Thu, 7 Aug 2003 22:20:12 -0700 (PDT) Resent-Date: Thu, 7 Aug 2003 22:20:12 -0700 (PDT) Resent-Message-Id: <200308080520.h785KCfW071907@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jonathan Hanna Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E78B37B401 for ; Thu, 7 Aug 2003 22:13:45 -0700 (PDT) Received: from h24-76-111-119.vc.shawcable.net (h24-76-111-119.vc.shawcable.net [24.76.111.119]) by mx1.FreeBSD.org (Postfix) with ESMTP id D41EC43F75 for ; Thu, 7 Aug 2003 22:13:43 -0700 (PDT) (envelope-from jhanna@h24-76-111-119.vc.shawcable.net) Received: from h24-76-111-119.vc.shawcable.net (localhost [127.0.0.1]) h785Dgot081811 for ; Thu, 7 Aug 2003 22:13:42 -0700 (PDT) (envelope-from jhanna@h24-76-111-119.vc.shawcable.net) Received: (from jhanna@localhost)h785DgmV081810; Thu, 7 Aug 2003 22:13:42 -0700 (PDT) (envelope-from jhanna) Message-Id: <200308080513.h785DgmV081810@h24-76-111-119.vc.shawcable.net> Date: Thu, 7 Aug 2003 22:13:42 -0700 (PDT) From: Jonathan Hanna To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/55364: devel/spin update to 4.0.7 and fix of broken distfile X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jonathan Hanna List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Aug 2003 05:20:14 -0000 >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@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@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: