bl3ify and convert to use krb5.buildlink3.mk for proper Kerberos

detection and linkage.  This fixes PR 24498.

3 files changed, 35 insertions, 10 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 67fcf5cac05..1c3615ac64f 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/11/12 03:39:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.42 2004/03/23 06:13:30 jlam Exp $
 
 .include "Makefile.common"
 
@@ -14,17 +14,19 @@ CONFIGURE_ARGS+=	--enable-cram		# CRAM-MD5
 
 CONFIGURE_ARGS+=	--enable-plain		# PLAIN
 .if defined(USE_PAM)
-.  include "../../security/PAM/buildlink2.mk"
+.  include "../../security/PAM/buildlink3.mk"
 BUILD_DEFS+=		USE_PAM
 CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
 .endif
 
 CONFIGURE_ARGS+=	--enable-digest		# DIGEST-MD5
 CONFIGURE_ARGS+=	--with-rc4=${SSLBASE}
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 
-.if defined(SASL_USE_GSSAPI) && ${SASL_USE_GSSAPI} == "YES"
-CONFIGURE_ARGS+=	--enable-gssapi=/usr	# GSSAPI
+.if defined(KERBEROS) || \
+    (defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]))
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}	# GSSAPI
 PLIST_SRC+=		${.CURDIR}/PLIST.krb5
 .endif
 
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common
index 870e8e53665..ea4905262ff 100644
--- a/security/cyrus-sasl/Makefile.common
+++ b/security/cyrus-sasl/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/01/24 15:00:22 grant Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/03/23 06:13:30 jlam Exp $
 #
 # This Makefile fragment should be included _below_ and SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
@@ -19,11 +19,10 @@ PATCHDIR=		${.CURDIR}/../cyrus-sasl/patches
 DEPENDS+=		cyrus-sasl>=1.5.27:../../security/cyrus-sasl
 .endif
 
-USE_BUILDLINK2=		YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		yes
+GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
-USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
+USE_LIBTOOL=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/cyrus-sasl/buildlink3.mk b/security/cyrus-sasl/buildlink3.mk
new file mode 100644
index 00000000000..1ba809f4ff0
--- /dev/null
+++ b/security/cyrus-sasl/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/23 06:13:30 jlam Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+CYRUS_SASL_BUILDLINK3_MK:=	${CYRUS_SASL_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	cyrus-sasl
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncyrus-sasl}
+BUILDLINK_PACKAGES+=	cyrus-sasl
+
+.if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.cyrus-sasl+=		cyrus-sasl>=1.5.27nb3
+BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl
+.endif	# CYRUS_SASL_BUILDLINK3_MK
+
+.if defined(USE_PAM)
+.  include "../../security/PAM/buildlink3.mk"
+.endif
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}