diff options
| author | jlam <jlam> | 2006-07-19 14:01:29 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-19 14:01:29 +0000 |
| commit | b63b7da481c19b433b582d52b6781ff1561d31dc (patch) | |
| tree | 13e69096a438510cad679a582c4234129f77e6b1 | |
| parent | 9a87a61e9c0e8855b7ed5cfe531fc67c6aeecd79 (diff) | |
| download | pkgsrc-b63b7da481c19b433b582d52b6781ff1561d31dc.tar.gz | |
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.
| -rw-r--r-- | mk/fetch/fetch.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index 70811db332f..abc299c3b91 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -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+= /${srt:C/\//\\\//g}/ { good["${srt:S/\\/\\\\/g}"] = good["${sr 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 |