[108715] trunk/dports/lang/qore

[davidnichols at macports.org]

Revision: 108715
          https://trac.macports.org/changeset/108715
Author:   davidnichols at macports.org
Date:     2013-07-31 09:33:47 -0700 (Wed, 31 Jul 2013)
Log Message:
-----------
fixed last commit (thanks vq)

Modified Paths:
--------------
    trunk/dports/lang/qore/Portfile

Added Paths:
-----------
    trunk/dports/lang/qore/files/patch-qore-configure.ac.diff
    trunk/dports/lang/qore/files/patch-qore-configure.diff

Modified: trunk/dports/lang/qore/Portfile
===================================================================
--- trunk/dports/lang/qore/Portfile	2013-07-31 14:49:30 UTC (rev 108714)
+++ trunk/dports/lang/qore/Portfile	2013-07-31 16:33:47 UTC (rev 108715)
@@ -38,5 +38,5 @@
 # the autoconf check for iconv() in libiconv fails with GNU iconv, but we need it, so we turn it on anyway
 configure.ldflags   -liconv
 
-patchfiles          patch-qore-configure.ac.diff
-patchfiles          patch-qore-configure.diff
+patchfiles          patch-qore-configure.ac.diff \
+    patch-qore-configure.diff

Added: trunk/dports/lang/qore/files/patch-qore-configure.ac.diff
===================================================================
--- trunk/dports/lang/qore/files/patch-qore-configure.ac.diff	                        (rev 0)
+++ trunk/dports/lang/qore/files/patch-qore-configure.ac.diff	2013-07-31 16:33:47 UTC (rev 108715)
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2013-07-31 13:35:24.000000000 +0200
++++ configure.ac	2013-07-31 13:36:13.000000000 +0200
+@@ -19,7 +19,7 @@
+ AC_MSG_CHECKING([for flex 2.5.31 or greater])
+ if test -z "`echo $LEX | grep flex`"; then
+         AC_MSG_ERROR([no flex version found])
+-elif test -z "`$LEX --version | grep -e ' 2\.5\.3[[1-9]]' -e ' 2\.5\.[[4-9]][[0-9]]' -e ' 2\.\[[6-9]]' -e ' [[3-9]]'`" ; then
++elif test -z "`$LEX --version | grep -e ' 2\.5\.3[[1-9]]' -e ' 2\.5\.[[4-9]][[0-9]]' -e ' 2\.[[6-9]]' -e ' [[3-9]]'`" ; then
+         flexver=`$LEX --version`
+ 	AC_MSG_ERROR([incompatible $flexver found - you can download flex 2.5.35 at http://sourceforge.net/projects/flex])
+ else
+@@ -33,7 +33,7 @@
+ AC_MSG_CHECKING([for bison 1.85 or greater])
+ if test -z "`echo $YACC | grep bison`"; then
+ 	AC_MSG_ERROR([bison not found])
+-elif test -z "`$YACC --version | head -n 1 | grep -e ' 2\.' -e '1\.8[[5-9]]*' -e '1\.9'`"; then
++elif test -z "`$YACC --version | head -n 1 | grep -e ' [[2-9]]\.' -e '1\.8[[5-9]]*' -e '1\.9'`"; then
+         bisonver=`$YACC --version | head -n 1`
+ 	AC_MSG_ERROR([incompatible $bisonver found])
+ else

Added: trunk/dports/lang/qore/files/patch-qore-configure.diff
===================================================================
--- trunk/dports/lang/qore/files/patch-qore-configure.diff	                        (rev 0)
+++ trunk/dports/lang/qore/files/patch-qore-configure.diff	2013-07-31 16:33:47 UTC (rev 108715)
@@ -0,0 +1,20 @@
+--- configure.orig	2013-07-31 13:35:18.000000000 +0200
++++ configure	2013-07-31 13:36:33.000000000 +0200
+@@ -5191,7 +5191,7 @@
+ $as_echo_n "checking for flex 2.5.31 or greater... " >&6; }
+ if test -z "`echo $LEX | grep flex`"; then
+         as_fn_error $? "no flex version found" "$LINENO" 5
+-elif test -z "`$LEX --version | grep -e ' 2\.5\.3[1-9]' -e ' 2\.5\.[4-9][0-9]' -e ' 2\.\[6-9]' -e ' [3-9]'`" ; then
++elif test -z "`$LEX --version | grep -e ' 2\.5\.3[1-9]' -e ' 2\.5\.[4-9][0-9]' -e ' 2\.[6-9]' -e ' [3-9]'`" ; then
+         flexver=`$LEX --version`
+ 	as_fn_error $? "incompatible $flexver found - you can download flex 2.5.35 at http://sourceforge.net/projects/flex" "$LINENO" 5
+ else
+@@ -5249,7 +5249,7 @@
+ $as_echo_n "checking for bison 1.85 or greater... " >&6; }
+ if test -z "`echo $YACC | grep bison`"; then
+ 	as_fn_error $? "bison not found" "$LINENO" 5
+-elif test -z "`$YACC --version | head -n 1 | grep -e ' 2\.' -e '1\.8[5-9]*' -e '1\.9'`"; then
++elif test -z "`$YACC --version | head -n 1 | grep -e ' [2-9]\.' -e ' 1\.8[5-9]*' -e ' 1\.9'`"; then
+         bisonver=`$YACC --version | head -n 1`
+ 	as_fn_error $? "incompatible $bisonver found" "$LINENO" 5
+ else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130731/2e8df67e/attachment.html>