Support BUILDLINK_DEPENDS.<pkg> being a list of values.

4 files changed, 27 insertions, 14 deletions

diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index 29c2aac5536..08dd8c4a553 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
 
 .if !empty(PAM_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		pam
-BUILDLINK_DEPENDS.pam?=		PAM>=0.75
+BUILDLINK_DEPENDS.pam+=		PAM>=0.75
 BUILDLINK_PKGSRCDIR.pam?=	../../security/PAM
 .endif	# PAM_BUILDLINK3_MK
 
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 62aa4d55852..3f5b403bf9e 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/13 00:00:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
 
 .if !empty(HEIMDAL_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		heimdal
-BUILDLINK_DEPENDS.heimdal?=	heimdal>=0.4e
+BUILDLINK_DEPENDS.heimdal+=	heimdal>=0.4e
 BUILDLINK_PKGSRCDIR.heimdal?=	../../security/heimdal
 BUILDLINK_INCDIRS.heimdal?=	include/krb5
 .endif	# HEIMDAL_BUILDLINK3_MK
@@ -69,13 +69,17 @@ MAKEFLAGS+=	_HEIMDAL_VERSION="${_HEIMDAL_VERSION}"
 .    endif
 
 _HEIMDAL_PKG=		heimdal-${_HEIMDAL_VERSION}
-_HEIMDAL_DEPENDS=	${BUILDLINK_DEPENDS.heimdal}
+BUILDLINK_USE_BUILTIN.heimdal?=	YES
+.    for _depend_ in ${BUILDLINK_DEPENDS.heimdal}
+.      if !empty(BUILDLINK_USE_BUILTIN.heimdal:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.heimdal!=		\
-	if ${PKG_ADMIN} pmatch '${_HEIMDAL_DEPENDS}' ${_HEIMDAL_PKG}; then \
+	if ${PKG_ADMIN} pmatch '${_depend_}' ${_HEIMDAL_PKG}; then	\
 		${ECHO} "YES";						\
 	else								\
 		${ECHO} "NO";						\
 	fi
+.      endif
+.    endfor
 .  endif
 MAKEFLAGS+=	\
 	BUILDLINK_USE_BUILTIN.heimdal="${BUILDLINK_USE_BUILTIN.heimdal}"
@@ -86,7 +90,7 @@ MAKEFLAGS+=	\
 # If we depend on the package, depend on the latest version with a library
 # major number bump.
 #
-BUILDLINK_DEPENDS.heimdal=	heimdal>=0.6
+BUILDLINK_DEPENDS.heimdal+=	heimdal>=0.6
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=		heimdal
 .  endif
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 845b9ddb00f..7da411a6593 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/21 10:03:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/01/24 03:12:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
 _OPENSSL_PKGSRC_PKGNAME=	openssl-0.9.6l
 
 BUILDLINK_PACKAGES+=		openssl
-BUILDLINK_DEPENDS.openssl?=	openssl>=0.9.6l
+BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.6l
 BUILDLINK_PKGSRCDIR.openssl?=	../../security/openssl
 .endif	# OPENSSL_BUILDLINK3_MK
 
@@ -104,25 +104,34 @@ _OPENSSL_HAS_FIX!=							\
 _OPENSSL_PKG=		openssl-0.9.6l
 .    endif
 
-_OPENSSL_DEPENDS=	${BUILDLINK_DEPENDS.openssl}
+BUILDLINK_USE_BUILTIN.openssl?=	YES
+.    for _depend_ in ${BUILDLINK_DEPENDS.openssl}
+.      if !empty(BUILDLINK_USE_BUILTIN.openssl:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.openssl!=		\
-	if ${PKG_ADMIN} pmatch '${_OPENSSL_DEPENDS}' ${_OPENSSL_PKG}; then \
+	if ${PKG_ADMIN} pmatch '${_depend_}' ${_OPENSSL_PKG}; then	\
 		${ECHO} "YES";						\
 	else								\
 		${ECHO} "NO";						\
 	fi
+.      endif
+.    endfor
 .  endif
 MAKEFLAGS+=	\
 	BUILDLINK_USE_BUILTIN.openssl="${BUILDLINK_USE_BUILTIN.openssl}"
 .endif
 
 .if !defined(_NEED_NEWER_OPENSSL)
+_NEED_NEWER_OPENSSL?=	NO
+.  for _depend_ in ${BUILDLINK_DEPENDS.openssl}
+.    if !empty(_NEED_NEWER_OPENSSL:M[nN][oO])
 _NEED_NEWER_OPENSSL!=	\
-	if ${PKG_ADMIN} pmatch '${BUILDLINK_DEPENDS.openssl}' ${_OPENSSL_PKGSRC_PKGNAME}; then \
+	if ${PKG_ADMIN} pmatch '${_depend_}' ${_OPENSSL_PKGSRC_PKGNAME}; then \
 		${ECHO} "NO";						\
 	else								\
 		${ECHO} "YES";						\
 	fi
+.    endif
+.  endfor
 MAKEFLAGS+=	_NEED_NEWER_OPENSSL="${_NEED_NEWER_OPENSSL}"
 .endif
 
diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk
index fd7a1e63f09..b2f6e8f58d2 100644
--- a/security/tcp_wrappers/buildlink3.mk
+++ b/security/tcp_wrappers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCP_WRAPPERS_BUILDLINK3_MK:=	${TCP_WRAPPERS_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ TCP_WRAPPERS_BUILDLINK3_MK:=	${TCP_WRAPPERS_BUILDLINK3_MK}+
 
 .if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			tcp_wrappers
-BUILDLINK_DEPENDS.tcp_wrappers?=	tcp_wrappers>=7.6.1nb1
+BUILDLINK_DEPENDS.tcp_wrappers+=	tcp_wrappers>=7.6.1nb1
 BUILDLINK_PKGSRCDIR.tcp_wrappers?=	../../security/tcp_wrappers
 .endif	# TCP_WRAPPERS_BUILDLINK3_MK