[pkgsrc/trunk]: pkgsrc/mk/fetch Handle special case of URLs prepended with dash.

[asau <asau%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2af0de08bbcf
branches:  trunk
changeset: 350960:2af0de08bbcf
user:      asau <asau%pkgsrc.org@localhost>
date:      Tue Aug 09 15:16:35 2016 +0000

description:
Handle special case of URLs prepended with dash.

diffstat:

 mk/fetch/fetch-list.mk |  26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 5a4df9bea189 -r 2af0de08bbcf mk/fetch/fetch-list.mk
--- a/mk/fetch/fetch-list.mk    Tue Aug 09 15:04:50 2016 +0000
+++ b/mk/fetch/fetch-list.mk    Tue Aug 09 15:16:35 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fetch-list.mk,v 1.14 2011/06/19 10:23:56 plunky Exp $
+# $NetBSD: fetch-list.mk,v 1.15 2016/08/09 15:16:35 asau Exp $
 
 ######################################################################
 ### fetch-list (PUBLIC)
@@ -82,8 +82,16 @@
                ${ECHO} "${MKDIR} ${_DISTDIR}";                         \
                ${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
                ${ECHO} 'for site in $$sites; do';                      \
-               ${ECHO} '       ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" 
${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
-               ${ECHO} '       ${ECHO} ${fetchfile:T} not fetched';    \
+               ${ECHO} '       case "$${site}" in';                    \
+               ${ECHO} '       -*)';                                   \
+               ${ECHO} '               ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site#-}" 
${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
+               ${ECHO} '               ${ECHO} ${fetchfile:T} not fetched';    \
+               ${ECHO} '               ;;';                            \
+               ${ECHO} '       *)';                                    \
+               ${ECHO} '               ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" 
${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
+               ${ECHO} '               ${ECHO} ${fetchfile:T} not fetched';    \
+               ${ECHO} '               ;;';                            \
+               ${ECHO} '       esac;';                 \
                ${ECHO} 'done; }';                                      \
                ${ECHO} ')';                                            \
        fi)
@@ -100,8 +108,16 @@
                ${ECHO} "${MKDIR} ${_DISTDIR}";                         \
                ${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
                ${ECHO} 'for site in $$sites; do';                      \
-               ${ECHO} '       ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" 
${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
-               ${ECHO} '       ${ECHO} ${fetchfile:T} not fetched';    \
+               ${ECHO} '       case "$${site}" in';                    \
+               ${ECHO} '       -*)';                                   \
+               ${ECHO} '               ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site#-}" 
${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
+               ${ECHO} '               ${ECHO} ${fetchfile:T} not fetched';    \
+               ${ECHO} '               ;;';                            \
+               ${ECHO} '       *)';                                    \
+               ${ECHO} '               ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" 
${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
+               ${ECHO} '               ${ECHO} ${fetchfile:T} not fetched';    \
+               ${ECHO} '               ;;';                            \
+               ${ECHO} '       esac;';                 \
                ${ECHO} 'done; }';                                      \
        fi)
 .    endif