6 files changed, 19 insertions, 23 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index f9326b0e5248..904af43f7e9c 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bsddb3
-PORTVERSION=	3.3.0
+PORTVERSION=	3.4.0
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pybsddb
@@ -14,12 +14,22 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	perky@FreeBSD.org
 
+.if defined(WITH_DB3)
 LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+DBVERSION=	db3
+.else
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
+DBVERSION=	db4
+.endif
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_BUILDARGS=	--libs="-ldb3" --berkeley-db=${LOCALBASE}
+USE_REINPLACE=	yes
+PYDISTUTILS_BUILDARGS=	--libs="-l${DBVERSION}" --berkeley-db=${LOCALBASE}
+PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE}
 
-PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||}
+post-patch:
+	${REINPLACE_CMD} 's,%%DBVERSION%%,${DBVERSION},g' ${WRKSRC}/setup.py
+	${REINPLACE_CMD} 's,<db\.h>,<${DBVERSION}/db.h>,' ${WRKSRC}/src/_db.c
 
 .include <bsd.port.mk>
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index feeb5fffac9c..db8fe2197c77 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1 +1 @@
-MD5 (bsddb3-3.3.0.tar.gz) = f3e0f37d57fd033db43305684eb6e2e5
+MD5 (bsddb3-3.4.0.tar.gz) = e433307b4ee1dd7be4fa1177b8be575a
diff --git a/databases/py-bsddb3/files/patch-setup.py b/databases/py-bsddb3/files/patch-setup.py
index bf8ee3a20c30..dc004b0e9054 100644
--- a/databases/py-bsddb3/files/patch-setup.py
+++ b/databases/py-bsddb3/files/patch-setup.py
@@ -1,13 +1,13 @@
---- setup.py.orig	Fri Sep 14 00:15:30 2001
-+++ setup.py	Tue Feb  5 12:37:16 2002
+--- setup.py.orig	Thu Jul 11 03:48:34 2002
++++ setup.py	Thu Jul 11 03:51:34 2002
 @@ -68,8 +68,8 @@
      # figure out from the base setting where the lib and .h are
      if not incdir: incdir = os.path.join(BERKELEYDB_DIR, 'include')
      if not libdir: libdir = os.path.join(BERKELEYDB_DIR, 'lib')
 -    if not '-ldb' in LIBS:
 -        libname = ['db']
-+    if not '-ldb3' in LIBS:
-+        libname = ['db3']
++    if not '-l%%DBVERSION%%' in LIBS:
++        libname = ['%%DBVERSION%%']
      else:
          libname = []
      utils = []
diff --git a/databases/py-bsddb3/files/patch-src:_db.c b/databases/py-bsddb3/files/patch-src:_db.c
deleted file mode 100644
index 3e8646c0fac4..000000000000
--- a/databases/py-bsddb3/files/patch-src:_db.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/_db.c.orig	Mon Apr  9 12:26:03 2001
-+++ src/_db.c	Mon Apr  9 12:26:18 2001
-@@ -70,7 +70,7 @@
- /* --------------------------------------------------------------------- */
- 
- #include <Python.h>
--#include <db.h>
-+#include <db3/db.h>
- 
- /* --------------------------------------------------------------------- */
- /* Various macro definitions */
diff --git a/databases/py-bsddb3/pkg-comment b/databases/py-bsddb3/pkg-comment
index abf25acc994c..d11c42569015 100644
--- a/databases/py-bsddb3/pkg-comment
+++ b/databases/py-bsddb3/pkg-comment
@@ -1 +1 @@
-BerkeleyDB3 wrapper module for Python
+Python extension module for BerkeleyDB 3 and 4
diff --git a/databases/py-bsddb3/pkg-descr b/databases/py-bsddb3/pkg-descr
index 95a1d2393d1d..46f362f7e634 100644
--- a/databases/py-bsddb3/pkg-descr
+++ b/databases/py-bsddb3/pkg-descr
@@ -8,6 +8,3 @@ document in developers' web site for more details on the types and
 methods provided.
 
 WWW: http://pybsddb.sourceforge.net/
-developed by Robin Dunn et al
-
-- Hye-Shik Chang, a.k.a. "Perky"