Move the recently-added -C from the hardcoded arguments passed to FETCH_CMD,

to the user-definable FETCH_CMD variable itself, allowing this to be used with
curl again (FETCH_CMD = /usr/local/bin/curl -C -) for those that need/want it
(e.g. some less common cases with proxies, or for better https support).
"go ahead" espie@, makes sense to naddy.
This commit is contained in:
sthen 2013-05-15 16:32:16 +00:00
parent 786014dca5
commit 03ab353173

View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1224 2013/05/14 13:38:59 gsoares Exp $
# $OpenBSD: bsd.port.mk,v 1.1225 2013/05/15 16:32:16 sthen Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -202,7 +202,7 @@ _PROGRESS = -m
_PROGRESS =
.endif
FETCH_CMD ?= /usr/bin/ftp -V ${_PROGRESS} -k ${FTP_KEEPALIVE}
FETCH_CMD ?= /usr/bin/ftp -V ${_PROGRESS} -k ${FTP_KEEPALIVE} -C
PKG_TMPDIR ?= /var/tmp
@ -2825,7 +2825,7 @@ ${DISTDIR}/$p:
for site in ${$m}; do \
file=$@.part; \
${ECHO_MSG} ">> Fetch $${site}$u"; \
if ${FETCH_CMD} -C -o $$file $${site}$u; then \
if ${FETCH_CMD} -o $$file $${site}$u; then \
ck=`${_size_fragment} $$file $f`; \
if [ ! -f ${CHECKSUM_FILE} ]; then \
${ECHO_MSG} ">> Checksum file does not exist"; \