Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Jun 2020 13:25:14 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
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
Message-ID:  <202006021325.052DPExm077907@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006021325.052DPExm077907>