diff options
| author | tron <tron> | 2001-10-25 18:12:53 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-10-25 18:12:53 +0000 |
| commit | d634af110e6125b19fdae5950d9f42cafbe1f0f1 (patch) | |
| tree | e529176e6712b9e5fcbf3475fe8d6a5d1aa97bea /mk | |
| parent | c92e1dbfcfe963f5e01ff8680b97a02a832c3fbb (diff) | |
| download | pkgsrc-d634af110e6125b19fdae5950d9f42cafbe1f0f1.tar.gz | |
Sort "PATCH_SITES" using "MASTER_SORT" and "MASTER_SORT_REGEX", too.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 6 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 5287e0de85a..0f3fa21c2be 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.7 2001/10/21 21:26:57 seb Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.8 2001/10/25 18:12:53 tron Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -268,8 +268,8 @@ PATCH_FUZZ_FACTOR?= -F0 #MASTER_SORT= .ac.at .at .de .ch .se .fi .no # Whitespace delimited list of preferred download locations. -# MASTER_SITES will be reordered according to the hosts' address last -# components. +# MASTER_SITES and PATCH_SITES will be reordered according to the hosts' +# address last components. # Possible: list of domain name suffixes # Default: none diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7b988a17e46..d63a2ccb96d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.828 2001/10/24 19:42:28 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.829 2001/10/25 18:12:53 tron Exp $ # # This file is in the public domain. # @@ -1223,6 +1223,7 @@ MASTER_SORT_AWK+= /${srt:C/\//\\\//g}/ { good["${srt}"] = good["${srt}"] " " $$0 .endfor MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; } SORTED_MASTER_SITES_CMD= ${ECHO} '${MASTER_SITES}' | ${AWK} '${MASTER_SORT_AWK}' +SORTED_PATCH_SITES_CMD= ${ECHO} '${PATCH_SITES}' | ${AWK} '${MASTER_SORT_AWK}' .if !target(do-fetch) @@ -1238,7 +1239,7 @@ do-fetch: done . if defined(_PATCHFILES) ${_PKG_SILENT}${_PKG_DEBUG}cd ${_DISTDIR}; \ - sites="${PATCH_SITES}"; \ + sites=`${SORTED_PATCH_SITES_CMD}`; \ for file in "" ${_PATCHFILES}; do \ if [ "X$$file" = X"" ]; then continue; fi; \ bfile=`${BASENAME} $$file`; \ @@ -2451,7 +2452,7 @@ fetch-list-one-pkg: bfile=`${BASENAME} $$file`; \ if [ ! -f $$file -a ! -f $$bfile ]; then \ ${ECHO} -n "cd ${_DISTDIR} && [ -f $$file -o -f $$bfile ] || "; \ - for site in ${PATCH_SITES}; do \ + for site in `${SORTED_PATCH_SITES_CMD}`; do \ ${ECHO} -n ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} "${FETCH_AFTER_ARGS}" '|| '; \ done; \ ${ECHO} "${ECHO} $${file} not fetched"; \ |