Rename "SITES_* to "SITES.*" for file-specific lists of sites from which

to fetch the file.  This completes the renaming described in revision
1.1799 of bsd.pkg.mk.

38 files changed, 87 insertions, 90 deletions

diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
index 8fc3ece3bee..8f3f66f0899 100644
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: cross.mk,v 1.37 2005/07/15 18:27:48 jlam Exp $
+#	$NetBSD: cross.mk,v 1.38 2006/07/27 18:48:02 jlam Exp $
 
 # Shared definitions for building a cross-compile environment.
 
@@ -35,7 +35,7 @@ CFLAGS=			# empty
 CXXFLAGS=		# empty
 
 CROSS_DISTFILES+=	${BINUTILS_DISTNAME}.tar.gz
-SITES_${BINUTILS_DISTNAME}.tar.gz+=		${MASTER_SITE_GNU:=binutils/}
+SITES.${BINUTILS_DISTNAME}.tar.gz+=		${MASTER_SITE_GNU:=binutils/}
 CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld
 DEPENDS+=		cross-binutils>=2.15.0.0:../../cross/binutils
 PLIST_PRE+=		${COMMON_DIR}/PLIST-binutils
@@ -155,8 +155,8 @@ PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-objc-runtime
 # the main PLIST needs to go last to get the @dirrm's right
 PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs
 CROSS_DISTFILES+=	${EGCS_DISTNAME}.tar.gz ${EGCS_PATCHBUNDLE}
-SITES_${EGCS_DISTNAME}.tar.gz=		# no known-good site; fall back to distfiles mirrors
-SITES_${EGCS_PATCHBUNDLE}=		${MASTER_SITE_LOCAL}
+SITES.${EGCS_DISTNAME}.tar.gz=		# no known-good site; fall back to distfiles mirrors
+SITES.${EGCS_PATCHBUNDLE}=		${MASTER_SITE_LOCAL}
 USE_TOOLS+=		gmake
 
 CC_FOR_TARGET=		${EGCS_WRKSRC}/gcc/xgcc -B${EGCS_WRKSRC}/gcc/ ${CFLAGS_FOR_TARGET}
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
index 25ef760a3f4..500add5fe05 100644
--- a/emulators/arcem/Makefile
+++ b/emulators/arcem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/17 19:22:58 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/27 18:48:02 jlam Exp $
 #
 
 DISTNAME=	arcem-1.00-src
@@ -14,7 +14,7 @@ LINUX_FILES=	\
 		HardImage1.gz
 
 .for f in ${LINUX_FILES}
-SITES_${f}+=	\
+SITES.${f}+=	\
 		ftp://ftp.arm.uk.linux.org/pub/linux/arcem/
 .endfor
 
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index ab533b9de1d..5ba213714a2 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/05/21 03:01:10 dsainty Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/27 18:48:02 jlam Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
@@ -18,7 +18,7 @@ POSE_VERSION=	3.5
 DIST_SUBDIR=	${PKGBASE}
 
 # Source is under sources/ directory, skins are not...
-SITES_emulator-skins-19.tar.gz=	http://www.palmos.com/dev/tools/emulator/
+SITES.emulator-skins-19.tar.gz=	http://www.palmos.com/dev/tools/emulator/
 
 #LICENSE=       GPL
 
diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
index 63c76bdcf1d..3620eb109c4 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/07/03 04:38:43 kent Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/27 18:48:02 jlam Exp $
 #
 PEACE_VERSION=	0.0.20060701
 DISTNAME=	peace-${PEACE_VERSION}
-SITES_peace-0.0.20060701.tar.gz=http://chiharu.hauN.org/peace/dist/
+SITES.peace-0.0.20060701.tar.gz=http://chiharu.hauN.org/peace/dist/
 CATEGORIES=	emulators
 
 MAINTAINER=	kent@NetBSD.org
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 40f2168992f..de05b78d90d 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/27 18:48:02 jlam Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
@@ -14,9 +14,9 @@ HOMEPAGE=		http://www.wheel.gr.jp/~dai/software/#elisau10
 COMMENT=		10x8 dots X11 bitmap font for JIS X 0208
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-SITES_elisau10${EXTRACT_SUFX}=	\
+SITES.elisau10${EXTRACT_SUFX}=	\
 			http://hp.vector.co.jp/authors/VA004814/freesoft/
-SITES_clR5x8.bdf=	ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
+SITES.clR5x8.bdf=	ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
 
 WRKSRC=			${WRKDIR}
 USE_TOOLS+=		bdftopcf gzip patch
diff --git a/games/hugo/Makefile b/games/hugo/Makefile
index 74d326ee3bf..d0bd1290dbd 100644
--- a/games/hugo/Makefile
+++ b/games/hugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:16 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/27 18:48:02 jlam Exp $
 #
 
 DISTNAME=	hugov31_unix_source
@@ -12,7 +12,7 @@ MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://www.generalcoffee.com/hugo.html
 COMMENT=	Interactive fiction design system and interpreter
 
-SITES_hugolib.zip=${MASTER_SITE_IFARCHIVE:=programming/hugo/library/}
+SITES.hugolib.zip=${MASTER_SITE_IFARCHIVE:=programming/hugo/library/}
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 USE_TOOLS+=	gmake
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 49edf923b4c..2da991d87d9 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/03/20 18:15:38 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2006/07/27 18:48:02 jlam Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGNAME=		gcc-ssp-2.95.3.13
@@ -15,7 +15,7 @@ PATCHFILES=		gcc-2.95.3-diff-2002-08-29.gz
 
 SSP_PATCH=		protector-2.95.3-13.tar.gz
 DISTFILES+=		${DISTNAME}.tar.gz ${SSP_PATCH}
-SITES_protector-2.95.3-13.tar.gz=	http://www.trl.ibm.com/projects/security/ssp/gcc2_95_3/
+SITES.protector-2.95.3-13.tar.gz=	http://www.trl.ibm.com/projects/security/ssp/gcc2_95_3/
 
 PATCHDIR=		${.CURDIR}/../gcc/patches
 GCC_FILESDIR=		${.CURDIR}/../gcc/files
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 722de1b7ba8..f27c3d799f0 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/07/09 12:22:05 augustss Exp $
+# $NetBSD: Makefile,v 1.29 2006/07/27 18:48:02 jlam Exp $
 
 DISTNAME=	ghc-6.4.2
 PKGREVISION=	1
@@ -12,8 +12,8 @@ MAINTAINER=	kristerw@NetBSD.org
 HOMEPAGE=	http://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell
 
-SITES_ghc-6.2.1-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL}
-SITES_ghc-6.2.1-src.tar.bz2=http://www.haskell.org/ghc/dist/6.2.1/
+SITES.ghc-6.2.1-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL}
+SITES.ghc-6.2.1-src.tar.bz2=http://www.haskell.org/ghc/dist/6.2.1/
 
 ONLY_FOR_PLATFORM= NetBSD-1.5*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
 
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index 4cf84513ab2..a319b87e049 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/01/08 18:38:26 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/07/27 18:48:02 jlam Exp $
 #
 
 DISTNAME=		qmail-conf-0.60
@@ -16,7 +16,7 @@ DEPENDS+=		daemontools>=0.70:../../sysutils/daemontools
 DEPENDS+=		qmail>=1.03nb7:../../mail/qmail
 DEPENDS+=		ucspi-tcp>=0.86:../../net/ucspi-tcp
 
-SITES_djbdns-1.05.tar.gz=	http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/
+SITES.djbdns-1.05.tar.gz=	http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/
 
 DJB_RESTRICTED=		NO
 DJB_CONFIG_CMDS=	${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ucspi-tcp
diff --git a/math/gap/Makefile b/math/gap/Makefile
index 54658197e97..dae5bcaa483 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/27 18:48:02 jlam Exp $
 #
 
 DISTNAME=	gap4r3
@@ -17,7 +17,7 @@ HOMEPAGE=	http://www.gap-system.org/
 COMMENT=	Computational group theory and discrete algebra language
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-SITES_fix4r3n5.tar.gz=	${MASTER_SITES:=bugfixes/}
+SITES.fix4r3n5.tar.gz=	${MASTER_SITES:=bugfixes/}
 
 LICENSE=	no-commercial-use
 
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile
index 4c564abf9ce..d00507abc80 100644
--- a/misc/openoffice-bin/Makefile
+++ b/misc/openoffice-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/05/22 22:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/07/27 18:48:02 jlam Exp $
 
 PKGNAME=		openoffice-bin-${OO_VER}
 PKGREVISION=		2
@@ -6,7 +6,7 @@ CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		openoffice-linux-112-services.rdb.bz2
-SITES_openoffice-linux-112-services.rdb.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\
+SITES.openoffice-linux-112-services.rdb.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\
 			ftp://ftp.NetBSD.org/pub/NetBSD/misc/mrauch/
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}	\
 			openoffice-linux-112-services.rdb.bz2
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index f2c59b08057..d1af49ed3ef 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2006/07/13 11:07:23 hira Exp $
+# $NetBSD: Makefile,v 1.75 2006/07/27 18:48:03 jlam Exp $
 
 DISTNAME=		openoffice-1.1.5
 PKGREVISION=		1
@@ -7,8 +7,8 @@ MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/1.1.5/}
 DISTFILES=		OOo_1.1.5_src.tar.gz
 DISTFILES+=		gpc231.tar.Z
 DISTFILES+=		ooo_addons_115.tar.bz2
-SITES_gpc231.tar.Z= 	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
-SITES_ooo_addons_115.tar.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\
+SITES.gpc231.tar.Z= 	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
+SITES.ooo_addons_115.tar.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\
 			ftp://ftp.NetBSD.org/pub/NetBSD/misc/mrauch/
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
diff --git a/misc/openoffice/Makefile.i18n b/misc/openoffice/Makefile.i18n
index 1cf4b196789..5462da3aab9 100644
--- a/misc/openoffice/Makefile.i18n
+++ b/misc/openoffice/Makefile.i18n
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i18n,v 1.5 2005/12/05 20:50:40 rillig Exp $
+# $NetBSD: Makefile.i18n,v 1.6 2006/07/27 18:48:03 jlam Exp $
 
 .if ${PKG_LANG:C/_.*//} == "afrikaans"
 OPENOFFICE_ISOCODE=	af
@@ -176,7 +176,7 @@ OPENOFFICE_HELPCODE?=	${OPENOFFICE_ISOCODE}
 
 .if defined(OPENOFFICE_HAS_HELP)
 DISTFILES+=	helpcontent_${OPENOFFICE_LANGCODE}_unix.tgz
-SITES_helpcontent_${OPENOFFICE_LANGCODE}_unix.tgz=${MASTER_SITE_OPENOFFICE:=contrib/helpcontent/}
+SITES.helpcontent_${OPENOFFICE_LANGCODE}_unix.tgz=${MASTER_SITE_OPENOFFICE:=contrib/helpcontent/}
 .endif
 
 PLIST_SRC+=	PLIST.i18n.${OPENOFFICE_LANGCODE}
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk
index eae74d3118b..4bc443f3b8a 100644
--- a/mk/fetch/fetch.mk
+++ b/mk/fetch/fetch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.19 2006/07/27 16:06:27 jlam Exp $
+# $NetBSD: fetch.mk,v 1.20 2006/07/27 18:48:03 jlam Exp $
 
 _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE=	${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -58,20 +58,17 @@ 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_SITES_CMD} ${fetchfile:T}`
-SITES.${fetchfile:T:S/=/--/}?=	${SITES_${fetchfile:T:S/=/--/}}
+SITES.${fetchfile:T:S/=/--/}?= `${DYNAMIC_SITES_CMD} ${fetchfile:T}`
 .  endfor
 .endif
 .if !empty(_DISTFILES)
 .  for fetchfile in ${_DISTFILES}
-SITES_${fetchfile:T:S/=/--/}?= ${MASTER_SITES}
-SITES.${fetchfile:T:S/=/--/}?=	${SITES_${fetchfile:T:S/=/--/}}
+SITES.${fetchfile:T:S/=/--/}?= ${MASTER_SITES}
 .  endfor
 .endif
 .if !empty(_PATCHFILES)
 .  for fetchfile in ${_PATCHFILES}
-SITES_${fetchfile:T:S/=/--/}?= ${PATCH_SITES}
-SITES.${fetchfile:T:S/=/--/}?=	${SITES_${fetchfile:T:S/=/--/}}
+SITES.${fetchfile:T:S/=/--/}?= ${PATCH_SITES}
 .  endfor
 .endif
 
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index f5deada044e..8b03c895271 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/07/20 22:09:02 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2006/07/27 18:48:03 jlam Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -46,7 +46,7 @@ SKINS +=	AlienMind-1.2${EXTRACT_SUFX}			\
 
 .if !defined(SITES_AlienMind-1.2.tar.bz2)
 .  for skin in ${SKINS}
-SITES_${skin}= ${SKIN_SITES}
+SITES.${skin}= ${SKIN_SITES}
 .  endfor
 .endif
 
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 874cc23e770..ac3d9af3ae4 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/12/29 06:21:58 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2006/07/27 18:48:03 jlam Exp $
 
 DISTNAME=		djbdns-1.05
 PKGREVISION=		7
@@ -11,7 +11,7 @@ HOMEPAGE=		http://cr.yp.to/djbdns.html
 COMMENT=		Collection of secure and reliable DNS tools
 
 MANPAGES=		${DISTNAME}-man-20031023.tar.gz
-SITES_${MANPAGES}=	http://smarden.org/pape/djb/manpages/
+SITES.${MANPAGES}=	http://smarden.org/pape/djb/manpages/
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk
index da7ef99880a..2e4cdb2cc8e 100644
--- a/net/djbdns/options.mk
+++ b/net/djbdns/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2006/01/11 17:20:32 schmonz Exp $
+# $NetBSD: options.mk,v 1.10 2006/07/27 18:48:03 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.djbdns
 PKG_SUPPORTED_OPTIONS+=	inet6 djbdns-ignoreip2 djbdns-tinydns64
@@ -14,7 +14,7 @@ PKG_SUGGESTED_OPTIONS+=   djbdns-tinydns64
 .if !empty(PKG_OPTIONS:Minet6)
 IPV6_PATCH=			djbdns-1.05-ipv6.diff.bz2
 PATCHFILES+=			${IPV6_PATCH}
-SITES_${IPV6_PATCH}=		http://www.fefe.de/dns/
+SITES.${IPV6_PATCH}=		http://www.fefe.de/dns/
 PATCH_DIST_STRIP.${IPV6_PATCH}=	-p1
 PLIST_SRC+=			${PKGDIR}/PLIST.inet6
 .endif
@@ -22,7 +22,7 @@ PLIST_SRC+=			${PKGDIR}/PLIST.inet6
 .if !empty(PKG_OPTIONS:Mdjbdns-ignoreip2)
 IGNOREIP2_PATCH=		djbdns-1.05-ignoreip2.patch
 PATCHFILES+=			${IGNOREIP2_PATCH}
-SITES_${IGNOREIP2_PATCH}=	http://www.tinydns.org/
+SITES.${IGNOREIP2_PATCH}=	http://www.tinydns.org/
 .endif
 
 .if !empty(PKG_OPTIONS:Mdjbdns-tinydns64)
diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile
index d89edd0894a..51fcb9ef32c 100644
--- a/net/ripe-whois/Makefile
+++ b/net/ripe-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/27 18:48:03 jlam Exp $
 #
 
 DISTNAME=	ripe-whois-3.1.1v6
@@ -19,8 +19,8 @@ BUILD_DEFS+=	USE_INET6
 ASCII_DOC=		ripe-223.txt
 PS_DOC=			ripe-223.ps
 DOCS=			${ASCII_DOC} ${PS_DOC}
-SITES_${ASCII_DOC}=	ftp://ftp.ripe.net/ripe/docs/
-SITES_${PS_DOC}=	ftp://ftp.ripe.net/ripe/docs/
+SITES.${ASCII_DOC}=	ftp://ftp.ripe.net/ripe/docs/
+SITES.${PS_DOC}=	ftp://ftp.ripe.net/ripe/docs/
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 post-install:
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index 06ca4b46559..bc1a21f927b 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:10:31 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/07/27 18:48:03 jlam Exp $
 
 DISTNAME=		speedtouch-1.3.1
 PKGREVISION=		4
@@ -11,7 +11,7 @@ DISTFILES=		${DISTNAME}.tar.bz2
 #	http://www.speedtouch.com/driver_upgrade_lx_3.0.1.2.htm
 #
 FIRMWARE_SRCS=		SpeedTouch330_firmware_3012.zip
-SITES_${FIRMWARE_SRCS}=	http://www.speedtouch.com/download/drivers/USB/
+SITES.${FIRMWARE_SRCS}=	http://www.speedtouch.com/download/drivers/USB/
 DISTFILES+=		${FIRMWARE_SRCS}
 EXTRACT_OPTS_ZIP=	-Laqo -d ${WRKDIR}/firmware
 
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index adc55bc7ac1..111b35d7cb9 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/08/24 04:36:14 schmonz Exp $
+# $NetBSD: Makefile,v 1.30 2006/07/27 18:48:03 jlam Exp $
 
 DISTNAME=		ucspi-tcp-0.88
 PKGREVISION=		1
@@ -11,7 +11,7 @@ HOMEPAGE=		http://cr.yp.to/ucspi-tcp.html
 COMMENT=		Command-line tools for building TCP client-server applications
 
 MANPAGES=		${DISTNAME}-man-20020317.tar.gz
-SITES_${MANPAGES}=	http://smarden.org/pape/djb/manpages/
+SITES.${MANPAGES}=	http://smarden.org/pape/djb/manpages/
 
 DJB_RESTRICTED=		YES
 
diff --git a/print/ghostscript-esp/Makefile b/print/ghostscript-esp/Makefile
index e8816a91dca..e842df01c6f 100644
--- a/print/ghostscript-esp/Makefile
+++ b/print/ghostscript-esp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/15 20:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/27 18:48:03 jlam Exp $
 
 DISTNAME=	espgs-${GS_VERS}-source
 PKGNAME=	ghostscript-esp-${GS_VERS}
@@ -53,7 +53,7 @@ EXTRACT_ONLY=		${GS_SRCS}
 #
 JPEG_SRCS=		jpegsrc.v6b.tar.gz
 JPEG_WRKSRC=		${WRKDIR}/jpeg-6b
-SITES_${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/
+SITES.${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/
 DISTFILES+=		${JPEG_SRCS}
 EXTRACT_ONLY+=		${JPEG_SRCS}
 
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 29c62bc36b4..020f17fbea9 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/06/18 10:35:42 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/27 18:48:03 jlam Exp $
 
 DISTNAME=	ghostscript-${GS_VERS}
 PKGNAME=	ghostscript-gnu-${GS_VERS}
@@ -34,7 +34,7 @@ EXTRACT_ONLY=		${GS_SRCS}
 #
 JPEG_SRCS=		jpegsrc.v6b.tar.gz
 JPEG_WRKSRC=		${WRKDIR}/jpeg-6b
-SITES_${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/
+SITES.${JPEG_SRCS}=	ftp://ftp.uu.net/graphics/jpeg/
 DISTFILES+=		${JPEG_SRCS}
 EXTRACT_ONLY+=		${JPEG_SRCS}
 
diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index 367f173e94f..93880228a4c 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/07/11 16:29:49 hira Exp $
+# $NetBSD: Makefile,v 1.31 2006/07/27 18:48:03 jlam Exp $
 
 DISTNAME=	ptex-src-${PTEX_VERS}
 PKGNAME=	ja-ptex-bin-${PTEX_VERS}
@@ -14,10 +14,10 @@ HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
 COMMENT=	Publishing TeX (pTeX)
 
 # XXX ${MAKE_VARIABLES} won't be extracted here.  strange...
-SITES_dvipsk-jpatch-p1.7a.tar.gz= \
+SITES.dvipsk-jpatch-p1.7a.tar.gz= \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/ \
 		ftp://ftp.ring.gr.jp/pub/text/TeX/ascii-ptex/dvips/
-SITES_mendexk2.6d.tar.gz= \
+SITES.mendexk2.6d.tar.gz= \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/ \
 		ftp://ftp.ring.gr.jp/pub/text/TeX/ascii-ptex/mendex/
 
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index d73bb01f00e..f73fcea3dde 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/01/21 18:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/07/27 18:48:03 jlam Exp $
 #
 
 DISTNAME=	tetex-texmf-2.0.2
@@ -14,7 +14,7 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Machine-independent part of teTeX, version 2
 
-SITES_listings${EXTRACT_SUFX}= ${LOCAL_PORTS}
+SITES.listings${EXTRACT_SUFX}= ${LOCAL_PORTS}
 
 CONFLICTS+=	teTeX2-share-[0-9]*
 
diff --git a/security/CSP/Makefile b/security/CSP/Makefile
index db3778aeccc..9bb9d1852e5 100644
--- a/security/CSP/Makefile
+++ b/security/CSP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/27 20:56:17 cube Exp $
+# $NetBSD: Makefile,v 1.2 2006/07/27 18:48:03 jlam Exp $
 #
 
 DISTNAME=	CSP-0.32
@@ -15,7 +15,7 @@ DEPENDS+=	p5-IPC-Run>=0.79:../../devel/p5-IPC-Run
 DEPENDS+=	p5-Term-Prompt>=1.03:../../devel/p5-Term-Prompt
 
 CSPGUIDE=	cspguide.pdf
-SITES_${CSPGUIDE}=	http://devel.it.su.se/content/1/c4/32/90/
+SITES.${CSPGUIDE}=	http://devel.it.su.se/content/1/c4/32/90/
 EXTRACT_ONLY=	${DISTFILES:N*.pdf}
 
 PERL5_PACKLIST=	auto/CSP/.packlist
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index d4baa83d918..d58affe5eb5 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/05/31 18:22:25 ghen Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/27 18:48:03 jlam Exp $
 #
 
 DISTNAME=		dirmngr-0.9.3
@@ -7,7 +7,7 @@ CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		pth-2.0.4.tar.gz
-SITES_pth-2.0.4.tar.gz=	${MASTER_SITE_GNU:=pth/}
+SITES.pth-2.0.4.tar.gz=	${MASTER_SITE_GNU:=pth/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		shannonjr@NetBSD.org
diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk
index 29171f1d66b..d4c81545d34 100644
--- a/security/gnupg/options.mk
+++ b/security/gnupg/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2006/05/31 18:22:25 ghen Exp $
+# $NetBSD: options.mk,v 1.9 2006/07/27 18:48:03 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg
 PKG_SUPPORTED_OPTIONS=	curl idea ldap
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=	--without-libcurl
 # use of IDEA as crypto function
 LICENCE=	fee-based-commercial-use
 DISTFILES+=	idea.c.gz
-SITES_idea.c.gz=ftp://ftp.gnupg.dk/pub/contrib-dk/ \
+SITES.idea.c.gz=ftp://ftp.gnupg.dk/pub/contrib-dk/ \
 		http://www.gnupg.dk/contrib-dk/
 USE_TOOLS+=	gzcat
 
diff --git a/security/libtcpa/Makefile b/security/libtcpa/Makefile
index 282e34da438..bd437dd7a88 100644
--- a/security/libtcpa/Makefile
+++ b/security/libtcpa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/07/27 18:48:03 jlam Exp $
 #
 
 DISTNAME=		tpm-1.1b
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/TPM
 
-SITES_tcpa_man_20031210.tgz= http://www.citi.umich.edu/u/rwash/projects/trusted/
+SITES.tcpa_man_20031210.tgz= http://www.citi.umich.edu/u/rwash/projects/trusted/
 
 BUILD_DIRS=		${WRKSRC}/libtcpa ${WRKSRC}/examples
 INSTALLATION_DIRS=	bin lib man/man3 share/doc/${PKGBASE}
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 0107526e277..4426c870931 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/01/14 07:00:30 schmonz Exp $
+# $NetBSD: Makefile,v 1.28 2006/07/27 18:48:03 jlam Exp $
 
 DISTNAME=		daemontools-0.76
 PKGREVISION=		1
@@ -11,7 +11,7 @@ HOMEPAGE=		http://cr.yp.to/daemontools.html
 COMMENT=		Service monitoring and logging utilities by djb
 
 MANPAGES=		${DISTNAME}-man-20020131.tar.gz
-SITES_${MANPAGES}=	http://smarden.org/pape/djb/manpages/
+SITES.${MANPAGES}=	http://smarden.org/pape/djb/manpages/
 
 DJB_RESTRICTED=		YES
 
diff --git a/sysutils/xen12/Makefile b/sysutils/xen12/Makefile
index d4f4951b055..d8b3b4073d0 100644
--- a/sysutils/xen12/Makefile
+++ b/sysutils/xen12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/27 18:48:04 jlam Exp $
 #
 
 DISTNAME=		xeno-1.2-src-040418
@@ -28,7 +28,7 @@ BUILD_DEFS+=		XEN12_USE_COM2
 
 .if defined(XEN12_USE_COM2) && !empty(XEN12_USE_COM2:M[Yy][Ee][Ss])
 PATCHFILES+=		xen12-com2-support-040522.diff
-SITES_xen12-com2-support-040522.diff=ftp://ftp.NetBSD.org/pub/NetBSD/arch/xen/misc/
+SITES.xen12-com2-support-040522.diff=ftp://ftp.NetBSD.org/pub/NetBSD/arch/xen/misc/
 .endif
 
 post-extract:
diff --git a/textproc/GutenMark-words/Makefile b/textproc/GutenMark-words/Makefile
index 4012173dbe5..74de29f8866 100644
--- a/textproc/GutenMark-words/Makefile
+++ b/textproc/GutenMark-words/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/15 13:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/07/27 18:48:04 jlam Exp $
 #
 
 DISTNAME=	GutenMark-words-20030107
@@ -16,7 +16,7 @@ WORDLISTS=	special.words.gz english.names.gz US.places.gz \
 		italian.words.gz spanish.words.gz NonUS.places.gz \
 		norwegian.words.gz gaelic.words.gz danish.words.gz \
 		swedish.words.gz finnish.words.gz nonenglish.words.gz
-SITES_GutenMark.cfg=http://www.sandroid.org/GutenMark/
+SITES.GutenMark.cfg=http://www.sandroid.org/GutenMark/
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${DISTNAME}
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index a08da7512a1..11dc1c95889 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2006/06/04 14:04:33 schwarz Exp $
+# $NetBSD: Makefile,v 1.30 2006/07/27 18:48:04 jlam Exp $
 #
 
 DISTNAME=	docbook-xml-4.4
 PKGREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/xml/4.4/
-SITES_docbook-xml-4.3.zip=	http://www.oasis-open.org/docbook/xml/4.3/
-SITES_docbook-xml-4.2.zip=	http://www.oasis-open.org/docbook/xml/4.2/
+SITES.docbook-xml-4.3.zip=	http://www.oasis-open.org/docbook/xml/4.3/
+SITES.docbook-xml-4.2.zip=	http://www.oasis-open.org/docbook/xml/4.2/
 DISTFILES=	docbook-xml-4.2.zip docbook-xml-4.3.zip docbook-xml-4.4.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile
index 0cb08056c73..4d5a6e151e4 100644
--- a/wm/wmthemes/Makefile
+++ b/wm/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:30:55 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/07/27 18:48:04 jlam Exp $
 
 #
 # There is no distinfo file because users can specify alternate themes
@@ -35,7 +35,7 @@ BUILD_DEFS+=	WINDOWMAKER_THEMES
 THEME_FILES=
 .for theme in ${WINDOWMAKER_THEMES}
 THEME_FILES+=	${theme}.tar.gz
-SITES_${theme}.tar.gz=	http://download.freshmeat.net/themes/${theme:C/-[^-]*$//}/
+SITES.${theme}.tar.gz=	http://download.freshmeat.net/themes/${theme:C/-[^-]*$//}/
 .endfor
 
 .include "../../mk/x11.buildlink3.mk"
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index acb146f573a..b8a699552a9 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/03/04 21:30:59 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2006/07/27 18:48:04 jlam Exp $
 
 DISTNAME=		w3c-libwww-5.4.0
 PKGNAME=		libwww-5.4.0
@@ -16,7 +16,7 @@ COMMENT=		The W3C Reference Library
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-SITES_libwww-configure-5.4.0nb1.gz=	${MASTER_SITE_LOCAL}
+SITES.libwww-configure-5.4.0nb1.gz=	${MASTER_SITE_LOCAL}
 
 USE_TOOLS+=		gmake perl
 USE_LIBTOOL=		YES
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index ab3293e8e1b..d8f6b117dbc 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/01/05 22:46:12 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2006/07/27 18:48:04 jlam Exp $
 
 DISTNAME=	thttpd-2.25b
 PKGREVISION=	5
@@ -15,7 +15,7 @@ COMMENT=	Tiny/turbo/throttling HTTP server
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 NETBSD_LOGO=		sitedrivenby.gif
-SITES_${NETBSD_LOGO}=	http://www.NetBSD.org/images/logos/
+SITES.${NETBSD_LOGO}=	http://www.NetBSD.org/images/logos/
 
 GNU_CONFIGURE=	yes
 
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index a97cfffdde9..87363dcb5c9 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/04/16 12:12:25 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/07/27 18:48:04 jlam Exp $
 #
 
 DISTNAME=	tidy_src_051026
@@ -6,7 +6,7 @@ PKGNAME=	tidy-20051026
 CATEGORIES=	www
 MASTER_SITES=	http://tidy.sourceforge.net/src/ \
 		http://tidy.sourceforge.net/src/old/
-SITES_tidy_docs_050705.tgz=	http://tidy.sourceforge.net/docs/
+SITES.tidy_docs_050705.tgz=	http://tidy.sourceforge.net/docs/
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tidy_docs_050705${EXTRACT_SUFX}
 
diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile
index 5c177ffafec..597b2f9a311 100644
--- a/www/wdg-validate/Makefile
+++ b/www/wdg-validate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/04/22 09:22:17 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/27 18:48:04 jlam Exp $
 #
 
 DISTNAME=	validate-1.2.2
@@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	validate
 EXTRACT_ONLY=	wdg-sgml-lib-1.1.4.tar.gz
-SITES_wdg-sgml-lib-1.1.4.tar.gz=	http://www.htmlhelp.com/tools/validator/src/
+SITES.wdg-sgml-lib-1.1.4.tar.gz=	http://www.htmlhelp.com/tools/validator/src/
 
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	validate
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 54a81d819fd..bb51c3fdfcd 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.71 2006/07/26 12:39:25 drochner Exp $
+# $NetBSD: Makefile,v 1.72 2006/07/27 18:48:04 jlam Exp $
 #
 
 DISTNAME=		gnome-session-2.14.2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.14/}
-SITES_gnome-splash-2.14.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
+SITES.gnome-splash-2.14.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
 EXTRACT_SUFX=		.tar.bz2
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.14.0.png