svn commit: r513892 - in head/devel/spin: . files

[Koichiro Iwao]

Author: meta
Date: Sun Oct  6 16:04:07 2019
New Revision: 513892
URL: https://svnweb.freebsd.org/changeset/ports/513892

Log:
  devel/spin: Ressurect the port & assign to submitter
  
  it never actually needed gcc, "gcc" was just a hardcoded compiler name
  instead of "cc".
  
  While here,
  - Upstream switched to GitHub
  - Update to 6.5.0
  
  PR:		241067
  Submitted by:	Greg V <greg at unrelenting.technology>

Added:
  head/devel/spin/
     - copied from r510951, head/devel/spin/
  head/devel/spin/files/
  head/devel/spin/files/patch-Src_main.c   (contents, props changed)
  head/devel/spin/files/patch-Src_spin.y   (contents, props changed)
Modified:
  head/devel/spin/Makefile
  head/devel/spin/distinfo

Modified: head/devel/spin/Makefile
==============================================================================
--- head/devel/spin/Makefile	Tue Sep  3 14:42:17 2019	(r510951)
+++ head/devel/spin/Makefile	Sun Oct  6 16:04:07 2019	(r513892)
@@ -2,59 +2,53 @@
 # $FreeBSD$
 
 PORTNAME=	spin
-PORTVERSION=	6.4.8
-PORTREVISION=	2
+PORTVERSION=	6.5.0
+DISTVERSIONPREFIX=	version-
 CATEGORIES=	devel
-MASTER_SITES=	http://spinroot.com/spin/Src/
-DISTNAME=	spin${PORTVERSION:S/.//g}
-DIST_SUBDIR=	spin
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	greg at unrelenting.technology
 COMMENT=	On-the-fly verification system for asynchronous concurrent systems
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/Src/LICENSE
 
-BROKEN=		depends on the gcc meta port
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2019-09-04
-
-RUN_DEPENDS=	gcc:lang/gcc
-
-WRKSRC=		${WRKDIR}/Spin/Src${PORTVERSION}
 MAKEFILE=	makefile
-ALL_TARGET=	spin
+ALL_TARGET=	all
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DNXT"
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	nimble-code
+GH_PROJECT=	Spin
+
 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
+SHEBANG_FILES=	optional_gui/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
+	${REINPLACE_CMD} -e "s|exec wish|#exec wish|" ${WRKSRC}/optional_gui/ispin.tcl
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/spin ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/Spin/Man/spin.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/Src/spin ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/Man/spin.1 ${STAGEDIR}${PREFIX}/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKDIR}/Spin/Doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/Doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKDIR}/Spin/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 do-install-ISPIN-on:
-	${INSTALL_SCRIPT} ${WRKDIR}/Spin/iSpin/ispin.tcl ${STAGEDIR}${PREFIX}/bin/ispin
+	${INSTALL_SCRIPT} ${WRKSRC}/optional_gui/ispin.tcl ${STAGEDIR}${PREFIX}/bin/ispin
 
 .include <bsd.port.mk>

Modified: head/devel/spin/distinfo
==============================================================================
--- head/devel/spin/distinfo	Tue Sep  3 14:42:17 2019	(r510951)
+++ head/devel/spin/distinfo	Sun Oct  6 16:04:07 2019	(r513892)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536942338
-SHA256 (spin/spin648.tar.gz) = 0035bb114157a759e047c7f94ede0a3d7149003893914c9bbdff45e074ab6ae7
-SIZE (spin/spin648.tar.gz) = 544622
+TIMESTAMP = 1570219065
+SHA256 (nimble-code-Spin-version-6.5.0_GH0.tar.gz) = 7bd764793621940b7e69eef8210c82c75ccee7745f24927f221d228260505333
+SIZE (nimble-code-Spin-version-6.5.0_GH0.tar.gz) = 4360118

Added: head/devel/spin/files/patch-Src_main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/spin/files/patch-Src_main.c	Sun Oct  6 16:04:07 2019	(r513892)
@@ -0,0 +1,20 @@
+--- Src/main.c.orig	2019-10-04 20:09:58 UTC
++++ Src/main.c
+@@ -103,7 +103,7 @@ void	explain(int);
+ 	   can later be truncated at that point
+ 	*/
+  #if 1
+-	#define CPP	"gcc -std=gnu99 -E -x c" /* 6.4.0 new default on all systems */
++	#define CPP	"cc -std=gnu99 -E -x c" /* 6.4.0 new default on all systems */
+ 	/* if gcc-4 is available, this setting is modified below */
+  #else
+ 	#if defined(PC) || defined(MAC)
+@@ -579,7 +579,7 @@ void
+ preprocess(char *a, char *b, int a_tmp)
+ {	char precmd[1024], cmd[2048];
+ 	int i;
+-#ifdef PC
++#if 0
+ 	/* gcc is sometimes a symbolic link to gcc-4
+ 	   that does not work well in cygwin, so we try
+ 	   to use the actual executable that is used.

Added: head/devel/spin/files/patch-Src_spin.y
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/spin/files/patch-Src_spin.y	Sun Oct  6 16:04:07 2019	(r513892)
@@ -0,0 +1,10 @@
+--- Src/spin.y.orig	2019-10-04 20:02:16 UTC
++++ Src/spin.y
+@@ -13,6 +13,7 @@
+ #include <unistd.h>
+ #endif
+ #include <stdarg.h>
++#include <stdlib.h>
+ 
+ #define YYMAXDEPTH	20000	/* default is 10000 */
+ #define YYDEBUG		0