diff options
| author | adam <adam@pkgsrc.org> | 2010-06-02 13:14:47 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-06-02 13:14:47 +0000 |
| commit | af27353ec8a9e63f0b4eb306119a8e8596d5f28e (patch) | |
| tree | 67b3e0570f90708d3283ac9230d0d2d9777800d5 /databases/p5-BDB | |
| parent | c48946fd88a792ba21627554b5ef83e116bdebb9 (diff) | |
| download | pkgsrc-af27353ec8a9e63f0b4eb306119a8e8596d5f28e.tar.gz | |
Fix building with db5; revision bump for db4 update
Diffstat (limited to 'databases/p5-BDB')
| -rw-r--r-- | databases/p5-BDB/Makefile | 8 | ||||
| -rw-r--r-- | databases/p5-BDB/distinfo | 3 | ||||
| -rw-r--r-- | databases/p5-BDB/patches/patch-aa | 31 |
3 files changed, 37 insertions, 5 deletions
diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile index ca160393f4a..fae01775a88 100644 --- a/databases/p5-BDB/Makefile +++ b/databases/p5-BDB/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/04/17 09:35:40 seb Exp $ -# +# $NetBSD: Makefile,v 1.2 2010/06/02 13:21:03 adam Exp $ DISTNAME= BDB-1.88 PKGNAME= p5-${DISTNAME} +PKGREVISION= 1 SVR4_PKGNAME= p5bdb CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/ML/MLEHMANN/} @@ -14,7 +14,7 @@ LICENSE= ${PERL5_LICENSE} PKG_DESTDIR_SUPPORT= user-destdir -BDB_ACCEPTED= db4 db3 db2 +BDB_ACCEPTED= db5 db4 db3 db2 PERL5_PACKLIST= auto/BDB/.packlist MAKE_PARAMS+= INC=-I${BDBBASE:Q}/${BUILDLINK_INCDIRS.${BDB_TYPE}:Q} @@ -22,6 +22,6 @@ PERL5_LDFLAGS+= -L${BUILDLINK_PREFIX.${BDB_TYPE}} ${BDB_LIBS} DEPENDS+= p5-common-sense-[0-9]*:../../devel/p5-common-sense -.include "../../mk/bdb.buildlink3.mk" .include "../../lang/perl5/module.mk" +.include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-BDB/distinfo b/databases/p5-BDB/distinfo index f0753b75e48..9172a50015f 100644 --- a/databases/p5-BDB/distinfo +++ b/databases/p5-BDB/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/04/17 09:35:40 seb Exp $ +$NetBSD: distinfo,v 1.2 2010/06/02 13:21:03 adam Exp $ SHA1 (BDB-1.88.tar.gz) = 75f1701d0e768755a7789e4329ac8f8dc6c6c788 RMD160 (BDB-1.88.tar.gz) = 0140f02283726f29c69cae66af5b2fe43155a55d Size (BDB-1.88.tar.gz) = 35879 bytes +SHA1 (patch-aa) = 8f86278fa8496dc982d779293da798b5eeb0d990 diff --git a/databases/p5-BDB/patches/patch-aa b/databases/p5-BDB/patches/patch-aa new file mode 100644 index 00000000000..747bf4c0237 --- /dev/null +++ b/databases/p5-BDB/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.1 2010/06/02 13:21:03 adam Exp $ + +--- BDB.xs.orig 2010-06-01 07:59:05.000000000 +0000 ++++ BDB.xs +@@ -33,7 +33,7 @@ + + #include <db.h> + +-#if DB_VERSION_MAJOR != 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3) ++#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3) + # error you need Berkeley DB 4.3 or a newer 4.x version installed + #endif + +@@ -1228,7 +1228,7 @@ BOOT: + const_iv (WRITECURSOR) + const_iv (YIELDCPU) + const_iv (ENCRYPT_AES) +-#if DB_VERSION_MINOR < 8 ++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 8) + const_iv (XA_CREATE) + #endif + const_iv (BTREE) +@@ -1382,7 +1382,7 @@ BOOT: + const_iv (PRIORITY_VERY_HIGH) + const_iv (IGNORE_LEASE) + #endif +-#if DB_VERSION_MINOR >= 7 ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 7) + //const_iv (MULTIPLE_KEY) + const_iv (LOG_DIRECT) + const_iv (LOG_DSYNC) |