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.

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

(limited to 'x11/kdebase3')

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 2d0c53e6793..fb856d0930c 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2005/03/26 15:30:46 markd Exp $
+# $NetBSD: Makefile,v 1.72 2005/03/28 09:39:58 jlam Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -74,9 +74,9 @@ CONFIGURE_ENV+=		RUN_KAPPFINDER=no
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
-PKG_DEFAULT_OPTIONS+=	sasl2
+PKG_DEFAULT_OPTIONS+=	sasl
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kdebase
-PKG_SUPPORTED_OPTIONS=	sasl2 samba
+PKG_SUPPORTED_OPTIONS=	sasl samba
 .include "../../mk/bsd.options.mk"
 
 BUILDLINK_DEPENDS.Xrandr+=      Xrandr>=1.0
@@ -150,7 +150,7 @@ CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE'
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Msasl2)
+.if !empty(PKG_OPTIONS:Msasl)
 .include "../../security/cyrus-sasl2/buildlink3.mk"
 .endif
 .include "../../x11/Xrandr/buildlink3.mk"
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index 8423dfb3992..5ddc2a5d7d2 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/03/24 04:47:58 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/28 09:39:58 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
@@ -27,7 +27,7 @@ BUILDLINK_DEPENDS.Xrandr+=      Xrandr>=1.0
 .if !empty(PKG_OPTIONS.kdebase:Msamba)
 .  include "../../net/samba/buildlink3.mk"
 .endif
-.if !empty(PKG_OPTIONS.kdebase:Msasl2)
+.if !empty(PKG_OPTIONS.kdebase:Msasl)
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
 .endif
 .include "../../x11/Xrandr/buildlink3.mk"
-- 
cgit v1.2.3