Index: Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 14 Sep 2011 07:38:20 -0000 1.1 +++ Makefile 15 Sep 2011 12:55:52 -0000 @@ -6,9 +6,9 @@ # PORTNAME= zorba -PORTVERSION= 1.4.0 +PORTVERSION= 2.0.2 CATEGORIES= textproc -MASTER_SITES= SF +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= gahr@FreeBSD.org COMMENT= A general purpose C++ XQuery processor @@ -35,6 +35,7 @@ CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME} DOCSDIR= ${PREFIX}/share/doc/${PKGNAME} +DATADIR= ${PREFIX}/share/${PKGNAME} .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 14 Sep 2011 07:38:20 -0000 1.1 +++ distinfo 15 Sep 2011 12:55:52 -0000 @@ -1,2 +1,2 @@ -SHA256 (zorba-1.4.0.tar.gz) = 230518cdb70568f286397961f878b61e268370aca9b9d2f3817b6d1fdfb9cf86 -SIZE (zorba-1.4.0.tar.gz) = 5177139 +SHA256 (zorba-2.0.2.tar.gz) = d81b017a794179017767aec0970ad74b0be7ae76d40334abb0a144b57ff7762e +SIZE (zorba-2.0.2.tar.gz) = 7102339 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 14 Sep 2011 07:38:20 -0000 1.1 +++ pkg-plist 15 Sep 2011 12:55:52 -0000 @@ -1,216 +1,350 @@ -include/zorba/modules/org/w3/www/2005/Atom.xsd -include/zorba/modules/org/w3/www/2005/xml.xsd -include/zorba/modules/org/w3/www/2005/xpath_functions.xq -include/zorba/modules/org/expath/ns/http-client.xsd -include/zorba/modules/org/expath/ns/http-client.xq -include/zorba/modules/org/expath/ns/httpclientimpl.xq -include/zorba/modules/org/expath/ns/error.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/errors.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/information.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/statistical.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/math.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/lookup.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/datetime.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/engineering.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/logical.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/math-sumproduct.xq -include/zorba/modules/com/zorba-xquery/www/modules/excel/text.xq -include/zorba/modules/com/zorba-xquery/www/modules/serialize.xq -include/zorba/modules/com/zorba-xquery/www/modules/tidy.xq -include/zorba/modules/com/zorba-xquery/www/modules/xqdoc.xq -include/zorba/modules/com/zorba-xquery/www/modules/math.xq -include/zorba/modules/com/zorba-xquery/www/modules/file.xq -include/zorba/modules/com/zorba-xquery/www/modules/node-reference.xq -include/zorba/modules/com/zorba-xquery/www/modules/random.xq -include/zorba/modules/com/zorba-xquery/www/modules/schema.xq -include/zorba/modules/com/zorba-xquery/www/modules/datetime.xq -include/zorba/modules/com/zorba-xquery/www/modules/csv2xml.xq -include/zorba/modules/com/zorba-xquery/www/modules/json.xq -include/zorba/modules/com/zorba-xquery/www/modules/base64.xq -include/zorba/modules/com/zorba-xquery/www/modules/email/smtp.xq -include/zorba/modules/com/zorba-xquery/www/modules/security/hmac.xq -include/zorba/modules/com/zorba-xquery/www/modules/process.xq -include/zorba/modules/com/zorba-xquery/www/modules/introspection/dctx.xq -include/zorba/modules/com/zorba-xquery/www/modules/introspection/sctx.xq -include/zorba/modules/com/zorba-xquery/www/modules/xqddf.xq -include/zorba/modules/com/zorba-xquery/www/modules/libfile.so.1.4.0 -include/zorba/modules/com/zorba-xquery/www/modules/libfile.so -include/zorba/modules/com/zorba-xquery/www/modules/libprocess.so.1.4.0 -include/zorba/modules/com/zorba-xquery/www/modules/libprocess.so -include/zorba/modules/com/zorba-xquery/www/modules/libserialize.so.1.4.0 -include/zorba/modules/com/zorba-xquery/www/modules/libserialize.so -include/zorba/modules/com/zorba-xquery/www/modules/libdatetime.so.1.4.0 -include/zorba/modules/com/zorba-xquery/www/modules/libdatetime.so -include/zorba/modules/com/zorba-xquery/www/modules/security/libhmac.so.1.4.0 -include/zorba/modules/com/zorba-xquery/www/modules/security/libhmac.so -include/zorba/modules/org/expath/ns/libhttpclientimpl.so.1.4.0 -include/zorba/modules/org/expath/ns/libhttpclientimpl.so -include/zorba/zorba/debugger_exception.h -include/zorba/zorba/util/file.h -include/zorba/zorba/util/path.h -include/zorba/zorba/store_consts.h -include/zorba/zorba/debugger_event_handler.h -include/zorba/zorba/pure_stateless_function.h -include/zorba/zorba/base64.h -include/zorba/zorba/debugger_client.h -include/zorba/zorba/store_manager_c.h -include/zorba/zorba/item_factory.h -include/zorba/zorba/uri_resolvers.h -include/zorba/zorba/zorbac.h -include/zorba/zorba/error_handler.h -include/zorba/zorba/external_module.h -include/zorba/zorba/printer_error_handler.h -include/zorba/zorba/item_sequence.h -include/zorba/zorba/exception.h -include/zorba/zorba/static_context_consts.h -include/zorba/zorba/vector_item_sequence.h -include/zorba/zorba/item.h -include/zorba/zorba/file.h -include/zorba/zorba/properties_base.h -include/zorba/zorba/empty_sequence.h -include/zorba/zorba/xquery.h -include/zorba/zorba/static_context.h -include/zorba/zorba/declared_collection.h -include/zorba/zorba/xmldatamanager.h -include/zorba/zorba/default_content_handler.h -include/zorba/zorba/nonepure_stateless_function.h -include/zorba/zorba/zorba.h -include/zorba/zorba/function.h -include/zorba/zorba/default_error_handler.h -include/zorba/zorba/version.h -include/zorba/zorba/identtypes.h -include/zorba/zorba/iterator.h -include/zorba/zorba/api_shared_types.h -include/zorba/zorba/serializable.h -include/zorba/zorba/singleton_item_sequence.h -include/zorba/zorba/options.h -include/zorba/zorba/collection.h -include/zorba/zorba/zorbastring.h -include/zorba/zorba/external_function_data.h -include/zorba/zorba/smart_ptr.h -include/zorba/zorba/serialization_callback.h -include/zorba/zorba/sax2.h -include/zorba/zorba/typeident.h -include/zorba/zorba/debugger_default_event_handler.h -include/zorba/zorba/declared_index.h -include/zorba/zorba/external_function.h -include/zorba/zorba/stateless_function.h -include/zorba/zorba/error.h -include/zorba/zorba/serializer.h -include/zorba/zorba/store_manager.h -include/zorba/zorba/dynamic_context.h -include/zorba/simplestore/msdom/import.h +bin/testdriver +bin/zorba include/xqc.h -include/zorba/zorba/config.h -lib/libzorba_simplestore.so.1.4.0 +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/collection.h +include/zorba/collection_manager.h +include/zorba/config.h +include/zorba/debugger_client.h +include/zorba/debugger_default_event_handler.h +include/zorba/debugger_event_handler.h +include/zorba/debugger_exception.h +include/zorba/default_content_handler.h +include/zorba/diagnostic.h +include/zorba/diagnostic_handler.h +include/zorba/diagnostic_list.h +include/zorba/document_manager.h +include/zorba/dynamic_context.h +include/zorba/empty_sequence.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/qname.h +include/zorba/internal/system_diagnostic.h +include/zorba/internal/type_traits.h +include/zorba/internal/unique_ptr.h +include/zorba/internal/ztd.h +include/zorba/item.h +include/zorba/item_factory.h +include/zorba/item_sequence.h +include/zorba/iterator.h +include/zorba/locale.h +include/zorba/options.h +include/zorba/printer_diagnostic_handler.h +include/zorba/properties_base.h +include/zorba/query_location.h +include/zorba/sax2.h +include/zorba/serialization_callback.h +include/zorba/serializer.h +include/zorba/singleton_item_sequence.h +include/zorba/smart_ptr.h +include/zorba/static_collection_manager.h +include/zorba/static_context.h +include/zorba/static_context_consts.h +include/zorba/stemmer.h +include/zorba/store_consts.h +include/zorba/store_manager.h +include/zorba/store_manager_c.h +include/zorba/streams.h +include/zorba/tokenizer.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 +include/zorba/util/time.h.orig +include/zorba/util/timer.h +include/zorba/util/uri.h +include/zorba/vector_item_sequence.h +include/zorba/version.h +include/zorba/xmldatamanager.h +include/zorba/xquery.h +include/zorba/xquery_exception.h +include/zorba/xquery_functions.h +include/zorba/xquery_stack_trace.h +include/zorba/xquery_warning.h +include/zorba/zorba.h +include/zorba/zorba_exception.h +include/zorba/zorba_functions.h +include/zorba/zorba_string.h +include/zorba/zorbac.h +include/zorba/zorbac.h.orig lib/libzorba_simplestore.so -bin/zorba -%%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_RUBY%%%%RUBY_SITEARCHLIBDIR%%/zorba_api.so -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_b.gif -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_r.gif -%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_b.gif -%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_r.gif -%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_b.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_r.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/CMakeFiles/xqdoc.dir/progress.make -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/CMakeFiles/xqdoc.dir/cmake_clean.cmake -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/CMakeFiles/xqdoc.dir/build.make -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/CMakeFiles/xqdoc.dir/DependInfo.cmake -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/CMakeFiles/CMakeDirectoryInformation.cmake -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/CMakeFiles/progress.marks -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/templates/index.html -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/css/jquery.treeview.css -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/css/main.css -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/css/screen.css -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/images/S.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/images/U.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/images/N.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/images/treeview-default.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/images/treeview-default-line.gif -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/lib/jquery.cookie.js -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/lib/jquery.js -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/xhtml/lib/jquery.treeview.js -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/Makefile -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/cmake_install.cmake -%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/CTestTestfile.cmake +lib/libzorba_simplestore.so.2.0.2 +%%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 +%%DATADIR%%/xqdoc/generator/xqdoc-html.xq +%%DATADIR%%/xqdoc/generator/xqdoc-xml.xq +%%DATADIR%%/xqdoc/requisites/images/External.gif +%%DATADIR%%/xqdoc/requisites/images/Nondeterministic.gif +%%DATADIR%%/xqdoc/requisites/images/Sequential.gif +%%DATADIR%%/xqdoc/requisites/images/Streamable.gif +%%DATADIR%%/xqdoc/requisites/images/Updating.gif +%%DATADIR%%/xqdoc/requisites/images/Variadic.gif +%%DATADIR%%/xqdoc/requisites/images/ZCsmall.gif +%%DATADIR%%/xqdoc/requisites/images/blog.png +%%DATADIR%%/xqdoc/requisites/images/documentation.png +%%DATADIR%%/xqdoc/requisites/images/download.png +%%DATADIR%%/xqdoc/requisites/images/minus.gif +%%DATADIR%%/xqdoc/requisites/images/modules.png +%%DATADIR%%/xqdoc/requisites/images/modules.svg +%%DATADIR%%/xqdoc/requisites/images/noisepattern.png +%%DATADIR%%/xqdoc/requisites/images/open.png +%%DATADIR%%/xqdoc/requisites/images/plus.gif +%%DATADIR%%/xqdoc/requisites/images/store.png +%%DATADIR%%/xqdoc/requisites/images/terminal.png +%%DATADIR%%/xqdoc/requisites/images/tools.png +%%DATADIR%%/xqdoc/requisites/images/treeview-default-line.gif +%%DATADIR%%/xqdoc/requisites/images/treeview-default.gif +%%DATADIR%%/xqdoc/requisites/images/up.gif +%%DATADIR%%/xqdoc/requisites/images/zorba_logo.png +%%DATADIR%%/xqdoc/requisites/lib/jquery.cookie.js +%%DATADIR%%/xqdoc/requisites/lib/jquery.js +%%DATADIR%%/xqdoc/requisites/lib/jquery.treeview.js +%%DATADIR%%/xqdoc/requisites/lib/shBrushXQuery.js +%%DATADIR%%/xqdoc/requisites/lib/shBrushXml.js +%%DATADIR%%/xqdoc/requisites/lib/shCore.js +%%DATADIR%%/xqdoc/requisites/styles/jquery.treeview.css +%%DATADIR%%/xqdoc/requisites/styles/main.css +%%DATADIR%%/xqdoc/requisites/styles/shCore.css +%%DATADIR%%/xqdoc/requisites/styles/shThemeDefault.css +%%DATADIR%%/xqdoc/requisites/styles/shThemeXQuery.css +%%DATADIR%%/xqdoc/requisites/templates/main.html +%%DATADIR%%/xqdoc/requisites/templates/www.functx.com_index.html +%%DATADIR%%/xqdoc/requisites/templates/www.w3.org_2005_xpath-functions.html +%%DATADIR%%/xqdoc/requisites/templates/www.w3.org_2005_xpath-functions_math.html +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt -%%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/simple.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/sax2.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/errors.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/context.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/serialization.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/chaining.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/external_functions.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/datamanager.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/uri_resolvers.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/execution_plans.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/item_handler.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/callback.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/debugger.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/examples.cpp -%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/Makefile -%%PORTDOCS%%%%DOCSDIR%%/c/examples/csimple.c +%%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/c/examples/ccontext.c %%PORTDOCS%%%%DOCSDIR%%/c/examples/cerror.c -%%PORTDOCS%%%%DOCSDIR%%/c/examples/cparsing.c -%%PORTDOCS%%%%DOCSDIR%%/c/examples/cexternal_functions.c -%%PORTDOCS%%%%DOCSDIR%%/c/examples/cserialization.c -%%PORTDOCS%%%%DOCSDIR%%/c/examples/csequences.c %%PORTDOCS%%%%DOCSDIR%%/c/examples/cexamples.c +%%PORTDOCS%%%%DOCSDIR%%/c/examples/cexternal_functions.c +%%PORTDOCS%%%%DOCSDIR%%/c/examples/cparsing.c %%PORTDOCS%%%%DOCSDIR%%/c/examples/cparsing.xml -%%WITH_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simple.php -%%WITH_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/python_test.py -%%WITH_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/ruby_test.rb -%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/xqdoc/xhtml/lib -%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/xqdoc/xhtml/images -%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/xqdoc/xhtml/css -%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/xqdoc/xhtml -%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/xqdoc/templates -%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/xqdoc/CMakeFiles/xqdoc.dir -%%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/xqdoc/CMakeFiles +%%PORTDOCS%%%%DOCSDIR%%/c/examples/csequences.c +%%PORTDOCS%%%%DOCSDIR%%/c/examples/cserialization.c +%%PORTDOCS%%%%DOCSDIR%%/c/examples/csimple.c +%%PORTDOCS%%%%DOCSDIR%%/c/html/documentation.png +%%PORTDOCS%%%%DOCSDIR%%/c/html/download.png +%%PORTDOCS%%%%DOCSDIR%%/c/html/modules.png +%%PORTDOCS%%%%DOCSDIR%%/c/html/noisepattern.png +%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_b.gif +%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_l.gif +%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_r.gif +%%PORTDOCS%%%%DOCSDIR%%/c/html/terminal.png +%%PORTDOCS%%%%DOCSDIR%%/code/html/rtab_b.gif +%%PORTDOCS%%%%DOCSDIR%%/code/html/rtab_l.gif +%%PORTDOCS%%%%DOCSDIR%%/code/html/rtab_r.gif +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/Makefile +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/binary.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/callback.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/chaining.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/context.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/datamanager.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/errors.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/examples.cpp +%%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/module_import_check.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/sax2.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/serialization.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/simple.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/uri_resolvers.cpp +%%PORTDOCS%%%%DOCSDIR%%/cxx/html/documentation.png +%%PORTDOCS%%%%DOCSDIR%%/cxx/html/download.png +%%PORTDOCS%%%%DOCSDIR%%/cxx/html/modules.png +%%PORTDOCS%%%%DOCSDIR%%/cxx/html/noisepattern.png +%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_b.gif +%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_l.gif +%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_r.gif +%%PORTDOCS%%%%DOCSDIR%%/cxx/html/terminal.png +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/W3C-WD.css +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/documentation.png +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/download.png +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/modules.png +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/noisepattern.png +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_b.gif +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_l.gif +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_r.gif +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/scripting_spec.html +%%PORTDOCS%%%%DOCSDIR%%/zorba/html/terminal.png +%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/Makefile %%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/xqdoc %%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba/html %%PORTDOCS%%@dirrm %%DOCSDIR%%/zorba -%%WITH_RUBY%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby/examples -%%WITH_RUBY%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby -%%WITH_PYTHON%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/python/examples -%%WITH_PYTHON%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/python -%%WITH_PHP%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/php/examples -%%WITH_PHP%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/php +%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby/html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/ruby +%%PORTDOCS%%@dirrm %%DOCSDIR%%/python/html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/python +%%PORTDOCS%%@dirrm %%DOCSDIR%%/php/html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/php +%%PORTDOCS%%@dirrm %%DOCSDIR%%/java/html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/java %%PORTDOCS%%@dirrm %%DOCSDIR%%/cxx/html %%PORTDOCS%%@dirrm %%DOCSDIR%%/cxx/examples %%PORTDOCS%%@dirrm %%DOCSDIR%%/cxx +%%PORTDOCS%%@dirrm %%DOCSDIR%%/code/html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/code %%PORTDOCS%%@dirrm %%DOCSDIR%%/c/html %%PORTDOCS%%@dirrm %%DOCSDIR%%/c/examples %%PORTDOCS%%@dirrm %%DOCSDIR%%/c %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm include/zorba/zorba/util -@dirrm include/zorba/zorba -@dirrm include/zorba/simplestore/msdom -@dirrm include/zorba/simplestore -@dirrm include/zorba/modules/org/w3/www/2005 -@dirrm include/zorba/modules/org/w3/www -@dirrm include/zorba/modules/org/w3 -@dirrm include/zorba/modules/org/expath/ns -@dirrm include/zorba/modules/org/expath -@dirrm include/zorba/modules/org -@dirrm include/zorba/modules/com/zorba-xquery/www/modules/security -@dirrm include/zorba/modules/com/zorba-xquery/www/modules/introspection -@dirrm include/zorba/modules/com/zorba-xquery/www/modules/excel -@dirrm include/zorba/modules/com/zorba-xquery/www/modules/email -@dirrm include/zorba/modules/com/zorba-xquery/www/modules -@dirrm include/zorba/modules/com/zorba-xquery/www -@dirrm include/zorba/modules/com/zorba-xquery -@dirrm include/zorba/modules/com -@dirrm include/zorba/modules -@dirrm include/zorba/ +@dirrm %%DATADIR%%/xqdoc/requisites/templates +@dirrm %%DATADIR%%/xqdoc/requisites/styles +@dirrm %%DATADIR%%/xqdoc/requisites/lib +@dirrm %%DATADIR%%/xqdoc/requisites/images +@dirrm %%DATADIR%%/xqdoc/requisites +@dirrm %%DATADIR%%/xqdoc/generator +@dirrm %%DATADIR%%/xqdoc +@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%% +@dirrm include/zorba/internal +@dirrm include/zorba/util +@dirrm include/zorba Index: files/patch-CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/files/patch-CMakeLists.txt,v retrieving revision 1.1 diff -u -r1.1 patch-CMakeLists.txt --- files/patch-CMakeLists.txt 14 Sep 2011 07:38:20 -0000 1.1 +++ files/patch-CMakeLists.txt 15 Sep 2011 12:55:52 -0000 @@ -1,7 +1,7 @@ ---- CMakeLists.txt.orig 2011-08-12 10:26:33.000000000 +0200 -+++ CMakeLists.txt 2011-08-12 10:26:28.000000000 +0200 -@@ -37,6 +37,10 @@ - SET(LINUX "${CMAKE_SYSTEM}") +--- CMakeLists.txt.orig 2011-09-10 17:56:13.000000000 +0200 ++++ CMakeLists.txt 2011-09-15 09:45:41.000000000 +0200 +@@ -39,6 +39,10 @@ + SET(LINUX "${CMAKE_SYSTEM}") ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") +IF("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") Index: files/patch-cmake_modules_FindPHP5.cmake =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/files/patch-cmake_modules_FindPHP5.cmake,v retrieving revision 1.1 diff -u -r1.1 patch-cmake_modules_FindPHP5.cmake --- files/patch-cmake_modules_FindPHP5.cmake 14 Sep 2011 07:38:20 -0000 1.1 +++ files/patch-cmake_modules_FindPHP5.cmake 15 Sep 2011 12:55:52 -0000 @@ -1,6 +1,6 @@ ---- cmake_modules/FindPHP5.cmake.orig 2010-07-14 15:23:17.000000000 +0200 -+++ cmake_modules/FindPHP5.cmake 2011-08-19 09:45:39.000000000 +0200 -@@ -26,15 +26,11 @@ +--- 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 +@@ -27,15 +27,11 @@ SET(PHP5_FOUND "NO") SET(PHP5_POSSIBLE_INCLUDE_PATHS @@ -18,17 +18,18 @@ ) #FIND_PATH(PHP5_FOUND_INCLUDE_PATH main/php.h -@@ -51,8 +47,7 @@ +@@ -52,9 +48,7 @@ FIND_PROGRAM(PHP5_EXECUTABLE NAMES php5 php PATHS - /usr/bin - /usr/local/bin +- ${PHP5_BINARY_DIR} + %%LOCALBASE%%/bin ) + MESSAGE(STATUS "Executable: " ${PHP5_EXECUTABLE}) - MARK_AS_ADVANCED( -@@ -103,9 +98,11 @@ +@@ -108,8 +102,7 @@ FIND_PROGRAM(PHP5_CONFIG_EXECUTABLE NAMES php5-config php-config PATHS @@ -36,9 +37,5 @@ - /usr/local/bin + %%LOCALBASE%%/bin ) -+IF(NOT PHP5_CONFIG_EXECUTABLE) -+ MESSAGE(FATAL_ERROR "PHP config executable not found") -+ENDIF(NOT PHP5_CONFIG_EXECUTABLE) EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --version - OUTPUT_VARIABLE PHP5_VERSION) Index: files/patch-doc_CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/files/patch-doc_CMakeLists.txt,v retrieving revision 1.1 diff -u -r1.1 patch-doc_CMakeLists.txt --- files/patch-doc_CMakeLists.txt 14 Sep 2011 07:38:20 -0000 1.1 +++ files/patch-doc_CMakeLists.txt 15 Sep 2011 12:55:52 -0000 @@ -1,21 +1,24 @@ ---- doc/CMakeLists.txt.orig 2011-08-19 15:31:29.000000000 +0200 -+++ doc/CMakeLists.txt 2011-08-19 15:32:16.000000000 +0200 -@@ -37,9 +37,15 @@ +--- 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 @@ + ADD_SUBDIRECTORY(c) - IF(ZORBA_USE_SWIG AND BUILDING_SIMPLESTORE) - ADD_SUBDIRECTORY(java) -- ADD_SUBDIRECTORY(python) -- ADD_SUBDIRECTORY(ruby) -- ADD_SUBDIRECTORY(php) -+ IF (WITH_PYTHON) -+ ADD_SUBDIRECTORY(python) -+ ENDIF (WITH_PYTHON) -+ IF (WITH_RUBY) -+ ADD_SUBDIRECTORY(ruby) -+ ENDIF (WITH_RUBY) -+ IF (WITH_PHP5) -+ ADD_SUBDIRECTORY(php) -+ ENDIF (WITH_PHP5) - ENDIF(ZORBA_USE_SWIG AND BUILDING_SIMPLESTORE) + IF (SWIG_FOUND) +- ADD_SUBDIRECTORY(java) +- ADD_SUBDIRECTORY(python) +- ADD_SUBDIRECTORY(ruby) ++ IF (WITH_JAVA) ++ ADD_SUBDIRECTORY(java) ++ ENDIF (WITH_JAVA) ++ IF (WITH_PYTHON) ++ ADD_SUBDIRECTORY(python) ++ ENDIF (WITH_PYTHON) ++ IF (WITH_RUBY) ++ ADD_SUBDIRECTORY(ruby) ++ ENDIF (WITH_RUBY) ++ IF (WITH_PHP) + ADD_SUBDIRECTORY(php) ++ ENDIF (WITH_PHP) + ENDIF (SWIG_FOUND) - # workaround: a dir is already needed for the install command. + # generate Doxygen code documentation Index: files/patch-include-zorba-util_time.h =================================================================== RCS file: files/patch-include-zorba-util_time.h diff -N files/patch-include-zorba-util_time.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-include-zorba-util_time.h 15 Sep 2011 12:55:52 -0000 @@ -0,0 +1,14 @@ +--- include/zorba/util/time.h.orig 2011-09-15 11:16:07.000000000 +0200 ++++ include/zorba/util/time.h 2011-09-15 11:19:48.000000000 +0200 +@@ -73,7 +73,11 @@ + + inline void get_current_cputime (cputime& t) + { ++#if defined( __FreeBSD__ ) ++ clock_gettime(CLOCK_PROF, &t); ++#else + clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t); ++#endif + } + + #elif defined(ZORBA_HAVE_RUSAGE_FUNCTION) Index: files/patch-src-context_dynamic_context.cpp =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/files/patch-src-context_dynamic_context.cpp,v retrieving revision 1.1 diff -u -r1.1 patch-src-context_dynamic_context.cpp --- files/patch-src-context_dynamic_context.cpp 14 Sep 2011 07:38:20 -0000 1.1 +++ files/patch-src-context_dynamic_context.cpp 15 Sep 2011 12:55:52 -0000 @@ -1,47 +1,38 @@ ---- src/context/dynamic_context.cpp.orig 2011-08-11 15:02:06.000000000 +0200 -+++ src/context/dynamic_context.cpp 2011-08-11 15:10:43.000000000 +0200 -@@ -16,7 +16,9 @@ +--- 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 +@@ -18,7 +18,9 @@ #include "common/common.h" #include #include -+#if defined(WIN32) ++#ifdef WIN32 #include +#endif #ifdef UNIX #include #endif -@@ -147,10 +149,10 @@ - if (gmtm.tm_isdst != 0) - lTimeShift = -timebuffer.timezone*60 + 3600; +@@ -192,10 +194,10 @@ + if (gmtm.tm_isdst != 0) + lTimeShift += 3600; #else -- struct timeb timebuffer; -- ftime( &timebuffer ); -+ struct timeval tv; -+ gettimeofday( &tv, 0 ); - struct ::tm gmtm; -- localtime_r(&timebuffer.time, &gmtm); //thread safe localtime on Linux -+ localtime_r(&tv.tv_sec, &gmtm); //thread safe localtime on Linux - lTimeShift = gmtm.tm_gmtoff; +- struct timeb timebuffer; +- ftime( &timebuffer ); ++ struct timeval tv; ++ gettimeofday( &tv, 0 ); + struct ::tm gmtm; +- localtime_r(&timebuffer.time, &gmtm); //thread safe localtime on Linux ++ localtime_r(&tv.tv_sec, &gmtm); //thread safe localtime on Linux + lTimeShift = gmtm.tm_gmtoff; #endif -@@ -162,7 +164,11 @@ - gmtm.tm_mday, - gmtm.tm_hour, - gmtm.tm_min, -+#if defined(WIN32) - gmtm.tm_sec + timebuffer.millitm/1000.0, +@@ -207,7 +209,11 @@ + gmtm.tm_mday, + gmtm.tm_hour, + gmtm.tm_min, ++#ifdef WIN32 + gmtm.tm_sec + timebuffer.millitm/1000.0, +#else -+ gmtm.tm_sec + tv.tv_usec/1000000.0, ++ gmtm.tm_sec + tv.tv_usec/1000000.0, +#endif - theTimezone/3600); + static_cast(theTimezone/3600)); - #if WIN32 -@@ -170,8 +176,6 @@ - time(&t0); - GENV_ITEMFACTORY->createLong(current_time_millis, t0*1000); - #else -- timeval tv; -- gettimeofday(&tv, 0); - long long millis = tv.tv_sec; - millis = millis * 1000 + tv.tv_usec/1000; - GENV_ITEMFACTORY->createLong(current_time_millis, millis); + } Index: files/patch-src-util_atomic_int.h =================================================================== RCS file: files/patch-src-util_atomic_int.h diff -N files/patch-src-util_atomic_int.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src-util_atomic_int.h 15 Sep 2011 12:55:52 -0000 @@ -0,0 +1,138 @@ +--- src/util/atomic_int.h.orig 2011-09-15 10:09:31.000000000 +0200 ++++ src/util/atomic_int.h 2011-09-15 11:15:19.000000000 +0200 +@@ -27,7 +27,10 @@ + // Test first for and prefer gcc's atomic operations over all others since + // they're an order of magnitude faster. + // +-#if defined( __GNUC__ ) ++#if defined( __FreeBSD__ ) ++# include ++# include ++#elif defined( __GNUC__ ) + # if __GNUC__ * 100 + __GNUC_MINOR__ >= 402 + # include + # else +@@ -40,9 +43,6 @@ + # endif + #elif defined( __APPLE__ ) + # include +-#elif defined( __FreeBSD__ ) +-# include +-# include + #elif defined( __NetBSD__ ) + # include + #elif defined( __SOLARIS__ ) +@@ -66,12 +66,12 @@ + */ + class atomic_int { + public: +-#if defined( __GNUC__ ) ++#if defined( __FreeBSD__ ) ++ typedef int value_type; ++#elif defined( __GNUC__ ) + typedef _Atomic_word value_type; + #elif defined( __APPLE__ ) || defined( __NetBSD__ ) || defined( __SOLARIS__ ) + typedef int32_t value_type; +-#elif defined( __FreeBSD__ ) +- typedef int value_type; + #elif defined( _WIN32 ) + typedef LONG value_type; + #endif +@@ -172,7 +172,7 @@ + + value_type load_impl() const { + #if defined( __FreeBSD__ ) +- return atomic_load_acq_int( &value_ ); ++ return atomic_load_acq_int( (volatile u_int *)&value_ ); + #else + value_type const temp = *(value_type volatile*)&value_; + # if defined( __GNUC__ ) +@@ -192,7 +192,7 @@ + + void store_impl( value_type n ) { + #if defined( __FreeBSD__ ) +- atomic_store_rel_int( &value_, n ); ++ atomic_store_rel_int( (volatile u_int *)&value_, n ); + #elif defined( _WIN32 ) + InterlockedExchange( &value_, n ); + #else +@@ -210,12 +210,12 @@ + } + + value_type add( value_type n ) { +-#if defined( __GNUC__ ) ++#if defined( __FreeBSD__ ) ++ return atomic_fetchadd_int( (volatile u_int*)&value_, n ) + n; ++#elif defined( __GNUC__ ) + return GNU_EXCHANGE_AND_ADD( &value_, n ) + n; + #elif defined( __APPLE__ ) + return OSAtomicAdd32( n, &value_ ); +-#elif defined( __FreeBSD__ ) +- return atomic_fetchadd_int( &value_, n ) + n; + #elif defined( __NetBSD__ ) + return (value_type)atomic_add_32_nv( (uint32_t*)&value_, n ); + #elif defined( __SOLARIS__ ) +@@ -226,12 +226,12 @@ + } + + value_type pre_dec() { +-#if defined( __GNUC__ ) ++#if defined( __FreeBSD__ ) ++ return atomic_fetchadd_int( (volatile u_int *)&value_, -1 ) - 1; ++#elif defined( __GNUC__ ) + return GNU_EXCHANGE_AND_ADD( &value_, -1 ) - 1; + #elif defined( __APPLE__ ) + return OSAtomicDecrement32( &value_ ); +-#elif defined( __FreeBSD__ ) +- return atomic_fetchadd_int( &value_, -1 ) - 1; + #elif defined( __NetBSD__ ) + return (value_type)atomic_add_int_nv( (uint32_t*)&value_, -1 ); + #elif defined( __SOLARIS__ ) +@@ -242,12 +242,12 @@ + } + + value_type pre_inc() { +-#if defined( __GNUC__ ) ++#if defined( __FreeBSD__ ) ++ return atomic_fetchadd_int( (volatile u_int *)&value_, 1 ) + 1; ++#elif defined( __GNUC__ ) + return GNU_EXCHANGE_AND_ADD( &value_, 1 ) + 1; + #elif defined( __APPLE__ ) + return OSAtomicIncrement32( &value_ ); +-#elif defined( __FreeBSD__ ) +- return atomic_fetchadd_int( &value_, 1 ) + 1; + #elif defined( __NetBSD__ ) + return (value_type)atomic_add_int_nv( (uint32_t*)&value_, 1 ); + #elif defined( __SOLARIS__ ) +@@ -258,12 +258,12 @@ + } + + value_type post_dec() { +-#if defined( __GNUC__ ) ++#if defined( __FreeBSD__ ) ++ return atomic_fetchadd_int( (volatile u_int *)&value_, -1 ); ++#elif defined( __GNUC__ ) + return GNU_EXCHANGE_AND_ADD( &value_, -1 ); + #elif defined( __APPLE__ ) + return OSAtomicDecrement32( &value_ ) + 1; +-#elif defined( __FreeBSD__ ) +- return atomic_fetchadd_int( &value_, -1 ); + #elif defined( __NetBSD__ ) + return (value_type)atomic_add_int_nv( (uint32_t*)&value_, -1 ) + 1; + #elif defined( __SOLARIS__ ) +@@ -274,12 +274,12 @@ + } + + value_type post_inc() { +-#if defined( __GNUC__ ) ++#if defined( __FreeBSD__ ) ++ return atomic_fetchadd_int( (volatile u_int *)&value_, 1 ); ++#elif defined( __GNUC__ ) + return GNU_EXCHANGE_AND_ADD( &value_, 1 ); + #elif defined( __APPLE__ ) + return OSAtomicIncrement32( &value_ ) - 1; +-#elif defined( __FreeBSD__ ) +- return atomic_fetchadd_int( &value_, 1 ); + #elif defined( __NetBSD__ ) + return (value_type)atomic_add_int_nv( (uint32_t*)&value_, 1 ) - 1; + #elif defined( __SOLARIS__ ) Index: files/patch-src-util_string_util.cpp =================================================================== RCS file: files/patch-src-util_string_util.cpp diff -N files/patch-src-util_string_util.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src-util_string_util.cpp 15 Sep 2011 12:55:52 -0000 @@ -0,0 +1,38 @@ +--- 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 +@@ -92,7 +92,11 @@ + float atof( char const *s ) { + char *end; + errno = 0; ++#ifdef WIN32 + float result = std::strtof( s, &end ); ++#else ++ float result = strtof( s, &end ); ++#endif + check_parse_number( s, end, &result ); + return result; + } +@@ -100,7 +104,11 @@ + long long atoll( char const *s ) { + char *end; + errno = 0; ++#ifdef WIN32 + long long const result = std::strtoll( s, &end, 10 ); ++#else ++ long long const result = strtoll( s, &end, 10 ); ++#endif + check_parse_number( s, end, static_cast( nullptr ) ); + return result; + } +@@ -116,7 +124,11 @@ + ); + char *end; + errno = 0; ++#ifdef WIN32 + unsigned long long const result = std::strtoull( s, &end, 10 ); ++#else ++ unsigned long long const result = strtoull( s, &end, 10 ); ++#endif + check_parse_number( s, end, static_cast( nullptr ) ); + return result; + } Index: files/patch-src-zorbatypes_integer.cpp =================================================================== RCS file: files/patch-src-zorbatypes_integer.cpp diff -N files/patch-src-zorbatypes_integer.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src-zorbatypes_integer.cpp 15 Sep 2011 12:55:52 -0000 @@ -0,0 +1,14 @@ +--- 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; + } Index: files/patch-swig-java_CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/files/patch-swig-java_CMakeLists.txt,v retrieving revision 1.1 diff -u -r1.1 patch-swig-java_CMakeLists.txt --- files/patch-swig-java_CMakeLists.txt 14 Sep 2011 07:38:20 -0000 1.1 +++ files/patch-swig-java_CMakeLists.txt 15 Sep 2011 12:55:52 -0000 @@ -1,5 +1,5 @@ ---- swig/java/CMakeLists.txt.orig 2011-08-23 09:11:30.000000000 +0200 -+++ swig/java/CMakeLists.txt 2011-08-23 09:17:55.000000000 +0200 +--- swig/java/CMakeLists.txt.orig 2011-09-10 17:56:13.000000000 +0200 ++++ swig/java/CMakeLists.txt 2011-09-15 09:55:46.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_JAVA) + FIND_PACKAGE ( Java ) - include ( FindJNI ) + INCLUDE ( ${CMAKE_SOURCE_DIR}/cmake_modules/FindJNI.cmake ) -@@ -62,8 +64,8 @@ +@@ -65,8 +67,8 @@ INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR}) ELSE ( APPLE ) IF(NOT WIN32) @@ -18,9 +18,9 @@ + 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}/libzorba_api.dll DESTINATION bin/java/org/zorbaxquery/api ) - INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION bin/java/org/zorbaxquery/api ) -@@ -73,3 +75,5 @@ + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.dll DESTINATION bin/java/org/zorbaxquery/api/ + COMPONENT "java_swig") +@@ -78,3 +80,5 @@ ELSE (JAVA_INCLUDE_PATH) MESSAGE ( STATUS "SWIG Java: not generating JAVA API because jni headers not found.") ENDIF (JAVA_INCLUDE_PATH) Index: files/patch-swig-php_CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/files/patch-swig-php_CMakeLists.txt,v retrieving revision 1.1 diff -u -r1.1 patch-swig-php_CMakeLists.txt --- files/patch-swig-php_CMakeLists.txt 14 Sep 2011 07:38:20 -0000 1.1 +++ files/patch-swig-php_CMakeLists.txt 15 Sep 2011 12:55:52 -0000 @@ -1,33 +1,50 @@ ---- swig/php/CMakeLists.txt.orig 2010-07-14 15:23:16.000000000 +0200 -+++ swig/php/CMakeLists.txt 2011-08-19 13:55:46.000000000 +0200 +--- swig/php/CMakeLists.txt.orig 2011-09-15 09:56:13.000000000 +0200 ++++ swig/php/CMakeLists.txt 2011-09-15 09:57:30.000000000 +0200 @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +IF (WITH_PHP5) + - INCLUDE(${CMAKE_MODULE_PATH}/FindPHP5.cmake) - FIND_PACKAGE(PHP5) - -@@ -36,13 +38,11 @@ + IF (NOT PHP5_FOUND) + MESSAGE (STATUS "SWIG PHP: PHP5 binding not generated because library and include file not installed.") + ELSE (NOT PHP5_FOUND) +@@ -40,11 +42,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 PREFIX "" ) -- ENDIF ( LINUX OR CYGWIN ) -+ ENDIF ( LINUX OR CYGWIN 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}${PHP5_INSTALL_PATH}) - MESSAGE(STATUS "SWIG PHP: PHP module install path: " ${PHP5_INSTALL_PATH}) - - INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api_wrapper.php -@@ -74,3 +74,5 @@ +- IF (LINUX OR CYGWIN) ++ IF (LINUX OR CYGWIN OR FREEBSD) + SET_TARGET_PROPERTIES (${SWIG_MODULE_zorba_api_REAL_NAME} PROPERTIES PREFIX "") +- ENDIF (LINUX OR CYGWIN) ++ ENDIF (LINUX OR CYGWIN OR FREEBSD) + +- IF (NOT WIN32 OR CYGWIN) ++ IF (NOT WIN32 OR CYGWIN OR FREEBSD) + 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}) +@@ -55,7 +57,7 @@ + ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api.so + DESTINATION ${PHP5_INSTALL_PATH} + ) +- ELSE (NOT WIN32 OR CYGWIN) ++ ELSE (NOT WIN32 OR CYGWIN OR FREEBSD) + INSTALL ( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.php +@@ -63,7 +65,7 @@ + COMPONENT "php_swig" + DESTINATION php_ext + ) +- ENDIF (NOT WIN32 OR CYGWIN) ++ ENDIF (NOT WIN32 OR CYGWIN OR FREEBSD) + + ### Start PHP proxy generation + # Configure the test file +@@ -92,3 +94,5 @@ ### End PHP proxy generation - ENDIF( NOT PHP5_FOUND ) + ENDIF (NOT PHP5_FOUND) + +ENDIF (WITH_PHP5) Index: files/patch-swig-python_CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/files/patch-swig-python_CMakeLists.txt,v retrieving revision 1.1 diff -u -r1.1 patch-swig-python_CMakeLists.txt --- files/patch-swig-python_CMakeLists.txt 14 Sep 2011 07:38:20 -0000 1.1 +++ files/patch-swig-python_CMakeLists.txt 15 Sep 2011 12:55:52 -0000 @@ -1,24 +1,26 @@ ---- swig/python/CMakeLists.txt.orig 2010-07-14 15:23:16.000000000 +0200 -+++ swig/python/CMakeLists.txt 2011-08-11 17:07:52.000000000 +0200 +--- swig/python/CMakeLists.txt.orig 2011-09-10 17:56:13.000000000 +0200 ++++ swig/python/CMakeLists.txt 2011-09-15 09:58:54.000000000 +0200 @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +IF (WITH_PYTHON) + - # install path determined from where Python lives - FIND_PACKAGE(PythonInterp) - FIND_PACKAGE(PythonLibs) -@@ -43,9 +45,11 @@ - 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}) - ENDIF(NOT WIN32) + IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH) + MESSAGE (STATUS "SWIG Python: generating Python API") +@@ -42,7 +44,7 @@ + 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 @@ 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) Index: files/patch-swig-ruby_CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/files/patch-swig-ruby_CMakeLists.txt,v retrieving revision 1.1 diff -u -r1.1 patch-swig-ruby_CMakeLists.txt --- files/patch-swig-ruby_CMakeLists.txt 14 Sep 2011 07:38:20 -0000 1.1 +++ files/patch-swig-ruby_CMakeLists.txt 15 Sep 2011 12:55:52 -0000 @@ -1,31 +1,30 @@ ---- swig/ruby/CMakeLists.txt.orig 2010-07-14 15:23:16.000000000 +0200 -+++ swig/ruby/CMakeLists.txt 2011-08-12 10:38:13.000000000 +0200 -@@ -12,6 +12,7 @@ +--- 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 +@@ -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 # limitations under the License. - ++ +IF (WITH_RUBY) ++ + IF(APPLE) CMAKE_FIND_FRAMEWORKS ( Ruby ) - FIND_PACKAGE(Ruby) - -@@ -27,13 +28,12 @@ + ENDIF(APPLE) +@@ -28,9 +31,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 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 FREEBSD ) EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']" 48 OUTPUT_VARIABLE RUBY_SITEARCH_DIR) -- STRING(REPLACE "/usr/" "" RUBY_SITEARCH_DIR "${RUBY_SITEARCH_DIR}" ) - - IF ( APPLE ) - INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api.bundle -@@ -45,3 +45,4 @@ +@@ -49,3 +52,5 @@ ELSE (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) 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) Index: files/patch-test-rbkt_CMakeLists.txt =================================================================== RCS file: /home/pcvs/ports/textproc/zorba/files/patch-test-rbkt_CMakeLists.txt,v retrieving revision 1.1 diff -u -r1.1 patch-test-rbkt_CMakeLists.txt --- files/patch-test-rbkt_CMakeLists.txt 14 Sep 2011 07:38:20 -0000 1.1 +++ files/patch-test-rbkt_CMakeLists.txt 15 Sep 2011 12:55:52 -0000 @@ -1,6 +1,6 @@ ---- test/rbkt/CMakeLists.txt.orig 2011-08-11 09:53:03.000000000 +0200 -+++ test/rbkt/CMakeLists.txt 2011-08-11 10:08:48.000000000 +0200 -@@ -68,7 +68,7 @@ +--- test/rbkt/CMakeLists.txt.orig 2011-09-10 17:56:08.000000000 +0200 ++++ test/rbkt/CMakeLists.txt 2011-09-15 10:05:12.000000000 +0200 +@@ -71,7 +71,7 @@ MESSAGE(STATUS "Did NOT find Boost SYSTEM component - not building multithreaded test driver") SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE FALSE) ELSE (NOT Boost_SYSTEM_FOUND) @@ -9,12 +9,3 @@ ENDIF (NOT Boost_SYSTEM_FOUND) ENDIF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34) -@@ -88,7 +88,7 @@ - - ADD_EXECUTABLE(testdriver_mt ${TESTDRIVER_MT_SRCS}) - TARGET_LINK_LIBRARIES(testdriver_mt zorba_simplestore -- boost_filesystem-mt ${Boost_system_lib}) -+ ${Boost_system_lib}) - IF (ZORBA_BUILD_STATIC_LIBRARY) - ADD_EXECUTABLE(testdriver_mt_static testdriver_mt.cpp) - SET_TARGET_PROPERTIES(testdriver_mt_static