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.

5 files changed, 49 insertions, 14 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
 
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index bbe13c22c94..d05465dba41 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/01/24 19:46:45 epg Exp $
+# $NetBSD: Makefile,v 1.41 2007/01/25 07:35:30 epg Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -8,7 +8,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../devel/subversion/Makefile.common"
 
-BUILD_DEFS+=		PKG_BUILD_OPTIONS.apr
+.if !empty(PKG_OPTIONS:Mapr1)
+APU_OPTIONS=		PKG_BUILD_OPTIONS.apr-util
+.else
+APU_OPTIONS=		PKG_BUILD_OPTIONS.apr
+.endif
+
+BUILD_DEFS+=		${APU_OPTIONS}
 
 USE_TOOLS+=		msgfmt
 
@@ -19,13 +25,18 @@ BROKEN_GETTEXT_DETECTION=	yes
 CONFIGURE_ARGS+=	--without-apache
 CONFIGURE_ARGS+=	--without-apxs
 
-BUILDLINK_API_DEPENDS.apr+=		apr>=0.9.5
-BUILDLINK_API_DEPENDS.neon+=	neon>=0.24.7
+.if !empty(PKG_OPTIONS:Mapr1)
+.  include "../../devel/apr/buildlink3.mk"
+.  include "../../devel/apr-util/buildlink3.mk"
+.else
+BUILDLINK_API_DEPENDS.apr+=    apr>=0.9.5
+.  include "../../devel/apr0/buildlink3.mk"
+.endif
 
-.include "../../devel/apr0/buildlink3.mk"
+BUILDLINK_API_DEPENDS.neon+=   neon>=0.24.7
 .include "../../www/neon/buildlink3.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.apr:Mdb4)
+.if !empty(${APU_OPTIONS}:Mdb4)
 PLIST_SRC=		${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
 .else
 CONFIGURE_ARGS+=	--without-berkeley-db
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index bca6e0b7361..04cb441de18 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/01/24 19:46:45 epg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/01/25 07:35:30 epg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -20,9 +20,20 @@ BUILDLINK_ABI_DEPENDS.subversion-base?=	subversion-base>=1.3.0nb2
 BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
 
 BUILDLINK_FILES.subversion-base+=	bin/svn-config
+
+.if !defined(PKG_BUILD_OPTIONS.subversion)
+PKG_BUILD_OPTIONS.subversion!=cd ${BUILDLINK_PKGSRCDIR.subversion-base} && \
+			${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+.endif
 .endif	# SUBVERSION_BASE_BUILDLINK3_MK
 
-.include "../../devel/apr0/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.subversion:Mapr1)
+.  include "../../devel/apr/buildlink3.mk"
+.  include "../../devel/apr-util/buildlink3.mk"
+.else
+.  include "../../devel/apr0/buildlink3.mk"
+.endif
+
 .include "../../www/neon/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/subversion-base/options.mk b/devel/subversion-base/options.mk
new file mode 100644
index 00000000000..57021ee1cdc
--- /dev/null
+++ b/devel/subversion-base/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2007/01/25 07:35:30 epg Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.subversion
+PKG_SUPPORTED_OPTIONS=	apache22 apr1
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mapache22)
+PKG_OPTIONS+=		apr1
+.elif !empty(PKG_OPTIONS:Mapr1)
+PKG_OPTIONS+=		apache22
+.endif
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 31678425b87..df658ca4733 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2006/11/08 11:29:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.26 2007/01/25 07:35:30 epg Exp $
 
 DISTNAME=		subversion-${SVNVER}
 CATEGORIES=		devel
@@ -20,10 +20,11 @@ PATCHDIR=		${.CURDIR}/../../devel/subversion/patches
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
-CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr}
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../devel/subversion-base/options.mk"
+
 CONFIGURE_ARGS+=	--with-neon=${BUILDLINK_PREFIX.neon}
-CONFIGURE_ARGS+=	--with-ssl
 # workaround: does not install info file, but does create directory
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}