From cb4b57b6b0550cc574f892b42abe94aee8f18741 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Thu, 8 Jun 2006 08:01:53 +0000
Subject: Replaced PHASE_MSG with STEP_MSG in many (but not all) places where
 it wasn't used to identify a ``phase'', as defined in the pkgsrc guide.

---
 mk/bsd.pkg.mk                   |  6 +++---
 mk/flavor/pkg/depends.mk        | 10 +++++-----
 mk/flavor/pkg/install.mk        |  4 ++--
 mk/flavor/pkg/metadata.mk       |  4 ++--
 mk/flavor/pkg/views.mk          |  6 +++---
 mk/patch/patch.mk               |  4 ++--
 mk/pkginstall/bsd.pkginstall.mk |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 33814ca3f01..844059a54f0 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1846 2006/06/07 18:37:06 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1847 2006/06/08 08:01:53 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -1340,9 +1340,9 @@ su-target: .USE
 		*) ${WARNING_MSG} "Running: "${PRE_ROOT_CMD:Q} ;;	\
 		esac;							\
 		${PRE_ROOT_CMD};					\
-		${PHASE_MSG} "Becoming \`\`${ROOT_USER}'' to make su-${.TARGET} (`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'`)"; \
+		${STEP_MSG} "Becoming \`\`${ROOT_USER}'' to make su-${.TARGET} (`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'`)"; \
 		${SU_CMD} "cd ${.CURDIR}; ${SETENV} PATH='$${PATH}:${SU_CMD_PATH_APPEND}' ${MAKE} ${MAKEFLAGS} PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL} su-${.TARGET} ${MAKEFLAGS.su-${.TARGET}}"; \
-		${PHASE_MSG} "Dropping \`\`${ROOT_USER}'' privileges."; \
+		${STEP_MSG} "Dropping \`\`${ROOT_USER}'' privileges."; \
 	fi
 
 # Empty pre-* and post-* targets
diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk
index 94b4bdfb997..fa4062bb522 100644
--- a/mk/flavor/pkg/depends.mk
+++ b/mk/flavor/pkg/depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.4 2006/06/08 07:04:49 rillig Exp $
+# $NetBSD: depends.mk,v 1.5 2006/06/08 08:01:53 rillig Exp $
 
 _DEPENDS_FILE=		${WRKDIR}/.depends
 _REDUCE_DEPENDS_CMD=	${SETENV} CAT=${CAT:Q}				\
@@ -77,9 +77,9 @@ depends-install: ${_DEPENDS_FILE}
 		pkg=`${_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`;	\
 		case "$$pkg" in						\
 		"")							\
-			${PHASE_MSG} "Required installed package $$pattern: NOT found"; \
+			${STEP_MSG} "Required installed package $$pattern: NOT found"; \
 			target=${DEPENDS_TARGET:Q};			\
-			${PHASE_MSG} "Verifying $$target for $$dir";	\
+			${STEP_MSG} "Verifying $$target for $$dir";	\
 			if ${TEST} ! -d "$$dir"; then			\
 				${ERROR_MSG} "[depends.mk] The directory \`\`$$dir'' does not exist."; \
 				exit 1;					\
@@ -93,7 +93,7 @@ depends-install: ${_DEPENDS_FILE}
 				${ERROR_MSG} "    stale work directory for $$dir?"; \
 				exit 1;					\
 			esac;						\
-			${PHASE_MSG} "Returning to build of ${PKGNAME}"; \
+			${STEP_MSG} "Returning to build of ${PKGNAME}"; \
 			;;						\
 		*)							\
 			objfmt=`${PKG_INFO} -Q OBJECT_FMT "$$pkg"`;	\
@@ -106,7 +106,7 @@ depends-install: ${_DEPENDS_FILE}
 				exit 1;					\
 				;;					\
 			esac;						\
-			${PHASE_MSG} "Required installed package $$pattern: $$pkg found"; \
+			${STEP_MSG} "Required installed package $$pattern: $$pkg found"; \
 			;;						\
 		esac;							\
 	done
diff --git a/mk/flavor/pkg/install.mk b/mk/flavor/pkg/install.mk
index b2ead7eb6d4..dafaef4e17b 100644
--- a/mk/flavor/pkg/install.mk
+++ b/mk/flavor/pkg/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.5 2006/06/07 17:21:23 jlam Exp $
+# $NetBSD: install.mk,v 1.6 2006/06/08 08:01:53 rillig Exp $
 
 ######################################################################
 ### install-check-conflicts (PRIVATE, pkgsrc/mk/install/install.mk)
@@ -64,7 +64,7 @@ _REGISTER_DEPENDENCIES=							\
 
 .PHONY: register-pkg
 register-pkg: generate-metadata ${_DEPENDS_COOKIE}
-	@${PHASE_MSG} "Registering installation for ${PKGNAME}"
+	@${STEP_MSG} "Registering installation for ${PKGNAME}"
 	${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
 	${_PKG_SILENT}${_PKG_DEBUG}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME}
diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk
index 1ad45fff2c6..91df7ac9552 100644
--- a/mk/flavor/pkg/metadata.mk
+++ b/mk/flavor/pkg/metadata.mk
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.4 2006/06/07 17:05:25 jlam Exp $
+# $NetBSD: metadata.mk,v 1.5 2006/06/08 08:01:53 rillig Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -234,7 +234,7 @@ ${_MESSAGE_FILE}: ${MESSAGE_SRC}
 .PHONY: install-display-message
 register-pkg: install-display-message
 install-display-message: ${_MESSAGE_FILE}
-	@${PHASE_MSG} "Please note the following:"
+	@${STEP_MSG} "Please note the following:"
 	@${ECHO_MSG} ""
 	@${CAT} ${_MESSAGE_FILE}
 	@${ECHO_MSG} ""
diff --git a/mk/flavor/pkg/views.mk b/mk/flavor/pkg/views.mk
index 9235d1169df..97ac5e1734e 100644
--- a/mk/flavor/pkg/views.mk
+++ b/mk/flavor/pkg/views.mk
@@ -1,4 +1,4 @@
-# $NetBSD: views.mk,v 1.3 2006/06/07 17:28:33 jlam Exp $
+# $NetBSD: views.mk,v 1.4 2006/06/08 08:01:53 rillig Exp $
 
 # By default, all packages attempt to link into the views.
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
@@ -33,7 +33,7 @@ privileged-install-hook: build-views
 ###
 .PHONY: build-views su-build-views
 build-views: su-target
-	@${PHASE_MSG} "Building views for ${PKGNAME}"
+	@${STEP_MSG} "Building views for ${PKGNAME}"
 
 su-build-views:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
@@ -76,7 +76,7 @@ su-build-views:
 ###
 .PHONY: remove-views su-remove-views
 remove-views: su-target
-	@${PHASE_MSG} "Removing ${PKGNAME} from views"
+	@${STEP_MSG} "Removing ${PKGNAME} from views"
 
 su-remove-views:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
diff --git a/mk/patch/patch.mk b/mk/patch/patch.mk
index d7c78c21388..e39ffb711c2 100644
--- a/mk/patch/patch.mk
+++ b/mk/patch/patch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: patch.mk,v 1.2 2006/06/08 07:30:40 rillig Exp $
+# $NetBSD: patch.mk,v 1.3 2006/06/08 08:01:53 rillig Exp $
 #
 # The following variables may be set in a package Makefile and control
 # how pkgsrc patches are applied.
@@ -223,7 +223,7 @@ PATCH_DIST_CAT.${i:S/=/--/}?=	{ patchfile=${i}; ${PATCH_DIST_CAT}; }
 .endfor
 
 distribution-patch-message:
-	@${PHASE_MSG} "Applying distribution patches for ${PKGNAME}"
+	@${STEP_MSG} "Applying distribution patches for ${PKGNAME}"
 
 do-distribution-patch:
 .for i in ${PATCHFILES}
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index d49e5dc5c6e..9e38f8c638e 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.8 2006/06/08 03:30:37 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.9 2006/06/08 08:01:53 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -276,7 +276,7 @@ _INSTALL_USERGROUP_CHECK=						\
 
 .PHONY: create-usergroup
 create-usergroup: su-target
-	@${PHASE_MSG} "Requiring users and groups for ${PKGNAME}"
+	@${STEP_MSG} "Requiring users and groups for ${PKGNAME}"
 
 PRE_CMD.su-create-usergroup=						\
 	if ${_INSTALL_USERGROUP_CHECK} -g ${_PKG_GROUPS:C/\:*$//} &&	\
-- 
cgit v1.2.3