<!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>[143133] trunk/dports/textproc/zorba</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/143133">143133</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-12-04 12:33:02 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>zorba: update to version 3.1, dependencies, now uses github.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextproczorbaPortfile">trunk/dports/textproc/zorba/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportstextproczorbafilespatchbison30diff">trunk/dports/textproc/zorba/files/patch-bison-3.0.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextproczorbaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/zorba/Portfile (143132 => 143133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/zorba/Portfile 2015-12-04 19:27:59 UTC (rev 143132)
+++ trunk/dports/textproc/zorba/Portfile 2015-12-04 20:33:02 UTC (rev 143133)
</span><span class="lines">@@ -3,11 +3,9 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx">
</span><del>-name zorba
-version 3.0
-revision 3
-set branch [join [lrange [split ${version} .] 0 1] .]
</del><ins>+github.setup 28msec zorba 3.1
</ins><span class="cx"> license Apache-2
</span><span class="cx"> categories textproc devel
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -25,24 +23,20 @@
</span><span class="cx"> of the query processor allows a pluggable XML store (e.g. main memory, DOM \
</span><span class="cx"> stores, persistent disk-based large stores, S3 stores).
</span><span class="cx">
</span><del>-homepage http://www.zorba-xquery.com/
-master_sites https://launchpad.net/zorba/trunk/${branch}/+download
-distfiles ${name}-${version}${extract.suffix} \
- ${name}_modules-${version}${extract.suffix}
</del><ins>+homepage http://www.zorba.io/home
</ins><span class="cx">
</span><del>-checksums ${name}-${version}${extract.suffix} \
- rmd160 f6add7764e6c538c76f538fa3e2cc226ba36a6f7 \
- sha256 8ae73ce11ed522d40f20dc2d7c907176ee5dd9e26bde5a40b8a02dbca9558dfe \
- ${name}_modules-${version}${extract.suffix} \
- rmd160 fb9cac7f26cf0351b7a73f279002d0cda09fdd66 \
- sha256 5fc68381f2ffde43f705010b2055df7067a8d8740815805750ab73b602a1957d
</del><ins>+checksums rmd160 b2bbc7dc718473eccb4f3f03fced5802a15ca827 \
+ sha256 536b5949346c2623be1f068b7cca27e94efcc8df7dc807b61c4b085082f5675b
</ins><span class="cx">
</span><span class="cx"> # In-source builds are not allowed
</span><span class="cx"> cmake.out_of_source yes
</span><span class="cx">
</span><span class="cx"> patchfiles patch-src-types-schema-SchemaValidatorFilter.h.diff
</span><del>-patchfiles-append patch-bison-3.0.diff
</del><span class="cx">
</span><ins>+depends_build-append \
+ port:bison \
+ port:flex
+
</ins><span class="cx"> depends_lib \
</span><span class="cx"> port:boost \
</span><span class="cx"> port:curl \
</span><span class="lines">@@ -74,12 +68,7 @@
</span><span class="cx"> -DCURL_FOUND=YES \
</span><span class="cx"> -DCURL_INCLUDE_DIR=${prefix}/include \
</span><span class="cx"> -DCURL_LIBRARY=${prefix}/lib/libcurl.dylib \
</span><del>- -DZORBA_SUPPRESS_SWIG=YES \
</del><span class="cx"> -DZORBA_XQUERYX=YES
</span><span class="cx">
</span><span class="cx"> test.env DYLD_LIBRARY_PATH=${worksrcpath}/src
</span><span class="cx"> test.run yes
</span><del>-
-livecheck.type regex
-livecheck.url https://launchpad.net/zorba/+download
-livecheck.regex zorba-(\[0-9.\]+)${extract.suffix}
</del></span></pre></div>
<a id="trunkdportstextproczorbafilespatchbison30diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/zorba/files/patch-bison-3.0.diff (143132 => 143133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/zorba/files/patch-bison-3.0.diff 2015-12-04 19:27:59 UTC (rev 143132)
+++ trunk/dports/textproc/zorba/files/patch-bison-3.0.diff 2015-12-04 20:33:02 UTC (rev 143133)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-Fix build with bison 3
-https://bugs.launchpad.net/zorba/+bug/1227047
---- src/compiler/parser/parser.y.orig 2013-11-06 01:20:44.000000000 -0600
-+++ src/compiler/parser/parser.y 2015-04-13 06:51:08.000000000 -0500
-@@ -31,8 +31,7 @@
- %skeleton "lalr1.cc" /* -*- C++ -*- */
- %require "2.4"
- %defines
--%name-prefix="zorba"
--%pure-parser
-+%name-prefix "zorba"
- %error-verbose
-
-
-@@ -45,9 +44,9 @@
-
-
- #ifdef XQUERY_PARSER
--%define "parser_class_name" "xquery_parser"
-+%define "parser_class_name" { xquery_parser }
- #else
--%define "parser_class_name" "jsoniq_parser"
-+%define "parser_class_name" { jsoniq_parser }
- #endif
-
-
-@@ -4635,21 +4634,21 @@
- $$ = NumericLiteral::new_literal(
- LOC(@$), ParseConstants::num_decimal, *$1
- );
-- delete yylval.decval;
-+ delete yylhs.value.decval;
- }
- | INTEGER_LITERAL
- {
- $$ = NumericLiteral::new_literal(
- LOC(@$), ParseConstants::num_integer, *$1
- );
-- delete yylval.ival;
-+ delete yylhs.value.ival;
- }
- | DOUBLE_LITERAL
- {
- $$ = NumericLiteral::new_literal(
- LOC(@$), ParseConstants::num_double, *$1
- );
-- delete yylval.dval;
-+ delete yylhs.value.dval;
- }
- ;
-
</del></span></pre>
</div>
</div>
</body>
</html>