Renamed replace-pkg to _flavor-replace and undo-replace-pkg to

_flavor-undo-replace. The leading underscore makes it obvious that these
targets are private, which saves redundant comments.

3 files changed, 24 insertions, 23 deletions

diff --git a/mk/flavor/README b/mk/flavor/README
index 88f5f926742..aca6fc0a9eb 100644
--- a/mk/flavor/README
+++ b/mk/flavor/README
@@ -55,8 +55,8 @@ The following make targets must be implemented:
   here.)
 * tarup-pkg
 * package-install
-* replace-pkg
-* undo-replace-pkg
+* _flavor-replace
+* _flavor-undo-replace
 
 = Bugs =
 
diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk
index 512a19f253f..a463b2e9647 100644
--- a/mk/flavor/pkg/replace.mk
+++ b/mk/flavor/pkg/replace.mk
@@ -1,12 +1,13 @@
-# $NetBSD: replace.mk,v 1.6 2006/11/16 22:06:18 rillig Exp $
+# $NetBSD: replace.mk,v 1.7 2007/03/08 23:06:37 rillig Exp $
+#
 
-######################################################################
-### replace-pkg (PRIVATE, pkgsrc/mk/install/replace.mk)
-######################################################################
-### replace-pkg updates a package in-place on the system.
-###
-
-replace-pkg: \
+# _flavor-replace:
+#	Updates a package in-place on the system.
+#
+# See also:
+#	replace
+#
+_flavor-replace: \
 	replace-tarup \
 	replace-names \
 	replace-preserve-required-by \
@@ -16,13 +17,13 @@ replace-pkg: \
 	replace-fixup-required-by \
 	.PHONY
 
-######################################################################
-### undo-replace-pkg (PRIVATE, pkgsrc/mk/install/replace.mk)
-######################################################################
-### undo-replace-pkg undoes a "make replace".
-###
-
-undo-replace-pkg: \
+# _flavor-undo-replace:
+#	Undoes the actions from a previous _flavor-replace.
+#
+# See also:
+#	undo-replace
+#
+_flavor-undo-replace: \
 	undo-replace-check \
 	replace-preserve-required-by \
 	deinstall \
diff --git a/mk/install/replace.mk b/mk/install/replace.mk
index 10fb3773d56..4c39181ea36 100644
--- a/mk/install/replace.mk
+++ b/mk/install/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.8 2007/02/20 11:17:03 rillig Exp $
+# $NetBSD: replace.mk,v 1.9 2007/03/08 23:06:37 rillig Exp $
 #
 # Public targets:
 #
@@ -13,11 +13,11 @@
 #
 # Private targets that must be defined by the package system flavor:
 #
-# replace-pkg:
+# _flavor-replace:
 #	Updates a package in-place on the system.
 #
-# undo-replace-pkg:
-#	Undoes a previous "make replace-pkg".
+# _flavor-undo-replace:
+#	Undoes a previous "make _flavor-replace".
 
 _REPLACE_TARGETS+=	${_PKGSRC_BUILD_TARGETS}
 _REPLACE_TARGETS+=	replace-message
@@ -38,7 +38,7 @@ replace-message:
 	@${PHASE_MSG} "Replacing for ${PKGNAME}"
         @${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 
-su-replace: replace-pkg
+su-replace: _flavor-replace
 MAKEFLAGS.su-replace=	_UPDATE_RUNNING=yes
 
 #
@@ -52,5 +52,5 @@ undo-replace-message:
 	@${PHASE_MSG} "Undoing replacement for ${PKGNAME}"
         @${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 
-su-undo-replace: undo-replace-pkg
+su-undo-replace: _flavor-undo-replace
 MAKEFLAGS.su-undo-replace=	_UPDATE_RUNNING=yes