2 files changed, 21 insertions, 33 deletions

diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index a4bbdb1691aa..1efcf2ff92ff 100644
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	redland-bindings
 PORTVERSION=	1.0.17.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/
 
@@ -25,6 +26,7 @@ OPTIONS_SUB=	yes
 
 PERL_CONFIGURE_WITH=	perl
 PERL_USES=		perl5
+PERL_USE=		PERL5=build,run
 PHP_CONFIGURE_WITH=	php
 PHP_USE=		PHP=yes PHP_BUILD=yes
 PYTHON_CONFIGURE_WITH=	python
@@ -32,12 +34,4 @@ PYTHON_USE=		PYTHON=yes
 RUBY_CONFIGURE_WITH=	ruby
 RUBY_USE=		RUBY=yes
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MPERL}
-	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
-	${SED} -i '' -e 's,^${STAGEDIR},,g' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/RDF/Redland/CORE/.packlist
-.endif
-
 .include <bsd.port.mk>
diff --git a/textproc/redland-bindings/pkg-plist b/textproc/redland-bindings/pkg-plist
index 714149d276dd..ceeacbcbb608 100644
--- a/textproc/redland-bindings/pkg-plist
+++ b/textproc/redland-bindings/pkg-plist
@@ -15,26 +15,25 @@
 %%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.so
+%%PERL%%%%SITE_ARCH%%/RDF/Redland.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/BlankNode.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/CORE.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Iterator.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/LiteralNode.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Model.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Node.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Parser.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Query.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/QueryResults.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/RSS.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Serializer.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Statement.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Storage.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/Stream.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/URI.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/URINode.pm
+%%PERL%%%%SITE_ARCH%%/RDF/Redland/XMLLiteralNode.pm
+%%PERL%%%%SITE_ARCH%%/auto/RDF/Redland/CORE/CORE.so
 %%PHP%%lib/php/%%PHP_EXT_DIR%%/redland.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/RDF.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/Redland.py
@@ -66,8 +65,3 @@
 %%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