Revision: 111864 https://trac.macports.org/changeset/111864 Author: davidnichols@macports.org Date: 2013-10-04 07:03:05 -0700 (Fri, 04 Oct 2013) Log Message: ----------- removed unnecessary / obsolute patches Removed Paths: ------------- trunk/dports/lang/qore/files/patch-qore-configure.ac.diff trunk/dports/lang/qore/files/patch-qore-configure.diff trunk/dports/lang/qore-devel/files/patch-next_build.sh.diff Deleted: trunk/dports/lang/qore/files/patch-qore-configure.ac.diff =================================================================== --- trunk/dports/lang/qore/files/patch-qore-configure.ac.diff 2013-10-04 13:56:07 UTC (rev 111863) +++ trunk/dports/lang/qore/files/patch-qore-configure.ac.diff 2013-10-04 14:03:05 UTC (rev 111864) @@ -1,20 +0,0 @@ ---- 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 Deleted: trunk/dports/lang/qore/files/patch-qore-configure.diff =================================================================== --- trunk/dports/lang/qore/files/patch-qore-configure.diff 2013-10-04 13:56:07 UTC (rev 111863) +++ trunk/dports/lang/qore/files/patch-qore-configure.diff 2013-10-04 14:03:05 UTC (rev 111864) @@ -1,20 +0,0 @@ ---- 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 Deleted: trunk/dports/lang/qore-devel/files/patch-next_build.sh.diff =================================================================== --- trunk/dports/lang/qore-devel/files/patch-next_build.sh.diff 2013-10-04 13:56:07 UTC (rev 111863) +++ trunk/dports/lang/qore-devel/files/patch-next_build.sh.diff 2013-10-04 14:03:05 UTC (rev 111864) @@ -1,13 +0,0 @@ ---- next_build.sh.orig 2012-02-23 08:03:52.000000000 +0100 -+++ next_build.sh 2012-02-23 08:05:36.000000000 +0100 -@@ -56,8 +56,8 @@ - # see if svnversion is available - which svnversion >/dev/null 2>/dev/null - if [ $? -eq 0 ]; then -- build=`svnversion|sed s/M//|sed s/:.*$//` -- if [ "$build" != "exported" ]; then -+ build=`svnversion|sed -e s/M// -e s/:.*$// -e 's/ .*$//'` -+ if [ "$build" != "exported" -a "$build" != "Unversioned" ]; then - make_file $file - ok=1 - fi
participants (1)
-
davidnichols@macports.org