From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 27 00:40:20 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D57716AE83 for ; Sat, 27 May 2006 00:40:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8DE343D66 for ; Sat, 27 May 2006 00:40:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4R0eF7N094806 for ; Sat, 27 May 2006 00:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4R0eFLc094805; Sat, 27 May 2006 00:40:15 GMT (envelope-from gnats) Resent-Date: Sat, 27 May 2006 00:40:15 GMT Resent-Message-Id: <200605270040.k4R0eFLc094805@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, Shaun Amott Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3CA016AE20 for ; Sat, 27 May 2006 00:32:00 +0000 (UTC) (envelope-from shaun@inerd.com) Received: from dione.picobyte.net (host-212-158-207-124.bulldogdsl.com [212.158.207.124]) by mx1.FreeBSD.org (Postfix) with SMTP id D38B243D46 for ; Sat, 27 May 2006 00:31:57 +0000 (GMT) (envelope-from shaun@inerd.com) Received: from charon.picobyte.net (charon.picobyte.net [IPv6:2001:4bd0:201e::fe03]) by dione.picobyte.net (Postfix) with ESMTP for ; Sat, 27 May 2006 01:31:54 +0100 (BST) Message-Id: <1148689914.2925@charon.picobyte.net> Date: Sat, 27 May 2006 01:31:54 +0100 From: Shaun Amott To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/97995: [MAINTAINER] www/horde: Fix apache config file to work with apache >= 2.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Shaun Amott List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 May 2006 00:40:21 -0000 >Number: 97995 >Category: ports >Synopsis: [MAINTAINER] www/horde: Fix apache config file to work with apache >= 2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat May 27 00:40:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Shaun Amott >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: >Description: Dick Hoogendijk pointed out that apache's config file format changed in 2.2. The patch below tweaks the config file we install to work as intended on apache 2.2. >How-To-Repeat: >Fix: --- horde.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/horde/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- Makefile 12 May 2006 01:59:55 -0000 1.37 +++ Makefile 27 May 2006 00:28:09 -0000 @@ -271,6 +271,10 @@ .if ${PHP_VER} == 5 @${REINPLACE_CMD} -e "s:mod_php4.c:mod_php5.c:" ${WRKDIR}/httpd-horde.conf .endif +.if ${APACHE_VERSION} >= 22 + @${REINPLACE_CMD} -e "s:IfModule mod_\([^ ]*\)\.c:IfModule \1_module:" \ + ${WRKDIR}/httpd-horde.conf +.endif @${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${WRKSRC}/config/mime_drivers.php.dist .if !defined(WITHOUT_X11) . if !defined(WITHOUT_WV) --- horde.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: