<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134203] trunk/dports/sysutils/xpkg</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134203">134203</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-03-19 17:31:20 -0700 (Thu, 19 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>xpkg: Fix build with Bison 3 (comment:47:ticket:41600)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsxpkgPortfile">trunk/dports/sysutils/xpkg/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/sysutils/xpkg/files/</li>
<li><a href="#trunkdportssysutilsxpkgfilesbison3patch">trunk/dports/sysutils/xpkg/files/bison3.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilsxpkgPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/xpkg/Portfile (134202 => 134203)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -21,5 +21,8 @@
</span><span class="cx"> use_bzip2 yes
</span><span class="cx"> checksums sha1 5ba46247546bf8e9318dfad79a6d04b307feadfe
</span><span class="cx">
</span><ins>+# https://trac.macports.org/ticket/41600#comment:47
+patchfiles bison3.patch
+
</ins><span class="cx"> configure.args --mandir=${prefix}/share/man
</span><span class="cx"> configure.cflags-append "-I${prefix}/include"
</span></span></pre></div>
<a id="trunkdportssysutilsxpkgfilesbison3patch"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/xpkg/files/bison3.patch (0 => 134203)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+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); }
</ins></span></pre>
</div>
</div>
</body>
</html>