Wed Jan 6 07:38:25 2016 UTC ()
Use :tA to make DISTINFO_FILE absolute when passing it to the fetch
and checksum scripts.

Fixes the problem where DISTINFO_FILE=../../foo/bar/distinfo doesn't
work without having an extraneous and ugly ${.CURDIR} stuffed into it
by hand.


(dholland)
diff -r1.21 -r1.22 pkgsrc/mk/checksum/checksum.mk
diff -r1.67 -r1.68 pkgsrc/mk/fetch/fetch.mk
cvs diff -r1.21 -r1.22 pkgsrc/mk/checksum/checksum.mk (expand / switch to unified diff)

--- pkgsrc/mk/checksum/checksum.mk 2015/10/12 18:23:48 1.21
+++ pkgsrc/mk/checksum/checksum.mk 2016/01/06 07:38:25 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: checksum.mk,v 1.21 2015/10/12 18:23:48 agc Exp $ 1# $NetBSD: checksum.mk,v 1.22 2016/01/06 07:38:25 dholland Exp $
2# 2#
3# See bsd.checksum.mk for helpful comments. 3# See bsd.checksum.mk for helpful comments.
4# 4#
5 5
6_DIGEST_ALGORITHMS?= SHA1 RMD160 SHA512 6_DIGEST_ALGORITHMS?= SHA1 RMD160 SHA512
7_PATCH_DIGEST_ALGORITHMS?= SHA1 7_PATCH_DIGEST_ALGORITHMS?= SHA1
8 8
9# These variables are set by pkgsrc/mk/fetch/bsd.fetch-vars.mk. 9# These variables are set by pkgsrc/mk/fetch/bsd.fetch-vars.mk.
10#_CKSUMFILES?= # empty 10#_CKSUMFILES?= # empty
11#_IGNOREFILES?= # empty 11#_IGNOREFILES?= # empty
12 12
13# _COOKIE.checksum 13# _COOKIE.checksum
14# The file whose presence determines whether or not the checksum 14# The file whose presence determines whether or not the checksum
@@ -31,27 +31,27 @@ _CHECKSUM_CMD= \ @@ -31,27 +31,27 @@ _CHECKSUM_CMD= \
31 ECHO=${TOOLS_ECHO:Q} SED=${TOOLS_CMDLINE_SED:Q} \ 31 ECHO=${TOOLS_ECHO:Q} SED=${TOOLS_CMDLINE_SED:Q} \
32 TEST=${TOOLS_TEST:Q} \ 32 TEST=${TOOLS_TEST:Q} \
33 ${SH} ${PKGSRCDIR}/mk/checksum/checksum \ 33 ${SH} ${PKGSRCDIR}/mk/checksum/checksum \
34 34
35.if defined(NO_CHECKSUM) || empty(_CKSUMFILES) 35.if defined(NO_CHECKSUM) || empty(_CKSUMFILES)
36checksum checksum-phase: 36checksum checksum-phase:
37 @${DO_NADA} 37 @${DO_NADA}
38.else 38.else
39checksum checksum-phase: 39checksum checksum-phase:
40 ${RUN} set -e; \ 40 ${RUN} set -e; \
41 case ${.TARGET:Q} in \ 41 case ${.TARGET:Q} in \
42 *-phase) ${TEST} ! -f ${_COOKIE.checksum} || exit 0 ;; \ 42 *-phase) ${TEST} ! -f ${_COOKIE.checksum} || exit 0 ;; \
43 esac; \ 43 esac; \
44 if cd ${DISTDIR} && ${_CHECKSUM_CMD} ${DISTINFO_FILE} ${_CKSUMFILES}; then \ 44 if cd ${DISTDIR} && ${_CHECKSUM_CMD} ${DISTINFO_FILE:tA} ${_CKSUMFILES}; then \
45 ${TRUE}; \ 45 ${TRUE}; \
46 else \ 46 else \
47 ${ERROR_MSG} "Make sure the Makefile and checksum file (${DISTINFO_FILE})"; \ 47 ${ERROR_MSG} "Make sure the Makefile and checksum file (${DISTINFO_FILE})"; \
48 ${ERROR_MSG} "are up to date. If you want to override this check, type"; \ 48 ${ERROR_MSG} "are up to date. If you want to override this check, type"; \
49 ${ERROR_MSG} "\"${MAKE} NO_CHECKSUM=yes [other args]\"."; \ 49 ${ERROR_MSG} "\"${MAKE} NO_CHECKSUM=yes [other args]\"."; \
50 exit 1; \ 50 exit 1; \
51 fi 51 fi
52.endif 52.endif
53 53
54_DISTINFO_CMD= ${PKGSRC_SETENV} DIGEST=${TOOLS_DIGEST:Q} SED=${TOOLS_SED:Q} \ 54_DISTINFO_CMD= ${PKGSRC_SETENV} DIGEST=${TOOLS_DIGEST:Q} SED=${TOOLS_SED:Q} \
55 TEST=${TOOLS_TEST:Q} WC=${TOOLS_WC:Q} \ 55 TEST=${TOOLS_TEST:Q} WC=${TOOLS_WC:Q} \
56 ${AWK} -f ${PKGSRCDIR}/mk/checksum/distinfo.awk -- 56 ${AWK} -f ${PKGSRCDIR}/mk/checksum/distinfo.awk --
57 57
cvs diff -r1.67 -r1.68 pkgsrc/mk/fetch/fetch.mk (expand / switch to unified diff)

--- pkgsrc/mk/fetch/fetch.mk 2015/09/14 08:27:13 1.67
+++ pkgsrc/mk/fetch/fetch.mk 2016/01/06 07:38:25 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: fetch.mk,v 1.67 2015/09/14 08:27:13 joerg Exp $ 1# $NetBSD: fetch.mk,v 1.68 2016/01/06 07:38:25 dholland 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.
@@ -250,27 +250,27 @@ _FETCH_CMD= ${PKGSRC_SETENV} CHECKSUM=${ @@ -250,27 +250,27 @@ _FETCH_CMD= ${PKGSRC_SETENV} CHECKSUM=${
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})
263_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:Q} 263_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:tA:Q}
264.endif 264.endif
265.if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS]) 265.if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS])
266_FETCH_ARGS+= -r 266_FETCH_ARGS+= -r
267.endif 267.endif
268.if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR) 268.if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
269_FETCH_ARGS+= -d ${DIST_SUBDIR} 269_FETCH_ARGS+= -d ${DIST_SUBDIR}
270.endif 270.endif
271.if defined(POST_FETCH_HOOK) && !empty(POST_FETCH_HOOK) 271.if defined(POST_FETCH_HOOK) && !empty(POST_FETCH_HOOK)
272_FETCH_ARGS+= -p ${POST_FETCH_HOOK:Q} 272_FETCH_ARGS+= -p ${POST_FETCH_HOOK:Q}
273.endif 273.endif
274 274
275.PHONY: do-fetch-file 275.PHONY: do-fetch-file
276do-fetch-file: .USE 276do-fetch-file: .USE