From owner-svn-ports-all@FreeBSD.ORG Sat Nov 15 11:06:06 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2ECA7FCD; Sat, 15 Nov 2014 11:06:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02D60A6D; Sat, 15 Nov 2014 11:06:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAFB65x4046743; Sat, 15 Nov 2014 11:06:05 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAFB65G7046742; Sat, 15 Nov 2014 11:06:05 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201411151106.sAFB65G7046742@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 15 Nov 2014 11:06:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372593 - in head/lang/spl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Nov 2014 11:06:06 -0000 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@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 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})