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.

23 files changed, 73 insertions, 73 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index b988519..f726fa2 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -52,13 +52,13 @@ do-install:
 		${FALSE} ; \
 	fi
 
-	@${ECHO} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ;
+	@${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ;
 	@for dir in ${NSCP}; do \
 		if [ -e $${dir}/plugins/libnullplugin.so ]; then \
 			BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \
 			case $${BIN} in \
 			\(SYSV\),) \
-				${ECHO} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \
+				${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \
 			esac \
 		fi \
 	done
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index b988519..f726fa2 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -52,13 +52,13 @@ do-install:
 		${FALSE} ; \
 	fi
 
-	@${ECHO} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ;
+	@${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ;
 	@for dir in ${NSCP}; do \
 		if [ -e $${dir}/plugins/libnullplugin.so ]; then \
 			BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \
 			case $${BIN} in \
 			\(SYSV\),) \
-				${ECHO} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \
+				${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \
 			esac \
 		fi \
 	done
diff --git a/net/dctc-gui/Makefile b/net/dctc-gui/Makefile
index bcf02d9..4c5f201 100644
--- a/net/dctc-gui/Makefile
+++ b/net/dctc-gui/Makefile
@@ -38,10 +38,10 @@ post-patch:
 		${WRKSRC}/src/init_fnc.c
 
 post-configure:
-	@${ECHO} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h
-	@${ECHO} '#ifndef SEMVMX' >> ${WRKSRC}/config.h
-	@${ECHO} '#define SEMVMX 32767' >> ${WRKSRC}/config.h
-	@${ECHO} '#endif' >> ${WRKSRC}/config.h
+	@${ECHO_CMD} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO_CMD} '#ifndef SEMVMX' >> ${WRKSRC}/config.h
+	@${ECHO_CMD} '#define SEMVMX 32767' >> ${WRKSRC}/config.h
+	@${ECHO_CMD} '#endif' >> ${WRKSRC}/config.h
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index 2ff8087..3bebe96 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -41,14 +41,14 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-configure:
-	@${ECHO} '#ifndef MSG_NOSIGNAL' >> ${CONFIGURE_WRKSRC}/config.h
-	@${ECHO} '# define MSG_NOSIGNAL 0' >> ${CONFIGURE_WRKSRC}/config.h
-	@${ECHO} '#endif' >> ${CONFIGURE_WRKSRC}/config.h
-	@${ECHO} '#include <errno.h>' >> ${CONFIGURE_WRKSRC}/config.h
-	@${ECHO} '#ifndef ENODATA' >> ${CONFIGURE_WRKSRC}/config.h
-	@${ECHO} '# define ENODATA ENOMSG' >> ${CONFIGURE_WRKSRC}/config.h
-	@${ECHO} '#endif' >> ${CONFIGURE_WRKSRC}/config.h
-	@${ECHO} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO_CMD} '#ifndef MSG_NOSIGNAL' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO_CMD} '# define MSG_NOSIGNAL 0' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO_CMD} '#endif' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO_CMD} '#include <errno.h>' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO_CMD} '#ifndef ENODATA' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO_CMD} '# define ENODATA ENOMSG' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO_CMD} '#endif' >> ${CONFIGURE_WRKSRC}/config.h
+	@${ECHO_CMD} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h
 
 do-install:
 .ifndef(NOPORTDOCS)
diff --git a/net/ddup/Makefile b/net/ddup/Makefile
index 22099e7..2b83fa9 100644
--- a/net/ddup/Makefile
+++ b/net/ddup/Makefile
@@ -32,7 +32,7 @@ post-patch:
 
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
-	${ECHO} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h
+	${ECHO_CMD} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ddupcron.sh ${PREFIX}/sbin/
diff --git a/net/dhisd/Makefile b/net/dhisd/Makefile
index f41aa96..03e6c16 100644
--- a/net/dhisd/Makefile
+++ b/net/dhisd/Makefile
@@ -24,23 +24,23 @@ do-install:
 post-install:
 	${ECHO} "===>   Installing ${PREFIX}/bin/dhisd."
 	${INSTALL_PROGRAM} ${WRKSRC}/dhisd ${PREFIX}/bin
-	@${ECHO} "bin/dhisd" >> ${TMPPLIST}
+	@${ECH_CMDO} "bin/dhisd" >> ${TMPPLIST}
 	${ECHO} "===>   Installing ${PREFIX}/bin/genkeys."
 	${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${PREFIX}/bin
-	@${ECHO} "bin/genkeys" >> ${TMPPLIST}
+	@${ECH_CMDO} "bin/genkeys" >> ${TMPPLIST}
 	${ECHO} "===>   Creating ${PREFIX}/etc/dhis and installing sample db files."
 	@${MKDIR} ${PREFIX}/etc/dhis
 	@${CHMOD} 700 ${PREFIX}/etc/dhis
 	@${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${PREFIX}/etc/dhis/dhis.db.sample
-	@${ECHO} "etc/dhis/dhis.db.sample" >> ${TMPPLIST}
+	@${ECHO_CMD} "etc/dhis/dhis.db.sample" >> ${TMPPLIST}
 	@${INSTALL_DATA} ${WRKSRC}/services.db.sample ${PREFIX}/etc/dhis/services.db.sample
-	@${ECHO} "etc/dhis/services.db.sample" >> ${TMPPLIST}
+	@${ECHO_CMD} "etc/dhis/services.db.sample" >> ${TMPPLIST}
 	@${CHMOD} 600 ${PREFIX}/etc/dhis/*
-	@${ECHO} "@dirrm etc/dhis" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm etc/dhis" >> ${TMPPLIST}
 .if !exists(${PREFIX}/etc/rc.d/dhisd.sh)
 	${ECHO} "===>   Installing ${PREFIX}/etc/rc.d/dhid.sh startup file."
 	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dhisd.sh ${PREFIX}/etc/rc.d/dhisd.sh
-	@${ECHO} "etc/rc.d/dhisd.sh" >> ${TMPPLIST}
+	@${ECHO_CMD} "etc/rc.d/dhisd.sh" >> ${TMPPLIST}
 .endif
 .if !defined(NOPORTDOCS)
 	${ECHO} "===>   Installing documentation in ${DOCSDIR}"
@@ -48,11 +48,11 @@ post-install:
 	@${CHMOD} 755 ${DOCSDIR}
 .for DOCFILE in ${DOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR}
-	@${ECHO} "share/doc/${PORTNAME}/${DOCFILE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "share/doc/${PORTNAME}/${DOCFILE}" >> ${TMPPLIST}
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/INSTALL.bsd ${DOCSDIR}
-	@${ECHO} "share/doc/${PORTNAME}/INSTALL.bsd" >> ${TMPPLIST}
-	@${ECHO} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST}
+	@${ECHO_CMD} "share/doc/${PORTNAME}/INSTALL.bsd" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST}
 .endif
 	@${ECHO} "--------------------------------------------------------------------------"
 	@${ECHO} "Before dhisd can run, you will need configure BIND."
diff --git a/net/freeradius-devel/Makefile b/net/freeradius-devel/Makefile
index d27b279..2355ad8 100644
--- a/net/freeradius-devel/Makefile
+++ b/net/freeradius-devel/Makefile
@@ -59,8 +59,8 @@ UNWANTED_LIBS=${STATIC_MODULES:S/^/lib\/rlm_/:S/$/.a/} \
 post-install:
 .if defined(WANT_KRB5) && defined(KRB5_HOME)
 	@${RM} ${PREFIX}/lib/rlm_krb5.a
-	@${ECHO} 'lib/rlm_krb5.so' >> ${TMPPLIST}
-	@${ECHO} 'lib/rlm_krb5.so.0' >> ${TMPPLIST}
+	@${ECHO_CMD} 'lib/rlm_krb5.so' >> ${TMPPLIST}
+	@${ECHO_CMD} 'lib/rlm_krb5.so.0' >> ${TMPPLIST}
 .endif
 	@cd ${PREFIX} && ${RM} ${UNWANTED_LIBS}
 .for f in acct_users attrs clients clients.conf hints huntgroups ldap.attrmap \
diff --git a/net/fspd/Makefile b/net/fspd/Makefile
index e77e5c2..03cd87b 100644
--- a/net/fspd/Makefile
+++ b/net/fspd/Makefile
@@ -26,14 +26,14 @@ do-patch:
 		${WRKSRC}/include/server_conf.h
 
 pre-install:
-	${ECHO} "sbin/fspd" > ${PLIST}
+	${ECHO_CMD} "sbin/fspd" > ${PLIST}
 .if !defined(NOPORTDOCS)
 .for i in ${DOCFILES}
-	${ECHO} ${DOCDIR}/${i} >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
 .endfor
-	${ECHO} share/examples/fspd/example.conf >> ${PLIST}
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
-	${ECHO} @dirrm share/examples/fspd >> ${PLIST}
+	${ECHO_CMD} share/examples/fspd/example.conf >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm share/examples/fspd >> ${PLIST}
 .endif
 
 do-install:
diff --git a/net/gnu-finger/Makefile b/net/gnu-finger/Makefile
index 3aea451..136395b 100644
--- a/net/gnu-finger/Makefile
+++ b/net/gnu-finger/Makefile
@@ -23,7 +23,7 @@ post-install:
 	@${CP} ${WRKSRC}/support/ttylocs ${PREFIX}/etc/fingerdir/ttylocs.sample
 	@${CP} ${FILESDIR}/clients.sample ${PREFIX}/etc/fingerdir/clients.sample
 	@${INSTALL} ${COPY} -m 744 -o root ${FILESDIR}/fingerd.sh.sample ${PREFIX}/etc/rc.d/fingerd.sh.sample
-	@${ECHO} "GNU.finger.server.hostname" > ${PREFIX}/etc/fingerdir/serverhost.sample
-	@${ECHO} "mail.spool.server.hostname" > ${PREFIX}/etc/fingerdir/mailhost.sample
+	@${ECHO_CMD} "GNU.finger.server.hostname" > ${PREFIX}/etc/fingerdir/serverhost.sample
+	@${ECHO_CMD} "mail.spool.server.hostname" > ${PREFIX}/etc/fingerdir/mailhost.sample
 
 .include <bsd.port.mk>
diff --git a/net/kxicq-devel/Makefile b/net/kxicq-devel/Makefile
index f889439..2dd93b8 100644
--- a/net/kxicq-devel/Makefile
+++ b/net/kxicq-devel/Makefile
@@ -49,8 +49,8 @@ pre-install:
 .for skin in ${SKINS}
 	@for f in ${WRKDIR}/${skin}/* ; do \
 		file=`${BASENAME} $$f`; \
-		${ECHO} share/apps/kxicq/skins/${skin}/$$file >> ${PLIST} ; done
-	@${ECHO} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm
+		${ECHO_CMD} share/apps/kxicq/skins/${skin}/$$file >> ${PLIST} ; done
+	@${ECHO_CMD} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm
 .endfor
 	@${CAT} ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm
 	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile
index f889439..2dd93b8 100644
--- a/net/kxicq/Makefile
+++ b/net/kxicq/Makefile
@@ -49,8 +49,8 @@ pre-install:
 .for skin in ${SKINS}
 	@for f in ${WRKDIR}/${skin}/* ; do \
 		file=`${BASENAME} $$f`; \
-		${ECHO} share/apps/kxicq/skins/${skin}/$$file >> ${PLIST} ; done
-	@${ECHO} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm
+		${ECHO_CMD} share/apps/kxicq/skins/${skin}/$$file >> ${PLIST} ; done
+	@${ECHO_CMD} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm
 .endfor
 	@${CAT} ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm
 	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
diff --git a/net/micq/Makefile b/net/micq/Makefile
index b53f360..98035b2 100644
--- a/net/micq/Makefile
+++ b/net/micq/Makefile
@@ -28,7 +28,7 @@ pre-configure:
 	@${ECHO_MSG} "make WITH_MICQ_LANG=<your_lang>"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Currently supported <your_lang> values are:"
-	@${ECHO} "  "${SUP_LANGS} | ${SED} 's|,$$|.|' | /usr/bin/fmt
+	@${ECHO_CMD} "  "${SUP_LANGS} | ${SED} 's|,$$|.|' | /usr/bin/fmt
 .else
 	@/usr/bin/printf "#define ${WITH_MICQ_LANG}_LANG\n#undef ENGLISH_LANG" >> \
 		${WRKSRC}/../include/config.h
diff --git a/net/pim6dd/Makefile b/net/pim6dd/Makefile
index 87aec58..3f04d84 100644
--- a/net/pim6dd/Makefile
+++ b/net/pim6dd/Makefile
@@ -35,9 +35,9 @@ post-install:
 	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
 .for file in ${DOCS}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/${file} ${PREFIX}/share/doc/${PORTNAME}
-	@${ECHO} share/doc/${PORTNAME}/${file} >>${TMPPLIST}
+	@${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST}
 .endfor
-	@${ECHO} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
+	@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile
index 4146170..29917df 100644
--- a/net/pim6sd/Makefile
+++ b/net/pim6sd/Makefile
@@ -36,9 +36,9 @@ post-install:
 	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
 .for file in ${DOCS}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/${file} ${PREFIX}/share/doc/${PORTNAME}
-	@${ECHO} share/doc/${PORTNAME}/${file} >>${TMPPLIST}
+	@${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST}
 .endfor
-	@${ECHO} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
+	@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/ruby-drb/Makefile b/net/ruby-drb/Makefile
index 190a7db..88c661f 100644
--- a/net/ruby-drb/Makefile
+++ b/net/ruby-drb/Makefile
@@ -32,7 +32,7 @@ post-patch:
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc && for f in drb-ref.rd*; do \
 		${MV} $$f $$f.orig; \
-		( ${ECHO} '=begin'; ${CAT} $$f.orig; ${ECHO} '=end' ) > $$f; \
+		( ${ECHO_CMD} '=begin'; ${CAT} $$f.orig; ${ECHO_CMD} '=end' ) > $$f; \
 		${RM} $$f.orig; \
 	done
 .endif
@@ -40,10 +40,10 @@ post-patch:
 do-build:
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc && for f in *.rd; do \
-		${RUBY_RD} $$f > `${ECHO} $$f | ${SED} 's/\.rd$$/.html/'`; \
+		${RUBY_RD} $$f > `${ECHO_CMD} $$f | ${SED} 's/\.rd$$/.html/'`; \
 	done
 	cd ${WRKSRC}/doc && for f in *.rd.ja; do \
-		${RUBY_RD} $$f > `${ECHO} $$f | ${SED} 's/\.rd.ja$$/.ja.html/'`; \
+		${RUBY_RD} $$f > `${ECHO_CMD} $$f | ${SED} 's/\.rd.ja$$/.ja.html/'`; \
 	done
 	${MKDIR} ${WRKSRC}/doc/ja
 	cd ${WRKSRC}/doc && ${MV} *.rd.ja *.ja.html ja/
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index d6bd4af..a400d2d 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -103,10 +103,10 @@ post-install:
 	${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
 	${CHMOD} 111 ${PREFIX}/bin/smbpasswd
 .if defined(PACKAGE_BUILDING)
-	${ECHO} "private/smbpasswd" >> ${TMPPLIST}
-	${ECHO} "@dirrm private" >> ${TMPPLIST}
+	${ECHO_CMD} "private/smbpasswd" >> ${TMPPLIST}
+	${ECHO_CMD} "@dirrm private" >> ${TMPPLIST}
 .else
-	${ECHO} "@unexec ${ECHO} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
 .endif
 
 .if !defined(NOPORTDOCS)
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 21c46ef..7756fd1 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -103,10 +103,10 @@ post-install:
 	${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
 	${CHMOD} 111 ${PREFIX}/bin/smbpasswd
 .if defined(PACKAGE_BUILDING)
-	${ECHO} "private/smbpasswd" >> ${TMPPLIST}
-	${ECHO} "@dirrm private" >> ${TMPPLIST}
+	${ECHO_CMD} "private/smbpasswd" >> ${TMPPLIST}
+	${ECHO_CMD} "@dirrm private" >> ${TMPPLIST}
 .else
-	${ECHO} "@unexec ${ECHO} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
 .endif
 
 .if !defined(NOPORTDOCS)
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index d6bd4af..a400d2d 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -103,10 +103,10 @@ post-install:
 	${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
 	${CHMOD} 111 ${PREFIX}/bin/smbpasswd
 .if defined(PACKAGE_BUILDING)
-	${ECHO} "private/smbpasswd" >> ${TMPPLIST}
-	${ECHO} "@dirrm private" >> ${TMPPLIST}
+	${ECHO_CMD} "private/smbpasswd" >> ${TMPPLIST}
+	${ECHO_CMD} "@dirrm private" >> ${TMPPLIST}
 .else
-	${ECHO} "@unexec ${ECHO} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST}
 .endif
 
 .if !defined(NOPORTDOCS)
diff --git a/net/svnc/Makefile b/net/svnc/Makefile
index 98e8731..0be34e3 100644
--- a/net/svnc/Makefile
+++ b/net/svnc/Makefile
@@ -45,14 +45,14 @@ do-build:
 		${WRKDIR}/vnc_unixsrc/libvncauth/libvncauth.a
 
 pre-install:
-	${ECHO} "bin/svncviewer" > ${PLIST}
+	${ECHO_CMD} "bin/svncviewer" > ${PLIST}
 .if !defined(NOPORTDOCS)
 .for i in ${DOCFILES}
-	${ECHO} -n ${DOCDIR} >> ${PLIST}
-	${ECHO} ${i} >> ${PLIST}
+	${ECHO_CMD} -n ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} ${i} >> ${PLIST}
 .endfor
-	${ECHO} -n "@dirrm " >> ${PLIST}
-	${ECHO} ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} -n "@dirrm " >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/net/tik/Makefile b/net/tik/Makefile
index f2a7532..7bc7b18 100644
--- a/net/tik/Makefile
+++ b/net/tik/Makefile
@@ -40,26 +40,26 @@ do-install:
 	@${CP} ${PKGDIR}/pkg-plist ${PLIST}
 .for d in ${SRCDIRS}
 	@${MKDIR} ${PREFIX}/${d}
-	@${ECHO} @dirrm ${d} >> ${PLIST}.dirrm
+	@${ECHO_CMD} @dirrm ${d} >> ${PLIST}.dirrm
 .endfor
 .for f in ${SRCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/tik/${f}
-	@${ECHO} share/tik/${f} >> ${PLIST}
+	@${ECHO_CMD} share/tik/${f} >> ${PLIST}
 .endfor
 	@${MKDIR} ${PREFIX}/${EGDIR}
-	@${ECHO} @dirrm ${EGDIR} >> ${PLIST}.dirrm
+	@${ECHO_CMD} @dirrm ${EGDIR} >> ${PLIST}.dirrm
 .for f in ${EGFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${EGDIR}/${f}
-	@${ECHO} ${EGDIR}/${f} >> ${PLIST}
+	@${ECHO_CMD} ${EGDIR}/${f} >> ${PLIST}
 .endfor
 	@${SED} 's#@PREFIX@#${PREFIX}#g' < ${FILESDIR}/tik >${WRKDIR}/tik.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/tik.sh ${PREFIX}/bin/tik
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOCDIR}
-	@${ECHO} @dirrm ${DOCDIR} >> ${PLIST}.dirrm
+	@${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}.dirrm
 .for f in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DOCDIR}/${f}
-	@${ECHO} ${DOCDIR}/${f} >> ${PLIST}
+	@${ECHO_CMD} ${DOCDIR}/${f} >> ${PLIST}
 .endfor
 .endif
 	@${SORT} -r ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm
diff --git a/net/tn3270/Makefile b/net/tn3270/Makefile
index 0de218f..bb39f16 100644
--- a/net/tn3270/Makefile
+++ b/net/tn3270/Makefile
@@ -31,8 +31,8 @@ post-extract:
 	${CP} -rp ${LIBTELNETDIR} ${WRKSRC}
 
 do-configure:
-	${ECHO} "BINDIR=	${PREFIX}/bin" > ${WRKDIR}/Makefile.inc
-	${ECHO} "MANDIR=	${PREFIX}/man/man" >> ${WRKDIR}/Makefile.inc
+	${ECHO_CMD} "BINDIR=	${PREFIX}/bin" > ${WRKDIR}/Makefile.inc
+	${ECHO_CMD} "MANDIR=	${PREFIX}/man/man" >> ${WRKDIR}/Makefile.inc
 do-build:
 	cd ${WRKSRC}; \
 	${MAKE} depend; \
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 756b22e..a7c889d 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -52,6 +52,6 @@ post-install:
 # Add to PLIST because VNC developers can't/won't freeze their doc
 # distfile.
 	(cd ${PREFIX}; ls share/doc/vnc/* >> ${TMPPLIST})
-	${ECHO} '@dirrm share/doc/vnc' >> ${TMPPLIST}
+	${ECHO_CMD} '@dirrm share/doc/vnc' >> ${TMPPLIST}
 .endif
 .include <bsd.port.mk>
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index c2a9897..49c9c7e 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -31,8 +31,8 @@ post-build:
 	@${CP} ${PKGDIR}/pkg-plist ${PLIST}
 	@(cd ${WRKSRC}/data; find pkc pkt ! -type d | \
 		${SED} -e 's|^|share/xipdump/|' >> ${PLIST})
-	@${ECHO} "@dirrm share/xipdump/pkt" >> ${PLIST}
-	@${ECHO} "@dirrm share/xipdump/pkc" >> ${PLIST}
-	@${ECHO} "@dirrm share/xipdump" >> ${PLIST}
+	@${ECHO_CMD} "@dirrm share/xipdump/pkt" >> ${PLIST}
+	@${ECHO_CMD} "@dirrm share/xipdump/pkc" >> ${PLIST}
+	@${ECHO_CMD} "@dirrm share/xipdump" >> ${PLIST}
 
 .include <bsd.port.mk>