diff options
| author | joerg <joerg@pkgsrc.org> | 2009-02-14 18:51:20 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-02-14 18:51:20 +0000 |
| commit | eaaa208213408b6639779ac1129bdd9861f7ca64 (patch) | |
| tree | 9c7c3cf034ec8500d8fbc1ff4f3d683d72bdd75c /mk | |
| parent | 9118a9fbfb65b4d790576ccffa663e76c0638700 (diff) | |
| download | pkgsrc-eaaa208213408b6639779ac1129bdd9861f7ca64.tar.gz | |
Don't use += to append to an empty variable. If PASSIVE_FTP is not
defined, it would still leave the variable with a non-empty value and
that would be passed down to the fetch command when running fetch-list.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/fetch/fetch.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index b305386d186..b1879fb3ff9 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.39 2009/02/10 19:25:09 joerg Exp $ +# $NetBSD: fetch.mk,v 1.40 2009/02/14 18:51:20 joerg Exp $ _MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} @@ -189,9 +189,8 @@ fetch-check-interactive: .USEBEFORE # the whole file. The default is set in pkgsrc/mk/defaults/mk.conf. # -_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_BEFORE_ARGS.ftp= ${PASSIVE_FETCH:D-p} _FETCH_AFTER_ARGS.ftp= # empty _FETCH_RESUME_ARGS.ftp= -R _FETCH_OUTPUT_ARGS.ftp= -o @@ -209,8 +208,7 @@ _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_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 |