Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Apr 2016 21:43:01 +0000 (UTC)
From:      TAKATSU Tomonari <tota@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412872 - head/devel/spin
Message-ID:  <201604092143.u39Lh1gZ023480@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tota
Date: Sat Apr  9 21:43:01 2016
New Revision: 412872
URL: https://svnweb.freebsd.org/changeset/ports/412872

Log:
  - Update to 6.4.5
  - Add LICENSE section
  - Make use of PORTDOCS, PORTEXAMPLES and some options helpers
  - Make portlint happier

Modified:
  head/devel/spin/Makefile   (contents, props changed)
  head/devel/spin/distinfo   (contents, props changed)
  head/devel/spin/pkg-plist   (contents, props changed)

Modified: head/devel/spin/Makefile
==============================================================================
--- head/devel/spin/Makefile	Sat Apr  9 21:29:37 2016	(r412871)
+++ head/devel/spin/Makefile	Sat Apr  9 21:43:01 2016	(r412872)
@@ -2,52 +2,52 @@
 # $FreeBSD$
 
 PORTNAME=	spin
-PORTVERSION=	6.4.3
+PORTVERSION=	6.4.5
 CATEGORIES=	devel
 MASTER_SITES=	http://spinroot.com/spin/Src/
 DISTNAME=	spin${PORTVERSION:S/.//g}
+DIST_SUBDIR=	spin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	On-the-fly verification system for asynchronous concurrent systems
 
-OPTIONS_DEFINE=	ISPIN DOCS
-OPTIONS_DEFAULT=	ISPIN
-ISPIN_DESC=	Install xspin and TCL/Tk dependency
-
-.include <bsd.port.options.mk>
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-.if ${PORT_OPTIONS:MISPIN}
-USES=		shebangfix tk
-SHEBANG_FILES=	../iSpin/ispin.tcl
-tk_OLD_CMD=	/bin/sh
-tk_CMD=		${WISH} -f
-PLIST_SUB+=	ISPIN=""
-.else
-PLIST_SUB+=	ISPIN="@comment "
-.endif
-
-DIST_SUBDIR=	spin
 WRKSRC=		${WRKDIR}/Spin/Src${PORTVERSION}
 MAKEFILE=	makefile
 ALL_TARGET=	spin
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DNXT"
 
-post-patch:
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	DOCS EXAMPLES ISPIN
+OPTIONS_DEFAULT=	ISPIN
+OPTIONS_SUB=	yes
+ISPIN_DESC=	Install ispin and TCL/Tk dependency
+ISPIN_USES=	shebangfix tk
+
+SHEBANG_FILES=	../iSpin/ispin.tcl
+tk_OLD_CMD=	/bin/sh
+tk_CMD=		${WISH} -f
+
+post-patch-ISPIN-on:
 	${REINPLACE_CMD} -e "s|exec wish|#exec wish|" ${WRKDIR}/Spin/iSpin/ispin.tcl
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spin ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/../iSpin/ispin.tcl ${STAGEDIR}${PREFIX}/bin/ispin
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/Doc
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/Examples
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/Examples/Book_1991
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/Examples/Exercises
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/Examples/LTL
-	${INSTALL_DATA} ${WRKDIR}/Spin/Doc/* ${STAGEDIR}${DOCSDIR}/Doc
-	(cd ${WRKDIR}/Spin/Examples && ${FIND} . -type f | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}/Examples)
-	(cd ${WRKDIR}/Spin/Examples/Book_1991 && ${FIND} . -type f | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}/Examples/Book_1991)
-	(cd ${WRKDIR}/Spin/Examples/Exercises && ${FIND} . -type f | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}/Examples/Exercises)
-	(cd ${WRKDIR}/Spin/Examples/LTL && ${FIND} . -type f | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}/Examples/LTL)
 	${INSTALL_MAN} ${WRKDIR}/Spin/Man/spin.1 ${STAGEDIR}${PREFIX}/man/man1
 
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKDIR}/Spin/Doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKDIR}/Spin/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+
+do-install-ISPIN-on:
+	${INSTALL_SCRIPT} ${WRKDIR}/Spin/iSpin/ispin.tcl ${STAGEDIR}${PREFIX}/bin/ispin
+
 .include <bsd.port.mk>

Modified: head/devel/spin/distinfo
==============================================================================
--- head/devel/spin/distinfo	Sat Apr  9 21:29:37 2016	(r412871)
+++ head/devel/spin/distinfo	Sat Apr  9 21:43:01 2016	(r412872)
@@ -1,2 +1,2 @@
-SHA256 (spin/spin643.tar.gz) = c1d28254332a797c1788edf6bd6f42ddb95b46011d74763581941aee76878d32
-SIZE (spin/spin643.tar.gz) = 572960
+SHA256 (spin/spin645.tar.gz) = 44081282eb63cd9df763ebbcf8bad19dbeefecbebf8ac2cc090ea92e2ab71875
+SIZE (spin/spin645.tar.gz) = 672549

Modified: head/devel/spin/pkg-plist
==============================================================================
--- head/devel/spin/pkg-plist	Sat Apr  9 21:29:37 2016	(r412871)
+++ head/devel/spin/pkg-plist	Sat Apr  9 21:43:01 2016	(r412872)
@@ -1,119 +1,3 @@
 bin/spin
 %%ISPIN%%bin/ispin
 man/man1/spin.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/Doc/1_Exercises.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/3_SpinGUI.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/4_SpinVerification.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book1991_Ch6_add.txt
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book1991_Errata.txt
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book1991_answers.txt
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Book2003_Errata.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Intro.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Manual.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Pan.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Quick.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/README.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/Spin.html
-%%PORTDOCS%%%%DOCSDIR%%/Doc/V1.Updates
-%%PORTDOCS%%%%DOCSDIR%%/Doc/V2.Updates
-%%PORTDOCS%%%%DOCSDIR%%/Doc/V3.Updates
-%%PORTDOCS%%%%DOCSDIR%%/Doc/V4.Updates
-%%PORTDOCS%%%%DOCSDIR%%/Doc/V5.Updates
-%%PORTDOCS%%%%DOCSDIR%%/Doc/V6.Updates
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.datalink.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.defines.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.flow_cl.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.fserver.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.pftp.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.present.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.session.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/App.F.user.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p101.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p102.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p104.1.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p104.2.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p105.1.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p105.2.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p107.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p108.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p116.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p117.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p123.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p248.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p312.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p319.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p320.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p325.test.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p327.upper.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p329.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p330.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.defines2.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.fserver.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.pftp.ses.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.session.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p337.user.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p342.pftp.ses1.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p343.claim.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p347.pftp.ses5.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p347.pres.sim.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p347.session.prog.h
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p94.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p95.1.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p95.2.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p96.1.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p96.2.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p97.1.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p97.2.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Book_1991/p99.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_1a.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_1f.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_2.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_3a.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_3b.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_3c.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_4.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_5.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/Exercises/ex_6.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/bakery.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/diskhead.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/leader.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/leader_pre.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/ltl_always_eventually.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/ltl_example.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/ltl_gen.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/mobile1.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/mobile2.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/patterns.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/petersonN.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/pftp.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/salesman1.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/salesman2.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/train.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/zune.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/LTL/_spin_nvr.tmp
-%%PORTDOCS%%%%DOCSDIR%%/Examples/README_tests.txt
-%%PORTDOCS%%%%DOCSDIR%%/Examples/abp.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/calculator.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/cambridge.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/dtp.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/eratosthenes.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/for_example.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/for_select_example.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/hajek.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/hello.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/leader0.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/leader_trace.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/life.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/loops.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/manna_pnueli.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/pathfinder.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/peterson.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/priorities.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/rtos1.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/sat.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/snoopy.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/sort.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/welfare.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/werkplaats.pml
-%%PORTDOCS%%%%DOCSDIR%%/Examples/wordcount.pml



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604092143.u39Lh1gZ023480>