Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Mar 2015 21:17:41 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r382869 - head/www/mod_dav_svn
Message-ID:  <201503312117.t2VLHfbp017516@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ohauer
Date: Tue Mar 31 21:17:40 2015
New Revision: 382869
URL: https://svnweb.freebsd.org/changeset/ports/382869
QAT: https://qat.redports.org/buildarchive/r382869/

Log:
  - use dedicated apache module file for subversion modules
  
  Approved by:	lev@ (implicit)

Modified:
  head/www/mod_dav_svn/Makefile
  head/www/mod_dav_svn/pkg-plist

Modified: head/www/mod_dav_svn/Makefile
==============================================================================
--- head/www/mod_dav_svn/Makefile	Tue Mar 31 21:16:18 2015	(r382868)
+++ head/www/mod_dav_svn/Makefile	Tue Mar 31 21:17:40 2015	(r382869)
@@ -22,12 +22,15 @@ CONFIGURE_ARGS+=	--with-apxs=${APXS} \
 			--with-apache-libexecdir \
 			--without-gnome-keyring \
 			--without-kwallet
-
-SUB_FILES=	pkg-install
+SUB_FILES+=	220_subversion.conf.sample
 
 PLIST_SUB+=	SED=${SED}
 
 ALL_TARGET=	apache-mod
 INSTALL_TARGET=	install-mods-shared
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
+	${CP} ${WRKDIR}/220_subversion.conf.sample ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
+
 .include <bsd.port.post.mk>

Modified: head/www/mod_dav_svn/pkg-plist
==============================================================================
--- head/www/mod_dav_svn/pkg-plist	Tue Mar 31 21:16:18 2015	(r382868)
+++ head/www/mod_dav_svn/pkg-plist	Tue Mar 31 21:17:40 2015	(r382869)
@@ -1,10 +1,4 @@
-@comment enable / disable modules in this order: dav_svn, authz_svn, dontdothat
-@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf
+@sample %%APACHEETCDIR%%/modules.d/220_subversion.conf.sample
 %%APACHEMODDIR%%/mod_dav_svn.so
-@exec %D/sbin/apxs -e -a -n dav_svn %D/%F
-@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+authz_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%APACHEMODDIR%%/mod_authz_svn.so
-@exec %D/sbin/apxs -e -a -n authz_svn %D/%F
-@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%APACHEMODDIR%%/mod_dontdothat.so
-@exec %D/sbin/apxs -e -A -n dontdothat %D/%F



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503312117.t2VLHfbp017516>