From 44b2f63e7c89ccf8654ca42ea89024ed22a1f3d4 Mon Sep 17 00:00:00 2001 From: epg Date: Thu, 25 Jan 2007 07:35:30 +0000 Subject: Allow subversion to be built with either apr0 or apr & apr-util. devel/apr0/buildlink3.mk: Add apr<1.0 to BUILDLINK_API_DEPENDS.apr . devel/subversion/Makefile.common: Drop --with-apr and --with-apr-util from CONFIGURE_ARGS; these have not been needed since the buildlink framework started ensuring the PATH is correct. Drop --with-ssl from CONFIGURE_ARGS; this has not been necessary since this stopped using the built-in neon. Include new options.mk . devel/subversion-base/Makefile: devel/subversion-base/buildlink3.mk: Use devel/apr0 or devel/apr & devel/apr-util if PKG_OPTIONS.subversion has the apr1 option. devel/subversion-base/options.mk: Provide apache22 and apr1 options; currently these must be set together, so enforce that. www/ap2-subversion/Makefile: Use apache22 if PKG_OPTIONS.subversion has the apache22 option, else use apache2. --- www/ap2-subversion/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'www/ap2-subversion') diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile index 2f18ad10051..31dcc4025f2 100644 --- a/www/ap2-subversion/Makefile +++ b/www/ap2-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/12/08 23:34:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.26 2007/01/25 07:35:30 epg Exp $ PKGNAME= ap2-subversion-${SVNVER} COMMENT= WebDAV server (Apache module) for Subversion @@ -9,17 +9,21 @@ CONFIGURE_ARGS+= --with-apxs=${APXS:Q} CONFIGURE_ARGS+= --disable-mod-activation APACHE_MODULE= YES -PKG_APACHE_ACCEPTED= apache2 apache22 BUILD_TARGET= apache-mod INSTALL_TARGET= install-mods-shared -BUILDLINK_API_DEPENDS.apache?= apache>=2.0.48 - post-patch: ${RM} ${WRKSRC}/build-outputs.mk ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk +.if !empty(PKG_OPTIONS:Mapache22) +BUILDLINK_API_DEPENDS.apache?= apache>=2.0.48 +PKG_APACHE_ACCEPTED= apache22 +.else +PKG_APACHE_ACCEPTED= apache2 +.endif + .include "../../devel/subversion-base/buildlink3.mk" .include "../../mk/apache.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3