From 48543130b7864279f7d496e904ae56567d683d1e Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Thu, 3 Jul 2008 20:39:44 +0000
Subject: Make the newly introduced cyrus-sasl dependency optional, on by
 default.

Approved during the freeze by agc@.
---
 devel/subversion-base/Makefile   | 13 +++++++++----
 devel/subversion-base/options.mk |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'devel')

diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 37d9454117d..6dd06285445 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2008/06/19 22:33:25 epg Exp $
+# $NetBSD: Makefile,v 1.54 2008/07/03 20:39:44 schmonz Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
+PKGREVISION=	1
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -25,9 +26,6 @@ BROKEN_GETTEXT_DETECTION=	yes
 CONFIGURE_ARGS+=	--disable-neon-version-check
 CONFIGURE_ARGS+=	--without-apache
 CONFIGURE_ARGS+=	--without-apxs
-CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-
-.include "../../security/cyrus-sasl/buildlink3.mk"
 
 .if !empty(PKG_OPTIONS:Mapr1)
 .  include "../../devel/apr/buildlink3.mk"
@@ -54,6 +52,13 @@ PLIST_SRC=		${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
 CONFIGURE_ARGS+=	--without-berkeley-db
 .endif
 
+.if !empty(PKG_OPTIONS:Msasl)
+.include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
+.else
+CONFIGURE_ARGS+=	--without-sasl
+.endif
+
 PLIST_SUBST+=		DAV_RA=${DAV_RA:Q}
 
 SUBST_CLASSES+=		paths
diff --git a/devel/subversion-base/options.mk b/devel/subversion-base/options.mk
index 8c79586f9e0..4a025740858 100644
--- a/devel/subversion-base/options.mk
+++ b/devel/subversion-base/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.6 2008/07/02 13:14:23 gdt Exp $
+# $NetBSD: options.mk,v 1.7 2008/07/03 20:39:44 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.subversion
-PKG_SUPPORTED_OPTIONS=	apache22 apr1 serf java
-PKG_SUGGESTED_OPTIONS=	apr1
+PKG_SUPPORTED_OPTIONS=	apache22 apr1 serf java sasl
+PKG_SUGGESTED_OPTIONS=	apr1 sasl
 
 # Note that this file is included as part of several packages.
 # Therefore this file only defines options, but does not include the
-- 
cgit v1.2.3