Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

XXX: Why do we have the exactly same code in all the files?

10 files changed, 49 insertions, 49 deletions

diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk
index 99a2092a68e..773c5bec332 100644
--- a/mk/compiler/ccache.mk
+++ b/mk/compiler/ccache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.30 2007/10/16 09:33:29 rillig Exp $
+# $NetBSD: ccache.mk,v 1.31 2008/02/07 20:59:05 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -129,11 +129,11 @@ PKGSRC_MAKE_ENV+=	CCACHE_DIR=${CCACHE_DIR:Q}
 .    if !target(${_CCACHE_${_var_}})
 override-tools: ${_CCACHE_${_var_}}
 ${_CCACHE_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	${LN} -fs ${CCACHE_BASE}/bin/ccache ${.TARGET}
 .      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -fs ${CCACHE_BASE}/bin/ccache ${_alias_};		\
 	fi
diff --git a/mk/compiler/ccc.mk b/mk/compiler/ccc.mk
index 6e514fcc8e5..2ec4afae4e9 100644
--- a/mk/compiler/ccc.mk
+++ b/mk/compiler/ccc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ccc.mk,v 1.16 2007/03/15 22:33:42 rillig Exp $
+# $NetBSD: ccc.mk,v 1.17 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the Compaq C Compilers.
 #
@@ -69,14 +69,14 @@ PREPEND_PATH+=	${_CCC_DIR}/bin
 .  if !target(${_CCC_${_var_}})
 override-tools: ${_CCC_${_var_}}
 ${_CCC_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
 	 ${ECHO} 'exec /usr/bin/${.TARGET:T} "$$@"';			\
 	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+	${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -f ${.TARGET} ${_alias_};				\
 	fi
diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk
index bb6fe784f04..e555cca243f 100644
--- a/mk/compiler/distcc.mk
+++ b/mk/compiler/distcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.29 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: distcc.mk,v 1.30 2008/02/07 20:59:05 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -110,11 +110,11 @@ PKGSRC_MAKE_ENV+=	DISTCC_VERBOSE=${DISTCC_VERBOSE:Q}
 .    if !target(${_DISTCC_${_var_}})
 override-tools: ${_DISTCC_${_var_}}
 ${_DISTCC_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	${LN} -fs ${_DISTCCBASE}/bin/distcc ${.TARGET}
 .      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -fs ${_DISTCCBASE}/bin/distcc ${_alias_};		\
 	fi
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk
index 78a8c58191e..01288e254c5 100644
--- a/mk/compiler/f2c.mk
+++ b/mk/compiler/f2c.mk
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.9 2007/01/16 17:16:20 dmcmahill Exp $
+# $NetBSD: f2c.mk,v 1.10 2008/02/07 20:59:05 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -109,11 +109,11 @@ PKGSRC_MAKE_ENV+=	F2C_DIR=${F2C_DIR:Q}
 .    if !target(${_F2C_${_var_}})
 override-tools: ${_F2C_${_var_}}
 ${_F2C_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${.TARGET}
 .      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${_alias_};		\
 	fi
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index b14736b064c..22dd65cfe44 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.92 2007/08/11 17:31:22 joerg Exp $
+# $NetBSD: gcc.mk,v 1.93 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -433,19 +433,19 @@ GCC_USE_SYMLINKS?=	no
 .  if !target(${_GCC_${_var_}})
 override-tools: ${_GCC_${_var_}}
 ${_GCC_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${RUN}${MKDIR} ${.TARGET:H}
 .    if !empty(GCC_USE_SYMLINKS:Myes)
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${LN} -s ${_GCCBINDIR}/${.TARGET:T} ${.TARGET}
+	${RUN}${RM} -f ${.TARGET}
+	${RUN}${LN} -s ${_GCCBINDIR}/${.TARGET:T} ${.TARGET}
 .    else
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
 	 ${ECHO} 'exec ${_GCCBINDIR}/${.TARGET:T} "$$@"';		\
 	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+	${RUN}${CHMOD} +x ${.TARGET}
 .    endif
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -f -s ${.TARGET:T} ${_alias_};			\
 	fi
diff --git a/mk/compiler/hp.mk b/mk/compiler/hp.mk
index 7d5e0eeb46c..452d4400abb 100644
--- a/mk/compiler/hp.mk
+++ b/mk/compiler/hp.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hp.mk,v 1.4 2008/01/15 10:08:18 tnn Exp $
+# $NetBSD: hp.mk,v 1.5 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the HP-UX C/aC++ compilers.
 #
@@ -71,14 +71,14 @@ PREPEND_PATH+=	${_HP_DIR}/bin
 .  if !target(${_HP_${_var_}})
 override-tools: ${_HP_${_var_}}
 ${_HP_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
 	 ${ECHO} 'exec ${${_var_}PATH} "$$@"';			\
 	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+	${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -f ${.TARGET} ${_alias_};				\
 	fi
diff --git a/mk/compiler/icc.mk b/mk/compiler/icc.mk
index 37ea4a0991c..c624b6bdc7d 100644
--- a/mk/compiler/icc.mk
+++ b/mk/compiler/icc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: icc.mk,v 1.4 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: icc.mk,v 1.5 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the Intel compilers.
 #
@@ -80,14 +80,14 @@ CONFIGURE_ENV+=		ac_cv___attribute__=yes
 .  if !target(${_ICC_${_var_}})
 override-tools: ${_ICC_${_var_}}
 ${_ICC_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
 	 ${ECHO} 'exec ${ICCBASE}/bin/${.TARGET:T} "$$@"';		\
 	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+	${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -f ${.TARGET} ${_alias_};				\
 	fi
diff --git a/mk/compiler/ido.mk b/mk/compiler/ido.mk
index fcc32d1f655..9f8b83e657f 100644
--- a/mk/compiler/ido.mk
+++ b/mk/compiler/ido.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ido.mk,v 1.5 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: ido.mk,v 1.6 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the SGI IRIS Development Option
 # cc (IRIX 5).
@@ -66,14 +66,14 @@ PREPEND_PATH+=	${_IDO_DIR}/bin
 .  if !target(${_IDO_${_var_}})
 override-tools: ${_IDO_${_var_}}
 ${_IDO_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
 	 ${ECHO} 'exec ${${_var_}PATH} "$$@"';			\
 	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+	${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -f ${.TARGET} ${_alias_};				\
 	fi
diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index fae9327d0b0..4c52767b1ae 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.38 2007/03/07 01:37:18 rillig Exp $
+# $NetBSD: mipspro.mk,v 1.39 2008/02/07 20:59:05 rillig Exp $
 #
 # This is the compiler definition for the MIPSpro C compiler.
 #
@@ -90,14 +90,14 @@ PREPEND_PATH+=	${_MIPSPRO_DIR}/bin
 .  if !target(${_MIPSPRO_${_var_}})
 override-tools: ${_MIPSPRO_${_var_}}
 ${_MIPSPRO_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
 	 ${ECHO} 'exec ${MIPSPROBASE}/bin/${.TARGET:T} "$$@"';		\
 	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+	${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -f ${.TARGET} ${_alias_};				\
 	fi
diff --git a/mk/compiler/xlc.mk b/mk/compiler/xlc.mk
index f5a7716227c..bf352ee7818 100644
--- a/mk/compiler/xlc.mk
+++ b/mk/compiler/xlc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.16 2007/08/30 21:47:29 joerg Exp $
+# $NetBSD: xlc.mk,v 1.17 2008/02/07 20:59:05 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -116,14 +116,14 @@ PREPEND_PATH+=	${_XLC_DIR}/bin
 .  if !target(${_XLC_${_var_}})
 override-tools: ${_XLC_${_var_}}
 ${_XLC_${_var_}}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}${MKDIR} ${.TARGET:H}
+	${RUN}					\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
 	 ${ECHO} 'exec ${XLCBASE}/bin/${.TARGET:T} "$$@"';		\
 	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+	${RUN}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -f ${.TARGET} ${_alias_};				\
 	fi