Change the way the fetch process is organised as proposed on tech-pkg:

- Introduce FETCH_USING, which specifies the mechanism to use; possible
  values are ftp, fetch, curl, wget, manual and custom.
- Depend on the correct tool/program if not using manual or custom.
- For manual, just use /usr/bin/false to bail out if a distfile is
  missing.
- For custom, FETCH_CMD and related variables are used as before.
- Default value is ftp.

1 files changed, 10 insertions, 5 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 4cb846983ad..0ade3242b9d 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.180 2008/11/29 13:38:52 rillig Exp $
+# $NetBSD: mk.conf,v 1.181 2009/02/10 18:55:54 joerg Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -347,10 +347,15 @@ DEFAULT_VIEW?= ""
 # This is the default view to which packages are added after installation.
 # Default: "" (the empty view)
 
-FETCH_CMD?=             ${TOOLS_PATH.ftp}
-# Default program to fetch the files with pkgsrc.
-# Default: NetBSD's ftp(1).
-# Possible: any.
+FETCH_USING?=	ftp
+# The program type to fetch files.
+# "manual" will explicitly fail if the DISTFILES don't exist locally.
+# "custom" requires setting FETCH_CMD, FETCH_BEFORE_ARGS, FETCH_AFTER_ARGS,
+# FETCH_RESUME_ARGS and FETCH_OUTPUT_ARGS.
+#
+# The default value can be overriden by a package before including
+# bsd.prefs.mk and by the user in mk.conf.
+# Possible: curl, custom, fetch, ftp, manual, wget
 
 #FIX_SYSTEM_HEADERS=
 # Make pkgtools/posix_headers an automatic build dependency for all