Date: Sun, 1 Mar 2009 15:29:23 GMT From: David Naylor <naylor.b.david@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/132221: [UPDATE] soprano 2.1.67->2.2.2 (+options) Message-ID: <200903011529.n21FTNpb099073@www.freebsd.org> Resent-Message-ID: <200903011530.n21FU9Wk012741@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 132221
>Category: ports
>Synopsis: [UPDATE] soprano 2.1.67->2.2.2 (+options)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 01 15:30:08 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: David Naylor
>Release: FreeBSD 7.1p2
>Organization:
Private
>Environment:
FreeBSD dragon.dg 7.1-RELEASE-p2 FreeBSD 7.1-RELEASE-p2 #0: Sun Feb 1 20:27:42 SAST 2009 root@dragon.dg:/tmp/tmp/src/sys/GENERIC i386
>Description:
The attached patch updates soprano from 2.1.67 to 2.2.2. It also adds options to control the backends that are compiled.
Since sesame2 requires java (and thus a heavyweight option) it is disabled by default while the alternative, redland, is enabled by default.
While I was busy with this port I notices there were other build options (to disable various components):
- clucene: full-text indexing
- raptop: raptor parser and serializer
- dbus: iter-process communication
and to enable:
- DOCS: builds the API docs for suprano
I could add options to control the above (if it is desired) although I think the backends do warrant options the others are a less clear-cut case?
>How-To-Repeat:
n/a
>Fix:
Apply the patch:
cd /usr/ports/textproc/soprano && patch < /path/to/patch
Patch attached with submission follows:
Index: distinfo
===================================================================
--- distinfo (revision 4531)
+++ distinfo (working copy)
@@ -1,3 +1,3 @@
-MD5 (soprano-2.1.67.tar.bz2) = 9639e400ba4beb08af35e5128439cc77
-SHA256 (soprano-2.1.67.tar.bz2) = 1fe7feb83891e5761646e731fbdb8a44c84600392a72316c7eada304e8e29026
-SIZE (soprano-2.1.67.tar.bz2) = 1847445
+MD5 (soprano-2.2.2.tar.bz2) = 101527bd62a1d27ab101d345fbf4cf25
+SHA256 (soprano-2.2.2.tar.bz2) = ac3f4f36a947dc38857e930c5be504a41cbeb3cd931632ffeb4b70555a4bbc72
+SIZE (soprano-2.2.2.tar.bz2) = 1849380
Index: pkg-plist
===================================================================
--- pkg-plist (revision 4531)
+++ pkg-plist (working copy)
@@ -150,7 +150,8 @@
lib/soprano/libsoprano_nquadserializer.so
lib/soprano/libsoprano_raptorparser.so
lib/soprano/libsoprano_raptorserializer.so
-lib/soprano/libsoprano_redlandbackend.so
+%%REDLAND%%/lib/soprano/libsoprano_redlandbackend.so
+%%SESAME2%%lib/soprano/libsoprano_sesame2backend.so
libdata/pkgconfig/soprano.pc
share/dbus-1/interfaces/org.soprano.Model.xml
share/dbus-1/interfaces/org.soprano.NodeIterator.xml
@@ -161,9 +162,15 @@
%%DATADIR%%/plugins/nquadserializer.desktop
%%DATADIR%%/plugins/raptorparser.desktop
%%DATADIR%%/plugins/raptorserializer.desktop
-%%DATADIR%%/plugins/redlandbackend.desktop
+%%REDLAND%%%%DATADIR%%/plugins/redlandbackend.desktop
+%%SESAME2%%%%DATADIR%%/plugins/sesame2backend.desktop
%%DATADIR%%/rules/nrl.rules
%%DATADIR%%/rules/rdfs.rules
+%%SESAME2%%%%DATADIR%%/sesame2/openrdf-sesame-2.1.4-onejar.jar
+%%SESAME2%%%%DATADIR%%/sesame2/slf4j-api-1.5.5.jar
+%%SESAME2%%%%DATADIR%%/sesame2/slf4j-simple-1.5.5.jar
+%%SESAME2%%%%DATADIR%%/sesame2/SopranoSesame2Wrapper.class
+%%SESAME2%%@dirrm %%DATADIR%%/sesame2
@dirrm %%DATADIR%%/rules
@dirrm %%DATADIR%%/plugins
@dirrm %%DATADIR%%
Index: Makefile
===================================================================
--- Makefile (revision 4531)
+++ Makefile (working copy)
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= soprano
-PORTVERSION= 2.1.67
+PORTVERSION= 2.2.2
CATEGORIES= textproc
MASTER_SITES= SF
@@ -15,6 +15,9 @@
LIB_DEPENDS= clucene.0:${PORTSDIR}/textproc/clucene \
rdf.0:${PORTSDIR}/textproc/redland
+OPTIONS= REDLAND "Use Redland as storage backend" on \
+ SESAME2 "Use Sesame2 as storage backend (requires Java)" off
+
USE_BZIP2= yes
USE_QT_VER= 4
QT_COMPONENTS= corelib dbus qtestlib network \
@@ -23,9 +26,30 @@
USE_LDCONFIG= yes
USE_CMAKE= yes
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_REDLAND)
+PLIST_SUB+= REDLAND=""
+.else
+CMAKE_ARGS+= -DSOPRANO_DISABLE_REDLAND_BACKEND=yes
+PLIST_SUB+= REDLAND="@comment "
+.endif
+
+.if defined(WITH_SESAME2)
+CATEGORIES+= java
+CMAKE_ENV+= JAVA_HOME=${JAVA_HOME}
+USE_JAVA= yes
+JAVA_VERSION= 1.4+
+JAVA_OS= native
+PLIST_SUB+= SESAME2=""
+.else
+CMAKE_ARGS+= -DSOPRANO_DISABLE_SESAME2_BACKEND=yes
+PLIST_SUB+= SESAME2="@comment "
+.endif
+
post-patch:
${MKDIR} ${WRKSRC}
${REINPLACE_CMD} -e "s,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig," \
${WRKSRC}/CMakeLists.txt
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903011529.n21FTNpb099073>