'Please use ${ECHO} instead of "echo".'

'Please use ${ECHO_N} instead of "echo -n".'

4 files changed, 7 insertions, 7 deletions

diff --git a/lang/gcc34/options.mk b/lang/gcc34/options.mk
index ebf7140f9ff..3016d935d33 100644
--- a/lang/gcc34/options.mk
+++ b/lang/gcc34/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2013/04/06 04:07:24 rodent Exp $
+# $NetBSD: options.mk,v 1.5 2013/04/06 14:58:19 rodent Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc34
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java gcc-objc gcc-ada
@@ -108,7 +108,7 @@ pre-configure:
 	cd ${WRKDIR}/.gcc/bin/ && \
 	for filename in ${ALT_GCC:T} $${bin_files} ; do \
 		${ECHO} '#!${TOOLS_SHELL}' > $${filename}; \
-		${ECHO} -n "exec ${ALT_GCC:H}/$${filename} " >>$${filename}; \
+		${ECHO_N} "exec ${ALT_GCC:H}/$${filename} " >>$${filename}; \
 		${ECHO} '"$$@"' >>$${filename}; \
 		${CHMOD} +x $${filename}; \
 	done )
diff --git a/lang/gcc34/preconfigure.mk b/lang/gcc34/preconfigure.mk
index 2b47fd5a20c..4d2e5da185b 100644
--- a/lang/gcc34/preconfigure.mk
+++ b/lang/gcc34/preconfigure.mk
@@ -4,7 +4,7 @@
 	cd ${WRKDIR}/.gcc/bin && \
 	for _target_ in $${bin_files} ; do \
 		${ECHO} '#!${TOOLS_SHELL}' > $${_target_} && \
-		${ECHO} -n "exec ${BUILDLINK_PREFIX.gcc34}/bin/$${_target_}" >> $${_target_} && \
+		${ECHO_N} "exec ${BUILDLINK_PREFIX.gcc34}/bin/$${_target_}" >> $${_target_} && \
 		${ECHO} ' "$$@"' >> $${_target_} && \
 		${CHMOD} +x $${_target_}; \
 	done )
diff --git a/lang/hugs/package.mk b/lang/hugs/package.mk
index fcce7b04523..3b27682ca58 100644
--- a/lang/hugs/package.mk
+++ b/lang/hugs/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.4 2010/01/29 18:52:09 joerg Exp $
+# $NetBSD: package.mk,v 1.5 2013/04/06 14:58:19 rodent Exp $
 #
 
 PKGNAME=	hugs98-${DISTNAME}
@@ -34,7 +34,7 @@ do-install:
 		copy --verbose --destdir=${DESTDIR}
 	cd ${WRKSRC} && \
 	pkg=`awk '{ print $$2; nextfile }' < .installed-pkg-config` && \
-	echo $$pkg && \
+	${ECHO} $$pkg && \
 	${INSTALL_DATA_DIR} \
 	    ${DESTDIR}${PREFIX}/lib/hugs/packages/$$pkg/packages/$$pkg && \
 	${INSTALL_DATA} .installed-pkg-config \
diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile
index c1e62fd8f3e..c3d4ed26762 100644
--- a/lang/swi-prolog-packages/Makefile
+++ b/lang/swi-prolog-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2013/02/06 23:22:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2013/04/06 14:58:20 rodent Exp $
 
 .include "../../lang/swi-prolog-lite/Makefile.common"
 
@@ -54,7 +54,7 @@ pre-install: checkforx
 # Based on misc/openoffice:
 DISPLAY?=	#empty, if unset
 checkforx:
-.if ${DISPLAY} == "" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && echo YES || echo NO!} == "NO"
+.if ${DISPLAY} == "" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && ${ECHO} YES || ${ECHO} NO!} == "NO"
 .  if exists(${X11BASE}/bin/Xvfb)
 	-${X11BASE}/bin/Xvfb :2 & \
 	${ECHO} $$! >${WRKDIR}/.Xvfb.pid