<!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>[124409] 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/124409">124409</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-08-23 23:25:42 -0700 (Sat, 23 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>zorba: update to 3.0 (#35339)</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="#trunkdportstextproczorbafilespatchdocdirdiff">trunk/dports/textproc/zorba/files/patch-docdir.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 (124408 => 124409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/zorba/Portfile 2014-08-24 06:07:22 UTC (rev 124408)
+++ trunk/dports/textproc/zorba/Portfile 2014-08-24 06:25:42 UTC (rev 124409)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx">
</span><span class="cx"> name zorba
</span><del>-version 2.2.0
-revision 3
</del><ins>+version 3.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> license Apache-2
</span><span class="cx"> categories textproc devel
</span><span class="lines">@@ -27,36 +26,55 @@
</span><span class="cx">
</span><span class="cx"> homepage http://www.zorba-xquery.com/
</span><span class="cx"> master_sites https://launchpad.net/zorba/trunk/${branch}/+download
</span><ins>+distfiles ${name}-${version}${extract.suffix} \
+ ${name}_modules-${version}${extract.suffix}
</ins><span class="cx">
</span><del>-checksums rmd160 976147777830a883d6a459b818a67d3279540045 \
- sha256 124929aa0dbf2ec444667c83067b5b27921d8f8043dbdde83674b981c6fb244e
</del><ins>+checksums ${name}-${version}${extract.suffix} \
+ rmd160 f6add7764e6c538c76f538fa3e2cc226ba36a6f7 \
+ sha256 8ae73ce11ed522d40f20dc2d7c907176ee5dd9e26bde5a40b8a02dbca9558dfe \
+ ${name}_modules-${version}${extract.suffix} \
+ rmd160 fb9cac7f26cf0351b7a73f279002d0cda09fdd66 \
+ sha256 5fc68381f2ffde43f705010b2055df7067a8d8740815805750ab73b602a1957d
</ins><span class="cx">
</span><del>-# In-source-builds are not allowed
</del><ins>+# In-source builds are not allowed
</ins><span class="cx"> configure.dir ${worksrcpath}/build
</span><ins>+
</ins><span class="cx"> build.dir ${configure.dir}
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><span class="cx"> xinstall -d ${build.dir}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-docdir.diff \
- patch-src-types-schema-SchemaValidatorFilter.h.diff
</del><ins>+patchfiles patch-src-types-schema-SchemaValidatorFilter.h.diff
</ins><span class="cx">
</span><del>-depends_build-append \
- port:bison \
- port:flex
-
</del><span class="cx"> depends_lib \
</span><span class="cx"> port:boost \
</span><span class="cx"> port:curl \
</span><ins>+ port:fop \
+ port:geos \
</ins><span class="cx"> port:icu \
</span><ins>+ port:libarchive \
</ins><span class="cx"> port:libiconv \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:libxslt \
</span><del>- port:xercesc3 \
- port:tidy
</del><ins>+ port:sqlite3 \
+ port:tidy \
+ port:xercesc3
</ins><span class="cx">
</span><del>-configure.post_args ..
</del><ins>+# External modules not installed:
+# port:ImageMagick - image skip this, creates too big .mpkg files
+# - schema-tools xmlbeans port not available
+# - read-pdf fontbox port not available
+# port:cclient - email breaks zorba build
+
+# Dependencies for external modules
+# port:cclient - email
+# port:geos - geo
+# port:libarchive - archive
+# port:libxslt - language/xslt
+# port:fop - xsl-fo
+
+configure.post_args ${worksrcpath}
</ins><span class="cx"> configure.args-append \
</span><span class="cx"> -DCURL_FOUND=YES \
</span><span class="cx"> -DCURL_INCLUDE_DIR=${prefix}/include \
</span></span></pre></div>
<a id="trunkdportstextproczorbafilespatchdocdirdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/zorba/files/patch-docdir.diff (124408 => 124409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/zorba/files/patch-docdir.diff 2014-08-24 06:07:22 UTC (rev 124408)
+++ trunk/dports/textproc/zorba/files/patch-docdir.diff 2014-08-24 06:25:42 UTC (rev 124409)
</span><span class="lines">@@ -1,92 +0,0 @@
</span><del>-Install documentation in an unversioned directory
---- doc/CMakeLists.txt.orig 2012-03-20 19:56:15.000000000 -0500
-+++ doc/CMakeLists.txt 2012-05-27 00:31:36.000000000 -0500
-@@ -64,43 +64,43 @@
-
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cxx/html
- COMPONENT "doc"
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/cxx)
-+ DESTINATION share/doc/zorba/cxx)
-
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/c/html
- COMPONENT "doc"
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/c)
-+ DESTINATION share/doc/zorba/c)
-
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/code/html
- COMPONENT "doc"
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/code)
-+ DESTINATION share/doc/zorba/code)
-
- IF (SWIG_FOUND)
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java/html
- COMPONENT "doc"
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/java)
-+ DESTINATION share/doc/zorba/java)
-
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/php/html
- COMPONENT "doc"
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/php)
-+ DESTINATION share/doc/zorba/php)
-
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python/html
- COMPONENT "doc"
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/python)
-+ DESTINATION share/doc/zorba/python)
-
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ruby/html
- COMPONENT "doc"
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/ruby)
-+ DESTINATION share/doc/zorba/ruby)
- ENDIF (SWIG_FOUND)
-
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zorba/html
- COMPONENT "doc"
- DESTINATION
-- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/zorba)
-+ share/doc/zorba/zorba)
-
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zorba/xqdoc
- COMPONENT "doc"
- DESTINATION
-- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/zorba
-+ share/doc/zorba/zorba
- PATTERN "*.vcxproj" EXCLUDE
- PATTERN "*.vcxproj.*" EXCLUDE
- PATTERN "*.cmake" EXCLUDE
-@@ -109,10 +109,10 @@
-
-
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
-+ DESTINATION share/doc/zorba)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/README.txt
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
-+ DESTINATION share/doc/zorba)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/NOTICE.txt
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
-+ DESTINATION share/doc/zorba)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/AUTHORS.txt
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
-+ DESTINATION share/doc/zorba)
---- doc/c/examples/CMakeLists.txt.orig 2012-03-20 19:56:16.000000000 -0500
-+++ doc/c/examples/CMakeLists.txt 2012-05-27 00:29:23.000000000 -0500
-@@ -62,4 +62,4 @@
- ${CMAKE_CURRENT_BINARY_DIR}/cparsing.xml
- COMPONENT "doc"
- DESTINATION
-- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/c/examples)
-+ share/doc/zorba/c/examples)
---- doc/cxx/examples/CMakeLists.txt.orig 2012-03-20 19:56:17.000000000 -0500
-+++ doc/cxx/examples/CMakeLists.txt 2012-05-27 00:34:08.000000000 -0500
-@@ -70,8 +70,8 @@
- INSTALL(FILES ${API_EXAMPLES} ${CMAKE_CURRENT_BINARY_DIR}/examples.cpp
- COMPONENT "cxx_examples"
- DESTINATION
-- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/cxx/examples)
-+ share/doc/zorba/cxx/examples)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Makefile.zorba
- COMPONENT "cxx_examples"
- DESTINATION
-- share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/cxx/examples RENAME Makefile)
-+ share/doc/zorba/cxx/examples RENAME Makefile)
</del></span></pre>
</div>
</div>
</body>
</html>