Attachment #208133 for bug #241067




# $FreeBSD$

PORTNAME=	spin
PORTVERSION=	6.5.0
DISTVERSIONPREFIX=	version-
CATEGORIES=	devel
MASTER_SITES=	http://spinroot.com/spin/Src/
DISTNAME=	spin${PORTVERSION:S/.//g}
DIST_SUBDIR=	spin

MAINTAINER=	greg@unrelenting.technology
COMMENT=	On-the-fly verification system for asynchronous concurrent systems

LICENSE=	BSD3CLAUSE
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=	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=	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|" ${WRKSRC}/optional_gui/ispin.tcl

do-install:
	${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 ${WRKSRC}/Doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}

do-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}

do-install-ISPIN-on:
	${INSTALL_SCRIPT} ${WRKSRC}/optional_gui/ispin.tcl ${STAGEDIR}${PREFIX}/bin/ispin

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)w/devel/spin/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1536942338	1	TIMESTAMP = 1570219065
2	SHA256 (spin/spin648.tar.gz) = 0035bb114157a759e047c7f94ede0a3d7149003893914c9bbdff45e074ab6ae7	2	SHA256 (nimble-code-Spin-version-6.5.0_GH0.tar.gz) = 7bd764793621940b7e69eef8210c82c75ccee7745f24927f221d228260505333
3	SIZE (spin/spin648.tar.gz) = 544622	3	SIZE (nimble-code-Spin-version-6.5.0_GH0.tar.gz) = 4360118




--- 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 Link Here

(-)w/devel/spin/files/patch-Src_spin.y (+10 lines)
1	--- Src/spin.y.orig 2019-10-04 20:02:16 UTC
2	+++ Src/spin.y
3	@@ -13,6 +13,7 @@
4	#include <unistd.h>
5	#endif
6	#include <stdarg.h>
7	+#include <stdlib.h>
8
9	#define YYMAXDEPTH 20000 /* default is 10000 */
10	#define YYDEBUG 0

Return to bug 241067

Lines 2-60 Link Here

(-)w/devel/spin/Makefile (-22 / +16 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= spin	4	PORTNAME= spin
5	PORTVERSION= 6.4.8	5	PORTVERSION= 6.5.0
6	PORTREVISION= 2	6	DISTVERSIONPREFIX= version-
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= http://spinroot.com/spin/Src/
9	DISTNAME= spin${PORTVERSION:S/.//g}
10	DIST_SUBDIR= spin
11		8
12	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= greg@unrelenting.technology
13	COMMENT= On-the-fly verification system for asynchronous concurrent systems	10	COMMENT= On-the-fly verification system for asynchronous concurrent systems
14		11
15	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
16	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/Src/LICENSE
17		14
18	BROKEN= depends on the gcc meta port
19	DEPRECATED= Broken for more than 6 months
20	EXPIRATION_DATE= 2019-09-04
21
22	RUN_DEPENDS= gcc:lang/gcc
23
24	WRKSRC= ${WRKDIR}/Spin/Src${PORTVERSION}
25	MAKEFILE= makefile	15	MAKEFILE= makefile
26	ALL_TARGET= spin	16	ALL_TARGET= all
27	MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DNXT"	17	MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DNXT"
28		18
29	PORTDOCS= *	19	PORTDOCS= *
30	PORTEXAMPLES= *	20	PORTEXAMPLES= *
31		21
		22	USE_GITHUB= yes
		23	GH_ACCOUNT= nimble-code
		24	GH_PROJECT= Spin
		25
32	OPTIONS_DEFINE= DOCS EXAMPLES ISPIN	26	OPTIONS_DEFINE= DOCS EXAMPLES ISPIN
33	OPTIONS_DEFAULT= ISPIN	27	OPTIONS_DEFAULT= ISPIN
34	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
35	ISPIN_DESC= Install ispin and TCL/Tk dependency	29	ISPIN_DESC= Install ispin and TCL/Tk dependency
36	ISPIN_USES= shebangfix tk	30	ISPIN_USES= shebangfix tk
37		31
38	SHEBANG_FILES= ../iSpin/ispin.tcl	32	SHEBANG_FILES= optional_gui/ispin.tcl
39	tk_OLD_CMD= /bin/sh	33	tk_OLD_CMD= /bin/sh
40	tk_CMD= ${WISH} -f	34	tk_CMD= ${WISH} -f
41		35
42	post-patch-ISPIN-on:	36	post-patch-ISPIN-on:
43	${REINPLACE_CMD} -e "s\|exec wish\|#exec wish\|" ${WRKDIR}/Spin/iSpin/ispin.tcl	37	${REINPLACE_CMD} -e "s\|exec wish\|#exec wish\|" ${WRKSRC}/optional_gui/ispin.tcl
44		38
45	do-install:	39	do-install:
46	${INSTALL_PROGRAM} ${WRKSRC}/spin ${STAGEDIR}${PREFIX}/bin	40	${INSTALL_PROGRAM} ${WRKSRC}/Src/spin ${STAGEDIR}${PREFIX}/bin
47	${INSTALL_MAN} ${WRKDIR}/Spin/Man/spin.1 ${STAGEDIR}${PREFIX}/man/man1	41	${INSTALL_MAN} ${WRKSRC}/Man/spin.1 ${STAGEDIR}${PREFIX}/man/man1
48		42
49	do-install-DOCS-on:	43	do-install-DOCS-on:
50	@${MKDIR} ${STAGEDIR}${DOCSDIR}	44	@${MKDIR} ${STAGEDIR}${DOCSDIR}
51	cd ${WRKDIR}/Spin/Doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}	45	cd ${WRKSRC}/Doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
52		46
53	do-install-EXAMPLES-on:	47	do-install-EXAMPLES-on:
54	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	48	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
55	cd ${WRKDIR}/Spin/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}	49	cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
56		50
57	do-install-ISPIN-on:	51	do-install-ISPIN-on:
58	${INSTALL_SCRIPT} ${WRKDIR}/Spin/iSpin/ispin.tcl ${STAGEDIR}${PREFIX}/bin/ispin	52	${INSTALL_SCRIPT} ${WRKSRC}/optional_gui/ispin.tcl ${STAGEDIR}${PREFIX}/bin/ispin
59		53
60	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Added Link Here

(-)w/devel/spin/files/patch-Src_main.c (+20 lines)
1	--- Src/main.c.orig 2019-10-04 20:09:58 UTC
2	+++ Src/main.c
3	@@ -103,7 +103,7 @@ void explain(int);
4	can later be truncated at that point
5	*/
6	#if 1
7	- #define CPP "gcc -std=gnu99 -E -x c" /* 6.4.0 new default on all systems */
8	+ #define CPP "cc -std=gnu99 -E -x c" /* 6.4.0 new default on all systems */
9	/* if gcc-4 is available, this setting is modified below */
10	#else
11	#if defined(PC) \|\| defined(MAC)
12	@@ -579,7 +579,7 @@ void
13	preprocess(char a, char b, int a_tmp)
14	{ char precmd[1024], cmd[2048];
15	int i;
16	-#ifdef PC
17	+#if 0
18	/* gcc is sometimes a symbolic link to gcc-4
19	that does not work well in cygwin, so we try
20	to use the actual executable that is used.