Attachment #216943 for bug #248415

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





_BDB_DEFAULT_save:=${BDB_DEFAULT}

_DB_PORTS=		5 6 18
_DB_DEFAULTS=	5	# does not include 6 due to different licensing
#	but user can re-add it through WITH_BDB6_PERMITTED
. if defined(WITH_BDB6_PERMITTED)
_DB_DEFAULTS+=	6 18
. endif

# Dependency lines for different db versions
db5_DEPENDS=	libdb-5.3.so:databases/db5
db6_DEPENDS=	libdb-6.2.so:databases/db6
db18_DEPENDS=	libdb-18.1.so:databases/db18
# Detect db versions by finding some files
db5_FIND=	${LOCALBASE}/include/db5/db.h
db6_FIND=	${LOCALBASE}/include/db6/db.h
db18_FIND=	${LOCALBASE}/include/db18/db.h

# Override the global BDB_DEFAULT with the
# port specific <BDB_UNIQUENAME>_WITH_BDB_VER

# 2. parse supported versions:
# 2a. build list from _bdb_ARGS
_SUPP_BDB_VER=
__bdb_ARGS:=${_bdb_ARGS:C,\+$,,}
.if !empty(_bdb_ARGS:M*+)
. for bdb in ${_DB_PORTS}
.  if ${__bdb_ARGS} <= ${bdb}
_SUPP_BDB_VER+=${bdb:C/\.//}
.  endif

.endif
# 2b. expand INVALID_BDB_VER if given with "+":
.if !empty(INVALID_BDB_VER:M*+)
_INV_BDB:=${INVALID_BDB_VER:C,\+$,,}
_INV_BDB_VER:=
. for bdb in ${_DB_PORTS}
.  if ${_INV_BDB} <= ${bdb}
_INV_BDB_VER+=${bdb:C/\.//}
.  endif

BDB_LIB_NAME=		db-6.2
BDB_LIB_CXX_NAME=	db_cxx-6.2
BDB_LIB_DIR=		${LOCALBASE}/lib/db6
. elif ${_BDB_VER} == 18
BDB_LIB_NAME=		db-18.1
BDB_LIB_CXX_NAME=	db_cxx-18.1
BDB_LIB_DIR=		${LOCALBASE}/lib/db18
. endif
BDB_LIB_NAME?=		db${_BDB_VER}
BDB_LIB_CXX_NAME?=	db${_BDB_VER}_cxx

Lines 35-41 Link Here

(-)Mk/bsd.default-versions.mk (-1 / +1 lines)
35		35
36	# Possible values: 2.4	36	# Possible values: 2.4
37	APACHE_DEFAULT?= 2.4	37	APACHE_DEFAULT?= 2.4
38	# Possible values: 48, 5, 6	38	# Possible values: 5, 6, 18
39	BDB_DEFAULT?= 5	39	BDB_DEFAULT?= 5
40	# Possible values: 2, 3	40	# Possible values: 2, 3
41	COROSYNC_DEFAULT?= 2	41	COROSYNC_DEFAULT?= 2

Lines 53-58 Link Here

(-)databases/Makefile (+1 lines)
53	SUBDIR += dalmp	53	SUBDIR += dalmp
54	SUBDIR += datamodeler	54	SUBDIR += datamodeler
55	SUBDIR += db	55	SUBDIR += db
		56	SUBDIR += db18
56	SUBDIR += db5	57	SUBDIR += db5
57	SUBDIR += db6	58	SUBDIR += db6
58	SUBDIR += dbf	59	SUBDIR += dbf




# Created by: Matthias Andree <mandree@FreeBSD.org>
# $FreeBSD$

PORTNAME=	db18
PORTVERSION=	18.1.40
PORTREVISION=	1
CATEGORIES=	databases java
MASTER_SITES=	https://github.com/yasuhirokimura/${PORTNAME}/releases/download/${PORTVERSION}/
PKGNAMEPREFIX?=
#
# the distfiles aren't named db18-* but db-*:
DISTNAME=	db-${PORTVERSION}
DIST_SUBDIR=	bdb

MAINTAINER=	yasu@utahime.org
COMMENT=	Oracle Berkeley DB, Release ${BDBVER}

LICENSE=	AGPLv3 BSD3CLAUSE UPL10
LICENSE_COMB=	multi
LICENSE_NAME_UPL10=	The Universal Permissive License (UPL), Version 1.0
LICENSE=	AGPLv3
LICENSE_FILE=	${WRKSRC}/../LICENSE
LICENSE_FILE_UPL10=	${WRKSRC}/../EXAMPLES-LICENSE
LICENSE_PERMS_UPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BROKEN_mips64=	no usable MUTEX implementation, assy works only for MIPS32, POSIX mutexes are unshared


		--bindir=${PREFIX}/bin/${PORTNAME}
CONFIGURE_SCRIPT=	../dist/configure
GNU_CONFIGURE=	yes
USES=		gmake libtool ssl
INSTALL_TARGET=	install_include install_lib install_utilities
WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}

PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
MAKE_ARGS+=	docdir=${DOCSDIR}

OPTIONS_DEFINE=	CRYPTO DEBUG L10N JAVA TCL DOCS
OPTIONS_DEFAULT=CRYPTO
OPTIONS_SUB=	yes
CRYPTO_DESC=	Cryptography support
L10N_DESC=	Localization support (EXPERIMENTAL)
SQL_DESC=	Enable SQL API (EXPERIMENTAL)

PORTDOCS=	*


DEBUG_CONFIGURE_ENABLE=	debug umrw
CRYPTO_CONFIGURE_WITH=	cryptography=yes
L10N_CONFIGURE_ENABLE=	localization
SQL_CONFIGURE_ENABLE=	sql sql_codegen
SQL_VARS=		DBLIBS+=libdb_sql
JAVA_USE=		java
JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION="7+"
# openjdk 11 or newer and cause IllegalArgument
# exceptions during build even if the version check
# in dist/configure is disabled or fixed:
JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION="7 8"
JAVA_CONFIGURE_ENABLE=	java
JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
JAVA_CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"

TCL_CONFIGURE_ENABLE=	tcl
TCL_USES=		tcl
TCL_CONFIGURE_WITH=	tcl=${TCL_LIBDIR}
TCL_VARS=		DBLIBS+=libdb_tcl 
DOCS_INSTALL_TARGET=	install_docs

.include <bsd.port.options.mk>

CONFIGURE_ARGS+=	--with-mutex=POSIX/pthreads
.endif

post-patch:
	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \
	    ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* \
	    ${WRKSRC}/../src/dbinc/atomic.h
	${REINPLACE_CMD} -e 's/%%BDBVER%%/${BDBVER}/' ${WRKSRC}/../lang/sql/upgrade61.sh

post-install:
.for i in ${DBLIBS}
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so

	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA
.endfor

post-install-SQL-off:
	${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql

post-install-SQL-on:
	${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \
	    ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-upgrade61.sh

post-install-TCL-on:
	echo "package ifneeded Db_tcl ${BDBVER} \
	      [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \

Lines 1-3 Link Here

(-)databases/db18/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1502528680	1	TIMESTAMP = 1595521725
2	SHA256 (bdb/db-6.2.32.tar.gz) = a9c5e2b004a5777aa03510cfe5cd766a4a3b777713406b02809c17c8e0e7a8fb	2	SHA256 (bdb/db-18.1.40.tar.gz) = 0cecb2ef0c67b166de93732769abdeba0555086d51de1090df325e18ee8da9c8
3	SIZE (bdb/db-6.2.32.tar.gz) = 45342417	3	SIZE (bdb/db-18.1.40.tar.gz) = 30763705




--- dist/Makefile.in.orig	2020-05-29 17:58:22 UTC
+++ dist/Makefile.in
@@ -1299,8 +1299,8 @@ uninstall_utilities:
 
 # We install csharp docs even on UNIX so we don't have a 
 # broken link on the landing page.
-DOCLIST=api_reference articles bdb-sql collections csharp gsg \
-	gsg_db_rep gsg_db_server gsg_txn index.html installation \
+DOCLIST=api_reference articles collections csharp gsg \
+	gsg_db_rep gsg_txn index.html installation \
 	java license porting programmer_reference upgrading
 
 install_docs:




--- lang/sql/upgrade61.sh.orig	2016-03-28 19:45:53 UTC
+++ lang/sql/upgrade61.sh
@@ -1,12 +1,19 @@
 #!/bin/sh
 # This script upgrades SQL databases from BDB 5.0 to early 6.1
 # to late 6.1 and up by reindexing them.
+# 
+# Originally provided by Oracle as part of the Oracle BerkeleyDB
+# 12.1.6.* tarballs.
 #
+# Bugfixed for proper quoting and error checking
+# by Matthias Andree <mandree@FreeBSD.org>
 
-for var in $@
+rc=0
+for var in "$@"
 do
-    echo Recovering database $var
-    db_recover -f -h ${var}-journal
-    echo Reindexing database $var
-    echo .quit | dbsql -cmd REINDEX  $var
+    echo "Recovering database $var"
+    db_recover-%%BDBVER%% -f -h "${var}-journal" || { rc=1 ; continue ; }
+    echo "Reindexing database $var"
+    echo .quit | dbsql-%%BDBVER%% -cmd REINDEX "$var" || rc=1
 done
+exit $rc




--- src/dbinc/db.in.orig	2017-04-13 14:06:20 UTC
+++ src/dbinc/db.in
@@ -2997,11 +2997,11 @@ typedef struct {
 #define	dbmclose	__db_dbm_close@DB_VERSION_UNIQUE_NAME@
 #if !defined(__cplusplus)
 #define	delete(a)	__db_dbm_delete@DB_VERSION_UNIQUE_NAME@(a)
+#define	store(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
 #endif
 #define	fetch(a)	__db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
 #define	firstkey	__db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
 #define	nextkey(a)	__db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
-#define	store(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
 
 /*******************************************************
  * Hsearch historic interface.

Lines 8-14 Link Here

(-)databases/db18/pkg-descr (-4 / +1 lines)
8	be confident that Oracle Berkeley DB will manage your persistence	8	be confident that Oracle Berkeley DB will manage your persistence
9	needs.	9	needs.
10		10
11	Note that Berkeley DB 6 changed license to the	11	WWW: https://www.oracle.com/database/berkeley-db/
12	Affero GNU General Public License v3 (AGPL v3).
13
14	WWW: http://www.oracle.com/us/products/database/berkeley-db/db/




bin/db%%BDBMAJ%%/db_printlog
bin/db%%BDBMAJ%%/db_recover
bin/db%%BDBMAJ%%/db_replicate
%%SQL%%bin/db%%BDBMAJ%%/db_sql_codegen
bin/db%%BDBMAJ%%/db_stat
bin/db%%BDBMAJ%%/db_tuner
bin/db%%BDBMAJ%%/db_upgrade
bin/db%%BDBMAJ%%/db_verify
%%SQL%%bin/db%%BDBMAJ%%-upgrade61.sh
%%SQL%%bin/db%%BDBMAJ%%/dbsql
bin/db_archive-%%BDBVER%%
bin/db_checkpoint-%%BDBVER%%
bin/db_convert-%%BDBVER%%

bin/db_printlog-%%BDBVER%%
bin/db_recover-%%BDBVER%%
bin/db_replicate-%%BDBVER%%
%%SQL%%bin/db_sql_codegen-%%BDBVER%%
bin/db_stat-%%BDBVER%%
bin/db_tuner-%%BDBVER%%
bin/db_upgrade-%%BDBVER%%
bin/db_verify-%%BDBVER%%
%%SQL%%bin/dbsql-%%BDBVER%%
include/db%%BDBMAJ%%/db.h
include/db%%BDBMAJ%%/db_185.h
include/db%%BDBMAJ%%/db_cxx.h
%%SQL%%include/db%%BDBMAJ%%/dbsql.h
include/db%%BDBMAJ%%/dbstl_base_iterator.h
include/db%%BDBMAJ%%/dbstl_common.h
include/db%%BDBMAJ%%/dbstl_container.h

%%JAVA%%lib/db%%BDBMAJ%%/libdb_java.a
%%JAVA%%lib/db%%BDBMAJ%%/libdb_java.so
%%JAVA%%lib/db%%BDBMAJ%%/libdb_java-%%BDBMAJ%%.so
%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBVER%%.a
%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBVER%%.so
%%SQL%%lib/db%%BDBMAJ%%/libdb_sql.a
%%SQL%%lib/db%%BDBMAJ%%/libdb_sql.so
%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBMAJ%%.so
lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.a
lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.so
lib/db%%BDBMAJ%%/libdb_stl-%%BDBMAJ%%.so

lib/libdb_cxx-%%BDBMAJ%%.so
%%JAVA%%lib/libdb_java-%%BDBVER%%.so
%%JAVA%%lib/libdb_java-%%BDBMAJ%%.so
%%SQL%%lib/libdb_sql-%%BDBVER%%.so
%%SQL%%lib/libdb_sql-%%BDBMAJ%%.so
lib/libdb_stl-%%BDBVER%%.so
lib/libdb_stl-%%BDBMAJ%%.so
%%TCL%%lib/db%%BDBMAJ%%/libdb_tcl-%%BDBVER%%.a

Return to bug 248415

Lines 59-77 Link Here

(-)Mk/Uses/bdb.mk (-6 / +12 lines)
59		59
60	_BDB_DEFAULT_save:=${BDB_DEFAULT}	60	_BDB_DEFAULT_save:=${BDB_DEFAULT}
61		61
62	_DB_PORTS= 5 6	62	_DB_PORTS= 5 6 18
63	_DB_DEFAULTS= 5 # does not include 6 due to different licensing	63	_DB_DEFAULTS= 5 # does not include 6 due to different licensing
64	# but user can re-add it through WITH_BDB6_PERMITTED	64	# but user can re-add it through WITH_BDB6_PERMITTED
65	. if defined(WITH_BDB6_PERMITTED)	65	. if defined(WITH_BDB6_PERMITTED)
66	_DB_DEFAULTS+= 6	66	_DB_DEFAULTS+= 6 18
67	. endif	67	. endif
68		68
69	# Dependency lines for different db versions	69	# Dependency lines for different db versions
70	db5_DEPENDS= libdb-5.3.so:databases/db5	70	db5_DEPENDS= libdb-5.3.so:databases/db5
71	db6_DEPENDS= libdb-6.2.so:databases/db6	71	db6_DEPENDS= libdb-6.2.so:databases/db6
		72	db18_DEPENDS= libdb-18.1.so:databases/db18
72	# Detect db versions by finding some files	73	# Detect db versions by finding some files
73	db5_FIND= ${LOCALBASE}/include/db5/db.h	74	db5_FIND= ${LOCALBASE}/include/db5/db.h
74	db6_FIND= ${LOCALBASE}/include/db6/db.h	75	db6_FIND= ${LOCALBASE}/include/db6/db.h
		76	db18_FIND= ${LOCALBASE}/include/db18/db.h
75		77
76	# Override the global BDB_DEFAULT with the	78	# Override the global BDB_DEFAULT with the
77	# port specific <BDB_UNIQUENAME>_WITH_BDB_VER	79	# port specific <BDB_UNIQUENAME>_WITH_BDB_VER
Lines 109-117 Link Here
109	# 2. parse supported versions:	111	# 2. parse supported versions:
110	# 2a. build list from _bdb_ARGS	112	# 2a. build list from _bdb_ARGS
111	_SUPP_BDB_VER=	113	_SUPP_BDB_VER=
112	__bdb_ARGS:=${_bdb_ARGS:C,\+$,,:C/(.)(.)$/\1.\2/}	114	__bdb_ARGS:=${_bdb_ARGS:C,\+$,,}
113	.if !empty(_bdb_ARGS:M*+)	115	.if !empty(_bdb_ARGS:M*+)
114	. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}	116	. for bdb in ${_DB_PORTS}
115	. if ${__bdb_ARGS} <= ${bdb}	117	. if ${__bdb_ARGS} <= ${bdb}
116	_SUPP_BDB_VER+=${bdb:C/\.//}	118	_SUPP_BDB_VER+=${bdb:C/\.//}
117	. endif	119	. endif
Lines 121-129 Link Here
121	.endif	123	.endif
122	# 2b. expand INVALID_BDB_VER if given with "+":	124	# 2b. expand INVALID_BDB_VER if given with "+":
123	.if !empty(INVALID_BDB_VER:M*+)	125	.if !empty(INVALID_BDB_VER:M*+)
124	_INV_BDB:=${INVALID_BDB_VER:C,\+$,,:C/(.)(.)$/\1.\2/}	126	_INV_BDB:=${INVALID_BDB_VER:C,\+$,,}
125	_INV_BDB_VER:=	127	_INV_BDB_VER:=
126	. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}	128	. for bdb in ${_DB_PORTS}
127	. if ${_INV_BDB} <= ${bdb}	129	. if ${_INV_BDB} <= ${bdb}
128	_INV_BDB_VER+=${bdb:C/\.//}	130	_INV_BDB_VER+=${bdb:C/\.//}
129	. endif	131	. endif
Lines 183-188 Link Here
183	BDB_LIB_NAME= db-6.2	185	BDB_LIB_NAME= db-6.2
184	BDB_LIB_CXX_NAME= db_cxx-6.2	186	BDB_LIB_CXX_NAME= db_cxx-6.2
185	BDB_LIB_DIR= ${LOCALBASE}/lib/db6	187	BDB_LIB_DIR= ${LOCALBASE}/lib/db6
		188	. elif ${_BDB_VER} == 18
		189	BDB_LIB_NAME= db-18.1
		190	BDB_LIB_CXX_NAME= db_cxx-18.1
		191	BDB_LIB_DIR= ${LOCALBASE}/lib/db18
186	. endif	192	. endif
187	BDB_LIB_NAME?= db${_BDB_VER}	193	BDB_LIB_NAME?= db${_BDB_VER}
188	BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx	194	BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx

Lines 1-25 Link Here

(-)databases/db18/Makefile (-36 / +15 lines)
1	# Created by: Matthias Andree <mandree@FreeBSD.org>	1	# Created by: Matthias Andree <mandree@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= db6	4	PORTNAME= db18
5	PORTVERSION= 6.2.32	5	PORTVERSION= 18.1.40
6	PORTREVISION= 1
7	CATEGORIES= databases java	6	CATEGORIES= databases java
8	MASTER_SITES= https://download.oracle.com/berkeley-db/	7	MASTER_SITES= https://github.com/yasuhirokimura/${PORTNAME}/releases/download/${PORTVERSION}/
9	PKGNAMEPREFIX?=	8	PKGNAMEPREFIX?=
10	#	9	#
11	# the distfiles aren't named db6-* but db-*:	10	# the distfiles aren't named db18-* but db-*:
12	DISTNAME= db-${PORTVERSION}	11	DISTNAME= db-${PORTVERSION}
13	DIST_SUBDIR= bdb	12	DIST_SUBDIR= bdb
14		13
15	DEPRECATED= latest 6.2.x version and newer not downloadable without registration	14	MAINTAINER= yasu@utahime.org
16	EXPIRATION_DATE=2020-12-02	15	COMMENT= Oracle Berkeley DB, Release ${BDBVER}
17		16
18	MAINTAINER= mandree@FreeBSD.org	17	LICENSE= AGPLv3 BSD3CLAUSE UPL10
19	COMMENT= Oracle Berkeley DB, revision ${BDBVER}	18	LICENSE_COMB= multi
20		19	LICENSE_NAME_UPL10= The Universal Permissive License (UPL), Version 1.0
21	LICENSE= AGPLv3
22	LICENSE_FILE= ${WRKSRC}/../LICENSE	20	LICENSE_FILE= ${WRKSRC}/../LICENSE
		21	LICENSE_FILE_UPL10= ${WRKSRC}/../EXAMPLES-LICENSE
		22	LICENSE_PERMS_UPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
23		23
24	BROKEN_mips64= no usable MUTEX implementation, assy works only for MIPS32, POSIX mutexes are unshared	24	BROKEN_mips64= no usable MUTEX implementation, assy works only for MIPS32, POSIX mutexes are unshared
25		25
Lines 32-38 Link Here
32	--bindir=${PREFIX}/bin/${PORTNAME}	32	--bindir=${PREFIX}/bin/${PORTNAME}
33	CONFIGURE_SCRIPT= ../dist/configure	33	CONFIGURE_SCRIPT= ../dist/configure
34	GNU_CONFIGURE= yes	34	GNU_CONFIGURE= yes
35	USES= gmake libtool	35	USES= gmake libtool ssl
36	INSTALL_TARGET= install_include install_lib install_utilities	36	INSTALL_TARGET= install_include install_lib install_utilities
37	WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix	37	WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
38	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}	38	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
Lines 40-51 Link Here
40	PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}	40	PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
41	MAKE_ARGS+= docdir=${DOCSDIR}	41	MAKE_ARGS+= docdir=${DOCSDIR}
42		42
43	OPTIONS_DEFINE= CRYPTO DEBUG L10N SQL JAVA TCL DOCS	43	OPTIONS_DEFINE= CRYPTO DEBUG L10N JAVA TCL DOCS
44	OPTIONS_DEFAULT=CRYPTO	44	OPTIONS_DEFAULT=CRYPTO
45	OPTIONS_SUB= yes	45	OPTIONS_SUB= yes
46	CRYPTO_DESC= Cryptography support	46	CRYPTO_DESC= Cryptography support
47	L10N_DESC= Localization support (EXPERIMENTAL)	47	L10N_DESC= Localization support (EXPERIMENTAL)
48	SQL_DESC= Enable SQL API (EXPERIMENTAL)
49		48
50	PORTDOCS= *	49	PORTDOCS= *
51		50
Lines 54-67 Link Here
54	DEBUG_CONFIGURE_ENABLE= debug umrw	53	DEBUG_CONFIGURE_ENABLE= debug umrw
55	CRYPTO_CONFIGURE_WITH= cryptography=yes	54	CRYPTO_CONFIGURE_WITH= cryptography=yes
56	L10N_CONFIGURE_ENABLE= localization	55	L10N_CONFIGURE_ENABLE= localization
57	SQL_CONFIGURE_ENABLE= sql sql_codegen
58	SQL_VARS= DBLIBS+=libdb_sql
59	JAVA_USE= java	56	JAVA_USE= java
60	# db6 is only compatible with openjdk 7 or 8,	57	JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION="7+"
61	# openjdk 11 or newer and cause IllegalArgument
62	# exceptions during build even if the version check
63	# in dist/configure is disabled or fixed:
64	JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION="7 8"
65	JAVA_CONFIGURE_ENABLE= java	58	JAVA_CONFIGURE_ENABLE= java
66	JAVA_CPPFLAGS= -I"${JAVA_HOME}/include"	59	JAVA_CPPFLAGS= -I"${JAVA_HOME}/include"
67	JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"	60	JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
Lines 68-74 Link Here
68	TCL_CONFIGURE_ENABLE= tcl	61	TCL_CONFIGURE_ENABLE= tcl
69	TCL_USES= tcl	62	TCL_USES= tcl
70	TCL_CONFIGURE_WITH= tcl=${TCL_LIBDIR}	63	TCL_CONFIGURE_WITH= tcl=${TCL_LIBDIR}
71	TCL_VARS= DBLIBS+=libdb_tcl	64	TCL_VARS= DBLIBS+=libdb_tcl
72	DOCS_INSTALL_TARGET= install_docs	65	DOCS_INSTALL_TARGET= install_docs
73		66
74	.include <bsd.port.options.mk>	67	.include <bsd.port.options.mk>
Lines 77-89 Link Here
77	CONFIGURE_ARGS+= --with-mutex=POSIX/pthreads	70	CONFIGURE_ARGS+= --with-mutex=POSIX/pthreads
78	.endif	71	.endif
79		72
80	post-patch:
81	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
82	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \
83	${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* \
84	${WRKSRC}/../src/dbinc/atomic.h
85	${REINPLACE_CMD} -e 's/%%BDBVER%%/${BDBVER}/' ${WRKSRC}/../lang/sql/upgrade61.sh
86
87	post-install:	73	post-install:
88	.for i in ${DBLIBS}	74	.for i in ${DBLIBS}
89	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so	75	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so
Lines 100-112 Link Here
100	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA	86	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA
101	.endfor	87	.endfor
102		88
103	post-install-SQL-off:
104	${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql
105
106	post-install-SQL-on:
107	${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \
108	${STAGEDIR}${PREFIX}/bin/${PORTNAME}-upgrade61.sh
109
110	post-install-TCL-on:	89	post-install-TCL-on:
111	echo "package ifneeded Db_tcl ${BDBVER} \	90	echo "package ifneeded Db_tcl ${BDBVER} \
112	[list load [file join $$dir libdb_tcl-${BDBVER}.so]] \	91	[list load [file join $$dir libdb_tcl-${BDBVER}.so]] \

Line 0 Link Here

(-)databases/db18/files/patch-dist_Makefile.in (+13 lines)
	1	--- dist/Makefile.in.orig 2020-05-29 17:58:22 UTC
	2	+++ dist/Makefile.in
	3	@@ -1299,8 +1299,8 @@ uninstall_utilities:
	4
	5	# We install csharp docs even on UNIX so we don't have a
	6	# broken link on the landing page.
	7	-DOCLIST=api_reference articles bdb-sql collections csharp gsg \
	8	- gsg_db_rep gsg_db_server gsg_txn index.html installation \
	9	+DOCLIST=api_reference articles collections csharp gsg \
	10	+ gsg_db_rep gsg_txn index.html installation \
	11	java license porting programmer_reference upgrading
	12
	13	install_docs:

Lines 1-27 Link Here

(-)databases/db18/files/patch-lang_sql_upgrade61.sh (-27 lines)
1	--- lang/sql/upgrade61.sh.orig 2016-03-28 19:45:53 UTC
2	+++ lang/sql/upgrade61.sh
3	@@ -1,12 +1,19 @@
4	#!/bin/sh
5	# This script upgrades SQL databases from BDB 5.0 to early 6.1
6	# to late 6.1 and up by reindexing them.
7	+#
8	+# Originally provided by Oracle as part of the Oracle BerkeleyDB
9	+# 12.1.6.* tarballs.
10	#
11	+# Bugfixed for proper quoting and error checking
12	+# by Matthias Andree <mandree@FreeBSD.org>
13
14	-for var in $@
15	+rc=0
16	+for var in "$@"
17	do
18	- echo Recovering database $var
19	- db_recover -f -h ${var}-journal
20	- echo Reindexing database $var
21	- echo .quit \| dbsql -cmd REINDEX $var
22	+ echo "Recovering database $var"
23	+ db_recover-%%BDBVER%% -f -h "${var}-journal" \|\| { rc=1 ; continue ; }
24	+ echo "Reindexing database $var"
25	+ echo .quit \| dbsql-%%BDBVER%% -cmd REINDEX "$var" \|\| rc=1
26	done
27	+exit $rc

Lines 1-15 Link Here

(-)databases/db18/files/patch-src_dbinc_db.in (-15 lines)
1	--- src/dbinc/db.in.orig 2017-04-13 14:06:20 UTC
2	+++ src/dbinc/db.in
3	@@ -2997,11 +2997,11 @@ typedef struct {
4	#define dbmclose __db_dbm_close@DB_VERSION_UNIQUE_NAME@
5	#if !defined(__cplusplus)
6	#define delete(a) __db_dbm_delete@DB_VERSION_UNIQUE_NAME@(a)
7	+#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
8	#endif
9	#define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
10	#define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
11	#define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
12	-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
13
14	/*******************************************************
15	* Hsearch historic interface.

Lines 10-22 Link Here

(-)databases/db18/pkg-plist (-13 lines)
10	bin/db%%BDBMAJ%%/db_printlog	10	bin/db%%BDBMAJ%%/db_printlog
11	bin/db%%BDBMAJ%%/db_recover	11	bin/db%%BDBMAJ%%/db_recover
12	bin/db%%BDBMAJ%%/db_replicate	12	bin/db%%BDBMAJ%%/db_replicate
13	%%SQL%%bin/db%%BDBMAJ%%/db_sql_codegen
14	bin/db%%BDBMAJ%%/db_stat	13	bin/db%%BDBMAJ%%/db_stat
15	bin/db%%BDBMAJ%%/db_tuner	14	bin/db%%BDBMAJ%%/db_tuner
16	bin/db%%BDBMAJ%%/db_upgrade	15	bin/db%%BDBMAJ%%/db_upgrade
17	bin/db%%BDBMAJ%%/db_verify	16	bin/db%%BDBMAJ%%/db_verify
18	%%SQL%%bin/db%%BDBMAJ%%-upgrade61.sh
19	%%SQL%%bin/db%%BDBMAJ%%/dbsql
20	bin/db_archive-%%BDBVER%%	17	bin/db_archive-%%BDBVER%%
21	bin/db_checkpoint-%%BDBVER%%	18	bin/db_checkpoint-%%BDBVER%%
22	bin/db_convert-%%BDBVER%%	19	bin/db_convert-%%BDBVER%%
Lines 29-44 Link Here
29	bin/db_printlog-%%BDBVER%%	26	bin/db_printlog-%%BDBVER%%
30	bin/db_recover-%%BDBVER%%	27	bin/db_recover-%%BDBVER%%
31	bin/db_replicate-%%BDBVER%%	28	bin/db_replicate-%%BDBVER%%
32	%%SQL%%bin/db_sql_codegen-%%BDBVER%%
33	bin/db_stat-%%BDBVER%%	29	bin/db_stat-%%BDBVER%%
34	bin/db_tuner-%%BDBVER%%	30	bin/db_tuner-%%BDBVER%%
35	bin/db_upgrade-%%BDBVER%%	31	bin/db_upgrade-%%BDBVER%%
36	bin/db_verify-%%BDBVER%%	32	bin/db_verify-%%BDBVER%%
37	%%SQL%%bin/dbsql-%%BDBVER%%
38	include/db%%BDBMAJ%%/db.h	33	include/db%%BDBMAJ%%/db.h
39	include/db%%BDBMAJ%%/db_185.h	34	include/db%%BDBMAJ%%/db_185.h
40	include/db%%BDBMAJ%%/db_cxx.h	35	include/db%%BDBMAJ%%/db_cxx.h
41	%%SQL%%include/db%%BDBMAJ%%/dbsql.h
42	include/db%%BDBMAJ%%/dbstl_base_iterator.h	36	include/db%%BDBMAJ%%/dbstl_base_iterator.h
43	include/db%%BDBMAJ%%/dbstl_common.h	37	include/db%%BDBMAJ%%/dbstl_common.h
44	include/db%%BDBMAJ%%/dbstl_container.h	38	include/db%%BDBMAJ%%/dbstl_container.h
Lines 69-79 Link Here
69	%%JAVA%%lib/db%%BDBMAJ%%/libdb_java.a	63	%%JAVA%%lib/db%%BDBMAJ%%/libdb_java.a
70	%%JAVA%%lib/db%%BDBMAJ%%/libdb_java.so	64	%%JAVA%%lib/db%%BDBMAJ%%/libdb_java.so
71	%%JAVA%%lib/db%%BDBMAJ%%/libdb_java-%%BDBMAJ%%.so	65	%%JAVA%%lib/db%%BDBMAJ%%/libdb_java-%%BDBMAJ%%.so
72	%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBVER%%.a
73	%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBVER%%.so
74	%%SQL%%lib/db%%BDBMAJ%%/libdb_sql.a
75	%%SQL%%lib/db%%BDBMAJ%%/libdb_sql.so
76	%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBMAJ%%.so
77	lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.a	66	lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.a
78	lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.so	67	lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.so
79	lib/db%%BDBMAJ%%/libdb_stl-%%BDBMAJ%%.so	68	lib/db%%BDBMAJ%%/libdb_stl-%%BDBMAJ%%.so
Lines 85-92 Link Here
85	lib/libdb_cxx-%%BDBMAJ%%.so	74	lib/libdb_cxx-%%BDBMAJ%%.so
86	%%JAVA%%lib/libdb_java-%%BDBVER%%.so	75	%%JAVA%%lib/libdb_java-%%BDBVER%%.so
87	%%JAVA%%lib/libdb_java-%%BDBMAJ%%.so	76	%%JAVA%%lib/libdb_java-%%BDBMAJ%%.so
88	%%SQL%%lib/libdb_sql-%%BDBVER%%.so
89	%%SQL%%lib/libdb_sql-%%BDBMAJ%%.so
90	lib/libdb_stl-%%BDBVER%%.so	77	lib/libdb_stl-%%BDBVER%%.so
91	lib/libdb_stl-%%BDBMAJ%%.so	78	lib/libdb_stl-%%BDBMAJ%%.so
92	%%TCL%%lib/db%%BDBMAJ%%/libdb_tcl-%%BDBVER%%.a	79	%%TCL%%lib/db%%BDBMAJ%%/libdb_tcl-%%BDBVER%%.a