diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-27 16:06:27 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-27 16:06:27 +0000 |
| commit | 817fd9ec0d8b95bdd0d9d3f1ea3698736e1519f7 (patch) | |
| tree | 60f8eb30b7c39cc2dafd368f8d8c8ae2129a33a7 /mk/fetch | |
| parent | d5f379de6bcc34557240e819dcf1e5a65300897b (diff) | |
| download | pkgsrc-817fd9ec0d8b95bdd0d9d3f1ea3698736e1519f7.tar.gz | |
All of the other *SITES* variables are plural, so rename DYNAMIC_SITE_*
to DYNAMIC_SITES_* for consistency.
Diffstat (limited to 'mk/fetch')
| -rw-r--r-- | mk/fetch/fetch-list.mk | 6 | ||||
| -rw-r--r-- | mk/fetch/fetch.mk | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mk/fetch/fetch-list.mk b/mk/fetch/fetch-list.mk index 6a6b5039b5b..e8525e62c6d 100644 --- a/mk/fetch/fetch-list.mk +++ b/mk/fetch/fetch-list.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch-list.mk,v 1.4 2006/07/27 15:16:44 jlam Exp $ +# $NetBSD: fetch-list.mk,v 1.5 2006/07/27 16:06:27 jlam Exp $ # Prints out a script to fetch all needed files (no checksumming). .PHONY: fetch-list @@ -44,7 +44,7 @@ fetch-list-one-pkg: @location=`${PWD_CMD} | ${AWK} -F / '{ print $$(NF-1) "/" $$NF }'`; \ ${ECHO} '# Need additional files for ${PKGNAME} ('$$location')...' . for fetchfile in ${_ALLFILES} -. if exists(${DYNAMIC_SITE_SCRIPT}) +. if exists(${DYNAMIC_SITES_SCRIPT}) @(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then \ ${ECHO}; \ filesize=`${AWK} ' \ @@ -53,7 +53,7 @@ fetch-list-one-pkg: ${ECHO} '# Fetch ${fetchfile} ('$${filesize-???}' bytes):'; \ ${ECHO} '#'; \ ${ECHO} '${SH} -s ${fetchfile:T} <<"EOF" |('; \ - ${CAT} ${DYNAMIC_SITE_SCRIPT}; \ + ${CAT} ${DYNAMIC_SITES_SCRIPT}; \ ${ECHO} EOF; \ ${ECHO} read unsorted_sites; \ ${ECHO} 'unsorted_sites="$${unsorted_sites} ${_MASTER_SITE_BACKUP}"'; \ diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index 25c27371784..eae74d3118b 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.18 2006/07/27 15:16:44 jlam Exp $ +# $NetBSD: fetch.mk,v 1.19 2006/07/27 16:06:27 jlam Exp $ _MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} @@ -54,11 +54,11 @@ _ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} $$unsorted_sites # # Associate each file to fetch with the correct site(s). # -DYNAMIC_SITE_SCRIPT?= ${FILESDIR}/getsite.sh -DYNAMIC_SITE_CMD?= ${SETENV} PATH=${PATH:Q} ${SH} ${DYNAMIC_SITE_SCRIPT} -.if exists(${DYNAMIC_SITE_SCRIPT}) +DYNAMIC_SITES_SCRIPT?= ${FILESDIR}/getsite.sh +DYNAMIC_SITES_CMD?= ${SETENV} PATH=${PATH:Q} ${SH} ${DYNAMIC_SITES_SCRIPT} +.if exists(${DYNAMIC_SITES_SCRIPT}) . for fetchfile in ${_ALLFILES} -SITES_${fetchfile:T:S/=/--/}?= `${DYNAMIC_SITE_CMD} ${fetchfile:T}` +SITES_${fetchfile:T:S/=/--/}?= `${DYNAMIC_SITES_CMD} ${fetchfile:T}` SITES.${fetchfile:T:S/=/--/}?= ${SITES_${fetchfile:T:S/=/--/}} . endfor .endif |