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.

35 files changed, 253 insertions, 253 deletions

diff --git a/lang/compaq-cc/Makefile b/lang/compaq-cc/Makefile
index 25f54a5..96d9d87 100644
--- a/lang/compaq-cc/Makefile
+++ b/lang/compaq-cc/Makefile
@@ -88,7 +88,7 @@ do-install:
 	    ; mkdir -p ${PREFIX}/lib					\
 	    ; cc -c ld-linux.c -o ${PREFIX}/lib/ld-linux.so.2		\
 # cpio creates directories with stupid permissions
-	find ${PREFIX}/usr/lib/compaq -type d | xargs ${CHMOD} 755
+	${FIND} ${PREFIX}/usr/lib/compaq -type d | xargs ${CHMOD} 755
 # tweaks to compile FreeBSD bits better
 	${MV} ${CCC_ROOT}/alpha-linux/bin/comp.config \
 		${CCC_ROOT}/alpha-linux/bin/comp.config.ORIG
@@ -99,56 +99,56 @@ do-install:
 	${MKDIR} ${CCC_ROOT}/alpha-freebsd/include
 	${MKDIR} ${CCC_ROOT}/alpha-freebsd/lib
 	cd ${FILESDIR}/include ; \
-		find . -print0 \
+		${FIND} . -print0 \
 		| cpio -dump0 -R root:wheel ${CCC_ROOT}/alpha-freebsd/include
 	cd ${CCC_ROOT}/alpha-freebsd/include ; ${LN} -sf machine/stdarg.h .
 
 post-install:
 # fixup PLIST for the FreeBSD bits
 	cd ${PREFIX} ;\
-	    find ${CCC_DIR}/alpha-freebsd -type f -o -type l \
+	    ${FIND} ${CCC_DIR}/alpha-freebsd -type f -o -type l \
 	    					>${WRKDIR}/PLIST.alpha-freebsd
 	cd ${PREFIX} ;\
-	    find ${CCC_DIR}/alpha-freebsd -type d \
-	    | sed -e 's/^/@dirrm /g' \
+	    ${FIND} ${CCC_DIR}/alpha-freebsd -type d \
+	    | ${SED} -e 's/^/@dirrm /g' \
 	    | sort -r				>>${WRKDIR}/PLIST.alpha-freebsd
-	${ECHO} "r ${TMPPLIST}"				>  ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.alpha-freebsd"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"					>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.alpha-freebsd"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"					>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"			>  ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.alpha-freebsd"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.alpha-freebsd"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-alpha-freebsd
 	cd ${WRKDIR} ; ex < ex.script
 # fixup PLIST for the AlphaLinux bits
 	cd ${PREFIX} ;\
-	    find ${CCC_DIR}/alpha-linux -type f -o -type l \
+	    ${FIND} ${CCC_DIR}/alpha-linux -type f -o -type l \
 	    					>${WRKDIR}/PLIST.alphalinux
-	${ECHO} "lib/ld-linux.so.2"		>>${WRKDIR}/PLIST.alphalinux
-	${ECHO} "@dirrm lib"		>>${WRKDIR}/PLIST.alphalinux
+	${ECHO_CMD} "lib/ld-linux.so.2"		>>${WRKDIR}/PLIST.alphalinux
+	${ECHO_CMD} "@dirrm lib"		>>${WRKDIR}/PLIST.alphalinux
 	cd ${PREFIX} ;\
-	    find ${CCC_DIR}/alpha-linux -type d \
-	    | sed -e 's/^/@dirrm /g' \
+	    ${FIND} ${CCC_DIR}/alpha-linux -type d \
+	    | ${SED} -e 's/^/@dirrm /g' \
 	    | sort -r				>>${WRKDIR}/PLIST.alphalinux
-	${ECHO} "r ${TMPPLIST}"				>  ${WRKDIR}/ex.script2
-	${ECHO} "/Insert PLIST.alphalinux"		>> ${WRKDIR}/ex.script2
-	${ECHO} "d"					>> ${WRKDIR}/ex.script2
-	${ECHO} "r ${WRKDIR}/PLIST.alphalinux"		>> ${WRKDIR}/ex.script2
-	${ECHO} "x!"					>> ${WRKDIR}/ex.script2
+	${ECHO_CMD} "r ${TMPPLIST}"			>  ${WRKDIR}/ex.script2
+	${ECHO_CMD} "/Insert PLIST.alphalinux"		>> ${WRKDIR}/ex.script2
+	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script2
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.alphalinux"	>> ${WRKDIR}/ex.script2
+	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script2
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-alphalinux
 	cd ${WRKDIR} ; ex < ex.script2
 # fixup PLIST for the docs bits
 	cd ${PREFIX} ;\
-	    find usr/doc/${CCC_REV:C/-1$//} -type f -o -type l \
+	    ${FIND} usr/doc/${CCC_REV:C/-1$//} -type f -o -type l \
 	    					>${WRKDIR}/PLIST.docs
 	cd ${PREFIX} ;\
-	    find usr/doc/${CCC_REV:C/-1$//} -type d \
-	    | sed -e 's/^/@dirrm /g' \
+	    ${FIND} usr/doc/${CCC_REV:C/-1$//} -type d \
+	    | ${SED} -e 's/^/@dirrm /g' \
 	    | sort -r				>>${WRKDIR}/PLIST.docs
-	${ECHO} "r ${TMPPLIST}"				>  ${WRKDIR}/ex.script3
-	${ECHO} "/Insert PLIST.docs"			>> ${WRKDIR}/ex.script3
-	${ECHO} "d"					>> ${WRKDIR}/ex.script3
-	${ECHO} "r ${WRKDIR}/PLIST.docs"		>> ${WRKDIR}/ex.script3
-	${ECHO} "x!"					>> ${WRKDIR}/ex.script3
+	${ECHO_CMD} "r ${TMPPLIST}"			>  ${WRKDIR}/ex.script3
+	${ECHO_CMD} "/Insert PLIST.docs"		>> ${WRKDIR}/ex.script3
+	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script3
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.docs"		>> ${WRKDIR}/ex.script3
+	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script3
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-docs
 	cd ${WRKDIR} ; ex < ex.script3
 
diff --git a/lang/cyclone/Makefile b/lang/cyclone/Makefile
index f92c194..839d209 100644
--- a/lang/cyclone/Makefile
+++ b/lang/cyclone/Makefile
@@ -39,7 +39,7 @@ post-patch:
 .endif
 
 do-configure:
-	@cd ${CONFIGURE_WRKSRC} && ${ECHO} y | ./configure ${CONFIGURE_ARGS}
+	@cd ${CONFIGURE_WRKSRC} && ${ECHO_CMD} y | ./configure ${CONFIGURE_ARGS}
 
 post-build:
 .for target in cyclone_src update build test
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 2ca5941..5cedf96 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -80,8 +80,8 @@ post-install:
 	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
 		do strip $$prog ; \
 		done)
-	ln -f ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
-	ln -f ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
+	${LN} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
+	${LN} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
@@ -94,13 +94,13 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} \
+	    ${FIND} lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} \
 		-type f -o -type l >${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/eperl/Makefile b/lang/eperl/Makefile
index 3a50660..f1e0090 100644
--- a/lang/eperl/Makefile
+++ b/lang/eperl/Makefile
@@ -33,11 +33,11 @@ CONFIGURE_ARGS= --with-perl=${PERL5}
 MAN1=	eperl.1
 
 test:
-	@(cd ${WRKSRC}; make test)
+	@(cd ${WRKSRC}; ${MAKE} test)
 
 post-patch:
-	@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l strnstr | \
-		xargs ${PERL} -pi -e 's|strnstr|ePerl_strnstr|g'
+	@${FIND} ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l strnstr | \
+		${XARGS} ${PERL} -pi -e 's|strnstr|ePerl_strnstr|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/eperl ${PREFIX}/bin/eperl
@@ -54,9 +54,9 @@ do-install:
 	fi
 	${INSTALL_PROGRAM} ${WRKSRC}/eperl ${PREFIX}/www/cgi-bin/nph-eperl
 	@if [ ".`${GREP} x-httpd-eperl ${PREFIX}/etc/apache/srm.conf`" = . ]; then \
-		${ECHO} "AddType  application/x-httpd-eperl  .phtml .eperl .epl" \
+		${ECHO_CMD} "AddType  application/x-httpd-eperl  .phtml .eperl .epl" \
 			>>${PREFIX}/etc/apache/srm.conf; \
-		${ECHO} "Action   application/x-httpd-eperl  /cgi-bin/nph-eperl" \
+		${ECHO_CMD} "Action   application/x-httpd-eperl  /cgi-bin/nph-eperl" \
 			>>${PREFIX}/etc/apache/srm.conf; \
 		${ECHO} "Added knowledge about ePerl to Apache's srm.conf"; \
 	else \
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 908e13b..9e2f28e 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -81,8 +81,8 @@ SCRIPT_ENV+=    PATH=${PATH}:${JAVABINDIR}
 # If X11 is not used, skip gs and etk applications.
 pre-build:
 .if defined(WITHOUT_X11)
-	${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP
-	${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/SKIP
+	${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP
+	${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/SKIP
 .endif
 
 # Check if javac is really in ${JAVABINDIR}.
@@ -139,20 +139,20 @@ post-install:
 .endif
 	sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
 	cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock
-	@cd ${PREFIX} ; find lib/erlang/* -type f -o -type l \
+	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \
 		| ${GREP} -v "^lib/erlang/man" \
 		| sort \
 		> ${WRKDIR}/PLIST.lib-erlang
-	@cd ${PREFIX} ; find lib/erlang/* -type d | sort -r \
+	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \
 		| ${GREP} -v "^lib/erlang/man" \
 	    	| ${SED} -e 's/^/@dirrm /g' \
 		>> ${WRKDIR}/PLIST.lib-erlang
 
-	@${ECHO} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
-	@${ECHO} "/Insert PLIST.lib-erlang"	>> ${WRKDIR}/ex.script
-	@${ECHO} "d"				>> ${WRKDIR}/ex.script
-	@${ECHO} "r ${WRKDIR}/PLIST.lib-erlang"	>> ${WRKDIR}/ex.script
-	@${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Insert PLIST.lib-erlang"		>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/PLIST.lib-erlang"	>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 	@${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-erlang
 	@cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 908e13b..9e2f28e 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -81,8 +81,8 @@ SCRIPT_ENV+=    PATH=${PATH}:${JAVABINDIR}
 # If X11 is not used, skip gs and etk applications.
 pre-build:
 .if defined(WITHOUT_X11)
-	${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP
-	${ECHO} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/SKIP
+	${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/gs/SKIP
+	${ECHO_CMD} "WITHOUT_X11 defined" > ${WRKSRC}/lib/etk/SKIP
 .endif
 
 # Check if javac is really in ${JAVABINDIR}.
@@ -139,20 +139,20 @@ post-install:
 .endif
 	sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
 	cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock
-	@cd ${PREFIX} ; find lib/erlang/* -type f -o -type l \
+	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type f -o -type l \
 		| ${GREP} -v "^lib/erlang/man" \
 		| sort \
 		> ${WRKDIR}/PLIST.lib-erlang
-	@cd ${PREFIX} ; find lib/erlang/* -type d | sort -r \
+	@cd ${PREFIX} ; ${FIND} lib/erlang/* -type d | sort -r \
 		| ${GREP} -v "^lib/erlang/man" \
 	    	| ${SED} -e 's/^/@dirrm /g' \
 		>> ${WRKDIR}/PLIST.lib-erlang
 
-	@${ECHO} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
-	@${ECHO} "/Insert PLIST.lib-erlang"	>> ${WRKDIR}/ex.script
-	@${ECHO} "d"				>> ${WRKDIR}/ex.script
-	@${ECHO} "r ${WRKDIR}/PLIST.lib-erlang"	>> ${WRKDIR}/ex.script
-	@${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Insert PLIST.lib-erlang"		>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/PLIST.lib-erlang"	>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 	@${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-erlang
 	@cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/f77/Makefile b/lang/f77/Makefile
index 44d09c3..375427a 100644
--- a/lang/f77/Makefile
+++ b/lang/f77/Makefile
@@ -38,7 +38,7 @@ MAN1=		${F77NAME}.1
 PLIST=		${WRKDIR}/PLIST
 
 do-install:
-	@${ECHO} 'bin/${F77NAME}' > ${PLIST}
+	@${ECHO_CMD} 'bin/${F77NAME}' > ${PLIST}
 	${INSTALL_PROGRAM} ${WRKSRC}/f77 ${PREFIX}/bin/${F77NAME}
 	@${SED} -e 's/F77/${F77NAME}/g' -e 's/f77/${F77NAME}/g' \
 	${WRKSRC}/f77.1  > ${WRKSRC}/${F77NAME}.1
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 834ee87..136f549 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -103,13 +103,13 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV} \
+	    ${FIND} lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV} \
 		-type f -o -type l >${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 7b3f391..f71cb67 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -66,8 +66,8 @@ pre-fetch:
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	@touch ${SRCDIR}/gcc/configure
-	@touch ${SRCDIR}/gcc/cstamp-h.in
+	@${TOUCH} ${SRCDIR}/gcc/configure
+	@${TOUCH} ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 
@@ -94,7 +94,7 @@ post-install:
 	done )
 .for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
 	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}30
-	-( test -e ${PREFIX}/man/man1/${file}.1 \
+	-( ${TEST} -e ${PREFIX}/man/man1/${file}.1 \
 		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
 		${PREFIX}/man/man1/${file}30.1 )
 .endfor
@@ -115,17 +115,17 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	(${ECHO} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index c5b257e..1c3c528 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -118,16 +118,16 @@ post-install:
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
 	    	>${WRKDIR}/PLIST.gcc-lib
 	cd ${PREFIX} ;\
-	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
-	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
-	${ECHO} "d"				>> ${WRKDIR}/ex.script
-	${ECHO} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
-	${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
 
diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile
index aea0f5d..13ca553 100644
--- a/lang/gnat/Makefile
+++ b/lang/gnat/Makefile
@@ -51,18 +51,18 @@ MAN1=		adagcc.1 cccp.1
 # For the GNAT compiler, we look in ${PREFIX} and in ${LOCALBASE}.
 .ifdef PREFIX
 have_boot!=	if [ -x ${PREFIX}/bin/adagcc -a -x ${PREFIX}/bin/gnatbind ]; then \
-			${ECHO} "${PREFIX}/bin"; \
+			${ECHO_CMD} "${PREFIX}/bin"; \
 		else \
-			${ECHO} ""; \
+			${ECHO_CMD} ""; \
 		fi
 .else
 have_boot=
 .endif
 .if empty(have_boot)
 have_boot!=	if [ -x ${LOCALBASE}/bin/adagcc -a -x ${LOCALBASE}/bin/gnatbind ]; then \
-			${ECHO} "${LOCALBASE}/bin"; \
+			${ECHO_CMD} "${LOCALBASE}/bin"; \
 		else \
-			${ECHO} ""; \
+			${ECHO_CMD} ""; \
 		fi
 .endif
 
@@ -70,19 +70,19 @@ have_boot!=	if [ -x ${LOCALBASE}/bin/adagcc -a -x ${LOCALBASE}/bin/gnatbind ]; t
 # Check for attempts to cross-compile or build an aout GNAT compiler.
 .if empty(have_boot)
 have_boot!=	if [ ${PORTOBJFORMAT} = "aout" ]; then \
-			${ECHO} "borken for aout"; \
+			${ECHO_CMD} "borken for aout"; \
 		else \
-			${ECHO} ""; \
+			${ECHO_CMD} ""; \
 		fi
 .else
 have_boot!=	if [ `file ${have_boot}/adagcc | awk ' { print $$2 }'` = "ELF" ]; then \
 			if [ ${PORTOBJFORMAT} = "elf" ]; then \
-				${ECHO} ${have_boot}; \
+				${ECHO_CMD} ${have_boot}; \
 			else \
-				${ECHO} "borken for aout"; \
+				${ECHO_CMD} "borken for aout"; \
 			fi \
 		else \
-			${ECHO} "borken for aout"; \
+			${ECHO_CMD} "borken for aout"; \
 		fi
 .endif
 
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index 88cd473..729710a 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -33,8 +33,8 @@ post-extract:
 
 do-build:
 	( \
-	${ECHO} '#!/bin/sh'; \
-	${ECHO} 'exec ${JAVA} -jar ${PREFIX}/share/java/classes/jruby.jar "$$@"'; \
+	${ECHO_CMD} '#!/bin/sh'; \
+	${ECHO_CMD} 'exec ${JAVA} -jar ${PREFIX}/share/java/classes/jruby.jar "$$@"'; \
 	) > ${WRKSRC}/jruby
 
 do-install:
@@ -50,8 +50,8 @@ post-install:
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}; find ${FILES} -type f | sort | ${SED} 's,^,share/java/${PORTNAME}/,' >> ${TMPPLIST}
 	cd ${WRKSRC}; find ${FILES} -type d | sort -r | ${SED} 's,^,@dirrm share/java/${PORTNAME}/,' >> ${TMPPLIST}
-	${ECHO} '@dirrm share/java/${PORTNAME}' >> ${TMPPLIST}
+	${ECHO_CMD} '@dirrm share/java/${PORTNAME}' >> ${TMPPLIST}
 .endif
-	${ECHO} '@unexec ${RMDIR} %D/share/java 2> /dev/null || true' >> ${TMPPLIST}
+	${ECHO_CMD} '@unexec ${RMDIR} %D/share/java 2> /dev/null || true' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/lang/klone/Makefile b/lang/klone/Makefile
index df860df..24acff6 100644
--- a/lang/klone/Makefile
+++ b/lang/klone/Makefile
@@ -22,7 +22,7 @@ do-configure:
 		-e 's:%%CFLAGS%%:${CFLAGS}:' \
 		${FILESDIR}/freebsd > ${WRKSRC}/Configs/freebsd
 	@${CP} -f ${WRKSRC}/Configs/freebsd ${WRKSRC}/Config.freebsd
-	@${ECHO} "freebsd" > ${WRKSRC}/.dir
+	@${ECHO_CMD} "freebsd" > ${WRKSRC}/.dir
 	@${RM} -f makefile
 
 do-install:
diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile
index b2dad34..c8a1bac 100644
--- a/lang/mozart/Makefile
+++ b/lang/mozart/Makefile
@@ -59,16 +59,16 @@ post-install:
 	@${MV} ${PREFIX}/lib/oz/mozart/doc ${PREFIX}/lib/oz
 	@${RM} -rf ${PREFIX}/lib/oz/mozart
 .endif
-	@cd ${PREFIX} ; find lib/oz -type f -o -type l | sort \
+	@cd ${PREFIX} ; ${FIND} lib/oz -type f -o -type l | sort \
 		> ${WRKDIR}/PLIST.lib-oz
-	@cd ${PREFIX} ; find lib/oz -type d | sort -r \
+	@cd ${PREFIX} ; ${FIND} lib/oz -type d | sort -r \
 	    	| ${SED} -e 's/^/@dirrm /g' \
 		>> ${WRKDIR}/PLIST.lib-oz
-	@${ECHO} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
-	@${ECHO} "/Insert PLIST.lib-oz"		>> ${WRKDIR}/ex.script
-	@${ECHO} "d"				>> ${WRKDIR}/ex.script
-	@${ECHO} "r ${WRKDIR}/PLIST.lib-oz"	>> ${WRKDIR}/ex.script
-	@${ECHO} "x!"				>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Insert PLIST.lib-oz"	>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "d"			>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/PLIST.lib-oz"	>> ${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	@${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-oz
 	@cd ${WRKDIR} ; ex < ex.script
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/php_doc/Makefile b/lang/php_doc/Makefile
index 19408c5..2f2508d 100644
--- a/lang/php_doc/Makefile
+++ b/lang/php_doc/Makefile
@@ -77,7 +77,7 @@ localfetch:
 	cd ${LOCAL_TMPDIR}/${lang} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${LOCAL_DISTDIR}/php_manual_${lang}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
 
 	(cd ${LOCAL_TMPDIR}/${lang} && /bin/ls -1) | ${PERL} -pe 'print "%%PHPDOCDIR%%/$_";' > ${.CURDIR}/pkg-plist.${lang}
-	${ECHO} "@dirrm %%PHPDOCDIR%%" >> ${.CURDIR}/pkg-plist.${lang}
+	${ECHO_CMD} "@dirrm %%PHPDOCDIR%%" >> ${.CURDIR}/pkg-plist.${lang}
 	${RM} -rf ${LOCAL_TMPDIR}/${lang}
 .endfor
 
diff --git a/lang/smalleiffel-devel/Makefile b/lang/smalleiffel-devel/Makefile
index 5b7cd5c..c391c51 100644
--- a/lang/smalleiffel-devel/Makefile
+++ b/lang/smalleiffel-devel/Makefile
@@ -35,8 +35,8 @@ ALIASDIR=	${PREFIX}/SmallEiffel
 # Make sure we can set the symbolic link SmallEiffel
 # to the actual release directory.
 do-install:
-	@(if test -e ${ALIASDIR} ; then \
-	    if ! test -L ${ALIASDIR} ; then \
+	@(if ${TEST} -e ${ALIASDIR} ; then \
+	    if ! ${TEST} -L ${ALIASDIR} ; then \
 		${ECHO} "Make sure ${ALIASDIR} is a symbolic link"; \
 		${ECHO} "or does not exist. This directory will point to "; \
 		${ECHO} "the actual SmallEiffel installation directory."; \
@@ -45,16 +45,16 @@ do-install:
 	    ${RM} ${ALIASDIR}; \
 	fi; \
 	${LN} -fs ${SEDIR} ${ALIASDIR})
-	@(if test -e ${SEDIR} ; then ${RM} -rf ${SEDIR}; fi; \
+	@(if ${TEST} -e ${SEDIR} ; then ${RM} -rf ${SEDIR}; fi; \
 	    ${MKDIR} ${SEDIR}; \
 	    ${CP} -pR ${WRKSRC}/* ${SEDIR}; \
-	    ${ECHO} ./ > ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_std/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_iterator/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_random/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX)
+	    ${ECHO_CMD} ./ > ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_std/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_iterator/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_random/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX)
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \
 		> ${PKGMESSAGE}
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \
diff --git a/lang/smalleiffel/Makefile b/lang/smalleiffel/Makefile
index fa6c731..486ca3a 100644
--- a/lang/smalleiffel/Makefile
+++ b/lang/smalleiffel/Makefile
@@ -34,8 +34,8 @@ PKGINSTALL=	${WRKDIR}/INSTALL
 # Make sure we can set the symbolic link SmallEiffel
 # to the actual release directory.
 do-install:
-	@(if test -e ${ALIASDIR} ; then \
-	    if ! test -L ${ALIASDIR} ; then \
+	@(if ${TEST} -e ${ALIASDIR} ; then \
+	    if ! ${TEST} -L ${ALIASDIR} ; then \
 		${ECHO} "Make sure ${ALIASDIR} is a symbolic link"; \
 		${ECHO} "or does not exist. This directory will point to "; \
 		${ECHO} "the actual SmallEiffel installation directory."; \
@@ -44,16 +44,16 @@ do-install:
 	    ${RM} ${ALIASDIR}; \
 	fi; \
 	${LN} -fs ${SEDIR} ${ALIASDIR})
-	@(if test -e ${SEDIR} ; then ${RM} -rf ${SEDIR}; fi; \
+	@(if ${TEST} -e ${SEDIR} ; then ${RM} -rf ${SEDIR}; fi; \
 	    ${MKDIR} ${SEDIR}; \
 	    ${CP} -pR ${WRKSRC}/* ${SEDIR}; \
-	    ${ECHO} ./ > ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_std/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_iterator/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_random/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX)
+	    ${ECHO_CMD} ./ > ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_std/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_iterator/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_random/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX)
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \
 		> ${PKGMESSAGE}
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \
diff --git a/lang/smarteiffel/Makefile b/lang/smarteiffel/Makefile
index fa6c731..486ca3a 100644
--- a/lang/smarteiffel/Makefile
+++ b/lang/smarteiffel/Makefile
@@ -34,8 +34,8 @@ PKGINSTALL=	${WRKDIR}/INSTALL
 # Make sure we can set the symbolic link SmallEiffel
 # to the actual release directory.
 do-install:
-	@(if test -e ${ALIASDIR} ; then \
-	    if ! test -L ${ALIASDIR} ; then \
+	@(if ${TEST} -e ${ALIASDIR} ; then \
+	    if ! ${TEST} -L ${ALIASDIR} ; then \
 		${ECHO} "Make sure ${ALIASDIR} is a symbolic link"; \
 		${ECHO} "or does not exist. This directory will point to "; \
 		${ECHO} "the actual SmallEiffel installation directory."; \
@@ -44,16 +44,16 @@ do-install:
 	    ${RM} ${ALIASDIR}; \
 	fi; \
 	${LN} -fs ${SEDIR} ${ALIASDIR})
-	@(if test -e ${SEDIR} ; then ${RM} -rf ${SEDIR}; fi; \
+	@(if ${TEST} -e ${SEDIR} ; then ${RM} -rf ${SEDIR}; fi; \
 	    ${MKDIR} ${SEDIR}; \
 	    ${CP} -pR ${WRKSRC}/* ${SEDIR}; \
-	    ${ECHO} ./ > ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_std/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_iterator/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_random/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \
-	    ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX)
+	    ${ECHO_CMD} ./ > ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_std/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_iterator/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_random/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \
+	    ${ECHO_CMD} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX)
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \
 		> ${PKGMESSAGE}
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \
diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index b0e12fd..29c5178 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -111,9 +111,9 @@ post-extract:
 do-configure:
 	test -f "${WRKDIR}/config/targets.orig" || \
 	${MV} "${WRKDIR}/config/targets" "${WRKDIR}/config/targets.orig"
-	${ECHO} -n > ${WRKDIR}/.tmp.sed
+	${ECHO_CMD} -n > ${WRKDIR}/.tmp.sed
 .for t in ${MLTARGETS}
-	${ECHO} '/^#TARGETS="\$$TARGETS[ 	]+${t}"$$/s/#//' >> ${WRKDIR}/.tmp.sed
+	${ECHO_CMD} '/^#TARGETS="\$$TARGETS[ 	]+${t}"$$/s/#//' >> ${WRKDIR}/.tmp.sed
 .endfor
 	${SED} -E -f ${WRKDIR}/.tmp.sed "${WRKDIR}/config/targets.orig" \
 	> "${WRKDIR}/config/targets"
@@ -139,8 +139,8 @@ do-build:
 .endif
 .if defined(WITH_RECOMPILE) || defined(WITH_FLINT)
 	cd ${WRKDIR}/src/system && ( \
-	${ECHO} 'CM.autoload "$$smlnj/cmb.cm";' ; \
-	${ECHO} 'CMB.make ();' ) | \
+	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
+	${ECHO_CMD} 'CMB.make ();' ) | \
 	../../bin/sml && \
 	./makeml && \
 	./installml &&