pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/fetch Work around incomprehensible quoting mess sur...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/33ebcf13774e
branches:  trunk
changeset: 516327:33ebcf13774e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jul 19 14:01:29 2006 +0000

description:
Work around incomprehensible quoting mess surrounding MASTER_SORT* by
in do-fetch-file (formerly they were inserted by the old _FETCH_FILE
inserting some quotes that are no longer added by the fetch command list
macro).  This makes fetching with MASTER_SORT* set work again.

diffstat:

 mk/fetch/fetch.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 2af185069baf -r 33ebcf13774e mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Wed Jul 19 13:33:42 2006 +0000
+++ b/mk/fetch/fetch.mk Wed Jul 19 14:01:29 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.12 2006/07/19 13:33:42 jlam Exp $
+# $NetBSD: fetch.mk,v 1.13 2006/07/19 14:01:29 jlam Exp $
 
 _MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -46,7 +46,7 @@
 MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; }
 
 SORT_SITES_CMD= ${ECHO} $$unsorted_sites | ${AWK} '${MASTER_SORT_AWK}'
-ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} `${SORT_SITES_CMD:S/\\/\\\\/g:C/"/\"/g}`
+ORDERED_SITES= "${_MASTER_SITE_OVERRIDE} `${SORT_SITES_CMD:S/\\/\\\\/g:C/"/\"/g}`"
 .else
 ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} $$unsorted_sites
 .endif



Home | Main Index | Thread Index | Old Index