summaryrefslogtreecommitdiff
path: root/www/ap2-subversion
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2011-12-06 01:47:06 +0000
committerobache <obache@pkgsrc.org>2011-12-06 01:47:06 +0000
commita6565c32aaae31cc19e8fc3897d0c7820c14071c (patch)
treef9258ad9204088189ab28c71b8cae02301bd0460 /www/ap2-subversion
parent30a1cd50bb4911f1ee800d16ffa3a821669c0b87 (diff)
downloadpkgsrc-a6565c32aaae31cc19e8fc3897d0c7820c14071c.tar.gz
revive apache2 support.
Diffstat (limited to 'www/ap2-subversion')
-rw-r--r--www/ap2-subversion/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 3cb938e30d9..e93da5316a3 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2011/12/05 13:28:34 dholland Exp $
+# $NetBSD: Makefile,v 1.49 2011/12/06 01:47:06 obache Exp $
PKGNAME= ${APACHE_PKG_PREFIX}-subversion-${SVNVER}
PKGREVISION= 3
COMMENT= WebDAV server (Apache module) for Subversion
PKG_DESTDIR_SUPPORT= user-destdir
-
.include "../../devel/subversion/Makefile.common"
CONFIGURE_ARGS+= --with-apxs=${APXS:Q}
@@ -20,8 +19,11 @@ post-patch:
${RM} ${WRKSRC}/build-outputs.mk
${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk
-PKG_APACHE_ACCEPTED= apache22
+PKG_APACHE_ACCEPTED= apache2 apache22
.include "../../devel/subversion-base/buildlink3.mk"
.include "../../mk/apache.mk"
+.if ${PKG_APACHE} == "apache2" && !empty(PKG_BUILD_OPTIONS.subversion-base:Mapr1)
+PKG_FAIL_REASON= "subversion-base package must be built without apr1 option."
+.endif
.include "../../mk/bsd.pkg.mk"