Date: Wed, 2 Nov 2005 22:36:10 GMT From: Jon Spencer <jon@jackson-spencer.ca> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/88410: devel/subversion port incorrect plist in some cases. Message-ID: <200511022236.jA2MaAmf088761@www.freebsd.org> Resent-Message-ID: <200511022240.jA2MeDpD087064@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88410
>Category: ports
>Synopsis: devel/subversion port incorrect plist in some cases.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 02 22:40:13 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jon Spencer
>Release: 6-STABLE
>Organization:
>Environment:
FreeBSD zaphod.homenetwork 6.0-STABLE FreeBSD 6.0-STABLE #2: Wed Nov 2 10:12:31 PST 2005 root@zaphod.homenetwork:/usr/obj/usr/src/sys/ZAPHOD i386
>Description:
If you build the devel/subversion port with WITH_MOD_DAV_SVN=yes
and APACHE2_PORT=www/apache21 then the pkg-plist is incorrectly
specified. The plist contains libexec/apache2/mod_dav_svn.so, but
this file will be installed as libexec/apache21/mod_dav_svn.so.
I've included a patch I believe rectifies the problem.
>How-To-Repeat:
cd /usr/ports/devel/subversion
make WITH_MOD_DAV_SVN=yes APACHE2_PORT=www/apache21 package
>Fix:
diff -ru ../subversion-old/Makefile ./Makefile
--- ../subversion-old/Makefile Wed Nov 2 14:11:45 2005
+++ ./Makefile Wed Nov 2 14:16:36 2005
@@ -159,10 +159,12 @@
BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT}
.if ${APACHE2_PORT} == "www/apache21"
+PLIST_SUB+= APACHEDIR="apache21"
APR_APU_DIR= ${LOCALBASE}/bin
APR_CONFIG= apr-1-config
APU_CONFIG= apu-1-config
.else
+PLIST_SUB+= APACHEDIR="apache2"
APR_APU_DIR= ${LOCALBASE}/lib/apache2
APR_CONFIG= apr-config
APU_CONFIG= apu-config
diff -ru ../subversion-old/pkg-plist ./pkg-plist
--- ../subversion-old/pkg-plist Wed Nov 2 14:11:45 2005
+++ ./pkg-plist Wed Nov 2 14:14:29 2005
@@ -173,10 +173,10 @@
%%DATADIR%%/test-scripts/svntest/svntest.sh
%%DATADIR%%/xslt/svnindex.css
%%DATADIR%%/xslt/svnindex.xsl
-%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
-%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
-%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
-%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
+%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_dav_svn.so
+%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_authz_svn.so
+%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so
+%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so
%%WITH_JAVA%%lib/libsvnjavahl-1.a
%%WITH_JAVA%%lib/libsvnjavahl-1.so
%%WITH_JAVA%%lib/libsvnjavahl-1.so.0
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511022236.jA2MaAmf088761>