- Update to 5.1.2

- Restore the patch to fix build with bsddb other than 4.2

4 files changed, 25 insertions, 25 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 62df0103ddb1..a437d74629cf 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bsddb3
-PORTVERSION=	5.1.1
-PORTREVISION=	1
+PORTVERSION=	5.1.2
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index 71d4de15b9fb..944d07f9b09f 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bsddb3-5.1.1.tar.gz) = db93e1d0b2a84f3f058077f5cfcc19fafee5f9caf4137549eab13218ebfe59da
-SIZE (bsddb3-5.1.1.tar.gz) = 377691
+SHA256 (bsddb3-5.1.2.tar.gz) = 98f3401f910a0002a09cd6e947023f8eb266f10d1dac468c65d6e191b5f25a17
+SIZE (bsddb3-5.1.2.tar.gz) = 380258
diff --git a/databases/py-bsddb3/files/patch-setup2.py b/databases/py-bsddb3/files/patch-setup2.py
index ec8672941a98..9b14214ca822 100644
--- a/databases/py-bsddb3/files/patch-setup2.py
+++ b/databases/py-bsddb3/files/patch-setup2.py
@@ -1,14 +1,6 @@
---- setup2.py.orig	2010-11-05 06:19:08.000000000 +0800
-+++ setup2.py	2011-03-08 08:12:34.000000000 +0800
-@@ -36,7 +36,6 @@
-                         'Please use capsule objects instead.',
-                 category=DeprecationWarning)
- 
--            import bsddb  # Import the 2.7 version, that uses CObject
-         finally :
-             context.__exit__()
- 
-@@ -50,10 +49,10 @@
+--- setup2.py.orig	2011-03-08 22:16:14.000000000 +0800
++++ setup2.py	2011-03-15 16:00:42.000000000 +0800
+@@ -53,10 +53,7 @@
              category=DeprecationWarning)
  
  
@@ -16,21 +8,18 @@
 -  from setuptools import setup, Extension
 -except :
 -  from distutils.core import setup, Extension
-+#try :
-+#  from setuptools import setup, Extension
-+#except :
 +from distutils.core import setup, Extension
  
  from distutils.dep_util import newer
  import distutils.ccompiler
-@@ -248,8 +247,8 @@
+@@ -247,8 +244,8 @@
          incdir = os.path.join(BERKELEYDB_DIR, 'include')
      if not libdir:
          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
 -    if not '-ldb' in LIBS:
 -        libname = [dblib]
-+    if not '-ldb-4.2' in LIBS:
-+        libname = ['db-4.2']
++    if not '-l%%DBVERSION%%' in LIBS:
++        libname = ['%%DBVERSION%%']
      else:
          if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
          libname = []
diff --git a/databases/py-bsddb3/files/patch-setup3.py b/databases/py-bsddb3/files/patch-setup3.py
index 085acb026287..0ca781085917 100644
--- a/databases/py-bsddb3/files/patch-setup3.py
+++ b/databases/py-bsddb3/files/patch-setup3.py
@@ -1,13 +1,25 @@
---- setup3.py.orig	2009-06-30 14:58:24.819924337 +0800
-+++ setup3.py	2009-06-30 14:59:39.207070800 +0800
-@@ -204,8 +204,8 @@
+--- setup3.py.orig	2011-03-15 16:10:41.000000000 +0800
++++ setup3.py	2011-03-15 16:12:40.000000000 +0800
+@@ -53,10 +53,7 @@
+             category=DeprecationWarning)
+ 
+ 
+-try :
+-  from setuptools import setup, Extension
+-except :
+-  from distutils.core import setup, Extension
++from distutils.core import setup, Extension
+ 
+ from distutils.dep_util import newer
+ import distutils.ccompiler
+@@ -247,8 +244,8 @@
          incdir = os.path.join(BERKELEYDB_DIR, 'include')
      if not libdir:
          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
 -    if not '-ldb' in LIBS:
 -        libname = [dblib]
 +    if not '-l%%DBVERSION%%' in LIBS:
-+        libname = ['%%DBVERSION%%']
++        libname = [%%DBVERSION%%]
      else:
          if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
          libname = []