2 files changed, 90 insertions, 110 deletions

diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index 3915e3764895..d3374ef5ee41 100644
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -9,72 +9,34 @@ MASTER_SITES=	http://download.librdf.org/source/
 MAINTAINER?=	kde@FreeBSD.org
 COMMENT?=	Language bindings for the Redland package
 
-LIB_DEPENDS=	rdf:${PORTSDIR}/textproc/redland
+# Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
+# of its licenses is "GPLv2 or newer", which includes GPLv3.
+LICENSE=	AL2 GPLv2 GPLv3 LGPL21
+LICENSE_COMB=	dual
+
+LIB_DEPENDS=	librdf.so:${PORTSDIR}/textproc/redland
 
 GNU_CONFIGURE=	yes
+USES=		pkgconfig
 
 OPTIONS_DEFINE=	PERL PHP PYTHON RUBY
 OPTIONS_DEFAULT=PYTHON
+OPTIONS_SUB=	yes
 
-USES=		pkgconfig
+PERL_CONFIGURE_WITH=	perl
+PERL_USES=		perl5
+PHP_CONFIGURE_WITH=	php
+PHP_USE=		PHP=yes PHP_BUILD=yes
+PYTHON_CONFIGURE_WITH=	python
+PYTHON_USE=		PYTHON=2.5+
+RUBY_CONFIGURE_WITH=	ruby
+RUBY_USE=		RUBY=yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MPERL}
-USES+=		perl5
-CONFIGURE_ARGS+=--with-perl
-PLIST_SUB+=	WITH_PERL=""
-MANPREFIX=	${LOCALBASE}/lib/perl5/${PERL_VER}
-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 \
-		RDF::Redland::Query.3 \
-		RDF::Redland::QueryResults.3 \
-		RDF::Redland::RSS.3 \
-		RDF::Redland::Serializer.3 \
-		RDF::Redland::Statement.3 \
-		RDF::Redland::Storage.3 \
-		RDF::Redland::Stream.3 \
-		RDF::Redland::URI.3 \
-		RDF::Redland::URINode.3 \
-		RDF::Redland::XMLLiteralNode.3
-.else
-PLIST_SUB+=	WITH_PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPHP}
-USE_PHP=	yes
-USE_PHP_BUILD=	yes
-CONFIGURE_ARGS+=--with-php
-PLIST_SUB+=	WITH_PHP=""
-.else
-PLIST_SUB+=	WITH_PHP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	2.5+
-CONFIGURE_ARGS+=--with-python
-PLIST_SUB+=	WITH_PYTHON=""
-.else
-PLIST_SUB+=	WITH_PYTHON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRUBY}
-USE_RUBY=	yes
-CONFIGURE_ARGS+=--with-ruby
-PLIST_SUB+=	WITH_RUBY=""
-.else
-PLIST_SUB+=	WITH_RUBY="@comment "
-.endif
-
 post-install:
 .if ${PORT_OPTIONS:MPERL}
-	-${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
+	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/redland-bindings/pkg-plist b/textproc/redland-bindings/pkg-plist
index ec982b7ed842..775c5f6b5ce9 100644
--- a/textproc/redland-bindings/pkg-plist
+++ b/textproc/redland-bindings/pkg-plist
@@ -1,55 +1,73 @@
-@comment $FreeBSD$
-%%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
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Query.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/QueryResults.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/RSS.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Serializer.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Statement.pm
-%%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_ARCHLIBDIR%%/redland.so
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/constants.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/convert_owl.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/convertfoaf.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/dc.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/model.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/node.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/parser.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/query.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/queryresults.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/resource.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/schemas/foaf.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/serializer.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/statement.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/store.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/stream.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/uri.rb
-%%WITH_RUBY%%%%RUBY_LIBDIR%%/rdf/redland/util.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
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::BlankNode.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::Iterator.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::LiteralNode.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::Model.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::Node.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::Parser.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::Query.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::QueryResults.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::RSS.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::Serializer.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::Statement.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::Storage.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::Stream.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::URI.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::URINode.3.gz
+%%PERL%%%%PERL5_MAN3%%/RDF::Redland::XMLLiteralNode.3.gz
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/BlankNode.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/CORE.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Iterator.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/LiteralNode.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Model.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Node.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Parser.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Query.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/QueryResults.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/RSS.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Serializer.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Statement.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Storage.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Stream.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/URI.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/URINode.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/XMLLiteralNode.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/.packlist
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/CORE.bs
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/CORE.so
+%%PHP%%lib/php/%%PHP_EXT_DIR%%/redland.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/Redland.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/RDF.py
+%%RUBY%%%%RUBY_ARCHLIBDIR%%/redland.so
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/constants.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/convert_owl.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/convertfoaf.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/dc.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/model.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/node.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/parser.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/query.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/queryresults.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/resource.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/schemas/foaf.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/schemas/owl.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/schemas/rdfs.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/serializer.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/statement.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/store.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/stream.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/uri.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland/util.rb
+%%RUBY%%%%RUBY_LIBDIR%%/rdf/redland.rb
+%%RUBY%%@dirrm %%RUBY_LIBDIR%%/rdf/redland/schemas
+%%RUBY%%@dirrm %%RUBY_LIBDIR%%/rdf/redland
+%%RUBY%%@dirrm %%RUBY_LIBDIR%%/rdf
+%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
+%%PYTHON%%@dirrmtry %%PYTHON_LIBDIR%%
+%%PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDF