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 /devel/apr0 | |
| 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 'devel/apr0')
| -rw-r--r-- | devel/apr0/buildlink3.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/apr0/buildlink3.mk b/devel/apr0/buildlink3.mk index 6b11705aac4..9dbc7c8a2b5 100644 --- a/devel/apr0/buildlink3.mk +++ b/devel/apr0/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/01/24 19:31:24 epg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2007/01/25 07:35:30 epg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= apr BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr .if !empty(APR_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5.2.0.51nb1 +BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5.2.0.51nb1 apr<1.0 BUILDLINK_ABI_DEPENDS.apr+= apr>=0.9.7.2.0.55nb2 BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr0 |