From 84849dca2e55f6d896414c5a64f694b70db3299c Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 28 Mar 2005 09:39:56 +0000
Subject: Remove security/cyrus-sasl and security/cy-login.  These packages
 tracked the Cyrus SASL 1.5.x releases, which are no longer maintained. Adjust
 packages to use security/cyrus-sasl2 instead for SASL support. This closes PR
 pkg/28218 and PR pkg/29736.

---
 misc/kdepim3/Makefile      | 8 ++++----
 misc/kdepim3/buildlink3.mk | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'misc')

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index c435f871681..ebb55d7faca 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/03/24 05:08:41 markd Exp $
+# $NetBSD: Makefile,v 1.41 2005/03/28 09:39:57 jlam Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -11,9 +11,9 @@ USE_DIRS+=		xdg-1.1
 USE_PERL=		run
 USE_GNU_TOOLS+=		awk yacc
 
-PKG_DEFAULT_OPTIONS+=	sasl2
+PKG_DEFAULT_OPTIONS+=	sasl
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kdepim
-PKG_SUPPORTED_OPTIONS=	sasl2
+PKG_SUPPORTED_OPTIONS=	sasl
 .include "../../mk/bsd.options.mk"
 
 BUILDLINK_DEPENDS.gpgme+=     gpgme>=0.4.5
@@ -37,7 +37,7 @@ 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)
+.if !empty(PKG_OPTIONS:Msasl)
 .include "../../security/cyrus-sasl2/buildlink3.mk"
 PLIST_SUBST+=	HAVE_SASL=""
 .else
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 3aae0116b15..0518ef87935 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/03/24 05:08:41 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/28 09:39:57 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEPIM_BUILDLINK3_MK:=	${KDEPIM_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ 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)
+.if !empty(PKG_OPTIONS.kdepim:Msasl)
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
 .endif
 .include "../../x11/kdebase3/buildlink3.mk"
-- 
cgit v1.2.3