Attachment #226569 for bug #257295

View | Details | Raw Unified | Return to bug 257295
Collapse All | Expand All





PORTNAME=	spl
PORTVERSION=	1.2.1
PORTREVISION=	5
CATEGORIES=	lang
MASTER_SITES=	http://shakespearelang.sourceforge.net/download/

MAINTAINER=	fuz@fuz.su
COMMENT=	Shakespeare programming language

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

BROKEN_FreeBSD_13=	ld: error: duplicate symbol: cast
BROKEN_FreeBSD_14=	ld: error: duplicate symbol: cast

USES=		bison gmake

OPTIONS_DEFINE=	EXAMPLES

ALL_EXAMPLES=	Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \
		primes.spl reverse.spl shakesbeer.spl

OPTIONS_DEFINE=	EXAMPLES

post-patch:
.for f in . examples
	${REINPLACE_CMD} -e 's,= gcc,?= gcc,' -e 's,^CCFLAGS.*,CFLAGS += -Wall,' \

Added Link Here

(-)b/lang/spl/files/patch-libspl.c (+10 lines)
1	--- libspl.c.orig 2021-07-20 09:38:16 UTC
2	+++ libspl.c
3	@@ -27,6 +27,7 @@ USA.
4	#include <stdio.h>
5	#include <stdlib.h>
6
7	+#define GLOBAL
8	#include "spl.h"
9	#include "strutils.h"
10




--- spl.h.orig	2021-07-20 09:35:24 UTC
+++ spl.h
@@ -43,13 +43,17 @@ typedef struct {
 
 /* global variables */
 
-CHARACTER **cast;
-CHARACTER *first_person;
-CHARACTER *second_person;
+#ifndef GLOBAL
+# define GLOBAL extern
+#endif
 
-int truth_flag;
-int num_on_stage;
-int num_cast;
+GLOBAL CHARACTER **cast;
+GLOBAL CHARACTER *first_person;
+GLOBAL CHARACTER *second_person;
+
+GLOBAL int truth_flag;
+GLOBAL int num_on_stage;
+GLOBAL int num_cast;
 
 /* function prototypes */
 extern void activate_character(int line, CHARACTER *character);

Return to bug 257295

Lines 2-27 Link Here

(-)b/lang/spl/Makefile (-7 / +4 lines)
2		2
3	PORTNAME= spl	3	PORTNAME= spl
4	PORTVERSION= 1.2.1	4	PORTVERSION= 1.2.1
5	PORTREVISION= 4	5	PORTREVISION= 5
6	CATEGORIES= lang	6	CATEGORIES= lang
7	MASTER_SITES= http://shakespearelang.sourceforge.net/download/	7	MASTER_SITES= http://shakespearelang.sourceforge.net/download/
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= fuz@fuz.su
10	COMMENT= Shakespeare programming language	10	COMMENT= Shakespeare programming language
11		11
12	LICENSE= GPLv2+	12	LICENSE= GPLv2+
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	BROKEN_FreeBSD_13= ld: error: duplicate symbol: cast
16	BROKEN_FreeBSD_14= ld: error: duplicate symbol: cast
17
18	USES= bison gmake	15	USES= bison gmake
19		16
		17	OPTIONS_DEFINE= EXAMPLES
		18
20	ALL_EXAMPLES= Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \	19	ALL_EXAMPLES= Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \
21	primes.spl reverse.spl shakesbeer.spl	20	primes.spl reverse.spl shakesbeer.spl
22		21
23	OPTIONS_DEFINE= EXAMPLES
24
25	post-patch:	22	post-patch:
26	.for f in . examples	23	.for f in . examples
27	${REINPLACE_CMD} -e 's,= gcc,?= gcc,' -e 's,^CCFLAGS.*,CFLAGS += -Wall,' \	24	${REINPLACE_CMD} -e 's,= gcc,?= gcc,' -e 's,^CCFLAGS.*,CFLAGS += -Wall,' \

Added Link Here

(-)b/lang/spl/files/patch-spl.h (-1 / +26 lines)
0	-	1	--- spl.h.orig 2021-07-20 09:35:24 UTC
		2	+++ spl.h
		3	@@ -43,13 +43,17 @@ typedef struct {
		4
		5	/* global variables */
		6
		7	-CHARACTER **cast;
		8	-CHARACTER *first_person;
		9	-CHARACTER *second_person;
		10	+#ifndef GLOBAL
		11	+# define GLOBAL extern
		12	+#endif
		13
		14	-int truth_flag;
		15	-int num_on_stage;
		16	-int num_cast;
		17	+GLOBAL CHARACTER **cast;
		18	+GLOBAL CHARACTER *first_person;
		19	+GLOBAL CHARACTER *second_person;
		20	+
		21	+GLOBAL int truth_flag;
		22	+GLOBAL int num_on_stage;
		23	+GLOBAL int num_cast;
		24
		25	/* function prototypes */
		26	extern void activate_character(int line, CHARACTER *character);