4 files changed, 88 insertions, 72 deletions

diff --git a/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile
index 64260093352d..1530910f437d 100644
--- a/textproc/p5-RDFStore/Makefile
+++ b/textproc/p5-RDFStore/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	RDFStore
-PORTVERSION=	0.42
+PORTVERSION=	0.50
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	RDF
+MASTER_SITE_SUBDIR=	RDF/AREGGIORI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
@@ -21,27 +21,34 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-X
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_BDB=	yes
+
 PERL_CONFIGURE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		Data::MagicTie.3 RDFStore.3 RDFStore::Literal.3 \
-		RDFStore::Model.3 RDFStore::NodeFactory.3 \
-		RDFStore::Parser::OpenHealth.3 RDFStore::Parser::SiRPAC.3 \
-		RDFStore::Parser::Styles::MagicTie.3 RDFStore::RDFNode.3 \
+MAN3=		DBD::RDFStore.3 DBMS.3 RDFStore.3 \
+		RDFStore::Digest::Digestable.3 RDFStore::Literal.3 \
+		RDFStore::Model.3 RDFStore::NodeFactory.3 RDFStore::Object.3 \
+		RDFStore::Parser.3 RDFStore::Parser::NTriples.3 \
+		RDFStore::Parser::SiRPAC.3 \
+		RDFStore::Parser::Styles::RDFStore::Model.3 RDFStore::RDFNode.3 \
 		RDFStore::Resource.3 RDFStore::SchemaModel.3 \
-		RDFStore::SetModel.3 RDFStore::Stanford::Digest.3 \
-		RDFStore::Stanford::Digest::Abstract.3 \
-		RDFStore::Stanford::Digest::Digestable.3 \
-		RDFStore::Stanford::Digest::Generic.3 \
-		RDFStore::Stanford::Digest::MD5.3 \
-		RDFStore::Stanford::Digest::SHA1.3 \
-		RDFStore::Stanford::Digest::Util.3 \
-		RDFStore::Stanford::Literal.3 RDFStore::Stanford::Model.3 \
-		RDFStore::Stanford::NodeFactory.3 RDFStore::Stanford::RDFNode.3 \
-		RDFStore::Stanford::Resource.3 RDFStore::Stanford::SetModel.3 \
-		RDFStore::Stanford::Statement.3 \
-		RDFStore::Stanford::VirtualModel.3 \
-		RDFStore::Stanford::Vocabulary::Generator.3 \
-		RDFStore::Statement.3 RDFStore::VirtualModel.3
-
-.include <bsd.port.mk>
+		RDFStore::Serializer.3 RDFStore::Serializer::NTriples.3 \
+		RDFStore::Serializer::RDFXML.3 RDFStore::Serializer::RSS.3 \
+		RDFStore::Statement.3 RDFStore::Util::Digest.3 \
+		RDFStore::Util::UTF8.3 RDFStore::VirtualModel.3 \
+		RDFStore::Vocabulary::Generator.3 RDQL::Parser.3 Util::BLOB.3
+
+pre-configure:
+	@${ECHO} "INCLUDE=${BDB_INCLUDE_DIR}" > ${WRKSRC}/arch_conf.in
+	@${ECHO} "LIB=${BDB_LIB_DIR}" >> ${WRKSRC}/arch_conf.in
+	@${ECHO} "DBNAME=-l${BDB_LIB_NAME}" >> ${WRKSRC}/arch_conf.in
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
+.else
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/p5-RDFStore/distinfo b/textproc/p5-RDFStore/distinfo
index b7b642e70675..2a5b7f5920b9 100644
--- a/textproc/p5-RDFStore/distinfo
+++ b/textproc/p5-RDFStore/distinfo
@@ -1,3 +1,3 @@
-MD5 (RDFStore-0.42.tar.gz) = 3098388a4dd7dfe7a578b8700b1b7496
-SHA256 (RDFStore-0.42.tar.gz) = d63c627ecf62ecea5930ee17c799a1f1f796d89784a490d76578b8767fe93e59
-SIZE (RDFStore-0.42.tar.gz) = 193825
+MD5 (RDFStore-0.50.tar.gz) = 370eb13ae9eedeb2e6be500133bcd8f6
+SHA256 (RDFStore-0.50.tar.gz) = c703fb8ab186c6097278d03f45bd19e345dbbb734327b14c43aaea80b00522fe
+SIZE (RDFStore-0.50.tar.gz) = 488028
diff --git a/textproc/p5-RDFStore/pkg-descr b/textproc/p5-RDFStore/pkg-descr
index 353d2792a61f..88e64e9a550e 100644
--- a/textproc/p5-RDFStore/pkg-descr
+++ b/textproc/p5-RDFStore/pkg-descr
@@ -8,6 +8,3 @@ Data::MagicTie(3) the suite allow a user to fetch, parse, process, store
 and query RDF models.
 
 WWW: http://search.cpan.org/dist/RDFStore/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/textproc/p5-RDFStore/pkg-plist b/textproc/p5-RDFStore/pkg-plist
index 8c30d03818d5..727ac792e23b 100644
--- a/textproc/p5-RDFStore/pkg-plist
+++ b/textproc/p5-RDFStore/pkg-plist
@@ -1,45 +1,57 @@
+bin/rdf.pl
+bin/rdfdump.pl
+bin/rdfquery.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/DBD/RDFStore.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/DBMS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Digest/Digestable.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Literal.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Model.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/NodeFactory.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Object.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/NTriples.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/SiRPAC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/Styles/RDFStore/Model.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/RDFNode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Resource.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/SchemaModel.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer/NTriples.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer/RDFXML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer/RSS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Statement.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Util/Digest.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Util/UTF8.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/VirtualModel.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/DAML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/DC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/DCQ.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/DCT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/FOAF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/Generator.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/OWL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/RDF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/RDFS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/RDFStoreContext.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary/RSS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/RDQL/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Util/BLOB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBMS/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore/.packlist
-%%SITE_PERL%%/Data/MagicTie.pm
-%%SITE_PERL%%/RDFStore.pm
-%%SITE_PERL%%/RDFStore/Literal.pm
-%%SITE_PERL%%/RDFStore/Model.pm
-%%SITE_PERL%%/RDFStore/NodeFactory.pm
-%%SITE_PERL%%/RDFStore/Parser/OpenHealth.pm
-%%SITE_PERL%%/RDFStore/Parser/SiRPAC.pm
-%%SITE_PERL%%/RDFStore/Parser/Styles/MagicTie.pm
-%%SITE_PERL%%/RDFStore/RDFNode.pm
-%%SITE_PERL%%/RDFStore/Resource.pm
-%%SITE_PERL%%/RDFStore/SchemaModel.pm
-%%SITE_PERL%%/RDFStore/SetModel.pm
-%%SITE_PERL%%/RDFStore/Stanford/Digest.pm
-%%SITE_PERL%%/RDFStore/Stanford/Digest/Abstract.pm
-%%SITE_PERL%%/RDFStore/Stanford/Digest/Digestable.pm
-%%SITE_PERL%%/RDFStore/Stanford/Digest/Generic.pm
-%%SITE_PERL%%/RDFStore/Stanford/Digest/MD5.pm
-%%SITE_PERL%%/RDFStore/Stanford/Digest/SHA1.pm
-%%SITE_PERL%%/RDFStore/Stanford/Digest/Util.pm
-%%SITE_PERL%%/RDFStore/Stanford/Literal.pm
-%%SITE_PERL%%/RDFStore/Stanford/Model.pm
-%%SITE_PERL%%/RDFStore/Stanford/NodeFactory.pm
-%%SITE_PERL%%/RDFStore/Stanford/RDFNode.pm
-%%SITE_PERL%%/RDFStore/Stanford/Resource.pm
-%%SITE_PERL%%/RDFStore/Stanford/SetModel.pm
-%%SITE_PERL%%/RDFStore/Stanford/Statement.pm
-%%SITE_PERL%%/RDFStore/Stanford/VirtualModel.pm
-%%SITE_PERL%%/RDFStore/Stanford/Vocabulary/Generator.pm
-%%SITE_PERL%%/RDFStore/Statement.pm
-%%SITE_PERL%%/RDFStore/VirtualModel.pm
-%%SITE_PERL%%/RDFStore/Vocabulary/DAML.pm
-%%SITE_PERL%%/RDFStore/Vocabulary/DC.pm
-%%SITE_PERL%%/RDFStore/Vocabulary/DCQ.pm
-%%SITE_PERL%%/RDFStore/Vocabulary/RDF.pm
-%%SITE_PERL%%/RDFStore/Vocabulary/RDFS.pm
-@dirrm %%SITE_PERL%%/RDFStore/Parser/Styles
-@dirrm %%SITE_PERL%%/RDFStore/Parser
-@dirrm %%SITE_PERL%%/RDFStore/Stanford/Digest
-@dirrm %%SITE_PERL%%/RDFStore/Stanford/Vocabulary
-@dirrm %%SITE_PERL%%/RDFStore/Stanford
-@dirrm %%SITE_PERL%%/RDFStore/Vocabulary
-@dirrm %%SITE_PERL%%/RDFStore
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore/RDFStore.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore/RDFStore.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Digest
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/Styles/RDFStore
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser/Styles
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Parser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Serializer
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Util
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore/Vocabulary
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RDFStore
+@dirrmtry %%SITE_PERL%%/DBD
+@dirrmtry %%SITE_PERL%%/RDQL
+@dirrmtry %%SITE_PERL%%/Util
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore
-@dirrmtry %%SITE_PERL%%/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBMS