Date: Thu, 3 Dec 2020 20:41:49 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556922 - in head: Mk/Uses sysutils/nss_ndb Message-ID: <202012032041.0B3KfnnF043682@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Thu Dec 3 20:41:49 2020 New Revision: 556922 URL: https://svnweb.freebsd.org/changeset/ports/556922 Log: Unregister expired databases/db6 and remove it as an option. Modified: head/Mk/Uses/bdb.mk head/sysutils/nss_ndb/Makefile Modified: head/Mk/Uses/bdb.mk ============================================================================== --- head/Mk/Uses/bdb.mk Thu Dec 3 20:36:25 2020 (r556921) +++ head/Mk/Uses/bdb.mk Thu Dec 3 20:41:49 2020 (r556922) @@ -59,24 +59,21 @@ BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} _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 +_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+= 6 18 +_DB_DEFAULTS+= 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 @@ -185,10 +182,6 @@ LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS} BDB_LIB_NAME= db-5.3 BDB_LIB_CXX_NAME= db_cxx-5.3 BDB_LIB_DIR= ${LOCALBASE}/lib/db5 -. elif ${_BDB_VER} == 6 -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 Modified: head/sysutils/nss_ndb/Makefile ============================================================================== --- head/sysutils/nss_ndb/Makefile Thu Dec 3 20:36:25 2020 (r556921) +++ head/sysutils/nss_ndb/Makefile Thu Dec 3 20:41:49 2020 (r556922) @@ -27,17 +27,11 @@ WRKGRP_DESC= Enable workgroup stripping WRKGRP_CONFIGURE_ON= --with-workgroup OPTIONS_SINGLE= BDB -OPTIONS_SINGLE_BDB= DB0 DB6 DB5 DB4 +OPTIONS_SINGLE_BDB= DB0 DB5 DB4 OPTIONS_DEFAULT= DB0 DB0_DESC= Use old libc version of Berkeley DB DB0_CONFIGURE_ON= --without-db - -DB6_DESC= Build with Berkeley DB v6 library -DB6_USES+= localbase -DB6_USE_LDCONFIG+= yes -DB6_LIB_DEPENDS= libdb-6.so:databases/db6 -DB6_CONFIGURE_ON= --with-db=6 DB5_DESC= Build with Berkeley DB v5 library DB5_USES+= localbase
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012032041.0B3KfnnF043682>