summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archivers/bzip2/buildlink3.mk4
-rw-r--r--converters/libiconv/buildlink3.mk4
-rw-r--r--databases/db/buildlink3.mk4
-rw-r--r--devel/binutils/buildlink3.mk4
-rw-r--r--devel/gettext-lib/buildlink3.mk23
-rw-r--r--devel/libgetopt/buildlink3.mk4
-rw-r--r--devel/ncurses/buildlink3.mk12
-rw-r--r--devel/readline/buildlink3.mk4
-rw-r--r--devel/zlib/buildlink3.mk14
-rw-r--r--graphics/MesaLib/buildlink3.mk14
-rw-r--r--graphics/freetype2/buildlink3.mk16
-rw-r--r--graphics/glu/buildlink3.mk14
-rw-r--r--graphics/xpm/buildlink3.mk12
-rw-r--r--net/libpcap/buildlink3.mk4
-rw-r--r--security/PAM/buildlink3.mk4
-rw-r--r--security/heimdal/buildlink3.mk14
-rw-r--r--security/openssl/buildlink3.mk19
-rw-r--r--security/tcp_wrappers/buildlink3.mk4
-rw-r--r--x11/Xrender/buildlink3.mk14
19 files changed, 119 insertions, 69 deletions
diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk
index 5cede0713a0..4e7ea874ff2 100644
--- a/archivers/bzip2/buildlink3.mk
+++ b/archivers/bzip2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:31 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+
.if !empty(BZIP2_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= bzip2
-BUILDLINK_DEPENDS.bzip2?= bzip2>=1.0.1
+BUILDLINK_DEPENDS.bzip2+= bzip2>=1.0.1
BUILDLINK_PKGSRCDIR.bzip2?= ../../archivers/bzip2
.endif # BZIP2_BUILDLINK3_MK
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index 86aed18c0fb..472501168a7 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/06 19:13:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:31 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+
.if !empty(ICONV_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= iconv
-BUILDLINK_DEPENDS.iconv?= libiconv>=1.9.1
+BUILDLINK_DEPENDS.iconv+= libiconv>=1.9.1
BUILDLINK_PKGSRCDIR.iconv?= ../../converters/libiconv
.endif # ICONV_BUILDLINK3_MK
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index 89fd61ad34d..c1a3f892a74 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/22 08:58:59 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:31 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB2_BUILDLINK3_MK:= ${DB2_BUILDLINK3_MK}+
.if !empty(DB2_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= db
-BUILDLINK_DEPENDS.db?= db>=2.7.3
+BUILDLINK_DEPENDS.db+= db>=2.7.3
BUILDLINK_PKGSRCDIR.db?= ../../databases/db
.endif # DB2_BUILDLINK3_MK
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index dddee12dbe3..ee8d5e0818c 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+
.if !empty(BINUTILS_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= binutils
-BUILDLINK_DEPENDS.binutils?= binutils>=2.14.0
+BUILDLINK_DEPENDS.binutils+= binutils>=2.14.0
BUILDLINK_PKGSRCDIR.binutils?= ../../devel/binutils
BUILDLINK_DEPMETHOD.binutils?= build
.endif # BINUTILS_BUILDLINK3_MK
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 00eff33d8e6..96dfba1cc96 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/01/11 06:29:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/01/24 03:12:32 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+
.if !empty(GETTEXT_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= gettext
-BUILDLINK_DEPENDS.gettext?= gettext-lib>=0.10.35nb1
+BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.10.35nb1
BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib
.endif # GETTEXT_BUILDLINK3_MK
@@ -36,13 +36,17 @@ BUILDLINK_USE_BUILTIN.gettext= NO
# Consider the base system libintl to be gettext-lib-0.10.35nb1.
#
_GETTEXT_PKG= gettext-lib-0.10.35nb1
-_GETTEXT_DEPENDS= ${BUILDLINK_DEPENDS.gettext}
+BUILDLINK_USE_BUILTIN.gettext?= YES
+. for _depend_ in ${BUILDLINK_DEPENDS.gettext}
+. if !empty(BUILDLINK_USE_BUILTIN.gettext:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.gettext!= \
- if ${PKG_ADMIN} pmatch '${_GETTEXT_DEPENDS}' ${_GETTEXT_PKG}; then \
+ if ${PKG_ADMIN} pmatch '${_depend_}' ${_GETTEXT_PKG}; then \
${ECHO} "YES"; \
else \
${ECHO} "NO"; \
fi
+. endif
+. endfor
#
# The listed platforms have a broken (for the purposes of pkgsrc) version
# of gettext-lib.
@@ -70,9 +74,12 @@ BUILDLINK_DEPENDS+= gettext
_BLNK_LIBINTL= -lintl
_GETTEXT_ICONV_DEPENDS= gettext-lib>=0.11.5nb1
. if !defined(_GETTEXT_NEEDS_ICONV)
+_GETTEXT_NEEDS_ICONV?= NO
+. for _depend_ in ${BUILDLINK_DEPENDS.gettext}
+. if !empty(_GETTEXT_NEEDS_ICONV:M[nN][oO])
_GETTEXT_NEEDS_ICONV!= \
- if ${PKG_INFO} -qe "${BUILDLINK_DEPENDS.gettext}"; then \
- pkg=`cd ${_PKG_DBDIR}; ${PKG_ADMIN} -S lsbest '${BUILDLINK_DEPENDS.gettext}'`; \
+ if ${PKG_INFO} -qe '${_depend_}'; then \
+ pkg=`cd ${_PKG_DBDIR}; ${PKG_ADMIN} -S lsbest '${_depend_}'`; \
if ${PKG_INFO} -qN "$$pkg" | ${GREP} -q "libiconv-[0-9]"; then \
${ECHO} "YES"; \
else \
@@ -81,11 +88,13 @@ _GETTEXT_NEEDS_ICONV!= \
else \
${ECHO} "YES"; \
fi
+. endif
+. endfor
MAKEFLAGS+= _GETTEXT_NEEDS_ICONV=${_GETTEXT_NEEDS_ICONV}
. endif
. if ${_GETTEXT_NEEDS_ICONV} == "YES"
. include "../../converters/libiconv/buildlink3.mk"
-BUILDLINK_DEPENDS.gettext= ${_GETTEXT_ICONV_DEPENDS}
+BUILDLINK_DEPENDS.gettext+= ${_GETTEXT_ICONV_DEPENDS}
_BLNK_LIBINTL+= ${BUILDLINK_LDADD.iconv}
. endif
. else
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index b3a7f22570e..3049327ab69 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETOPT_BUILDLINK3_MK:= ${GETOPT_BUILDLINK3_MK}+
.if !empty(GETOPT_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= getopt
-BUILDLINK_DEPENDS.getopt?= libgetopt>=1.3
+BUILDLINK_DEPENDS.getopt+= libgetopt>=1.3
BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt
.endif # GETOPT_BUILDLINK3_MK
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index 4ebebd9bcd2..f7ef5fdab0b 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/01/21 04:28:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/01/24 03:12:32 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+
.if !empty(NCURSES_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= ncurses
-BUILDLINK_DEPENDS.ncurses?= ncurses>=5.0
+BUILDLINK_DEPENDS.ncurses+= ncurses>=5.0
BUILDLINK_PKGSRCDIR.ncurses?= ../../devel/ncurses
.endif # NCURSES_BUILDLINK3_MK
@@ -89,13 +89,17 @@ _NCURSES_VERSION!= \
} \
' ${_NCURSES_H}
_NCURSES_PKG= ncurses-${_NCURSES_VERSION}
-_NCURSES_DEPENDS= ${BUILDLINK_DEPENDS.ncurses}
+BUILDLINK_USE_BUILTIN.ncurses?= YES
+. for _depend_ in ${BUILDLINK_DEPENDS.ncurses}
+. if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.ncurses!= \
- if ${PKG_ADMIN} pmatch '${_NCURSES_DEPENDS}' ${_NCURSES_PKG}; then \
+ if ${PKG_ADMIN} pmatch '${_depend_}' ${_NCURSES_PKG}; then \
${ECHO} "YES"; \
else \
${ECHO} "NO"; \
fi
+. endif
+. endfor
. endif
MAKEFLAGS+= \
BUILDLINK_USE_BUILTIN.ncurses="${BUILDLINK_USE_BUILTIN.ncurses}"
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 4de81785e4b..48a538dff39 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/10 08:40:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:32 jlam Exp $
#
# Optionally define USE_GNU_READLINE to force use of GNU readline.
#
@@ -12,7 +12,7 @@ READLINE_BUILDLINK3_MK:= ${READLINE_BUILDLINK3_MK}+
.if !empty(READLINE_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= readline
-BUILDLINK_DEPENDS.readline?= readline>=2.2
+BUILDLINK_DEPENDS.readline+= readline>=2.2
BUILDLINK_PKGSRCDIR.readline?= ../../devel/readline
.endif # READLINE_BUILDLINK3_MK
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index f43ce6f5d4b..e57e721e817 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/19 23:11:19 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:32 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+
.if !empty(ZLIB_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= zlib
-BUILDLINK_DEPENDS.zlib?= zlib>=1.1.4nb1
+BUILDLINK_DEPENDS.zlib+= zlib>=1.1.4nb1
BUILDLINK_PKGSRCDIR.zlib?= ../../devel/zlib
.endif # ZLIB_BUILDLINK3_MK
@@ -70,13 +70,17 @@ _ZLIB_PKG= zlib-1.1.4nb1
. endfor
. endif
-_ZLIB_DEPENDS= ${BUILDLINK_DEPENDS.zlib}
+BUILDLINK_USE_BUILTIN.zlib?= YES
+. for _depend_ in ${BUILDLINK_DEPENDS.zlib}
+. if !empty(BUILDLINK_USE_BUILTIN.zlib:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.zlib!= \
- if ${PKG_ADMIN} pmatch '${_ZLIB_DEPENDS}' ${_ZLIB_PKG}; then \
+ if ${PKG_ADMIN} pmatch '${_depend_}' ${_ZLIB_PKG}; then \
${ECHO} "YES"; \
else \
${ECHO} "NO"; \
fi
+. endif
+. endfor
. endif
MAKEFLAGS+= BUILDLINK_USE_BUILTIN.zlib="${BUILDLINK_USE_BUILTIN.zlib}"
.endif
@@ -86,7 +90,7 @@ MAKEFLAGS+= BUILDLINK_USE_BUILTIN.zlib="${BUILDLINK_USE_BUILTIN.zlib}"
# If we depend on the package, depend on the latest version with a library
# major number bump.
#
-BUILDLINK_DEPENDS.zlib= zlib>=1.2.1
+BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1
. if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= zlib
. endif
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
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index fcf6ecb1003..c8cc751ce3a 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/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}+
LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+
.if !empty(LIBPCAP_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= libpcap
-BUILDLINK_DEPENDS.libpcap?= libpcap>=0.7.2
+BUILDLINK_DEPENDS.libpcap+= libpcap>=0.7.2
BUILDLINK_PKGSRCDIR.libpcap?= ../../net/libpcap
.endif # LIBPCAP_BUILDLINK3_MK
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
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index db51bb2a08c..ca4632a0776 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/01/24 01:52:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/01/24 03:12:32 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+
@@ -7,7 +7,7 @@ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+
.if !empty(XRENDER_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= Xrender
-BUILDLINK_DEPENDS.Xrender?= Xrender>=0.2
+BUILDLINK_DEPENDS.Xrender+= Xrender>=0.2
BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender
.endif # XRENDER_BUILDLINK3_MK
@@ -49,13 +49,17 @@ _XRENDER_MINOR!= \
${AWK} '/\#define[ ]*RENDER_MINOR/ { print "."$$3 }' ${_X11_EXTENSIONS_RENDER_H}
_XRENDER_VERSION= ${_XRENDER_MAJOR}${_XRENDER_MINOR}
_XRENDER_PKG= Xrender-${_XRENDER_VERSION}
-_XRENDER_DEPENDS= ${BUILDLINK_DEPENDS.Xrender}
+BUILDLINK_USE_BUILTIN.Xrender?= YES
+. for _depend_ in ${BUILDLINK_DEPENDS.Xrender}
+. if !empty(BUILDLINK_USE_BUILTIN.Xrender:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.Xrender!= \
- if ${PKG_ADMIN} pmatch '${_XRENDER_DEPENDS}' ${_XRENDER_PKG}; then \
+ if ${PKG_ADMIN} pmatch '${_depend_}' ${_XRENDER_PKG}; then \
${ECHO} "YES"; \
else \
${ECHO} "NO"; \
fi
+. endif
+. endfor
. endif
MAKEFLAGS+= \
BUILDLINK_USE_BUILTIN.Xrender="${BUILDLINK_USE_BUILTIN.Xrender}"
@@ -66,7 +70,7 @@ MAKEFLAGS+= \
# If we depend on the package, depend on the latest version with a library
# minor number bump.
#
-BUILDLINK_DEPENDS.Xrender= Xrender>=0.8.2
+BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2
. if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= Xrender
. endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-14 15:10:19 +0000