svn commit: r556798 - in head: Mk Mk/Uses databases databases/db18 databases/db18/files
Matthias Andree
mandree at FreeBSD.org
Wed Dec 2 00:09:16 UTC 2020
Author: mandree
Date: Wed Dec 2 00:09:14 2020
New Revision: 556798
URL: https://svnweb.freebsd.org/changeset/ports/556798
Log:
New port: databases/db18 Oracle Berkeley DB, Release 18.1
Oracle Berkeley DB is a family of open source embeddable databases
that allows developers to incorporate within their applications a
fast, scalable, transactional database engine with industrial grade
reliability and availability. As a result, customers and end-users
will experience an application that simply works, reliably manages
data, can scale under extreme load, but requires no ongoing database
administration. As a developer, you can focus on your application and
be confident that Oracle Berkeley DB will manage your persistence
needs.
This port is derived from databases/db6 (by svn copy + edits).
PR: 248415
Submitted by: Yasuhiro KIMURA
Added:
head/databases/db18/
- copied from r556797, head/databases/db6/
Deleted:
head/databases/db18/files/patch-lang_sql_upgrade61.sh
head/databases/db18/files/patch-src_dbinc_db.in
Modified:
head/Mk/Uses/bdb.mk
head/Mk/bsd.default-versions.mk
head/databases/Makefile
head/databases/db18/Makefile
head/databases/db18/distinfo
head/databases/db18/pkg-descr
head/databases/db18/pkg-plist
Modified: head/Mk/Uses/bdb.mk
==============================================================================
--- head/Mk/Uses/bdb.mk Tue Dec 1 22:27:24 2020 (r556797)
+++ head/Mk/Uses/bdb.mk Wed Dec 2 00:09:14 2020 (r556798)
@@ -59,19 +59,25 @@ BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME}
_BDB_DEFAULT_save:=${BDB_DEFAULT}
-_DB_PORTS= 5 6
+_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
+#
+# 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+= 6
+_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
@@ -109,9 +115,9 @@ _INST_BDB_VER+=${bdb}
# 2. parse supported versions:
# 2a. build list from _bdb_ARGS
_SUPP_BDB_VER=
-__bdb_ARGS:=${_bdb_ARGS:C,\+$,,:C/(.)(.)$/\1.\2/}
+__bdb_ARGS:=${_bdb_ARGS:C,\+$,,}
.if !empty(_bdb_ARGS:M*+)
-. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}
+. for bdb in ${_DB_PORTS}
. if ${__bdb_ARGS} <= ${bdb}
_SUPP_BDB_VER+=${bdb:C/\.//}
. endif
@@ -121,9 +127,9 @@ _SUPP_BDB_VER=${_bdb_ARGS}
.endif
# 2b. expand INVALID_BDB_VER if given with "+":
.if !empty(INVALID_BDB_VER:M*+)
-_INV_BDB:=${INVALID_BDB_VER:C,\+$,,:C/(.)(.)$/\1.\2/}
+_INV_BDB:=${INVALID_BDB_VER:C,\+$,,}
_INV_BDB_VER:=
-. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}
+. for bdb in ${_DB_PORTS}
. if ${_INV_BDB} <= ${bdb}
_INV_BDB_VER+=${bdb:C/\.//}
. endif
@@ -183,6 +189,10 @@ BDB_LIB_DIR= ${LOCALBASE}/lib/db5
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
Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk Tue Dec 1 22:27:24 2020 (r556797)
+++ head/Mk/bsd.default-versions.mk Wed Dec 2 00:09:14 2020 (r556798)
@@ -35,7 +35,7 @@ ${_l:tu}_DEFAULT= ${lang:C/.*=//g}
# Possible values: 2.4
APACHE_DEFAULT?= 2.4
-# Possible values: 48, 5, 6
+# Possible values: 5, 6, 18
BDB_DEFAULT?= 5
# Possible values: 2, 3
COROSYNC_DEFAULT?= 2
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Tue Dec 1 22:27:24 2020 (r556797)
+++ head/databases/Makefile Wed Dec 2 00:09:14 2020 (r556798)
@@ -54,6 +54,7 @@
SUBDIR += cutelyst-asql
SUBDIR += dalmp
SUBDIR += db
+ SUBDIR += db18
SUBDIR += db5
SUBDIR += db6
SUBDIR += dbf
Modified: head/databases/db18/Makefile
==============================================================================
--- head/databases/db6/Makefile Tue Dec 1 22:27:24 2020 (r556797)
+++ head/databases/db18/Makefile Wed Dec 2 00:09:14 2020 (r556798)
@@ -1,25 +1,25 @@
# Created by: Matthias Andree <mandree at FreeBSD.org>
# $FreeBSD$
-PORTNAME= db6
-PORTVERSION= 6.2.32
-PORTREVISION= 1
+PORTNAME= db18
+PORTVERSION= 18.1.40
CATEGORIES= databases java
-MASTER_SITES= https://download.oracle.com/berkeley-db/
+MASTER_SITES= https://github.com/yasuhirokimura/${PORTNAME}/releases/download/${PORTVERSION}/
PKGNAMEPREFIX?=
#
-# the distfiles aren't named db6-* but db-*:
+# the distfiles aren't named db18-* but db-*:
DISTNAME= db-${PORTVERSION}
DIST_SUBDIR= bdb
-DEPRECATED= latest 6.2.x version and newer not downloadable without registration
-EXPIRATION_DATE=2020-12-02
+MAINTAINER= yasu at utahime.org
+COMMENT= Oracle Berkeley DB, Release ${BDBVER}
-MAINTAINER= mandree at FreeBSD.org
-COMMENT= Oracle Berkeley DB, revision ${BDBVER}
-
-LICENSE= AGPLv3
+LICENSE= AGPLv3 BSD3CLAUSE UPL10
+LICENSE_COMB= multi
+LICENSE_NAME_UPL10= The Universal Permissive License (UPL), Version 1.0
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
@@ -32,7 +32,7 @@ CONFIGURE_ARGS= --enable-cxx --enable-stl --enable-dbm
--bindir=${PREFIX}/bin/${PORTNAME}
CONFIGURE_SCRIPT= ../dist/configure
GNU_CONFIGURE= yes
-USES= gmake libtool
+USES= gmake libtool ssl
INSTALL_TARGET= install_include install_lib install_utilities
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -40,12 +40,11 @@ USE_LDCONFIG= yes
PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
MAKE_ARGS+= docdir=${DOCSDIR}
-OPTIONS_DEFINE= CRYPTO DEBUG L10N SQL JAVA TCL DOCS
+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= *
@@ -54,21 +53,15 @@ DBLIBS= libdb libdb_cxx libdb_stl
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
-# db6 is only compatible with openjdk 7 or 8,
-# 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_VARS= DBLIBS+=libdb_java JAVA_VERSION="7+"
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
+TCL_VARS= DBLIBS+=libdb_tcl
DOCS_INSTALL_TARGET= install_docs
.include <bsd.port.options.mk>
@@ -77,13 +70,6 @@ DOCS_INSTALL_TARGET= install_docs
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
@@ -99,13 +85,6 @@ post-install-JAVA-off:
.for i in gsg gsg_db_rep gsg_txn
${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} \
Modified: head/databases/db18/distinfo
==============================================================================
--- head/databases/db6/distinfo Tue Dec 1 22:27:24 2020 (r556797)
+++ head/databases/db18/distinfo Wed Dec 2 00:09:14 2020 (r556798)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502528680
-SHA256 (bdb/db-6.2.32.tar.gz) = a9c5e2b004a5777aa03510cfe5cd766a4a3b777713406b02809c17c8e0e7a8fb
-SIZE (bdb/db-6.2.32.tar.gz) = 45342417
+TIMESTAMP = 1595521725
+SHA256 (bdb/db-18.1.40.tar.gz) = 0cecb2ef0c67b166de93732769abdeba0555086d51de1090df325e18ee8da9c8
+SIZE (bdb/db-18.1.40.tar.gz) = 30763705
Modified: head/databases/db18/pkg-descr
==============================================================================
--- head/databases/db6/pkg-descr Tue Dec 1 22:27:24 2020 (r556797)
+++ head/databases/db18/pkg-descr Wed Dec 2 00:09:14 2020 (r556798)
@@ -8,7 +8,4 @@ administration. As a developer, you can focus on your
be confident that Oracle Berkeley DB will manage your persistence
needs.
-Note that Berkeley DB 6 changed license to the
-Affero GNU General Public License v3 (AGPL v3).
-
-WWW: http://www.oracle.com/us/products/database/berkeley-db/db/
+WWW: https://www.oracle.com/database/berkeley-db/
Modified: head/databases/db18/pkg-plist
==============================================================================
--- head/databases/db6/pkg-plist Tue Dec 1 22:27:24 2020 (r556797)
+++ head/databases/db18/pkg-plist Wed Dec 2 00:09:14 2020 (r556798)
@@ -10,13 +10,10 @@ bin/db%%BDBMAJ%%/db_log_verify
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%%
@@ -29,16 +26,13 @@ bin/db_log_verify-%%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
@@ -69,11 +63,6 @@ lib/db%%BDBMAJ%%/libdb_cxx.so
%%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
@@ -85,8 +74,6 @@ lib/libdb_cxx-%%BDBVER%%.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
More information about the svn-ports-head
mailing list