- 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@

3 files changed, 55 insertions, 42 deletions

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