From owner-cvs-ports@FreeBSD.ORG Mon Nov 30 15:51:54 2009 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F3FE106566C; Mon, 30 Nov 2009 15:51:54 +0000 (UTC) (envelope-from ume@mahoroba.org) Received: from asuka.mahoroba.org (ent.mahoroba.org [IPv6:2001:2f0:104:8010::1]) by mx1.freebsd.org (Postfix) with ESMTP id 3EBC08FC18; Mon, 30 Nov 2009 15:51:54 +0000 (UTC) Received: from yuga.mahoroba.org (ume@yuga.mahoroba.org [IPv6:2001:2f0:104:8010:21b:d3ff:fe38:5381]) (user=ume mech=CRAM-MD5 bits=0) by asuka.mahoroba.org (8.14.3/8.14.3) with ESMTP/inet6 id nAUFpeEa049795 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 1 Dec 2009 00:51:44 +0900 (JST) (envelope-from ume@mahoroba.org) Date: Tue, 01 Dec 2009 00:51:39 +0900 Message-ID: From: Hajimu UMEMOTO To: Steven Kreuzer In-Reply-To: <200911301433.nAUEXu0X061881@repoman.freebsd.org> References: <200911301433.nAUEXu0X061881@repoman.freebsd.org> User-Agent: xcite1.58> Wanderlust/2.15.7 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-2022-JP-2?B?R29qGyQoRCtXGyhC?=) APEL/10.7 Emacs/23.1 (i386-portbld-freebsd8.0) MULE/6.0 (HANACHIRUSATO) X-Operating-System: FreeBSD 8.0-STABLE X-PGP-Key: http://www.imasy.or.jp/~ume/publickey.asc X-PGP-Fingerprint: 1F00 0B9E 2164 70FC 6DC5 BF5F 04E9 F086 BF90 71FE Organization: Internet Mutual Aid Society, YOKOHAMA MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.3 (asuka.mahoroba.org [IPv6:2001:2f0:104:8010::1]); Tue, 01 Dec 2009 00:51:44 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 at asuka.mahoroba.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on asuka.mahoroba.org Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/Mk bsd.database.mk X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2009 15:51:54 -0000 Hi, >>>>> On Mon, 30 Nov 2009 14:33:56 +0000 (UTC) >>>>> Steven Kreuzer 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. 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@mahoroba.org ume@{,jp.}FreeBSD.org http://www.imasy.org/~ume/