<!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>[133941] trunk/dports/devel/xxdiff</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/133941">133941</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-03-15 17:17:12 -0700 (Sun, 15 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>xxdiff: Fix build with Bison 3 (comment:47:ticket:41600)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelxxdiffPortfile">trunk/dports/devel/xxdiff/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/xxdiff/files/</li>
<li><a href="#trunkdportsdevelxxdifffilesbison3patch">trunk/dports/devel/xxdiff/files/bison3.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelxxdiffPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/xxdiff/Portfile (133940 => 133941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/xxdiff/Portfile 2015-03-16 00:17:09 UTC (rev 133940)
+++ trunk/dports/devel/xxdiff/Portfile 2015-03-16 00:17:12 UTC (rev 133941)
</span><span class="lines">@@ -27,6 +27,9 @@
</span><span class="cx"> sha1 ab2848fd9279f55b5db270f319ad4791154ecf82 \
</span><span class="cx"> rmd160 12e7527f39713b925f05b687c2ad8b60459bb670
</span><span class="cx">
</span><ins>+# https://trac.macports.org/ticket/41600#comment:47
+patchfiles bison3.patch
+
</ins><span class="cx"> # "Configure" and build adapted from README.build.
</span><span class="cx">
</span><span class="cx"> build.type gnu
</span></span></pre></div>
<a id="trunkdportsdevelxxdifffilesbison3patch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/xxdiff/files/bison3.patch (0 => 133941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/xxdiff/files/bison3.patch (rev 0)
+++ trunk/dports/devel/xxdiff/files/bison3.patch 2015-03-16 00:17:12 UTC (rev 133941)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+Replace YYPARSE_PARAM (which Bison 3 no longer supports) with
+%parse-param and update function prototypes as necessary.
+Index: src/resParser.y
+===================================================================
+--- src/resParser.y.orig
++++ src/resParser.y
+@@ -37,14 +37,10 @@
+ #include <qrect.h>
+ #include <qstylefactory.h>
+
+-// The parser input is the resources object to fill in.
+-#define RESOURCES ( static_cast<XxResources*>(resources) )
+-#define YYPARSE_PARAM resources
+-
+ // Declare lexer from other compilation unit.
+ int resParserlex( YYSTYPE* yylval );
+
+-void resParsererror( const char* msg );
++void resParsererror( XxResources* RESOURCES, const char* msg );
+
+ // Declare some parser functions and data defined in resParser.cpp
+ namespace XxResParserNS {
+@@ -144,7 +140,12 @@ using namespace XxResParserNS; // Make s
+ %type <num> boolkwd
+
+ %start xxdiffrc
+-%pure_parser
++%define api.pure
++
++%code requires {
++ #include <resources.h>
++}
++%parse-param {XxResources* RESOURCES}
+
+ %%
+ xxdiffrc : stmts
+@@ -188,7 +189,7 @@ prefgeometry : PREFGEOMETRY COLON GEOMSP
+ RESOURCES->setPreferredGeometry( geometry );
+ }
+ else {
+- yyerror( "Bad geometry specification." );
++ yyerror( RESOURCES, "Bad geometry specification." );
+ // Should never happen, the lexer regexp should be tough
+ // enough.
+ }
+@@ -216,7 +217,7 @@ style : STYLE COLON STRING
+ err += QString( "\nValid styles are: " );
+ err += styles.join( ", " );
+ #endif
+- yyerror( err.latin1() );
++ yyerror( RESOURCES, err.latin1() );
+ #if (QT_VERSION >= 0x030000)
+ }
+ #endif
+@@ -230,7 +231,7 @@ accel : ACCEL DOT ACCELNAME COLON STRIN
+ char buf[2048];
+ ::snprintf( buf, 2048,
+ "Unrecognized accelerator: %s\n", $5 );
+- yyerror( buf );
++ yyerror( RESOURCES, buf );
+ }
+ }
+
+Index: src/resParser.cpp
+===================================================================
+--- src/resParser.cpp.orig
++++ src/resParser.cpp
+@@ -69,11 +69,11 @@
+ *============================================================================*/
+
+ // Parser routine defined in the yacc parser.
+-extern int resParserparse( void* );
++extern int resParserparse( XxResources* );
+
+ //------------------------------------------------------------------------------
+ //
+-void resParsererror( const char* msg )
++void resParsererror( XxResources* RESOURCES, const char* msg )
+ {
+ // Send errors to stdout so we can filter out the debug info shmeglu while
+ // debugging parser.
+@@ -786,7 +786,7 @@ int parseFromKeywordList(
+ QString os;
+ QTextOStream oss( &os );
+ oss << "Unknown " << errmsg << ": " << name << flush;
+- resParsererror( os.latin1() );
++ resParsererror( NULL, os.latin1() );
+ }
+ num = ERROR_TOKEN;
+ return ERROR_TOKEN;
</ins></span></pre>
</div>
</div>
</body>
</html>