cleanup: replaced _PKG_SILENT and _PKG_DEBUG with RUN.

5 files changed, 26 insertions, 26 deletions

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