[134203] trunk/dports/sysutils/xpkg

[larryv at macports.org]

Revision: 134203
          https://trac.macports.org/changeset/134203
Author:   larryv at macports.org
Date:     2015-03-19 17:31:20 -0700 (Thu, 19 Mar 2015)
Log Message:
-----------
xpkg: Fix build with Bison 3 (comment:47:ticket:41600)

Modified Paths:
--------------
    trunk/dports/sysutils/xpkg/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/xpkg/files/
    trunk/dports/sysutils/xpkg/files/bison3.patch

Modified: trunk/dports/sysutils/xpkg/Portfile
===================================================================
--- trunk/dports/sysutils/xpkg/Portfile	2015-03-20 00:31:17 UTC (rev 134202)
+++ trunk/dports/sysutils/xpkg/Portfile	2015-03-20 00:31:20 UTC (rev 134203)
@@ -21,5 +21,8 @@
 use_bzip2           yes
 checksums           sha1 5ba46247546bf8e9318dfad79a6d04b307feadfe
 
+# https://trac.macports.org/ticket/41600#comment:47
+patchfiles          bison3.patch
+
 configure.args      --mandir=${prefix}/share/man
 configure.cflags-append "-I${prefix}/include"

Added: trunk/dports/sysutils/xpkg/files/bison3.patch
===================================================================
--- trunk/dports/sysutils/xpkg/files/bison3.patch	                        (rev 0)
+++ trunk/dports/sysutils/xpkg/files/bison3.patch	2015-03-20 00:31:20 UTC (rev 134203)
@@ -0,0 +1,25 @@
+The "name-prefix" directive is obsolete, and Bison 3 no longer adds
+missing semicolons to actions.
+
+Index: src/xmlpars.y
+===================================================================
+--- src/xmlpars.y.orig
++++ src/xmlpars.y
+@@ -73,7 +73,7 @@ handle_attribute(xpkg_pkg_t pkg, const c
+ %}
+ 
+ %locations
+-%name-prefix="xpkgxml"
++%define api.prefix {xpkgxml}
+ %debug
+ %union { char *string; xpkg_item_t xitem; xpkg_items_t xitems; long number; };
+ %token ATTR XPKG NAME VERS REVI REQU PROV ITEM MINO MAJO
+@@ -115,7 +115,7 @@ items: items aitem							{ LIST_INSERT_H
+      | aitem								{ xpkg_items_t i = items_create(); LIST_INSERT_HEAD(i, $1, entries); $$=i; };
+      ;
+ 
+-aitem: '<' ITEM '>' aitem_m '/' ITEM '>'	{ $$ = $4 }
++aitem: '<' ITEM '>' aitem_m '/' ITEM '>'	{ $$ = $4; }
+      ;
+ 
+ aitem_m : name major minor		{ $$ = item_create($1, $2, $3); FREE($1); }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150319/15672d1a/attachment.html>