Date: Thu, 25 May 2006 17:09:41 -0400 (EDT) From: Paul Dlug <paul@aps.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lev@FreeBSD.org Subject: ports/97932: [PATCH] devel/subversion: Fix installation of mod_dav_svn with apache > 2.0 Message-ID: <200605252109.k4PL9fgO032291@lugnut.aps.org> Resent-Message-ID: <200605252110.k4PLAFKT080211@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97932
>Category: ports
>Synopsis: [PATCH] devel/subversion: Fix installation of mod_dav_svn with apache > 2.0
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 25 21:10:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Paul Dlug
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD lugnut.aps.org 6.1-STABLE FreeBSD 6.1-STABLE #1: Wed May 17 12:03:59 EDT 2006
>Description:
If you build subversion with WITH_MOD_DAV_SVN and you are running apache22 instead of apache2 the module silently fails to install. This is because the module install path is hardcoded to PREFIX/libexec/apache2. The right fix for this is to query APXS to determin the module directory. The patch included does exactly that (see other ports that do this such as www/p5-Apache-DBI for example), it falls back to the hardcoded PREFIX/libexec/apache2 if no build could be detected. Tested under 6.1 STABLE with apache-2.2.2 installed.
P.S. There are a bunch of portlint errors you might want to look into.
Port maintainer (lev@freebsd.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/subversion/Makefile ~/Makefile
--- /usr/ports/devel/subversion/Makefile Thu May 25 07:17:16 2006
+++ /usr/home/paul/Makefile Thu May 25 17:02:57 2006
@@ -369,8 +369,13 @@
.endif
.if defined(WITH_MOD_DAV_SVN)
+.if exists(${APXS})
+APACHE_MODULE_DIR!=${APXS} -q LIBEXECDIR
+.else
+APACHE_MODULE_DIR?=${PREFIX}/libexec/apache2
+.endif
pre-install:
- ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav libexec/apache2/mod_dav.so
+ ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav ${APACHE_MODULE_DIR}/mod_dav.so
.endif
post-install: ${MKREPOS_TARGET}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605252109.k4PL9fgO032291>