From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 12 15:40:16 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01E0E106578C for ; Fri, 12 Nov 2010 15:40:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B77C88FC1B for ; Fri, 12 Nov 2010 15:40:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oACFeFu0060222 for ; Fri, 12 Nov 2010 15:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oACFeFZW060221; Fri, 12 Nov 2010 15:40:15 GMT (envelope-from gnats) Resent-Date: Fri, 12 Nov 2010 15:40:15 GMT Resent-Message-Id: <201011121540.oACFeFZW060221@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Matuska Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B18B1065694; Fri, 12 Nov 2010 15:39:38 +0000 (UTC) (envelope-from mm@mail2.vx.sk) Received: from mail2.vx.sk (mail2.vx.sk [IPv6:2a01:4f8:100:84a3::3]) by mx1.freebsd.org (Postfix) with ESMTP id 5A5D88FC12; Fri, 12 Nov 2010 15:39:37 +0000 (UTC) Received: from neo.vx.sk (localhost [127.0.0.1]) by mail2.vx.sk (Postfix) with ESMTP id ED0384268B; Fri, 12 Nov 2010 16:39:35 +0100 (CET) Received: from mail2.vx.sk ([127.0.0.1]) by neo.vx.sk (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id v71wD+H0v79Y; Fri, 12 Nov 2010 16:39:18 +0100 (CET) Received: by mail2.vx.sk (Postfix, from userid 1001) id 7B40642681; Fri, 12 Nov 2010 16:39:18 +0100 (CET) Message-Id: <20101112153918.7B40642681@mail2.vx.sk> Date: Fri, 12 Nov 2010 16:39:18 +0100 (CET) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: lev@FreeBSD.org Subject: ports/152172: [PATCH] devel/subversion: enable BDB5 support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2010 15:40:16 -0000 >Number: 152172 >Category: ports >Synopsis: [PATCH] devel/subversion: enable BDB5 support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 12 15:40:15 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.1-STABLE amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.1-STABLE FreeBSD 8.1-STABLE #0 r215048M: Thu Nov 11 13:36:47 CET >Description: Enable support for Berkeley DB version 5. Works very well. Port maintainer (lev@freebsd.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- subversion-1.6.13.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/subversion/Makefile,v retrieving revision 1.134 diff -u -r1.134 Makefile --- Makefile 3 Jun 2010 02:49:22 -0000 1.134 +++ Makefile 12 Nov 2010 15:36:24 -0000 @@ -22,7 +22,7 @@ NEON "WebDAV/Delta-V repo access module (neon)" on \ SERF "WebDAV/Delta-V repo access module (serf)" off \ SASL "SASL2 authorization support" off \ - BDB "db4 repository backend" on \ + BDB "Berkeley DB (4 or 5) repository backend" on \ ASVN "Build and install Archive SVN (asvn)" off \ MAINTAINER_DEBUG "Build debug version" off \ SVNSERVE_WRAPPER "Enable svnserve wrapper" off \ @@ -85,9 +85,9 @@ .endif @${ECHO_MSG} "" .if defined(WITH_BDB) - @${ECHO_MSG} "db4 repository backend enabled." + @${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled." .else - @${ECHO_MSG} "db4 repository backend disabled." + @${ECHO_MSG} "Berkeley DB (4 or 5) repository backend disabled." .endif @${ECHO_MSG} "" .if defined(WITH_MAINTAINER_DEBUG) @@ -159,13 +159,14 @@ pre-configure: .if !defined(WITHOUT_BDB) - @if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \ + @BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \ + if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" ] ; then \ ${ECHO_MSG} "" ; \ - ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ + ${ECHO_MSG} 'You should build `'"${APR_PORT}' with Berkeley DB (4 or 5) support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \ - ${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \ + ${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \ + ${ECHO_MSG} "To disable Berkeley DB support, define WITHOUT_BDB." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi Index: files/patch-configure =================================================================== RCS file: /home/pcvs/ports/devel/subversion/files/patch-configure,v retrieving revision 1.17 diff -u -r1.17 patch-configure --- files/patch-configure 25 Aug 2009 11:53:27 -0000 1.17 +++ files/patch-configure 12 Nov 2010 15:36:24 -0000 @@ -1,6 +1,35 @@ ---- configure.orig 2009-07-09 17:23:21.000000000 +0400 -+++ configure 2009-07-09 17:25:20.000000000 +0400 -@@ -27683,7 +27683,10 @@ +--- configure.orig 2010-09-29 21:26:31.000000000 +0200 ++++ configure 2010-11-12 16:28:13.838332326 +0100 +@@ -21458,8 +21458,8 @@ + fi + + if test "$withval" = "yes"; then +- if test "$apu_db_version" != "4"; then +- as_fn_error "APR-UTIL wasn't linked against Berkeley DB 4, ++ if test "$apu_db_version" != "4" -a "$apu_db_version" != "5"; then ++ as_fn_error "APR-UTIL wasn't linked against Berkeley DB 4 or 5, + while the fs component is required. Reinstall + APR-UTIL with the appropiate options." "$LINENO" 5 + fi +@@ -21467,7 +21467,7 @@ + status=required + + elif test "$apu_found" != "reconfig"; then +- if test "$apu_db_version" != 4; then ++ if test "$apu_db_version" != 4 -a "$apu_db_version" != 5; then + as_fn_error "APR-UTIL was installed independently, it won't be + possible to use the specified Berkeley DB: $withval" "$LINENO" 5 + fi +@@ -21513,7 +21513,7 @@ + whether apr-util is linked against Berkeley DB + $db_version" >&2;} + status=try-link +- elif test "$apu_db_version" != "4"; then ++ elif test "$apu_db_version" != "4" -a "$apu_db_version" != "5"; then + status=skip + else + status=try-link +@@ -23801,7 +23801,10 @@ if test "$RUBY" != "none"; then @@ -11,4 +40,4 @@ + if "$RUBY" -r mkmf -e 'with_ldflags("'"$PTHREAD_LIBS"'") { exit(have_func("rb_hash_foreach") ? 0 : 1) }'; then # Extract the first word of "rdoc", so it can be a program name with args. set dummy rdoc; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --- subversion-1.6.13.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: