- Update to 0.23 [1]

- include support for Berkeley DB 4.x [2]
- point to the right webpage [2]

PR:		51573
Submitted by:	Mathieu Arnold <m@absolight.fr> [1],
		Oliver Eikemeier <eikemeier@fillmore-labs.com> [2]
Approved by:	maintainer timeout (> 3 weeks)

4 files changed, 39 insertions, 24 deletions

diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile
index c9d10e61c485..99b54b9fab31 100644
--- a/databases/p5-BerkeleyDB/Makefile
+++ b/databases/p5-BerkeleyDB/Makefile
@@ -6,27 +6,42 @@
 #
 
 PORTNAME=	BerkeleyDB
-PORTVERSION=	0.19
+PORTVERSION=	0.23
 CATEGORIES=	databases perl5
 MASTER_SITES=	$(MASTER_SITE_PERL_CPAN)
 MASTER_SITE_SUBDIR=	BerkeleyDB
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bill@twwells.com
-COMMENT=	Perl5 interface to the Berkeley DB package revision 3
+COMMENT=	Perl5 interface to the Berkeley DB package revision 2, 3, 4 or 4.1
 
+# Default to db3
+WITH_BDB_VER?=	3
+
+.if ${WITH_BDB_VER} == 2
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
+.elif ${WITH_BDB_VER} == 3
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
+.elif ${WITH_BDB_VER} == 4
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
+.elif ${WITH_BDB_VER} == 41
+LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41
+.else
+.error WITH_BDB_VER must be one between 2, 3, 4 and 41
+.endif
 
 PERL_CONFIGURE=	yes
-ALL_TARGET=	all test
 
 MAN3=		BerkeleyDB.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+
+pre-everything::
+	@${ECHO} "This port defaults to use Berkeley DB 3, but you can change it"
+	@${ECHO} "by setting WITH_BDB_VER to either 2, 3, 4 or 41"
 
 post-patch:
-	@${ECHO} "INCLUDE = ${LOCALBASE}/include/db3" > ${WRKSRC}/config.in
+	@${ECHO} "INCLUDE = ${LOCALBASE}/include/db${WITH_BDB_VER}" > ${WRKSRC}/config.in
 	@${ECHO} "LIB = ${LOCALBASE}/lib" >> ${WRKSRC}/config.in
-	@${ECHO} "DBNAME = -ldb3" >> ${WRKSRC}/config.in
+	@${ECHO} "DBNAME = -ldb${WITH_BDB_VER}" >> ${WRKSRC}/config.in
 	${PERL} -pi -e '$$_="" if /MAN3PODS/' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/p5-BerkeleyDB/distinfo b/databases/p5-BerkeleyDB/distinfo
index c9069a139b82..add0766c15c4 100644
--- a/databases/p5-BerkeleyDB/distinfo
+++ b/databases/p5-BerkeleyDB/distinfo
@@ -1 +1 @@
-MD5 (BerkeleyDB-0.19.tar.gz) = 09db64e8c9a4c2af0c3580c41b1ac455
+MD5 (BerkeleyDB-0.23.tar.gz) = d97b85ea5b61bde7de4a998c91ef29c7
diff --git a/databases/p5-BerkeleyDB/pkg-descr b/databases/p5-BerkeleyDB/pkg-descr
index 22d6c3ec8d05..aabaf35c91ac 100644
--- a/databases/p5-BerkeleyDB/pkg-descr
+++ b/databases/p5-BerkeleyDB/pkg-descr
@@ -1,12 +1,12 @@
-This is the perl5 interface to Berkeley DB version 3, which it
-depends on.
+This is the perl5 interface to Berkeley DB version 2, 3, 4 or 4.1, which
+it depends on.
 
-You may want to use this, instead of the default dbm that perl
-provides, as that one is based on version 1, which is seriously
-buggy. E.g., if keys or data are over a hundred bytes or so, bad
-things may happen to your dbm files. Never mind all the extra
-features....
+You may want to use this, instead of the default dbm that perl provides,
+as that one is based on version 1, which is seriously buggy. E.g., if
+keys or data are over a hundred bytes or so, bad things may happen to
+your dbm files. Never mind all the extra features....
 
+WWW: http://search.cpan.org/dist/BerkeleyDB/
 WWW: http://www.sleepycat.com/
 
 Bill Wells
diff --git a/databases/p5-BerkeleyDB/pkg-plist b/databases/p5-BerkeleyDB/pkg-plist
index 1e9decf2fa8d..36c87d956d0d 100644
--- a/databases/p5-BerkeleyDB/pkg-plist
+++ b/databases/p5-BerkeleyDB/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BerkeleyDB.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BerkeleyDB.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BerkeleyDB/Btree.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BerkeleyDB/Hash.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BerkeleyDB/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BerkeleyDB/BerkeleyDB.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BerkeleyDB/BerkeleyDB.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BerkeleyDB/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BerkeleyDB
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BerkeleyDB
+%%SITE_PERL%%/%%PERL_ARCH%%/BerkeleyDB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/BerkeleyDB.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/BerkeleyDB/Btree.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/BerkeleyDB/Hash.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BerkeleyDB/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BerkeleyDB/BerkeleyDB.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BerkeleyDB/BerkeleyDB.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BerkeleyDB/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BerkeleyDB
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/BerkeleyDB