Tue Aug 1 13:15:33 2017 UTC ()
Do not perform checksum tests when explicitly calling a make target that
creates or updates the checksum.  Allows users to set FAILOVER_FETCH in
mk.conf unconditionally and be able to update distinfo files without
first having to remove them.


(jperkin)
diff -r1.68 -r1.69 pkgsrc/mk/fetch/fetch.mk
cvs diff -r1.68 -r1.69 pkgsrc/mk/fetch/fetch.mk (expand / switch to unified diff)

--- pkgsrc/mk/fetch/fetch.mk 2016/01/06 07:38:25 1.68
+++ pkgsrc/mk/fetch/fetch.mk 2017/08/01 13:15:32 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: fetch.mk,v 1.68 2016/01/06 07:38:25 dholland Exp $ 1# $NetBSD: fetch.mk,v 1.69 2017/08/01 13:15:32 jperkin Exp $
2 2
3.if empty(INTERACTIVE_STAGE:Mfetch) && empty(FETCH_MESSAGE:U) 3.if empty(INTERACTIVE_STAGE:Mfetch) && empty(FETCH_MESSAGE:U)
4_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} 4_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
5.endif 5.endif
6_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} 6_MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
7 7
8# Where to put distfiles that don't have any other master site 8# Where to put distfiles that don't have any other master site
9MASTER_SITE_LOCAL?= ${MASTER_SITE_BACKUP:=LOCAL_PORTS/} 9MASTER_SITE_LOCAL?= ${MASTER_SITE_BACKUP:=LOCAL_PORTS/}
10 10
11# Set up _ORDERED_SITES to work out the exact list of sites for every file, 11# Set up _ORDERED_SITES to work out the exact list of sites for every file,
12# using the dynamic sites script, or ordering according to the master site 12# using the dynamic sites script, or ordering according to the master site
13# list, MASTER_SORT_RANDOM randomization feature, or the patterns in 13# list, MASTER_SORT_RANDOM randomization feature, or the patterns in
14# MASTER_SORT or MASTER_SORT_REGEX as appropriate. 14# MASTER_SORT or MASTER_SORT_REGEX as appropriate.
@@ -249,27 +249,28 @@ _FETCH_CMD= ${PKGSRC_SETENV} CHECKSUM=${ @@ -249,27 +249,28 @@ _FETCH_CMD= ${PKGSRC_SETENV} CHECKSUM=${
249 ECHO=${TOOLS_ECHO:Q} \ 249 ECHO=${TOOLS_ECHO:Q} \
250 FETCH_CMD=${_FETCH_CMD.${FETCH_USING}:Q} \ 250 FETCH_CMD=${_FETCH_CMD.${FETCH_USING}:Q} \
251 FETCH_BEFORE_ARGS=${_FETCH_BEFORE_ARGS.${FETCH_USING}:Q} \ 251 FETCH_BEFORE_ARGS=${_FETCH_BEFORE_ARGS.${FETCH_USING}:Q} \
252 FETCH_AFTER_ARGS=${_FETCH_AFTER_ARGS.${FETCH_USING}:Q} \ 252 FETCH_AFTER_ARGS=${_FETCH_AFTER_ARGS.${FETCH_USING}:Q} \
253 FETCH_RESUME_ARGS=${_FETCH_RESUME_ARGS.${FETCH_USING}:Q} \ 253 FETCH_RESUME_ARGS=${_FETCH_RESUME_ARGS.${FETCH_USING}:Q} \
254 FETCH_OUTPUT_ARGS=${_FETCH_OUTPUT_ARGS.${FETCH_USING}:Q} \ 254 FETCH_OUTPUT_ARGS=${_FETCH_OUTPUT_ARGS.${FETCH_USING}:Q} \
255 MKDIR=${TOOLS_MKDIR:Q} MV=${TOOLS_MV:Q} \ 255 MKDIR=${TOOLS_MKDIR:Q} MV=${TOOLS_MV:Q} \
256 RM=${TOOLS_RM:Q} \ 256 RM=${TOOLS_RM:Q} \
257 TEST=${TOOLS_TEST:Q} TOUCH=${TOOLS_TOUCH:Q} \ 257 TEST=${TOOLS_TEST:Q} TOUCH=${TOOLS_TOUCH:Q} \
258 WC=${TOOLS_WC:Q} \ 258 WC=${TOOLS_WC:Q} \
259 ${SH} ${PKGSRCDIR}/mk/fetch/fetch 259 ${SH} ${PKGSRCDIR}/mk/fetch/fetch
260 260
261_FETCH_ARGS+= ${PKG_VERBOSE:D-v} 261_FETCH_ARGS+= ${PKG_VERBOSE:D-v}
262.if exists(${DISTINFO_FILE}) 262.if exists(${DISTINFO_FILE}) && !make(distinfo) && !make(makesum) \
 263 && !make(makedistinfo) && !make(mdi)
263_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:tA:Q} 264_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:tA:Q}
264.endif 265.endif
265.if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS]) 266.if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS])
266_FETCH_ARGS+= -r 267_FETCH_ARGS+= -r
267.endif 268.endif
268.if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR) 269.if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
269_FETCH_ARGS+= -d ${DIST_SUBDIR} 270_FETCH_ARGS+= -d ${DIST_SUBDIR}
270.endif 271.endif
271.if defined(POST_FETCH_HOOK) && !empty(POST_FETCH_HOOK) 272.if defined(POST_FETCH_HOOK) && !empty(POST_FETCH_HOOK)
272_FETCH_ARGS+= -p ${POST_FETCH_HOOK:Q} 273_FETCH_ARGS+= -p ${POST_FETCH_HOOK:Q}
273.endif 274.endif
274 275
275.PHONY: do-fetch-file 276.PHONY: do-fetch-file