[134119] trunk/dports/science/lparse

[larryv at macports.org]

Revision: 134119
          https://trac.macports.org/changeset/134119
Author:   larryv at macports.org
Date:     2015-03-18 14:02:09 -0700 (Wed, 18 Mar 2015)
Log Message:
-----------
lparse: Fix detection of Bison version (#47196)

Modified Paths:
--------------
    trunk/dports/science/lparse/Portfile

Added Paths:
-----------
    trunk/dports/science/lparse/files/fix-bison-version-detection.patch

Removed Paths:
-------------
    trunk/dports/science/lparse/files/patch-configure.diff

Modified: trunk/dports/science/lparse/Portfile
===================================================================
--- trunk/dports/science/lparse/Portfile	2015-03-18 20:58:57 UTC (rev 134118)
+++ trunk/dports/science/lparse/Portfile	2015-03-18 21:02:09 UTC (rev 134119)
@@ -28,7 +28,7 @@
 checksums           rmd160  131f6ea6235eeb7529d2564bb9ce904e5bc2358a \
                     sha256  886d29723f7188296e48584a4a32b8f111414acb7ca8490af28ef6b7f1717298
 
-patchfiles          patch-configure.diff \
+patchfiles          fix-bison-version-detection.patch \
                     fix-recursive-make.patch
 
 # this configure argument is only used for installing

Copied: trunk/dports/science/lparse/files/fix-bison-version-detection.patch (from rev 134118, trunk/dports/science/lparse/files/patch-configure.diff)
===================================================================
--- trunk/dports/science/lparse/files/fix-bison-version-detection.patch	                        (rev 0)
+++ trunk/dports/science/lparse/files/fix-bison-version-detection.patch	2015-03-18 21:02:09 UTC (rev 134119)
@@ -0,0 +1,17 @@
+The original regex for parsing Bison's version output somehow doesn't
+work at all with recent Bison. This one works with Bison 2.3 and 3.0.4,
+which covers our bases pretty well.
+
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -51,7 +51,7 @@ my $bison_version;
+ my $bison_letter;
+ my $bison_found = 0;
+ while (<IN>) {
+-  if (/[Bb]ison[^0-9]*(([0-9.]+)([a-z]+)?)*\s*$/) {
++  if (/^bison[^0-9]+(([0-9.]+)([a-z]*))\s*$/) {
+     my $whole_version = $1;
+     $bison_version = $2;
+     $bison_letter = $3;

Deleted: trunk/dports/science/lparse/files/patch-configure.diff
===================================================================
--- trunk/dports/science/lparse/files/patch-configure.diff	2015-03-18 20:58:57 UTC (rev 134118)
+++ trunk/dports/science/lparse/files/patch-configure.diff	2015-03-18 21:02:09 UTC (rev 134119)
@@ -1,11 +0,0 @@
---- configure.orig	2013-10-25 12:31:49.000000000 -0400
-+++ configure	2013-10-25 12:32:07.000000000 -0400
-@@ -51,7 +51,7 @@
- my $bison_letter;
- my $bison_found = 0;
- while (<IN>) {
--  if (/[Bb]ison[^0-9]*(([0-9.]+)([a-z]+)?)*\s*$/) {
-+  if (/[Bb]ison.*[^0-9]*(([0-9.]+)([a-z]+)?)*\s*$/) {
-     my $whole_version = $1;
-     $bison_version = $2;
-     $bison_letter = $3;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150318/0818926c/attachment.html>