PyBSDDB 4.1.1, a Python extension module for Berkeley DB 3 and 4.

This NetBSD package includes the patches from bug reports #667340,
#667343, and #669533, which are in the SourceForge pybsddb3 CVS but
not yet in the 4.1.1 release; hence PKGREVISION=1.

6 files changed, 137 insertions, 0 deletions

diff --git a/databases/py-bsddb3/DESCR b/databases/py-bsddb3/DESCR
new file mode 100644
index 00000000000..621d2fd4942
--- /dev/null
+++ b/databases/py-bsddb3/DESCR
@@ -0,0 +1,8 @@
+This module provides a nearly complete wrapping of the Sleepycat C API
+for the Database Environment, Database, Cursor, and Transaction
+objects, and each of these is exposed as a Python Type in the
+bsddb3.db module.  The database objects can use different access
+methods, btree, hash, recno, and queue.  For the first time all of
+these are fully supported in the Python wrappers.  Please see the
+document in developers' web site for more details on the types and
+methods provided.
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
new file mode 100644
index 00000000000..698d96f36da
--- /dev/null
+++ b/databases/py-bsddb3/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
+#
+
+DISTNAME=	bsddb3-4.1.1
+PKGNAME=	${PYPKGPREFIX}-bsddb3-4.1.1
+PKGREVISION= 	1
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pybsddb/}
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://pybsddb.sourceforge.net/
+COMMENT=	Python extension module for Berkeley DB 3 and 4
+
+PYSETUPBUILDARGS=	--berkeley-db=${LOCALBASE}
+PYSETUPINSTALLARGS=	--berkeley-db=${LOCALBASE}
+
+USE_BUILDLINK2=	yes
+PYDISTUTILSPKG=	yes
+PYBINMODULE=	yes
+
+.include "../../databases/db4/buildlink2.mk"
+.include "../../lang/python/extension.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-bsddb3/PLIST b/databases/py-bsddb3/PLIST
new file mode 100644
index 00000000000..65af2b9f053
--- /dev/null
+++ b/databases/py-bsddb3/PLIST
@@ -0,0 +1,50 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
+${PYSITELIB}/bsddb3/__init__.py
+${PYSITELIB}/bsddb3/__init__.pyc
+${PYSITELIB}/bsddb3/_db.so
+${PYSITELIB}/bsddb3/db.py
+${PYSITELIB}/bsddb3/db.pyc
+${PYSITELIB}/bsddb3/dbobj.py
+${PYSITELIB}/bsddb3/dbobj.pyc
+${PYSITELIB}/bsddb3/dbrecio.py
+${PYSITELIB}/bsddb3/dbrecio.pyc
+${PYSITELIB}/bsddb3/dbshelve.py
+${PYSITELIB}/bsddb3/dbshelve.pyc
+${PYSITELIB}/bsddb3/dbtables.py
+${PYSITELIB}/bsddb3/dbtables.pyc
+${PYSITELIB}/bsddb3/dbutils.py
+${PYSITELIB}/bsddb3/dbutils.pyc
+${PYSITELIB}/bsddb3/tests/__init__.py
+${PYSITELIB}/bsddb3/tests/__init__.pyc
+${PYSITELIB}/bsddb3/tests/test_all.py
+${PYSITELIB}/bsddb3/tests/test_all.pyc
+${PYSITELIB}/bsddb3/tests/test_associate.py
+${PYSITELIB}/bsddb3/tests/test_associate.pyc
+${PYSITELIB}/bsddb3/tests/test_basics.py
+${PYSITELIB}/bsddb3/tests/test_basics.pyc
+${PYSITELIB}/bsddb3/tests/test_compat.py
+${PYSITELIB}/bsddb3/tests/test_compat.pyc
+${PYSITELIB}/bsddb3/tests/test_dbobj.py
+${PYSITELIB}/bsddb3/tests/test_dbobj.pyc
+${PYSITELIB}/bsddb3/tests/test_dbshelve.py
+${PYSITELIB}/bsddb3/tests/test_dbshelve.pyc
+${PYSITELIB}/bsddb3/tests/test_dbtables.py
+${PYSITELIB}/bsddb3/tests/test_dbtables.pyc
+${PYSITELIB}/bsddb3/tests/test_env_close.py
+${PYSITELIB}/bsddb3/tests/test_env_close.pyc
+${PYSITELIB}/bsddb3/tests/test_get_none.py
+${PYSITELIB}/bsddb3/tests/test_get_none.pyc
+${PYSITELIB}/bsddb3/tests/test_join.py
+${PYSITELIB}/bsddb3/tests/test_join.pyc
+${PYSITELIB}/bsddb3/tests/test_lock.py
+${PYSITELIB}/bsddb3/tests/test_lock.pyc
+${PYSITELIB}/bsddb3/tests/test_misc.py
+${PYSITELIB}/bsddb3/tests/test_misc.pyc
+${PYSITELIB}/bsddb3/tests/test_queue.py
+${PYSITELIB}/bsddb3/tests/test_queue.pyc
+${PYSITELIB}/bsddb3/tests/test_recno.py
+${PYSITELIB}/bsddb3/tests/test_recno.pyc
+${PYSITELIB}/bsddb3/tests/test_thread.py
+${PYSITELIB}/bsddb3/tests/test_thread.pyc
+@dirrm ${PYSITELIB}/bsddb3/tests
+@dirrm ${PYSITELIB}/bsddb3
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
new file mode 100644
index 00000000000..672b50e6d3e
--- /dev/null
+++ b/databases/py-bsddb3/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
+
+SHA1 (bsddb3-4.1.1.tar.gz) = c30d9d06c760b2c73c4987fb7fd79f17421d10d4
+Size (bsddb3-4.1.1.tar.gz) = 484382 bytes
+SHA1 (patch-aa) = c5012b82afda6e47a2cfcaa102811c0510fe65ec
+SHA1 (patch-ab) = 7ac97eae4ae0663cbb594010d24c2ddcde2cf15e
diff --git a/databases/py-bsddb3/patches/patch-aa b/databases/py-bsddb3/patches/patch-aa
new file mode 100644
index 00000000000..a95a920d21a
--- /dev/null
+++ b/databases/py-bsddb3/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
+
+--- setup.py.orig	Sun Dec 22 00:44:30 2002
++++ setup.py
+@@ -70,10 +70,10 @@
+         sys.exit(1)
+ 
+     # figure out from the base setting where the lib and .h are
+-    if not incdir: incdir = os.path.join(BERKELEYDB_DIR, 'include')
++    if not incdir: incdir = os.path.join(BERKELEYDB_DIR, 'include/db4')
+     if not libdir: libdir = os.path.join(BERKELEYDB_DIR, 'lib')
+-    if not '-ldb' in LIBS:
+-        libname = ['db']
++    if not '-ldb4' in LIBS:
++        libname = ['db4']
+     else:
+         libname = []
+     utils = []
diff --git a/databases/py-bsddb3/patches/patch-ab b/databases/py-bsddb3/patches/patch-ab
new file mode 100644
index 00000000000..d86796816cf
--- /dev/null
+++ b/databases/py-bsddb3/patches/patch-ab
@@ -0,0 +1,32 @@
+$NetBSD: patch-ab,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
+
+--- src/_db.c.orig	Sun Dec 22 00:44:32 2002
++++ src/_db.c
+@@ -745,7 +745,8 @@
+     int err;
+     if (self->dbc != NULL) {
+         MYDB_BEGIN_ALLOW_THREADS;
+-        err = self->dbc->c_close(self->dbc);
++	if (self->mydb->db != NULL)
++            err = self->dbc->c_close(self->dbc);
+         self->dbc = NULL;
+         MYDB_END_ALLOW_THREADS;
+     }
+@@ -1071,7 +1072,9 @@
+      * threads have already been initialized.
+      *  (see pybsddb-users mailing list post on 2002-08-07)
+      */
++#ifdef WITH_THREAD
+     PyEval_InitThreads();
++#endif
+     MYDB_BEGIN_ALLOW_THREADS;
+ #if (DBVER >= 41)
+     err = self->db->associate(self->db,
+@@ -1620,6 +1623,7 @@
+ #endif
+     MYDB_END_ALLOW_THREADS;
+     if (makeDBError(err)) {
++	self->db->close(self->db, 0);
+         self->db = NULL;
+         return NULL;
+     }