Changes 5.0.0:

* Support for Berkeley DB 5.0.
* Drop support for Python 3.0.
* Now you can use TMPDIR env variable to override default
  test directory ("/tmp").
* Versioning of C API. If you use the code from C, please
  check the bsddb_api->api_version number against
  PYBSDDB_API_VERSION macro.
* In C code, the bsddb_api->dbsequence_type component is always available,
  even if the Berkeley DB version used doesn't support sequences. In that
  case, the component will be NULL.
* In C code, "DBSequenceObject_Check()" macro always exists, even if the
  Berkeley DB version used doesn't suport sequences. In that case, the test
  macro always returns "false".
* For a long time, the API has been accesible via C using "_bsddb.api" or
  "_pybsddb.api". If you are using Python >=2.7, you acquire access to that
  API via the new Capsule protocol (see "bsddb.h").  If you use the C API and
  upgrade to Python 2.7 and up, you must update the access code (see
  "bsddb.h"). The Capsule protocol is not supported in Python 3.0, but
  pybsddb 5.0.x doesn't support Python 3.0 anymore.
* Capsule support was buggy. The string passed in to PyCapsule_New() must
  outlive the capsule.
* Solve an "Overflow" warning in the testsuite running under python 2.3.
* When doing a complete full-matrix test, any warning will be considered
  an error.

4 files changed, 29 insertions, 17 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index ddd63131c95..ac8f194c7cf 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2009/06/04 17:24:08 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.38 2010/06/02 12:22:59 adam Exp $
 
-DISTNAME=	bsddb3-4.7.6
+DISTNAME=	bsddb3-5.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	http://pypi.python.org/packages/source/b/bsddb3/
@@ -12,20 +11,27 @@ COMMENT=	Python extension module for Berkeley DB 4
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYSETUPBUILDARGS=	--berkeley-db=${BUILDLINK_PREFIX.db4}
-PYSETUPINSTALLARGS=	--berkeley-db=${BUILDLINK_PREFIX.db4}
+BDB_ACCEPTED=		db4 db5
+
+PYSETUPBUILDARGS=	--berkeley-db=${BDBBASE}
+PYSETUPINSTALLARGS=	--berkeley-db=${BDBBASE}
 
 PYDISTUTILSPKG=	yes
 
 REPLACE_PYTHON=		Lib/bsddb/dbshelve.py
 REPLACE_PYTHON+=	Lib3/bsddb/dbshelve.py
 
+SUBST_CLASSES+=		bdb
+SUBST_STAGE.bdb=	pre-configure
+SUBST_FILES.bdb=	${WRKSRC}/setup2.py
+SUBST_SED.bdb=		-e "s,dblib = 'db',dblib = '${BDB_TYPE}',g"
+
 .include "../../mk/pthread.buildlink3.mk"
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} test.py
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-bsddb3/PLIST b/databases/py-bsddb3/PLIST
index daa165811c9..182b453d648 100644
--- a/databases/py-bsddb3/PLIST
+++ b/databases/py-bsddb3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:43:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/06/02 12:22:59 adam Exp $
 ${PYINC}/bsddb3/bsddb.h
 ${PYSITELIB}/bsddb3/__init__.py
 ${PYSITELIB}/bsddb3/__init__.pyc
@@ -46,6 +46,12 @@ ${PYSITELIB}/bsddb3/tests/test_compat.pyo
 ${PYSITELIB}/bsddb3/tests/test_cursor_pget_bug.py
 ${PYSITELIB}/bsddb3/tests/test_cursor_pget_bug.pyc
 ${PYSITELIB}/bsddb3/tests/test_cursor_pget_bug.pyo
+${PYSITELIB}/bsddb3/tests/test_db.py
+${PYSITELIB}/bsddb3/tests/test_db.pyc
+${PYSITELIB}/bsddb3/tests/test_db.pyo
+${PYSITELIB}/bsddb3/tests/test_dbenv.py
+${PYSITELIB}/bsddb3/tests/test_dbenv.pyc
+${PYSITELIB}/bsddb3/tests/test_dbenv.pyo
 ${PYSITELIB}/bsddb3/tests/test_dbobj.py
 ${PYSITELIB}/bsddb3/tests/test_dbobj.pyc
 ${PYSITELIB}/bsddb3/tests/test_dbobj.pyo
diff --git a/databases/py-bsddb3/buildlink3.mk b/databases/py-bsddb3/buildlink3.mk
index fa8d3e57607..ca71cef7b72 100644
--- a/databases/py-bsddb3/buildlink3.mk
+++ b/databases/py-bsddb3/buildlink3.mk
@@ -1,18 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/02 12:22:59 adam Exp $
 
 BUILDLINK_TREE+=	py-bsddb3
 
 .if !defined(PY_BSDDB3_BUILDLINK3_MK)
 PY_BSDDB3_BUILDLINK3_MK:=
 
-.  include "../../mk/pthread.buildlink3.mk"
-.  include "../../lang/python/pyversion.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.7.2
 BUILDLINK_ABI_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.7.2
-BUILDLINK_PKGSRCDIR.py-bsddb3?=	../../databases/py-bsddb3
+BUILDLINK_PKGSRCDIR.py-bsddb3?=		../../databases/py-bsddb3
 
-.include "../../databases/db4/buildlink3.mk"
+BDB_ACCEPTED?=		db4 db5
+.include "../../mk/bdb.buildlink3.mk"
 .endif # PY_BSDDB3_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-py-bsddb3
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index 039b3b20f65..aad13aad41a 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.16 2009/06/04 17:24:08 drochner Exp $
+$NetBSD: distinfo,v 1.17 2010/06/02 12:22:59 adam Exp $
 
-SHA1 (bsddb3-4.7.6.tar.gz) = 16addbc03f01d3205689319ceab4af1da74b6dfb
-RMD160 (bsddb3-4.7.6.tar.gz) = 1d3bcf7e0c4f3cc8640f4c1f2e2657b2de8a9db8
-Size (bsddb3-4.7.6.tar.gz) = 207478 bytes
-SHA1 (patch-aa) = 6d6fab16ef3e4e04f900a30de5d706298be25f23
+SHA1 (bsddb3-5.0.0.tar.gz) = 33a150a0e8c8e0f8830011aa40f9425372c1178c
+RMD160 (bsddb3-5.0.0.tar.gz) = 8d1246b200d1561b216902c47a6956b864f1f892
+Size (bsddb3-5.0.0.tar.gz) = 202405 bytes