Use ${ECHO_CMD} instead of ${ECHO} where you mean the echo command;

the ECHO macro is set to "echo" by default, but it is set to "true" if
make(1) is invoked with the -s option while ECHO_CMD is always set to
the echo command.

Use command macros where appropriate.

6 files changed, 26 insertions, 26 deletions

diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index e21e2682a8f7..b6ea556aa8da 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -17,12 +17,12 @@ do-install:
 	-${MKDIR} $(PREFIX)/lib/bytebench
 	for f in Makefile README Run doc pgms results testdir; \
 		do ${CP} -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done
-	${ECHO} "#!/bin/sh"		   >  $(PREFIX)/bin/bytebench
-	${ECHO} "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench
-	${ECHO} "RESULTDIR=/tmp"		   >> $(PREFIX)/bin/bytebench
-	${ECHO} "export TMPDIR RESULTDIR"	   >> $(PREFIX)/bin/bytebench
-	${ECHO} "cd $(PREFIX)/lib/bytebench"  >> $(PREFIX)/bin/bytebench
-	${ECHO} "exec ./Run \"\$$@\""	   >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "#!/bin/sh"		   >  $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "RESULTDIR=/tmp"		   >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "export TMPDIR RESULTDIR"	   >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "cd $(PREFIX)/lib/bytebench"  >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "exec ./Run \"\$$@\""	   >> $(PREFIX)/bin/bytebench
 	${CHMOD} 755 $(PREFIX)/bin/bytebench
 	${CHMOD} 644 $(PREFIX)/lib/bytebench/Makefile
 	${CHMOD} 644 $(PREFIX)/lib/bytebench/README
diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile
index e21e2682a8f7..b6ea556aa8da 100644
--- a/benchmarks/unixbench/Makefile
+++ b/benchmarks/unixbench/Makefile
@@ -17,12 +17,12 @@ do-install:
 	-${MKDIR} $(PREFIX)/lib/bytebench
 	for f in Makefile README Run doc pgms results testdir; \
 		do ${CP} -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done
-	${ECHO} "#!/bin/sh"		   >  $(PREFIX)/bin/bytebench
-	${ECHO} "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench
-	${ECHO} "RESULTDIR=/tmp"		   >> $(PREFIX)/bin/bytebench
-	${ECHO} "export TMPDIR RESULTDIR"	   >> $(PREFIX)/bin/bytebench
-	${ECHO} "cd $(PREFIX)/lib/bytebench"  >> $(PREFIX)/bin/bytebench
-	${ECHO} "exec ./Run \"\$$@\""	   >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "#!/bin/sh"		   >  $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "RESULTDIR=/tmp"		   >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "export TMPDIR RESULTDIR"	   >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "cd $(PREFIX)/lib/bytebench"  >> $(PREFIX)/bin/bytebench
+	${ECHO_CMD} "exec ./Run \"\$$@\""	   >> $(PREFIX)/bin/bytebench
 	${CHMOD} 755 $(PREFIX)/bin/bytebench
 	${CHMOD} 644 $(PREFIX)/lib/bytebench/Makefile
 	${CHMOD} 644 $(PREFIX)/lib/bytebench/README
diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index f0197ab0476a..2d2717310089 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -25,17 +25,17 @@ pre-build:
 		${CXX} ${CXXFLAGS} -O0 -c -DRINGHOME="\"${PREFIX}/share/xdrawchem/\"" -I${X11BASE}/include/qt2 -o molecule_tools.o molecule_tools.cpp
 
 pre-install:
-	${ECHO} bin/xdrawchem > ${PLIST}
+	${ECHO_CMD} bin/xdrawchem > ${PLIST}
 	${LS} ${WRKSRC}/ring | \
 		${SED} -e 's:^:share/xdrawchem/:' >> ${PLIST}
-	${ECHO} @dirrm share/xdrawchem >> ${PLIST}
+	${ECHO_CMD} @dirrm share/xdrawchem >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${LS} *txt | \
 		${SED} -e 's:^:share/doc/xdrawchem/:' >> ${PLIST}
-	${ECHO} @dirrm share/doc/xdrawchem >> ${PLIST}
+	${ECHO_CMD} @dirrm share/doc/xdrawchem >> ${PLIST}
 	${LS} ${WRKSRC}/save | \
 		${SED} -e 's:^:share/examples/xdrawchem/:' >> ${PLIST}
-	${ECHO} @dirrm share/examples/xdrawchem >> ${PLIST}
+	${ECHO_CMD} @dirrm share/examples/xdrawchem >> ${PLIST}
 .endif
 
 do-install:
diff --git a/chinese/emacs20/Makefile b/chinese/emacs20/Makefile
index 88b1e6185a39..f1548a1b761c 100644
--- a/chinese/emacs20/Makefile
+++ b/chinese/emacs20/Makefile
@@ -28,8 +28,8 @@ pre-patch:
 		${PATCH} -sp1 < ${.CURDIR}/files/emacs20-xim-20000713.diff ; )
 
 post-patch:
-	@${ECHO} "share/emacs/%%EMACS_VER%%/etc/Emacs" >> ${WRKDIR}/pkg-plist
-	@${ECHO} "share/emacs/%%EMACS_VER%%/etc/dot.emacs" >> ${WRKDIR}/pkg-plist
+	@${ECHO_CMD} "share/emacs/%%EMACS_VER%%/etc/Emacs" >> ${WRKDIR}/pkg-plist
+	@${ECHO_CMD} "share/emacs/%%EMACS_VER%%/etc/dot.emacs" >> ${WRKDIR}/pkg-plist
 	@${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist
 
 post-install:
diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile
index 02ba184878f9..0b6d45df875c 100644
--- a/chinese/enscript/Makefile
+++ b/chinese/enscript/Makefile
@@ -20,7 +20,7 @@ PLIST=		${WRKDIR}/pkg-plist
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
 post-patch:
-	@${ECHO} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist
+	@${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist
 	@${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist
 
 do-install:
diff --git a/chinese/firebird/Makefile b/chinese/firebird/Makefile
index 5456dae3bfbf..e4568a1214f4 100644
--- a/chinese/firebird/Makefile
+++ b/chinese/firebird/Makefile
@@ -25,12 +25,12 @@ post-install:
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/bbs.sh.example startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/bbs.sh.example ${PREFIX}/etc/rc.d/bbs.sh.example; \
 	fi
-	@echo "======================================================================="
-	@echo "Installnation Complete."
-	@echo "======================================================================="
-	@echo "please review ${PREFIX}/etc/rc.d/bbs.sh.example change bbsd port you want"
-	@echo "then rename to ${PREFIX}/etc/rc.d/bbs.sh then:"
-	@echo "use ${PREFIX}/etc/rc.d/bbs.sh { start | stop } to start the BBS service"
-	@echo "full and complete document in ${PREFIX}/bbs/bbssrc/doc read before ask."
+	@${ECHO} "======================================================================="
+	@${ECHO} "Installnation Complete."
+	@${ECHO} "======================================================================="
+	@${ECHO} "please review ${PREFIX}/etc/rc.d/bbs.sh.example change bbsd port you want"
+	@${ECHO} "then rename to ${PREFIX}/etc/rc.d/bbs.sh then:"
+	@${ECHO} "use ${PREFIX}/etc/rc.d/bbs.sh { start | stop } to start the BBS service"
+	@${ECHO} "full and complete document in ${PREFIX}/bbs/bbssrc/doc read before ask."
 
 .include <bsd.port.mk>