From owner-freebsd-apache@FreeBSD.ORG Tue Dec 1 08:05:23 2009 Return-Path: Delivered-To: apache@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2542106566B; Tue, 1 Dec 2009 08:05:23 +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 CFD2F8FC0C; Tue, 1 Dec 2009 08:05:22 +0000 (UTC) Received: from ameno.mahoroba.org (IDENT:pi9WSRKYfMgB1g4Vab7G3ddn+fiGYxwzqZmJ5RKO1YXWgbA3ZW7+PCYa7m+rJl2f@ameno.mahoroba.org [IPv6:2001:2f0:104:8010:20a:79ff:fe69:ee6b]) (user=ume mech=CRAM-MD5 bits=0) by asuka.mahoroba.org (8.14.3/8.14.3) with ESMTP/inet6 id nB185EQs009585 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 1 Dec 2009 17:05:18 +0900 (JST) (envelope-from ume@mahoroba.org) Date: Tue, 01 Dec 2009 17:05:13 +0900 Message-ID: From: Hajimu UMEMOTO To: apache@FreeBSD.org User-Agent: Wanderlust/2.14.0 (Africa) 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-RELEASE 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: multipart/mixed; boundary="Multipart_Tue_Dec__1_17:05:13_2009-1" 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 17:05:18 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 at asuka.mahoroba.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 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: Hajimu UMEMOTO Subject: apache22 with db48 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2009 08:05:23 -0000 --Multipart_Tue_Dec__1_17:05:13_2009-1 Content-Type: text/plain; charset=US-ASCII Hi, The db48 is now supported by bsd.databases.mk. However, apache22 fails to build when WITH_BDB=true and WITH_BDB_VER=48. Here is a patch. It seems Apache itself supports db47, the part for db47 support of existing patch-srclib:apr-util:build:dbm.m4 is useless. So, I reused it for db48. Sincerely, --Multipart_Tue_Dec__1_17:05:13_2009-1 Content-Type: application/octet-stream; type=patch Content-Disposition: attachment; filename="apache22-db48.diff" Content-Transfer-Encoding: 7bit Index: files/patch-srclib:apr-util:build:dbm.m4 diff -u files/patch-srclib:apr-util:build:dbm.m4.orig files/patch-srclib:apr-util:build:dbm.m4 --- files/patch-srclib:apr-util:build:dbm.m4.orig 2009-11-02 21:31:13.345485000 +0900 +++ files/patch-srclib:apr-util:build:dbm.m4 2009-12-01 15:02:40.000000000 +0900 @@ -1,5 +1,7 @@ ---- srclib/apr-util/build/dbm.m4.orig 2008-06-25 01:54:26.000000000 +0200 -+++ srclib/apr-util/build/dbm.m4 2008-12-09 22:40:21.000000000 +0100 +Index: srclib/apr-util/build/dbm.m4 +diff -u srclib/apr-util/build/dbm.m4.orig srclib/apr-util/build/dbm.m4 +--- srclib/apr-util/build/dbm.m4.orig 2008-11-21 15:32:58.000000000 +0900 ++++ srclib/apr-util/build/dbm.m4 2009-12-01 15:02:29.374250645 +0900 @@ -315,8 +315,8 @@ fi APU_CHECK_BERKELEY_DB(1, -1, -1, @@ -69,19 +71,19 @@ fi ]) +dnl -+dnl APU_CHECK_DB47: is DB4.7 present? ++dnl APU_CHECK_DB48: is DB4.8 present? +dnl +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version +dnl -+AC_DEFUN([APU_CHECK_DB47], [ ++AC_DEFUN([APU_CHECK_DB48], [ + places=$1 + if test -z "$places"; then -+ places="std /usr/local/BerkeleyDB.4.7 /boot/home/config" ++ places="std /usr/local/BerkeleyDB.4.8 /boot/home/config" + fi -+ APU_CHECK_BERKELEY_DB("4", "7", "-1", ++ APU_CHECK_BERKELEY_DB("4", "8", "-1", + "$places", -+ "db47/db.h db4/db.h db.h", -+ "db-4.7 db4-4.7 db47 db4 db" ++ "db48/db.h db4/db.h db.h", ++ "db-4.8 db4-4.8 db48 db4 db" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=4 @@ -94,8 +96,8 @@ AC_MSG_ERROR(Berkeley db4 not found) fi ;; -+ db47) -+ APU_CHECK_DB47("$check_places") ++ db48) ++ APU_CHECK_DB48("$check_places") + if test "$apu_db_version" != "4"; then + AC_MSG_ERROR(Berkeley db4 not found) + fi @@ -107,7 +109,7 @@ apu_use_db=1 apu_default_dbm=db4 ;; -+ db47) ++ db48) + apu_use_db=1 + apu_default_dbm=db4 + ;; --Multipart_Tue_Dec__1_17:05:13_2009-1 Content-Type: text/plain; charset=US-ASCII -- Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan ume@mahoroba.org ume@{,jp.}FreeBSD.org http://www.imasy.org/~ume/ --Multipart_Tue_Dec__1_17:05:13_2009-1--