Update path from cyrus-sasl2 to cyrus-sasl.

11 files changed, 23 insertions, 23 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 51a34c9d8d3..a79dca43172 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2006/04/13 21:45:13 wiz Exp $
 
 DISTNAME=	cyrus-imapd-2.2.12
 PKGREVISION=	4
@@ -117,7 +117,7 @@ PERL5_PACKLIST= \
 	auto/Cyrus/SIEVE/managesieve/.packlist
 
 .include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index bbb3553e004..c4d3815c4a8 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2006/04/13 21:45:13 wiz Exp $
 
 DISTNAME=		cyrus-imapd-2.1.18
 PKGREVISION=		3
@@ -128,7 +128,7 @@ PERL5_PACKLIST= \
 	auto/Cyrus/SIEVE/managesieve/.packlist
 
 .include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index 28a683bdb1f..65c2c31e140 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2006/04/01 22:02:19 abs Exp $
+# $NetBSD: options.mk,v 1.8 2006/04/13 21:45:13 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.exim
 PKG_SUPPORTED_OPTIONS=	exim-build-eximon exim-content-scan exim-lookup-dnsdb
@@ -96,6 +96,6 @@ EXIM_INCLUDE=		-I/usr/${BUILDLINK_INCDIRS.db-native}
 .if !empty(PKG_OPTIONS:Msaslauthd)
 LOCAL_MAKEFILE_OPTIONS+=AUTH_CYRUS_SASL=YES
 LOCAL_MAKEFILE_OPTIONS+=CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
-LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl2} -lsasl2
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
+LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl} -lsasl2
+.  include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 2ab0c80b5a9..10f0787310e 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/08 06:34:25 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/13 21:45:13 wiz Exp $
 #
 
 DISTNAME=		libetpan-0.43
@@ -20,7 +20,7 @@ SUBST_MESSAGE.conf=	Fixing libetpan-config.
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 1f83640c946..45ed3ac16b6 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/13 21:45:12 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index a5e35a1aab7..e24b05e77fb 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/04/13 18:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/04/13 21:45:13 wiz Exp $
 #
 
 DISTNAME=	mail-notification-2.0
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 # Whether to add SASL2 support.
 .if !empty(PKG_OPTIONS:Msasl)
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.  include "../../security/cyrus-sasl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-sasl
 .endif
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index a85f5c5ee4b..9b5fd24bc6b 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2005/12/20 17:23:11 tonio Exp $
+# $NetBSD: options.mk,v 1.13 2006/04/13 21:45:13 wiz Exp $
 
 # Global and legacy options
 
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
 ### SASLv2
 ###
 .if !empty(PKG_OPTIONS:Msasl)
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.  include "../../security/cyrus-sasl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 .endif
 
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
index 02a2d8c6b27..0d418dc5d81 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2006/01/10 06:39:00 martti Exp $
+# $NetBSD: options.mk,v 1.13 2006/04/13 21:45:13 wiz Exp $
 
 # Global and legacy options
 
@@ -84,7 +84,7 @@ AUXLIBS+=	-L${PGSQL_PREFIX}/lib -lpq \
 ### SASL support for SMTP authentication.
 ###
 .if !empty(PKG_OPTIONS:Msasl)
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.  include "../../security/cyrus-sasl/buildlink3.mk"
 BUILDLINK_INCDIRS.cyrus-sasl=	include/sasl
 SASLLIBDIR=	${PREFIX}/lib/sasl2
 PWCHECK_METHOD=	auxprop
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index bed54e58799..7cf13272c03 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2005/07/31 03:46:05 grant Exp $
+# $NetBSD: options.mk,v 1.21 2006/04/13 21:45:13 wiz Exp $
 
 # Global and legacy options
 
@@ -84,7 +84,7 @@ AUXLIBS+=	-L${PGSQL_PREFIX}/lib -lpq \
 ### SASL support for SMTP authentication.
 ###
 .if !empty(PKG_OPTIONS:Msasl)
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.  include "../../security/cyrus-sasl/buildlink3.mk"
 BUILDLINK_INCDIRS.cyrus-sasl=	include/sasl
 SASLLIBDIR=	${PREFIX}/lib/sasl2
 PWCHECK_METHOD=	auxprop
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index b4cd416f8e3..c1b4852e676 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2005/10/20 15:10:01 adrianp Exp $
+# $NetBSD: options.mk,v 1.14 2006/04/13 21:45:14 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
 PKG_SUPPORTED_OPTIONS=	inet6 db2 db4 ldap sasl tls tcpwrappers sendmail-socketmap
@@ -29,7 +29,7 @@ PKG_OPTIONS_LEGACY_OPTS+=	socketmap:sendmail-socketmap
 ### Use SASL/v2 for SMTP AUTH
 ###
 .if !empty(PKG_OPTIONS:Msasl)
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.  include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
 
 ###
diff --git a/mail/sendmail812/options.mk b/mail/sendmail812/options.mk
index 3cb6ea45035..bf3a90aee08 100644
--- a/mail/sendmail812/options.mk
+++ b/mail/sendmail812/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2006/04/13 21:45:14 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
 PKG_OPTIONS_OPTIONAL_GROUPS=	database
@@ -34,7 +34,7 @@ PKG_SUGGEST_OPTIONS+=	db2
 ### Use SASL/v2 for SMTP AUTH
 ###
 .if !empty(PKG_OPTIONS:Msasl)
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.  include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
 
 ###