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

4 files changed, 36 insertions, 20 deletions

diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 71c0ceb0572..0bf083a75e9 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/01/24 01:53:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/01/24 03:12:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
 MESA_REQD?=		3.4.2
 
 BUILDLINK_PACKAGES+=		MesaLib
-BUILDLINK_DEPENDS.MesaLib?=	MesaLib>=${MESA_REQD}
+BUILDLINK_DEPENDS.MesaLib+=	MesaLib>=${MESA_REQD}
 BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 .endif	# MESALIB_BUILDLINK3_MK
 
@@ -47,13 +47,17 @@ BUILDLINK_USE_BUILTIN.MesaLib=	NO
 #
 .    include "../../graphics/Mesa/version.mk"
 _MESALIB_PKG=		MesaLib-${_MESA_VERSION}
-_MESALIB_DEPENDS=	${BUILDLINK_DEPENDS.MesaLib}
+BUILDLINK_USE_BUILTIN.MesaLib?=	YES
+.    for _depend_ in ${BUILDLINK_DEPENDS.MesaLib}
+.      if !empty(BUILDLINK_USE_BUILTIN.MesaLib:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.MesaLib!=	\
-	if ${PKG_ADMIN} pmatch '${_MESALIB_DEPENDS}' ${_MESALIB_PKG}; then \
+	if ${PKG_ADMIN} pmatch '${_depend_}' ${_MESALIB_PKG}; then	\
 		${ECHO} "YES";						\
 	else								\
 		${ECHO} "NO";						\
 	fi
+.      endif
+.    endfor
 .  endif
 MAKEFLAGS+=	\
 	BUILDLINK_USE_BUILTIN.MesaLib="${BUILDLINK_USE_BUILTIN.MesaLib}"
@@ -64,7 +68,7 @@ MAKEFLAGS+=	\
 # If we depend on the package, depend on the latest version with a library
 # major number bump.
 #
-BUILDLINK_DEPENDS.MesaLib=	MesaLib>=5.0
+BUILDLINK_DEPENDS.MesaLib+=	MesaLib>=5.0
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=		MesaLib
 .  endif
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index 68f558faf0c..6d54538e606 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/01/24 01:46:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/01/24 03:12:32 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
 
 .if !empty(FREETYPE2_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		freetype2
-BUILDLINK_DEPENDS.freetype2?=	freetype2>=2.0.1
+BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.0.1
 BUILDLINK_PKGSRCDIR.freetype2?=	../../graphics/freetype2
 BUILDLINK_INCDIRS.freetype2?=	include/freetype2
 .endif	# FREETYPE2_BUILDLINK3_MK
@@ -53,13 +53,17 @@ _FREETYPE2_PATCH!=	\
 	${AWK} 'BEGIN { patch=0; } /\#define[ 	]*FREETYPE_PATCH/ { patch=$$3; } END { print "."patch; }' ${_FREETYPE2_FREETYPE_H}
 _FREETYPE2_VERSION=	${_FREETYPE2_MAJOR}${_FREETYPE2_MINOR}${_FREETYPE2_PATCH}
 _FREETYPE2_PKG=		freetype2-${_FREETYPE2_VERSION}
-_FREETYPE2_DEPENDS=	${BUILDLINK_DEPENDS.freetype2}
+BUILDLINK_USE_BUILTIN.freetype2?=	YES
+.    for _depend_ in ${BUILDLINK_DEPENDS.freetype2}
+.      if !empty(BUILDLINK_USE_BUILTIN.freetype2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.freetype2!=	\
-	if ${PKG_ADMIN} pmatch '${_FREETYPE2_DEPENDS}' ${_FREETYPE2_PKG}; then \
+	if ${PKG_ADMIN} pmatch '${_depend_}' ${_FREETYPE2_PKG}; then	\
 		${ECHO} "YES";						\
 	else								\
 		${ECHO} "NO";						\
 	fi
+.      endif
+.    endfor
 .  endif
 MAKEFLAGS+=	\
 	BUILDLINK_USE_BUILTIN.freetype2="${BUILDLINK_USE_BUILTIN.freetype2}"
@@ -70,7 +74,7 @@ MAKEFLAGS+=	\
 # If we depend on the package, depend on the latest version with a library
 # major number bump.
 #
-BUILDLINK_DEPENDS.freetype2=	freetype2>=2.1.3
+BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.3
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=		freetype2
 .  endif
@@ -86,4 +90,4 @@ FREETYPE_CONFIG?=	${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
 CONFIGURE_ENV+=		FREETYPE_CONFIG="${FREETYPE_CONFIG}"
 .endif	# FREETYPE2_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 1ba14096f9b..155ac7035d8 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/01/24 01:53:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/01/24 03:12:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
 MESA_REQD?=		3.4.2
 
 BUILDLINK_PACKAGES+=		glu
-BUILDLINK_DEPENDS.glu?=		glu>=${MESA_REQD}
+BUILDLINK_DEPENDS.glu+=		glu>=${MESA_REQD}
 BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
 .endif	# GLU_BUILDLINK3_MK
 
@@ -47,13 +47,17 @@ BUILDLINK_USE_BUILTIN.glu=	NO
 #
 .    include "../../graphics/Mesa/version.mk"
 _GLU_PKG=	glu-${_MESA_VERSION}
-_GLU_DEPENDS=	${BUILDLINK_DEPENDS.glu}
+BUILDLINK_USE_BUILTIN.glu?=	YES
+.    for _depend_ in ${BUILDLINK_DEPENDS.glu}
+.      if !empty(BUILDLINK_USE_BUILTIN.glu:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.glu!=	\
-	if ${PKG_ADMIN} pmatch '${_GLU_DEPENDS}' ${_GLU_PKG}; then \
+	if ${PKG_ADMIN} pmatch '${_depend_}' ${_GLU_PKG}; then		\
 		${ECHO} "YES";						\
 	else								\
 		${ECHO} "NO";						\
 	fi
+.      endif
+.    endfor
 .  endif
 MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.glu="${BUILDLINK_USE_BUILTIN.glu}"
 .endif	# BUILDLINK_USE_BUILTIN.glu
@@ -63,7 +67,7 @@ MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.glu="${BUILDLINK_USE_BUILTIN.glu}"
 # If we depend on the package, depend on the latest version with a library
 # major number bump.
 #
-BUILDLINK_DEPENDS.glu=	glu>=5.0.2nb3
+BUILDLINK_DEPENDS.glu+=	glu>=5.0.2nb3
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	glu
 .  endif
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index aa1f657842f..4a38458f9d2 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/01/24 01:51:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/01/24 03:12:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XPM_BUILDLINK3_MK:=	${XPM_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ XPM_BUILDLINK3_MK:=	${XPM_BUILDLINK3_MK}+
 
 .if !empty(XPM_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		xpm
-BUILDLINK_DEPENDS.xpm?=		xpm>=3.4k
+BUILDLINK_DEPENDS.xpm+=		xpm>=3.4k
 BUILDLINK_PKGSRCDIR.xpm?=	../../graphics/xpm
 .endif	# XPM_BUILDLINK3_MK
 
@@ -64,13 +64,17 @@ _XPM_PATCH!=	\
 	${AWK} 'BEGIN { split("abcdefghijklmnopqrstuvwxyz", alpha, "") } /\#define[ 	]*XpmRevision/ { print alpha[$$3] }' ${_X11_XPM_H}
 _XPM_VERSION=	${_XPM_MAJOR}${_XPM_MINOR}${_XPM_PATCH}
 _XPM_PKG=	xpm-${_XPM_VERSION}
-_XPM_DEPENDS=	${BUILDLINK_DEPENDS.xpm}
+BUILDLINK_USE_BUILTIN.xpm?=	YES
+.    for _depend_ in ${BUILDLINK_DEPENDS.xpm}
+.      if !empty(BUILDLINK_USE_BUILTIN.xpm:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.xpm!=	\
-	if ${PKG_ADMIN} pmatch '${_XPM_DEPENDS}' ${_XPM_PKG}; then	\
+	if ${PKG_ADMIN} pmatch '${_depend_}' ${_XPM_PKG}; then		\
 		${ECHO} "YES";						\
 	else								\
 		${ECHO} "NO";						\
 	fi
+.      endif
+.    endfor
 .  endif
 MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.xpm="${BUILDLINK_USE_BUILTIN.xpm}"
 .endif	# BUILDLINK_USE_BUILTIN.xpm