diff options
| author | obache <obache@pkgsrc.org> | 2014-02-14 07:43:46 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-02-14 07:43:46 +0000 |
| commit | 15bace3051f66d3478274420a55d88c6af83ff26 (patch) | |
| tree | 381a428decc86481ef40804fa01638709b7d29e5 /mk/tools | |
| parent | 3decbc0d9419b31dc08a3be4a60dd0d5df7fce8c (diff) | |
| download | pkgsrc-15bace3051f66d3478274420a55d88c6af83ff26.tar.gz | |
tell wget as a tool.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/replace.mk | 12 | ||||
| -rw-r--r-- | mk/tools/tools.Cygwin.mk | 5 | ||||
| -rw-r--r-- | mk/tools/tools.Linux.mk | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 4b357ca0f70..338d46fd838 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.266 2014/02/02 07:09:23 richard Exp $ +# $NetBSD: replace.mk,v 1.267 2014/02/14 07:43:46 obache Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -855,6 +855,16 @@ TOOLS_PATH.unzoo= ${TOOLS_PREFIX.unzoo}/bin/unzoo . endif .endif +.if !defined(TOOLS_IGNORE.wget) && !empty(_USE_TOOLS:Mwget) +. if !empty(PKGPATH:Mnet/wget) +MAKEFLAGS+= TOOLS_IGNORE.wget= +. elif !empty(_TOOLS_USE_PKGSRC.wget:M[yY][eE][sS]) +TOOLS_DEPENDS.wget?= wget-[0-9]*:../../net/wget +TOOLS_FIND_PREFIX+= TOOLS_PREFIX.wget=wget +TOOLS_PATH.wget= ${TOOLS_PREFIX.wget}/bin/wget +. endif +.endif + .if !defined(TOOLS_IGNORE.wish) && !empty(_USE_TOOLS:Mwish) . if !empty(PKGPATH:Mx11/tk) MAKEFLAGS+= TOOLS_IGNORE.wish= diff --git a/mk/tools/tools.Cygwin.mk b/mk/tools/tools.Cygwin.mk index b9a4c2c4f3b..3b630f3a469 100644 --- a/mk/tools/tools.Cygwin.mk +++ b/mk/tools/tools.Cygwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Cygwin.mk,v 1.5 2013/11/06 13:12:50 obache Exp $ +# $NetBSD: tools.Cygwin.mk,v 1.6 2014/02/14 07:43:46 obache Exp $ # # System-supplied tools for the Cygwin operating system. @@ -135,6 +135,9 @@ TOOLS_PLATFORM.tsort?= /bin/tsort TOOLS_PLATFORM.unzip?= /bin/unzip .endif TOOLS_PLATFORM.wc?= /bin/wc +.if exists(/bin/wget) +TOOLS_PLATFORM.wget?= /bin/wget +.endif TOOLS_PLATFORM.xargs?= /bin/xargs -r .if exists(/bin/xgettext) TOOLS_PLATFORM.xgettext?= /bin/xgettext diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk index 699db4914f5..c9deb135288 100644 --- a/mk/tools/tools.Linux.mk +++ b/mk/tools/tools.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Linux.mk,v 1.52 2013/11/06 13:12:50 obache Exp $ +# $NetBSD: tools.Linux.mk,v 1.53 2014/02/14 07:43:46 obache Exp $ # # System-supplied tools for the Linux operating system. @@ -239,6 +239,9 @@ TOOLS_PLATFORM.tr?= /usr/bin/tr TOOLS_PLATFORM.true?= true # shell builtin TOOLS_PLATFORM.tsort?= /usr/bin/tsort TOOLS_PLATFORM.wc?= /usr/bin/wc +.if exists(/usr/bin/wget) +TOOLS_PLATFORM.wget?= /usr/bin/wget +.endif TOOLS_PLATFORM.xargs?= /usr/bin/xargs -r .if exists(/usr/bin/xgettext) TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext |