Update to version 4.3.0

Note: This fix the build with latest db4 package.

Package changes:
 Remove references to LOCALBASE.
 Add test target support.

Changes since last packaged version (4.2.4):
4.3.0:
 * Added support for building properly against BerkeleyDB 4.3.21.
 * fixed bug introduced in 4.2.8 that prevent the module from
   compiling against BerkeleyDB 3.2 (which doesn't support pget).
 * setup.py was cleaned up a bit to search for and find the latest
   version of the correct combo of db.h and libdb.
4.2.9:
 * DB keys() values() and items() methods were ignoring their optional
   txn parameter.  This would lead to deadlocks in applications
   needing those to be transaction protected.
4.2.8:
 * Adds support for DB and DBCursor pget methods.  Based on a patch
   submitted to the mailing list by Ian Ward <ian@arevco.ca>
 * Added weakref support to all bsddb.db objects.
 * Make DBTxn objects automatically call abort() in their destructor if
   not yet finalized and raise a RuntimeWarning to that effect.
4.2.7:
 * fix an error with the legacy interface relying on the DB_TRUNCATE
   flag that changed behaviour to not work in a locking environment
   with BerkeleyDB 4.2.52.  [SF bug id 897820]
 * fixed memory leaks in DB.get, DBC.set_range and potentially several
   other methods that would occur primarily when using queue | recno
   format databases with integer keys. [SF patch id 967763]
4.2.6:
 * the DB.has_key method was not honoring its txn parameter to perform
   its lookup within the specified (optional) transaction.  fixed.
   [SF bug id 914019]
4.2.5:
 * Fixed a bug in the compatibility interface set_location() method
   where it would not properly search to the next nearest key when
   used on BTree databases.  [SF bug id 788421]
 * Fixed a bug in the compatibility interface set_location() method
   where it could crash when looking up keys in a hash or recno
   format database due to an incorrect free().

3 files changed, 16 insertions, 14 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 2fa6349f176..8ed1be96d9b 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:23 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/02 12:43:12 seb Exp $
 #
 
-DISTNAME=	bsddb3-4.2.4
+DISTNAME=	bsddb3-4.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pybsddb/}
 
@@ -11,8 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://pybsddb.sourceforge.net/
 COMMENT=	Python extension module for Berkeley DB 4
 
-PYSETUPBUILDARGS=	--berkeley-db=${LOCALBASE}
-PYSETUPINSTALLARGS=	--berkeley-db=${LOCALBASE}
+PYSETUPBUILDARGS=	--berkeley-db=${BUILDLINK_PREFIX.db4}
+PYSETUPINSTALLARGS=	--berkeley-db=${BUILDLINK_PREFIX.db4}
 
 USE_BUILDLINK3=	yes
 PYDISTUTILSPKG=	yes
@@ -25,6 +24,9 @@ BUILDLINK_DEPENDS.db4+=		db4>=4.2.52
 PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
 .endif
 
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} test.py
+
 .include "../../databases/db4/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index 82c334e34b5..a429d42b105 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2004/03/04 15:55:18 minskim Exp $
+$NetBSD: distinfo,v 1.5 2005/01/02 12:43:12 seb Exp $
 
-SHA1 (bsddb3-4.2.4.tar.gz) = 8fd531d6e310c0dbae8a46c88d04671ef0feb20d
-Size (bsddb3-4.2.4.tar.gz) = 508095 bytes
-SHA1 (patch-aa) = d19ba6ae428f3e27029c0ed23694230cc0b82656
+SHA1 (bsddb3-4.3.0.tar.gz) = c3dad1a753d70c6cb26ac112a6d3b6eca903433f
+Size (bsddb3-4.3.0.tar.gz) = 492360 bytes
+SHA1 (patch-aa) = 301787930b05613388ffad4f72586e132da8aa6d
diff --git a/databases/py-bsddb3/patches/patch-aa b/databases/py-bsddb3/patches/patch-aa
index 727268529c3..788a051b040 100644
--- a/databases/py-bsddb3/patches/patch-aa
+++ b/databases/py-bsddb3/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/02/10 17:56:55 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2005/01/02 12:43:12 seb Exp $
 
---- setup.py.orig	2003-07-08 23:41:34.000000000 -0500
+--- setup.py.orig	2004-12-16 09:10:17.000000000 +0000
 +++ setup.py
-@@ -75,11 +75,11 @@ if os.name == 'posix':
+@@ -177,11 +177,11 @@ if os.name == 'posix':
  
      # figure out from the base setting where the lib and .h are
      if not incdir:
@@ -11,9 +11,9 @@ $NetBSD: patch-aa,v 1.2 2004/02/10 17:56:55 minskim Exp $
      if not libdir:
          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
 -    if not '-ldb' in LIBS:
--        libname = ['db']
+-        libname = [dblib]
 +    if not '-ldb4' in LIBS:
 +        libname = ['db4']
      else:
+         if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
          libname = []
-     utils = []