cvs commit: ports/Mk bsd.database.mk

[Steven Kreuzer]

On Nov 30, 2009, at 10:51 AM, Hajimu UMEMOTO wrote:

> Hi,
> 
>>>>>> On Mon, 30 Nov 2009 14:33:56 +0000 (UTC)
>>>>>> Steven Kreuzer <skreuzer at FreeBSD.org> said:
> 
> skreuzer> skreuzer    2009-11-30 14:33:56 UTC
> 
> skreuzer>   FreeBSD ports repository
> 
> skreuzer>   Modified files:
> skreuzer>     Mk                   bsd.database.mk 
> skreuzer>   Log:
> skreuzer>   Add support for Berkeley DB 4.8
> 
> It seems the change is incomplete.  I need following change to make it
> work.

Nice Catch. I completely forgot to update that section.

Thanks for the heads up.

> 
> Index: Mk/bsd.database.mk
> diff -u Mk/bsd.database.mk.orig Mk/bsd.database.mk
> --- Mk/bsd.database.mk.orig	2009-11-30 23:59:50.000000000 +0900
> +++ Mk/bsd.database.mk	2009-12-01 00:46:47.058006580 +0900
> @@ -225,7 +225,7 @@
> 
> .if defined(USE_BDB)
> 
> -_DB_PORTS=	2 3 40 41 42 43 44 45 46 47 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+
> +_DB_PORTS=	2 3 40 41 42 43 44 45 46 47 48 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+
> # Dependence lines for different db versions
> db2_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
> db3_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
> @@ -396,6 +396,10 @@
> BDB_LIB_NAME=		db-4.7
> BDB_LIB_CXX_NAME=	db_cxx-4.7
> BDB_LIB_DIR=		${LOCALBASE}/lib/db47
> +.  elif ${_BDB_VER} == 48
> +BDB_LIB_NAME=		db-4.8
> +BDB_LIB_CXX_NAME=	db_cxx-4.8
> +BDB_LIB_DIR=		${LOCALBASE}/lib/db48
> .  endif
> BDB_LIB_NAME?=		db${_BDB_VER}
> BDB_LIB_CXX_NAME?=	db${_BDB_VER}_cxx
> 
> 
> Sincerely,
> 
> --
> Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
> ume at mahoroba.org  ume@{,jp.}FreeBSD.org
> http://www.imasy.org/~ume/

--
Steven Kreuzer
http://www.exit2shell.com/~skreuzer