- Stop installing the rapper binary with raptor and bump PORTREVISION.

- Update raptor2 to 2.0.4.
- Update rasqal to 0.9.27.
- Update redland to 1.0.14.
- Update redland-bindings to 1.0.13.1.
- Update shared-desktop-ontologies to 0.8.0. [1]
- Update soprano to 2.7.0 and disable clucene indexer.
- Update strigi to 0.7.6.

PR:		157022 [1]
Submitted by:	rakuco [1]

3 files changed, 38 insertions, 25 deletions

diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index f4e07ce90a04..9509d75ffcbf 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -5,16 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	raptor
-PORTVERSION=	1.4.21
+PORTNAME=	raptor2
+PORTVERSION=	2.0.4
 CATEGORIES=	textproc
-MASTER_SITES=	SF/librdf/${PORTNAME}/${PORTVERSION} \
-		http://download.librdf.org/source/
+MASTER_SITES=	http://download.librdf.org/source/ \
+		SF/librdf/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	RDF Parser Toolkit for Redland
 
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+		yajl.1:${PORTSDIR}/devel/yajl
+
+CONFLICTS=	raptor-1.4.1[0-9]* raptor-1.4.21
 
 USE_GNOME=	gnomehack libxml2
 GNU_CONFIGURE=	yes
@@ -25,7 +28,7 @@ CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 
 USE_LDCONFIG=	yes
 
-MAN1=		rapper.1 raptor-config.1
-MAN3=		libraptor.3
+MAN1=		rapper.1
+MAN3=		libraptor2.3
 
 .include <bsd.port.mk>
diff --git a/textproc/raptor2/distinfo b/textproc/raptor2/distinfo
index edbb4b616c80..42b2b947b07f 100644
--- a/textproc/raptor2/distinfo
+++ b/textproc/raptor2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (raptor-1.4.21.tar.gz) = db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca
-SIZE (raptor-1.4.21.tar.gz) = 1651843
+SHA256 (raptor2-2.0.4.tar.gz) = 34f49d3afa35f5433d8779dede62e4a6567783ee05ab2d6aec1a36054c552a6e
+SIZE (raptor2-2.0.4.tar.gz) = 1660320
diff --git a/textproc/raptor2/pkg-plist b/textproc/raptor2/pkg-plist
index 9acc5fd7054d..5e42060edd7e 100644
--- a/textproc/raptor2/pkg-plist
+++ b/textproc/raptor2/pkg-plist
@@ -1,15 +1,12 @@
 bin/rapper
-bin/raptor-config
-include/raptor.h
-lib/libraptor.a
-lib/libraptor.la
-lib/libraptor.so
-lib/libraptor.so.3
-libdata/pkgconfig/raptor.pc
+include/raptor2/raptor.h
+include/raptor2/raptor2.h
+lib/libraptor2.a
+lib/libraptor2.la
+lib/libraptor2.so
+lib/libraptor2.so.0
+libdata/pkgconfig/raptor2.pc
 @exec mkdir -p %D/share/gtk-doc/html/raptor
-share/gtk-doc/html/raptor/parser-rdfa.html
-share/gtk-doc/html/raptor/serializer-json.html
-share/gtk-doc/html/raptor/raptor-section-sax2.html
 share/gtk-doc/html/raptor/home.png
 share/gtk-doc/html/raptor/index.html
 share/gtk-doc/html/raptor/index.sgml
@@ -18,39 +15,51 @@ share/gtk-doc/html/raptor/ix01.html
 share/gtk-doc/html/raptor/left.png
 share/gtk-doc/html/raptor/parser-grddl.html
 share/gtk-doc/html/raptor/parser-guess.html
+share/gtk-doc/html/raptor/parser-json.html
 share/gtk-doc/html/raptor/parser-ntriples.html
+share/gtk-doc/html/raptor/parser-rdfa.html
 share/gtk-doc/html/raptor/parser-rdfxml.html
 share/gtk-doc/html/raptor/parser-rss-tag-soup.html
 share/gtk-doc/html/raptor/parser-trig.html
 share/gtk-doc/html/raptor/parser-turtle.html
 share/gtk-doc/html/raptor/raptor.devhelp
 share/gtk-doc/html/raptor/raptor.devhelp2
+share/gtk-doc/html/raptor/raptor-formats-types-by-parser.html
+share/gtk-doc/html/raptor/raptor-formats-types-by-serializer.html
+share/gtk-doc/html/raptor/raptor-formats-types-index.html
+share/gtk-doc/html/raptor/raptor-formats.html
 share/gtk-doc/html/raptor/raptor-parsers.html
+share/gtk-doc/html/raptor/raptor-section-avltree.html
 share/gtk-doc/html/raptor/raptor-section-constants.html
-share/gtk-doc/html/raptor/raptor-section-feature.html
 share/gtk-doc/html/raptor/raptor-section-general.html
 share/gtk-doc/html/raptor/raptor-section-iostream.html
 share/gtk-doc/html/raptor/raptor-section-locator.html
 share/gtk-doc/html/raptor/raptor-section-memory.html
+share/gtk-doc/html/raptor/raptor-section-option.html
 share/gtk-doc/html/raptor/raptor-section-parser.html
+share/gtk-doc/html/raptor/raptor-section-sax2.html
 share/gtk-doc/html/raptor/raptor-section-sequence.html
 share/gtk-doc/html/raptor/raptor-section-serializer.html
-share/gtk-doc/html/raptor/raptor-serializers.html
 share/gtk-doc/html/raptor/raptor-section-stringbuffer.html
 share/gtk-doc/html/raptor/raptor-section-triples.html
 share/gtk-doc/html/raptor/raptor-section-unicode.html
-share/gtk-doc/html/raptor/raptor-section-uri-factory.html
 share/gtk-doc/html/raptor/raptor-section-uri.html
 share/gtk-doc/html/raptor/raptor-section-world.html
 share/gtk-doc/html/raptor/raptor-section-www.html
 share/gtk-doc/html/raptor/raptor-section-xml-namespace.html
 share/gtk-doc/html/raptor/raptor-section-xml-qname.html
 share/gtk-doc/html/raptor/raptor-section-xml.html
+share/gtk-doc/html/raptor/raptor-serializers.html
+share/gtk-doc/html/raptor/raptor2-changes-1-4-21-to-2-0-0.html
+share/gtk-doc/html/raptor/raptor2-changes-2-0-3-to-2-0-4.html
+share/gtk-doc/html/raptor/raptor2-changes.html
 share/gtk-doc/html/raptor/reference-manual.html
 share/gtk-doc/html/raptor/restrict-parser-network-access.html
 share/gtk-doc/html/raptor/right.png
 share/gtk-doc/html/raptor/serializer-atom.html
 share/gtk-doc/html/raptor/serializer-dot.html
+share/gtk-doc/html/raptor/serializer-json.html
+share/gtk-doc/html/raptor/serializer-nquads.html
 share/gtk-doc/html/raptor/serializer-ntriples.html
 share/gtk-doc/html/raptor/serializer-rdfxml-abbrev.html
 share/gtk-doc/html/raptor/serializer-rdfxml-xmp.html
@@ -59,8 +68,6 @@ share/gtk-doc/html/raptor/serializer-rss-1-0.html
 share/gtk-doc/html/raptor/serializer-turtle.html
 share/gtk-doc/html/raptor/style.css
 share/gtk-doc/html/raptor/tutorial-initialising-finishing.html
-share/gtk-doc/html/raptor/tutorial-serializer-get-triples.html
-share/gtk-doc/html/raptor/tutorial.html
 share/gtk-doc/html/raptor/tutorial-parse-strictness.html
 share/gtk-doc/html/raptor/tutorial-parser-abort.html
 share/gtk-doc/html/raptor/tutorial-parser-content.html
@@ -72,8 +79,8 @@ share/gtk-doc/html/raptor/tutorial-parser-runtime-info.html
 share/gtk-doc/html/raptor/tutorial-parser-set-error-warning-handlers.html
 share/gtk-doc/html/raptor/tutorial-parser-set-id-handler.html
 share/gtk-doc/html/raptor/tutorial-parser-set-namespace-handler.html
-share/gtk-doc/html/raptor/tutorial-parser-static-info.html
 share/gtk-doc/html/raptor/tutorial-parser-set-triple-handler.html
+share/gtk-doc/html/raptor/tutorial-parser-static-info.html
 share/gtk-doc/html/raptor/tutorial-parsing.html
 share/gtk-doc/html/raptor/tutorial-querying-functionality.html
 share/gtk-doc/html/raptor/tutorial-serializer-create.html
@@ -81,12 +88,15 @@ share/gtk-doc/html/raptor/tutorial-serializer-declare-namespace.html
 share/gtk-doc/html/raptor/tutorial-serializer-destroy.html
 share/gtk-doc/html/raptor/tutorial-serializer-example.html
 share/gtk-doc/html/raptor/tutorial-serializer-features.html
+share/gtk-doc/html/raptor/tutorial-serializer-get-triples.html
 share/gtk-doc/html/raptor/tutorial-serializer-runtime-info.html
 share/gtk-doc/html/raptor/tutorial-serializer-send-triples.html
 share/gtk-doc/html/raptor/tutorial-serializer-set-error-warning-handlers.html
 share/gtk-doc/html/raptor/tutorial-serializer-to-destination.html
 share/gtk-doc/html/raptor/tutorial-serializing.html
+share/gtk-doc/html/raptor/tutorial.html
 share/gtk-doc/html/raptor/up.png
 @dirrm share/gtk-doc/html/raptor
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
+@dirrm include/raptor2