bl3ify

4 files changed, 23 insertions, 16 deletions

diff --git a/security/cy2-login/Makefile b/security/cy2-login/Makefile
index 717d40f0f3b..58bcd4bf0ee 100644
--- a/security/cy2-login/Makefile
+++ b/security/cy2-login/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/09/13 19:18:16 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/08 22:13:14 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-login/}
 COMMENT=	Cyrus SASL LOGIN authentication plugin
@@ -16,6 +16,7 @@ BUILD_DIRS=	${WRKSRC}/plugins
 ALL_TARGET=	liblogin.la
 
 do-install:
+	${INSTALL_DATA_DIR} ${PLUGINDIR}
 	cd ${WRKSRC}/plugins && \
 	${PKGSHLIBTOOL} --mode=install \
 		${INSTALL_PROGRAM} liblogin.la ${PLUGINDIR}
diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile
index dfc515294a4..93c03a04fd3 100644
--- a/security/cy2-ntlm/Makefile
+++ b/security/cy2-ntlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/11/12 03:39:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/08 22:13:14 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
 PKGREVISION=	1
@@ -14,9 +14,10 @@ BUILD_DIRS=	${WRKSRC}/plugins
 ALL_TARGET=	libntlm.la
 
 do-install:
+	${INSTALL_DATA_DIR} ${PLUGINDIR}
 	cd ${WRKSRC}/plugins && \
 	${PKGSHLIBTOOL} --mode=install \
 		${INSTALL_PROGRAM} libntlm.la ${PLUGINDIR}
 
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index f6ab5c6f186..6ab58502fe5 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/05 12:10:29 markd Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/08 22:13:14 jlam Exp $
 
 .include "Makefile.common"
 
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	--enable-otp		# OTP
 CONFIGURE_ARGS+=	--enable-digest		# DIGEST-MD5
 CONFIGURE_ARGS+=	--with-rc4
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 BUILD_DEFS+=		USE_PAM SASL_USE_GSSAPI
 
@@ -27,8 +27,7 @@ CONFIGURE_ARGS+=	--with-devrandom=/dev/urandom
 
 # saslauthd needs to find libraries for different authentication mechanisms.
 .if defined(USE_PAM)
-.  include "../../security/PAM/buildlink2.mk"
-BUILD_DEFS+=		USE_PAM
+.  include "../../security/PAM/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
 .endif
 
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 15bbcdd7b3c..47ece94cfcd 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2003/12/15 14:10:49 martti Exp $
+# $NetBSD: Makefile.common,v 1.10 2004/01/08 22:13:14 jlam Exp $
 #
-# This Makefile fragment should be included _below_ and SASL_PLUGIN
+# This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
 
 DISTNAME=	cyrus-sasl-2.1.15
-PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -16,19 +15,24 @@ DISTINFO_FILE=		${.CURDIR}/../cyrus-sasl2/distinfo
 FILESDIR=		${.CURDIR}/../cyrus-sasl2/files
 PATCHDIR=		${.CURDIR}/../cyrus-sasl2/patches
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+.include "../../mk/bsd.prefs.mk"
+
 .if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])
-DEPENDS+=		cyrus-sasl>=2.1.12:../../security/cyrus-sasl2
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.  if defined(DEFAULT_VIEW.cyrus-sasl)
+DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.cyrus-sasl}
+.  endif
 .endif
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 MAKE_ENV+=		SHLIBTOOL="${PKGSHLIBTOOL}"
 
-.include "../../mk/bsd.prefs.mk"
-
 # CYRUS_USER		username of the Cyrus administrator
 # CYRUS_GROUP		group of the Cyrus administrator
 #
@@ -37,8 +41,10 @@ CYRUS_GROUP?=		mail
 FILES_SUBST+=		CYRUS_USER=${CYRUS_USER}
 FILES_SUBST+=		ROOT_USER=${ROOT_USER}
 
-HTMLDIR=		${PREFIX}/share/doc/html/cyrus-sasl
 PLUGINDIR=		${PREFIX}/lib/sasl2
+_PLUGINDIR=		${VIEWBASE}/lib/sasl2
+
+HTMLDIR=		${PREFIX}/share/doc/html/cyrus-sasl
 # /var/run/saslauthd matches the default value in configure.
 SASLSOCKETDIR=		/var/run/saslauthd
 FILES_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
@@ -49,7 +55,7 @@ BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
 CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR}
 CONFIGURE_ARGS+=	--with-dblib=ndbm
 CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
-CONFIGURE_ARGS+=	--with-plugindir=${PLUGINDIR}
+CONFIGURE_ARGS+=	--with-plugindir=${_PLUGINDIR}
 
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--disable-anon		# ANONYMOUS