[93567] trunk/dports/textproc/zorba
ryandesign at macports.org
ryandesign at macports.org
Sat May 26 23:31:52 PDT 2012
Revision: 93567
https://trac.macports.org/changeset/93567
Author: ryandesign at macports.org
Date: 2012-05-26 23:31:50 -0700 (Sat, 26 May 2012)
Log Message:
-----------
zorba: update to 2.2.0; update master_sites and livecheck; add modeline
Modified Paths:
--------------
trunk/dports/textproc/zorba/Portfile
trunk/dports/textproc/zorba/files/patch-docdir.diff
trunk/dports/textproc/zorba/files/patch-src-types-schema-SchemaValidatorFilter.h.diff
Removed Paths:
-------------
trunk/dports/textproc/zorba/files/patch-src-CMakeLists.txt.diff
Modified: trunk/dports/textproc/zorba/Portfile
===================================================================
--- trunk/dports/textproc/zorba/Portfile 2012-05-27 05:38:40 UTC (rev 93566)
+++ trunk/dports/textproc/zorba/Portfile 2012-05-27 06:31:50 UTC (rev 93567)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -4,8 +5,8 @@
PortGroup cmake 1.0
name zorba
-version 1.4.0
-revision 3
+version 2.2.0
+set branch [join [lrange [split ${version} .] 0 1] .]
license Apache-2
categories textproc devel
platforms darwin
@@ -24,23 +25,20 @@
stores, persistent disk-based large stores, S3 stores).
homepage http://www.zorba-xquery.com/
-master_sites sourceforge
+master_sites https://launchpad.net/zorba/trunk/${branch}/+download
-checksums md5 ee2130e52f9aa7b03b17a91acff33b83 \
- sha1 3444b1c82e1a149efc61769af1f8a0aa1a6c7a48 \
- rmd160 67fc76f41c9e31bb452edb9e942c7fbbb787596a
+checksums rmd160 976147777830a883d6a459b818a67d3279540045 \
+ sha256 124929aa0dbf2ec444667c83067b5b27921d8f8043dbdde83674b981c6fb244e
# In-source-builds are not allowed
-worksrcdir ${distname}/build
+configure.dir ${worksrcpath}/build
+build.dir ${configure.dir}
post-extract {
- xinstall -d ${worksrcpath}
+ xinstall -d ${build.dir}
}
-patch.dir ${worksrcpath}/..
-
patchfiles patch-docdir.diff \
- patch-src-CMakeLists.txt.diff \
patch-src-types-schema-SchemaValidatorFilter.h.diff
depends_build-append \
@@ -59,16 +57,15 @@
configure.post_args ..
configure.args-append \
- -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
-DCURL_FOUND=YES \
-DCURL_INCLUDE_DIR=${prefix}/include \
-DCURL_LIBRARY=${prefix}/lib/libcurl.dylib \
- -DZORBA_USE_SWIG=NO \
+ -DZORBA_SUPPRESS_SWIG=YES \
-DZORBA_XQUERYX=YES
test.env DYLD_LIBRARY_PATH=${worksrcpath}/src
test.run yes
livecheck.type regex
-livecheck.url ${homepage}index.php/download/
-livecheck.regex {zorba-(\d+(?:\.\d+)*)\.}
+livecheck.url https://launchpad.net/zorba/+download
+livecheck.regex zorba-(\[0-9.\]+)${extract.suffix}
Modified: trunk/dports/textproc/zorba/files/patch-docdir.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-docdir.diff 2012-05-27 05:38:40 UTC (rev 93566)
+++ trunk/dports/textproc/zorba/files/patch-docdir.diff 2012-05-27 06:31:50 UTC (rev 93567)
@@ -1,70 +1,92 @@
Install documentation in an unversioned directory
---- doc/CMakeLists.txt.orig 2010-07-14 08:23:17.000000000 -0500
-+++ doc/CMakeLists.txt 2012-05-27 00:22:22.000000000 -0500
-@@ -55,34 +55,34 @@
- ENDIF (BUILDING_SIMPLESTORE)
+--- 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
+ 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
+ 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
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/java)
-+ DESTINATION share/doc/zorba/java)
+ 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
-- 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}/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
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/python)
-+ DESTINATION share/doc/zorba/python)
+ 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
-- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/ruby)
-+ DESTINATION share/doc/zorba/ruby)
+ 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)
+- 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})
--INSTALL(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
--INSTALL(FILES ${CMAKE_SOURCE_DIR}/NOTICE.txt DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
--INSTALL(FILES ${CMAKE_SOURCE_DIR}/AUTHORS.txt DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
-+INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION share/doc/zorba)
-+INSTALL(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/zorba)
-+INSTALL(FILES ${CMAKE_SOURCE_DIR}/NOTICE.txt DESTINATION share/doc/zorba)
-+INSTALL(FILES ${CMAKE_SOURCE_DIR}/AUTHORS.txt DESTINATION share/doc/zorba)
---- doc/c/examples/CMakeLists.txt.orig 2010-07-14 08:23:17.000000000 -0500
-+++ doc/c/examples/CMakeLists.txt 2012-05-27 00:22:22.000000000 -0500
-@@ -61,4 +61,4 @@
- ${CMAKE_CURRENT_BINARY_DIR}/cexamples.c
+ 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 2010-07-14 08:23:17.000000000 -0500
-+++ doc/cxx/examples/CMakeLists.txt 2012-05-27 00:22:22.000000000 -0500
-@@ -73,7 +73,7 @@
- # install the examples
- INSTALL(FILES ${API_EXAMPLES} ${CMAKE_CURRENT_BINARY_DIR}/examples.cpp
+--- 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
+ 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)
Deleted: trunk/dports/textproc/zorba/files/patch-src-CMakeLists.txt.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-src-CMakeLists.txt.diff 2012-05-27 05:38:40 UTC (rev 93566)
+++ trunk/dports/textproc/zorba/files/patch-src-CMakeLists.txt.diff 2012-05-27 06:31:50 UTC (rev 93567)
@@ -1,16 +0,0 @@
-Do not install dependencies' libraries
---- src/CMakeLists.txt.orig 2010-07-14 08:23:17.000000000 -0500
-+++ src/CMakeLists.txt 2012-05-27 00:22:22.000000000 -0500
-@@ -195,10 +195,10 @@
- )
-
- #install external packages in Mac OS X package
--IF ( APPLE )
-+IF ( FALSE )
- FOREACH(LIB ${Zorba_ICUUC} ${Zorba_ICUI18N} ${Zorba_ICU_DATA} ${Zorba_XERCESC} ${Zorba_XML2} )
- STRING(STRIP ${LIB} LIBNAME)
- MESSAGE(STATUS "Will install ${LIBNAME}")
- INSTALL(FILES ${LIBNAME} DESTINATION lib)
- ENDFOREACH(LIB)
--ENDIF ( APPLE )
-+ENDIF ( FALSE )
Modified: trunk/dports/textproc/zorba/files/patch-src-types-schema-SchemaValidatorFilter.h.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-src-types-schema-SchemaValidatorFilter.h.diff 2012-05-27 05:38:40 UTC (rev 93566)
+++ trunk/dports/textproc/zorba/files/patch-src-types-schema-SchemaValidatorFilter.h.diff 2012-05-27 06:31:50 UTC (rev 93567)
@@ -1,7 +1,7 @@
XMLScanner::loadGrammar's toCache argument is optional
---- src/types/schema/SchemaValidatorFilter.h.orig 2010-07-14 08:23:17.000000000 -0500
-+++ src/types/schema/SchemaValidatorFilter.h 2012-05-27 00:22:22.000000000 -0500
-@@ -237,7 +237,7 @@
+--- src/types/schema/SchemaValidatorFilter.h.orig 2012-03-20 19:56:21.000000000 -0500
++++ src/types/schema/SchemaValidatorFilter.h 2012-05-27 00:36:41.000000000 -0500
+@@ -238,7 +238,7 @@
virtual XERCES_CPP_NAMESPACE_QUALIFIER Grammar* loadGrammar(
const XERCES_CPP_NAMESPACE_QUALIFIER InputSource &src,
const short grammarType,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120526/df18473d/attachment.html>
More information about the macports-changes
mailing list