- Split redland to rasqal and redland itself libraries

- Update raptor to 1.4.21
- Update rasqal to 0.9.19
- Update redland to 1.0.10
- Update redland-bindings to 1.0.10.1
- Bump portrevision on depended ports

With hat on:	kde@

24 files changed, 183 insertions, 311 deletions

diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 9e0763f879e0..ca8aa1983e9a 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ardour
 PORTVERSION=	2.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://freebsd.nsu.ru/distfiles/ \
@@ -18,7 +18,7 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A multichannel digital audio workstation
 
 LIB_DEPENDS=	lrdf.2:${PORTSDIR}/textproc/liblrdf \
-		raptor.2:${PORTSDIR}/textproc/raptor \
+		raptor.3:${PORTSDIR}/textproc/raptor \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		jack.0:${PORTSDIR}/audio/jack \
 		sndfile.1:${PORTSDIR}/audio/libsndfile \
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 7ca1cd24f66a..1c1162c05433 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	tracker
 PORTVERSION=	0.6.95
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX?=	-client
@@ -26,7 +26,7 @@ LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		exempi.3:${PORTSDIR}/textproc/exempi \
 		hal.1:${PORTSDIR}/sysutils/hal \
 		totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
-		raptor.2:${PORTSDIR}/textproc/raptor \
+		raptor.3:${PORTSDIR}/textproc/raptor \
 		ogg.6:${PORTSDIR}/audio/libogg \
 		iptcdata.3:${PORTSDIR}/graphics/libiptcdata
 RUN_DEPENDS=	xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
diff --git a/textproc/Makefile b/textproc/Makefile
index 4d0cf7fd6d7c..af18499c5784 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1023,6 +1023,7 @@
     SUBDIR += rand
     SUBDIR += raptor
     SUBDIR += rarian
+    SUBDIR += rasqal
     SUBDIR += rast
     SUBDIR += re_graph
     SUBDIR += redet
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 1a4979a811f8..cf35e404d99d 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	liblrdf
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/lrdf/${PORTNAME}/${PORTVERSION}
 
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for manipulating RDF files describing LADSPA plugins
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	raptor.2:${PORTSDIR}/textproc/raptor
+LIB_DEPENDS=	raptor.3:${PORTSDIR}/textproc/raptor
 
 USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack gnometarget
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 0f43280a88e9..28b788c6b22c 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # New ports collection makefile for:	raptor
 # Date created:			Nov 22, 2001
 # Whom:				ijliao
@@ -7,13 +6,11 @@
 #
 
 PORTNAME=	raptor
-PORTVERSION=	1.4.18
-PORTREVISION=	1
+PORTVERSION=	1.4.21
 CATEGORIES=	textproc
 MASTER_SITES=	SF/librdf/${PORTNAME}/${PORTVERSION} \
 		http://download.librdf.org/source/
 
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	RDF Parser Toolkit for Redland
 
diff --git a/textproc/raptor/distinfo b/textproc/raptor/distinfo
index 561177bc468b..f161dc8b116f 100644
--- a/textproc/raptor/distinfo
+++ b/textproc/raptor/distinfo
@@ -1,3 +1,3 @@
-MD5 (raptor-1.4.18.tar.gz) = 284e768eeda0e2898b0d5bf7e26a016e
-SHA256 (raptor-1.4.18.tar.gz) = edfdb0734fb7120bf1cbb60e45a07864db2daaadf5c3591ccf7357f244d82a40
-SIZE (raptor-1.4.18.tar.gz) = 1657246
+MD5 (raptor-1.4.21.tar.gz) = 992061488af7a9e2d933df6b694bb876
+SHA256 (raptor-1.4.21.tar.gz) = db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca
+SIZE (raptor-1.4.21.tar.gz) = 1651843
diff --git a/textproc/raptor/pkg-plist b/textproc/raptor/pkg-plist
index 27926cc35396..9acc5fd7054d 100644
--- a/textproc/raptor/pkg-plist
+++ b/textproc/raptor/pkg-plist
@@ -4,7 +4,7 @@ include/raptor.h
 lib/libraptor.a
 lib/libraptor.la
 lib/libraptor.so
-lib/libraptor.so.2
+lib/libraptor.so.3
 libdata/pkgconfig/raptor.pc
 @exec mkdir -p %D/share/gtk-doc/html/raptor
 share/gtk-doc/html/raptor/parser-rdfa.html
@@ -41,6 +41,7 @@ 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
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 0f43280a88e9..28b788c6b22c 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # New ports collection makefile for:	raptor
 # Date created:			Nov 22, 2001
 # Whom:				ijliao
@@ -7,13 +6,11 @@
 #
 
 PORTNAME=	raptor
-PORTVERSION=	1.4.18
-PORTREVISION=	1
+PORTVERSION=	1.4.21
 CATEGORIES=	textproc
 MASTER_SITES=	SF/librdf/${PORTNAME}/${PORTVERSION} \
 		http://download.librdf.org/source/
 
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	RDF Parser Toolkit for Redland
 
diff --git a/textproc/raptor2/distinfo b/textproc/raptor2/distinfo
index 561177bc468b..f161dc8b116f 100644
--- a/textproc/raptor2/distinfo
+++ b/textproc/raptor2/distinfo
@@ -1,3 +1,3 @@
-MD5 (raptor-1.4.18.tar.gz) = 284e768eeda0e2898b0d5bf7e26a016e
-SHA256 (raptor-1.4.18.tar.gz) = edfdb0734fb7120bf1cbb60e45a07864db2daaadf5c3591ccf7357f244d82a40
-SIZE (raptor-1.4.18.tar.gz) = 1657246
+MD5 (raptor-1.4.21.tar.gz) = 992061488af7a9e2d933df6b694bb876
+SHA256 (raptor-1.4.21.tar.gz) = db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca
+SIZE (raptor-1.4.21.tar.gz) = 1651843
diff --git a/textproc/raptor2/pkg-plist b/textproc/raptor2/pkg-plist
index 27926cc35396..9acc5fd7054d 100644
--- a/textproc/raptor2/pkg-plist
+++ b/textproc/raptor2/pkg-plist
@@ -4,7 +4,7 @@ include/raptor.h
 lib/libraptor.a
 lib/libraptor.la
 lib/libraptor.so
-lib/libraptor.so.2
+lib/libraptor.so.3
 libdata/pkgconfig/raptor.pc
 @exec mkdir -p %D/share/gtk-doc/html/raptor
 share/gtk-doc/html/raptor/parser-rdfa.html
@@ -41,6 +41,7 @@ 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
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index affb15efb9bc..ee4799434a98 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -5,57 +5,38 @@
 #
 # $FreeBSD$
 #
-
-PORTNAME=	redland
-PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTNAME=	rasqal
+PORTVERSION=	0.9.19
 CATEGORIES=	textproc
 MASTER_SITES=	SF/librdf/${PORTNAME}/${PORTVERSION} \
 		http://librdf.org/dist/source/
 
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	A high-level interface for RDF
 
-LIB_DEPENDS=	raptor.2:${PORTSDIR}/textproc/raptor
+LIB_DEPENDS=	raptor.3:${PORTSDIR}/textproc/raptor \
+		pcre.0:${PORTSDIR}/devel/pcre
 
-USE_BDB=	yes
-WITH_BDB_HIGHEST=	yes
-INVALID_BDB_VER=2
 USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--with-raptor=system \
-		--with-rasqal=internal \
-		--with-threestore=no \
-		--with-sqlite=no
+CONFIGURE_ARGS=	--with-raptor=system
 
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=	yes
 
-MAN1=		rasqal-config.1 rdfproc.1 redland-config.1 \
-		redland-db-upgrade.1 roqet.1
-MAN3=		librasqal.3 redland.3
+MAN1=		rasqal-config.1 roqet.1
+MAN3=		librasqal.3
 
-OPTIONS+=	MYSQL "Use MySQL instead of BDB" off
 OPTIONS+=	MPFR  "Use MPFR library for decimals (implies GMP)" off
 OPTIONS+=	GMP   "Use Gnu MP library for decimals" off
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_MYSQL)
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=--with-mysql=yes
-PLIST_SUB+=	MYSQL=""
-.else
-CONFIGURE_ARGS+=--with-mysql=no
-PLIST_SUB+=	MYSQL="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 # Set to mpfr if MPFR is on, gmp if only GMP is on and none if neither.
 # This guards against $user setting both GMP and MPFR, since we can't be
@@ -70,13 +51,4 @@ LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 CONFIGURE_ARGS+=	--with-decimal=none
 .endif
 
-pre-everything::
-	@${ECHO_CMD} "You can choose BDB version by setting WITH_BDB_VER to one off:"
-	@${ECHO_CMD} "3 40 41 42 43 44 3+ 40+ 41+ 42+ 43+ 44+ (current: ${BDB_VER})"
-.	if defined(WITH_MYSQL)
-	@${ECHO_CMD} "MySQL version to be used: ${MYSQL_VER}"
-	@${ECHO_CMD} "If you don't have MySQL installed you can stop the build now"
-	@${ECHO_CMD} "and set WITH_MYSQL_VER to the desired version"
-.	endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/rasqal/distinfo b/textproc/rasqal/distinfo
index e54a28975bfb..8528315cb48f 100644
--- a/textproc/rasqal/distinfo
+++ b/textproc/rasqal/distinfo
@@ -1,3 +1,3 @@
-MD5 (redland-1.0.7.tar.gz) = 4c066d3dcf6c25f8fb8c9007e73f293c
-SHA256 (redland-1.0.7.tar.gz) = 5fe48265b770bae89c47b3a55711adbfba368dfa120ab8112bde539b210426fc
-SIZE (redland-1.0.7.tar.gz) = 3739013
+MD5 (rasqal-0.9.19.tar.gz) = 9bc1b40ffe1bdc794887d845d153bd4e
+SHA256 (rasqal-0.9.19.tar.gz) = a042846e8b7af52d9d66fba788c9d579e58c535cfaf80d33dc0bd69bf6ffeb08
+SIZE (rasqal-0.9.19.tar.gz) = 1232729
diff --git a/textproc/rasqal/files/patch-Makefile.in b/textproc/rasqal/files/patch-Makefile.in
deleted file mode 100644
index eb18debc2f80..000000000000
--- a/textproc/rasqal/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Aug  4 12:17:19 2004
-+++ Makefile.in	Wed Aug  4 12:18:49 2004
-@@ -257,7 +257,7 @@
- # to ensure that the raptor and rasqal subdirectories are called
- # as CONFIG_SUBDIR directories.
- #
--SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
-+SUBDIRS = @LOCAL_SUBDIRS@ librdf utils demos docs data
- EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
- README      NEWS      LICENSE.txt  TODO \
- README.html NEWS.html LICENSE.html TODO.html \
diff --git a/textproc/rasqal/files/patch-configure b/textproc/rasqal/files/patch-configure
deleted file mode 100644
index bdb0881dd344..000000000000
--- a/textproc/rasqal/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig	Tue Sep  9 00:06:31 2003
-+++ configure	Tue Sep  9 09:03:46 2003
-@@ -12735,9 +12735,9 @@
-   CFLAGS="$MAINTAINER_CFLAGS $CFLAGS"
- fi
- 
--LIBS=
--CPPFLAGS=
--LDFLAGS=
-+LIBS="$LIBS"
-+CPPFLAGS="$CPPFLAGS"
-+LDFLAGS="$LDFLAGS"
- 
- LIBRDF_LIBTOOLLIBS=librdf.la
- 
diff --git a/textproc/rasqal/pkg-descr b/textproc/rasqal/pkg-descr
index 022367271ed6..bcd545a95fb9 100644
--- a/textproc/rasqal/pkg-descr
+++ b/textproc/rasqal/pkg-descr
@@ -1,7 +1,6 @@
-Redland is a library that provides a high-level interface for RDF allowing
-the model to be stored, queried and manipulated. Redland implements each
-of the RDF model concepts in its own class so provides an object based API
-for them. Some of the classes providing the parsers, storage mechanisms and
-other elements are built as modules that can be added or removed as required.
+Rasqal is a free software / Open Source C library that handles Resource
+Description Framework (RDF) query syntaxes, query construction and query
+execution returning result bindings. The supported query languages are
+SPARQL and RDQL. 
 
 WWW: http://librdf.org/
diff --git a/textproc/rasqal/pkg-plist b/textproc/rasqal/pkg-plist
index 114cbe7d148d..b8039a7dd3a7 100644
--- a/textproc/rasqal/pkg-plist
+++ b/textproc/rasqal/pkg-plist
@@ -1,113 +1,40 @@
 bin/rasqal-config
-bin/rdfproc
-bin/redland-config
-bin/redland-db-upgrade
 bin/roqet
-include/librdf.h
-include/rasqal.h
-include/rdf_concepts.h
-include/rdf_digest.h
-include/rdf_hash.h
-include/rdf_init.h
-include/rdf_iterator.h
-include/rdf_log.h
-include/rdf_model.h
-include/rdf_node.h
-include/rdf_parser.h
-include/rdf_query.h
-include/rdf_serializer.h
-include/rdf_statement.h
-include/rdf_storage.h
-include/rdf_stream.h
-include/rdf_uri.h
-include/rdf_utf8.h
-include/redland.h
+include/rasqal/rasqal.h
 lib/librasqal.a
 lib/librasqal.la
 lib/librasqal.so
-lib/librasqal.so.0
-lib/librdf.a
-lib/librdf.la
-lib/librdf.so
-lib/librdf.so.0
+lib/librasqal.so.2
 libdata/pkgconfig/rasqal.pc
-libdata/pkgconfig/redland.pc
 share/gtk-doc/html/rasqal/home.png
 share/gtk-doc/html/rasqal/index.html
 share/gtk-doc/html/rasqal/index.sgml
-share/gtk-doc/html/rasqal/ix01.html
+share/gtk-doc/html/rasqal/indexes.html
 share/gtk-doc/html/rasqal/left.png
-share/gtk-doc/html/rasqal/pt01.html
 share/gtk-doc/html/rasqal/rasqal-section-data.html
 share/gtk-doc/html/rasqal/rasqal-section-expression.html
 share/gtk-doc/html/rasqal/rasqal-section-general.html
 share/gtk-doc/html/rasqal/rasqal-section-graph-pattern.html
 share/gtk-doc/html/rasqal/rasqal-section-literal.html
 share/gtk-doc/html/rasqal/rasqal-section-prefix.html
+share/gtk-doc/html/rasqal/rasqal-section-query-results-formatter.html
 share/gtk-doc/html/rasqal/rasqal-section-query-results.html
 share/gtk-doc/html/rasqal/rasqal-section-query.html
-share/gtk-doc/html/rasqal/rasqal-section-query-results-formatter.html
+share/gtk-doc/html/rasqal/rasqal-section-row.html
 share/gtk-doc/html/rasqal/rasqal-section-triple.html
 share/gtk-doc/html/rasqal/rasqal-section-triples-source.html
+share/gtk-doc/html/rasqal/rasqal-section-updates.html
 share/gtk-doc/html/rasqal/rasqal-section-variable.html
+share/gtk-doc/html/rasqal/rasqal-section-variables-table.html
 share/gtk-doc/html/rasqal/rasqal-section-xsd.html
 share/gtk-doc/html/rasqal/rasqal.devhelp
 share/gtk-doc/html/rasqal/rasqal.devhelp2
 share/gtk-doc/html/rasqal/rasqal.html
+share/gtk-doc/html/rasqal/reference-manual.html
 share/gtk-doc/html/rasqal/right.png
 share/gtk-doc/html/rasqal/style.css
 share/gtk-doc/html/rasqal/up.png
-share/gtk-doc/html/redland/home.png
-share/gtk-doc/html/redland/index.html
-share/gtk-doc/html/redland/index.sgml
-share/gtk-doc/html/redland/indexes.html
-share/gtk-doc/html/redland/introduction.html
-share/gtk-doc/html/redland/left.png
-share/gtk-doc/html/redland/objects.html
-share/gtk-doc/html/redland/redland-concepts.html
-share/gtk-doc/html/redland/redland-digest.html
-share/gtk-doc/html/redland/redland-files.html
-share/gtk-doc/html/redland/redland-hash.html
-share/gtk-doc/html/redland/redland-heuristics.html
-share/gtk-doc/html/redland/redland-iterator.html
-share/gtk-doc/html/redland/redland-list.html
-share/gtk-doc/html/redland/redland-log.html
-share/gtk-doc/html/redland/redland-model.html
-share/gtk-doc/html/redland/redland-node.html
-share/gtk-doc/html/redland/redland-parser.html
-share/gtk-doc/html/redland/redland-query-results.html
-share/gtk-doc/html/redland/redland-query.html
-share/gtk-doc/html/redland/redland-serializer.html
-share/gtk-doc/html/redland/redland-statement.html
-share/gtk-doc/html/redland/redland-storage.html
-share/gtk-doc/html/redland/redland-storage-module-file.html
-share/gtk-doc/html/redland/redland-storage-module-hashes.html
-share/gtk-doc/html/redland/redland-storage-module-memory.html
-share/gtk-doc/html/redland/redland-storage-module-mysql.html
-share/gtk-doc/html/redland/redland-storage-module-postgresql.html
-share/gtk-doc/html/redland/redland-storage-module-sqlite.html
-share/gtk-doc/html/redland/redland-storage-module-tstore.html
-share/gtk-doc/html/redland/redland-storage-module-uri.html
-share/gtk-doc/html/redland/redland-storage-modules.html
-share/gtk-doc/html/redland/redland-stream.html
-share/gtk-doc/html/redland/redland-unicode.html
-share/gtk-doc/html/redland/redland-uri.html
-share/gtk-doc/html/redland/redland-world.html
-share/gtk-doc/html/redland/redland.devhelp
-share/gtk-doc/html/redland/redland.devhelp2
-share/gtk-doc/html/redland/redland.html
-share/gtk-doc/html/redland/reference-manual.html
-share/gtk-doc/html/redland/right.png
-share/gtk-doc/html/redland/style.css
-share/gtk-doc/html/redland/tutorial.html
-share/gtk-doc/html/redland/up.png
-%%MYSQL%%share/redland/mysql-v1.ttl
-%%MYSQL%%share/redland/mysql-v2.ttl
-%%DATADIR%%/Redland.i
-@dirrm lib/redland
-@dirrm %%DATADIR%%
 @exec mkdir -p %D/share/gtk-doc/html/rasqal
 @dirrm share/gtk-doc/html/rasqal
-@exec mkdir -p %D/share/gtk-doc/html/redland
-@dirrm share/gtk-doc/html/redland
 @dirrmtry share/gtk-doc
+@dirrm include/rasqal
diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index ada619afacae..9a2df88dc42a 100644
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -6,37 +6,33 @@
 #
 
 PORTNAME=	redland-bindings
-PORTVERSION=	1.0.7.1
+PORTVERSION=	1.0.10.1
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Language bindings for the Redland package
 
-#OPTIONS=	JAVA "Add Java bindings" off \
-#		PERL "Add Perl bindings" off \
-#		PHP "Add PHP bindings" off \
-#		PYTHON "Add Python bindings" off \
-#		RUBY "Add Ruby bindings" off \
+OPTIONS=	PERL "Add Perl bindings" off \
+		PHP "Add PHP bindings" off \
+		PYTHON "Add Python bindings" on \
+		RUBY "Add Ruby bindings" off
 LIB_DEPENDS=	rdf.0:${PORTSDIR}/textproc/redland
 
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.options.mk>
 
-.if defined(WITH_JAVA)
-USE_JAVA=	yes
-JAVA_VERSION=	1.3+
-CONFIGURE_ARGS+=	--with-java --with-jdk=${JAVA_HOME}
-PLIST_SUB+=	WITH_JAVA=""
-.else
-PLIST_SUB+=	WITH_JAVA="@comment "
-.endif
 .if defined(WITH_PERL)
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perl
 PLIST_SUB+=	WITH_PERL=""
 MANPREFIX=	${LOCALBASE}/lib/perl5/${PERL_VERSION}
 MAN3=	RDF::Redland.3 \
+	RDF::Redland::BlankNode.3 \
 	RDF::Redland::Iterator.3 \
+	RDF::Redland::LiteralNode.3 \
 	RDF::Redland::Model.3 \
 	RDF::Redland::Node.3 \
 	RDF::Redland::Parser.3 \
@@ -47,10 +43,13 @@ MAN3=	RDF::Redland.3 \
 	RDF::Redland::Statement.3 \
 	RDF::Redland::Storage.3 \
 	RDF::Redland::Stream.3 \
-	RDF::Redland::URI.3
+	RDF::Redland::URI.3 \
+	RDF::Redland::URINode.3 \
+	RDF::Redland::XMLLiteralNode.3
 .else
 PLIST_SUB+=	WITH_PERL="@comment "
 .endif
+
 .if defined(WITH_PHP)
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
@@ -59,13 +58,15 @@ PLIST_SUB+=	WITH_PHP=""
 .else
 PLIST_SUB+=	WITH_PHP="@comment "
 .endif
+
 .if defined(WITH_PYTHON)
-USE_PYTHON=	yes
+USE_PYTHON=	2.5+
 CONFIGURE_ARGS+=	--with-python
 PLIST_SUB+=	WITH_PYTHON=""
 .else
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
+
 .if defined(WITH_RUBY)
 USE_RUBY=	yes
 CONFIGURE_ARGS+=	--with-ruby
@@ -74,20 +75,4 @@ PLIST_SUB+=	WITH_RUBY=""
 PLIST_SUB+=	WITH_RUBY="@comment "
 .endif
 
-GNU_CONFIGURE=	yes
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "**********************************************"
-	@${ECHO_MSG} "The following make variables can be set to"
-	@${ECHO_MSG} "enable bindings for various languages"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITH_JAVA   - Java bindings"
-	@${ECHO_MSG} "WITH_PERL   - Perl module"
-	@${ECHO_MSG} "WITH_PHP    - PHP extension"
-	@${ECHO_MSG} "WITH_PYTHON - Python extension"
-	@${ECHO_MSG} "WITH_RUBY   - Ruby bindings"
-	@${ECHO_MSG} "**********************************************"
-	@${ECHO_MSG} ""
-
 .include <bsd.port.mk>
diff --git a/textproc/redland-bindings/distinfo b/textproc/redland-bindings/distinfo
index a0089c287e19..672b41c5b5c1 100644
--- a/textproc/redland-bindings/distinfo
+++ b/textproc/redland-bindings/distinfo
@@ -1,3 +1,3 @@
-MD5 (redland-bindings-1.0.7.1.tar.gz) = ad38f4b5d4f55a87359ebff047a00184
-SHA256 (redland-bindings-1.0.7.1.tar.gz) = 82749b6e45399487aec8e368d0d1dea700222b4863ce3c12787f668469740134
-SIZE (redland-bindings-1.0.7.1.tar.gz) = 744527
+MD5 (redland-bindings-1.0.10.1.tar.gz) = 4b70555996b230c9e6671fc6e416e123
+SHA256 (redland-bindings-1.0.10.1.tar.gz) = 66361a05d85c0cbbc9b845341f709821c58add8307bde1eb5bdb7bb3bf761e94
+SIZE (redland-bindings-1.0.10.1.tar.gz) = 726598
diff --git a/textproc/redland-bindings/pkg-plist b/textproc/redland-bindings/pkg-plist
index 4a5c3c2529e0..2c618949531e 100644
--- a/textproc/redland-bindings/pkg-plist
+++ b/textproc/redland-bindings/pkg-plist
@@ -1,13 +1,9 @@
 @comment $FreeBSD$
-%%WITH_JAVA%%lib/java/librdf-java.a
-%%WITH_JAVA%%lib/java/librdf-java.la
-%%WITH_JAVA%%lib/java/librdf-java.so
-%%WITH_JAVA%%lib/java/librdf-java.so.0
-%%WITH_JAVA%%share/java/librdf-java.jar
-%%WITH_JAVA%%@unexec rmdir %D/lib/java
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/BlankNode.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/CORE.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Iterator.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/LiteralNode.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Model.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Node.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Parser.pm
@@ -19,9 +15,41 @@
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Storage.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Stream.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/URI.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/URINode.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/XMLLiteralNode.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/.packlist
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/CORE.bs
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/CORE.so
 %%WITH_PHP%%lib/php/%%PHP_EXT_DIR%%/redland.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/Redland.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/RDF.py
-%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/redland.so
+%%WITH_RUBY%%%%RUBY_ARCHLIBDIR%%/redland.so
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/queryresults.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/model.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/convert_owl.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/dc.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/uri.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/util.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/serializer.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/parser.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/resource.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/stream.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/convertfoaf.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/statement.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/schemas/owl.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/schemas/rdfs.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/schemas/foaf.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/node.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/constants.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/query.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/store.rb
+%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland.rb
+%%WITH_RUBY%%@dirrm %%RUBY_LIBDIR%%/rdf/redland/schemas
+%%WITH_RUBY%%@dirrm %%RUBY_LIBDIR%%/rdf/redland
+%%WITH_RUBY%%@dirrm %%RUBY_LIBDIR%%/rdf
+%%WITH_PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDF
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index affb15efb9bc..76f9ede87ac5 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -7,22 +7,22 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTVERSION=	1.0.10
 CATEGORIES=	textproc
 MASTER_SITES=	SF/librdf/${PORTNAME}/${PORTVERSION} \
 		http://librdf.org/dist/source/
 
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	A high-level interface for RDF
 
-LIB_DEPENDS=	raptor.2:${PORTSDIR}/textproc/raptor
+LIB_DEPENDS=	raptor.3:${PORTSDIR}/textproc/raptor \
+		rasqal.2:${PORTSDIR}/textproc/rasqal
 
 USE_BDB=	yes
 WITH_BDB_HIGHEST=	yes
 INVALID_BDB_VER=2
-USE_GNOME=	gnomehack gnometarget lthack pkgconfig
+USE_GNOME=	gnomehack gnometarget lthack pkgconfig libxml2
+USE_AUTOTOOLS=	libltdl:22
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -31,44 +31,67 @@ CPPFLAGS=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-raptor=system \
-		--with-rasqal=internal \
-		--with-threestore=no \
-		--with-sqlite=no
+		--with-threestore=no
 
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=	yes
 
-MAN1=		rasqal-config.1 rdfproc.1 redland-config.1 \
-		redland-db-upgrade.1 roqet.1
-MAN3=		librasqal.3 redland.3
+MAN1=		rdfproc.1 redland-config.1 \
+		redland-db-upgrade.1
+MAN3=		redland.3
 
-OPTIONS+=	MYSQL "Use MySQL instead of BDB" off
-OPTIONS+=	MPFR  "Use MPFR library for decimals (implies GMP)" off
-OPTIONS+=	GMP   "Use Gnu MP library for decimals" off
+OPTIONS+=	THREADS "Enable Threads" off
+#		MYSQL "Use MySQL instead of BDB" off \
+#		PGSQL "Use PgSQL instead of BDB" off \
+#		SQLITE "Use SQLite instead of BDB" off \
+#		VIRTUOSO "Use Virtoso instead of BDB" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MYSQL)
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=--with-mysql=yes
-PLIST_SUB+=	MYSQL=""
+.if defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+=	--disable-threads
 .else
+CONFIGURE_ARGS+=	--enable-threads
+.endif
+
+#.if defined(WITH_MYSQL)
+#USE_MYSQL=	yes
+#CONFIGURE_ARGS+=--with-mysql=yes
+#CONFIGURE_ENV+=	LIBS="${LIBS}"
+#CFLAGS+=	-I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
+#LDFLAGS+=	-L${LOCALBASE}/lib/mysql
+#PLIST_SUB+=	MYSQL=""
+#.else
 CONFIGURE_ARGS+=--with-mysql=no
 PLIST_SUB+=	MYSQL="@comment "
-.endif
+#.endif
 
-# Set to mpfr if MPFR is on, gmp if only GMP is on and none if neither.
-# This guards against $user setting both GMP and MPFR, since we can't be
-# very verbose in explaining our options.
-.if defined(WITH_MPFR)
-CONFIGURE_ARGS+=	--with-decimal=mpfr
-LIB_DEPENDS+=	mpfr.3:${PORTSDIR}/math/mpfr
-.elif defined(WITH_GMP)
-CONFIGURE_ARGS+=	--with-decimal=gmp
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
-.else
-CONFIGURE_ARGS+=	--with-decimal=none
-.endif
+#.if defined(WITH_PGSQL)
+#USE_PGSQL=	yes
+#CONFIGURE_ARGS+=--with-postgresql=yes
+#PLIST_SUB+=	PGSQL=""
+#.else
+CONFIGURE_ARGS+=--with-postgresql=no
+PLIST_SUB+=	PGSQL="@comment "
+#.endif
+
+#.if defined(WITH_SQLITE)
+#USE_SQLITE=	3
+#CONFIGURE_ARGS+=--with-sqlite=3
+#PLIST_SUB+=	SQLITE=""
+#.else
+CONFIGURE_ARGS+=--with-sqlite=no
+PLIST_SUB+=	SQLITE="@comment "
+#.endif
+
+#.if defined(WITH_VIRTUOSO)
+#CONFIGURE_ARGS+=--with-virtuoso=yes
+#LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+#PLIST_SUB+=	VIRTUOSO=""
+#.else
+CONFIGURE_ARGS+=--with-virtuoso=no
+PLIST_SUB+=	VIRTUOSO="@comment "
+#.endif
 
 pre-everything::
 	@${ECHO_CMD} "You can choose BDB version by setting WITH_BDB_VER to one off:"
@@ -79,4 +102,4 @@ pre-everything::
 	@${ECHO_CMD} "and set WITH_MYSQL_VER to the desired version"
 .	endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/redland/distinfo b/textproc/redland/distinfo
index e54a28975bfb..1de42d185489 100644
--- a/textproc/redland/distinfo
+++ b/textproc/redland/distinfo
@@ -1,3 +1,3 @@
-MD5 (redland-1.0.7.tar.gz) = 4c066d3dcf6c25f8fb8c9007e73f293c
-SHA256 (redland-1.0.7.tar.gz) = 5fe48265b770bae89c47b3a55711adbfba368dfa120ab8112bde539b210426fc
-SIZE (redland-1.0.7.tar.gz) = 3739013
+MD5 (redland-1.0.10.tar.gz) = bdbb9b8dc614fc09a14cd646079619e1
+SHA256 (redland-1.0.10.tar.gz) = e3060d05de27c72fb1d1c8ebb698006462abcb96bff98511c0baf08d85389815
+SIZE (redland-1.0.10.tar.gz) = 1569554
diff --git a/textproc/redland/files/patch-Makefile.in b/textproc/redland/files/patch-Makefile.in
index eb18debc2f80..cbb15b307ba4 100644
--- a/textproc/redland/files/patch-Makefile.in
+++ b/textproc/redland/files/patch-Makefile.in
@@ -1,11 +1,11 @@
 --- Makefile.in.orig	Wed Aug  4 12:17:19 2004
 +++ Makefile.in	Wed Aug  4 12:18:49 2004
-@@ -257,7 +257,7 @@
- # to ensure that the raptor and rasqal subdirectories are called
- # as CONFIG_SUBDIR directories.
- #
--SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
-+SUBDIRS = @LOCAL_SUBDIRS@ librdf utils demos docs data
+@@ -288,7 +288,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ 
+ # Subdirectories to build/install/distribute etc.
+-SUBDIRS = $(subdirs) src examples utils demos docs data
++SUBDIRS = $(subdirs) src utils demos docs data
  EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
  README      NEWS      LICENSE.txt  TODO \
- README.html NEWS.html LICENSE.html TODO.html \
diff --git a/textproc/redland/files/patch-configure b/textproc/redland/files/patch-configure
deleted file mode 100644
index bdb0881dd344..000000000000
--- a/textproc/redland/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig	Tue Sep  9 00:06:31 2003
-+++ configure	Tue Sep  9 09:03:46 2003
-@@ -12735,9 +12735,9 @@
-   CFLAGS="$MAINTAINER_CFLAGS $CFLAGS"
- fi
- 
--LIBS=
--CPPFLAGS=
--LDFLAGS=
-+LIBS="$LIBS"
-+CPPFLAGS="$CPPFLAGS"
-+LDFLAGS="$LDFLAGS"
- 
- LIBRDF_LIBTOOLLIBS=librdf.la
- 
diff --git a/textproc/redland/pkg-plist b/textproc/redland/pkg-plist
index 114cbe7d148d..6af38683a482 100644
--- a/textproc/redland/pkg-plist
+++ b/textproc/redland/pkg-plist
@@ -1,62 +1,44 @@
-bin/rasqal-config
 bin/rdfproc
 bin/redland-config
 bin/redland-db-upgrade
-bin/roqet
 include/librdf.h
-include/rasqal.h
 include/rdf_concepts.h
 include/rdf_digest.h
 include/rdf_hash.h
 include/rdf_init.h
 include/rdf_iterator.h
+include/rdf_list.h
 include/rdf_log.h
 include/rdf_model.h
 include/rdf_node.h
 include/rdf_parser.h
 include/rdf_query.h
+include/rdf_raptor.h
 include/rdf_serializer.h
 include/rdf_statement.h
 include/rdf_storage.h
+include/rdf_storage_module.h
 include/rdf_stream.h
 include/rdf_uri.h
 include/rdf_utf8.h
 include/redland.h
-lib/librasqal.a
-lib/librasqal.la
-lib/librasqal.so
-lib/librasqal.so.0
 lib/librdf.a
 lib/librdf.la
 lib/librdf.so
 lib/librdf.so.0
-libdata/pkgconfig/rasqal.pc
+%%MYSQL%%lib/redland/librdf_storage_mysql.a
+%%MYSQL%%lib/redland/librdf_storage_mysql.la
+%%MYSQL%%lib/redland/librdf_storage_mysql.so
+%%PGSQL%%lib/redland/librdf_storage_postgresql.a
+%%PGSQL%%lib/redland/librdf_storage_postgresql.la
+%%PGSQL%%lib/redland/librdf_storage_postgresql.so
+%%SQLITE%%lib/redland/librdf_storage_sqlite.a
+%%SQLITE%%lib/redland/librdf_storage_sqlite.la
+%%SQLITE%%lib/redland/librdf_storage_sqlite.so
+%%VIRTUOSO%%lib/redland/librdf_storage_virtuoso.a
+%%VIRTUOSO%%lib/redland/librdf_storage_virtuoso.la
+%%VIRTUOSO%%lib/redland/librdf_storage_virtuoso.so
 libdata/pkgconfig/redland.pc
-share/gtk-doc/html/rasqal/home.png
-share/gtk-doc/html/rasqal/index.html
-share/gtk-doc/html/rasqal/index.sgml
-share/gtk-doc/html/rasqal/ix01.html
-share/gtk-doc/html/rasqal/left.png
-share/gtk-doc/html/rasqal/pt01.html
-share/gtk-doc/html/rasqal/rasqal-section-data.html
-share/gtk-doc/html/rasqal/rasqal-section-expression.html
-share/gtk-doc/html/rasqal/rasqal-section-general.html
-share/gtk-doc/html/rasqal/rasqal-section-graph-pattern.html
-share/gtk-doc/html/rasqal/rasqal-section-literal.html
-share/gtk-doc/html/rasqal/rasqal-section-prefix.html
-share/gtk-doc/html/rasqal/rasqal-section-query-results.html
-share/gtk-doc/html/rasqal/rasqal-section-query.html
-share/gtk-doc/html/rasqal/rasqal-section-query-results-formatter.html
-share/gtk-doc/html/rasqal/rasqal-section-triple.html
-share/gtk-doc/html/rasqal/rasqal-section-triples-source.html
-share/gtk-doc/html/rasqal/rasqal-section-variable.html
-share/gtk-doc/html/rasqal/rasqal-section-xsd.html
-share/gtk-doc/html/rasqal/rasqal.devhelp
-share/gtk-doc/html/rasqal/rasqal.devhelp2
-share/gtk-doc/html/rasqal/rasqal.html
-share/gtk-doc/html/rasqal/right.png
-share/gtk-doc/html/rasqal/style.css
-share/gtk-doc/html/rasqal/up.png
 share/gtk-doc/html/redland/home.png
 share/gtk-doc/html/redland/index.html
 share/gtk-doc/html/redland/index.sgml
@@ -88,6 +70,7 @@ share/gtk-doc/html/redland/redland-storage-module-postgresql.html
 share/gtk-doc/html/redland/redland-storage-module-sqlite.html
 share/gtk-doc/html/redland/redland-storage-module-tstore.html
 share/gtk-doc/html/redland/redland-storage-module-uri.html
+share/gtk-doc/html/redland/redland-storage-module-virtuoso.html
 share/gtk-doc/html/redland/redland-storage-modules.html
 share/gtk-doc/html/redland/redland-stream.html
 share/gtk-doc/html/redland/redland-unicode.html
@@ -99,6 +82,7 @@ share/gtk-doc/html/redland/redland.html
 share/gtk-doc/html/redland/reference-manual.html
 share/gtk-doc/html/redland/right.png
 share/gtk-doc/html/redland/style.css
+share/gtk-doc/html/redland/tutorial-introduction.html
 share/gtk-doc/html/redland/tutorial.html
 share/gtk-doc/html/redland/up.png
 %%MYSQL%%share/redland/mysql-v1.ttl
@@ -106,8 +90,6 @@ share/gtk-doc/html/redland/up.png
 %%DATADIR%%/Redland.i
 @dirrm lib/redland
 @dirrm %%DATADIR%%
-@exec mkdir -p %D/share/gtk-doc/html/rasqal
-@dirrm share/gtk-doc/html/rasqal
 @exec mkdir -p %D/share/gtk-doc/html/redland
 @dirrm share/gtk-doc/html/redland
 @dirrmtry share/gtk-doc