Make MTREE_FILE and MTREE_ARGS internal by prefixing them with '_'.

They are not supposed to be set by the user.

4 files changed, 13 insertions, 13 deletions

diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index b260463b006..3f59e8df24e 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.41 2007/02/10 08:59:07 rillig Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.42 2007/03/02 09:08:34 wiz Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -42,7 +42,7 @@ MAKE_FLAGS+=		CC=${CC:Q} CXX=${CXX:Q}
 .endif
 
 .if defined(USE_X11BASE)
-MTREE_FILE?=		${PKGSRCDIR}/mk/platform/${OPSYS}.x11.dist
+_MTREE_FILE?=		${PKGSRCDIR}/mk/platform/${OPSYS}.x11.dist
 .  if ${X11_TYPE} != "modular"
 .    include "../../mk/x11.buildlink3.mk"
 .  endif
diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk
index 73126b8738a..77f9368990d 100644
--- a/mk/flavor/pkg/metadata.mk
+++ b/mk/flavor/pkg/metadata.mk
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.13 2006/11/13 18:02:09 agc Exp $
+# $NetBSD: metadata.mk,v 1.14 2007/03/02 09:08:33 wiz Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -326,7 +326,7 @@ _PKG_CREATE_ARGS+=				-c ${_COMMENT_FILE}
 _PKG_CREATE_ARGS+=	${_MESSAGE_FILE:D	-D ${_MESSAGE_FILE}}
 _PKG_CREATE_ARGS+=				-d ${_DESCR_FILE}
 _PKG_CREATE_ARGS+=				-f ${PLIST}
-_PKG_CREATE_ARGS+=	${NO_MTREE:D:U		-m ${MTREE_FILE}}
+_PKG_CREATE_ARGS+=	${NO_MTREE:D:U		-m ${_MTREE_FILE}}
 _PKG_CREATE_ARGS+=	${PKG_PRESERVE:D	-n ${_PRESERVE_FILE}}
 _PKG_CREATE_ARGS+=				-S ${_SIZE_ALL_FILE}
 _PKG_CREATE_ARGS+=				-s ${_SIZE_PKG_FILE}
@@ -370,7 +370,7 @@ _CONTENTS_TARGETS+=	plist
 _CONTENTS_TARGETS+=	${_PRESERVE_FILE}
 _CONTENTS_TARGETS+=	${_SIZE_ALL_FILE}
 _CONTENTS_TARGETS+=	${_SIZE_PKG_FILE}
-_CONTENTS_TARGETS+=	${NO_MTREE:D:U${MTREE_FILE}}
+_CONTENTS_TARGETS+=	${NO_MTREE:D:U${_MTREE_FILE}}
 
 ${_CONTENTS_FILE}: ${_CONTENTS_TARGETS}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
diff --git a/mk/install/install.mk b/mk/install/install.mk
index 9262b80635f..cb85ba0fe02 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.34 2007/03/02 08:49:40 wiz Exp $
+# $NetBSD: install.mk,v 1.35 2007/03/02 09:08:33 wiz Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -231,15 +231,15 @@ install-check-umask:
 ### then it's known to pre-create all of the directories that it needs
 ### at install-time, so we don't need mtree to do it for us.
 ###
-MTREE_FILE?=	${PKGSRCDIR}/mk/platform/${OPSYS}.pkg.dist
-MTREE_ARGS?=	-U -f ${MTREE_FILE} -d -e -p
+_MTREE_FILE?=	${PKGSRCDIR}/mk/platform/${OPSYS}.pkg.dist
+_MTREE_ARGS?=	-U -f ${_MTREE_FILE} -d -e -p
 
 .PHONY: install-makedirs
 install-makedirs:
 	${_PKG_SILENT}${_PKG_DEBUG}${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}
 .if !defined(NO_MTREE)
-	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${MTREE_FILE} ||	\
-		${MTREE} ${MTREE_ARGS} ${DESTDIR}${PREFIX}/
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_MTREE_FILE} ||	\
+		${MTREE} ${_MTREE_ARGS} ${DESTDIR}${PREFIX}/
 .endif
 .if defined(INSTALLATION_DIRS) && !empty(INSTALLATION_DIRS)
 	@${STEP_MSG} "Creating installation directories"
diff --git a/mk/plist/print-plist.mk b/mk/plist/print-plist.mk
index 0755c317340..67830825f83 100644
--- a/mk/plist/print-plist.mk
+++ b/mk/plist/print-plist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: print-plist.mk,v 1.11 2006/11/15 10:40:34 joerg Exp $
+# $NetBSD: print-plist.mk,v 1.12 2007/03/02 09:08:33 wiz Exp $
 
 ###
 ### Automatic PLIST generation
@@ -55,7 +55,7 @@ _PRINT_PLIST_AWK_IGNORE+=	|| ($$0 ~ /^.*\/fonts\.cache-1/)
 .endif
 
 # Common (system) directories not to generate @dirrm statements for
-# Reads MTREE_FILE and generate awk statements that will
+# Reads _MTREE_FILE and generate awk statements that will
 # sort out which directories NOT to include into the PLIST @dirrm list
 .if make(print-PLIST)
 _PRINT_PLIST_COMMON_DIRS!=	${AWK} 'BEGIN {				\
@@ -80,7 +80,7 @@ _PRINT_PLIST_COMMON_DIRS!=	${AWK} 'BEGIN {				\
 			}						\
 		}							\
 		END { print "{ print $$$$0; }"; }			\
-	' <${MTREE_FILE}
+	' <${_MTREE_FILE}
 .endif
 
 # scan $PREFIX for any files/dirs modified since the package was extracted