svn commit: r372593 - in head/lang/spl: . files

[John Marino]

Author: marino
Date: Sat Nov 15 11:06:04 2014
New Revision: 372593
URL: https://svnweb.freebsd.org/changeset/ports/372593
QAT: https://qat.redports.org/buildarchive/r372593/

Log:
  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/

Added:
  head/lang/spl/files/
  head/lang/spl/files/patch-include_roman__numbers.metaflex   (contents, props changed)
Modified:
  head/lang/spl/Makefile

Modified: head/lang/spl/Makefile
==============================================================================
--- head/lang/spl/Makefile	Sat Nov 15 10:53:29 2014	(r372592)
+++ head/lang/spl/Makefile	Sat Nov 15 11:06:04 2014	(r372593)
@@ -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 at 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>

Added: head/lang/spl/files/patch-include_roman__numbers.metaflex
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/spl/files/patch-include_roman__numbers.metaflex	Sat Nov 15 11:06:04 2014	(r372593)
@@ -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})