Restore support for apr0 via the SUGGESTED apr1 option.

Do not include logic to auto-enable apr1 if the option apache22 is
defined because apache22 does not appear to be a valid option.

Do not force apr1 if serf is selected.  Instead, fail and force the
user to choose consistent options.

No PKGREVISION because apr1 is the default and the resulting package
is unchanged.  apr0 support not tested.

4 files changed, 31 insertions, 12 deletions

diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 3a3f0c88503..41b40deaf54 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2009/06/01 18:56:08 gdt Exp $
+# $NetBSD: Makefile,v 1.65 2009/06/02 15:34:44 gdt Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -17,8 +17,21 @@ USE_TOOLS+=		msgfmt
 CONFIGURE_ARGS+=	--disable-neon-version-check
 CONFIGURE_ARGS+=	--without-apxs
 
-.include "../../devel/apr/buildlink3.mk"
-.include "../../devel/apr-util/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mapr1)
+APU_OPTIONS=		PKG_BUILD_OPTIONS.apr-util
+.else
+APU_OPTIONS=		PKG_BUILD_OPTIONS.apr
+.endif
+BUILD_DEFS+=		${APU_OPTIONS}
+
+.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
+
 BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.4
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/subversion-base/PLIST.bdb b/devel/subversion-base/PLIST.bdb
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/devel/subversion-base/PLIST.bdb
+++ /dev/null
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index 0feaf8ab0cb..6738c06a49f 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2009/05/30 00:16:47 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/06/02 15:34:44 gdt Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 .include "../../devel/subversion/Makefile.version"
@@ -21,8 +21,15 @@ pkgbase := subversion-base
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
 
-.include "../../devel/apr/buildlink3.mk"
-.include "../../devel/apr-util/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.subversion-base:Mapr1)
+.  include "../../devel/apr/buildlink3.mk"
+.  include "../../devel/apr-util/buildlink3.mk"
+.else
+.  include "../../devel/apr0/buildlink3.mk"
+.endif
+
+# If serf and -apr1 are selected, the build will probably fail.
+# Do that rather than force neon for apr0
 .if !empty(PKG_BUILD_OPTIONS.subversion-base:Mserf)
 .  include "../../www/serf/buildlink3.mk"
 .else
diff --git a/devel/subversion-base/options.mk b/devel/subversion-base/options.mk
index 66f00cf1472..9eadea85a01 100644
--- a/devel/subversion-base/options.mk
+++ b/devel/subversion-base/options.mk
@@ -1,13 +1,12 @@
-# $NetBSD: options.mk,v 1.9 2009/05/30 00:16:47 gdt Exp $
+# $NetBSD: options.mk,v 1.10 2009/06/02 15:34:44 gdt Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.subversion
-PKG_SUPPORTED_OPTIONS=	serf sasl
-PKG_SUGGESTED_OPTIONS=	# empty
+PKG_SUPPORTED_OPTIONS=	apr1 serf sasl
+PKG_SUGGESTED_OPTIONS=	apr1
 
 # Note that this file is included as part of several packages.
-# Therefore this file only defines options, but does not include the
-# typical fragments to change behavior based on options, leaving those
-# to the individual Makefiles.
+# Therefore this file defines options and includes some but not all of
+# the typical fragments, leaving some to individual package files.
 
 .include "../../mk/bsd.options.mk"