[pkgsrc/trunk]: pkgsrc/devel/subversion-base Make the newly introduced cyrus-...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/325c78d30fd3
branches:  trunk
changeset: 544026:325c78d30fd3
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Jul 03 20:39:44 2008 +0000

description:
Make the newly introduced cyrus-sasl dependency optional, on by default.

Approved during the freeze by agc@.

diffstat:

 devel/subversion-base/Makefile   |  13 +++++++++----
 devel/subversion-base/options.mk |   6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r bb0198a2a46c -r 325c78d30fd3 devel/subversion-base/Makefile
--- a/devel/subversion-base/Makefile    Thu Jul 03 20:06:21 2008 +0000
+++ b/devel/subversion-base/Makefile    Thu Jul 03 20:39:44 2008 +0000
@@ -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 @@
 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 @@
 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 -r bb0198a2a46c -r 325c78d30fd3 devel/subversion-base/options.mk
--- a/devel/subversion-base/options.mk  Thu Jul 03 20:06:21 2008 +0000
+++ b/devel/subversion-base/options.mk  Thu Jul 03 20:39:44 2008 +0000
@@ -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