Attachment #166763 for bug #207033

View | Details | Raw Unified | Return to bug 207033
Collapse All | Expand All

Lines 788-793 Link Here

(-)databases/Makefile (+1 lines)
788	SUBDIR += py-tarantool	788	SUBDIR += py-tarantool
789	SUBDIR += py-umemcache	789	SUBDIR += py-umemcache
790	SUBDIR += py-whisper	790	SUBDIR += py-whisper
		791	SUBDIR += py3-bsddb3
791	SUBDIR += py33-gdbm	792	SUBDIR += py33-gdbm
792	SUBDIR += py33-sqlite3	793	SUBDIR += py33-sqlite3
793	SUBDIR += py34-gdbm	794	SUBDIR += py34-gdbm




# Created by: Ben Woods <woodsb02@gmail.com>
# $FreeBSD$

PORTNAME=	bsddb3
PORTVERSION=	6.1.1
PORTREVISION=	1
CATEGORIES=	databases python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	woodsb02@gmail.com
COMMENT=	Python extension module for BerkeleyDB 3 and 4

LICENSE=	BSD3CLAUSE

USE_BDB=	yes
USES=		python:3
USE_PYTHON=	distutils autoplist

PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}

Lines 1-2 Link Here

(-)databases/py3-bsddb3/distinfo (-2 / +2 lines)
1	SHA256 (bsddb3-6.1.0.tar.gz) = b13163e3891c32390aea66edcf7880eb245abc89199a766b7b1907fc5c1efd15	1	SHA256 (bsddb3-6.1.1.tar.gz) = 6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3
2	SIZE (bsddb3-6.1.0.tar.gz) = 340966	2	SIZE (bsddb3-6.1.1.tar.gz) = 450571




--- 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)
 
 

 from distutils.dep_util import newer
 import distutils.ccompiler
 
@@ -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')

     else:
         if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
         libname = []
@@ -328,7 +324,7 @@ if os.name == 'posix':
 
     # read db.h to figure out what version of Berkeley DB this is
     ver = None
-    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_h_lines = f.readlines()
     f.close()
     db_ver_re = re.compile(
         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')




--- setup3.py.orig	2016-02-08 21:18:47 UTC
+++ setup3.py
@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
             category=DeprecationWarning)
 
 

-  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
 
@@ -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')

     else:
         if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
         libname = []
@@ -328,7 +324,7 @@ if os.name == 'posix':
 
     # read db.h to figure out what version of Berkeley DB this is
     ver = None
-    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_h_lines = f.readlines()
     f.close()
     db_ver_re = re.compile(
         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')

Return to bug 207033

Lines 1-20 Link Here

(-)databases/py3-bsddb3/Makefile (-5 / +4 lines)
1	# Created by: Hye-Shik Chang <perky@python.or.kr>	1	# Created by: Ben Woods <woodsb02@gmail.com>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= bsddb3	4	PORTNAME= bsddb3
5	PORTVERSION= 6.1.0	5	PORTVERSION= 6.1.1
6	PORTREVISION= 1
7	CATEGORIES= databases python	6	CATEGORIES= databases python
8	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
10		9
11	MAINTAINER= bofh@FreeBSD.org	10	MAINTAINER= woodsb02@gmail.com
12	COMMENT= Python extension module for BerkeleyDB 3 and 4	11	COMMENT= Python extension module for BerkeleyDB 3 and 4
13		12
14	LICENSE= BSD3CLAUSE	13	LICENSE= BSD3CLAUSE
15		14
16	USE_BDB= yes	15	USE_BDB= yes
17	USES= python	16	USES= python:3
18	USE_PYTHON= distutils autoplist	17	USE_PYTHON= distutils autoplist
19		18
20	PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}	19	PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}

Lines 1-6 Link Here

(-)databases/py3-bsddb3/files/patch-setup2.py (-10 / +10 lines)
1	--- setup2.py.orig 2011-03-08 22:16:14.000000000 +0800	1	--- setup2.py.orig 2016-02-08 21:14:26 UTC
2	+++ setup2.py 2011-03-15 16:00:42.000000000 +0800	2	+++ setup2.py
3	@@ -86,11 +86,7 @@	3	@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
4	category=DeprecationWarning)	4	category=DeprecationWarning)
5		5
6		6
Lines 13-19 Link Here
13	from distutils.dep_util import newer	13	from distutils.dep_util import newer
14	import distutils.ccompiler	14	import distutils.ccompiler
15		15
16	@@ -295,8 +291,8 @@	16	@@ -288,8 +284,8 @@ if os.name == 'posix':
17	incdir = os.path.join(BERKELEYDB_DIR, 'include')	17	incdir = os.path.join(BERKELEYDB_DIR, 'include')
18	if not libdir:	18	if not libdir:
19	libdir = os.path.join(BERKELEYDB_DIR, 'lib')	19	libdir = os.path.join(BERKELEYDB_DIR, 'lib')
Lines 24-35 Link Here
24	else:	24	else:
25	if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"	25	if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
26	libname = []	26	libname = []
27	@@ -336,7 +332,7 @@	27	@@ -328,7 +324,7 @@ if os.name == 'posix':
		28
28	# read db.h to figure out what version of Berkeley DB this is	29	# read db.h to figure out what version of Berkeley DB this is
29	ver = None	30	ver = None
30	# This should move to "with" when we drop support for Python 2.4 and 2.5	31	- with open(os.path.join(incdir, 'db.h'), 'r') as f :
31	- f = open(os.path.join(incdir, 'db.h'), 'r')	32	+ with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
32	+ f = open('%%BDB_INCLUDE_DIR%%/db.h', 'r')	33	db_h_lines = f.readlines()
33	db_h_lines = f.readlines()
34	f.close()
35	db_ver_re = re.compile(	34	db_ver_re = re.compile(
		35	r'^#define\s+DB_VERSION_STRING\s.Berkeley DB (\d+\.\d+).')

Lines 1-6 Link Here

(-)databases/py3-bsddb3/files/patch-setup3.py (-10 / +11 lines)
1	--- setup3.py.orig	1	--- setup3.py.orig 2016-02-08 21:18:47 UTC
2	+++ setup3.py	2	+++ setup3.py
3	@@ -86,10 +86,7 @@	3	@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
4	category=DeprecationWarning)	4	category=DeprecationWarning)
5		5
6		6
Lines 8-18 Link Here
8	- from setuptools import setup, Extension	8	- from setuptools import setup, Extension
9	-except :	9	-except :
10	- from distutils.core import setup, Extension	10	- from distutils.core import setup, Extension
		11	-
11	+from distutils.core import setup, Extension	12	+from distutils.core import setup, Extension
12
13	from distutils.dep_util import newer	13	from distutils.dep_util import newer
14	import distutils.ccompiler	14	import distutils.ccompiler
15	@@ -295,8 +292,8 @@	15
		16	@@ -288,8 +284,8 @@ if os.name == 'posix':
16	incdir = os.path.join(BERKELEYDB_DIR, 'include')	17	incdir = os.path.join(BERKELEYDB_DIR, 'include')
17	if not libdir:	18	if not libdir:
18	libdir = os.path.join(BERKELEYDB_DIR, 'lib')	19	libdir = os.path.join(BERKELEYDB_DIR, 'lib')
Lines 23-34 Link Here
23	else:	24	else:
24	if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")	25	if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
25	libname = []	26	libname = []
26	@@ -336,7 +333,7 @@	27	@@ -328,7 +324,7 @@ if os.name == 'posix':
		28
27	# read db.h to figure out what version of Berkeley DB this is	29	# read db.h to figure out what version of Berkeley DB this is
28	ver = None	30	ver = None
29	# This should move to "with" when we drop support for Python 2.4 and 2.5	31	- with open(os.path.join(incdir, 'db.h'), 'r') as f :
30	- f = open(os.path.join(incdir, 'db.h'), 'r')	32	+ with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
31	+ f = open('%%BDB_INCLUDE_DIR%%/db.h', 'r')	33	db_h_lines = f.readlines()
32	db_h_lines = f.readlines()
33	f.close()
34	db_ver_re = re.compile(	34	db_ver_re = re.compile(
		35	r'^#define\s+DB_VERSION_STRING\s.Berkeley DB (\d+\.\d+).')