Page MenuHomeFreeBSD
Files F153495319

D35852.id108334.diff
No OneTemporary
Actions

D35852.id108334.diff
View Options

Index: Mk/Uses/bdb.mk
===================================================================
--- Mk/Uses/bdb.mk
+++ Mk/Uses/bdb.mk
@@ -8,19 +8,11 @@
# necessary (db5 if compatible).
# This adds a "debug-bdb" make target which will dump the
# related data.
-# INVALID_BDB_VER
-# - This variable can be defined when the port does not
-# support one or more versions of Berkeley DB.
# <BDB_UNIQUENAME>_WITH_BDB_VER
# - User defined port specific variable to set Berkeley DB
# version.
# WITH_BDB_HIGHEST
# - Use the highest installed version of Berkeley DB.
-# WITH_BDB6_PERMITTED
-# - If defined, BerkeleyDB 6 is added to the
-# default version set, making it eligible even
-# if not already installed. This is due to its
-# stricter Affero GNU Public License.
#
# These variables will then be filled in by this .mk file:
#
@@ -58,14 +50,6 @@
_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) || ${_bdb_ARGS} == 18
-_DB_DEFAULTS+= 18
-. endif
# Dependency lines for different db versions
db5_DEPENDS= libdb-5.3.so:databases/db5
@@ -83,32 +67,10 @@
# Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not
# ask for a more specific version.
. if ${_bdb_ARGS} == yes
-. if ${BDB_DEFAULT} != 1
_bdb_ARGS= ${BDB_DEFAULT}
-. else
-_bdb_ARGS:= 5+
-. endif
. endif
-# Compatiblity hack:
-# upgrade older plussed versions to 5+
-_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+
-. for i in ${_bdb_ARGS}
-. if ${_BDB_OLDPLUSVERS:M${i}}
-_bdb_ARGS:= 5+
-. endif
-. endfor
-
-# 1. detect installed versions
-_INST_BDB_VER=
-. for bdb in ${_DB_PORTS}
-. if exists(${db${bdb}_FIND})
-_INST_BDB_VER+=${bdb}
-. endif
-. endfor
-
-# 2. parse supported versions:
-# 2a. build list from _bdb_ARGS
+# 1. parse supported versions and build list from _bdb_ARGS
_SUPP_BDB_VER=
__bdb_ARGS:=${_bdb_ARGS:C,\+$,,}
. if !empty(_bdb_ARGS:M*+)
@@ -120,46 +82,19 @@
. else
_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,\+$,,}
-_INV_BDB_VER:=
-. for bdb in ${_DB_PORTS}
-. if ${_INV_BDB} <= ${bdb}
-_INV_BDB_VER+=${bdb:C/\.//}
-. endif
-. endfor
-. else
-_INV_BDB_VER:=${INVALID_BDB_VER}
-. endif
-# 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER
-. for unsupp in ${_INV_BDB_VER}
-_SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}}
-. endfor
-
-# 3a. calculate intersection in _INST_BDB_VER to see if there
-# is a usable installed version
-. for i in ${_INST_BDB_VER}
-. if empty(_SUPP_BDB_VER:M${i})
-_INST_BDB_VER:= ${_INST_BDB_VER:N${i}}
-. endif
-. endfor
-_ELIGIBLE_BDB_VER:=${_INST_BDB_VER}
-# 3b. if there is no usable version installed, check defaults
-. if empty(_INST_BDB_VER)
-_DFLT_BDB_VER:=${_DB_DEFAULTS}
+# 2. check defaults
+_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}
-. if empty(_SUPP_BDB_VER:M${i})
+. for i in ${_DFLT_BDB_VER}
+. if empty(_SUPP_BDB_VER:M${i})
_DFLT_BDB_VER:= ${_DFLT_BDB_VER:N${i}}
-. endif
-. endfor
+. endif
+. endfor
_ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER}
-. endif
-# 4. elect a version
+# 3. elect a version
_BDB_VER=
. for i in ${_ELIGIBLE_BDB_VER}
. if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER})
@@ -167,9 +102,9 @@
. endif
. endfor
-# 5. catch errors or set variables
+# 4. catch errors or set variables
. if empty(_BDB_VER)
-IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${_bdb_ARGS}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb
+IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${_bdb_ARGS}. Try: make debug-bdb
. else
. if defined(BDB_BUILD_DEPENDS)
BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
@@ -201,8 +136,6 @@
@${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}"
@${ECHO_CMD} "--PROCESSING------------------------------------------------"
@${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}"
- @${ECHO_CMD} "invalid versions: ${_INV_BDB_VER}"
- @${ECHO_CMD} "installed versions: ${_INST_BDB_VER}"
@${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}"
@${ECHO_CMD} "bdb_ARGS (effective): ${_bdb_ARGS}"
@${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}"
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk
+++ Mk/bsd.default-versions.mk
@@ -34,7 +34,7 @@
# Possible values: 2.4
APACHE_DEFAULT?= 2.4
# Possible values: 5, 18
-BDB_DEFAULT?= 5
+BDB_DEFAULT?= 18
# Possible values: 2, 3
COROSYNC_DEFAULT?= 2
# Possible_values: full canna nox devel_full devel_nox
Index: mail/exim/Makefile
===================================================================
--- mail/exim/Makefile
+++ mail/exim/Makefile
@@ -45,7 +45,7 @@
OPTIONS_SUB= yes
AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-BDB_USES= bdb
+BDB_USES= bdb:5
DMARC_LIB_DEPENDS= libopendmarc.so:mail/opendmarc
EMBEDDED_PERL_USE= perl5=run,build
EXIMON_USES= xorg
@@ -338,7 +338,6 @@
.endif
.if ${PORT_OPTIONS:MBDB}
-INVALID_BDB_VER= 2 3 6 18
DB_LIBS= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
DB_INCLUDES= -I${BDB_INCLUDE_DIR}
.else

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 11:31 AM (6 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31974500
Default Alt Text
D35852.id108334.diff (5 KB)

Event Timeline