From d963c7dca27074c6a097997a3dd79cdd9d1b2135 Mon Sep 17 00:00:00 2001
From: Wen Heping <wen@FreeBSD.org>
Date: Wed, 16 Mar 2011 00:10:57 +0000
Subject: - Update to 5.1.2 - Restore the patch to fix build with bsddb other
 than 4.2

---
 databases/py-bsddb3/files/patch-setup3.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'databases/py-bsddb3/files/patch-setup3.py')

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 = []
-- 
cgit v1.2.3