 @@ -1,14 +1,14 @@
-# $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
 # in the MAKECONF file, which is /etc/mk.conf by default.
+#
 # Note: This file is included after the MAKECONF file, so you cannot query
 # these default values in the MAKECONF using the ".if" and ".for"
 # preprocessing directives.
 # ************************************************************************
 # NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
 # ************************************************************************
 @@ -337,30 +337,35 @@ DISTDIR?=	${PKGSRCDIR}/distfiles
 # of the directories in ${DIST_PATH}, it will be downloaded into
 # ${DISTDIR}.  If the requested file is in one of the directories in
 # ${DIST_PATH}, a symbolic link will be made to it from ${DISTDIR}.
 # ${DIST_PATH} directories will will be searched before ${DISTDIR},
 # letting a CD hold the main distfiles archive, and local ${DISTDIR}
 # hold any updated distfiles, for example.
 # Possible:  any directories
 # Default: none
 DEFAULT_VIEW?= ""
 # This is the default view to which packages are added after installation.
 # Default: "" (the empty view)
-FETCH_CMD?=             ${TOOLS_PATH.ftp}
+FETCH_USING?=	ftp
-# Default program to fetch the files with pkgsrc.
+# The program type to fetch files.
-# Default: NetBSD's ftp(1).
+# "manual" will explicitly fail if the DISTFILES don't exist locally.
-# Possible: any.
+# "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
 # packages except those in the pkgtools category.
 # Possible: "yes", not defined
 # Default: not defined
 LIBTOOLIZE_PLIST?=	yes
 # This determines whether to expand libtool archives (.la files) in PLISTs
 # into the represented library names.
 # Possible: yes, no
 # Default: yes

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.fetch-vars.mk,v 1.11 2008/05/22 20:11:55 joerg Exp $
+# $NetBSD: bsd.fetch-vars.mk,v 1.12 2009/02/10 18:55:54 joerg Exp $
+#
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
 # bsd.fetch.mk is included.
+#
 # The following variables may be set by the user:
+#
 #    DISTDIR is the top-level directory into which all original
 #	distribution files are fetched.
+#
 #    DIST_PATH is a list of directories, separated by colons, in which
 #	the distribution files are looked up, additionally to DISTDIR.
 #	No files will ever be created in these directories.
 @@ -63,19 +63,25 @@ _ALLFILES?=	${_DISTFILES} ${_PATCHFILES}
 _ALLFILES:=	${_ALLFILES:O:u}	# remove duplicates
 _BUILD_DEFS+=	_DISTFILES _PATCHFILES
 # When mirroring distfiles which others may fetch, only fetch the
 # distfiles if it is allowed to be re-distributed freely.  Also,
 # suppress some bootstrap-depends output.
+#
 .if make(mirror-distfiles)
 NO_SKIP=		# defined
 _BOOTSTRAP_VERBOSE=	# defined
 .endif
-.if !empty(_CKSUMFILES)
+.if !empty(_CKSUMFILES) && defined(FAILOVER_FETCH)
 USE_TOOLS+=	ftp:bootstrap
 .  if defined(FAILOVER_FETCH)
 USE_TOOLS+=	digest:bootstrap
 .  endif
 .endif
 _FETCH_TOOLS.ftp=		ftp
 _FETCH_TOOLS.fetch=		fetch
 _FETCH_DEPENDS.wget=		wget-[0-9]*:../../net/wget
 _FETCH_DEPENDS.curl=		curl-[0-9]*:../../www/curl
 _FETCH_TOOLS.manual=		false
 USE_TOOLS+=	${_FETCH_TOOLS.${FETCH_USING}:C/$/:bootstrap/}
 BOOTSTRAP_DEPENDS+=	${_FETCH_DEPENDS.${FETCH_USING}}

 @@ -1,14 +1,14 @@
-# $NetBSD: fetch-list.mk,v 1.10 2009/02/08 23:16:08 wiz Exp $
+# $NetBSD: fetch-list.mk,v 1.11 2009/02/10 18:55:54 joerg Exp $
 ######################################################################
 ### fetch-list (PUBLIC)
 ######################################################################
 ### fetch-list is a public target to print out a standalone shell
 ### script to fetch all distfiles needed to build the package,
 ### including distfiles needed by dependencies.  This script does not
 ### perform any checksumming of the distfiles and does not resume
 ### interrupted file transfers.
 ###
 .PHONY: fetch-list
 fetch-list: fetch-list-header fetch-list-recursive
 @@ -72,38 +72,38 @@ fetch-list-one-pkg:
 			/^Size/ && $$2 == "(${fetchfile})" { print $$4 } \
 			' ${DISTINFO_FILE}` || true;			\
 		${ECHO} '# Fetch ${fetchfile} ('$${filesize-???}' bytes):'; \
 		${ECHO} '#';						\
 		${ECHO} '${SH} -s ${fetchfile:T} <<"EOF" |(';		\
 		${CAT} ${DYNAMIC_SITES_SCRIPT};				\
 		${ECHO} EOF;						\
 		${ECHO} read unsorted_sites;				\
 		${ECHO} 'unsorted_sites="$${unsorted_sites} ${_MASTER_SITE_BACKUP}"'; \
 		${ECHO} sites='"'${_ORDERED_SITES:Q}'"';		\
 		${ECHO} "${MKDIR} ${_DISTDIR}";				\
 		${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
 		${ECHO}	'for site in $$sites; do';			\
-		${ECHO} '	${FETCH_CMD} ${FETCH_BEFORE_ARGS} "$${site}${fetchfile:T}" ${FETCH_AFTER_ARGS} && break ||'; \
+		${ECHO} '	${_FETCH_CMD.${FETCH_USING}:Q} ${_FETCH_BEFORE_ARGS.${FETCH_USING}:Q} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}:Q} && break ||'; \
 		${ECHO} '	${ECHO} ${fetchfile:T} not fetched';	\
 		${ECHO}	'done; }';					\
 		${ECHO} ')';						\
 	fi)
 .    else
 	@(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then			\
 		${ECHO};						\
 		filesize=`${AWK} '					\
 			/^Size/ && $$2 == "(${fetchfile})" { print $$4 } \
 			' ${DISTINFO_FILE}` || true;			\
 		${ECHO} '# Fetch ${fetchfile} ('$${filesize-???}' bytes):'; \
 		${ECHO} '#';						\
 		${ECHO} 'unsorted_sites="${SITES.${fetchfile:T:S/=/--/}} ${_MASTER_SITE_BACKUP}"'; \
 		${ECHO} sites='"'${_ORDERED_SITES:Q}'"';		\
 		${ECHO} "${MKDIR} ${_DISTDIR}";				\
 		${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
 		${ECHO}	'for site in $$sites; do';			\
-		${ECHO} '	${FETCH_CMD} ${FETCH_BEFORE_ARGS} "$${site}${fetchfile:T}" ${FETCH_AFTER_ARGS} && break ||'; \
+		${ECHO} '	${_FETCH_CMD.${FETCH_USING}:Q} ${_FETCH_BEFORE_ARGS.${FETCH_USING}:Q} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}:Q} && break ||'; \
 		${ECHO} '	${ECHO} ${fetchfile:T} not fetched';	\
 		${ECHO}	'done; }';					\
 	fi)
 .    endif
 .  endfor
 .endif

 @@ -1,14 +1,14 @@
-# $NetBSD: fetch.mk,v 1.37 2008/10/08 15:39:07 joerg Exp $
+# $NetBSD: fetch.mk,v 1.38 2009/02/10 18:55:54 joerg Exp $
 _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE=	${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 # Where to put distfiles that don't have any other master site
 MASTER_SITE_LOCAL?=	${MASTER_SITE_BACKUP:=LOCAL_PORTS/}
 # Set up _ORDERED_SITES to work out the exact list of sites for every file,
 # using the dynamic sites script, or ordering according to the master site
 # list, MASTER_SORT_RANDOM randomization feature, or the patterns in
 # MASTER_SORT or MASTER_SORT_REGEX as appropriate.
 # No actual sorting is done until _ORDERED_SITES is expanded.
+#
 @@ -153,91 +153,98 @@ fetch-check-interactive: .USEBEFORE
 	${ERROR_MSG} "======================================================================"; \
 	exit 1
 .else
 	@${DO_NADA}
 .endif
 ######################################################################
 ### do-fetch-file (PRIVATE)
 ######################################################################
 ### do-fetch-file is a macro target that runs the "fetch" script to
 ### transfer the files from the appropriate sites if needed.
 ###
+#
-# FETCH_CMD is the program used to fetch files.  It must understand
+# FETCH_CMD is the program used to fetch files for FETCH_USING=manual.
-#	fetching files located via URLs, e.g. NetBSD's ftp, net/tnftp,
+#       It must understand fetching files located via URLs,
-#	etc.  The default value is set in pkgsrc/mk/defaults/mk.conf.
+#	e.g. NetBSD's ftp, net/tnftp, etc.
+#
 # The following variables are all lists of options to pass to he command
 # used to do the actual fetching of the file.
+#
 # FETCH_BEFORE_ARGS appear before all other options on the command line.
+#
 # FETCH_AFTER_ARGS appear after all other options on the command line.
+#
 # FETCH_RESUME_ARGS appears just after FETCH_BEFORE_ARGS and is the set
 #	of options for causing the command to resume a previous transfer.
+#
 # FETCH_OUTPUT_ARGS is a set of options for specifying the name of the
 #	local file that will hold the contents of the fetched file.
+#
 # FAILOVER_FETCH, if defined, will cause a checksum to be performed during
 #	a fetch to verify the transferred file is correct; if the checksum
 #	is incorrect, then the next site will be tried.
+#
 # PKG_RESUME_TRANSFERS is a yes/no variable that causes the fetch script
 #	to try to resume interrupted file transfers to avoid downloading
 #	the whole file.  The default is set in pkgsrc/mk/defaults/mk.conf.
+#
 #FETCH_CMD?=		ftp	# default is set by pkgsrc/mk/defaults/mk.conf
 FETCH_BEFORE_ARGS?=	${_FETCH_BEFORE_ARGS.${FETCH_CMD:T}}
 FETCH_AFTER_ARGS?=	${_FETCH_AFTER_ARGS.${FETCH_CMD:T}}
 FETCH_RESUME_ARGS?=	${_FETCH_RESUME_ARGS.${FETCH_CMD:T}}
 FETCH_OUTPUT_ARGS?=	${_FETCH_OUTPUT_ARGS.${FETCH_CMD:T}}
 _FETCH_BEFORE_ARGS.ftp=		# empty
 # If this host is behind a filtering firewall, use passive ftp(1)
 _FETCH_BEFORE_ARGS.ftp+=	${PASSIVE_FETCH:D-p}
 _FETCH_AFTER_ARGS.ftp=		# empty
 _FETCH_RESUME_ARGS.ftp=		-R
 _FETCH_OUTPUT_ARGS.ftp=		-o
 _FETCH_CMD.ftp=			${TOOLS_PATH.ftp}
 _FETCH_BEFORE_ARGS.fetch=	# empty
 _FETCH_AFTER_ARGS.fetch=	# empty
 _FETCH_RESUME_ARGS.fetch=	-r
 _FETCH_OUTPUT_ARGS.fetch=	-o
 _FETCH_CMD.fetch=		${TOOLS_PATH.fetch}
 _FETCH_BEFORE_ARGS.wget=	# empty
 _FETCH_AFTER_ARGS.wget=		# empty
 _FETCH_RESUME_ARGS.wget=	-c
 _FETCH_OUTPUT_ARGS.wget=	-O
 _FETCH_CMD.wget=		${PREFIX}/bin/wget
 _FETCH_BEFORE_ARGS.curl=	# empty
 _FETCH_BEFORE_ARGS.curl+=	${PASSIVE_FETCH:D--ftp-pasv}
 _FETCH_AFTER_ARGS.curl=		-O # must be here to honor -o option
 _FETCH_RESUME_ARGS.curl=	-C -
 _FETCH_OUTPUT_ARGS.curl=	-o
 _FETCH_CMD.curl=		${PREFIX}/bin/wget
 _FETCH_CMD.manual=		${TOOLS_PATH.false}
 _FETCH_CMD.custom=		${FETCH_CMD}
 _FETCH_BEFORE_ARGS.custom=	${FETCH_BEFORE_ARGS}
 _FETCH_AFTER_ARGS.custom=	${FETCH_AFTER_ARGS}
 _FETCH_RESUME_ARGS.custom=	${FETCH_RESUME_ARGS}
 _FETCH_OUTPUT_ARGS.custom=	${FETCH_OUTPUT_ARGS}
 _FETCH_CMD=	${SETENV} CHECKSUM=${_CHECKSUM_CMD:Q}			\
-			CP=${TOOLS_CP:Q}				\
+		CP=${TOOLS_CP:Q}				\
-			ECHO=${TOOLS_ECHO:Q}				\
+		ECHO=${TOOLS_ECHO:Q}				\
-			FETCH_CMD=${FETCH_CMD:Q}			\
+		FETCH_CMD=${_FETCH_CMD.${FETCH_USING}:Q}	\
-			FETCH_BEFORE_ARGS=${FETCH_BEFORE_ARGS:Q}	\
+		FETCH_BEFORE_ARGS=${_FETCH_BEFORE_ARGS.${FETCH_USING}:Q} \
-			FETCH_AFTER_ARGS=${FETCH_AFTER_ARGS:Q}		\
+		FETCH_AFTER_ARGS=${_FETCH_AFTER_ARGS.${FETCH_USING}:Q}   \
-			FETCH_RESUME_ARGS=${FETCH_RESUME_ARGS:Q}	\
+		FETCH_RESUME_ARGS=${_FETCH_RESUME_ARGS.${FETCH_USING}:Q} \
-			FETCH_OUTPUT_ARGS=${FETCH_OUTPUT_ARGS:Q}	\
+		FETCH_OUTPUT_ARGS=${_FETCH_OUTPUT_ARGS.${FETCH_USING}:Q} \
-			MKDIR=${TOOLS_MKDIR:Q} MV=${TOOLS_MV:Q}		\
+		MKDIR=${TOOLS_MKDIR:Q} MV=${TOOLS_MV:Q}		\
-			TEST=${TOOLS_TEST:Q} TOUCH=${TOOLS_TOUCH:Q}	\
+		TEST=${TOOLS_TEST:Q} TOUCH=${TOOLS_TOUCH:Q}	\
-			WC=${TOOLS_WC:Q}				\
+		WC=${TOOLS_WC:Q}				\
 		${SH} ${PKGSRCDIR}/mk/fetch/fetch
 _FETCH_ARGS+=	${PKG_VERBOSE:D-v}
 .if exists(${DISTINFO_FILE})
 _FETCH_ARGS+=	${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:Q}
 .endif
 .if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS])
 _FETCH_ARGS+=	-r
 .endif
 .if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
 _FETCH_ARGS+=	-d ${DIST_SUBDIR}
 .endif