aboutsummaryrefslogtreecommitdiff
path: root/textproc/zorba
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2012-09-26 12:55:33 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2012-09-26 12:55:33 +0000
commit2a6ea84ccb5fb8469268c599a549c76c094cd36b (patch)
tree2db0daa7a4b4553b72f8ab4fbe25eb4d6deecdcd /textproc/zorba
parent30e6d7a2c6780f268d48cc43bad5e2f5095929dc (diff)
downloadports-2a6ea84ccb5fb8469268c599a549c76c094cd36b.tar.gz
ports-2a6ea84ccb5fb8469268c599a549c76c094cd36b.zip
Notes
Diffstat (limited to 'textproc/zorba')
-rw-r--r--textproc/zorba/Makefile69
-rw-r--r--textproc/zorba/distinfo4
-rw-r--r--textproc/zorba/files/patch-CMakeLists.txt37
-rw-r--r--textproc/zorba/files/patch-bin-debugger_main.cpp11
-rw-r--r--textproc/zorba/files/patch-cmake_modules_CMakeUseBison.cmake25
-rw-r--r--textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake30
-rw-r--r--textproc/zorba/files/patch-cmake_modules_FindPHP5.cmake13
-rw-r--r--textproc/zorba/files/patch-cmake_modules_FindSWIG.cmake11
-rw-r--r--textproc/zorba/files/patch-doc_CMakeLists.txt35
-rw-r--r--textproc/zorba/files/patch-modules-com-zorba-xquery-www-modules-datetime.xq.src_datetime.cpp41
-rw-r--r--textproc/zorba/files/patch-src-context_dynamic_context.cpp16
-rw-r--r--textproc/zorba/files/patch-src-util_string_util.cpp12
-rw-r--r--textproc/zorba/files/patch-src-zorbatypes_integer.cpp14
-rw-r--r--textproc/zorba/files/patch-swig-java_CMakeLists.txt32
-rw-r--r--textproc/zorba/files/patch-swig-php_CMakeLists.txt30
-rw-r--r--textproc/zorba/files/patch-swig-python_CMakeLists.txt22
-rw-r--r--textproc/zorba/files/patch-swig-ruby_CMakeLists.txt20
-rw-r--r--textproc/zorba/files/patch-swig-xqj_CMakeLists.txt17
-rw-r--r--textproc/zorba/files/patch-test-rbkt-modules-java_CMakeLists.txt16
-rw-r--r--textproc/zorba/pkg-plist386
20 files changed, 560 insertions, 281 deletions
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index 908e99cfbaf8..67a654740cab 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -1,46 +1,47 @@
-# New ports collection Makefile for: zorba
-# Date created: 22 February 2011
-# Whom: gahr
-#
+# Created by: gahr
# $FreeBSD$
-#
PORTNAME= zorba
-PORTVERSION= 2.0.2
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= textproc
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES= https://launchpadlibrarian.net/112668806/
+DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A general purpose C++ XQuery processor
LICENSE= AL2
-LIB_DEPENDS= xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
- tidy:${PORTSDIR}/www/tidy-lib \
- curl.6:${PORTSDIR}/ftp/curl \
- icudata.48:${PORTSDIR}/devel/icu
+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
+RUN_DEPENDS= fop:${PORTSDIR}/textproc/fop
-OPTIONS= PHP "PHP bindings" off \
- PYTHON "Python bindings" off \
- RUBY "Ruby bindings" off \
- JAVA "Java bindings" off
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+OPTIONS_DEFINE= PHP PYTHON RUBY JAVA
# Both install include/xqc.h
CONFLICTS= xqilla-[0-9]*
-USE_GNOME= libxml2
+USE_GNOME= libxml2 libxslt
+USE_ICONV= yes
USE_LDCONFIG= yes
USE_CMAKE= yes
CMAKE_OUTSOURCE=yes
-CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME}
+CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING=-I${LOCALBASE}/include
+
+DOCSDIR= ${PREFIX}/share/doc/${PKGNAME}
-DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-DATADIR= ${PREFIX}/share/${PORTNAME}-${PORTVERSION}
+PLIST_SUB+= FULLVERSION=${PORTVERSION} \
+ MIDVERSION=${PORTVERSION:R} \
+ MINVERSION=${PORTVERSION:R:R}
.include <bsd.port.options.mk>
-.if defined(WITH_PHP)
+.if ${PORT_OPTIONS:MPHP}
USE_PHP= tokenizer
USE_PHP_BUILD= yes
WITH_SWIG= yes
@@ -53,7 +54,7 @@ CMAKE_ARGS+= -DWITH_PHP5:BOOL=false
PLIST_SUB+= WITH_PHP="@comment "
.endif
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
USE_PYTHON= yes
WITH_SWIG= yes
CMAKE_ARGS+= -DWITH_PYTHON:BOOL=true \
@@ -66,7 +67,7 @@ CMAKE_ARGS+= -DWITH_PYTHON:BOOL=false
PLIST_SUB+= WITH_PYTHON="@comment "
.endif
-.if defined(WITH_RUBY)
+.if ${PORT_OPTIONS:MRUBY}
USE_RUBY= yes
WITH_SWIG= yes
CMAKE_ARGS+= -DWITH_RUBY:BOOL=true
@@ -76,11 +77,13 @@ CMAKE_ARGS+= -DWITH_RUBY:BOOL=false
PLIST_SUB+= WITH_RUBY="@comment "
.endif
-.if defined(WITH_JAVA)
+.if ${PORT_OPTIONS:MJAVA}
USE_JAVA= yes
+CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME}
+CATEGORIES+= java
WITH_SWIG= yes
CMAKE_ARGS+= -DWITH_JAVA:BOOL=true \
- -DJAVA_LIBDIR:PATH=${JAVALIBDIR:S/${PREFIX}//}
+ -DJAVA_LIBDIR:PATH=${JAVALIBDIR}
PLIST_SUB+= WITH_JAVA=""
.else
CMAKE_ARGS+= -DWITH_JAVA:BOOL=false
@@ -88,7 +91,7 @@ PLIST_SUB+= WITH_JAVA="@comment "
.endif
.if defined(WITH_SWIG)
-BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20
.endif
.if !defined(NOPORTDOCS)
@@ -97,12 +100,18 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
post-patch:
${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/cmake_modules/FindPHP5.cmake
+ ${WRKSRC}/CMakeLists.txt ${WRKSRC}/cmake_modules/FindPHP5.cmake
.if defined(NOPORTDOCS)
- ${REINPLACE_CMD} -e '481s|^|#|' ${WRKSRC}/CMakeLists.txt
+ ${REINPLACE_CMD} -e '531s|^|#|' ${WRKSRC}/CMakeLists.txt
.endif
-pre-build:
- ${FIND} ${WRKSRC} -name "*.orig" -delete
+#pre-build:
+# ${FIND} ${WRKSRC} -name "*.orig" -delete
+
+post-install:
+ ${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R}
+
+test: build
+ cd ${BUILD_WRKSRC} && ${MAKE} test
.include <bsd.port.mk>
diff --git a/textproc/zorba/distinfo b/textproc/zorba/distinfo
index 90e72be7da04..d76862f284a7 100644
--- a/textproc/zorba/distinfo
+++ b/textproc/zorba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zorba-2.0.2.tar.gz) = d81b017a794179017767aec0970ad74b0be7ae76d40334abb0a144b57ff7762e
-SIZE (zorba-2.0.2.tar.gz) = 7102339
+SHA256 (zorba-src-2.6.0.tar.gz) = a3e029faf57d9101452fbc04420b950e9b3386587c1d7ddbefb8c23c6acef829
+SIZE (zorba-src-2.6.0.tar.gz) = 11750258
diff --git a/textproc/zorba/files/patch-CMakeLists.txt b/textproc/zorba/files/patch-CMakeLists.txt
index 01544070c95e..c4f0db746ca7 100644
--- a/textproc/zorba/files/patch-CMakeLists.txt
+++ b/textproc/zorba/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig 2011-09-10 17:56:13.000000000 +0200
-+++ CMakeLists.txt 2011-09-15 09:45:41.000000000 +0200
+--- CMakeLists.txt.orig 2012-06-13 06:56:48.000000000 +0200
++++ CMakeLists.txt 2012-06-22 10:45:57.000000000 +0200
@@ -39,6 +39,10 @@
SET(LINUX "${CMAKE_SYSTEM}")
ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
@@ -11,3 +11,36 @@
# custom ctest options
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake)
+@@ -317,14 +321,21 @@
+ ENDIF(WIN32)
+
+ #
++# execinfo
++#
++IF(FREEBSD)
++ SET(requiredlibs ${requiredlibs} "/usr/local/lib/libexecinfo.so")
++ENDIF(FREEBSD)
++
++#
+ # SWIG
+ #
+ IF (NOT ZORBA_SUPPRESS_SWIG)
+ FIND_PACKAGE (SWIG)
+
+- COMPARE_VERSION_STRINGS("${SWIG_VERSION}" "1.3.40" result)
++ COMPARE_VERSION_STRINGS("${SWIG_VERSION}" "2.0.7" result)
+ IF(result LESS 0)
+- MESSAGE(WARNING "You need at least SWIG version 1.3.40")
++ MESSAGE(WARNING "You need at least SWIG version 2.0.7")
+ ENDIF(result LESS 0)
+
+
+@@ -504,7 +515,7 @@
+ SET(ZORBA_CMAKE_DIR "cmake" CACHE STRING
+ "Relative path to CMake files in Zorba installation")
+ ELSE (WIN32)
+- SET(ZORBA_CMAKE_DIR "share/cmake/zorba-${ZORBA_VERSION}" CACHE STRING
++ SET(ZORBA_CMAKE_DIR "share/cmake/Modules/zorba-${ZORBA_VERSION}" CACHE STRING
+ "Relative path to CMake files in Zorba installation")
+ ENDIF (WIN32)
+
diff --git a/textproc/zorba/files/patch-bin-debugger_main.cpp b/textproc/zorba/files/patch-bin-debugger_main.cpp
new file mode 100644
index 000000000000..5bd4192814f0
--- /dev/null
+++ b/textproc/zorba/files/patch-bin-debugger_main.cpp
@@ -0,0 +1,11 @@
+--- bin/debugger/main.cpp.orig 2012-06-21 11:19:43.000000000 +0200
++++ bin/debugger/main.cpp 2012-06-21 11:19:27.000000000 +0200
+@@ -22,6 +22,8 @@
+ #include <unistd.h>
+ #endif
+
++#include <signal.h>
++
+ #include <vector>
+
+ #include <zorba/config.h>
diff --git a/textproc/zorba/files/patch-cmake_modules_CMakeUseBison.cmake b/textproc/zorba/files/patch-cmake_modules_CMakeUseBison.cmake
new file mode 100644
index 000000000000..309ed7cffa1f
--- /dev/null
+++ b/textproc/zorba/files/patch-cmake_modules_CMakeUseBison.cmake
@@ -0,0 +1,25 @@
+--- cmake_modules/CMakeUseBison.cmake.orig 2012-06-28 14:18:14.000000000 +0200
++++ cmake_modules/CMakeUseBison.cmake 2012-06-28 14:18:33.000000000 +0200
+@@ -40,7 +40,9 @@
+ IF(NOT BISON_EXECUTABLE)
+ MESSAGE(STATUS "Looking for bison")
+ FIND_PROGRAM(BISON_EXECUTABLE bison)
+- IF(BISON_EXECUTABLE)
++ENDIF(NOT BISON_EXECUTABLE)
++
++IF(BISON_EXECUTABLE)
+ EXEC_PROGRAM(
+ ${BISON_EXECUTABLE}
+ ARGS --version
+@@ -55,9 +57,8 @@
+ ELSE (BISON_EXECUTABLE)
+ SET (BISON_MAJOR_VERSION "0")
+ SET (BISON_MINOR_VERSION "0")
+- ENDIF(BISON_EXECUTABLE)
+- SET (BISON_VERSION_FULL ${BISON_MAJOR_VERSION}.${BISON_MINOR_VERSION} CACHE STRING "The Bison version" FORCE)
+-ENDIF(NOT BISON_EXECUTABLE)
++ENDIF(BISON_EXECUTABLE)
++SET (BISON_VERSION_FULL ${BISON_MAJOR_VERSION}.${BISON_MINOR_VERSION} CACHE STRING "The Bison version" FORCE)
+
+ IF(BISON_EXECUTABLE)
+ MACRO(BISON_FILE FILENAME)
diff --git a/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake b/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake
new file mode 100644
index 000000000000..63706d88f60b
--- /dev/null
+++ b/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake
@@ -0,0 +1,30 @@
+--- 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
+@@ -30,7 +30,9 @@
+ IF(NOT FLEX_EXECUTABLE)
+ MESSAGE(STATUS "Looking for flex")
+ FIND_PROGRAM(FLEX_EXECUTABLE flex)
+- IF(FLEX_EXECUTABLE)
++ENDIF(NOT FLEX_EXECUTABLE)
++
++IF(FLEX_EXECUTABLE)
+ 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)
+- ELSE (FLEX_EXECUTABLE)
++ELSE (FLEX_EXECUTABLE)
+ SET (FLEX_MAJOR_VERSION "0")
+ SET (FLEX_MINOR_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)
++ENDIF(FLEX_EXECUTABLE)
++SET (FLEX_VERSION_FULL ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_REVISION_VERSION} CACHE STRING "The Flex version" FORCE)
+
+ IF(FLEX_EXECUTABLE)
+ MACRO(FLEX_FILE FILENAME)
diff --git a/textproc/zorba/files/patch-cmake_modules_FindPHP5.cmake b/textproc/zorba/files/patch-cmake_modules_FindPHP5.cmake
index 16133b802784..e5f10f69f3d9 100644
--- a/textproc/zorba/files/patch-cmake_modules_FindPHP5.cmake
+++ b/textproc/zorba/files/patch-cmake_modules_FindPHP5.cmake
@@ -1,5 +1,5 @@
---- cmake_modules/FindPHP5.cmake.orig 2011-09-15 09:46:24.000000000 +0200
-+++ cmake_modules/FindPHP5.cmake 2011-09-15 09:48:14.000000000 +0200
+--- cmake_modules/FindPHP5.cmake.orig 2012-06-21 09:33:11.000000000 +0200
++++ cmake_modules/FindPHP5.cmake 2012-06-21 09:34:40.000000000 +0200
@@ -27,15 +27,11 @@
SET(PHP5_FOUND "NO")
@@ -9,7 +9,7 @@
- /usr/include/php
- /usr/local/include/php
- /usr/local/apache/php
-+ %%LOCALBASE%%/include/php
++ %%LOCALBASE%%/include/php
)
SET(PHP5_POSSIBLE_LIB_PATHS
@@ -18,18 +18,17 @@
)
#FIND_PATH(PHP5_FOUND_INCLUDE_PATH main/php.h
-@@ -52,9 +48,7 @@
+@@ -52,8 +48,7 @@
FIND_PROGRAM(PHP5_EXECUTABLE
NAMES php5 php
PATHS
- /usr/bin
- /usr/local/bin
-- ${PHP5_BINARY_DIR}
+ %%LOCALBASE%%/bin
+ ${PHP5_BINARY_DIR}
)
MESSAGE(STATUS "Executable: " ${PHP5_EXECUTABLE})
-
-@@ -108,8 +102,7 @@
+@@ -116,8 +111,7 @@
FIND_PROGRAM(PHP5_CONFIG_EXECUTABLE
NAMES php5-config php-config
PATHS
diff --git a/textproc/zorba/files/patch-cmake_modules_FindSWIG.cmake b/textproc/zorba/files/patch-cmake_modules_FindSWIG.cmake
new file mode 100644
index 000000000000..fc8d59bc8c2b
--- /dev/null
+++ b/textproc/zorba/files/patch-cmake_modules_FindSWIG.cmake
@@ -0,0 +1,11 @@
+--- cmake_modules/FindSWIG.cmake.orig 2012-06-22 10:40:43.000000000 +0200
++++ cmake_modules/FindSWIG.cmake 2012-06-22 10:45:35.000000000 +0200
+@@ -25,7 +25,7 @@
+
+ SET(SWIG_FOUND FALSE)
+
+-FIND_PROGRAM(SWIG_EXECUTABLE swig)
++FIND_PROGRAM(SWIG_EXECUTABLE swig2.0)
+
+ IF(SWIG_EXECUTABLE)
+ EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -swiglib
diff --git a/textproc/zorba/files/patch-doc_CMakeLists.txt b/textproc/zorba/files/patch-doc_CMakeLists.txt
index aad648c2913c..7b49a9cfbe37 100644
--- a/textproc/zorba/files/patch-doc_CMakeLists.txt
+++ b/textproc/zorba/files/patch-doc_CMakeLists.txt
@@ -1,24 +1,37 @@
---- doc/CMakeLists.txt.orig 2011-09-15 09:49:09.000000000 +0200
-+++ doc/CMakeLists.txt 2011-09-15 09:50:35.000000000 +0200
-@@ -39,10 +39,18 @@
+--- doc/CMakeLists.txt.orig 2012-08-08 17:14:01.000000000 +0200
++++ doc/CMakeLists.txt 2012-09-19 17:26:59.000000000 +0200
+@@ -39,12 +39,19 @@
ADD_SUBDIRECTORY(c)
IF (SWIG_FOUND)
- ADD_SUBDIRECTORY(java)
-- ADD_SUBDIRECTORY(python)
-- ADD_SUBDIRECTORY(ruby)
+ IF (WITH_JAVA)
+ ADD_SUBDIRECTORY(java)
-+ ENDIF (WITH_JAVA)
++ ENDIF ()
+ ADD_SUBDIRECTORY(xqj)
+- ADD_SUBDIRECTORY(python)
+- ADD_SUBDIRECTORY(ruby)
+- ADD_SUBDIRECTORY(php)
+- ADD_SUBDIRECTORY(csharp)
+ IF (WITH_PYTHON)
+ ADD_SUBDIRECTORY(python)
-+ ENDIF (WITH_PYTHON)
++ ENDIF ()
+ IF (WITH_RUBY)
+ ADD_SUBDIRECTORY(ruby)
-+ ENDIF (WITH_RUBY)
++ ENDIF ()
+ IF (WITH_PHP)
- ADD_SUBDIRECTORY(php)
-+ ENDIF (WITH_PHP)
++ ADD_SUBDIRECTORY(php)
++ ENDIF ()
+
+ ENDIF (SWIG_FOUND)
+
+@@ -98,9 +105,6 @@
+ COMPONENT "doc"
+ DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqj)
+
+- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/csharp/html
+- COMPONENT "doc"
+- DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/csharp)
ENDIF (SWIG_FOUND)
- # generate Doxygen code documentation
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zorba/html
diff --git a/textproc/zorba/files/patch-modules-com-zorba-xquery-www-modules-datetime.xq.src_datetime.cpp b/textproc/zorba/files/patch-modules-com-zorba-xquery-www-modules-datetime.xq.src_datetime.cpp
new file mode 100644
index 000000000000..b586666cf870
--- /dev/null
+++ b/textproc/zorba/files/patch-modules-com-zorba-xquery-www-modules-datetime.xq.src_datetime.cpp
@@ -0,0 +1,41 @@
+--- ./modules/com/zorba-xquery/www/modules/datetime.xq.src/datetime.cpp.orig 2012-06-21 11:21:17.000000000 +0200
++++ ./modules/com/zorba-xquery/www/modules/datetime.xq.src/datetime.cpp 2012-06-21 11:03:07.000000000 +0200
+@@ -19,7 +19,9 @@
+ #include <zorba/singleton_item_sequence.h>
+
+ #include <time.h>
++#ifdef WIN21
+ #include <sys/timeb.h>
++#endif
+ #ifdef UNIX
+ #include <sys/time.h>
+ #endif
+@@ -40,16 +42,21 @@
+ lSummerTimeShift = -timebuffer.timezone * 60;
+ if (gmtm.tm_isdst != 0)
+ lSummerTimeShift += 3600;
+-#else
+- struct timeb timebuffer;
+- ftime( &timebuffer );
+- localtime_r(&timebuffer.time, &gmtm); //thread safe localtime on Linux
+- localtime_r(&timebuffer.time, &gmtm); //thread safe localtime on Linux
+- lSummerTimeShift = gmtm.tm_gmtoff;
+-#endif
+
+ timezone = lSummerTimeShift; // in seconds
+ millitm = timebuffer.millitm;
++#else
++ struct timeval tv;
++ struct timezone tz;
++ gettimeofday( &tv, &tz );
++ localtime_r(&tv.tv_sec, &gmtm); //thread safe localtime on Unix
++
++ if (tz.tz_dsttime != 0)
++ lSummerTimeShift = 3600;
++
++ timezone = -tz.tz_minuteswest * 60 + lSummerTimeShift; // in seconds
++ millitm = tv.tv_usec / 1000;
++#endif
+ }
+
+ /******************************************************************************
diff --git a/textproc/zorba/files/patch-src-context_dynamic_context.cpp b/textproc/zorba/files/patch-src-context_dynamic_context.cpp
index 25549221bb77..8f0d625d2cb7 100644
--- a/textproc/zorba/files/patch-src-context_dynamic_context.cpp
+++ b/textproc/zorba/files/patch-src-context_dynamic_context.cpp
@@ -1,5 +1,5 @@
---- src/context/dynamic_context.cpp.orig 2011-09-10 17:56:15.000000000 +0200
-+++ src/context/dynamic_context.cpp 2011-09-15 09:54:19.000000000 +0200
+--- src/context/dynamic_context.cpp.orig 2012-06-13 06:56:48.000000000 +0200
++++ src/context/dynamic_context.cpp 2012-06-21 09:49:08.000000000 +0200
@@ -18,7 +18,9 @@
#include "common/common.h"
#include <assert.h>
@@ -9,8 +9,8 @@
+#endif
#ifdef UNIX
#include <sys/time.h>
- #endif
-@@ -192,10 +194,10 @@
+ #include <unistd.h>
+@@ -238,10 +240,10 @@
if (gmtm.tm_isdst != 0)
lTimeShift += 3600;
#else
@@ -24,10 +24,10 @@
lTimeShift = gmtm.tm_gmtoff;
#endif
-@@ -207,7 +209,11 @@
- gmtm.tm_mday,
- gmtm.tm_hour,
- gmtm.tm_min,
+@@ -253,7 +255,11 @@
+ static_cast<short>(gmtm.tm_mday),
+ static_cast<short>(gmtm.tm_hour),
+ static_cast<short>(gmtm.tm_min),
+#ifdef WIN32
gmtm.tm_sec + timebuffer.millitm/1000.0,
+#else
diff --git a/textproc/zorba/files/patch-src-util_string_util.cpp b/textproc/zorba/files/patch-src-util_string_util.cpp
index fd1eaf12bc98..3ada0d6aa50c 100644
--- a/textproc/zorba/files/patch-src-util_string_util.cpp
+++ b/textproc/zorba/files/patch-src-util_string_util.cpp
@@ -1,5 +1,5 @@
---- src/util/string_util.cpp.orig 2011-09-15 11:58:15.000000000 +0200
-+++ src/util/string_util.cpp 2011-09-15 12:23:07.000000000 +0200
+--- src/util/string_util.cpp.orig 2012-06-13 06:56:48.000000000 +0200
++++ src/util/string_util.cpp 2012-06-21 09:49:48.000000000 +0200
@@ -92,7 +92,11 @@
float atof( char const *s ) {
char *end;
@@ -24,8 +24,8 @@
check_parse_number( s, end, static_cast<long long*>( nullptr ) );
return result;
}
-@@ -116,7 +124,11 @@
- );
+@@ -114,7 +122,11 @@
+
char *end;
errno = 0;
+#ifdef WIN32
@@ -34,5 +34,5 @@
+ unsigned long long const result = strtoull( s, &end, 10 );
+#endif
check_parse_number( s, end, static_cast<unsigned long long*>( nullptr ) );
- return result;
- }
+
+ if ( minus && result ) {
diff --git a/textproc/zorba/files/patch-src-zorbatypes_integer.cpp b/textproc/zorba/files/patch-src-zorbatypes_integer.cpp
deleted file mode 100644
index cd2f0c5c92b7..000000000000
--- a/textproc/zorba/files/patch-src-zorbatypes_integer.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/zorbatypes/integer.cpp.orig 2011-09-15 13:39:45.000000000 +0200
-+++ src/zorbatypes/integer.cpp 2011-09-15 13:40:12.000000000 +0200
-@@ -208,7 +208,11 @@
- MAPM const temp( d.sign() >= 0 ? d.floor() : d.ceil() );
- char *const buf = new char[ temp.exponent() + 3 ];
- temp.toIntegerString( buf );
-+#if defined( WIN32 )
- value_type const result( std::strtoll( buf, nullptr, 10 ) );
-+#else
-+ value_type const result( strtoll( buf, nullptr, 10 ) );
-+#endif
- delete[] buf;
- return result;
- }
diff --git a/textproc/zorba/files/patch-swig-java_CMakeLists.txt b/textproc/zorba/files/patch-swig-java_CMakeLists.txt
index 343ae34ca950..27c4f49ce1c3 100644
--- a/textproc/zorba/files/patch-swig-java_CMakeLists.txt
+++ b/textproc/zorba/files/patch-swig-java_CMakeLists.txt
@@ -1,5 +1,5 @@
---- swig/java/CMakeLists.txt.orig 2011-09-10 17:56:13.000000000 +0200
-+++ swig/java/CMakeLists.txt 2011-11-28 17:03:53.000000000 +0100
+--- swig/java/CMakeLists.txt.orig 2012-06-21 09:54:18.000000000 +0200
++++ swig/java/CMakeLists.txt 2012-06-21 09:56:11.000000000 +0200
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
@@ -9,32 +9,32 @@
FIND_PACKAGE ( Java )
INCLUDE ( ${CMAKE_SOURCE_DIR}/cmake_modules/FindJNI.cmake )
-@@ -46,9 +48,9 @@
+@@ -45,9 +47,9 @@
# The following fix was added because of the changes in CMake 2.8, which have the
# result of naming the java binding library "liblibzorba_api.so" instead of "libzorba_api.so"
-- IF ( LINUX OR CYGWIN )
-+ IF ( LINUX OR CYGWIN OR FREEBSD)
- SET_TARGET_PROPERTIES( ${SWIG_MODULE_libzorba_api_REAL_NAME} PROPERTIES PREFIX "" )
-- ENDIF ( LINUX OR CYGWIN )
-+ ENDIF ( LINUX OR CYGWIN OR FREEBSD)
+- IF (LINUX OR CYGWIN OR APPLE)
++ IF (LINUX OR CYGWIN OR APPLE OR FREEBSD)
+ SET_TARGET_PROPERTIES( lib_zorba_java_api PROPERTIES PREFIX "" )
+- ENDIF (LINUX OR CYGWIN OR APPLE)
++ ENDIF (LINUX OR CYGWIN OR APPLE OR FREEBSD)
- IF (${CMAKE_INSTALL_PREFIX} EQUAL "/usr/local")
- SET (JAVA_SITEARCH_DIR "/usr/share/java")
-@@ -65,8 +67,8 @@
+ FILE(GLOB ZORBA_API_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_SOURCE_DIR}/../*.h")
+ FOREACH(ZORBA_API_HEADER ${ZORBA_API_HEADERS})
+@@ -77,8 +79,8 @@
INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR})
ELSE ( APPLE )
IF(NOT WIN32)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so DESTINATION ${JAVA_SITEARCH_DIR})
- INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR})
-+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so DESTINATION ${JAVA_LIBDIR})
++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so DESTINATION ${JAVA_LIBDIR})
+ INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_LIBDIR})
ELSE(NOT WIN32)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.dll DESTINATION bin/java/org/zorbaxquery/api/
- COMPONENT "java_swig")
-@@ -78,3 +80,5 @@
+ IF (MSVC_IDE)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/zorba_api.dll
+@@ -102,3 +104,5 @@
ELSE (JAVA_INCLUDE_PATH)
- MESSAGE ( STATUS "SWIG Java: not generating JAVA API because jni headers not found.")
+ MESSAGE ( STATUS "SWIG: Java binding not generated because JNI was not found.")
ENDIF (JAVA_INCLUDE_PATH)
+
+ENDIF (WITH_JAVA)
diff --git a/textproc/zorba/files/patch-swig-php_CMakeLists.txt b/textproc/zorba/files/patch-swig-php_CMakeLists.txt
index 26f842917975..3847ff088d3a 100644
--- a/textproc/zorba/files/patch-swig-php_CMakeLists.txt
+++ b/textproc/zorba/files/patch-swig-php_CMakeLists.txt
@@ -1,33 +1,33 @@
---- swig/php/CMakeLists.txt.orig 2011-09-10 17:56:13.000000000 +0200
-+++ swig/php/CMakeLists.txt 2011-11-24 15:58:35.000000000 +0100
+--- swig/php/CMakeLists.txt.orig 2012-06-21 09:56:31.000000000 +0200
++++ swig/php/CMakeLists.txt 2012-06-21 09:57:39.000000000 +0200
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+IF (WITH_PHP5)
+
- IF (NOT PHP5_FOUND)
- MESSAGE (STATUS "SWIG PHP: PHP5 binding not generated because library and include file not installed.")
- ELSE (NOT PHP5_FOUND)
-@@ -40,13 +42,11 @@
+ IF (PHP5_FOUND)
+ MESSAGE (STATUS "SWIG: Generating PHP5 API")
+@@ -52,13 +54,11 @@
# The following fix was added because of the changes in CMake 2.8, which have the
# result of naming the java binding library "liblibzorba_api.so" instead of "libzorba_api.so"
-- IF (LINUX OR CYGWIN)
-+ IF (LINUX OR CYGWIN OR FREEBSD)
+ SET_TARGET_PROPERTIES( ${SWIG_MODULE_zorba_api_REAL_NAME} PROPERTIES PROJECT_LABEL "PHP" FOLDER "APIs")
+- IF (LINUX OR CYGWIN OR APPLE)
++ IF (LINUX OR CYGWIN OR APPLE OR FREEBSD)
SET_TARGET_PROPERTIES (${SWIG_MODULE_zorba_api_REAL_NAME} PROPERTIES PREFIX "")
-- ENDIF (LINUX OR CYGWIN)
-+ ENDIF (LINUX OR CYGWIN OR FREEBSD)
+- ENDIF (LINUX OR CYGWIN OR APPLE)
++ ENDIF (LINUX OR CYGWIN OR APPLE OR FREEBSD)
IF (NOT WIN32 OR CYGWIN)
- STRING (REPLACE ${CMAKE_INSTALL_PREFIX} "" PHP5_INSTALL_PATH ${PHP5_EXTENSION_DIR})
- SET (PHP5_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/php5")
- MESSAGE (STATUS "SWIG PHP: PHP module install path: " ${PHP5_INSTALL_PATH})
INSTALL (
-@@ -88,3 +88,5 @@
- ### End PHP proxy generation
-
- ENDIF (NOT PHP5_FOUND)
+ FILES
+@@ -89,3 +89,5 @@
+ ELSE (PHP5_FOUND)
+ MESSAGE (STATUS "SWIG: PHP5 binding not generated because library and include file are not installed.")
+ ENDIF (PHP5_FOUND)
+
+ENDIF (WITH_PHP5)
diff --git a/textproc/zorba/files/patch-swig-python_CMakeLists.txt b/textproc/zorba/files/patch-swig-python_CMakeLists.txt
index 7cc9b5aee1fb..f8fe86f33557 100644
--- a/textproc/zorba/files/patch-swig-python_CMakeLists.txt
+++ b/textproc/zorba/files/patch-swig-python_CMakeLists.txt
@@ -1,5 +1,5 @@
---- swig/python/CMakeLists.txt.orig 2011-09-10 17:56:13.000000000 +0200
-+++ swig/python/CMakeLists.txt 2011-11-28 11:13:44.000000000 +0100
+--- swig/python/CMakeLists.txt.orig 2012-06-21 09:58:01.000000000 +0200
++++ swig/python/CMakeLists.txt 2012-06-21 09:58:39.000000000 +0200
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
@@ -7,9 +7,9 @@
+IF (WITH_PYTHON)
+
IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
- MESSAGE (STATUS "SWIG Python: generating Python API")
+ MESSAGE (STATUS "SWIG: Generating Python API")
-@@ -35,14 +37,14 @@
+@@ -46,7 +48,7 @@
FILES
${CMAKE_CURRENT_BINARY_DIR}/zorba_api.py
${CMAKE_CURRENT_BINARY_DIR}/_zorba_api.so
@@ -17,18 +17,10 @@
+ DESTINATION ${PYTHON_SWIG_INSTALL_DIR}
)
ELSE(NOT WIN32)
- INSTALL (
- FILES
- ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.py
- ${CMAKE_CURRENT_BINARY_DIR}/_zorba_api.pyd
-- DESTINATION bin/python
-+ DESTINATION ${PYTHON_SWIG_INSTALL_DIR}
- COMPONENT "python_swig"
- )
- ENDIF(NOT WIN32)
-@@ -52,3 +54,5 @@
+ INSTALL ( FILES
+@@ -60,3 +62,5 @@
ELSE (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
- MESSAGE (STATUS "SWIG Python: binding not generated because library and include files are not installed.")
+ MESSAGE (STATUS "SWIG: Python binding not generated because library and include files are not installed.")
ENDIF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
+
+ENDIF (WITH_PYTHON)
diff --git a/textproc/zorba/files/patch-swig-ruby_CMakeLists.txt b/textproc/zorba/files/patch-swig-ruby_CMakeLists.txt
index 881e944f943e..525dda53f1ae 100644
--- a/textproc/zorba/files/patch-swig-ruby_CMakeLists.txt
+++ b/textproc/zorba/files/patch-swig-ruby_CMakeLists.txt
@@ -1,5 +1,5 @@
---- swig/ruby/CMakeLists.txt.orig 2011-09-10 17:56:13.000000000 +0200
-+++ swig/ruby/CMakeLists.txt 2011-09-15 10:01:12.000000000 +0200
+--- swig/ruby/CMakeLists.txt.orig 2012-06-21 09:59:38.000000000 +0200
++++ swig/ruby/CMakeLists.txt 2012-06-21 10:00:14.000000000 +0200
@@ -11,6 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
@@ -10,21 +10,21 @@
IF(APPLE)
CMAKE_FIND_FRAMEWORKS ( Ruby )
ENDIF(APPLE)
-@@ -28,9 +31,9 @@
+@@ -44,9 +47,9 @@
# The following fix was added because of the changes in CMake 2.8, which have the
# result of naming the java binding library "liblibzorba_api.so" instead of "libzorba_api.so"
-- IF ( LINUX OR CYGWIN )
-+ IF ( LINUX OR CYGWIN OR FREEBSD )
+- IF ( LINUX OR CYGWIN OR APPLE )
++ IF ( LINUX OR CYGWIN OR APPLE OR FREEBSD )
SET_TARGET_PROPERTIES( ${SWIG_MODULE_zorba_api_REAL_NAME} PROPERTIES PREFIX "" )
-- ENDIF ( LINUX OR CYGWIN )
-+ ENDIF ( LINUX OR CYGWIN OR FREEBSD )
+- ENDIF ( LINUX OR CYGWIN OR APPLE )
++ ENDIF ( LINUX OR CYGWIN OR APPLE OR FREEBSD )
EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']"
- 48 OUTPUT_VARIABLE RUBY_SITEARCH_DIR)
-@@ -49,3 +52,5 @@
+ OUTPUT_VARIABLE RUBY_SITEARCH_DIR)
+@@ -85,3 +88,5 @@
ELSE (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
- MESSAGE(STATUS "SWIG Ruby: binding not generated because library and include files are not installed.")
+ MESSAGE(STATUS "SWIG: Ruby binding not generated because library and include files are not installed.")
ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+
+ENDIF (WITH_RUBY)
diff --git a/textproc/zorba/files/patch-swig-xqj_CMakeLists.txt b/textproc/zorba/files/patch-swig-xqj_CMakeLists.txt
new file mode 100644
index 000000000000..745ef1002e74
--- /dev/null
+++ b/textproc/zorba/files/patch-swig-xqj_CMakeLists.txt
@@ -0,0 +1,17 @@
+--- swig/xqj/CMakeLists.txt.orig 2012-06-27 11:49:12.000000000 +0200
++++ swig/xqj/CMakeLists.txt 2012-06-27 11:49:35.000000000 +0200
+@@ -12,6 +12,8 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
++IF (WITH_JAVA)
++
+ INCLUDE (CMakeJavaInformation )
+ MESSAGE(STATUS "SWIG: Generating XQJ API")
+
+@@ -123,3 +125,5 @@
+ ELSEIF (Java_Development_FOUND)
+ MESSAGE ( STATUS "SWIG Java: Not generating XQJ API because JNI headers not found.")
+ ENDIF (Java_Development_FOUND)
++
++ENDIF (WITH_JAVA)
diff --git a/textproc/zorba/files/patch-test-rbkt-modules-java_CMakeLists.txt b/textproc/zorba/files/patch-test-rbkt-modules-java_CMakeLists.txt
new file mode 100644
index 000000000000..51e2f673148d
--- /dev/null
+++ b/textproc/zorba/files/patch-test-rbkt-modules-java_CMakeLists.txt
@@ -0,0 +1,16 @@
+--- test/rbkt/modules/java/CMakeLists.txt.orig 2012-09-25 09:26:34.000000000 +0200
++++ test/rbkt/modules/java/CMakeLists.txt 2012-09-25 09:27:23.000000000 +0200
+@@ -16,6 +16,8 @@
+ # on the JVM claspath. This test scenario should be extended to include a
+ # Zorba module using the .jar, etc.
+ # We make use of the much-improved Java support added in CMake 2.8.6.
++
++IF (WITH_JAVA)
+ COMPARE_VERSION_STRINGS (${CMAKE_VERSION} "2.8.6" RESULT)
+ IF (${RESULT} GREATER -1)
+ FIND_PACKAGE (Java COMPONENTS Development)
+@@ -34,3 +36,4 @@
+
+ ENDIF (Java_Development_FOUND)
+ ENDIF (${RESULT} GREATER -1)
++ENDIF (WITH_JAVA)
diff --git a/textproc/zorba/pkg-plist b/textproc/zorba/pkg-plist
index 9e653f9be388..d59544894585 100644
--- a/textproc/zorba/pkg-plist
+++ b/textproc/zorba/pkg-plist
@@ -1,11 +1,13 @@
bin/testdriver
bin/zorba
+bin/xqdb
include/xqc.h
include/zorba/annotation.h
include/zorba/api_shared_types.h
include/zorba/audit.h
include/zorba/audit_scoped.h
include/zorba/base64.h
+include/zorba/base64_stream.h
include/zorba/collection.h
include/zorba/collection_manager.h
include/zorba/config.h
@@ -20,13 +22,16 @@ include/zorba/diagnostic_list.h
include/zorba/document_manager.h
include/zorba/dynamic_context.h
include/zorba/empty_sequence.h
+include/zorba/external_function_parameter.h
include/zorba/error.h
include/zorba/external_module.h
include/zorba/file.h
include/zorba/function.h
include/zorba/identtypes.h
include/zorba/internal/diagnostic.h
+include/zorba/internal/proxy.h
include/zorba/internal/qname.h
+include/zorba/internal/streambuf.h
include/zorba/internal/system_diagnostic.h
include/zorba/internal/type_traits.h
include/zorba/internal/unique_ptr.h
@@ -53,13 +58,16 @@ include/zorba/store_consts.h
include/zorba/store_manager.h
include/zorba/store_manager_c.h
include/zorba/streams.h
+include/zorba/thesaurus.h
include/zorba/tokenizer.h
+include/zorba/transcode_stream.h
include/zorba/typeident.h
include/zorba/unit_tests.h
include/zorba/uri_resolvers.h
include/zorba/user_exception.h
include/zorba/util/file.h
include/zorba/util/path.h
+include/zorba/util/time.h.orig
include/zorba/util/time.h
include/zorba/util/timer.h
include/zorba/util/uri.h
@@ -77,120 +85,18 @@ include/zorba/zorba_functions.h
include/zorba/zorba_string.h
include/zorba/zorbac.h
lib/libzorba_simplestore.so
-lib/libzorba_simplestore.so.2.0.2
+lib/libzorba_simplestore.so.%%MINVERSION%%
+lib/libzorba_simplestore.so.%%FULLVERSION%%
+lib/zorba/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/libhttp-client_2.0.so
+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%%/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
-%%DATADIR%%/cmake/ExternalModuleConfig.cmake.in
-%%DATADIR%%/cmake/ZorbaConfig.cmake
-%%DATADIR%%/cmake/ZorbaConfigVersion.cmake
-%%DATADIR%%/cmake/ZorbaModule.cmake
-%%DATADIR%%/cmake/ZorbaUse.cmake
-%%DATADIR%%/modules/com/functx/www/index.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/errors.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/converters/base64.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/converters/base64_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/converters/base64_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/datetime.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/datetime_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/datetime_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/fetch.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/fetch_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/fetch_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/http-client.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/http-client_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/http-client_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/introspection/sctx.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/introspection/sctx_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/introspection/sctx_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/libdatetime_2.0.so
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/libhttp-client_2.0.so
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/math.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/math_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/math_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/node-reference.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/node-reference_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/node-reference_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/node.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/node_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/node_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/project_xqdoc.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/project_xqdoc_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/project_xqdoc_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/random.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/random_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/random_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/reflection.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/reflection_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/reflection_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/schema.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/schema_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/schema_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/data-structures/unordered-map_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/ddl_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/dml_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/documents.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/documents_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/documents_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/collections/ddl.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/collections/ddl_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/collections/ddl_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/collections/dml.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/collections/dml_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/collections/dml_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/indexes/ddl_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/indexes/ddl_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/indexes/dml_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/indexes/dml_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/string.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/string_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/string_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xml.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xml_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xml_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc2xhtml/error.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc2xhtml/error_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc2xhtml/error_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc_2.0.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc_2.xq
-%%DATADIR%%/modules/com/zorba-xquery/www/warnings.xq
-%%DATADIR%%/modules/org/expath/ns/error.xq
-%%DATADIR%%/modules/org/expath/ns/file.xq
-%%DATADIR%%/modules/org/expath/ns/file_2.0.xq
-%%DATADIR%%/modules/org/expath/ns/file_2.xq
-%%DATADIR%%/modules/org/expath/ns/http-client.xsd
-%%DATADIR%%/modules/org/expath/ns/libfile_2.0.so
-%%DATADIR%%/modules/org/w3/www/2001/xml.xsd
-%%DATADIR%%/modules/org/w3/www/2005/xpath-functions.xq
-%%DATADIR%%/modules/org/w3/www/2005/xpath-functions.xsd
-%%DATADIR%%/modules/org/w3/www/2005/xpath-functions/math.xq
-%%DATADIR%%/modules/org/w3/www/2005/xqt-errors.xq
-%%DATADIR%%/modules/org/w3/www/2010/xslt-xquery-serialization.xsd
+%%WITH_JAVA%%%%JAVASHAREDIR%%/zorba_xqj.jar
+%%WITH_JAVA%%%%JAVASHAREDIR%%/xqjapi.jar
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
%%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
@@ -226,6 +132,7 @@ lib/libzorba_simplestore.so.2.0.2
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/execution_plans.cpp
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/external_functions.cpp
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/item_handler.cpp
+%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/jsoniq.cpp
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/module_import_check.cpp
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/sax2.cpp
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/serialization.cpp
@@ -279,7 +186,12 @@ lib/libzorba_simplestore.so.2.0.2
%%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/templates/www.functx.com_index.html
%%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/templates/www.w3.org_2005_xpath-functions.html
%%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/templates/www.w3.org_2005_xpath-functions_math.html
+%%WITH_JAVA%%%%PORTDOCS%%%%DOCSDIR%%/xqj/html/rtab_b.gif
+%%WITH_JAVA%%%%PORTDOCS%%%%DOCSDIR%%/xqj/html/rtab_r.gif
+%%WITH_JAVA%%%%PORTDOCS%%%%DOCSDIR%%/xqj/html/rtab_l.gif
+%%PORTDOCS%%%%DOCSDIR%%/zorba/html/JSONforXQuery.html
%%PORTDOCS%%%%DOCSDIR%%/zorba/html/W3C-WD.css
+%%PORTDOCS%%%%DOCSDIR%%/zorba/html/XQueryforJSON.html
%%PORTDOCS%%%%DOCSDIR%%/zorba/html/documentation.png
%%PORTDOCS%%%%DOCSDIR%%/zorba/html/download.png
%%PORTDOCS%%%%DOCSDIR%%/zorba/html/modules.png
@@ -300,46 +212,168 @@ lib/libzorba_simplestore.so.2.0.2
%%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
-@dirrm include/zorba/internal
-@dirrm include/zorba/util
-@dirrm include/zorba
-@dirrm %%DATADIR%%/modules/org/w3/www/2010
-@dirrm %%DATADIR%%/modules/org/w3/www/2005/xpath-functions
-@dirrm %%DATADIR%%/modules/org/w3/www/2005
-@dirrm %%DATADIR%%/modules/org/w3/www/2001
-@dirrm %%DATADIR%%/modules/org/w3/www
-@dirrm %%DATADIR%%/modules/org/w3
-@dirrm %%DATADIR%%/modules/org/expath/ns
-@dirrm %%DATADIR%%/modules/org/expath
-@dirrm %%DATADIR%%/modules/org
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/xqdoc2xhtml
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/integrity_constraints
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/indexes
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static/collections
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/store/static
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections/w3c
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic/collections
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/store/dynamic
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/store/data-structures
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/store
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/introspection
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules/converters
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www/modules
-@dirrm %%DATADIR%%/modules/com/zorba-xquery/www
-@dirrm %%DATADIR%%/modules/com/zorba-xquery
-@dirrm %%DATADIR%%/modules/com/functx/www
-@dirrm %%DATADIR%%/modules/com/functx
-@dirrm %%DATADIR%%/modules/com
-@dirrm %%DATADIR%%/modules
-@dirrm %%DATADIR%%/cmake
-@dirrm %%DATADIR%%
-%%WITH_RUBY%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby/html
-%%WITH_RUBY%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby
+%%WITH_RUBY%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby
+%%WITH_PHP%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/php/html
+%%WITH_PHP%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/php
%%WITH_PYTHON%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/python/examples
%%WITH_PYTHON%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/python/html
%%WITH_PYTHON%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/python
%%WITH_JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/java/html
%%WITH_JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/java
+%%WITH_JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/xqj/html
+%%WITH_JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/xqj
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www/index.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www/index_0.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www/index_0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/errors.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/errors_0.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/errors_0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/converters/base64.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/converters/base64_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/converters/base64_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/converters/json-options.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/converters/json.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/converters/json_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/converters/json_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/datetime.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/datetime_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/datetime_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/debugger/dbgp-message-handler.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/debugger/dbgp-message-handler_1.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/debugger/dbgp-message-handler_1.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/fetch.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/fetch_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/fetch_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/full-text.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/full-text.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/full-text_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/full-text_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/http-client.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/http-client_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/http-client_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/introspection/sctx.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/introspection/sctx_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/introspection/sctx_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/math.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/math_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/math_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/node-position.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/node-position_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/node-position_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/node-reference.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/node-reference_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/node-reference_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/node.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/node_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/node_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/project_xqdoc.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/project_xqdoc_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/project_xqdoc_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/random.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/random_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/random_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/reflection.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/reflection_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/reflection_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/schema.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/schema_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/schema_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/data-structures/unordered-map.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/data-structures/unordered-map_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/data-structures/unordered-map_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/ddl.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/ddl_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/ddl_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/dml.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/dml_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/dml_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/ddl_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/w3c/dml_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/documents.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/documents_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/documents_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/collections/ddl.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/collections/ddl_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/collections/ddl_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/collections/dml.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/collections/dml_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/collections/dml_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/indexes/ddl.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/indexes/ddl_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/indexes/ddl_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/indexes/dml.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/indexes/dml_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/indexes/dml_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/integrity_constraints/ddl_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/integrity_constraints/dml_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/string.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/string_2.1.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/string_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/uri.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/uri_1.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/uri_1.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xml-options.xsd
+%%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.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
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc2xhtml/error_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc2xhtml/index_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc2xhtml/index_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc_2.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc_2.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/schemas/complete-pul.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/schemas/pul.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/schemas/xdm.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/warnings.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/warnings_0.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/warnings_0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/expath/ns/error.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/expath/ns/error_0.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/expath/ns/error_0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/expath/ns/file.xq
+%%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/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
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xpath-functions.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xpath-functions/math.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xpath-functions/math_0.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xpath-functions/math_0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xpath-functions_0.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xpath-functions_0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xqt-errors.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xqt-errors_0.0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xqt-errors_0.xq
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2010/xslt-xquery-serialization.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/TR/xhtml1/DTD/xhtml-lat1.ent.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/TR/xhtml1/DTD/xhtml-special.ent.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/TR/xhtml1/DTD/xhtml-symbol.ent.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/TR/xhtml1/DTD/xhtml1-frameset.dtd.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/TR/xhtml1/DTD/xhtml1-strict.dtd.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/TR/xhtml1/DTD/xhtml1-transitional.dtd.xsd
+%%DATADIR%%/uris/core/%%FULLVERSION%%/org/xqdoc/www/1.0.xsd
%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/xqdoc
%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba
@@ -359,3 +393,65 @@ lib/libzorba_simplestore.so.2.0.2
%%PORTDOCS%%@dirrm %%DOCSDIR%%/c/examples
%%PORTDOCS%%@dirrm %%DOCSDIR%%/c
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+share/cmake/Modules/zorba-%%FULLVERSION%%/ZorbaModule.cmake
+share/cmake/Modules/zorba-%%FULLVERSION%%/ZorbaConfig.cmake
+share/cmake/Modules/zorba-%%FULLVERSION%%/ZorbaConfigVersion.cmake
+share/cmake/Modules/zorba-%%FULLVERSION%%/ZorbaUse.cmake
+share/cmake/Modules/zorba-%%FULLVERSION%%/ExternalModuleConfig.cmake.in
+@dirrm share/cmake/Modules/zorba-%%FULLVERSION%%
+@dirrm lib/zorba/core/%%FULLVERSION%%/org/expath/ns
+@dirrm lib/zorba/core/%%FULLVERSION%%/org/expath
+@dirrm lib/zorba/core/%%FULLVERSION%%/org
+@dirrm lib/zorba/core/%%FULLVERSION%%/edu/princeton/wordnet
+@dirrm lib/zorba/core/%%FULLVERSION%%/edu/princeton
+@dirrm lib/zorba/core/%%FULLVERSION%%/edu
+@dirrm lib/zorba/core/%%FULLVERSION%%/com/zorba-xquery/www/modules
+@dirrm lib/zorba/core/%%FULLVERSION%%/com/zorba-xquery/www
+@dirrm lib/zorba/core/%%FULLVERSION%%/com/zorba-xquery
+@dirrm lib/zorba/core/%%FULLVERSION%%/com
+@dirrm lib/zorba/core/%%FULLVERSION%%
+@dirrm lib/zorba/core
+@dirrm lib/zorba
+@dirrm include/zorba/util
+@dirrm include/zorba/internal
+@dirrm include/zorba
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/xqdoc/www
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/xqdoc
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/TR/xhtml1/DTD
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/TR/xhtml1
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/TR
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2010
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005/xpath-functions
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org/w3/www/2005
+@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
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/org
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/schemas
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/xqdoc2xhtml
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/integrity_constraints
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/indexes
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static/collections
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/static
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections/w3c
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic/collections
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/dynamic
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store/data-structures
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/store
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/introspection
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/debugger
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules/converters
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www/modules
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery/www
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/zorba-xquery
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%/com
+@dirrm %%DATADIR%%/uris/core/%%FULLVERSION%%
+@dirrm %%DATADIR%%/uris/core
+@dirrm %%DATADIR%%/uris
+@dirrm %%DATADIR%%