svn commit: r410767 - head/Mk
Mathieu Arnold
mat at FreeBSD.org
Thu Mar 10 16:48:24 UTC 2016
Author: mat
Date: Thu Mar 10 16:48:22 2016
New Revision: 410767
URL: https://svnweb.freebsd.org/changeset/ports/410767
Log:
Fix fetch-list.
PR: 207875
Sponsored by: Absolight
Modified:
head/Mk/bsd.port.mk
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Thu Mar 10 16:40:46 2016 (r410766)
+++ head/Mk/bsd.port.mk Thu Mar 10 16:48:22 2016 (r410767)
@@ -4005,13 +4005,14 @@ fetch-list:
else \
SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \
fi; \
+ ${ECHO_CMD} -n ${MKDIR} ${_DISTDIR} '&& ' ; \
+ ${ECHO_CMD} -n cd ${_DISTDIR} '&& { ' ; \
for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
if [ ! -z "`${ECHO_CMD} ${NOFETCHFILES} | ${GREP} -w $${file}`" ]; then \
if [ -z "`${ECHO_CMD} ${MASTER_SITE_OVERRIDE} | ${GREP} -w $${site}`" ]; then \
continue; \
fi; \
fi; \
- DIR=${DIST_SUBDIR};\
CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \
case $${file} in \
*/*) args="-o $${file} $${site}$${file}";; \
@@ -4019,7 +4020,7 @@ fetch-list:
esac; \
${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
done; \
- ${ECHO_CMD} "${ECHO_CMD} $${file} not fetched" ; \
+ ${ECHO_CMD} "${ECHO_CMD} $${file} not fetched; }" ; \
fi; \
done)
.if defined(PATCHFILES)
@@ -4047,6 +4048,8 @@ fetch-list:
else \
SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \
fi; \
+ ${ECHO_CMD} -n ${MKDIR} ${_DISTDIR} '&& ' ; \
+ ${ECHO_CMD} -n cd ${_DISTDIR} '&& { ' ; \
for site in `eval $$SORTED_PATCH_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \
case $${file} in \
@@ -4055,7 +4058,7 @@ fetch-list:
esac; \
${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
done; \
- ${ECHO_CMD} "${ECHO_CMD} $${file} not fetched" ; \
+ ${ECHO_CMD} "${ECHO_CMD} $${file} not fetched; }" ; \
fi; \
done)
.endif
More information about the svn-ports-head
mailing list