aboutsummaryrefslogtreecommitdiff
path: root/lang/spl
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2014-11-15 11:06:04 +0000
committerJohn Marino <marino@FreeBSD.org>2014-11-15 11:06:04 +0000
commit3f230752a63f3db7e502c0f3892ac0bfe213dfdb (patch)
tree19b43f440d7ec66bc5af036b34bc2ad117b45742 /lang/spl
parent58c07c4937a7788c2735691390c32734f6b07238 (diff)
downloadports-3f230752a63f3db7e502c0f3892ac0bfe213dfdb.tar.gz
ports-3f230752a63f3db7e502c0f3892ac0bfe213dfdb.zip
lang/spl: Fix build on modern gcc
I don't know why spl builds on clang but fails on gcc due to a flex precedence issue. Rather, I don't know why the flex issue doesn't affect clang. There was a patch provided by a fork nearly four years ago that fixes the gcc build nicely. The bitbucket issue warns that more eyes should review the fix though. Issue 1: roman number II interpreted as I https://bitbucket.org/kcartmell/marlowe/issue/1/
Notes
Notes: svn path=/head/; revision=372593
Diffstat (limited to 'lang/spl')
-rw-r--r--lang/spl/Makefile7
-rw-r--r--lang/spl/files/patch-include_roman__numbers.metaflex14
2 files changed, 18 insertions, 3 deletions
diff --git a/lang/spl/Makefile b/lang/spl/Makefile
index 2521788bc723..48ce1cf8505c 100644
--- a/lang/spl/Makefile
+++ b/lang/spl/Makefile
@@ -3,12 +3,12 @@
PORTNAME= spl
PORTVERSION= 1.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang
MASTER_SITES= http://shakespearelang.sourceforge.net/download/
MAINTAINER= ports@FreeBSD.org
-COMMENT= The Shakespeare programming language
+COMMENT= Shakespeare programming language
USES= bison gmake
@@ -28,6 +28,7 @@ post-patch:
do-install:
${TAR} -C ${WRKSRC}/spl -cf - . | ${TAR} -C ${STAGEDIR}${PREFIX} -xf -
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- cd ${WRKSRC}/examples && ${INSTALL_DATA} ${ALL_EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+ (cd ${WRKSRC}/examples && \
+ ${INSTALL_DATA} ${ALL_EXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
.include <bsd.port.mk>
diff --git a/lang/spl/files/patch-include_roman__numbers.metaflex b/lang/spl/files/patch-include_roman__numbers.metaflex
new file mode 100644
index 000000000000..33b690879e23
--- /dev/null
+++ b/lang/spl/files/patch-include_roman__numbers.metaflex
@@ -0,0 +1,14 @@
+Replaced roman numeral regular expression to address precedence issue
+
+Issue 1: roman number II interpreted as I
+https://bitbucket.org/kcartmell/marlowe/issue/1/
+
+--- include/roman_numbers.metaflex.orig 2001-10-18 12:34:31.000000000 +0000
++++ include/roman_numbers.metaflex
+@@ -1,5 +1 @@
+-ROMAN_THOUSANDS m+
+-ROMAN_HUNDREDS (c(d|m)|dc{0,3}|c{1,3})
+-ROMAN_TENS (x(l|c)|lx{0,3}|x{1,3})
+-ROMAN_ONES (i(v|x)|vi{0,3}|i{1,3})
+-ROMAN_NUMBER {ROMAN_ONES}|{ROMAN_TENS}{ROMAN_ONES}?|{ROMAN_HUNDREDS}{ROMAN_TENS}?{ROMAN_ONES}?|{ROMAN_THOUSANDS}{ROMAN_HUNDREDS}?{ROMAN_TENS}?{ROMAN_ONES}?
++ROMAN_NUMBER M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})