databases/py-bsddb3: Update version 6.1.0=>6.1.1

4 files changed, 24 insertions, 24 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 260ca2020cd2..1a1531a8337e 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bsddb3
-PORTVERSION=	6.1.0
-PORTREVISION=	1
+PORTVERSION=	6.1.1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index ff27f45128d5..bbc6fa7e73be 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bsddb3-6.1.0.tar.gz) = b13163e3891c32390aea66edcf7880eb245abc89199a766b7b1907fc5c1efd15
-SIZE (bsddb3-6.1.0.tar.gz) = 340966
+SHA256 (bsddb3-6.1.1.tar.gz) = 6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3
+SIZE (bsddb3-6.1.1.tar.gz) = 450571
diff --git a/databases/py-bsddb3/files/patch-setup2.py b/databases/py-bsddb3/files/patch-setup2.py
index de43b6a35d8c..4ed3fdfd8d8f 100644
--- a/databases/py-bsddb3/files/patch-setup2.py
+++ b/databases/py-bsddb3/files/patch-setup2.py
@@ -1,6 +1,6 @@
---- setup2.py.orig	2011-03-08 22:16:14.000000000 +0800
-+++ setup2.py	2011-03-15 16:00:42.000000000 +0800
-@@ -86,11 +86,7 @@
+--- setup2.py.orig	2016-02-08 21:14:26 UTC
++++ setup2.py
+@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
              category=DeprecationWarning)
  
  
@@ -13,7 +13,7 @@
  from distutils.dep_util import newer
  import distutils.ccompiler
  
-@@ -295,8 +291,8 @@
+@@ -288,8 +284,8 @@ if os.name == 'posix':
          incdir = os.path.join(BERKELEYDB_DIR, 'include')
      if not libdir:
          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
@@ -24,12 +24,12 @@
      else:
          if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
          libname = []
-@@ -336,7 +332,7 @@
+@@ -328,7 +324,7 @@ if os.name == 'posix':
+ 
      # read db.h to figure out what version of Berkeley DB this is
      ver = None
-     # This should move to "with" when we drop support for Python 2.4 and 2.5
--    f = open(os.path.join(incdir, 'db.h'), 'r')
-+    f = open('%%BDB_INCLUDE_DIR%%/db.h', 'r')
-     db_h_lines = f.readlines()
-     f.close()
+-    with open(os.path.join(incdir, 'db.h'), 'r') as f :
++    with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
+         db_h_lines = f.readlines()
      db_ver_re = re.compile(
+         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
diff --git a/databases/py-bsddb3/files/patch-setup3.py b/databases/py-bsddb3/files/patch-setup3.py
index 81ebb4ff6e4e..3ff9359b825d 100644
--- a/databases/py-bsddb3/files/patch-setup3.py
+++ b/databases/py-bsddb3/files/patch-setup3.py
@@ -1,6 +1,6 @@
---- setup3.py.orig
+--- setup3.py.orig	2016-02-08 21:18:47 UTC
 +++ setup3.py
-@@ -86,10 +86,7 @@
+@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
              category=DeprecationWarning)
  
  
@@ -8,11 +8,12 @@
 -  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
-@@ -295,8 +292,8 @@
+ 
+@@ -288,8 +284,8 @@ if os.name == 'posix':
          incdir = os.path.join(BERKELEYDB_DIR, 'include')
      if not libdir:
          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
@@ -23,12 +24,12 @@
      else:
          if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
          libname = []
-@@ -336,7 +333,7 @@
+@@ -328,7 +324,7 @@ if os.name == 'posix':
+ 
      # read db.h to figure out what version of Berkeley DB this is
      ver = None
-     # This should move to "with" when we drop support for Python 2.4 and 2.5
--    f = open(os.path.join(incdir, 'db.h'), 'r')
-+    f = open('%%BDB_INCLUDE_DIR%%/db.h', 'r')
-     db_h_lines = f.readlines()
-     f.close()
+-    with open(os.path.join(incdir, 'db.h'), 'r') as f :
++    with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
+         db_h_lines = f.readlines()
      db_ver_re = re.compile(
+         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')