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.

7 files changed, 17 insertions, 17 deletions

diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index c3daa917b88..ca6953a8a22 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -26,7 +26,7 @@ BROKEN=		CAM
 pre-build:
 	@cd ${WRKSRC}; ${MV} Makefile Makefile~; \
 		${SED} -e s:/usr/local:${PREFIX}:g -e s/CFL/CXXFL/ <Makefile~ >Makefile;\
-		${ECHO} all: cd-write >> Makefile
+		${ECHO_CMD} all: cd-write >> Makefile
 	@cd ${WRKSRC}/c++tk; ${MV} Makefile Makefile~; \
 		${SED} -e s:/usr/local:${PREFIX}:g <Makefile~ >Makefile
 
diff --git a/sysutils/cd9660_unicode/Makefile b/sysutils/cd9660_unicode/Makefile
index cbeb2944cd1..439716522c8 100644
--- a/sysutils/cd9660_unicode/Makefile
+++ b/sysutils/cd9660_unicode/Makefile
@@ -17,7 +17,7 @@ NO_PACKAGE=	Should be in sync with the kernel to work correctly
 
 SRCPREFIX?=	/usr/src
 PKGMESSAGE=	${WRKDIR}/.MESSAGE
-ENCODINGS=	cd ${WRKSRC}/templates && ${ECHO} [^C]* | \
+ENCODINGS=	cd ${WRKSRC}/templates && ${ECHO_CMD} [^C]* | \
 			${SED} 's|\.txt|,|g'
 FMT=		/usr/bin/fmt
 FLAG!=		/usr/bin/grep -e cd9660_wchar2char \
@@ -39,7 +39,7 @@ pre-fetch:
 
 pre-install:
 	@ENCODINGS=`${ENCODINGS}` && \
-		ENCODINGS=`${ECHO} $${ENCODINGS} | ${SED} 's|,$$||'` && \
+		ENCODINGS=`${ECHO_CMD} $${ENCODINGS} | ${SED} 's|,$$||'` && \
 		${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%ENCODINGS%%|$${ENCODINGS}|" \
 			${PKGDIR}/pkg-message | ${FMT} > ${PKGMESSAGE}
 	${MKDIR} ${PREFIX}/lib/cd9660_unicode
diff --git a/sysutils/clockspeed/Makefile b/sysutils/clockspeed/Makefile
index 93112259f42..00e8ebd3da0 100644
--- a/sysutils/clockspeed/Makefile
+++ b/sysutils/clockspeed/Makefile
@@ -32,9 +32,9 @@ RC_SCRIPT_STARTUP_DIR=		${PREFIX}/etc/rc.d
 post-patch: real-post-patch
 
 do-configure:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${CC} -s -L${LOCALBASE}/lib > ${WRKSRC}/conf-ld
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
+	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} ${CC} -s -L${LOCALBASE}/lib > ${WRKSRC}/conf-ld
+	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
 
 post-install: real-post-install
 
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 33e488403a9..0e504d0607f 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -49,7 +49,7 @@ post-extract:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS:S/z//} ${SRCBALL_NAME}.tar \
 	${EXTRACT_AFTER_ARGS} \
 	)
-	@( cd ${WRKSRC} ; ${ECHO} "y" | ./Inventory || exit 1 )
+	@( cd ${WRKSRC} ; ${ECHO_CMD} "y" | ./Inventory || exit 1 )
 .endif
 
 #pre-patch:
diff --git a/sysutils/service-config/Makefile b/sysutils/service-config/Makefile
index c2e8a723ac1..7999900245c 100644
--- a/sysutils/service-config/Makefile
+++ b/sysutils/service-config/Makefile
@@ -21,8 +21,8 @@ NO_PACKAGE=	A possibly inherited DJB-style license would prohibit \
 		distribution of modified binary packages
 
 post-patch:
-	@${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	@${ECHO} "${CC} ${CFLAGS} ${STRIP}" > ${WRKSRC}/conf-ld
+	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} "${CC} ${CFLAGS} ${STRIP}" > ${WRKSRC}/conf-ld
 	@${PERL} -pi -e 's!/usr/local!${PREFIX}!g' ${WRKSRC}/conf-home
 
 .include <bsd.port.mk>
diff --git a/sysutils/ucspi-tcp/Makefile b/sysutils/ucspi-tcp/Makefile
index 435ece97f68..4e1c146653c 100644
--- a/sysutils/ucspi-tcp/Makefile
+++ b/sysutils/ucspi-tcp/Makefile
@@ -20,9 +20,9 @@ SCRIPTS_ENV=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \
 		MANMODE="${MANMODE}" CFLAGS="${CFLAGS}"
 
 post-configure:
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	@${ECHO} ${CC} -s > ${WRKSRC}/conf-ld
+	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
+	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
 
 do-install:
 .for file in addcr argv0 delcr fixcrio mconnect-io rblsmtpd recordio tcpclient tcprules tcprulescheck tcpserver
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 299613219cb..8c72fcb045c 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -79,11 +79,11 @@ post-install:
 		| ${SED} -e 's/^/@dirrm /g' \
 		>> ${WRKDIR}/PLIST.lib-webmin
 
-	@${ECHO} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
-	@${ECHO} "/Insert PLIST.lib-webmin"	>> ${WRKDIR}/ex.script
-	@${ECHO} "d"				>> ${WRKDIR}/ex.script
-	@${ECHO} "r ${WRKDIR}/PLIST.lib-webmin"	>> ${WRKDIR}/ex.script
-	@${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Insert PLIST.lib-webmin"		>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/PLIST.lib-webmin"	>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 	@${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-webmin
 	@cd ${WRKDIR} ; ex < ex.script
 # upgrade configuration if etc/webmin exists