4 files changed, 48 insertions, 21 deletions

diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index 4ff765b3414f..3511a9513e63 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -5,19 +5,19 @@
 # $FreeBSD$
 
 PORTNAME=	soprano
-PORTVERSION=	2.3.1
-PORTREVISION=	1
-CATEGORIES=	textproc
+PORTVERSION=	2.4.3
+CATEGORIES?=	textproc
 MASTER_SITES=	SF/${PORTNAME}/Soprano/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QT4 RDF framework
 
 LIB_DEPENDS=	clucene.0:${PORTSDIR}/textproc/clucene \
-		raptor.2:${PORTSDIR}/textproc/raptor
+		raptor.3:${PORTSDIR}/textproc/raptor
 
-OPTIONS=	REDLAND "Use Redland as storage backend" on \
-		SESAME2 "Use Sesame2 as storage backend (requires Java)" off
+#OPTIONS+=	REDLAND "Use Redland as storage backend (required for KDE4)" on
+#OPTIONS+=	VIRTUOSO "Use libiodbc/virtuoso as storage backend (required for KDE4)" on
+OPTIONS+=	SESAME2 "Use Sesame2 as storage backend (requires Java)" off
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
@@ -27,9 +27,9 @@ USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_REDLAND)
+.if !defined(WITHOUT_REDLAND)
 LIB_DEPENDS+=	rdf.0:${PORTSDIR}/textproc/redland
 PLIST_SUB+=	REDLAND=""
 .else
@@ -37,11 +37,19 @@ CMAKE_ARGS+=	-DSOPRANO_DISABLE_REDLAND_BACKEND=yes
 PLIST_SUB+=	REDLAND="@comment "
 .endif
 
+.if !defined(WITHOUT_VIRTUOSO)
+LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+PLIST_SUB+=	VIRTUOSO=""
+.else
+CMAKE_ARGS+=	-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=yes
+PLIST_SUB+=	VIRTUOSO="@comment "
+.endif
+
 .if defined(WITH_SESAME2)
 CATEGORIES+=	java
 CMAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 PLIST_SUB+=	SESAME2=""
 .else
@@ -49,10 +57,18 @@ CMAKE_ARGS+=	-DSOPRANO_DISABLE_SESAME2_BACKEND=yes
 PLIST_SUB+=	SESAME2="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
-	${REINPLACE_CMD} -e "s,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig," \
+	${REINPLACE_CMD} -E -e "s,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig," \
+		-e 's,VERSION STR(LESS|EQUAL|GREATER) "([^"]+)",VERSION VERSION_\1 \2,g' \
 		${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e "s,soprano/cmake,cmake/Modules," \
 		${WRKSRC}/cmake/modules/CMakeLists.txt
 
+post-install:
+.if defined(WITH_VIRTUOSO)
+	@${CAT} ${PKGMESSAGE}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/textproc/soprano/distinfo b/textproc/soprano/distinfo
index 9997b678e523..aab9554d165e 100644
--- a/textproc/soprano/distinfo
+++ b/textproc/soprano/distinfo
@@ -1,3 +1,3 @@
-MD5 (soprano-2.3.1.tar.bz2) = c9a2c008b80cd5d76599e9d48139dfe9
-SHA256 (soprano-2.3.1.tar.bz2) = 13e8b123bbbaea55f0a89495de6b08bb09945cd983f525a63c60f3345726be95
-SIZE (soprano-2.3.1.tar.bz2) = 1919103
+MD5 (soprano-2.4.3.tar.bz2) = e2bfa179a03810af60618110f5f832e2
+SHA256 (soprano-2.4.3.tar.bz2) = 390c529bd1f46a00362ed9ab932933d24d264b4b8988048549558f5ad52caa08
+SIZE (soprano-2.4.3.tar.bz2) = 1944785
diff --git a/textproc/soprano/pkg-message b/textproc/soprano/pkg-message
new file mode 100644
index 000000000000..f7e584379ec2
--- /dev/null
+++ b/textproc/soprano/pkg-message
@@ -0,0 +1,4 @@
+============================================================
+You'll have to install databases/virtuoso to use soprano's 
+virtuoso backend.
+============================================================
diff --git a/textproc/soprano/pkg-plist b/textproc/soprano/pkg-plist
index 45d5efa2ab2b..6a5118987a48 100644
--- a/textproc/soprano/pkg-plist
+++ b/textproc/soprano/pkg-plist
@@ -12,10 +12,7 @@ include/Soprano/Client/DBusModel
 include/Soprano/Client/DBusNodeIterator
 include/Soprano/Client/DBusQueryResultIterator
 include/Soprano/Client/DBusStatementIterator
-include/Soprano/Graph
-include/Soprano/LanguageTag
 include/Soprano/Client/LocalSocketClient
-include/Soprano/NRLModel
 include/Soprano/Client/SparqlModel
 include/Soprano/Client/TcpClient
 include/Soprano/Error/Error
@@ -25,6 +22,7 @@ include/Soprano/Error/Locator
 include/Soprano/Error/ParserError
 include/Soprano/FilterModel
 include/Soprano/Global
+include/Soprano/Graph
 include/Soprano/Index/CLuceneIndex
 include/Soprano/Index/IndexFilterModel
 include/Soprano/Index/QueryHit
@@ -37,8 +35,10 @@ include/Soprano/Inference/StandardRuleSet
 include/Soprano/Inference/StatementPattern
 include/Soprano/Iterator
 include/Soprano/IteratorBackend
+include/Soprano/LanguageTag
 include/Soprano/LiteralValue
 include/Soprano/Model
+include/Soprano/NRLModel
 include/Soprano/Node
 include/Soprano/NodeIterator
 include/Soprano/Parser
@@ -58,6 +58,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
@@ -75,6 +76,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
@@ -99,9 +101,9 @@ include/soprano/inferenceruleparser.h
 include/soprano/inferenceruleset.h
 include/soprano/iterator.h
 include/soprano/iteratorbackend.h
+include/soprano/languagetag.h
 include/soprano/literalvalue.h
 include/soprano/localsocketclient.h
-include/soprano/languagetag.h
 include/soprano/locator.h
 include/soprano/model.h
 include/soprano/mutexmodel.h
@@ -128,8 +130,8 @@ include/soprano/sil.h
 include/soprano/simplenodeiterator.h
 include/soprano/simplestatementiterator.h
 include/soprano/soprano.h
-include/soprano/sopranomacros.h
 include/soprano/soprano_export.h
+include/soprano/sopranomacros.h
 include/soprano/sopranotypes.h
 include/soprano/sparqlmodel.h
 include/soprano/statement.h
@@ -143,23 +145,27 @@ 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/soprano/libsoprano_nquadparser.so
 lib/soprano/libsoprano_nquadserializer.so
 lib/soprano/libsoprano_raptorparser.so
 lib/soprano/libsoprano_raptorserializer.so
 %%REDLAND%%lib/soprano/libsoprano_redlandbackend.so
 %%SESAME2%%lib/soprano/libsoprano_sesame2backend.so
+%%VIRTUOSO%%lib/soprano/libsoprano_virtuosobackend.so
 libdata/pkgconfig/soprano.pc
+libdata/pkgconfig/sopranoclient.pc
+libdata/pkgconfig/sopranoindex.pc
+libdata/pkgconfig/sopranoserver.pc
 share/cmake/Modules/SopranoAddOntology.cmake
 share/dbus-1/interfaces/org.soprano.Model.xml
 share/dbus-1/interfaces/org.soprano.NodeIterator.xml
@@ -172,6 +178,7 @@ share/dbus-1/interfaces/org.soprano.StatementIterator.xml
 %%DATADIR%%/plugins/raptorserializer.desktop
 %%REDLAND%%%%DATADIR%%/plugins/redlandbackend.desktop
 %%SESAME2%%%%DATADIR%%/plugins/sesame2backend.desktop
+%%VIRTUOSO%%%%DATADIR%%/plugins/virtuosobackend.desktop
 %%DATADIR%%/rules/nrl.rules
 %%DATADIR%%/rules/rdfs.rules
 %%SESAME2%%%%DATADIR%%/sesame2/openrdf-sesame-2.2.4-onejar.jar