pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/fetch Don't use += to append to an empty variable. ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8fa134b1fd95
branches:  trunk
changeset: 554438:8fa134b1fd95
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Feb 14 18:51:20 2009 +0000

description:
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:

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

diffs (30 lines):

diff -r 4ebb50e14fdd -r 8fa134b1fd95 mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Sat Feb 14 18:45:12 2009 +0000
+++ b/mk/fetch/fetch.mk Sat Feb 14 18:51:20 2009 +0000
@@ -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 @@
 #      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_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



Home | Main Index | Thread Index | Old Index