From owner-freebsd-apache@FreeBSD.ORG Thu May 20 22:53:44 2010 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 C2F03106567C; Thu, 20 May 2010 22:53:44 +0000 (UTC) (envelope-from pgollucci@frieza.p6m7g8.net) Received: from frieza.p6m7g8.net (wsip-174-79-184-239.dc.dc.cox.net [174.79.184.239]) by mx1.freebsd.org (Postfix) with ESMTP id 8C7438FC0A; Thu, 20 May 2010 22:53:43 +0000 (UTC) Received: from frieza.p6m7g8.net (localhost [127.0.0.1]) by frieza.p6m7g8.net (8.14.4/8.14.4) with ESMTP id o4KMrhWU022083; Thu, 20 May 2010 18:53:43 -0400 (EDT) (envelope-from pgollucci@frieza.p6m7g8.net) Received: (from pgollucci@localhost) by frieza.p6m7g8.net (8.14.4/8.14.4/Submit) id o4KMrhsX022082; Thu, 20 May 2010 18:53:43 -0400 (EDT) (envelope-from pgollucci) Date: Thu, 20 May 2010 18:53:43 -0400 (EDT) Message-Id: <201005202253.o4KMrhsX022082@frieza.p6m7g8.net> To: FreeBSD-gnats-submit@freebsd.org From: "Philip M. Gollucci" X-send-pr-version: 3.113 X-GNATS-Notify: Cc: lev@freebsd.org, apache@freebsd.org Subject: [PATCH] devel/subversion: catch up with deve/apr* and www/apache2* changes 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: Thu, 20 May 2010 22:53:44 -0000 >Submitter-Id: current-users >Originator: Philip M. Gollucci >Organization: >Confidential: no >Synopsis: [PATCH] devel/subversion: catch up with deve/apr* and www/apache2* changes >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 9.0-CURRENT amd64 >Environment: System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Apr 26 16:20:00 EDT 2010 >Description: Port maintainer (lev@freebsd.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- subversion-1.6.11_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/subversion/Makefile,v retrieving revision 1.132 diff -u -u -r1.132 Makefile --- Makefile 18 May 2010 04:05:02 -0000 1.132 +++ Makefile 20 May 2010 22:30:32 -0000 @@ -18,7 +18,6 @@ TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \ - APACHE2_APR "Use APR from Apache 2.X" off \ MOD_DONTDOTHAT "mod_dontdothat for Apache 2.X" off \ NEON "WebDAV/Delta-V repo access module (neon)" on \ SERF "WebDAV/Delta-V repo access module (serf)" off \ @@ -102,19 +101,10 @@ @${FALSE} .endif @${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled." - @${ECHO_MSG} "This option implies the WITH_APACHE2_APR option." .else @${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X" .endif @${ECHO_MSG} "" -.if defined(WITH_APACHE2_APR) - @${ECHO_MSG} "Using APR from ${APACHE_PORT}. If you have the devel/apr1" - @${ECHO_MSG} "port/package installed, you may need to remove it." -.else - @${ECHO_MSG} "You can link subversion against the APR built with" - @${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr1 port." -.endif - @${ECHO_MSG} "" .if defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_DAV_SVN) @${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled." .else @@ -167,13 +157,6 @@ @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: - @if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} 'You selected to use`'"${APR_PORT}' for apr library." ; \ - ${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ - fi .if !defined(WITHOUT_BDB) @if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \ ${ECHO_MSG} "" ; \ Index: Makefile.common =================================================================== RCS file: /home/ncvs/ports/devel/subversion/Makefile.common,v retrieving revision 1.32 diff -u -u -r1.32 Makefile.common --- Makefile.common 18 May 2010 04:20:37 -0000 1.32 +++ Makefile.common 20 May 2010 22:48:36 -0000 @@ -6,7 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.6.11 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= devel MASTER_SITES= http://subversion.tigris.org/downloads/:main \ http://svnbook.red-bean.com/en/1.5/:book @@ -67,7 +67,7 @@ .endif .if defined(WITH_MOD_DAV_SVN) -WITH_APACHE2_APR= yes +WITH_APACHE= yes CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DAV_SVN="" SUB_LIST+= MOD_DAV_SVN_INSTALL="YES" @@ -86,34 +86,28 @@ SVNUSER?= svn .endif -.if defined(WITH_APACHE2_APR) -USE_APACHE= 2.0+ +.if defined(WITH_APACHE) +USE_APACHE= 2.0+ .include "${PORTSDIR}/Mk/bsd.apache.mk" -.if ${APACHE_VERSION} >= 21 -APR_APU_DIR= ${LOCALBASE}/bin -APR_CONFIG= apr-1-config -APU_CONFIG= apu-1-config -.else -APR_APU_DIR= ${LOCALBASE}/lib/apache2 -APR_CONFIG= apr-config -APU_CONFIG= apu-config -.endif -APR_PORT= ${APACHE_PORT} -.else -APR_PORT= devel/apr1 -LIB_DEPENDS+= apr-1:${PORTSDIR}/${APR_PORT} -APR_APU_DIR= ${LOCALBASE}/bin -APR_CONFIG= apr-1-config -APU_CONFIG= apu-1-config +.if ${APACHE_VERSION} > 20 +LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 +APR_CONFIG= ${LOCALBASE}/bin/apr-1-config +APU_CONFIG= ${LOCALBASE}/bin/apu-1-config +.else +LIB_DEPENDS+= apr-0:${PORTSDIR}/devel/apr0 +APR_CONFIG= ${LOCALBASE}/bin/apr-config +APU_CONFIG= ${LOCALBASE}/bin/apu-config +.endif +.else +LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 +APR_CONFIG= ${LOCALBASE}/bin/apr-1-config +APU_CONFIG= ${LOCALBASE}/bin/apu-1-config .endif -CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \ - --with-apr-util=${APR_APU_DIR}/${APU_CONFIG} +CONFIGURE_ARGS+= --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG} .if defined(WITH_SVNAUTHZ_VALIDATE) -.if exists(${APR_APU_DIR}/${APR_CONFIG}) -APR_INCLUDE_DIR!= ${APR_APU_DIR}/${APR_CONFIG} --includedir -.endif +APR_INCLUDE_DIR!= ${APR_CONFIG} --includedir PLIST_SUB+= SVNAUTHZ_VALIDATE="" .else PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment " --- subversion-1.6.11_2.patch ends here ---