[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Add missing explicit dependency on cyrus-...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7fde45d7f2c2
branches:  trunk
changeset: 491427:7fde45d7f2c2
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Mar 24 04:47:58 2005 +0000

description:
Add missing explicit dependency on cyrus-sasl2.  Make it optional but
on by default.  The default might be changed later if the common
authentication cases are covered without it.

diffstat:

 x11/kdebase3/Makefile      |   8 ++++++--
 x11/kdebase3/buildlink3.mk |  10 +++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (60 lines):

diff -r 20db37fb9084 -r 7fde45d7f2c2 x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Thu Mar 24 02:56:59 2005 +0000
+++ b/x11/kdebase3/Makefile     Thu Mar 24 04:47:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/03/23 21:44:37 markd Exp $
+# $NetBSD: Makefile,v 1.70 2005/03/24 04:47:58 markd Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
 CATEGORIES=    x11
@@ -74,8 +74,9 @@
 
 PLIST_SRC+=            ${PKGDIR}/PLIST
 
+PKG_DEFAULT_OPTIONS+=  sasl2
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kdebase
-PKG_SUPPORTED_OPTIONS= samba
+PKG_SUPPORTED_OPTIONS= sasl2 samba
 .include "../../mk/bsd.options.mk"
 
 BUILDLINK_DEPENDS.Xrandr+=      Xrandr>=1.0
@@ -143,6 +144,9 @@
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Msasl2)
+.include "../../security/cyrus-sasl2/buildlink3.mk"
+.endif
 .include "../../x11/Xrandr/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/xcursor/buildlink3.mk"
diff -r 20db37fb9084 -r 7fde45d7f2c2 x11/kdebase3/buildlink3.mk
--- a/x11/kdebase3/buildlink3.mk        Thu Mar 24 02:56:59 2005 +0000
+++ b/x11/kdebase3/buildlink3.mk        Thu Mar 24 04:47:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/03/23 21:44:37 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/03/24 04:47:58 markd Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=        ${KDEBASE_BUILDLINK3_MK}+
@@ -16,12 +16,20 @@
 BUILDLINK_PKGSRCDIR.kdebase?=  ../../x11/kdebase3
 .endif # KDEBASE_BUILDLINK3_MK
 
+PKG_OPTIONS.kdebase?=   ${PKG_DEFAULT_OPTIONS}
+
 BUILDLINK_DEPENDS.Xrandr+=      Xrandr>=1.0
 
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
+.if !empty(PKG_OPTIONS.kdebase:Msamba)
+.  include "../../net/samba/buildlink3.mk"
+.endif
+.if !empty(PKG_OPTIONS.kdebase:Msasl2)
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.endif
 .include "../../x11/Xrandr/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/xcursor/buildlink3.mk"