tell wget as a tool.

6 files changed, 26 insertions, 8 deletions

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index bbfd661b435..27e634459a5 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.339 2013/12/19 23:50:29 tron Exp $
+# $NetBSD: bsd.prefs.mk,v 1.340 2014/02/14 07:43:46 obache Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -678,6 +678,8 @@ USE_TOOLS+=	awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc		\
 FETCH_USING=	fetch
 .  elif defined(TOOLS_PLATFORM.curl)
 FETCH_USING=	curl
+.  elif defined(TOOLS_PLATFORM.wget)
+FETCH_USING=	wget
 .  else
 FETCH_USING=	ftp
 .  endif
diff --git a/mk/fetch/bsd.fetch-vars.mk b/mk/fetch/bsd.fetch-vars.mk
index 0eb551d0ed5..6b2c65b0f0a 100644
--- a/mk/fetch/bsd.fetch-vars.mk
+++ b/mk/fetch/bsd.fetch-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.fetch-vars.mk,v 1.14 2012/07/27 10:48:36 jperkin Exp $
+# $NetBSD: bsd.fetch-vars.mk,v 1.15 2014/02/14 07:43:46 obache Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -79,7 +79,7 @@ USE_TOOLS+=	digest:bootstrap
 
 _FETCH_TOOLS.ftp=		ftp
 _FETCH_TOOLS.fetch=		fetch
-_FETCH_DEPENDS.wget=		wget-[0-9]*:../../net/wget
+_FETCH_TOOLS.wget=		wget
 _FETCH_TOOLS.curl=		curl
 _FETCH_TOOLS.manual=		false
 
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk
index 1d5ee544aac..9b02d46b5e6 100644
--- a/mk/fetch/fetch.mk
+++ b/mk/fetch/fetch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.62 2013/11/16 15:29:39 jakllsch Exp $
+# $NetBSD: fetch.mk,v 1.63 2014/02/14 07:43:46 obache Exp $
 
 _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE=	${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -219,7 +219,7 @@ _FETCH_BEFORE_ARGS.wget=	${PASSIVE_FETCH:D--passive-ftp} \
 _FETCH_AFTER_ARGS.wget=		# empty
 _FETCH_RESUME_ARGS.wget=	-c
 _FETCH_OUTPUT_ARGS.wget=	-O
-_FETCH_CMD.wget=		${PREFIX}/bin/wget
+_FETCH_CMD.wget=		${TOOLS_PATH.wget}
 
 _FETCH_BEFORE_ARGS.curl=	${PASSIVE_FETCH:D--ftp-pasv} \
 				--fail --insecure --location \
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