Attachment #231569 for bug #261523




_BDB_DEFAULT_save:=${BDB_DEFAULT}

_DB_PORTS=		5 18
_DB_DEFAULTS=	5
#
#   Since 2020-12-02, this name is not fitting too much but
#   retained for now for compatibility. The name of this variable
#   is subject to change especially once db6 were removed.
. if defined(WITH_BDB6_PERMITTED)
_DB_DEFAULTS+=	18
. endif

# Dependency lines for different db versions
db5_DEPENDS=	libdb-5.3.so:databases/db5


# 3b. if there is no usable version installed, check defaults
.if empty(_INST_BDB_VER)
_DFLT_BDB_VER:=${_DB_PORTS}
# make sure we use a reasonable version for package builds
_WITH_BDB_HIGHEST=yes
. for i in ${_DFLT_BDB_VER}

Lines 34-40 ${_l:tu}_DEFAULT= ${lang:C/.*=//g} Link Here

(-)b/Mk/bsd.default-versions.mk (-1 / +1 lines)
34	# Possible values: 2.4	34	# Possible values: 2.4
35	APACHE_DEFAULT?= 2.4	35	APACHE_DEFAULT?= 2.4
36	# Possible values: 5, 18	36	# Possible values: 5, 18
37	BDB_DEFAULT?= 5	37	BDB_DEFAULT?= 18
38	# Possible values: 2, 3	38	# Possible values: 2, 3
39	COROSYNC_DEFAULT?= 2	39	COROSYNC_DEFAULT?= 2
40	# Possible_values: full canna nox devel_full devel_nox	40	# Possible_values: full canna nox devel_full devel_nox

Lines 19-24 PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE} Link Here

(-)b/databases/py-berkeleydb/Makefile (+2 lines)
19	PYDISTUTILS_BUILDARGS= --libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}	19	PYDISTUTILS_BUILDARGS= --libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
20	PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE}	20	PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE}
21		21
		22	MAKE_ENV= YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=yes
		23
22	PORTDOCS= *	24	PORTDOCS= *
23	DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}	25	DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
24		26

Lines 1-6 Link Here

(-)b/databases/py-bsddb3/files/patch-setup3.py (-4 / +25 lines)
1	--- setup3.py.orig 2016-02-08 21:18:47 UTC	1	--- setup3.py.orig 2020-11-26 15:38:58 UTC
2	+++ setup3.py	2	+++ setup3.py
3	@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve	3	@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.version_info >=
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	@@ -288,8 +284,8 @@ if os.name == 'posix':	16	@@ -152,7 +148,8 @@ if os.name == 'posix':
		17	lflags_arg = LFLAGS + LIBS
		18
		19	# Supported Berkeley DB versions, in order of preference.
		20	- db_ver_list = ((6, 2), (6, 1),
		21	+ db_ver_list = ((18, 1), (18, 0),
		22	+ (6, 2), (6, 1),
		23	(5, 3), (5, 1),
		24	(4, 8), (4, 7))
		25	db_ver = None
		26	@@ -298,8 +295,8 @@ if os.name == 'posix':
17	incdir = os.path.join(BERKELEYDB_DIR, 'include')	27	incdir = os.path.join(BERKELEYDB_DIR, 'include')
18	if not libdir:	28	if not libdir:
19	libdir = os.path.join(BERKELEYDB_DIR, 'lib')	29	libdir = os.path.join(BERKELEYDB_DIR, 'lib')
Lines 24-30 Link Here
24	else:	34	else:
25	if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")	35	if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
26	libname = []	36	libname = []
27	@@ -328,7 +324,7 @@ if os.name == 'posix':	37	@@ -338,7 +335,7 @@ if os.name == 'posix':
28		38
29	# read db.h to figure out what version of Berkeley DB this is	39	# read db.h to figure out what version of Berkeley DB this is
30	ver = None	40	ver = None
Lines 33-35 Link Here
33	db_h_lines = f.readlines()	43	db_h_lines = f.readlines()
34	db_ver_re = re.compile(	44	db_ver_re = re.compile(
35	r'^#define\s+DB_VERSION_STRING\s.Berkeley DB (\d+\.\d+).')	45	r'^#define\s+DB_VERSION_STRING\s.Berkeley DB (\d+\.\d+).')
		46	@@ -350,8 +347,8 @@ if os.name == 'posix':
		47	if not match:
		48	continue
		49	fullverstr = match.group(1)
		50	- ver = fullverstr[0] + fullverstr[2] # 31 == 3.1, 32 == 3.2, etc.
		51	- db_ver = (int(fullverstr[0]), int(fullverstr[2]))
		52	+ ver = fullverstr.split('.')
		53	+ db_ver = (int(ver[0]), int(ver[1]))
		54	if (db_ver2 is not None) and (db_ver != db_ver2) :
		55	raise AssertionError("Detected Berkeley DB version is inconsistent")
		56	if db_ver not in db_ver_list:




--- dns-terror/DatedStringDb.cc.orig	2003-05-17 18:14:35 UTC
+++ dns-terror/DatedStringDb.cc
@@ -63,13 +63,21 @@ using namespace std;
 DatedStringDb::DatedStringDb(const char *dbhome, const char *storename)
 {
 #if DB_VERSION_MAJOR >= 3
+#if DB_VERSION_MAJOR >= 5
+  env = new DbEnv((u_int32_t) 0);
+#else
   env = new DbEnv(0);
+#endif
   env->set_error_stream(&cerr);
   env->set_errpfx(storename ? storename : "DatedStringDb");
   env->set_cachesize(0, MPOOL_SIZE, 0);
   env->open(dbhome, DB_CREATE|DB_INIT_MPOOL|DB_PRIVATE, 0644);
   db = new Db(env, 0);




 #include <string.h>
 
 #ifdef DB_HEADER
@@ -305,7 +306,7 @@ std::unique_ptr<DbEnv> CreateDbEnv(const char *path)
                             DB_RECOVER |
                             DB_CREATE;
 
-    std::unique_ptr<DbEnv> env(new DbEnv(0));
+    std::unique_ptr<DbEnv> env(new DbEnv((u_int32_t)0));
     env->open(path, flags, 0600);
 
     // This prevents the log from growing indefinitely
@@ -324,7 +325,7 @@ void DestroyDbEnv(std::unique_ptr<DbEnv>& env)
     env->close(0);
 
     // Clean up temporary environment files (unless they're still in use):
-    DbEnv env2(0);
+    DbEnv env2((u_int32_t)0);
     env2.remove(dbpath.c_str(), 0);
 
     env.reset();

Return to bug 261523

Lines 58-71 BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} Link Here

(-)b/Mk/Uses/bdb.mk (-9 / +1 lines)
58	_BDB_DEFAULT_save:=${BDB_DEFAULT}	58	_BDB_DEFAULT_save:=${BDB_DEFAULT}
59		59
60	_DB_PORTS= 5 18	60	_DB_PORTS= 5 18
61	_DB_DEFAULTS= 5
62	#
63	# Since 2020-12-02, this name is not fitting too much but
64	# retained for now for compatibility. The name of this variable
65	# is subject to change especially once db6 were removed.
66	. if defined(WITH_BDB6_PERMITTED)
67	_DB_DEFAULTS+= 18
68	. endif
69		61
70	# Dependency lines for different db versions	62	# Dependency lines for different db versions
71	db5_DEPENDS= libdb-5.3.so:databases/db5	63	db5_DEPENDS= libdb-5.3.so:databases/db5
Lines 148-154 _ELIGIBLE_BDB_VER:=${_INST_BDB_VER} Link Here
148		140
149	# 3b. if there is no usable version installed, check defaults	141	# 3b. if there is no usable version installed, check defaults
150	.if empty(_INST_BDB_VER)	142	.if empty(_INST_BDB_VER)
151	_DFLT_BDB_VER:=${_DB_DEFAULTS}	143	_DFLT_BDB_VER:=${_DB_PORTS}
152	# make sure we use a reasonable version for package builds	144	# make sure we use a reasonable version for package builds
153	_WITH_BDB_HIGHEST=yes	145	_WITH_BDB_HIGHEST=yes
154	. for i in ${_DFLT_BDB_VER}	146	. for i in ${_DFLT_BDB_VER}

Lines 1-6 Link Here

(-)b/dns/fastresolve/files/patch-dns-terror__DatedStringDb.cc (-1 / +11 lines)
1	--- dns-terror/DatedStringDb.cc.orig 2003-05-17 18:14:35 UTC	1	--- dns-terror/DatedStringDb.cc.orig 2003-05-17 18:14:35 UTC
2	+++ dns-terror/DatedStringDb.cc	2	+++ dns-terror/DatedStringDb.cc
3	@@ -69,7 +69,11 @@ DatedStringDb::DatedStringDb(const char	3	@@ -63,13 +63,21 @@ using namespace std;
		4	DatedStringDb::DatedStringDb(const char dbhome, const char storename)
		5	{
		6	#if DB_VERSION_MAJOR >= 3
		7	+#if DB_VERSION_MAJOR >= 5
		8	+ env = new DbEnv((u_int32_t) 0);
		9	+#else
		10	env = new DbEnv(0);
		11	+#endif
		12	env->set_error_stream(&cerr);
		13	env->set_errpfx(storename ? storename : "DatedStringDb");
4	env->set_cachesize(0, MPOOL_SIZE, 0);	14	env->set_cachesize(0, MPOOL_SIZE, 0);
5	env->open(dbhome, DB_CREATE\|DB_INIT_MPOOL\|DB_PRIVATE, 0644);	15	env->open(dbhome, DB_CREATE\|DB_INIT_MPOOL\|DB_PRIVATE, 0644);
6	db = new Db(env, 0);	16	db = new Db(env, 0);

Lines 8-10 Link Here

(-)b/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp (-1 / +18 lines)
8	#include <string.h>	8	#include <string.h>
9		9
10	#ifdef DB_HEADER	10	#ifdef DB_HEADER
11	-	11	@@ -305,7 +306,7 @@ std::unique_ptr<DbEnv> CreateDbEnv(const char *path)
		12	DB_RECOVER \|
		13	DB_CREATE;
		14
		15	- std::unique_ptr<DbEnv> env(new DbEnv(0));
		16	+ std::unique_ptr<DbEnv> env(new DbEnv((u_int32_t)0));
		17	env->open(path, flags, 0600);
		18
		19	// This prevents the log from growing indefinitely
		20	@@ -324,7 +325,7 @@ void DestroyDbEnv(std::unique_ptr<DbEnv>& env)
		21	env->close(0);
		22
		23	// Clean up temporary environment files (unless they're still in use):
		24	- DbEnv env2(0);
		25	+ DbEnv env2((u_int32_t)0);
		26	env2.remove(dbpath.c_str(), 0);
		27
		28	env.reset();