[pkgsrc/trunk]: pkgsrc/mk/fetch All of the other *SITES* variables are plural...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4606d2c85c06
branches:  trunk
changeset: 516773:4606d2c85c06
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jul 27 16:06:27 2006 +0000

description:
All of the other *SITES* variables are plural, so rename DYNAMIC_SITE_*
to DYNAMIC_SITES_* for consistency.

diffstat:

 mk/fetch/fetch-list.mk |   6 +++---
 mk/fetch/fetch.mk      |  10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (52 lines):

diff -r a66aaf210117 -r 4606d2c85c06 mk/fetch/fetch-list.mk
--- a/mk/fetch/fetch-list.mk    Thu Jul 27 15:48:45 2006 +0000
+++ b/mk/fetch/fetch-list.mk    Thu Jul 27 16:06:27 2006 +0000
@@ -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 @@
        @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 @@
                ${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 -r a66aaf210117 -r 4606d2c85c06 mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Thu Jul 27 15:48:45 2006 +0000
+++ b/mk/fetch/fetch.mk Thu Jul 27 16:06:27 2006 +0000
@@ -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 @@
 #
 # 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