cleanup: replaced _PKG_SILENT and _PKG_DEBUG with RUN.

20 files changed, 72 insertions, 72 deletions

diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile
index 3deb3370bcc..57da3fa4299 100644
--- a/databases/postgresql81-client/Makefile
+++ b/databases/postgresql81-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/06/20 08:27:57 adam Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/16 07:22:01 rillig Exp $
 
 PKGNAME=	postgresql81-client-${BASE_VERS}
 COMMENT=	PostgreSQL database client programs
@@ -73,9 +73,9 @@ post-wrapper:
 .endif
 
 pre-build:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/backend &&					\
-	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}		\
 		../../src/include/parser/parse.h			\
 		../../src/include/utils/fmgroids.h
 
@@ -84,7 +84,7 @@ post-install:
 		FAQ* KNOWN_BUGS MISSING_FEATURES README.* TODO		\
 		bug.template;						\
 	do								\
-		${INSTALL_DATA} $$file ${DESTDIR}${PG_DOC_DIR}/$$file;		\
+		${INSTALL_DATA} $$file ${DESTDIR}${PG_DOC_DIR}/$$file;	\
         done
 	cp -R ${WRKSRC}/doc/TODO.detail ${DESTDIR}${PG_DOC_DIR}
 	chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PG_DOC_DIR}/TODO.detail
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index b90326be9bd..982d8b12307 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/06/20 08:27:58 adam Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/16 07:22:01 rillig Exp $
 
 PKGNAME=	postgresql81-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -84,12 +84,12 @@ post-wrapper:
 .endif
 
 pre-build:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/backend &&					\
-	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}		\
 		../../src/include/parser/parse.h			\
 		../../src/include/utils/fmgroids.h
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/port &&					\
        	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile
index f40dac9810d..107add2b55b 100644
--- a/databases/postgresql82-client/Makefile
+++ b/databases/postgresql82-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/01/20 19:43:56 sketch Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/16 07:22:01 rillig Exp $
 
 PKGNAME=	postgresql82-client-${BASE_VERS}
 COMMENT=	PostgreSQL database client programs
@@ -75,9 +75,9 @@ post-wrapper:
 .endif
 
 pre-build:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/backend &&					\
-	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}		\
 		../../src/include/parser/parse.h			\
 		../../src/include/utils/fmgroids.h
 
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index a3599b6337d..e282fbaf54b 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/04/05 16:40:08 adam Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/16 07:22:01 rillig Exp $
 
 PKGNAME=	postgresql82-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -84,12 +84,12 @@ post-wrapper:
 .endif
 
 pre-build:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/backend &&					\
-	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}		\
 		../../src/include/parser/parse.h			\
 		../../src/include/utils/fmgroids.h
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/port &&					\
        	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile
index 5d79b9f3d4c..15f8d5eb0b2 100644
--- a/databases/postgresql83-client/Makefile
+++ b/databases/postgresql83-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/01/20 19:43:56 sketch Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/16 07:22:02 rillig Exp $
 
 PKGNAME=	postgresql83-client-${BASE_VERS}
 COMMENT=	PostgreSQL database client programs
@@ -72,9 +72,9 @@ post-wrapper:
 .endif
 
 pre-build:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/backend &&					\
-	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}		\
 		../../src/include/parser/parse.h			\
 		../../src/include/utils/fmgroids.h
 
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 0968e33e0f3..db8bae3e3c0 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/07 17:55:42 adam Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/16 07:22:02 rillig Exp $
 
 PKGNAME=	postgresql83-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -85,12 +85,12 @@ post-wrapper:
 .endif
 
 pre-build:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/backend &&					\
-	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}		\
 		../../src/include/parser/parse.h			\
 		../../src/include/utils/fmgroids.h
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC}/src/port &&					\
        	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
diff --git a/databases/shared-mime-info/buildlink3.mk b/databases/shared-mime-info/buildlink3.mk
index 5378163693e..a5c19a28e73 100644
--- a/databases/shared-mime-info/buildlink3.mk
+++ b/databases/shared-mime-info/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/05/16 07:22:02 rillig Exp $
 
 BUILDLINK_TREE+=	shared-mime-info
 
@@ -15,7 +15,7 @@ _SMI_FAKE_UPDATEDB=	${BUILDLINK_DIR}/bin/update-mime-database
 
 .PHONY: shared-mime-info-buildlink-fake
 shared-mime-info-buildlink-fake:
-	${_PKG_SILENT}${_PKG_DEBUG}set -e;				\
+	${RUN} \
 	if [ ! -f ${_SMI_FAKE_UPDATEDB:Q} ]; then			\
 		${ECHO_BUILDLINK_MSG} "Creating "${_SMI_FAKE_UPDATEDB:Q}; \
 		${MKDIR} ${_SMI_FAKE_UPDATEDB:H};			\
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index 0694ec2fad7..33fec48d58e 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/05/16 07:22:02 rillig Exp $
 
 BUILDLINK_TREE+=	GConf
 
@@ -22,7 +22,7 @@ _GCONF_FAKE=		${BUILDLINK_DIR}/bin/gconftool-2
 
 .PHONY: GConf-buildlink-fake
 GConf-buildlink-fake:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN} \
 	if [ ! -f ${_GCONF_FAKE} ]; then				\
 		${ECHO_BUILDLINK_MSG} "Creating ${_GCONF_FAKE}";	\
 		${MKDIR} ${_GCONF_FAKE:H};				\
diff --git a/devel/guile-fcgi/Makefile b/devel/guile-fcgi/Makefile
index b50c363b349..487409f7607 100644
--- a/devel/guile-fcgi/Makefile
+++ b/devel/guile-fcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/07/14 12:56:01 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/16 07:22:02 rillig Exp $
 
 DISTNAME=	guile-fcgi-0.1
 PKGREVISION=	7
@@ -17,8 +17,8 @@ CONFIGURE_ARGS+=--with-fcgi-includes=${BUILDLINK_PREFIX.fcgi}/include
 CONFIGURE_ARGS+=--with-fcgi-lib=${BUILDLINK_PREFIX.fcgi}/lib
 
 do-build:
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} guile-fcgi.x
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
+	${RUN} cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} guile-fcgi.x
+	${RUN} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
 
 .include "../../lang/guile/buildlink3.mk"
 .include "../../www/fcgi/buildlink3.mk"
diff --git a/devel/libltdl/convenience.mk b/devel/libltdl/convenience.mk
index 9c8415cba04..780326e7e6a 100644
--- a/devel/libltdl/convenience.mk
+++ b/devel/libltdl/convenience.mk
@@ -1,4 +1,4 @@
-# $NetBSD: convenience.mk,v 1.9 2006/10/05 12:41:24 rillig Exp $
+# $NetBSD: convenience.mk,v 1.10 2009/05/16 07:22:02 rillig Exp $
 #
 # Override "libltdlc.la" -- the libltdl "convenience" library embedded into
 # programs that ship with libltdl.  Also override packages attempting to
@@ -12,7 +12,7 @@ post-patch: fix-libltdlc
 fix-libltdlc:
 	@${STEP_MSG} 'Fixing libltdl convenience library linkage.'
 .for sd in ${LIBLTDL_CONVENIENCE_SUBDIR}
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN}								\
 	cd ${WRKSRC}/${sd};						\
 	rm -f Makefile Makefile.in Makefile.am configure* ltdl.h *.la;	\
 	{ ${ECHO} "# Generated by devel/libltdl/convenience.mk";	\
@@ -23,7 +23,7 @@ fix-libltdlc:
 	${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la libltdl.la;		\
 	${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la libltdlc.la
 .  if ${OPSYS} == "Darwin"
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	cd ${WRKSRC}/${sd} &&						\
 	${LN} -s ${BUILDLINK_DIR}/lib/libltdl.dylib libltdlc.dylib
 .  endif
diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile
index 502a7c5d481..b8958ae4d1d 100644
--- a/editors/kdissert/Makefile
+++ b/editors/kdissert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/02/27 19:51:13 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/16 07:22:02 rillig Exp $
 #
 
 DISTNAME=		kdissert-1.0.7
@@ -16,16 +16,16 @@ USE_TOOLS+=		msgfmt
 PYTHON_FOR_BUILD_ONLY=	yes
 
 do-configure:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \
+	${RUN} ${_ULIMIT_CMD} \
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 	${PYTHONBIN} waf configure --prefix=${PTEFIX}
 
 do-build:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD} \
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} waf
 
 do-install:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
+	${RUN} ${_ULIMIT_CMD} \
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 	${PYTHONBIN} waf install
 
diff --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile
index 9abadd95906..5d1a18d7a3c 100644
--- a/fonts/ms-ttf/Makefile
+++ b/fonts/ms-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/16 07:22:03 rillig Exp $
 
 DISTNAME=	# empty
 PKGNAME=	ms-ttf-20020306
@@ -39,7 +39,7 @@ FONTS_DIRS.ttf=	${FONTDIR}
 INSTALLATION_DIRS=	${FONTDIR} ${DOCDIR}
 
 post-extract:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	for f in ${WRKSRC}/*.TTF ; do					\
 		${MV} $$f `echo $$f | ${SED} 's|TTF$$|ttf|'`;		\
 	done
diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk
index 414226c49b8..f3cb9c2ad92 100644
--- a/graphics/hicolor-icon-theme/buildlink3.mk
+++ b/graphics/hicolor-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/05/16 07:22:03 rillig Exp $
 
 BUILDLINK_TREE+=	hicolor-icon-theme
 
@@ -38,9 +38,9 @@ _GUIC_FAKE=		${BUILDLINK_DIR}/bin/gtk-update-icon-cache
 
 .PHONY: guic-buildlink-fake
 guic-buildlink-fake:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	if [ ! -f ${_GUIC_FAKE} ]; then					\
-		${ECHO_BUILDLINK_MSG} "Creating ${_GUIC_FAKE}";	\
+		${ECHO_BUILDLINK_MSG} "Creating ${_GUIC_FAKE}";		\
 		${MKDIR} ${_GUIC_FAKE:H};				\
 		${ECHO} "#!${SH}" > ${_GUIC_FAKE};			\
 		${CHMOD} +x ${_GUIC_FAKE};				\
diff --git a/graphics/kphotools/Makefile b/graphics/kphotools/Makefile
index 3b1bb5944c4..038e1055ca1 100644
--- a/graphics/kphotools/Makefile
+++ b/graphics/kphotools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/18 05:06:41 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/16 07:22:03 rillig Exp $
 #
 
 DISTNAME=	kphotools-0.2.1
@@ -23,7 +23,7 @@ SUBST_SED.kphotools=	-e 's|@kphotoolsdir@|${KDEDIR}/share/kde/apps/kphotools|'
 SUBST_STAGE.kphotools=	post-patch
 
 post-configure:
-	${_PKG_DEBUG}${_PKG_SILENT}${LN} -s ${FILESDIR}/pkgsrc_fixes.h ${BUILDLINK_DIR}/include/
+	${RUN}${LN} -s ${FILESDIR}/pkgsrc_fixes.h ${BUILDLINK_DIR}/include/
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk
index c32a6d96c8c..483b5b1e433 100644
--- a/graphics/lcms/buildlink3.mk
+++ b/graphics/lcms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/05/16 07:22:03 rillig Exp $
 
 BUILDLINK_TREE+=	lcms
 
@@ -14,9 +14,9 @@ BUILDLINK_TARGETS+=	buildlink-include-lcms
 .PHONY: buildlink-include-lcms
 buildlink-include-lcms:
 .for _h_ in lcms.h icc34.h
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	if [ ! -f ${BUILDLINK_DIR}/include/lcms/${_h_} ]; then		\
-		${MKDIR} ${BUILDLINK_DIR}/include/lcms;	\
+		${MKDIR} ${BUILDLINK_DIR}/include/lcms;			\
 		${ECHO_BUILDLINK_MSG} "Linking lcms/${_h_} to ${_h_} in ${BUILDLINK_DIR}/include"; \
 		${LN} -s ${BUILDLINK_PREFIX.lcms}/include/${_h_} ${BUILDLINK_DIR}/include/lcms/${_h_}; \
 	fi
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index a853e9295e1..d98662d6779 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2009/05/16 07:22:03 rillig Exp $
 
 BUILDLINK_TREE+=	ocaml
 
@@ -25,7 +25,7 @@ OCAMLBIN_WRAPPERS=	ocaml
 
 .PHONY: ocaml-wrappers
 ocaml-wrappers:
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN}								\
 	for w in ${OCAML_WRAPPERS}; do					\
 		${SED}	-e 's|@SH@|'${SH:Q}'|g'				\
 			-e 's|@OCAML_PREFIX@|${BUILDLINK_PREFIX.ocaml}|g' \
@@ -35,7 +35,7 @@ ocaml-wrappers:
 			> ${BUILDLINK_DIR}/bin/"$$w";			\
 		${CHMOD} +x ${BUILDLINK_DIR}/bin/"$$w";			\
 	done
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN}								\
 	for w in ${OCAMLBIN_WRAPPERS}; do				\
 		${LN} -s ${BUILDLINK_PREFIX.ocaml}/bin/"$$w"		\
 		         ${BUILDLINK_DIR}/bin/"$$w";			\
diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk
index de94fef0984..90f286c8106 100644
--- a/lang/perl5/module.mk
+++ b/lang/perl5/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.58 2009/03/21 23:11:29 sno Exp $
+# $NetBSD: module.mk,v 1.59 2009/05/16 07:22:04 rillig Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install perl5 modules.
@@ -93,7 +93,7 @@ MAKE_PARAMS+=	${MAKE_PARAMS.${_PERL5_MODTYPE}}
 
 .PHONY: do-makemaker-configure
 do-makemaker-configure:
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN}								\
 	for dir in ${PERL5_CONFIGURE_DIRS}; do				\
 		cd ${WRKSRC};						\
 		if ${TEST} -f "$$dir"/Makefile.PL; then			\
@@ -105,7 +105,7 @@ do-makemaker-configure:
 
 .PHONY: do-modbuild-configure
 do-modbuild-configure:
-	${_PKG_SILENT}${_PKG_DEBUG} set -e;				\
+	${RUN}								\
 	for dir in ${PERL5_CONFIGURE_DIRS}; do				\
 		cd ${WRKSRC};						\
 		if ${TEST} -f "$$dir"/Build.PL; then			\
diff --git a/lang/perl5/packlist.mk b/lang/perl5/packlist.mk
index f6472374462..bc5368ba8ad 100644
--- a/lang/perl5/packlist.mk
+++ b/lang/perl5/packlist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: packlist.mk,v 1.12 2007/01/15 05:36:04 rillig Exp $
+# $NetBSD: packlist.mk,v 1.13 2009/05/16 07:22:04 rillig Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # create packlist files.  This file is automatically included by
@@ -114,7 +114,7 @@ post-install: perl-packlist
 
 .PHONY: perl-packlist
 perl-packlist:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${RUN}								\
 	${TEST} -n ${_PERL5_PACKLIST:Q}"" || exit 0;			\
 	for file in ${_PERL5_PACKLIST}; do				\
 		if ${TEST} ! -f "$$file"; then				\
diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk
index c9426dc097f..180d1d79fd3 100644
--- a/lang/ruby/buildlink3.mk
+++ b/lang/ruby/buildlink3.mk
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:52 joerg Exp $
-
-.if !defined(_RUBYVERSION_MK)
-.include "../../lang/ruby/rubyversion.mk"
-.endif
+# $NetBSD: buildlink3.mk,v 1.11 2009/05/16 07:22:04 rillig Exp $
 
 BUILDLINK_TREE+=	${RUBY_BASE}
 
 .if !defined(RUBY_BUILDLINK3_MK)
 RUBY_BUILDLINK3_MK:=
 
+.if !defined(_RUBYVERSION_MK)
+.include "../../lang/ruby/rubyversion.mk"
+.endif
+
 BUILDLINK_API_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_REQD}
 BUILDLINK_ABI_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_VERSION}
 BUILDLINK_PKGSRCDIR.${RUBY_BASE}?=	../../lang/${RUBY_BASE}
@@ -18,7 +18,7 @@ BUILDLINK_FILES.${RUBY_BASE}+=	lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
 BUILDLINK_TARGETS+=	buildlink-bin-ruby
 
 buildlink-bin-ruby:
-	${_PKG_SILENT}${_PKG_DEBUG} \
+	${RUN} \
 	f=${BUILDLINK_PREFIX.${RUBY_BASE}:Q}"/bin/ruby${RUBY_VER}"; \
 	if ${TEST} -f $$f; then \
 		${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk
index 6fdc23f8ea3..62befd9046f 100644
--- a/lang/ruby/modules.mk
+++ b/lang/ruby/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.25 2009/02/15 03:20:03 taca Exp $
+# $NetBSD: modules.mk,v 1.26 2009/05/16 07:22:04 rillig Exp $
 
 .if !defined(_RUBY_MODULE_MK)
 _RUBY_MODULE_MK=	# defined
@@ -39,10 +39,10 @@ do-configure:	ruby-extconf-configure
 ruby-extconf-configure:
 .for d in ${RUBY_EXTCONF_SUBDIRS}
 	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} in ${d} to configure"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; \
+	${RUN}cd ${WRKSRC}/${d}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
 .if empty(RUBY_EXTCONF_CHECK:M[nN][oO])
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; \
+	${RUN}cd ${WRKSRC}/${d}; \
 		${TEST} -f ${RUBY_EXTCONF_MAKEFILE}
 .endif
 .endfor
@@ -53,7 +53,7 @@ do-build:	ruby-extconf-build
 ruby-extconf-build:
 .for d in ${RUBY_EXTCONF_SUBDIRS}
 	@${ECHO_MSG} "===>  Building ${d}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${BUILD_TARGET}
+	${RUN}cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${BUILD_TARGET}
 .endfor
 .endif
 
@@ -63,17 +63,17 @@ do-install:	ruby-extconf-install
 ruby-extconf-install:
 .for d in ${RUBY_EXTCONF_SUBDIRS}
 	@${ECHO_MSG} "===>  Installing ${d}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
+	${RUN}cd ${WRKSRC}/${d}; ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
 .endfor
 .endif
 
 .else
 ruby-extconf-configure:
 	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} to configure"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
 .if empty(RUBY_EXTCONF_CHECK:M[nN][oO])
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; \
+	${RUN}cd ${WRKSRC}/${d}; \
 		${TEST} -f ${RUBY_EXTCONF_MAKEFILE}
 .endif
 .endif
@@ -100,11 +100,11 @@ do-configure:	ruby-setup-configure
 ruby-setup-configure:
 .if defined(USE_RUBY_SETUP_PKG) && empty(USE_RUBY_SETUP_PKG:M[nN][oO])
 	@${ECHO_MSG} "===>  Use pkgsrc's ruby-setup"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 		${CP} ${PREFIX}/${RUBY_VENDORLIB}/setup.rb ${RUBY_SETUP}
 .endif
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to configure"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_SETUP} config ${CONFIGURE_ARGS}
 .endif
 
@@ -113,7 +113,7 @@ do-build:	ruby-setup-build
 
 ruby-setup-build:
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to build"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} setup
 .endif
 
@@ -127,7 +127,7 @@ _RUBY_SETUP_INSTALLARGS+=   --prefix=${DESTDIR:Q}
 
 ruby-setup-install:
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to ${INSTALL_TARGET}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} ${_RUBY_SETUP_INSTALLARGS}
 .endif
 
@@ -157,7 +157,7 @@ do-install:	ruby-simple-install
 
 ruby-simple-install:
 	@${ECHO_MSG} "===>  Running ${RUBY_SIMPLE_INSTALL} to ${INSTALL_TARGET}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
+	${RUN}cd ${WRKSRC}; \
 	${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_SIMPLE_INSTALL} ${INSTALL_TARGET}
 .endif
 .endif # USE_RUBY_INSTALL