[pkgsrc/trunk]: pkgsrc/mk/fetch PASSIVE_FETCH only affects "ftp", so move it ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2af185069baf
branches:  trunk
changeset: 516326:2af185069baf
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jul 19 13:33:42 2006 +0000

description:
PASSIVE_FETCH only affects "ftp", so move it to the ftp-related FETCH_*
variables.

diffstat:

 mk/fetch/fetch.mk |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (29 lines):

diff -r 94ab7adef397 -r 2af185069baf mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Wed Jul 19 10:56:51 2006 +0000
+++ b/mk/fetch/fetch.mk Wed Jul 19 13:33:42 2006 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: fetch.mk,v 1.11 2006/07/18 23:27:14 jlam Exp $
-
-# If this host is behind a filtering firewall, use passive ftp(1)
-FETCH_BEFORE_ARGS+=    ${PASSIVE_FETCH:D-p}
+# $NetBSD: fetch.mk,v 1.12 2006/07/19 13:33:42 jlam Exp $
 
 _MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -202,10 +199,12 @@
 FETCH_RESUME_ARGS?=    ${_FETCH_RESUME_ARGS.${FETCH_CMD:T}}
 FETCH_OUTPUT_ARGS?=    ${_FETCH_OUTPUT_ARGS.${FETCH_CMD:T}}
 
-_FETCH_BEFORE_ARGS.ftp=        # empty
-_FETCH_AFTER_ARGS.ftp= # empty
-_FETCH_RESUME_ARGS.ftp=        -R
-_FETCH_OUTPUT_ARGS.ftp=        -o
+_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=    ${SETENV} CHECKSUM=${_CHECKSUM_CMD:Q}                   \
                        CP=${TOOLS_CP:Q}                                \