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.

47 files changed, 111 insertions, 111 deletions

diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index ba40ce9da892..be67fe17026f 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -23,8 +23,8 @@ DOCDIR=		${PREFIX}/share/doc/checkpassword
 .SILENT:
 
 do-configure:
-	${ECHO} 'cc -s -lcrypt' > ${WRKSRC}/conf-ld
-	${ECHO} ${PREFIX} >${WRKSRC}/conf-home
+	${ECHO_CMD} 'cc -s -lcrypt' > ${WRKSRC}/conf-ld
+	${ECHO_CMD} ${PREFIX} >${WRKSRC}/conf-home
 
 post-install:
 #	${INSTALL_MAN} ${WRKSRC}/${MAN8} ${PREFIX}/man/man8
diff --git a/security/crack/Makefile b/security/crack/Makefile
index f7393a73cc9a..19d67f2d0c6f 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -26,7 +26,7 @@ pre-configure:
 	@${MV} -f ${WRKSRC}/src/util/elcid.c ${WRKSRC}/src/util/elcid.c.orig
 	@${CP} -p ${WRKSRC}/src/util/elcid.c,bsd ${WRKSRC}/src/util/elcid.c
 .endif
-	@${ECHO} "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile
+	@${ECHO_CMD} "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile
 
 pre-build:
 	@(if [ ! -f /usr/share/dict/words ];then \
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 74b05c44e5a0..4e8d235a9e6e 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -129,8 +129,8 @@ post-patch:
 		-e "s;%%PREFIX%%;${PREFIX};g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 .ifdef LDAP_MYSQL_MSG
-	@${ECHO} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE}
-	@${ECHO} >> ${PKGMESSAGE}
+	@${ECHO_CMD} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE}
+	@${ECHO_CMD} >> ${PKGMESSAGE}
 .endif
 
 pre-configure:
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 74b05c44e5a0..4e8d235a9e6e 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -129,8 +129,8 @@ post-patch:
 		-e "s;%%PREFIX%%;${PREFIX};g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 .ifdef LDAP_MYSQL_MSG
-	@${ECHO} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE}
-	@${ECHO} >> ${PKGMESSAGE}
+	@${ECHO_CMD} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE}
+	@${ECHO_CMD} >> ${PKGMESSAGE}
 .endif
 
 pre-configure:
diff --git a/security/digest/Makefile b/security/digest/Makefile
index 2a62e113536d..70536d681e6e 100644
--- a/security/digest/Makefile
+++ b/security/digest/Makefile
@@ -27,6 +27,6 @@ do-extract:
 	cd ${FILESDIR} && pax -r -w * ${WRKSRC}
 
 pre-install:
-	${ECHO} bin/digest > ${PLIST}
+	${ECHO_CMD} bin/digest > ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index ba1e490d9cd1..3b8f07626d52 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -36,8 +36,8 @@ WITH_DRWEBSMF_HOSTNAME!=hostname
 .if exists( ${WITH_DRWEBSMF_SENDMAIL_DIR}/include/libmilter/mfapi.h )
 
 SENDMAIL_VERSION!=      ${AWK} '/^sendmail [0-9.]+$$/{print $$2}' ${WITH_DRWEBSMF_SENDMAIL_DIR}/FREEBSD-upgrade
-SENDMAIL_MAJOR!=	${ECHO} ${SENDMAIL_VERSION} | ${AWK} 'BEGIN{ FS="." }{ print $$1 }'
-SENDMAIL_MINOR!=	${ECHO} ${SENDMAIL_VERSION} | ${AWK} 'BEGIN{ FS="." }{ print $$2 }'
+SENDMAIL_MAJOR!=	${ECHO_CMD} ${SENDMAIL_VERSION} | ${AWK} 'BEGIN{ FS="." }{ print $$1 }'
+SENDMAIL_MINOR!=	${ECHO_CMD} ${SENDMAIL_VERSION} | ${AWK} 'BEGIN{ FS="." }{ print $$2 }'
 .if ${SENDMAIL_MAJOR} > 8 || ${SENDMAIL_MAJOR} == 8 && ${SENDMAIL_MINOR} >= 12
 SENDMAIL8_12=	y
 .elif ${SENDMAIL_MAJOR} == 8 && ${SENDMAIL_MINOR} >= 10
@@ -69,13 +69,13 @@ post-configure:
 	cd ${WRKSRC}/libmilter && ${MAKE} clean && ${MAKE} SENDMAIL_DIR=${WITH_DRWEBSMF_SENDMAIL_DIR}
 	cd ${WRKSRC}/libsmutil && ${MAKE} clean && ${MAKE} SENDMAIL_DIR=${WITH_DRWEBSMF_SENDMAIL_DIR}
 	cd ${WRKSRC} && { \
-		${ECHO} y; \
-		${ECHO} n; \
-		${ECHO} y; \
-		${ECHO} ${SENDMAIL8_12} ; \
-		${ECHO} ${WITH_DRWEBSMF_SENDMAIL_DIR} ; \
-		${ECHO} ${CFLAGS} ; \
-		${ECHO} y; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} n; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} ${SENDMAIL8_12} ; \
+		${ECHO_CMD} ${WITH_DRWEBSMF_SENDMAIL_DIR} ; \
+		${ECHO_CMD} ${CFLAGS} ; \
+		${ECHO_CMD} y; \
 	} | ./configure
 
 do-install:
@@ -83,33 +83,33 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/drweb-smf ${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${WRKSRC}/drwebdc ${PREFIX}/sbin/
 	cd ${WRKSRC}/../sendmail && { \
-		${ECHO} y; \
-		${ECHO} "${PREFIX}/sbin"; \
-		${ECHO} ; \
-		${ECHO} u; \
-		${ECHO} "${PREFIX}/drweb/run/drweb-smf.sock"; \
-		${ECHO} drweb; \
-		${ECHO} "${PREFIX}/drweb/infected"; \
-		${ECHO} y; \
-		${ECHO} /tmp; \
-		${ECHO} y; \
-		${ECHO} y; \
-		${ECHO} ; \
-		${ECHO} postmaster@${WITH_DRWEBSMF_HOSTNAME}; \
-		${ECHO} y; \
-		${ECHO} y; \
-		${ECHO} y; \
-		${ECHO} c; \
-		${ECHO} t; \
-		${ECHO} t; \
-		${ECHO} t; \
-		${ECHO} a; \
-		${ECHO} r; \
-		${ECHO} 160000; \
-		${ECHO} ${SENDMAIL8_12} ; \
-		${ECHO} n; \
-		${ECHO} y; \
-		${ECHO} ; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} "${PREFIX}/sbin"; \
+		${ECHO_CMD} ; \
+		${ECHO_CMD} u; \
+		${ECHO_CMD} "${PREFIX}/drweb/run/drweb-smf.sock"; \
+		${ECHO_CMD} drweb; \
+		${ECHO_CMD} "${PREFIX}/drweb/infected"; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} /tmp; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} ; \
+		${ECHO_CMD} postmaster@${WITH_DRWEBSMF_HOSTNAME}; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} c; \
+		${ECHO_CMD} t; \
+		${ECHO_CMD} t; \
+		${ECHO_CMD} t; \
+		${ECHO_CMD} a; \
+		${ECHO_CMD} r; \
+		${ECHO_CMD} 160000; \
+		${ECHO_CMD} ${SENDMAIL8_12} ; \
+		${ECHO_CMD} n; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} ; \
 	} | ./configure
 	cd ${WRKSRC}/../sendmail; \
 		${INSTALL_DATA} example* readme.* sendmail.*.addon ${DOC_DIR}
diff --git a/security/gnupg-idea/Makefile b/security/gnupg-idea/Makefile
index 72487687e03c..ae5e00135caf 100644
--- a/security/gnupg-idea/Makefile
+++ b/security/gnupg-idea/Makefile
@@ -67,7 +67,7 @@ do-patch:
 do-build:
 .for i in ${CONTRIB}
 	${CC} ${CFLAGS} -o ${WRKSRC}/${i} ${WRKSRC}/${i}.c
-	${ECHO} "lib/gnupg/${i}" >>${PLIST}
+	${ECHO_CMD} "lib/gnupg/${i}" >>${PLIST}
 .endfor
 
 do-install:
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 554ca6535dc7..4d3bc60076bb 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -95,11 +95,11 @@ pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist.des >> ${PLIST}
 .endif
 .if !exists(/usr/include/ifaddrs.h)
-	@${ECHO} include/ifaddrs.h >> ${PLIST}
+	@${ECHO_CMD} include/ifaddrs.h >> ${PLIST}
 .endif
 .if defined(WITH_CRACKLIB)
 	${INSTALL_PROGRAM} ${WRKSRC}/kpasswdd-cracklib.so ${PREFIX}/lib/
-	@${ECHO} lib/kpasswdd-cracklib.so >> ${PLIST}
+	@${ECHO_CMD} lib/kpasswdd-cracklib.so >> ${PLIST}
 .endif
 
 .include "Makefile.man"
diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index 22d3f0c5b973..49bb6c39207b 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -29,12 +29,12 @@ do-build:
 	cd ${WRKDIR} && ${CC} ${CFLAGS} -DMPU8086 *.c -o lc_CLI
 
 pre-install:
-	${ECHO} bin/lc_CLI > ${PLIST}
+	${ECHO_CMD} bin/lc_CLI > ${PLIST}
 .if !defined(NOPORTDOCS)
 	for i in `find ${WRKDIR} -name '*txt'`; \
-		do ${ECHO} ${DOCDIR}/`${BASENAME} $${i}` >> ${PLIST}; \
+		do ${ECHO_CMD} ${DOCDIR}/`${BASENAME} $${i}` >> ${PLIST}; \
 	done
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 77bf8e2c3d3a..9e0e1d93d44a 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -33,14 +33,14 @@ USE_AUTOCONF=		yes
 USE_LIBTOOL=		yes
 
 pre-install:
-	${ECHO} bin/${PORTNAME} > ${PLIST}
-	${ECHO} bin/mdecrypt >> ${PLIST}
+	${ECHO_CMD} bin/${PORTNAME} > ${PLIST}
+	${ECHO_CMD} bin/mdecrypt >> ${PLIST}
 .for i in cs el pl
-	${ECHO} share/locale/${i}/LC_MESSAGES/mcrypt.mo >> ${PLIST}
+	${ECHO_CMD} share/locale/${i}/LC_MESSAGES/mcrypt.mo >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
-	${ECHO} share/examples/${PORTNAME}/sample.mcryptrc >> ${PLIST}
-	${ECHO} @dirrm share/examples/${PORTNAME} >> ${PLIST}
+	${ECHO_CMD} share/examples/${PORTNAME}/sample.mcryptrc >> ${PLIST}
+	${ECHO_CMD} @dirrm share/examples/${PORTNAME} >> ${PLIST}
 .endif
 
 post-install:
diff --git a/security/outguess/Makefile b/security/outguess/Makefile
index 6446a7cd707e..e3bbdb1618ee 100644
--- a/security/outguess/Makefile
+++ b/security/outguess/Makefile
@@ -27,14 +27,14 @@ PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/outguess
 
 pre-install:
-	${ECHO} bin/extract > ${PLIST}
-	${ECHO} bin/outguess >> ${PLIST}
-#	${ECHO} bin/histogram >> ${PLIST}
+	${ECHO_CMD} bin/extract > ${PLIST}
+	${ECHO_CMD} bin/outguess >> ${PLIST}
+#	${ECHO_CMD} bin/histogram >> ${PLIST}
 .if !defined(NOPORTDOCS)
 .for i in ${DOCS}
-	${ECHO} ${DOCDIR}/${i} >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
 .endfor
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/security/srp/Makefile b/security/srp/Makefile
index 38d680b9d1b0..3d85797ebe3a 100644
--- a/security/srp/Makefile
+++ b/security/srp/Makefile
@@ -30,9 +30,9 @@ post-install:
 .for f in ${PORTDOCS}
 	${MKDIR} ${PREFIX}/share/doc/srp
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/srp/${f}
-	@${ECHO} share/doc/srp/${f} >> ${TMPPLIST}
+	@${ECHO_CMD} share/doc/srp/${f} >> ${TMPPLIST}
 .endfor
-	@${ECHO} @dirrm share/doc/srp >> ${TMPPLIST}
+	@${ECHO_CMD} @dirrm share/doc/srp >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/shells/44bsd-csh/Makefile b/shells/44bsd-csh/Makefile
index 078ca9861d14..a45e7771712f 100644
--- a/shells/44bsd-csh/Makefile
+++ b/shells/44bsd-csh/Makefile
@@ -35,7 +35,7 @@ do-install:
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/44bsd-csh /etc/shells.bak; \
-		${ECHO} ${PREFIX}/bin/44bsd-csh) > /etc/shells
+		${ECHO_CMD} ${PREFIX}/bin/44bsd-csh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 tarup:
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 0c109415f523..454de9a3c832 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -26,7 +26,7 @@ MAN1=		bash.1 bashbug.1
 
 post-install:
 	${CP} /etc/shells /etc/shells.bak
-	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells
+	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO_CMD} ${PREFIX}/bin/bash) >/etc/shells
 	${RM} /etc/shells.bak
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/bash
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 0c109415f523..454de9a3c832 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -26,7 +26,7 @@ MAN1=		bash.1 bashbug.1
 
 post-install:
 	${CP} /etc/shells /etc/shells.bak
-	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells
+	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO_CMD} ${PREFIX}/bin/bash) >/etc/shells
 	${RM} /etc/shells.bak
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/bash
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
index 0c109415f523..454de9a3c832 100644
--- a/shells/bash3/Makefile
+++ b/shells/bash3/Makefile
@@ -26,7 +26,7 @@ MAN1=		bash.1 bashbug.1
 
 post-install:
 	${CP} /etc/shells /etc/shells.bak
-	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells
+	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO_CMD} ${PREFIX}/bin/bash) >/etc/shells
 	${RM} /etc/shells.bak
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/bash
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 1885a2945415..394b3de02c87 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -20,7 +20,7 @@ do-install:
 	@${ECHO} "updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/esh /etc/shells.bak; \
-	  ${ECHO} ${PREFIX}/bin/esh) > /etc/shells
+	  ${ECHO_CMD} ${PREFIX}/bin/esh) > /etc/shells
 	@${RM} /etc/shells.bak
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/doc/esh.info ${PREFIX}/info/esh.info
diff --git a/shells/flash/Makefile b/shells/flash/Makefile
index 6d3096a74008..ce3ac0ebc515 100644
--- a/shells/flash/Makefile
+++ b/shells/flash/Makefile
@@ -63,7 +63,7 @@ post-install:
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/flash /etc/shells.bak; \
-	${ECHO} ${PREFIX}/bin/flash) > /etc/shells
+	${ECHO_CMD} ${PREFIX}/bin/flash) > /etc/shells
 	@${RM} /etc/shells.bak
 	@${SED} -e "s:/usr/local:${PREFIX}:g" ${PKGMESSAGE}
 
diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile
index fe666df84f25..098cfaaf730d 100644
--- a/shells/ksh93/Makefile
+++ b/shells/ksh93/Makefile
@@ -39,7 +39,7 @@ post-install:
 	@${ECHO} "updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/ksh93 /etc/shells.bak; \
-	  ${ECHO} ${PREFIX}/bin/ksh93) >/etc/shells
+	  ${ECHO_CMD} ${PREFIX}/bin/ksh93) >/etc/shells
 	@${RM} -f /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/mudsh/Makefile b/shells/mudsh/Makefile
index 87d05e35ae7d..5cf8e2398836 100644
--- a/shells/mudsh/Makefile
+++ b/shells/mudsh/Makefile
@@ -33,7 +33,7 @@ post-install:
 	@${ECHO} "updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/mudsh /etc/shells.bak; \
-	 ${ECHO} ${PREFIX}/bin/mudsh) > /etc/shells
+	 ${ECHO_CMD} ${PREFIX}/bin/mudsh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 1816361cce4f..0ba79f9de191 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -20,7 +20,7 @@ post-install:
 	@${ECHO} "updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/osh /etc/shells.bak; \
-	 ${ECHO} ${PREFIX}/bin/osh) > /etc/shells
+	 ${ECHO_CMD} ${PREFIX}/bin/osh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/pash/Makefile b/shells/pash/Makefile
index 2945497e9be0..81b1ed3decac 100644
--- a/shells/pash/Makefile
+++ b/shells/pash/Makefile
@@ -24,7 +24,7 @@ post-install:
 	@${ECHO} "updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/osh /etc/shells.bak; \
-	 ${ECHO} ${PREFIX}/bin/pash) > /etc/shells
+	 ${ECHO_CMD} ${PREFIX}/bin/pash) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 93e1f86c3caf..a38e18e57a15 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -24,7 +24,7 @@ post-install:
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/ksh /etc/shells.bak; \
-		${ECHO} ${PREFIX}/bin/ksh) > /etc/shells
+		${ECHO_CMD} ${PREFIX}/bin/ksh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index e84a9771dfa5..1138c9ec4c3e 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -46,7 +46,7 @@ post-install:
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/psh /etc/shells.bak; \
-	${ECHO} ${PREFIX}/bin/psh) > /etc/shells
+	${ECHO_CMD} ${PREFIX}/bin/psh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index e84a9771dfa5..1138c9ec4c3e 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -46,7 +46,7 @@ post-install:
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/psh /etc/shells.bak; \
-	${ECHO} ${PREFIX}/bin/psh) > /etc/shells
+	${ECHO_CMD} ${PREFIX}/bin/psh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/sash/Makefile b/shells/sash/Makefile
index 60c26deee2ea..748ed00d383f 100644
--- a/shells/sash/Makefile
+++ b/shells/sash/Makefile
@@ -29,7 +29,7 @@ post-install:
 	@${ECHO_MSG} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/sash /etc/shells.bak; \
-		${ECHO} ${PREFIX}/bin/sash) > /etc/shells
+		${ECHO_CMD} ${PREFIX}/bin/sash) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index b57a02df78d4..9d657379b2a1 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -59,7 +59,7 @@ post-install:
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak; \
-	  ${ECHO} ${PREFIX}/bin/tcsh) > /etc/shells
+	  ${ECHO_CMD} ${PREFIX}/bin/tcsh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.post.mk>
diff --git a/shells/wapsh/Makefile b/shells/wapsh/Makefile
index 81f7dac81f77..026106cbc99a 100644
--- a/shells/wapsh/Makefile
+++ b/shells/wapsh/Makefile
@@ -88,7 +88,7 @@ do-install:
 post-install:
 	@${ECHO} "updating /etc/services"
 	@${CP} /etc/services /etc/services.bak
-	@(${GREP} -v ^htsh /etc/services.bak; ${ECHO} "htsh		3001/tcp    # htsh/wapsh server") > /etc/services
+	@(${GREP} -v ^htsh /etc/services.bak; ${ECHO_CMD} "htsh		3001/tcp    # htsh/wapsh server") > /etc/services
 	@if [ ! -f ${PREFIX}/etc/rc.d/htshd.sh ]; then \
 		${ECHO} "===>   Installing ${PREFIX}/etc/rc.d/htshd.sh startup file."; \
 		${INSTALL_SCRIPT} ${FILESDIR}/htshd.sh ${PREFIX}/etc/rc.d/htshd.sh; \
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index b6e23218c918..6e09fc5f5ad5 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -73,7 +73,7 @@ post-install:
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak; \
-	  ${ECHO} ${PREFIX}/bin/zsh) > /etc/shells
+	  ${ECHO_CMD} ${PREFIX}/bin/zsh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index d4cd095b5213..5d37d05c9a42 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -73,7 +73,7 @@ post-install:
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak; \
-	  ${ECHO} ${PREFIX}/bin/zsh) > /etc/shells
+	  ${ECHO_CMD} ${PREFIX}/bin/zsh) > /etc/shells
 	@${RM} /etc/shells.bak
 
 .include <bsd.port.mk>
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index c3daa917b887..ca6953a8a223 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 cbeb2944cd1f..439716522c8d 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 93112259f424..00e8ebd3da0c 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 33e488403a95..0e504d0607f4 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 c2e8a723ac12..7999900245ca 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 435ece97f684..4e1c146653c9 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 299613219cbb..8c72fcb045c9 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
diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
index 168d69ede379..1614e21ffd6a 100644
--- a/textproc/docbook-300/Makefile
+++ b/textproc/docbook-300/Makefile
@@ -37,7 +37,7 @@ pre-install:
 do-install:
 	@zcat ${DISTDIR}/docbk30.tar.Z |(cd ${INSTDIR}/3.0; pax -r)
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.0/catalog
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog
+	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.0/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile
index f2fcb16dbaa8..ca3d4ca4162e 100644
--- a/textproc/docbook-310/Makefile
+++ b/textproc/docbook-310/Makefile
@@ -38,7 +38,7 @@ pre-install:
 do-install:
 	@unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/3.1
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.1/catalog
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog
+	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/docbook-400/Makefile b/textproc/docbook-400/Makefile
index 0a1672ef6118..6f015e568c19 100644
--- a/textproc/docbook-400/Makefile
+++ b/textproc/docbook-400/Makefile
@@ -38,7 +38,7 @@ pre-install:
 do-install:
 	@unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/4.0
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/4.0/catalog
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.0/catalog
+	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.0/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.0/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/docbook-410/Makefile b/textproc/docbook-410/Makefile
index 7cd3e906782f..9935c298f60a 100644
--- a/textproc/docbook-410/Makefile
+++ b/textproc/docbook-410/Makefile
@@ -38,7 +38,7 @@ pre-install:
 do-install:
 	@unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/4.1
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/4.1/catalog
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.1/catalog
+	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.1/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.1/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index a3205944ca58..e5f47420e29c 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -161,9 +161,9 @@ post-patch:
 
 
 post-configure:
-	@${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
+	@${ECHO_CMD} "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
 .if defined(MASKBITS)
-	@${ECHO} "#define MASKBITS ${MASKBITS}" >> ${WRKSRC}/local.h
+	@${ECHO_CMD} "#define MASKBITS ${MASKBITS}" >> ${WRKSRC}/local.h
 .endif
 
 post-build:
@@ -257,6 +257,6 @@ post-install:
 .else
 	@${CAT} ${MASTERDIR}/pkg-plist.am >> ${TMPPLIST}
 .endif
-	@${ECHO} "@dirrm share/ispell" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm share/ispell" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 1ff22a7f2fc2..9c275b710137 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -49,7 +49,7 @@ post-install:
 	${MKDIR} ${PREFIX}/share/sgml/jade
 	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/jade
 	@if [ ! -f ${PREFIX}/share/sgml/catalog ]; then \
-		${ECHO} "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"" > ${PREFIX}/share/sgml/catalog; \
+		${ECHO_CMD} "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"" > ${PREFIX}/share/sgml/catalog; \
 	else \
 		${SETENV} LANG=C ${PERL} -ni -e 'print if !m|${PREFIX}/share/sgml/jade/catalog|;print "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"\n" if eof;' ${PREFIX}/share/sgml/catalog; \
 	fi
diff --git a/textproc/nicetext/Makefile b/textproc/nicetext/Makefile
index 3bc3d45e753a..1b64216eb0cd 100644
--- a/textproc/nicetext/Makefile
+++ b/textproc/nicetext/Makefile
@@ -23,8 +23,8 @@ PROGRAMS=	bitcp dct2mstr expgram genmodel gramtest impkimmo impmsc \
 		sortdct txt2dct
 
 post-install:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd
-	@${ECHO} ${PREFIX}/bin/"nttpd -b " ${PREFIX}/share/examples/nicetext/database >> ${WRKSRC}/bin/qstart-nttpd
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd
+	@${ECHO_CMD} ${PREFIX}/bin/"nttpd -b " ${PREFIX}/share/examples/nicetext/database >> ${WRKSRC}/bin/qstart-nttpd
 	${CHMOD} a+rx ${WRKSRC}/bin/qstart-nttpd
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/qstart-nttpd ${PREFIX}/bin/
 .for f in ${MAN1}
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 06523f4a4628..0403d19b9836 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -40,12 +40,12 @@ post-patch:
 .if defined(XMLPARSER_EUCJP)
 	@cd ${WRKSRC}/Parser/Encodings; \
 		${CONV_ENC} euc-jp ${XMLPARSER_EUCJP}.enc > euc-jp.enc
-	@${ECHO} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST
+	@${ECHO_CMD} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST
 .endif
 .if defined(XMLPARSER_SJIS)
 	@cd ${WRKSRC}/Parser/Encodings; \
 		${CONV_ENC} shift_jis ${XMLPARSER_SJIS}.enc > shift_jis.enc
-	@${ECHO} Parser/Encodings/Shift_JIS.enc >> ${WRKSRC}/MANIFEST
+	@${ECHO_CMD} Parser/Encodings/Shift_JIS.enc >> ${WRKSRC}/MANIFEST
 .endif
 
 post-configure:
diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile
index d86cfce43da7..8ea459561098 100644
--- a/textproc/sdocbook-xml/Makefile
+++ b/textproc/sdocbook-xml/Makefile
@@ -32,7 +32,7 @@ do-install:
 			*.dtd *.mod *.css *.xml ${DTDDIR}; \
 		${INSTALL_DATA} ent/* ${ENTDIR}
 	if [ ! -f ${INSTDIR}/catalog ]; then \
-		${ECHO} "CATALOG \"sdocbook/catalog\"" > ${INSTDIR}/catalog; \
+		${ECHO_CMD} "CATALOG \"sdocbook/catalog\"" > ${INSTDIR}/catalog; \
 	else \
 		${SETENV} LANG=C ${PERL} -ni -e 'print if !m|sdocbook/catalog|;print "CATALOG \"sdocbook/catalog\"\n" if eof;' ${INSTDIR}/catalog; \
 	fi
diff --git a/textproc/sgmltools-lite/Makefile b/textproc/sgmltools-lite/Makefile
index 8e4ae344d9d8..02409d3dc528 100644
--- a/textproc/sgmltools-lite/Makefile
+++ b/textproc/sgmltools-lite/Makefile
@@ -30,6 +30,6 @@ pre-install:
 	${MKDIR} ${PREFIX}/etc/sgml
 
 post-install:
-	${ECHO} "3.0.0" > ${LOCALBASE}/share/sgml/misc/sgmltools/VERSION
+	${ECHO_CMD} "3.0.0" > ${LOCALBASE}/share/sgml/misc/sgmltools/VERSION
 
 .include <bsd.port.mk>