diff options
| author | jlam <jlam> | 2006-07-19 13:33:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-19 13:33:42 +0000 |
| commit | fcff767f0c481d585983782318c36a9d3a735f01 (patch) | |
| tree | bc43aa6a5272b60d30ffbe3d64cc5a4de7bffdf5 /mk | |
| parent | 2d2bf68248df973b85a6b1451880dddcd6b4547a (diff) | |
| download | pkgsrc-fcff767f0c481d585983782318c36a9d3a735f01.tar.gz | |
PASSIVE_FETCH only affects "ftp", so move it to the ftp-related FETCH_*
variables.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/fetch/fetch.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index dbb1d8599ce..70811db332f 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -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_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 -_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} \ |