Rename <phase>_COOKIE variables to _COOKIE.<phase>. These are private

variables so there are no user-visible changes.  This change just makes
it a little easier to write for loops.

4 files changed, 17 insertions, 17 deletions

diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk
index faac2b30dba..a2b3fcfab8e 100644
--- a/mk/flavor/pkg/depends.mk
+++ b/mk/flavor/pkg/depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.8 2006/07/06 22:29:52 jlam Exp $
+# $NetBSD: depends.mk,v 1.9 2006/07/07 21:24:28 jlam Exp $
 
 _DEPENDS_FILE=		${WRKDIR}/.depends
 _REDUCE_DEPENDS_CMD=	${SETENV} CAT=${CAT:Q}				\
@@ -10,8 +10,8 @@ _REDUCE_DEPENDS_CMD=	${SETENV} CAT=${CAT:Q}				\
 # dependencies of the package.
 #
 _DEPENDS_PATTERNS_CMD=	\
-	if ${TEST} -f ${_DEPENDS_COOKIE}; then				\
-		${CAT} ${_DEPENDS_COOKIE} |				\
+	if ${TEST} -f ${_COOKIE.depends}; then				\
+		${CAT} ${_COOKIE.depends} |				\
 		${AWK} '/^full/ { print $$2 } { next }';		\
 	fi
 
@@ -36,9 +36,9 @@ show-depends:
 ###
 .PHONY: depends-cookie
 depends-cookie: ${_DEPENDS_FILE}
-	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_DEPENDS_COOKIE} || ${FALSE}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_DEPENDS_COOKIE:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${_DEPENDS_FILE} ${_DEPENDS_COOKIE}
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.depends} || ${FALSE}
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.depends:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${_DEPENDS_FILE} ${_COOKIE.depends}
 
 ${_DEPENDS_FILE}:
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
diff --git a/mk/flavor/pkg/install.mk b/mk/flavor/pkg/install.mk
index 0057e454f41..2ecd6273b87 100644
--- a/mk/flavor/pkg/install.mk
+++ b/mk/flavor/pkg/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.7 2006/06/09 13:59:08 jlam Exp $
+# $NetBSD: install.mk,v 1.8 2006/07/07 21:24:28 jlam Exp $
 
 ######################################################################
 ### install-check-conflicts (PRIVATE, pkgsrc/mk/install/install.mk)
@@ -60,7 +60,7 @@ _REGISTER_DEPENDENCIES=							\
 	${SH} ${PKGSRCDIR}/mk/flavor/pkg/register-dependencies
 
 .PHONY: register-pkg
-register-pkg: generate-metadata ${_DEPENDS_COOKIE}
+register-pkg: generate-metadata ${_COOKIE.depends}
 	@${STEP_MSG} "Registering installation for ${PKGNAME}"
 	${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk
index 78b45768371..2f207fb5e13 100644
--- a/mk/flavor/pkg/metadata.mk
+++ b/mk/flavor/pkg/metadata.mk
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.6 2006/06/09 16:41:09 jlam Exp $
+# $NetBSD: metadata.mk,v 1.7 2006/07/07 21:24:28 jlam Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -272,7 +272,7 @@ ${_PRESERVE_FILE}:
 _SIZE_ALL_FILE=		${PKG_DB_TMPDIR}/+SIZE_ALL
 _METADATA_TARGETS+=	${_SIZE_ALL_FILE}
 
-${_SIZE_ALL_FILE}: ${_DEPENDS_COOKIE}
+${_SIZE_ALL_FILE}: ${_COOKIE.depends}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${_DEPENDS_PATTERNS_CMD} |					\
@@ -353,7 +353,7 @@ _INSTALL_ARG_cmd=	if ${TEST} -f ${INSTALL_FILE}; then		\
 _CONTENTS_TARGETS+=	${_BUILD_INFO_FILE}
 _CONTENTS_TARGETS+=	${_BUILD_VERSION_FILE}
 _CONTENTS_TARGETS+=	${_COMMENT_FILE}
-_CONTENTS_TARGETS+=	${_DEPENDS_COOKIE}
+_CONTENTS_TARGETS+=	${_COOKIE.depends}
 _CONTENTS_TARGETS+=	${_DESCR_FILE}
 _CONTENTS_TARGETS+=	${_MESSAGE_FILE}
 _CONTENTS_TARGETS+=	plist
diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk
index a552478fcb7..2cf660ba90d 100644
--- a/mk/flavor/pkg/replace.mk
+++ b/mk/flavor/pkg/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.3 2006/07/05 19:13:46 jlam Exp $
+# $NetBSD: replace.mk,v 1.4 2006/07/07 21:24:28 jlam Exp $
 
 ######################################################################
 ### replace-pkg (PRIVATE, pkgsrc/mk/install/replace.mk)
@@ -32,7 +32,7 @@ undo-replace-pkg: ${_UNDO_REPLACE_PKG_TARGETS}
 
 _REQUIRED_BY_FILE=	${PKG_DB_TMPDIR}/+REQUIRED_BY
 
-_REPLACE_COOKIE=	${WRKDIR}/.replace_done
+_COOKIE.replace=	${WRKDIR}/.replace_done
 _REPLACE_OLDNAME_FILE=	${WRKDIR}/.replace_oldname
 _REPLACE_NEWNAME_FILE=	${WRKDIR}/.replace_newname
 
@@ -45,7 +45,7 @@ _REPLACE_NEWNAME_FILE=	${WRKDIR}/.replace_newname
 .PHONY: undo-replace-check
 undo-replace-check:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${TEST} ! -f ${_REPLACE_COOKIE} || exit 0;			\
+	${TEST} ! -f ${_COOKIE.replace} || exit 0;			\
 	${ERROR_MSG} "No replacment to undo!";				\
 	exit 1
 
@@ -95,14 +95,14 @@ replace-names:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${ECHO} ${PKGNAME} > ${_REPLACE_NEWNAME_FILE}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${CP} -f ${_REPLACE_NEWNAME_FILE} ${_REPLACE_COOKIE}
+	${CP} -f ${_REPLACE_NEWNAME_FILE} ${_COOKIE.replace}
 
 .PHONY: undo-replace-names
 undo-replace-names:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${ECHO} ${PKGNAME} > ${_REPLACE_OLDNAME_FILE}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${CP} -f ${_REPLACE_COOKIE} ${_REPLACE_NEWNAME_FILE}
+	${CP} -f ${_COOKIE.replace} ${_REPLACE_NEWNAME_FILE}
 
 ######################################################################
 ### replace-preserve-required-by (PRIVATE)
@@ -170,4 +170,4 @@ replace-clean:
 	${RM} -f ${WRKDIR}/$$newname${PKG_SUFX}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${RM} -f ${_REPLACE_OLDNAME_FILE} ${_REPLACE_NEWNAME_FILE}	\
-		${_REPLACE_COOKIE}
+		${_COOKIE.replace}