4 files changed, 32 insertions, 27 deletions

diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index 9bf6151e062c..406ec362fbcf 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	RDF-Notation3
-PORTVERSION=	0.70
+PORTVERSION=	0.83
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	RDF
@@ -14,10 +14,9 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RDF/Core.pm:${PORTSDIR}/textproc/p5-RDF-Core \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RDFStore.pm:${PORTSDIR}/textproc/p5-RDFStore
+BUILD_DEPENDS=	${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
+		${SITE_PERL}/RDF/Core.pm:${PORTSDIR}/textproc/p5-RDF-Core \
+		${SITE_PERL}/RDFStore.pm:${PORTSDIR}/textproc/p5-RDFStore
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -35,4 +34,10 @@ pre-patch:
 	@${FIND} ${WRKSRC} -name "*.pm" | xargs ${PERL} -pi -e \
 	'$$package=$$1 if /^package\s+([^\s;]*);/; s!^require 5.005_62;!!; s!^use warnings;!!; s!^our\s+(\$$)(VERSION)\s+=!$$1$${package}::$$2=!;'
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/p5-RDF-Notation3/distinfo b/textproc/p5-RDF-Notation3/distinfo
index 381482913423..1b0f900102c0 100644
--- a/textproc/p5-RDF-Notation3/distinfo
+++ b/textproc/p5-RDF-Notation3/distinfo
@@ -1 +1 @@
-MD5 (RDF-Notation3-0.70.tar.gz) = ba909ec87d1329baec8a3787b11979ed
+MD5 (RDF-Notation3-0.83.tar.gz) = 6d4b1e028c3080ae90232875e4737da5
diff --git a/textproc/p5-RDF-Notation3/pkg-descr b/textproc/p5-RDF-Notation3/pkg-descr
index e0864cbd2bc8..0a5828b4067a 100644
--- a/textproc/p5-RDF-Notation3/pkg-descr
+++ b/textproc/p5-RDF-Notation3/pkg-descr
@@ -2,7 +2,7 @@ This module is an RDF/N3 parser; it can parse N3 files or strings and provide
 results in whatever format (as far as there are subclasses supporting your
 desired format available).
 
-WWW: http://search.cpan.org/search?dist=RDF-Notation3
+WWW: http://search.cpan.org/dist/RDF-Notation3/
 
 -- Sergey Skvortsov
 skv@FreeBSD.org
diff --git a/textproc/p5-RDF-Notation3/pkg-plist b/textproc/p5-RDF-Notation3/pkg-plist
index 793275b057a0..16cf2514d9a3 100644
--- a/textproc/p5-RDF-Notation3/pkg-plist
+++ b/textproc/p5-RDF-Notation3/pkg-plist
@@ -1,19 +1,19 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDF/Notation3/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3.pod
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/PrefTriples.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/RDFCore.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/RDFStore.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/ReaderFile.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/ReaderString.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/SAX.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/Template/TReader.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/Template/TTriples.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/Template/TXML.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/Triples.pm
-lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/XML.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3/Template
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/RDF/Notation3
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/RDF 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDF/Notation3
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Notation3/.packlist
+%%SITE_PERL%%/RDF/Notation3.pm
+%%SITE_PERL%%/RDF/Notation3.pod
+%%SITE_PERL%%/RDF/Notation3/PrefTriples.pm
+%%SITE_PERL%%/RDF/Notation3/RDFCore.pm
+%%SITE_PERL%%/RDF/Notation3/RDFStore.pm
+%%SITE_PERL%%/RDF/Notation3/ReaderFile.pm
+%%SITE_PERL%%/RDF/Notation3/ReaderString.pm
+%%SITE_PERL%%/RDF/Notation3/SAX.pm
+%%SITE_PERL%%/RDF/Notation3/Template/TReader.pm
+%%SITE_PERL%%/RDF/Notation3/Template/TTriples.pm
+%%SITE_PERL%%/RDF/Notation3/Template/TXML.pm
+%%SITE_PERL%%/RDF/Notation3/Triples.pm
+%%SITE_PERL%%/RDF/Notation3/XML.pm
+@dirrm %%SITE_PERL%%/RDF/Notation3/Template
+@dirrm %%SITE_PERL%%/RDF/Notation3
+@unexec rmdir %D/%%SITE_PERL%%/RDF 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Notation3
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true