--- a/make-rules/prep-download.mk	Wed May 06 15:27:49 2015 -0700
+++ b/make-rules/prep-download.mk	Mon May 04 18:32:20 2015 -0500
@@ -35,7 +35,7 @@
 # the file and signature for verification of its contents.
 #
 
-TMP_SUFFIXES = $(subst COMPONENT_ARCHIVE_URL_,, \
+URL_SUFFIXES = $(subst COMPONENT_ARCHIVE_URL_,, \
 		$(filter COMPONENT_ARCHIVE_URL_%, $(.VARIABLES)))
 
 # Template for download rules.
@@ -64,4 +64,4 @@
 # cleanup macros.
 #
 $(eval $(call download-rules,))
-$(foreach suffix, $(TMP_SUFFIXES), $(eval $(call download-rules,_$(suffix))))
+$(foreach suffix, $(URL_SUFFIXES), $(eval $(call download-rules,_$(suffix))))

--- a/make-rules/prep-git.mk	Wed May 06 15:27:49 2015 -0700
+++ b/make-rules/prep-git.mk	Mon May 04 18:32:20 2015 -0500
@@ -28,7 +28,7 @@
 # GIT_COMMIT_ID{_[0-9]+} to match.
 #
 
-TMP_SUFFIXES = $(subst GIT_REPO_,, $(filter GIT_REPO_%, $(.VARIABLES)))
+GIT_SUFFIXES = $(subst GIT_REPO_,, $(filter GIT_REPO_%, $(.VARIABLES)))
 
 define git-rules
 ifdef GIT_REPO$(1)
@@ -74,4 +74,4 @@
 # cleanup macros.
 #
 $(eval $(call git-rules,))
-$(foreach suffix, $(TMP_SUFFIXES), $(eval $(call git-rules,_$(suffix))))
+$(foreach suffix, $(GIT_SUFFIXES), $(eval $(call git-rules,_$(suffix))))

--- a/make-rules/prep-hg.mk	Wed May 06 15:27:49 2015 -0700
+++ b/make-rules/prep-hg.mk	Mon May 04 18:32:20 2015 -0500
@@ -28,7 +28,7 @@
 # HG_REV{_[0-9]+} to match.
 #
 
-TMP_SUFFIXES = $(subst HG_REPO_,, $(filter HG_REPO_%, $(.VARIABLES)))
+HG_SUFFIXES = $(subst HG_REPO_,, $(filter HG_REPO_%, $(.VARIABLES)))
 
 define mercurial-rules
 ifdef HG_REPO$(1)
@@ -72,4 +72,4 @@
 # cleanup macros.
 #
 $(eval $(call mercurial-rules,))
-$(foreach suffix, $(TMP_SUFFIXES), $(eval $(call mercurial-rules,_$(suffix))))
+$(foreach suffix, $(HG_SUFFIXES), $(eval $(call mercurial-rules,_$(suffix))))

--- a/make-rules/prep-patch.mk	Wed May 06 15:27:49 2015 -0700
+++ b/make-rules/prep-patch.mk	Mon May 04 18:32:20 2015 -0500
@@ -54,7 +54,7 @@
 				LC_COLLATE=C sort)
 PATHCES +=	$(EXTRA_PATCHES)
 
-TMP_SUFFIXES = $(patsubst .patch_%,%, $(filter-out .patch,$(suffix $(PATCHES))))
+PCH_SUFFIXES = $(patsubst .patch_%,%, $(filter-out .patch,$(suffix $(PATCHES))))
 
 define patch-rule
 
@@ -87,5 +87,5 @@
 # Define the rules required to download any source archives and augment any
 # cleanup macros.
 #
-$(foreach suffix, $(TMP_SUFFIXES), $(eval $(call patch-rule,_$(suffix))))
+$(foreach suffix, $(PCH_SUFFIXES), $(eval $(call patch-rule,_$(suffix))))
 $(eval $(call patch-rule,))	# this must be last so we don't drop *.patch_%.

--- a/make-rules/prep-svn.mk	Wed May 06 15:27:49 2015 -0700
+++ b/make-rules/prep-svn.mk	Mon May 04 18:32:20 2015 -0500
@@ -28,7 +28,7 @@
 # SVN_REV{_[0-9]+} to match.
 #
 
-TMP_SUFFIXES = $(subst SVN_REPO_,, $(filter SVN_REPO_%, $(.VARIABLES)))
+SVN_SUFFIXES = $(subst SVN_REPO_,, $(filter SVN_REPO_%, $(.VARIABLES)))
 
 define subversion-rules
 ifdef SVN_REPO$(1)
@@ -71,4 +71,4 @@
 # cleanup macros.
 #
 $(eval $(call subversion-rules,))
-$(foreach suffix, $(TMP_SUFFIXES), $(eval $(call subversion-rules,_$(suffix))))
+$(foreach suffix, $(SVN_SUFFIXES), $(eval $(call subversion-rules,_$(suffix))))

--- a/make-rules/prep-unpack.mk	Wed May 06 15:27:49 2015 -0700
+++ b/make-rules/prep-unpack.mk	Mon May 04 18:32:20 2015 -0500
@@ -27,7 +27,7 @@
 # Anything that we downloaded and want to unpack must have a
 # COMPONENT_ARCHIVE{_[0-9]+} macro.
 #
-TMP_SUFFIXES = $(subst COMPONENT_ARCHIVE_,, \
+PCK_SUFFIXES = $(subst COMPONENT_ARCHIVE_,, \
                 $(filter COMPONENT_ARCHIVE_%, $(.VARIABLES)))
 
 # Template for unpacking rules.
@@ -66,4 +66,4 @@
 # cleanup macros.
 #
 $(eval $(call unpack-rules,))
-$(foreach suffix, $(TMP_SUFFIXES), $(eval $(call unpack-rules,_$(suffix))))
+$(foreach suffix, $(PCK_SUFFIXES), $(eval $(call unpack-rules,_$(suffix))))