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.

40 files changed, 135 insertions, 135 deletions

diff --git a/www/august/Makefile b/www/august/Makefile
index e7adfbf..a1bf0cb 100644
--- a/www/august/Makefile
+++ b/www/august/Makefile
@@ -27,10 +27,10 @@ do-patch:
 		${WRKSRC}/august
 
 pre-install:
-	${ECHO} bin/august > ${PLIST}
+	${ECHO_CMD} bin/august > ${PLIST}
 .if !defined(NOPORTDOCS)
-	${ECHO} share/doc/august/specchars.txt >> ${PLIST}
-	${ECHO} @dirrm share/doc/august >> ${PLIST}
+	${ECHO_CMD} share/doc/august/specchars.txt >> ${PLIST}
+	${ECHO_CMD} @dirrm share/doc/august >> ${PLIST}
 .endif
 
 do-install:
diff --git a/www/gn/Makefile b/www/gn/Makefile
index fa4b3a5..62ae011 100644
--- a/www/gn/Makefile
+++ b/www/gn/Makefile
@@ -47,7 +47,7 @@ post-install:
 	  tar -cf - -C ${WRKSRC} gnroot libexec bin etc | tar xpf - && \
 		(cd gnroot; ${WRKSRC}/bin/mkcache -r); \
 	  ${AWK} '$$1 ~ /#*gopher/ && $$6 == "${PREFIX}/libexec/gn" { exit 1 }' \
-		${INETD_CONF} || { \ ${ECHO} '#'gopher${CONF} >>${INETD_CONF}
+		${INETD_CONF} || { \ ${ECHO_CMD} '#'gopher${CONF} >>${INETD_CONF}
 	  }
 
 .include <bsd.port.mk>
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index db2c955..c56982d 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -104,13 +104,13 @@ do-install:
 	    (if [ ! -f ${MIMETYPES}.beforeHorde ] ; then \
 		${ECHO} "===> Updating mime.types..." ; \
 		${CP} -p ${MIMETYPES} ${MIMETYPES}.beforeHorde ; \
-		${ECHO} "" >> ${MIMETYPES} ; \
-		${ECHO} "# Added by Horde to support php3" >> ${MIMETYPES} ; \
+		${ECHO_CMD} "" >> ${MIMETYPES} ; \
+		${ECHO_CMD} "# Added by Horde to support php3" >> ${MIMETYPES} ; \
 		(if ! ${GREP} -q x-httpd-php3 ${MIMETYPES} ; then \
-		    ${ECHO} "application/x-httpd-php		phtml pht php php3" >> ${MIMETYPES} ; \
-		    ${ECHO} "application/x-httpd-php3	php3.none" >> ${MIMETYPES} ; \
+		    ${ECHO_CMD} "application/x-httpd-php		phtml pht php php3" >> ${MIMETYPES} ; \
+		    ${ECHO_CMD} "application/x-httpd-php3	php3.none" >> ${MIMETYPES} ; \
 		fi) ; \
-		${ECHO} "# End of Horde's additions." >> ${MIMETYPES} ; \
+		${ECHO_CMD} "# End of Horde's additions." >> ${MIMETYPES} ; \
 	    fi) ; \
 	fi)
 .endif
diff --git a/www/horde-devel/Makefile b/www/horde-devel/Makefile
index 5e7facf..f676cc2 100644
--- a/www/horde-devel/Makefile
+++ b/www/horde-devel/Makefile
@@ -114,8 +114,8 @@ do-install:
 	    ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \
 	    ${PERL} -pi -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:g" ${APACHE_CONF} ; \
 	    ${PERL} -pi -e "s:${HORDEDIR}/phplib:${PHP_LIB}:g" ${APACHE_CONF} ; \
-	    ${ECHO} "# Horde's include directory" >> ${APACHE_CONF} ; \
-	    ${ECHO} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \
+	    ${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \
+	    ${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \
 	fi)
 	@${CHOWN} -R www:www ${HORDEDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
diff --git a/www/horde/Makefile b/www/horde/Makefile
index db2c955..c56982d 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -104,13 +104,13 @@ do-install:
 	    (if [ ! -f ${MIMETYPES}.beforeHorde ] ; then \
 		${ECHO} "===> Updating mime.types..." ; \
 		${CP} -p ${MIMETYPES} ${MIMETYPES}.beforeHorde ; \
-		${ECHO} "" >> ${MIMETYPES} ; \
-		${ECHO} "# Added by Horde to support php3" >> ${MIMETYPES} ; \
+		${ECHO_CMD} "" >> ${MIMETYPES} ; \
+		${ECHO_CMD} "# Added by Horde to support php3" >> ${MIMETYPES} ; \
 		(if ! ${GREP} -q x-httpd-php3 ${MIMETYPES} ; then \
-		    ${ECHO} "application/x-httpd-php		phtml pht php php3" >> ${MIMETYPES} ; \
-		    ${ECHO} "application/x-httpd-php3	php3.none" >> ${MIMETYPES} ; \
+		    ${ECHO_CMD} "application/x-httpd-php		phtml pht php php3" >> ${MIMETYPES} ; \
+		    ${ECHO_CMD} "application/x-httpd-php3	php3.none" >> ${MIMETYPES} ; \
 		fi) ; \
-		${ECHO} "# End of Horde's additions." >> ${MIMETYPES} ; \
+		${ECHO_CMD} "# End of Horde's additions." >> ${MIMETYPES} ; \
 	    fi) ; \
 	fi)
 .endif
diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index 5e7facf..f676cc2 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -114,8 +114,8 @@ do-install:
 	    ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \
 	    ${PERL} -pi -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:g" ${APACHE_CONF} ; \
 	    ${PERL} -pi -e "s:${HORDEDIR}/phplib:${PHP_LIB}:g" ${APACHE_CONF} ; \
-	    ${ECHO} "# Horde's include directory" >> ${APACHE_CONF} ; \
-	    ${ECHO} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \
+	    ${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \
+	    ${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \
 	fi)
 	@${CHOWN} -R www:www ${HORDEDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index db2c955..c56982d 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -104,13 +104,13 @@ do-install:
 	    (if [ ! -f ${MIMETYPES}.beforeHorde ] ; then \
 		${ECHO} "===> Updating mime.types..." ; \
 		${CP} -p ${MIMETYPES} ${MIMETYPES}.beforeHorde ; \
-		${ECHO} "" >> ${MIMETYPES} ; \
-		${ECHO} "# Added by Horde to support php3" >> ${MIMETYPES} ; \
+		${ECHO_CMD} "" >> ${MIMETYPES} ; \
+		${ECHO_CMD} "# Added by Horde to support php3" >> ${MIMETYPES} ; \
 		(if ! ${GREP} -q x-httpd-php3 ${MIMETYPES} ; then \
-		    ${ECHO} "application/x-httpd-php		phtml pht php php3" >> ${MIMETYPES} ; \
-		    ${ECHO} "application/x-httpd-php3	php3.none" >> ${MIMETYPES} ; \
+		    ${ECHO_CMD} "application/x-httpd-php		phtml pht php php3" >> ${MIMETYPES} ; \
+		    ${ECHO_CMD} "application/x-httpd-php3	php3.none" >> ${MIMETYPES} ; \
 		fi) ; \
-		${ECHO} "# End of Horde's additions." >> ${MIMETYPES} ; \
+		${ECHO_CMD} "# End of Horde's additions." >> ${MIMETYPES} ; \
 	    fi) ; \
 	fi)
 .endif
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index fd6a2d6..8c2020e 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -26,6 +26,6 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh /usr/local/etc/rc.d
 
 post-install:
-	@${ECHO} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
+	@${ECHO_CMD} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile
index fd6a2d6..8c2020e 100644
--- a/www/jakarta-tomcat3/Makefile
+++ b/www/jakarta-tomcat3/Makefile
@@ -26,6 +26,6 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh /usr/local/etc/rc.d
 
 post-install:
-	@${ECHO} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
+	@${ECHO_CMD} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index fd6a2d6..8c2020e 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -26,6 +26,6 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh /usr/local/etc/rc.d
 
 post-install:
-	@${ECHO} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
+	@${ECHO_CMD} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index fd6a2d6..8c2020e 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -26,6 +26,6 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh /usr/local/etc/rc.d
 
 post-install:
-	@${ECHO} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
+	@${ECHO_CMD} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 0a77c2e..8dca10c 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -32,10 +32,10 @@ do-install:
 post-install:
 	@cd ${WRKSRC}/doc && \
 		for a in `/usr/bin/find . -type f | ${SED} -e 's:^\./::g'` ; \
-			do ${ECHO} share/doc/kannel/$$a >> ${TMPPLIST} ; done
-	@${ECHO} "@dirrm share/doc/kannel/arch" >> ${TMPPLIST}
-	@${ECHO} "@dirrm share/doc/kannel/userguide" >> ${TMPPLIST}
-	@${ECHO} "@dirrm share/doc/kannel" >> ${TMPPLIST}
+			do ${ECHO_CMD} share/doc/kannel/$$a >> ${TMPPLIST} ; done
+	@${ECHO_CMD} "@dirrm share/doc/kannel/arch" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm share/doc/kannel/userguide" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm share/doc/kannel" >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/linux-mozilla-devel/Makefile b/www/linux-mozilla-devel/Makefile
index 3742cee..1c8e2d3 100644
--- a/www/linux-mozilla-devel/Makefile
+++ b/www/linux-mozilla-devel/Makefile
@@ -57,32 +57,32 @@ do-patch:
 do-configure:
 #	- kldload linux
 #	${SETENV} $DISPLAY="NONE" ${WRKSRC}/bin/mozilla file:///dev/null
-	${ECHO} "#!/bin/sh"		>${WRKDIR}/${STARTUP_CMD}
-	${ECHO} -n "cd "		>>${WRKDIR}/${STARTUP_CMD}
-	${ECHO} ${INSTALL_DIR}		>>${WRKDIR}/${STARTUP_CMD}
-	${ECHO} "exec ./mozilla"	>>${WRKDIR}/${STARTUP_CMD}
-	${ECHO} "#!/bin/sh"					>${WRKDIR}/linkfarm
-	${ECHO} "# Run this after installing Netscape plugins."	>>${WRKDIR}/linkfarm
-	${ECHO} "cd ${PREFIX}/lib/linux-mozilla/plugins"	>>${WRKDIR}/linkfarm
-	${ECHO} -n "${FIND} ../../netscape-linux/plugins/*"	>>${WRKDIR}/linkfarm
-	${ECHO} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
-	${ECHO} -n "${FIND} ../../linux-netscape6/plugins"	>>${WRKDIR}/linkfarm
-	${ECHO} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} "#!/bin/sh"		>${WRKDIR}/${STARTUP_CMD}
+	${ECHO_CMD} -n "cd "		>>${WRKDIR}/${STARTUP_CMD}
+	${ECHO_CMD} ${INSTALL_DIR}		>>${WRKDIR}/${STARTUP_CMD}
+	${ECHO_CMD} "exec ./mozilla"	>>${WRKDIR}/${STARTUP_CMD}
+	${ECHO_CMD} "#!/bin/sh"					>${WRKDIR}/linkfarm
+	${ECHO_CMD} "# Run this after installing Netscape plugins."	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} "cd ${PREFIX}/lib/linux-mozilla/plugins"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} -n "${FIND} ../../netscape-linux/plugins/*"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} -n "${FIND} ../../linux-netscape6/plugins"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
 
 pre-install:
-	${ECHO} bin/${STARTUP_CMD} > ${PLIST}
-	${ECHO} "@unexec ${FIND} ${PREFIX}/lib/linux-mozilla/plugins -type l \
+	${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST}
+	${ECHO_CMD} "@unexec ${FIND} ${PREFIX}/lib/linux-mozilla/plugins -type l \
 		-exec ${RM} {} \;" >> ${PLIST}
 	cd ${WRKSRC}/bin; for i in `find * \! -type d | sort`; do \
-		${ECHO} lib/linux-mozilla/$${i} >> ${PLIST}; \
+		${ECHO_CMD} lib/linux-mozilla/$${i} >> ${PLIST}; \
 	done
 	cd ${WRKSRC}/bin; \
 	for i in `find -d * -type d`; do \
-		${ECHO} @dirrm lib/linux-mozilla/$${i} >> ${PLIST}; \
+		${ECHO_CMD} @dirrm lib/linux-mozilla/$${i} >> ${PLIST}; \
 	done
-	${ECHO} lib/linux-mozilla/linkfarm >> ${PLIST}
-	${ECHO} "@exec ${PREFIX}/lib/linux-mozilla/linkfarm" >> ${PLIST}
-	${ECHO} @dirrm lib/linux-mozilla >> ${PLIST}
+	${ECHO_CMD} lib/linux-mozilla/linkfarm >> ${PLIST}
+	${ECHO_CMD} "@exec ${PREFIX}/lib/linux-mozilla/linkfarm" >> ${PLIST}
+	${ECHO_CMD} @dirrm lib/linux-mozilla >> ${PLIST}
 
 do-install:
 	${MKDIR} ${INSTALL_DIR}
diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile
index 3742cee..1c8e2d3 100644
--- a/www/linux-mozilla/Makefile
+++ b/www/linux-mozilla/Makefile
@@ -57,32 +57,32 @@ do-patch:
 do-configure:
 #	- kldload linux
 #	${SETENV} $DISPLAY="NONE" ${WRKSRC}/bin/mozilla file:///dev/null
-	${ECHO} "#!/bin/sh"		>${WRKDIR}/${STARTUP_CMD}
-	${ECHO} -n "cd "		>>${WRKDIR}/${STARTUP_CMD}
-	${ECHO} ${INSTALL_DIR}		>>${WRKDIR}/${STARTUP_CMD}
-	${ECHO} "exec ./mozilla"	>>${WRKDIR}/${STARTUP_CMD}
-	${ECHO} "#!/bin/sh"					>${WRKDIR}/linkfarm
-	${ECHO} "# Run this after installing Netscape plugins."	>>${WRKDIR}/linkfarm
-	${ECHO} "cd ${PREFIX}/lib/linux-mozilla/plugins"	>>${WRKDIR}/linkfarm
-	${ECHO} -n "${FIND} ../../netscape-linux/plugins/*"	>>${WRKDIR}/linkfarm
-	${ECHO} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
-	${ECHO} -n "${FIND} ../../linux-netscape6/plugins"	>>${WRKDIR}/linkfarm
-	${ECHO} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} "#!/bin/sh"		>${WRKDIR}/${STARTUP_CMD}
+	${ECHO_CMD} -n "cd "		>>${WRKDIR}/${STARTUP_CMD}
+	${ECHO_CMD} ${INSTALL_DIR}		>>${WRKDIR}/${STARTUP_CMD}
+	${ECHO_CMD} "exec ./mozilla"	>>${WRKDIR}/${STARTUP_CMD}
+	${ECHO_CMD} "#!/bin/sh"					>${WRKDIR}/linkfarm
+	${ECHO_CMD} "# Run this after installing Netscape plugins."	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} "cd ${PREFIX}/lib/linux-mozilla/plugins"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} -n "${FIND} ../../netscape-linux/plugins/*"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} -n "${FIND} ../../linux-netscape6/plugins"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
 
 pre-install:
-	${ECHO} bin/${STARTUP_CMD} > ${PLIST}
-	${ECHO} "@unexec ${FIND} ${PREFIX}/lib/linux-mozilla/plugins -type l \
+	${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST}
+	${ECHO_CMD} "@unexec ${FIND} ${PREFIX}/lib/linux-mozilla/plugins -type l \
 		-exec ${RM} {} \;" >> ${PLIST}
 	cd ${WRKSRC}/bin; for i in `find * \! -type d | sort`; do \
-		${ECHO} lib/linux-mozilla/$${i} >> ${PLIST}; \
+		${ECHO_CMD} lib/linux-mozilla/$${i} >> ${PLIST}; \
 	done
 	cd ${WRKSRC}/bin; \
 	for i in `find -d * -type d`; do \
-		${ECHO} @dirrm lib/linux-mozilla/$${i} >> ${PLIST}; \
+		${ECHO_CMD} @dirrm lib/linux-mozilla/$${i} >> ${PLIST}; \
 	done
-	${ECHO} lib/linux-mozilla/linkfarm >> ${PLIST}
-	${ECHO} "@exec ${PREFIX}/lib/linux-mozilla/linkfarm" >> ${PLIST}
-	${ECHO} @dirrm lib/linux-mozilla >> ${PLIST}
+	${ECHO_CMD} lib/linux-mozilla/linkfarm >> ${PLIST}
+	${ECHO_CMD} "@exec ${PREFIX}/lib/linux-mozilla/linkfarm" >> ${PLIST}
+	${ECHO_CMD} @dirrm lib/linux-mozilla >> ${PLIST}
 
 do-install:
 	${MKDIR} ${INSTALL_DIR}
diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile
index 7fec3ce..d7651d13 100644
--- a/www/linux-netscape6/Makefile
+++ b/www/linux-netscape6/Makefile
@@ -99,18 +99,18 @@ do-configure:
 	${FILESDIR}/start.sh >${WRKDIR}/${STARTUP_CMD}
 
 pre-install:
-	${ECHO} bin/${STARTUP_CMD} > ${PLIST}
+	${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST}
 	cd ${WRKSRC}/bin; for i in `find * \! -type d | sort`; do \
-		${ECHO} lib/linux-netscape6/$${i} >> ${PLIST}; \
+		${ECHO_CMD} lib/linux-netscape6/$${i} >> ${PLIST}; \
 	done
 	cd ${WRKSRC}/plugins; for i in `find * \! -type d | sort`; do \
-		${ECHO} lib/linux-netscape6/plugins/$${i} >> ${PLIST}; \
+		${ECHO_CMD} lib/linux-netscape6/plugins/$${i} >> ${PLIST}; \
 	done
 	cd ${WRKSRC}/bin; \
 	for i in `find -d * -type d`; do \
-		${ECHO} @dirrm lib/linux-netscape6/$${i} >> ${PLIST}; \
+		${ECHO_CMD} @dirrm lib/linux-netscape6/$${i} >> ${PLIST}; \
 	done
-	${ECHO} @dirrm lib/linux-netscape6 >> ${PLIST}
+	${ECHO_CMD} @dirrm lib/linux-netscape6 >> ${PLIST}
 
 do-install:
 	${MKDIR} ${INSTALL_DIR}
diff --git a/www/mmosaic/Makefile b/www/mmosaic/Makefile
index 5cb49b3..ac4e591 100644
--- a/www/mmosaic/Makefile
+++ b/www/mmosaic/Makefile
@@ -27,9 +27,9 @@ USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mMosaic-src-${PORTVERSION}
 
 pre-install:
-	${ECHO} bin/mmosaic > ${PLIST}
+	${ECHO_CMD} bin/mmosaic > ${PLIST}
 	cd ${WRKSRC}/Copyrights; for i in `find * -type f`; do \
-		${ECHO} share/doc/mmosaic/$${i} >> ${PLIST}; \
+		${ECHO_CMD} share/doc/mmosaic/$${i} >> ${PLIST}; \
 	done
 
 do-install:
diff --git a/www/mozilla+ipv6/Makefile b/www/mozilla+ipv6/Makefile
index 301cd50..a0c0f71 100644
--- a/www/mozilla+ipv6/Makefile
+++ b/www/mozilla+ipv6/Makefile
@@ -76,8 +76,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	@(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO} locale,install,select,en-US >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
 	@/usr/bin/find ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		/usr/bin/xargs ${RMDIR} 2> /dev/null || ${TRUE}
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index e10cbff..63788a0 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -75,8 +75,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	@(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO} locale,install,select,en-US >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
 	@/usr/bin/find ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		/usr/bin/xargs ${RMDIR} 2> /dev/null || ${TRUE}
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index e10cbff..63788a0 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -75,8 +75,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	@(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO} locale,install,select,en-US >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
 	@/usr/bin/find ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		/usr/bin/xargs ${RMDIR} 2> /dev/null || ${TRUE}
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index e10cbff..63788a0 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -75,8 +75,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	@(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO} locale,install,select,en-US >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
 	@/usr/bin/find ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		/usr/bin/xargs ${RMDIR} 2> /dev/null || ${TRUE}
diff --git a/www/netscape3/Makefile b/www/netscape3/Makefile
index d862ec8..16e38a4 100644
--- a/www/netscape3/Makefile
+++ b/www/netscape3/Makefile
@@ -43,7 +43,7 @@ pre-install:
 post-install:
 .if defined(WITH_128BIT)
 	cd ${WRKDIR}/${FORTIFY} \
-	&& (${ECHO}; ${ECHO} yes; ${ECHO} no; ${ECHO} no) \
+	&& (${ECHO_CMD}; ${ECHO_CMD} yes; ${ECHO_CMD} no; ${ECHO_CMD} no) \
 	| ./Fortify.sh ${PREFIX}/lib/netscape/netscape.bin
 .endif
 	@${CAT} ${DESCR}
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index a7b7814..dcd2b54 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -86,7 +86,7 @@ post-configure:
 		-e "s;@BROWSER_VER@;${BROWSER_VER};g" \
 		${WRAPPER_TEMPLATE} >${WRKSRC}/netscape
 	${CHMOD} +x ${WRKSRC}/netscape
-	${ECHO} -n ${INFILE_HEAD},${NDIR} >${WRKSRC}/infile
+	${ECHO_CMD} -n ${INFILE_HEAD},${NDIR} >${WRKSRC}/infile
 
 .if defined(USE_AOUT_LIB)
 pre-install:
@@ -115,7 +115,7 @@ do-install:
 .endif
 .if defined(WITH_128BIT) && !defined(NO_FORTIFY)
 	cd ${WRKDIR}/${FORTIFY} \
-	&& (${ECHO}; ${ECHO} yes; ${ECHO} no; ${ECHO} no) \
+	&& (${ECHO_CMD}; ${ECHO_CMD} yes; ${ECHO_CMD} no; ${ECHO_CMD} no) \
 	| ./Fortify.sh ${NDIR}/${BROWSER_ARC}-${BROWSER_VER}.bin
 .endif
 	${CHOWN} -R root:wheel ${NDIR}
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index 4ef1f79..12ecd38 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -70,7 +70,7 @@ NETSCAPE_DIST_SUBDIR?=	communicator/english/${BROWSER_VER}/unix/${NETSCAPE_DIST_
 NETSCAPE_DIST_TAG?=	x86-unknown-freebsd # | x86-unknown-linux2.2 | x86-bsdi-bsd2 | alpha-dec-osf4.0
 
 BROWSER_VER=	${PORTVERSION}
-BROWSER_V!=	${ECHO} ${BROWSER_VER} | sed -e 's/\.//'
+BROWSER_V!=	${ECHO_CMD} ${BROWSER_VER} | sed -e 's/\.//'
 INFILE_HEAD?=	'Communicator,4.76.0.20001006'
 NO_AUTOADMIN=	'Not available'
 NO_FORTIFY=	'No need for this version'
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index a7b7814..dcd2b54 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -86,7 +86,7 @@ post-configure:
 		-e "s;@BROWSER_VER@;${BROWSER_VER};g" \
 		${WRAPPER_TEMPLATE} >${WRKSRC}/netscape
 	${CHMOD} +x ${WRKSRC}/netscape
-	${ECHO} -n ${INFILE_HEAD},${NDIR} >${WRKSRC}/infile
+	${ECHO_CMD} -n ${INFILE_HEAD},${NDIR} >${WRKSRC}/infile
 
 .if defined(USE_AOUT_LIB)
 pre-install:
@@ -115,7 +115,7 @@ do-install:
 .endif
 .if defined(WITH_128BIT) && !defined(NO_FORTIFY)
 	cd ${WRKDIR}/${FORTIFY} \
-	&& (${ECHO}; ${ECHO} yes; ${ECHO} no; ${ECHO} no) \
+	&& (${ECHO_CMD}; ${ECHO_CMD} yes; ${ECHO_CMD} no; ${ECHO_CMD} no) \
 	| ./Fortify.sh ${NDIR}/${BROWSER_ARC}-${BROWSER_VER}.bin
 .endif
 	${CHOWN} -R root:wheel ${NDIR}
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 7fec3ce..d7651d13 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -99,18 +99,18 @@ do-configure:
 	${FILESDIR}/start.sh >${WRKDIR}/${STARTUP_CMD}
 
 pre-install:
-	${ECHO} bin/${STARTUP_CMD} > ${PLIST}
+	${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST}
 	cd ${WRKSRC}/bin; for i in `find * \! -type d | sort`; do \
-		${ECHO} lib/linux-netscape6/$${i} >> ${PLIST}; \
+		${ECHO_CMD} lib/linux-netscape6/$${i} >> ${PLIST}; \
 	done
 	cd ${WRKSRC}/plugins; for i in `find * \! -type d | sort`; do \
-		${ECHO} lib/linux-netscape6/plugins/$${i} >> ${PLIST}; \
+		${ECHO_CMD} lib/linux-netscape6/plugins/$${i} >> ${PLIST}; \
 	done
 	cd ${WRKSRC}/bin; \
 	for i in `find -d * -type d`; do \
-		${ECHO} @dirrm lib/linux-netscape6/$${i} >> ${PLIST}; \
+		${ECHO_CMD} @dirrm lib/linux-netscape6/$${i} >> ${PLIST}; \
 	done
-	${ECHO} @dirrm lib/linux-netscape6 >> ${PLIST}
+	${ECHO_CMD} @dirrm lib/linux-netscape6 >> ${PLIST}
 
 do-install:
 	${MKDIR} ${INSTALL_DIR}
diff --git a/www/pruby/Makefile b/www/pruby/Makefile
index ac5a8c8..5840173 100644
--- a/www/pruby/Makefile
+++ b/www/pruby/Makefile
@@ -42,21 +42,21 @@ do-configure:
 		dir=`${MOD_PHP4_WRKSRC_CMD}`; \
 		php contrib/phpinfo.php > phpinfo.out; \
 		( \
-		${ECHO} "PHP4_SRC=$${dir}"; \
-		${ECHO} "PHP4_CONFIGURED=yes"; \
-		${ECHO} "RUBY_SRC="; \
-		${ECHO} "RUBY=${RUBY}"; \
-		${ECHO} "PHPINFO_OUT=phpinfo.out"; \
-		${ECHO} "LIBRUBYS_SO=${LOCALBASE}/lib/libruby.so"; \
+		${ECHO_CMD} "PHP4_SRC=$${dir}"; \
+		${ECHO_CMD} "PHP4_CONFIGURED=yes"; \
+		${ECHO_CMD} "RUBY_SRC="; \
+		${ECHO_CMD} "RUBY=${RUBY}"; \
+		${ECHO_CMD} "PHPINFO_OUT=phpinfo.out"; \
+		${ECHO_CMD} "LIBRUBYS_SO=${LOCALBASE}/lib/libruby.so"; \
 		) > Configuration; \
 	)
 
 pre-install:
-	dir=`. ${WRKSRC}/phpinfo.sd; ${ECHO} $${PI_EXTENSION_DIR}`; \
+	dir=`. ${WRKSRC}/phpinfo.sd; ${ECHO_CMD} $${PI_EXTENSION_DIR}`; \
 	${MKDIR} $${dir}
 
 post-install:
-	dir=`. ${WRKSRC}/phpinfo.sd; ${ECHO} $${PI_EXTENSION_DIR}`; \
+	dir=`. ${WRKSRC}/phpinfo.sd; ${ECHO_CMD} $${PI_EXTENSION_DIR}`; \
 	${INSTALL_DATA} ${WRKSRC}/ext_pruby_src/pruby_*.rb $${dir}/; \
 	${PERL} -i -pe "s,%%EXTENSION_DIR%%,$${dir#${PREFIX}/},g" ${TMPPLIST}
 .if !defined(NOPORTDOCS)
diff --git a/www/publicfile/Makefile b/www/publicfile/Makefile
index a7bcfae..5d1e0d7 100644
--- a/www/publicfile/Makefile
+++ b/www/publicfile/Makefile
@@ -20,8 +20,8 @@ ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 post-patch:
-	@${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	@${ECHO} "${CC} -s" > ${WRKSRC}/conf-ld
-	@${ECHO} "${PREFIX}" > ${WRKSRC}/conf-home
+	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} "${CC} -s" > ${WRKSRC}/conf-ld
+	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
 
 .include <bsd.port.mk>
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index e10cbff..63788a0 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -75,8 +75,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	@(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO} locale,install,select,en-US >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
 	@/usr/bin/find ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		/usr/bin/xargs ${RMDIR} 2> /dev/null || ${TRUE}
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index e10cbff..63788a0 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -75,8 +75,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	@(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO} locale,install,select,en-US >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
+	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
 	@/usr/bin/find ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		/usr/bin/xargs ${RMDIR} 2> /dev/null || ${TRUE}
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 7d20186..96c17e5 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -44,20 +44,20 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/extras/syslogtocern.8 ${PREFIX}/man/man8
 	@if [ ! -f ${PREFIX}/sbin/thttpd_wrapper ]; then \
 		${ECHO} "Installing ${PREFIX}/sbin/thttpd_wrapper file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO} "${ECHO} \$$\$$ > /var/run/thttpd_wrapper.pid" >> ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO} "while true ; do" >> ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO} "	${PREFIX}/sbin/thttpd -D -C ${PREFIX}/etc/thttpd.conf" >> ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO} "	sleep 10" >> ${PREFIX}/sbin/thttpd_wrapper; \
-		${ECHO} "done" >> ${PREFIX}/sbin/thttpd_wrapper; \
+		${ECHO_CMD} "#!/bin/sh" > ${PREFIX}/sbin/thttpd_wrapper; \
+		${ECHO_CMD} "${ECHO_CMD} \$$\$$ > /var/run/thttpd_wrapper.pid" >> ${PREFIX}/sbin/thttpd_wrapper; \
+		${ECHO_CMD} "while true ; do" >> ${PREFIX}/sbin/thttpd_wrapper; \
+		${ECHO_CMD} "	${PREFIX}/sbin/thttpd -D -C ${PREFIX}/etc/thttpd.conf" >> ${PREFIX}/sbin/thttpd_wrapper; \
+		${ECHO_CMD} "	sleep 10" >> ${PREFIX}/sbin/thttpd_wrapper; \
+		${ECHO_CMD} "done" >> ${PREFIX}/sbin/thttpd_wrapper; \
 		${CHMOD} 751 ${PREFIX}/sbin/thttpd_wrapper; \
 	fi
 	@${ECHO} "Installing ${PREFIX}/etc/thttpd.conf.sample configuration file."
-	@${ECHO} "dir=${PREFIX}/www/data" > ${PREFIX}/etc/thttpd.conf.sample
-	@${ECHO} "chroot" >> ${PREFIX}/etc/thttpd.conf.sample
-	@${ECHO} "cgipat=*.cgi" >> ${PREFIX}/etc/thttpd.conf.sample
-	@${ECHO} "logfile=${PREFIX}/www/logs/thttpd.log" >> ${PREFIX}/etc/thttpd.conf.sample
-	@${ECHO} "pidfile=/var/run/thttpd.pid" >> ${PREFIX}/etc/thttpd.conf.sample
+	@${ECHO_CMD} "dir=${PREFIX}/www/data" > ${PREFIX}/etc/thttpd.conf.sample
+	@${ECHO_CMD} "chroot" >> ${PREFIX}/etc/thttpd.conf.sample
+	@${ECHO_CMD} "cgipat=*.cgi" >> ${PREFIX}/etc/thttpd.conf.sample
+	@${ECHO_CMD} "logfile=${PREFIX}/www/logs/thttpd.log" >> ${PREFIX}/etc/thttpd.conf.sample
+	@${ECHO_CMD} "pidfile=/var/run/thttpd.pid" >> ${PREFIX}/etc/thttpd.conf.sample
 	@if [ ! -f ${PREFIX}/etc/rc.d/thttpd.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/thttpd.sh startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/thttpd.sh ${PREFIX}/etc/rc.d/thttpd.sh; \
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index fd6a2d6..8c2020e 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -26,6 +26,6 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh /usr/local/etc/rc.d
 
 post-install:
-	@${ECHO} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
+	@${ECHO_CMD} "etc/rc.d/tomcat.sh" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index fa007af..48cfa98 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -26,7 +26,7 @@ pre-configure:
 	@${ECHO_MSG} "Set the environment variable MD5_PW if you want MD5 encrypted passwords."
 	@${ECHO_MSG} ""
 .else
-	@${ECHO} "CFLAGS += -DMD5_PW" >> ${WRKDIR}/All/${OSNAME}/Makefile.include
+	@${ECHO_CMD} "CFLAGS += -DMD5_PW" >> ${WRKDIR}/All/${OSNAME}/Makefile.include
 .endif
 
 do-install:
diff --git a/www/wb0/Makefile b/www/wb0/Makefile
index a9053d7..c8623ee 100644
--- a/www/wb0/Makefile
+++ b/www/wb0/Makefile
@@ -28,19 +28,19 @@ post-patch:
 		${WRKSRC}/wb0.c
 
 pre-install:
-	${ECHO} bin/wb0 > ${PLIST}
+	${ECHO_CMD} bin/wb0 > ${PLIST}
 .if !defined(NOPORTDOCS)
 .for i in ${DOCS}
-	${ECHO} ${DOCDIR}/${i} >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
 .endfor
-	${ECHO} ${DOCDIR}/wb0.config.README >> ${PLIST}
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/wb0.config.README >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
-	${ECHO} etc/wb0.config >> ${PLIST}
+	${ECHO_CMD} etc/wb0.config >> ${PLIST}
 	for i in `find ${PREFIX}/share/wb0 -type f`; \
-		do ${ECHO} share/wb0/`${BASENAME} $${i}` >> ${PLIST}; \
+		do ${ECHO_CMD} share/wb0/`${BASENAME} $${i}` >> ${PLIST}; \
 	done
-	${ECHO} @dirrm share/wb0 >> ${PLIST}
+	${ECHO_CMD} @dirrm share/wb0 >> ${PLIST}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/www/webfs/Makefile b/www/webfs/Makefile
index 6daae6f..12cc35e 100644
--- a/www/webfs/Makefile
+++ b/www/webfs/Makefile
@@ -31,7 +31,7 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/webfsd.man ${PREFIX}/man/man1/webfsd.1
 .if !exists(${PREFIX}/etc/webfsd/mime.types)
 	@${MKDIR} ${PREFIX}/etc/webfsd
-	@${ECHO} "# Insert mime types here" > ${PREFIX}/etc/webfsd/mime.types
+	@${ECHO_CMD} "# Insert mime types here" > ${PREFIX}/etc/webfsd/mime.types
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/zope/Makefile b/www/zope/Makefile
index 9966fcc..8aeabc4 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -70,7 +70,7 @@ do-install:
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} wo_pcgi.py)
 	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
-		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
+		${ECHO_CMD} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi ; \
 		${RM} Zope.cgi.orig )
 	@(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o)
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 9966fcc..8aeabc4 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -70,7 +70,7 @@ do-install:
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} wo_pcgi.py)
 	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
-		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
+		${ECHO_CMD} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi ; \
 		${RM} Zope.cgi.orig )
 	@(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o)
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 9966fcc..8aeabc4 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -70,7 +70,7 @@ do-install:
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} wo_pcgi.py)
 	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
-		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
+		${ECHO_CMD} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi ; \
 		${RM} Zope.cgi.orig )
 	@(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o)
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 9966fcc..8aeabc4 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -70,7 +70,7 @@ do-install:
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} wo_pcgi.py)
 	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
-		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
+		${ECHO_CMD} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi ; \
 		${RM} Zope.cgi.orig )
 	@(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o)
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index 9966fcc..8aeabc4 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -70,7 +70,7 @@ do-install:
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} wo_pcgi.py)
 	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
-		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
+		${ECHO_CMD} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi ; \
 		${RM} Zope.cgi.orig )
 	@(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o)
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 9966fcc..8aeabc4 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -70,7 +70,7 @@ do-install:
 	@(cd ${ZOPEBASEDIR} && ${PYTHON_CMD} wo_pcgi.py)
 	@(cd ${ZOPEBASEDIR} && \
 		${MV} Zope.cgi Zope.cgi.orig ; \
-		${ECHO} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
+		${ECHO_CMD} "#! ${CGIBINDIR}/pcgi-wrapper" > Zope.cgi ; \
 		${CAT} Zope.cgi.orig >> Zope.cgi ; \
 		${RM} Zope.cgi.orig )
 	@(cd ${ZOPEBASEDIR}/pcgi/Test && ${RM} *.o)