[pkgsrc/trunk]: pkgsrc/security bl3ify and convert to use krb5.buildlink3.mk ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a6594d7559c3
branches:  trunk
changeset: 471276:a6594d7559c3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 23 06:13:30 2004 +0000

description:
bl3ify and convert to use krb5.buildlink3.mk for proper Kerberos
detection and linkage.  This fixes PR 24498.

diffstat:

 security/cy-login/Makefile          |   4 ++--
 security/cyrus-sasl/Makefile        |  12 +++++++-----
 security/cyrus-sasl/Makefile.common |   9 ++++-----
 security/cyrus-sasl/buildlink3.mk   |  24 ++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 12 deletions(-)

diffs (103 lines):

diff -r 89e8b548a539 -r a6594d7559c3 security/cy-login/Makefile
--- a/security/cy-login/Makefile        Tue Mar 23 05:39:23 2004 +0000
+++ b/security/cy-login/Makefile        Tue Mar 23 06:13:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/08 03:00:29 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/23 06:13:30 jlam Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy-login/}
 COMMENT=       Cyrus SASL LOGIN authentication plugin
@@ -12,7 +12,7 @@
 CONFIGURE_ARGS+=       --enable-login          # LOGIN
 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
diff -r 89e8b548a539 -r a6594d7559c3 security/cyrus-sasl/Makefile
--- a/security/cyrus-sasl/Makefile      Tue Mar 23 05:39:23 2004 +0000
+++ b/security/cyrus-sasl/Makefile      Tue Mar 23 06:13:30 2004 +0000
@@ -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-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 -r 89e8b548a539 -r a6594d7559c3 security/cyrus-sasl/Makefile.common
--- a/security/cyrus-sasl/Makefile.common       Tue Mar 23 05:39:23 2004 +0000
+++ b/security/cyrus-sasl/Makefile.common       Tue Mar 23 06:13:30 2004 +0000
@@ -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 @@
 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 -r 89e8b548a539 -r a6594d7559c3 security/cyrus-sasl/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/cyrus-sasl/buildlink3.mk Tue Mar 23 06:13:30 2004 +0000
@@ -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/+$//}