9 files changed, 40 insertions, 13 deletions
diff --git a/security/cyrus-sasl/DEINSTALL b/security/cyrus-sasl/DEINSTALL
index 75d06a8612e..22d58fd1bfe 100644
--- a/security/cyrus-sasl/DEINSTALL
+++ b/security/cyrus-sasl/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.5 2002/07/31 03:23:06 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.6 2002/08/25 18:39:49 jlam Exp $
 
 SASLDB=@PKG_SYSCONFDIR@/sasldb.db
 SASLSOCKETDIR=@SASLSOCKETDIR@
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index c9f09bf7c12..45df43bdfc1 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/07/31 03:23:06 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2002/08/25 18:39:50 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.27
 SVR4_PKGNAME=		csasl
@@ -13,7 +13,7 @@ COMMENT=		Simple Authentication and Security Layer
 
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR}
 CONFIGURE_ARGS+=	--with-dblib=ndbm
 CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
 CONFIGURE_ARGS+=	--with-plugindir=${PREFIX}/lib/sasl
-CONFIGURE_ARGS+=	--with-rc4=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-rc4=${BUILDLINK_PREFIX.openssl}
 
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--enable-anon		# ANONYMOUS
@@ -66,9 +66,9 @@ CONFIGURE_ARGS+=	--disable-gssapi	# --- no GSSAPI
 PLIST_SRC+=		${.CURDIR}/PLIST.plugins
 
 .if defined(USE_PAM)
-.  include "../../security/PAM/buildlink.mk"
+.  include "../../security/PAM/buildlink2.mk"
 BUILD_DEFS+=		USE_PAM
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
 .else
 CONFIGURE_ARGS+=	--without-pam
 .endif
@@ -105,6 +105,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
 
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl/PLIST.common b/security/cyrus-sasl/PLIST.common
index 56498d790e4..0854e1e0a21 100644
--- a/security/cyrus-sasl/PLIST.common
+++ b/security/cyrus-sasl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2002/07/31 03:23:06 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2002/08/25 18:39:50 jlam Exp $
 bin/sasl-config
 etc/rc.d/sasl_pwcheck
 etc/rc.d/saslauthd
diff --git a/security/cyrus-sasl/buildlink2.mk b/security/cyrus-sasl/buildlink2.mk
new file mode 100644
index 00000000000..38459f4ecad
--- /dev/null
+++ b/security/cyrus-sasl/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:50 jlam Exp $
+
+.if !defined(CYRUS_SASL_BUILDLINK2_MK)
+CYRUS_SASL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			cyrus-sasl
+BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=1.5.24nb2
+BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.cyrus-sasl=cyrus-sasl
+BUILDLINK_PREFIX.cyrus-sasl_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.cyrus-sasl=	include/hmac-md5.h
+BUILDLINK_FILES.cyrus-sasl+=	include/sasl.h
+BUILDLINK_FILES.cyrus-sasl+=	include/saslplug.h
+BUILDLINK_FILES.cyrus-sasl+=	include/saslutil.h
+BUILDLINK_FILES.cyrus-sasl+=	lib/libsasl.*
+
+.if defined(USE_PAM)
+.  include "../../security/PAM/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+=	cyrus-sasl-buildlink
+
+cyrus-sasl-buildlink: _BUILDLINK_USE
+
+.endif	# CYRUS_SASL_BUILDLINK2_MK
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 01828ee9826..d2bedb53cd0 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/07/31 03:23:07 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:39:51 jlam Exp $
 
 SHA1 (cyrus-sasl-1.5.27.tar.gz) = eedaec8355219b61e64236e3a5d9845d3af5a13d
 Size (cyrus-sasl-1.5.27.tar.gz) = 528252 bytes
diff --git a/security/cyrus-sasl/files/sasl_pwcheck.sh b/security/cyrus-sasl/files/sasl_pwcheck.sh
index aa2243707a4..32ea60034f9 100644
--- a/security/cyrus-sasl/files/sasl_pwcheck.sh
+++ b/security/cyrus-sasl/files/sasl_pwcheck.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: sasl_pwcheck.sh,v 1.8 2002/07/31 03:23:07 jlam Exp $
+# $NetBSD: sasl_pwcheck.sh,v 1.9 2002/08/25 18:39:51 jlam Exp $
 #
 # The pwcheck daemon allows UNIX password authentication with Cyrus SASL.
 #
diff --git a/security/cyrus-sasl/files/saslauthd.sh b/security/cyrus-sasl/files/saslauthd.sh
index 273c35f782a..16b77de72df 100644
--- a/security/cyrus-sasl/files/saslauthd.sh
+++ b/security/cyrus-sasl/files/saslauthd.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: saslauthd.sh,v 1.1 2002/07/31 03:23:07 jlam Exp $
+# $NetBSD: saslauthd.sh,v 1.2 2002/08/25 18:39:51 jlam Exp $
 #
 # The saslauthd daemon allows cleartext UNIX password authentication via
 # several authentication mechanisms with Cyrus SASL.
diff --git a/security/cyrus-sasl/patches/patch-aj b/security/cyrus-sasl/patches/patch-aj
index 2510133d45a..2b86eb5ffad 100644
--- a/security/cyrus-sasl/patches/patch-aj
+++ b/security/cyrus-sasl/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2002/07/31 03:23:07 jlam Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/25 18:39:51 jlam Exp $
 
 --- saslauthd/Makefile.am.orig	Fri Mar 23 20:41:35 2001
 +++ saslauthd/Makefile.am
diff --git a/security/cyrus-sasl/patches/patch-ak b/security/cyrus-sasl/patches/patch-ak
index 242fb18bf86..adf8a601617 100644
--- a/security/cyrus-sasl/patches/patch-ak
+++ b/security/cyrus-sasl/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2002/07/31 03:23:07 jlam Exp $
+$NetBSD: patch-ak,v 1.2 2002/08/25 18:39:52 jlam Exp $
 
 --- lib/checkpw.c.orig	Sat Feb 17 00:06:48 2001
 +++ lib/checkpw.c