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.

28 files changed, 75 insertions, 75 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 81ca551..3e7c5be 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -30,8 +30,8 @@ post-patch:
 	@${TOUCH} ${WRKSRC}/configure
 
 post-install:
-	@${ECHO} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbitrc.default
-	@${ECHO} "ORBIIOPIPv6=0" >> ${PREFIX}/etc/orbitrc.default
+	@${ECHO_CMD} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbitrc.default
+	@${ECHO_CMD} "ORBIIOPIPv6=0" >> ${PREFIX}/etc/orbitrc.default
 	@if [ ! -f ${PREFIX}/etc/orbitrc ]; then \
 		${CP} -p ${PREFIX}/etc/orbitrc.default ${PREFIX}/etc/orbitrc ; \
 	fi
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 81ca551..3e7c5be 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -30,8 +30,8 @@ post-patch:
 	@${TOUCH} ${WRKSRC}/configure
 
 post-install:
-	@${ECHO} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbitrc.default
-	@${ECHO} "ORBIIOPIPv6=0" >> ${PREFIX}/etc/orbitrc.default
+	@${ECHO_CMD} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbitrc.default
+	@${ECHO_CMD} "ORBIIOPIPv6=0" >> ${PREFIX}/etc/orbitrc.default
 	@if [ ! -f ${PREFIX}/etc/orbitrc ]; then \
 		${CP} -p ${PREFIX}/etc/orbitrc.default ${PREFIX}/etc/orbitrc ; \
 	fi
diff --git a/devel/bin86/Makefile b/devel/bin86/Makefile
index bbba2ca..6db2ce8 100644
--- a/devel/bin86/Makefile
+++ b/devel/bin86/Makefile
@@ -19,18 +19,18 @@ ONLY_FOR_ARCHS=	i386
 PLIST=		${WRKDIR}/pkg-plist
 
 post-extract:
-	find ${WRKSRC} -type f -print0 | xargs -0 ${CHMOD} 644
+	${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
 
 pre-install:
 	${RM} -f ${PLIST}
 	cd ${WRKSRC} && \
-		find -s ${WRKSRC} -perm 755 -type f -exec ${BASENAME} \{\} \; \
+		${FIND} -s ${WRKSRC} -perm 755 -type f -exec ${BASENAME} \{\} \; \
 			| ${SED} -e 's:^:bin/:' >> ${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/devel/codecrusader/Makefile b/devel/codecrusader/Makefile
index 5b41b3c..3f91b1d 100644
--- a/devel/codecrusader/Makefile
+++ b/devel/codecrusader/Makefile
@@ -83,9 +83,9 @@ post-extract:
 .endfor
 
 post-patch:
-	@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
+	@${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \
 		${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
-	@${ECHO} "\nLOADLIBS += ${PORTLIBS}" >> \
+	@${ECHO_CMD} "\nLOADLIBS += ${PORTLIBS}" >> \
 		${WRKSRC}/programs/${PORTNAME}/Make.header
 
 pre-build:
diff --git a/devel/codemedic/Makefile b/devel/codemedic/Makefile
index a6bfc88..d637956 100644
--- a/devel/codemedic/Makefile
+++ b/devel/codemedic/Makefile
@@ -76,9 +76,9 @@ post-extract:
 .endfor
 
 post-patch:
-	@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
+	@${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \
 		${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
-	@${ECHO} "\nLOADLIBS += ${PORTLIBS}" >> \
+	@${ECHO_CMD} "\nLOADLIBS += ${PORTLIBS}" >> \
 		${WRKSRC}/programs/${PORTNAME}/Make.header
 
 pre-build:
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index f01ef84..eaa4b60 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -49,17 +49,17 @@ post-configure:
 		${WRKSRC}/Makefile
 
 pre-install:
-	${ECHO} bin/cvsgraph > ${PLIST}
-	${ECHO} etc/cvsgraph.conf >> ${PLIST}
+	${ECHO_CMD} bin/cvsgraph > ${PLIST}
+	${ECHO_CMD} etc/cvsgraph.conf >> ${PLIST}
 .if !defined(NOPORTDOCS)
 .for i in ${DOCS}
-	${ECHO} ${DOCDIR}/${i} >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
 .endfor
 .for i in ${EXAMPLES}
-	${ECHO} share/examples/${PORTNAME}/${i} >> ${PLIST}
+	${ECHO_CMD} share/examples/${PORTNAME}/${i} >> ${PLIST}
 .endfor
-	${ECHO} @dirrm share/examples/${PORTNAME} >> ${PLIST}
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm share/examples/${PORTNAME} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index d0ace68..800843e 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -71,7 +71,7 @@ do-install:
 
 post-install:
 .if defined(PACKAGE_BUILDING)
-	${ECHO} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index d0ace68..800843e 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -71,7 +71,7 @@ do-install:
 
 post-install:
 .if defined(PACKAGE_BUILDING)
-	${ECHO} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index bb9ffb0..6cabede 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -27,9 +27,9 @@ MAN1=		ddd.1
 
 .if defined(MOTIFLIB)
 .if defined(MOTIF_STATIC)
-LIBXMDIR!=	${ECHO} ${MOTIFLIB} | sed -e 's/\/libXm\.a//g' | awk '{print $$1}'
+LIBXMDIR!=	${ECHO_CMD} ${MOTIFLIB} | ${SED} -e 's/\/libXm\.a//g' | ${AWK} '{print $$1}'
 .else
-LIBXMDIR!=	${ECHO} ${MOTIFLIB} | sed -e 's/-L//g' | awk '{print $$1}'
+LIBXMDIR!=	${ECHO_CMD} ${MOTIFLIB} | ${SED} -e 's/-L//g' | ${AWK} '{print $$1}'
 .endif
 .else
 LIBXMDIR=	${X11BASE}
@@ -40,11 +40,11 @@ pre-patch:
 	${RM} -fv ${WRKSRC}/ddd/ddd-themes.info*
 
 pre-configure:
-	@/usr/bin/find ${WRKSRC} -name configure | /usr/bin/xargs \
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} \
 		${PERL} -pi -e "s|-O2|-g|"
 
 post-configure:
-	${ECHO} "LIBXM = ${MOTIFLIB}" >> ${WRKSRC}/ddd/Makefile
+	${ECHO_CMD} "LIBXM = ${MOTIFLIB}" >> ${WRKSRC}/ddd/Makefile
 
 post-install:
 	@${RM} ${PREFIX}/lib/libiberty.a
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index 30fadee..719b90f 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -56,7 +56,7 @@ PLIST_SUB+=	LOADPATHSETUP:="@comment "
 .endif
 
 post-build:
-	@${ECHO} "(provide 'elib-startup)" >> ${WRKSRC}/${PORT_SETUPEL}
+	@${ECHO_CMD} "(provide 'elib-startup)" >> ${WRKSRC}/${PORT_SETUPEL}
 
 post-install:
 .if defined(INSTALL_LOADPATHSETUP)
diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index 64fbcb2..56e1cbe 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -31,7 +31,7 @@ MAN3=		bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \
 
 # X X X - I know, but it doesn't work with BSD iconv yet. :(((
 post-patch:
-	@/usr/bin/find ${WRKSRC} -type f | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
 		's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
 
 pre-configure:
@@ -48,10 +48,10 @@ CONFIGURE_ARGS=	--disable-shared
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/misc/gettextize \
 		${PREFIX}/bin/gettextize-new
-	@${ECHO} bin/gettextize-new > ${WRKDIR}/PLIST
+	@${ECHO_CMD} bin/gettextize-new > ${WRKDIR}/PLIST
 .for file in ${BINFILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin/${file}-new
-	@${ECHO} bin/${file}-new >> ${WRKDIR}/PLIST
+	@${ECHO_CMD} bin/${file}-new >> ${WRKDIR}/PLIST
 .endfor
 .else
 post-install:
diff --git a/devel/ilu/Makefile b/devel/ilu/Makefile
index b1ca73a..c8e89f8 100644
--- a/devel/ilu/Makefile
+++ b/devel/ilu/Makefile
@@ -65,10 +65,10 @@ post-patch:
 do-install:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	# Empty dir, but we really need it
-	${ECHO} @exec ${MKDIR} %D/ilu/lib/binding > ${PLIST}
-	${ECHO} @unexec ${RM} -r %D/ilu/lib/binding >> ${PLIST}
-	${ECHO} @exec ${CHMOD} 1777 %D/ilu/lib/binding >> ${PLIST}
-	${ECHO} @exec ${LDCONFIG} -m %D/ilu/lib >> ${PLIST}
+	${ECHO_CMD} @exec ${MKDIR} %D/ilu/lib/binding > ${PLIST}
+	${ECHO_CMD} @unexec ${RM} -r %D/ilu/lib/binding >> ${PLIST}
+	${ECHO_CMD} @exec ${CHMOD} 1777 %D/ilu/lib/binding >> ${PLIST}
+	${ECHO_CMD} @exec ${LDCONFIG} -m %D/ilu/lib >> ${PLIST}
 	# Empty dirs we don't need
 	${RMDIR} ${PREFIX}/ilu/man/man[358]
 	${RMDIR} ${PREFIX}/ilu/lisp
@@ -78,18 +78,18 @@ do-install:
 		| tail -r | ${GREP} -v lib/binding >> ${PLIST}
 	(cd ${PREFIX}/ilu/bin ; for file in * ; do \
 		${LN} -fs ${PREFIX}/ilu/bin/$$file ${PREFIX}/bin/. ; \
-		${ECHO} bin/$$file ; \
+		${ECHO_CMD} bin/$$file ; \
 		done) >> ${PLIST}
 	(cd ${PREFIX}/ilu/man/man1 ; for file in * ; do \
 		${LN} -fs ${PREFIX}/ilu/man/man1/$$file ${PREFIX}/man/man1/. ; \
-		${ECHO} man/man1/$$file ; \
+		${ECHO_CMD} man/man1/$$file ; \
 		done) >> ${PLIST}
-	${ECHO} etc/rc.d/50.ilu.sh >> ${PLIST}
+	${ECHO_CMD} etc/rc.d/50.ilu.sh >> ${PLIST}
 	${ECHO} "Installing ${startup_script} file"
 	test -d ${startup_dir} || ${MKDIR} ${startup_dir}
-	${ECHO} "#!/bin/sh" > ${startup_script}
-	${ECHO} "${ECHO} -n ' ILU-shlibs'" >> ${startup_script}
-	${ECHO} "${LDCONFIG} -m ${PREFIX}/ilu/lib" >> ${startup_script}
+	${ECHO_CMD} "#!/bin/sh" > ${startup_script}
+	${ECHO_CMD} "${ECHO_CMD} -n ' ILU-shlibs'" >> ${startup_script}
+	${ECHO_CMD} "${LDCONFIG} -m ${PREFIX}/ilu/lib" >> ${startup_script}
 	${CHMOD} 755 ${startup_script};
 	${startup_script}
 
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index a1cd206..979128c 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -29,7 +29,7 @@ INSTALL_TARGET=	install install.man
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 
 do-configure:
-	@${ECHO} > ${WRKSRC}/cf/host.def
+	@${ECHO_CMD} > ${WRKSRC}/cf/host.def
 	@(cd ${WRKDIR}/xc; \
 	  ${MAKE} Makefile.boot ; \
 	  ${MAKE} -f xmakefile SUBDIRS="include config" VerifyOS Makefiles includes)
diff --git a/devel/libtai/Makefile b/devel/libtai/Makefile
index 47335f4..bd2489b 100644
--- a/devel/libtai/Makefile
+++ b/devel/libtai/Makefile
@@ -32,9 +32,9 @@ PROGRAM_FILES=	easter nowutc leapsecs yearcal
 do-configure:
 	@${PERL} -pi -e "s!%%PREFIX%%!${PREFIX}!g" \
 		${WRKSRC}/leapsecs.3 ${WRKSRC}/leapsecs_read.c
-	@${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	@${ECHO} "${CC} -s" > ${WRKSRC}/conf-ld
-	@${ECHO} -fPIC -DPIC > ${WRKSRC}/conf-ccso
+	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} "${CC} -s" > ${WRKSRC}/conf-ld
+	@${ECHO_CMD} -fPIC -DPIC > ${WRKSRC}/conf-ccso
 
 do-install:
 	${INSTALL} ${COPY} -o ${SHAREOWN} -g ${BINGRP} -m 644 \
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 3dccddc..e70681f 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
 
 WRKSRC=		${WRKDIR}/mico
 
-MICOVER=	`${ECHO} ${DISTNAME} | ${SED} 's/mico-//'`
+MICOVER=	`${ECHO_CMD} ${DISTNAME} | ${SED} 's/mico-//'`
 
 .if defined(QT2)
 USE_QT_VER=	2
diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 884641d..e1a608d 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -95,11 +95,11 @@ do-install:
 
 post-install:
 .for f in ${BIN_FILES}
-	${ECHO} bin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
-	${ECHO} sbin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
-	${ECHO} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 884641d..e1a608d 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -95,11 +95,11 @@ do-install:
 
 post-install:
 .for f in ${BIN_FILES}
-	${ECHO} bin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
-	${ECHO} sbin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
-	${ECHO} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index 884641d..e1a608d 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -95,11 +95,11 @@ do-install:
 
 post-install:
 .for f in ${BIN_FILES}
-	${ECHO} bin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
-	${ECHO} sbin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
-	${ECHO} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index 884641d..e1a608d 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -95,11 +95,11 @@ do-install:
 
 post-install:
 .for f in ${BIN_FILES}
-	${ECHO} bin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
-	${ECHO} sbin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
-	${ECHO} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index 884641d..e1a608d 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -95,11 +95,11 @@ do-install:
 
 post-install:
 .for f in ${BIN_FILES}
-	${ECHO} bin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
-	${ECHO} sbin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
-	${ECHO} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Term-Screen/Makefile b/devel/p5-Term-Screen/Makefile
index 3b9c48c..532b4b7 100644
--- a/devel/p5-Term-Screen/Makefile
+++ b/devel/p5-Term-Screen/Makefile
@@ -29,9 +29,9 @@ do-install:
 	${MKDIR} ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Term
 	${INSTALL_SCRIPT} ${WRKSRC}/Screen.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Term
 	${MKDIR} ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/auto/Term/Screen
-	${ECHO} '${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Term/Screen.pm' >> \
+	${ECHO_CMD} '${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Term/Screen.pm' >> \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/auto/Term/Screen/.packlist
-	${ECHO} '${MAN3PREFIX}/man/man3/${MAN3}' >> \
+	${ECHO_CMD} '${MAN3PREFIX}/man/man3/${MAN3}' >> \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/auto/Term/Screen/.packlist
 
 .include <bsd.port.mk>
diff --git a/devel/pcl-cvs-emacs/Makefile b/devel/pcl-cvs-emacs/Makefile
index 68f6d0e..54481e5 100644
--- a/devel/pcl-cvs-emacs/Makefile
+++ b/devel/pcl-cvs-emacs/Makefile
@@ -84,15 +84,15 @@ pre-build:
 	${RM} ${WRKSRC}/pcl-cvs.info*
 
 post-build:
-	${ECHO} "(provide 'pcl-cvs-startup)" >> ${WRKSRC}/pcl-cvs-startup.el
+	${ECHO_CMD} "(provide 'pcl-cvs-startup)" >> ${WRKSRC}/pcl-cvs-startup.el
 
 pre-install:
 .if defined(ELIB_SETUP) && !empty(ELIB_SETUP)
-	${ECHO} ${ELIB_SETUP} >> ${INSTALL_WRKSRC}/${PORT_SETUPEL}
+	${ECHO_CMD} ${ELIB_SETUP} >> ${INSTALL_WRKSRC}/${PORT_SETUPEL}
 .endif
 
 post-install:
-	${ECHO} "(provide 'pcl-cvs-setup)" >> ${INSTALL_WRKSRC}/${PORT_SETUPEL}
+	${ECHO_CMD} "(provide 'pcl-cvs-setup)" >> ${INSTALL_WRKSRC}/${PORT_SETUPEL}
 	@${MAKE} setupel-install
 .if !defined(NOPORTDOCS)
 	@${MAKE} doc-install
diff --git a/devel/perforce/Makefile b/devel/perforce/Makefile
index 884641d..e1a608d 100644
--- a/devel/perforce/Makefile
+++ b/devel/perforce/Makefile
@@ -95,11 +95,11 @@ do-install:
 
 post-install:
 .for f in ${BIN_FILES}
-	${ECHO} bin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
-	${ECHO} sbin/${f} >> ${TMPPLIST}
+	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
-	${ECHO} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec /bin/rmdir ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/pmake/Makefile b/devel/pmake/Makefile
index 0d48354..a4ea39d 100644
--- a/devel/pmake/Makefile
+++ b/devel/pmake/Makefile
@@ -42,8 +42,8 @@ do-install::
 	@(cd ${WRKSRC}; ${SETENV} ${PMAKE_ENV} ${PREFIX}/bin/pmake new; \
 	  ${SETENV} ${PMAKE_ENV} ${PREFIX}/bin/pmake install)
 	@${ECHO} "Adding customs service to /etc/services..."
-	@${ECHO} -e 'customs\t\t8231/tcp\t# pmake customs server'>>/etc/services
-	@${ECHO} -e 'customs\t\t8231/udp\t# pmake customs server'>>/etc/services
+	@${ECHO_CMD} -e 'customs\t\t8231/tcp\t# pmake customs server'>>/etc/services
+	@${ECHO_CMD} -e 'customs\t\t8231/udp\t# pmake customs server'>>/etc/services
 .else
 do-install::
 	@(cd ${WRKSRC}/doc; ${SETENV} ${PMAKE_ENV} ${PREFIX}/bin/pmake)
diff --git a/devel/ruby-rreadline/Makefile b/devel/ruby-rreadline/Makefile
index e8957e3..080a6e7 100644
--- a/devel/ruby-rreadline/Makefile
+++ b/devel/ruby-rreadline/Makefile
@@ -20,8 +20,8 @@ RUBY_NO_BUILD_DEPENDS=	yes
 NO_BUILD=	yes
 
 post-extract:
-	${ECHO} '#!/bin/sh' > ${WRKSRC}/rbsh
-	${ECHO} 'ruby RubyShell.rb' >> ${WRKSRC}/rbsh
+	${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/rbsh
+	${ECHO_CMD} 'ruby RubyShell.rb' >> ${WRKSRC}/rbsh
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/*.rb ${RUBY_SITELIBDIR}/
diff --git a/devel/sdl10/Makefile b/devel/sdl10/Makefile
index 308ed4c..cb6933d 100644
--- a/devel/sdl10/Makefile
+++ b/devel/sdl10/Makefile
@@ -42,7 +42,7 @@ post-install:
 .for file in BUGS COPYING CREDITS README WhatsNew docs.html
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL
 .endfor
-	cd ${WRKSRC}/docs; tar cf - `${ECHO} [^M]*` | \
+	cd ${WRKSRC}/docs; ${TAR} cf - `${ECH_CMDO} [^M]*` | \
 		(cd ${PREFIX}/share/doc/SDL; ${TAR} --unlink -xf - )
 .endif
 
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index cd388f3..6c53a90 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -51,10 +51,10 @@ CONFIGURE_ARGS+=--enable-video-opengl
 
 .include <bsd.port.pre.mk>
 
-MAN3!=		/bin/cat ${FILESDIR}/man3
+MAN3!=		${CAT} ${FILESDIR}/man3
 
 pre-configure:
-	@find ${WRKSRC} -type f -name Makefile.in | xargs ${TOUCH}
+	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${TOUCH}
 
 post-configure:
 	@cd ${WRKSRC} && \
@@ -71,7 +71,7 @@ post-install:
 .for file in BUGS COPYING CREDITS README WhatsNew docs.html
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SDL11
 .endfor
-	@cd ${WRKSRC}/docs; tar cf - `${ECHO} [^Mm]*` | \
+	@cd ${WRKSRC}/docs; ${TAR} cf - `${ECHO_CMD} [^Mm]*` | \
 		(cd ${PREFIX}/share/doc/SDL11/docs; ${TAR} --unlink -xf - )
 .endif
 	@${DISPLAY_MSG}
diff --git a/devel/tcl-neo/Makefile b/devel/tcl-neo/Makefile
index f535621..4b0d4d5 100644
--- a/devel/tcl-neo/Makefile
+++ b/devel/tcl-neo/Makefile
@@ -32,7 +32,7 @@ MAKE_ENV+=	NEO_LIBRARY=${NEO_LIBRARY}
 DDIR=		${PREFIX}/lib/tcl${TCLV}/Trf
 
 post-build:
-	cd ${WRKSRC}/../neolibs && ${ECHO} 'auto_mkindex . */*.tcl' | tclsh8.3
+	cd ${WRKSRC}/../neolibs && ${ECHO_CMD} 'auto_mkindex . */*.tcl' | tclsh8.3
 
 NEO_LIBRARY=	${PREFIX}/lib/neo8.2