[pkgsrc/trunk]: pkgsrc/misc/kdepim3 Make cyrus-sasl2 dependency optional but ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8c09e602007d
branches:  trunk
changeset: 491432:8c09e602007d
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Mar 24 05:08:41 2005 +0000

description:
Make cyrus-sasl2 dependency optional but on by default.  Default might
be switched if common authentication cases are handled without it.

diffstat:

 misc/kdepim3/Makefile      |  15 +++++++++++++--
 misc/kdepim3/PLIST         |   6 +++---
 misc/kdepim3/buildlink3.mk |   7 ++++++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diffs (89 lines):

diff -r 54cebd90dd4d -r 8c09e602007d misc/kdepim3/Makefile
--- a/misc/kdepim3/Makefile     Thu Mar 24 05:07:46 2005 +0000
+++ b/misc/kdepim3/Makefile     Thu Mar 24 05:08:41 2005 +0000
@@ -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_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 @@
 .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 -r 54cebd90dd4d -r 8c09e602007d misc/kdepim3/PLIST
--- a/misc/kdepim3/PLIST        Thu Mar 24 05:07:46 2005 +0000
+++ b/misc/kdepim3/PLIST        Thu Mar 24 05:08:41 2005 +0000
@@ -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/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/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 -r 54cebd90dd4d -r 8c09e602007d misc/kdepim3/buildlink3.mk
--- a/misc/kdepim3/buildlink3.mk        Thu Mar 24 05:07:46 2005 +0000
+++ b/misc/kdepim3/buildlink3.mk        Thu Mar 24 05:08:41 2005 +0000
@@ -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_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"