- Update to 2.7.0

  Release notes: http://www.zorba-xquery.com/html/entry/2012/09/26/Gaia

Feature safe:	yes

4 files changed, 36 insertions, 24 deletions

diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index 67a654740cab..fec73d34c8cb 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	zorba
-PORTVERSION=	2.6.0
+PORTVERSION=	2.7.0
 CATEGORIES=	textproc
-MASTER_SITES=	https://launchpadlibrarian.net/112668806/
+MASTER_SITES=	https://launchpadlibrarian.net/119058962/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
@@ -16,7 +16,8 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
    		xerces-c:${PORTSDIR}/textproc/xerces-c3 \
 		icudata:${PORTSDIR}/devel/icu \
 		curl:${PORTSDIR}/ftp/curl \
-		tidy:${PORTSDIR}/www/tidy-lib
+		tidy:${PORTSDIR}/www/tidy-lib \
+		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
 RUN_DEPENDS=	fop:${PORTSDIR}/textproc/fop
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -30,8 +31,10 @@ USE_GNOME=	libxml2 libxslt
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
+CXXFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_OUTSOURCE=yes
-CMAKE_ARGS=	-DCMAKE_REQUIRED_FLAGS:STRING=-I${LOCALBASE}/include
+CMAKE_ARGS=	-DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAME}
 
diff --git a/textproc/zorba/distinfo b/textproc/zorba/distinfo
index d76862f284a7..937a6ff45b78 100644
--- a/textproc/zorba/distinfo
+++ b/textproc/zorba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zorba-src-2.6.0.tar.gz) = a3e029faf57d9101452fbc04420b950e9b3386587c1d7ddbefb8c23c6acef829
-SIZE (zorba-src-2.6.0.tar.gz) = 11750258
+SHA256 (zorba-src-2.7.0.tar.gz) = d9b16fb231b45640fd94107b8b8f753650c3f87a2d75323a0527b8ee96b5d18c
+SIZE (zorba-src-2.7.0.tar.gz) = 12867394
diff --git a/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake b/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake
index 63706d88f60b..1fbc85e7a003 100644
--- a/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake
+++ b/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake
@@ -1,5 +1,5 @@
---- cmake_modules/CMakeUseFlex.cmake.orig	2012-06-28 14:13:33.000000000 +0200
-+++ cmake_modules/CMakeUseFlex.cmake	2012-06-28 14:15:36.000000000 +0200
+--- cmake_modules/CMakeUseFlex.cmake.orig	2012-10-04 00:35:17.000000000 +0200
++++ cmake_modules/CMakeUseFlex.cmake	2012-10-30 09:45:22.000000000 +0100
 @@ -30,7 +30,9 @@
  IF(NOT FLEX_EXECUTABLE)
    MESSAGE(STATUS "Looking for flex")
@@ -11,15 +11,15 @@
      EXEC_PROGRAM(
              ${FLEX_EXECUTABLE}
              ARGS --version
-@@ -44,13 +46,12 @@
-     SET (FLEX_MAJOR_VERSION ${FLEX_MAJOR_VERSION_TMP} CACHE STRING "The flex major version" FORCE)
-     SET (FLEX_MINOR_VERSION ${FLEX_MINOR_VERSION_TMP} CACHE STRING "The flex minor version" FORCE)
- 	SET (FLEX_REVISION_VERSION ${FLEX_REVISION_VERSION_TMP} CACHE STRING "The flex revision version" FORCE)
+@@ -51,13 +53,12 @@
+     GET_FILENAME_COMPONENT(_flex_hint "${_flex_path}/../include" ABSOLUTE)
+     FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h HINTS "${_flex_hint}")
+ 
 -  ELSE (FLEX_EXECUTABLE)
 +ELSE (FLEX_EXECUTABLE)
      SET (FLEX_MAJOR_VERSION "0")
      SET (FLEX_MINOR_VERSION "0")
- 	  SET (FLEX_REVISION_VERSION "0")
+     SET (FLEX_REVISION_VERSION "0")
 -  ENDIF(FLEX_EXECUTABLE)
 -  SET (FLEX_VERSION_FULL ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_REVISION_VERSION} CACHE STRING "The Flex version" FORCE)
 -ENDIF(NOT FLEX_EXECUTABLE)
diff --git a/textproc/zorba/pkg-plist b/textproc/zorba/pkg-plist
index d59544894585..ceeed78aadfb 100644
--- a/textproc/zorba/pkg-plist
+++ b/textproc/zorba/pkg-plist
@@ -71,6 +71,7 @@ include/zorba/util/time.h.orig
 include/zorba/util/time.h
 include/zorba/util/timer.h
 include/zorba/util/uri.h
+include/zorba/util/uuid.h
 include/zorba/vector_item_sequence.h
 include/zorba/version.h
 include/zorba/xmldatamanager.h
@@ -91,10 +92,12 @@ lib/zorba/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/libhttp-client_2.0.s
 lib/zorba/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/libdatetime_2.0.so
 lib/zorba/core/%%FULLVERSION%%/edu/princeton/wordnet/wordnet-en.zth
 lib/zorba/core/%%FULLVERSION%%/org/expath/ns/libfile_2.0.so
+%%WITH_PHP%%%%PHP_EXTLIBDIR%%/XQueryProcessor.php
 %%WITH_PHP%%%%PHP_EXTLIBDIR%%/zorba_api_wrapper.php
 %%WITH_PHP%%%%PHP_EXTLIBDIR%%/zorba_api.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/zorba_api.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_zorba_api.so
+%%WITH_JAVA%%%%JAVASHAREDIR%%/classes/libzorba_api.so
 %%WITH_JAVA%%%%JAVASHAREDIR%%/zorba_xqj.jar
 %%WITH_JAVA%%%%JAVASHAREDIR%%/xqjapi.jar
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
@@ -206,20 +209,23 @@ lib/zorba/core/%%FULLVERSION%%/org/expath/ns/libfile_2.0.so
 %%WITH_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/html/rtab_r.gif
 %%WITH_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/html/rtab_l.gif
 %%WITH_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/python_test.py
+%%WITH_RUBY%%share/ruby/zorba_api.so
 %%WITH_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/html/rtab_b.gif
 %%WITH_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/html/rtab_l.gif
 %%WITH_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/html/rtab_r.gif
+%%WITH_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/ruby_test.rb
 %%WITH_JAVA%%%%PORTDOCS%%%%DOCSDIR%%/java/html/rtab_b.gif
 %%WITH_JAVA%%%%PORTDOCS%%%%DOCSDIR%%/java/html/rtab_l.gif
 %%WITH_JAVA%%%%PORTDOCS%%%%DOCSDIR%%/java/html/rtab_r.gif
 %%WITH_RUBY%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby/examples
+%%WITH_RUBY%%@dirrmtry share/ruby
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby
-%%WITH_PHP%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/php/html
-%%WITH_PHP%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/php
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/php/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/php
 %%WITH_PYTHON%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/python/examples
-%%WITH_PYTHON%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/python/html
-%%WITH_PYTHON%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/python
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/python/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/python
 %%WITH_JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/java/html
 %%WITH_JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/java
 %%WITH_JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/xqj/html
@@ -326,6 +332,7 @@ lib/zorba/core/%%FULLVERSION%%/org/expath/ns/libfile_2.0.so
 %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xml.xq
 %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xml_2.0.xq
 %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xml_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc-options.xsd
 %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc.xq
 %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc2xhtml/error.xq
 %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc2xhtml/error_2.0.xq
@@ -348,12 +355,15 @@ lib/zorba/core/%%FULLVERSION%%/org/expath/ns/libfile_2.0.so
 %%DATADIR%%/uris/core/%%FULLVERSION%%/org/expath/ns/file_2.0.xq
 %%DATADIR%%/uris/core/%%FULLVERSION%%/org/expath/ns/file_2.xq
 %%DATADIR%%/uris/core/%%FULLVERSION%%/org/expath/ns/http-client.xsd
-%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/www/functions.xq
-%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/www/functions_1.xq
-%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/www/functions_1.0.xq
-%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/www/errors.xq
-%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/www/errors_0.xq
-%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/www/errors_0.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/functions.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/functions_1.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/functions_1.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/function-library.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/function-library_1.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/function-library_1.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/errors.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/errors_0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/errors_0.0.xq
 %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2001/xml.xsd
 %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/XQueryX.xsd
 %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xpath-functions.xq
@@ -426,7 +436,6 @@ share/cmake/Modules/zorba-%%FULLVERSION%%/ExternalModuleConfig.cmake.in
 @dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2001
 @dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www
 @dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3
-@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq/www
 @dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/jsoniq
 @dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/expath/ns
 @dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/expath