We don't need to check for APR_USE_* or generate our own _APR_OPTIONS

variable since the apr/buildlink3.mk file does the right thing for us
already; we simply need to include it and check the value of
PKG_OPTIONS.apr.

3 files changed, 17 insertions, 33 deletions

diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index f988f82fcc2..6ee11fc6489 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/11/19 04:01:59 epg Exp $
+# $NetBSD: Makefile,v 1.21 2004/11/23 00:37:04 jlam Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -7,13 +7,16 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../subversion/Makefile.common"
 
-BUILD_DEFS+=		APR_USE_DB4
-
 CONFIGURE_ARGS+=	--without-apache
 CONFIGURE_ARGS+=	--without-apxs
 
-.include "../../mk/bsd.prefs.mk"
-.if !empty(APR_USE_DB4:M[yY][eE][sS])
+BUILDLINK_DEPENDS.apr+=		apr>=0.9.5
+BUILDLINK_DEPENDS.neon+=	neon>=0.24.7
+
+.include "../../devel/apr/buildlink3.mk"
+.include "../../www/neon/buildlink3.mk"
+
+.if !empty(PKG_OPTIONS.apr:Mdb4)
 PLIST_SRC=		${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
 .else
 CONFIGURE_ARGS+=	--without-berkeley-db
@@ -51,13 +54,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \
 		${SVNEXAMPLES}/hook-scripts
 
-BUILDLINK_DEPENDS.apr+=		apr>=0.9.5
-BUILDLINK_DEPENDS.neon+=	neon>=0.24.7
-
-.if !empty(APR_USE_DB4:M[yY][eE][sS])
-.  include "../../databases/db4/buildlink3.mk"
-.endif
-
-.include "../../devel/apr/buildlink3.mk"
-.include "../../www/neon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/subversion/buildlink3.mk b/devel/subversion/buildlink3.mk
index da7e3b2db6f..b99f056991b 100644
--- a/devel/subversion/buildlink3.mk
+++ b/devel/subversion/buildlink3.mk
@@ -1,8 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/11/23 00:37:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
 .include "../../devel/subversion/Makefile.version"
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -20,11 +21,6 @@ BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
 BUILDLINK_FILES.subversion-base+=	bin/svn-config
 .endif	# SUBVERSION_BASE_BUILDLINK3_MK
 
-.include "../../mk/bsd.prefs.mk"
-.if !empty(APR_USE_DB4:M[yY][eE][sS])
-.  include "../../databases/db4/buildlink3.mk"
-.endif
-
 .include "../../devel/apr/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
 
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 53a87f9393e..5b256cf06a2 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2004/11/22 22:52:53 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2004/11/23 00:37:04 jlam Exp $
+
+.include "Makefile.common"
 
 PKGNAME=		apache-${APACHE_VERSION}
 PKGREVISION=		2
@@ -27,6 +29,9 @@ CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
 CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr}
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../devel/apr/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 
 # Set the "Multi-Processing Model" used by Apache to handle requests.
 # Valid values are:
@@ -42,11 +47,7 @@ DFLT_APACHE_MODULES+=	proxy proxy_connect proxy_ftp proxy_http
 DFLT_APACHE_MODULES+=	ssl
 
 # LDAP support
-.if !defined(_APR_OPTIONS)
-_APR_OPTIONS!=	cd ../../devel/apr && ${MAKE} show-var VARNAME=PKG_OPTIONS
-MAKEFLAGS+=	_APR_OPTIONS=${_APR_OPTIONS:Q}
-.endif
-.if !empty(_APR_OPTIONS:Mldap)
+.if !empty(PKG_OPTIONS.apr:Mldap)
 DFLT_APACHE_MODULES+=	ldap auth_ldap
 .endif
 
@@ -116,7 +117,6 @@ SUBST_MESSAGE.confs=	"Fixing configuration files."
 #
 _AP_DEPENDS.ssl=	../../security/openssl/buildlink3.mk
 _AP_DEPENDS.deflate=	../../devel/zlib/buildlink3.mk
-_AP_DEPENDS.ldap=	../../databases/openldap/buildlink3.mk
 
 _AP_CFG_ARGS.ssl=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 _AP_CFG_ARGS.deflate=	--with-z=${BUILDLINK_PREFIX.zlib}
@@ -175,10 +175,4 @@ post-install:
 		${CHMOD} ${BINMODE} ${PREFIX}/sbin/$$file; \
 	done
 
-.include "Makefile.common"
-
-.include "../../devel/apr/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"