pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Support BUILDLINK_DEPENDS.<pkg> being a list of values.
details: https://anonhg.NetBSD.org/pkgsrc/rev/1e6d8775a31d
branches: trunk
changeset: 466877:1e6d8775a31d
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Jan 24 03:12:31 2004 +0000
description:
Support BUILDLINK_DEPENDS.<pkg> being a list of values.
diffstat:
archivers/bzip2/buildlink3.mk | 4 ++--
converters/libiconv/buildlink3.mk | 4 ++--
databases/db/buildlink3.mk | 4 ++--
devel/binutils/buildlink3.mk | 4 ++--
devel/gettext-lib/buildlink3.mk | 23 ++++++++++++++++-------
devel/libgetopt/buildlink3.mk | 4 ++--
devel/ncurses/buildlink3.mk | 12 ++++++++----
devel/readline/buildlink3.mk | 4 ++--
devel/zlib/buildlink3.mk | 14 +++++++++-----
graphics/MesaLib/buildlink3.mk | 14 +++++++++-----
graphics/freetype2/buildlink3.mk | 16 ++++++++++------
graphics/glu/buildlink3.mk | 14 +++++++++-----
graphics/xpm/buildlink3.mk | 12 ++++++++----
net/libpcap/buildlink3.mk | 4 ++--
security/PAM/buildlink3.mk | 4 ++--
security/heimdal/buildlink3.mk | 14 +++++++++-----
security/openssl/buildlink3.mk | 19 ++++++++++++++-----
security/tcp_wrappers/buildlink3.mk | 4 ++--
x11/Xrender/buildlink3.mk | 14 +++++++++-----
19 files changed, 119 insertions(+), 69 deletions(-)
diffs (truncated from 648 to 300 lines):
diff -r 6440f25b15bc -r 1e6d8775a31d archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/archivers/bzip2/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 @@
.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 -r 6440f25b15bc -r 1e6d8775a31d converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 @@
.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 -r 6440f25b15bc -r 1e6d8775a31d databases/db/buildlink3.mk
--- a/databases/db/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/databases/db/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 -r 6440f25b15bc -r 1e6d8775a31d devel/binutils/buildlink3.mk
--- a/devel/binutils/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/devel/binutils/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 @@
.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 -r 6440f25b15bc -r 1e6d8775a31d devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 @@
.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 @@
# 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 @@
_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 @@
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 -r 6440f25b15bc -r 1e6d8775a31d devel/libgetopt/buildlink3.mk
--- a/devel/libgetopt/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/devel/libgetopt/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 -r 6440f25b15bc -r 1e6d8775a31d devel/ncurses/buildlink3.mk
--- a/devel/ncurses/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/devel/ncurses/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 @@
.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_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 -r 6440f25b15bc -r 1e6d8775a31d devel/readline/buildlink3.mk
--- a/devel/readline/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/devel/readline/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 @@
.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 -r 6440f25b15bc -r 1e6d8775a31d devel/zlib/buildlink3.mk
--- a/devel/zlib/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/devel/zlib/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 @@
.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 @@
. 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 @@
# 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 -r 6440f25b15bc -r 1e6d8775a31d graphics/MesaLib/buildlink3.mk
--- a/graphics/MesaLib/buildlink3.mk Sat Jan 24 02:05:01 2004 +0000
+++ b/graphics/MesaLib/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
@@ -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 @@
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 @@
#
. 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 @@
# If we depend on the package, depend on the latest version with a library
# major number bump.
Home |
Main Index |
Thread Index |
Old Index