Make cyrus-sasl2 dependency optional but on by default. Default might

be switched if common authentication cases are handled without it.

3 files changed, 22 insertions, 6 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 59b664a1c96..c435f871681 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/03/23 22:07:07 markd Exp $
+# $NetBSD: Makefile,v 1.40 2005/03/24 05:08:41 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -11,6 +11,11 @@ USE_DIRS+=		xdg-1.1
 USE_PERL=		run
 USE_GNU_TOOLS+=		awk yacc
 
+PKG_DEFAULT_OPTIONS+=	sasl2
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kdepim
+PKG_SUPPORTED_OPTIONS=	sasl2
+.include "../../mk/bsd.options.mk"
+
 BUILDLINK_DEPENDS.gpgme+=     gpgme>=0.4.5
 
 REPLACE_PERL=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
@@ -32,9 +37,15 @@ REPLACE_PERL=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 .include "../../meta-pkgs/kde3/kde3.mk"
 BUILDLINK_DEPMETHOD.qt3-tools=	full
 
+.if !empty(PKG_OPTIONS:Msasl2)
+.include "../../security/cyrus-sasl2/buildlink3.mk"
+PLIST_SUBST+=	HAVE_SASL=""
+.else
+PLIST_SUBST+=	HAVE_SASL="@comment "
+.endif
+
 .include "../../comms/libmal/buildlink3.mk"
 .include "../../comms/pilot-link-libs/buildlink3.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 64b8e195274..534076c60ac 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2005/03/23 22:07:07 markd Exp $
+@comment $NetBSD: PLIST,v 1.18 2005/03/24 05:08:41 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -319,7 +319,7 @@ lib/kde3/kfile_vcf.la
 lib/kde3/kio_groupwise.la
 lib/kde3/kio_imap4.la
 lib/kde3/kio_mbox.la
-lib/kde3/kio_sieve.la
+${HAVE_SASL}lib/kde3/kio_sieve.la
 lib/kde3/knotes_kolab.la
 lib/kde3/knotes_local.la
 lib/kde3/knotes_xmlrpc.la
@@ -1448,7 +1448,7 @@ share/kde/services/memofile-conduit.desktop
 share/kde/services/notepad-conduit.desktop
 share/kde/services/overview.desktop
 share/kde/services/popmail-conduit.desktop
-share/kde/services/sieve.protocol
+${HAVE_SASL}share/kde/services/sieve.protocol
 share/kde/services/sysinfo_conduit.desktop
 share/kde/services/time_conduit.desktop
 share/kde/services/todo-conduit.desktop
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 45804d2aff2..3aae0116b15 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/03/23 22:07:07 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/03/24 05:08:41 markd Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEPIM_BUILDLINK3_MK:=	${KDEPIM_BUILDLINK3_MK}+
@@ -16,9 +16,14 @@ BUILDLINK_RECOMMENDED.kdepim+=	kdepim>=3.4.0
 BUILDLINK_PKGSRCDIR.kdepim?=	../../misc/kdepim3
 .endif	# KDEPIM_BUILDLINK3_MK
 
+PKG_OPTIONS.kdepim?=	${PKG_DEFAULT_OPTIONS}
+
 .include "../../comms/libmal/buildlink3.mk"
 .include "../../comms/pilot-link-libs/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
+.if !empty(PKG_OPTIONS.kdepim:Msasl2)
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.endif
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"