diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/binutils/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/gettext-lib/buildlink3.mk | 23 | ||||
-rw-r--r-- | devel/libgetopt/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/ncurses/buildlink3.mk | 12 | ||||
-rw-r--r-- | devel/readline/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/zlib/buildlink3.mk | 14 |
6 files changed, 39 insertions, 22 deletions
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 |