From owner-svn-ports-all@freebsd.org Tue Jun 2 13:25:15 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 22A3D33750F; Tue, 2 Jun 2020 13:25:15 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bt7v0Bjjz3b6R; Tue, 2 Jun 2020 13:25:15 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8CC21D818; Tue, 2 Jun 2020 13:25:14 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052DPE2J077909; Tue, 2 Jun 2020 13:25:14 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052DPExm077907; Tue, 2 Jun 2020 13:25:14 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202006021325.052DPExm077907@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Tue, 2 Jun 2020 13:25:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537552 - in head: Mk/Uses databases databases/db48 X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head: Mk/Uses databases databases/db48 X-SVN-Commit-Revision: 537552 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 13:25:15 -0000 Author: mandree Date: Tue Jun 2 13:25:14 2020 New Revision: 537552 URL: https://svnweb.freebsd.org/changeset/ports/537552 Log: databases/db48: Axe. Expired 25 months ago, no users left. Thanks to vd@'s preparation around PR 245220 and r533562, we can now finally axe databases/db48 before 2020Q3 branches. PR: 245220 (related) Deleted: head/databases/db48/ Modified: head/Mk/Uses/bdb.mk head/databases/Makefile Modified: head/Mk/Uses/bdb.mk ============================================================================== --- head/Mk/Uses/bdb.mk Tue Jun 2 13:20:25 2020 (r537551) +++ head/Mk/Uses/bdb.mk Tue Jun 2 13:25:14 2020 (r537552) @@ -59,19 +59,17 @@ BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} _BDB_DEFAULT_save:=${BDB_DEFAULT} -_DB_PORTS= 48 5 6 -_DB_DEFAULTS= 48 5 # does not include 6 due to different licensing +_DB_PORTS= 5 6 +_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 . endif # Dependency lines for different db versions -db48_DEPENDS= libdb-4.8.so:databases/db48 db5_DEPENDS= libdb-5.3.so:databases/db5 db6_DEPENDS= libdb-6.2.so:databases/db6 # Detect db versions by finding some files -db48_FIND= ${LOCALBASE}/include/db48/db.h db5_FIND= ${LOCALBASE}/include/db5/db.h db6_FIND= ${LOCALBASE}/include/db6/db.h @@ -87,16 +85,16 @@ BDB_DEFAULT= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VE . if ${BDB_DEFAULT} != 1 _bdb_ARGS= ${BDB_DEFAULT} . else -_bdb_ARGS:= 48+ +_bdb_ARGS:= 5+ . endif . endif # Compatiblity hack: -# upgrade older plussed versions to 48+ -_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ +# 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:= 48+ +_bdb_ARGS:= 5+ . endif .endfor @@ -177,11 +175,7 @@ BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_ . else LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS} . endif -. if ${_BDB_VER} == 48 -BDB_LIB_NAME= db-4.8 -BDB_LIB_CXX_NAME= db_cxx-4.8 -BDB_LIB_DIR= ${LOCALBASE}/lib/db48 -. elif ${_BDB_VER} == 5 +. if ${_BDB_VER} == 5 BDB_LIB_NAME= db-5.3 BDB_LIB_CXX_NAME= db_cxx-5.3 BDB_LIB_DIR= ${LOCALBASE}/lib/db5 Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Tue Jun 2 13:20:25 2020 (r537551) +++ head/databases/Makefile Tue Jun 2 13:25:14 2020 (r537552) @@ -51,7 +51,6 @@ SUBDIR += dalmp SUBDIR += datamodeler SUBDIR += db - SUBDIR += db48 SUBDIR += db5 SUBDIR += db6 SUBDIR += dbf