diff options
| author | epg <epg@pkgsrc.org> | 2007-01-25 07:35:30 +0000 |
|---|---|---|
| committer | epg <epg@pkgsrc.org> | 2007-01-25 07:35:30 +0000 |
| commit | b8ebd68d2f2ab0c06c867715b3b3e30a65e70ff4 (patch) | |
| tree | d4b711ff4b7089a266f6ccc714701a48c5e1c52c /www | |
| parent | b8fe72b48b485d1b4e2c5b62518d0d4c974d88b3 (diff) | |
| download | pkgsrc-b8ebd68d2f2ab0c06c867715b3b3e30a65e70ff4.tar.gz | |
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.
Diffstat (limited to 'www')
| -rw-r--r-- | www/ap2-subversion/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
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" |