Update to soprano 2.4.1

2.4.0
* New methods Client::SparqlModel::listStatementsAsync and
  Client::SparqlModel::listContextsAsync
* Automatic query prefix expansion in NRLModel
* Automatic NRL metadata graph removal in NRLModel
* sopranocmd:
  - New paramter --nrl for sopranocmd which will trigger automatic query
    prefix expansion based on prefixes stored in the underlying model,
    automatic context creation for imported statements that do not have
    one set, and automatic metad ata graph removal on removeContext calls.
  - New parameter --graphselect which allows to convert SPARQL select query
    results into a graph result. This is very usable since SPARQL construct
    queries do not support contexts/named graphs.
  - New command 'rmgraph' which allows to delete a list of graphs/contexts.
  - New parameter --foo which enables scriptable binding results without
    variable names.
* ServerCore is now fully multithreaded allowing two clients perform
  read-only commands simultaneously.
* New Virtuoso storage backend which can either connect to a running Virtuoso
  instance or spawn one locally.
* New convenience methods to handle BackendSettings.
* New class AsyncQuery which will spawn a new thread for real asnycroneous
  query execution (in contrast to AsyncModel which only performs the actual
  query call in another thread while the iteration is syncroneous.)
* Removed redland/librdf dependancy from raptor parser.

2.3.2
* Do not fail when trying to index empty strings, but ignore them.
* Fixed parsing of plain literals with language code in sopranocmd.
* Make onto2vocabularyclass work with the redland backend (not using graph
  SPARQL queries anymore)

2.3.1
* Changed installation path of cmake modules (SopranoAppOntology.cmake)
  to <prefix/share/soprano/cmake
* Prevent the redland backend to add one statement multiple times.
* Properly handle class names containing a dash '-' in onto2vocabularyclass
* sopranocmd: Fail if trying to export a non-graph query

5 files changed, 19 insertions, 43 deletions

diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index 5a1278f9cdd..18a5f5859a3 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2010/01/22 13:39:51 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/04/10 00:02:03 markd Exp $
 
-DISTNAME=	soprano-2.3.0
-PKGREVISION=	5
+DISTNAME=	soprano-2.4.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=soprano/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,6 +23,7 @@ PKGCONFIG_OVERRIDE+=	soprano.pc.cmake
 pre-configure:
 	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
+.include "../../databases/iodbc/buildlink3.mk"
 .include "../../textproc/libclucene/buildlink3.mk"
 .include "../../textproc/redland/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/textproc/soprano/PLIST b/textproc/soprano/PLIST
index 765da275444..2ec0c328624 100644
--- a/textproc/soprano/PLIST
+++ b/textproc/soprano/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/07/25 11:52:55 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/04/10 00:02:03 markd Exp $
 bin/onto2vocabularyclass
 bin/sopranocmd
 bin/sopranod
@@ -59,6 +59,7 @@ include/Soprano/Statement
 include/Soprano/StatementIterator
 include/Soprano/StorageModel
 include/Soprano/Util/AsyncModel
+include/Soprano/Util/AsyncQuery
 include/Soprano/Util/AsyncResult
 include/Soprano/Util/DummyModel
 include/Soprano/Util/MutexModel
@@ -76,6 +77,7 @@ include/Soprano/Vocabulary/SIL
 include/Soprano/Vocabulary/XMLSchema
 include/Soprano/Vocabulary/Xesam
 include/soprano/asyncmodel.h
+include/soprano/asyncquery.h
 include/soprano/asyncresult.h
 include/soprano/backend.h
 include/soprano/bindingset.h
@@ -144,32 +146,37 @@ include/soprano/xesam.h
 include/soprano/xsd.h
 lib/libsoprano.so
 lib/libsoprano.so.4
-lib/libsoprano.so.4.2.0
+lib/libsoprano.so.4.3.0
 lib/libsopranoclient.so
 lib/libsopranoclient.so.1
-lib/libsopranoclient.so.1.1.0
+lib/libsopranoclient.so.1.2.0
 lib/libsopranoindex.so
 lib/libsopranoindex.so.1
 lib/libsopranoindex.so.1.1.0
 lib/libsopranoserver.so
 lib/libsopranoserver.so.1
-lib/libsopranoserver.so.1.0.0
+lib/libsopranoserver.so.1.2.0
 lib/pkgconfig/soprano.pc
+lib/pkgconfig/sopranoclient.pc
+lib/pkgconfig/sopranoindex.pc
+lib/pkgconfig/sopranoserver.pc
 lib/soprano/libsoprano_nquadparser.so
 lib/soprano/libsoprano_nquadserializer.so
 lib/soprano/libsoprano_raptorparser.so
 lib/soprano/libsoprano_raptorserializer.so
 lib/soprano/libsoprano_redlandbackend.so
+lib/soprano/libsoprano_virtuosobackend.so
 share/dbus-1/interfaces/org.soprano.Model.xml
 share/dbus-1/interfaces/org.soprano.NodeIterator.xml
 share/dbus-1/interfaces/org.soprano.QueryResultIterator.xml
 share/dbus-1/interfaces/org.soprano.Server.xml
 share/dbus-1/interfaces/org.soprano.StatementIterator.xml
-share/kde/apps/cmake/modules/SopranoAddOntology.cmake
+share/soprano/cmake/SopranoAddOntology.cmake
 share/soprano/plugins/nquadparser.desktop
 share/soprano/plugins/nquadserializer.desktop
 share/soprano/plugins/raptorparser.desktop
 share/soprano/plugins/raptorserializer.desktop
 share/soprano/plugins/redlandbackend.desktop
+share/soprano/plugins/virtuosobackend.desktop
 share/soprano/rules/nrl.rules
 share/soprano/rules/rdfs.rules
diff --git a/textproc/soprano/distinfo b/textproc/soprano/distinfo
index 73787cbcce1..bdfe10eae65 100644
--- a/textproc/soprano/distinfo
+++ b/textproc/soprano/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.7 2010/01/25 20:11:21 markd Exp $
+$NetBSD: distinfo,v 1.8 2010/04/10 00:02:03 markd Exp $
 
-SHA1 (soprano-2.3.0.tar.bz2) = 7452957588be84e212c46b54034e907e61c277c9
-RMD160 (soprano-2.3.0.tar.bz2) = 7d42e97e04de5f0ebdfd4fb58d1a159a9223a51b
-Size (soprano-2.3.0.tar.bz2) = 1910821 bytes
-SHA1 (patch-aa) = b9ad93e3d304872bed2c48d3379eb0dbe96ff0cd
-SHA1 (patch-ab) = 1b5cf4639338d17f60b1dfbe19167c4584fd8cd4
+SHA1 (soprano-2.4.1.tar.bz2) = 83ce403616cf8580f238e44903d8c813c73d0656
+RMD160 (soprano-2.4.1.tar.bz2) = bf214e19ec9b17d2e17c8a33b2fc2fb539c67852
+Size (soprano-2.4.1.tar.bz2) = 1945249 bytes
diff --git a/textproc/soprano/patches/patch-aa b/textproc/soprano/patches/patch-aa
deleted file mode 100644
index 239e50984c2..00000000000
--- a/textproc/soprano/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/07/25 11:52:55 markd Exp $
-
---- cmake/modules/CMakeLists.txt.orig	2009-06-24 07:45:40.000000000 +1200
-+++ cmake/modules/CMakeLists.txt
-@@ -1,5 +1,5 @@
- install(FILES
-   SopranoAddOntology.cmake
-   DESTINATION
--  share/apps/cmake/modules
-+  share/kde/apps/cmake/modules
- )
diff --git a/textproc/soprano/patches/patch-ab b/textproc/soprano/patches/patch-ab
deleted file mode 100644
index 9582bddaf4a..00000000000
--- a/textproc/soprano/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/01/25 20:11:21 markd Exp $
-
-allow redland 1.0.10 and greater.  wont ever see < 1.0.5 in pkgsrc
-
---- CMakeLists.txt.orig	2010-01-25 10:16:27.000000000 +0000
-+++ CMakeLists.txt
-@@ -93,9 +93,9 @@ endif(SOPRANO_BUILD_INDEX_LIB AND NOT SO
- if(RAPTOR_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
-   set(BUILD_RAPTOR_PARSER TRUE)
- endif(RAPTOR_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
--if(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
-+if(RAPTOR_FOUND AND REDLAND_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
-   set(BUILD_RAPTOR_SERIALIZER TRUE)
--endif(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
-+endif(RAPTOR_FOUND AND REDLAND_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
- if(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND)
-   set(BUILD_DBUS_SUPPORT TRUE)
- endif(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND)