[Midnightbsd-cvs] mports [17788] trunk/Mk/extensions/bdb.mk: bdb 4.8 is now default

[laffer1 at midnightbsd.org]

Revision: 17788
          http://svnweb.midnightbsd.org/mports/?rev=17788
Author:   laffer1
Date:     2014-10-30 19:54:47 -0400 (Thu, 30 Oct 2014)
Log Message:
-----------
bdb 4.8 is now default

Modified Paths:
--------------
    trunk/Mk/extensions/bdb.mk

Modified: trunk/Mk/extensions/bdb.mk
===================================================================
--- trunk/Mk/extensions/bdb.mk	2014-10-30 23:50:25 UTC (rev 17787)
+++ trunk/Mk/extensions/bdb.mk	2014-10-30 23:54:47 UTC (rev 17788)
@@ -41,36 +41,15 @@
 # BDB_VER		- Detected Berkeley DB version.
 
 
-_DB_PORTS=	40 41 42 43 44 46 47 48 5 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+ 5+
+_DB_PORTS=	48 5 48+ 5+
 # Dependence lines for different db versions
-db40_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
-db41_DEPENDS=	db41.1:${PORTSDIR}/databases/db41
-db42_DEPENDS=	db-4.2.2:${PORTSDIR}/databases/db42
-db43_DEPENDS=	db-4.3.0:${PORTSDIR}/databases/db43
-db44_DEPENDS=	db-4.4.0:${PORTSDIR}/databases/db44
-db46_DEPENDS=	db-4.6.0:${PORTSDIR}/databases/db46
-db47_DEPENDS=	db-4.7.0:${PORTSDIR}/databases/db47
 db48_DEPENDS=	db-4.8.0:${PORTSDIR}/databases/db48
 db5_DEPENDS=	db-5.3:${PORTSDIR}/databases/db5
 # Detect db versions by finding some files
-db40_FIND=	${LOCALBASE}/include/db4/db.h
-db41_FIND=	${LOCALBASE}/include/db41/db.h
-db42_FIND=	${LOCALBASE}/include/db42/db.h
-db43_FIND=	${LOCALBASE}/include/db43/db.h
-db44_FIND=	${LOCALBASE}/include/db44/db.h
-db46_FIND=	${LOCALBASE}/include/db46/db.h
-db47_FIND=	${LOCALBASE}/include/db47/db.h
 db48_FIND=	${LOCALBASE}/include/db48/db.h
 db5_FIND=	${LOCALBASE}/include/db5/db.h
 
 # For specifying [3, 40, 41, ..]+
-_DB_40P=	40 ${_DB_41P}
-_DB_41P=	41 ${_DB_42P}
-_DB_42P=	42 ${_DB_43P}
-_DB_43P=	43 ${_DB_44P}
-_DB_44P=	44 ${_DB_45P}
-_DB_46P=	46 ${_DB_47P}
-_DB_47P=	47 ${_DB_48P}
 _DB_48P=	48 ${_DB_5P}
 _DB_5P=		5
 
@@ -82,7 +61,7 @@
 
 .if defined(WITH_BDB_VER)
 . if ${WITH_BDB_VER} == 4
-USE_BDB=	40
+USE_BDB=	48
 . elif ${WITH_BDB_VER} != 1
 USE_BDB=	${WITH_BDB_VER}
 . endif
@@ -89,9 +68,9 @@
 .endif
 _WANT_BDB_VER=	${USE_BDB}
 
-# Assume the default bdb version as 41
+# Assume the default bdb version as 48
 .if ${USE_BDB:tl} == "yes"
-_WANT_BDB_VER=	41+
+_WANT_BDB_VER=	48+
 .endif
 
 # Detect bdb version
@@ -180,31 +159,7 @@
 .else
 LIB_DEPENDS+=	${db${_BDB_VER}_DEPENDS}
 .endif
-.  if ${_BDB_VER} == 40
-BDB_LIB_NAME=		db4
-BDB_LIB_CXX_NAME=	db4_cxx
-BDB_INCLUDE_DIR=	${LOCALBASE}/include/db4
-.  elif ${_BDB_VER} == 42
-BDB_LIB_NAME=		db-4.2
-BDB_LIB_CXX_NAME=	db_cxx-4.2
-BDB_LIB_DIR=		${LOCALBASE}/lib/db42
-.  elif ${_BDB_VER} == 43
-BDB_LIB_NAME=		db-4.3
-BDB_LIB_CXX_NAME=	db_cxx-4.3
-BDB_LIB_DIR=		${LOCALBASE}/lib/db43
-.  elif ${_BDB_VER} == 44
-BDB_LIB_NAME=		db-4.4
-BDB_LIB_CXX_NAME=	db_cxx-4.4
-BDB_LIB_DIR=		${LOCALBASE}/lib/db44
-.  elif ${_BDB_VER} == 46
-BDB_LIB_NAME=		db-4.6
-BDB_LIB_CXX_NAME=	db_cxx-4.6
-BDB_LIB_DIR=		${LOCALBASE}/lib/db46
-.  elif ${_BDB_VER} == 47
-BDB_LIB_NAME=		db-4.7
-BDB_LIB_CXX_NAME=	db_cxx-4.7
-BDB_LIB_DIR=		${LOCALBASE}/lib/db47
-.  elif ${_BDB_VER} == 48
+.  if ${_BDB_VER} == 48
 BDB_LIB_NAME=		db-4.8
 BDB_LIB_CXX_NAME=	db_cxx-4.8
 BDB_LIB_DIR=		${LOCALBASE}/lib/db48