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.

12 files changed, 27 insertions, 27 deletions

diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index 630f4ea6cd7c..4392d06e97cb 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -162,14 +162,14 @@ pre-install:
 	@${ECHO} "==>  Creating custom pkg-plist..."
 	@${RM} -rf ${PLIST}
 .if !defined(NOPORTDOCS)
-	@for docfile in $(AFBACKUP_DOCS:S/^/share\/doc\/${PORTNAME}\//); do ${ECHO} $$docfile >>${PLIST}; done
+	@for docfile in $(AFBACKUP_DOCS:S/^/share\/doc\/${PORTNAME}\//); do ${ECHO_CMD} $$docfile >>${PLIST}; done
 .endif
 	@for plistfile in ${PLIST_SRC}; do ${CAT} ${FILESDIR}/$$plistfile >>${PLIST}; done
 	@${CAT} ${PLIST} | perl -nle 'print unless $$lines{$$_}++' >${PLIST}.tmp
 	@${CAT} ${PLIST}.tmp ${FILESDIR}/pkg-plist.fixedorder >${PLIST}
 .if !defined(NOPORTDOCS)
-	@${ECHO} @cwd ${PREFIX} >>${PLIST}
-	@${ECHO} @dirrm share/doc/${PORTNAME} >>${PLIST}
+	@${ECHO_CMD} @cwd ${PREFIX} >>${PLIST}
+	@${ECHO_CMD} @dirrm share/doc/${PORTNAME} >>${PLIST}
 .endif
 	@$(PKGINSTALL_ENV) ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
diff --git a/misc/compat22/Makefile b/misc/compat22/Makefile
index 190cc1786cec..6f897b522fd0 100644
--- a/misc/compat22/Makefile
+++ b/misc/compat22/Makefile
@@ -39,7 +39,7 @@ do-extract:
 	cd ${_DISTDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR}
 
 do-build:
-	@( ${ECHO} '#!/bin/sh'; ${ECHO} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
+	@( ${ECHO_CMD} '#!/bin/sh'; ${ECHO_CMD} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
 	) > ${WRKDIR}/000.${PORTNAME}.sh
 
 do-install:
diff --git a/misc/compat3x/Makefile b/misc/compat3x/Makefile
index 8827893646b8..82b111ba92b9 100644
--- a/misc/compat3x/Makefile
+++ b/misc/compat3x/Makefile
@@ -69,7 +69,7 @@ do-extract:
 	fi
 
 do-build:
-	@( ${ECHO} '#!/bin/sh'; ${ECHO} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
+	@( ${ECHO_CMD} '#!/bin/sh'; ${ECHO_CMD} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
 	) > ${WRKDIR}/000.${PORTNAME}.sh
 
 do-install:
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index bdfbadc8c9e4..c51586d5d122 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -90,7 +90,7 @@ do-extract:
 .endif
 
 do-build:
-	@( ${ECHO} '#!/bin/sh'; ${ECHO} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
+	@( ${ECHO_CMD} '#!/bin/sh'; ${ECHO_CMD} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
 	) > ${WRKDIR}/000.${PORTNAME}.sh
 
 do-install:
diff --git a/misc/libh/Makefile b/misc/libh/Makefile
index 1a3c630ebc6c..f489b976736f 100644
--- a/misc/libh/Makefile
+++ b/misc/libh/Makefile
@@ -29,7 +29,7 @@ DISTFILES!=	${CAT} ${FILESDIR}/distfiles
 CVS_CMD?=	cvs -z3
 # arbitrary date for now.
 CVS_DATE=	Thu December 21 18:20:00 GMT 2001
-CVS_DATE_!=	${ECHO} -n "${CVS_DATE}" | ${SED} 's/[ \t:]/_/g'
+CVS_DATE_!=	${ECHO_CMD} -n "${CVS_DATE}" | ${SED} 's/[ \t:]/_/g'
 CVS_SITES?=	:pserver:anonymous@usw4.freebsd.org:/home/libh/cvs
 STAMPFILE=	${DISTDIR}/${DISTNAME}/.stamp
 
@@ -50,7 +50,7 @@ do-fetch:
 			cd ${DISTDIR}; \
 			${TAR} xfz ${DISTNAME}.${CVS_DATE_}.tar.gz \
 				${DISTFILES}; \
-			${ECHO} -n "${CVS_DATE}" > ${STAMPFILE}; \
+			${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE}; \
 			exit; \
 		fi; \
 		unset CVS_RSH CVS_SERVER CVS_LOGIN || ${TRUE}; \
@@ -80,7 +80,7 @@ do-fetch:
 				if [ "X$${CVS_LOGIN}" = "Xyes" ]; then \
 					${CVS_CMD} -d $${CVS_SITE} logout < /dev/null; \
 				fi; \
-				${ECHO} -n ${CVS_DATE} > ${STAMPFILE}; \
+				${ECHO_CMD} -n ${CVS_DATE} > ${STAMPFILE}; \
 				${ECHO_MSG} ">> CVS checkout successful." ;\
 				exit; \
 			fi ;\
diff --git a/misc/lile/Makefile b/misc/lile/Makefile
index 30d1748c88cb..ea4d93a456a6 100644
--- a/misc/lile/Makefile
+++ b/misc/lile/Makefile
@@ -20,6 +20,6 @@ MAN1=		ile.1
 do-configure:
 	@(cd ${WRKSRC}; ${MV} Makefile Makefile.old; \
 	${SED} -e s:/usr/local:${PREFIX}: <Makefile.old > Makefile; \
-	${ECHO} all: ile >> Makefile; ${ECHO} CC=cc ${CFLAGS} >> Makefile)
+	${ECHO_CMD} all: ile >> Makefile; ${ECHO_CMD} CC=cc ${CFLAGS} >> Makefile)
 
 .include <bsd.port.mk>
diff --git a/misc/man.el/Makefile b/misc/man.el/Makefile
index e3d1979a5781..2e62aacdf524 100644
--- a/misc/man.el/Makefile
+++ b/misc/man.el/Makefile
@@ -32,9 +32,9 @@ do-install:
 	${MKDIR} ${SITEPKGDIR}/lisp/${f}
 	${LN} -sf ${ELISPDIR}/${f}.el ${SITEPKGDIR}/lisp/${f}/${f}.el
 	${LN} -sf ${ELISPDIR}/i18n-man.el ${SITEPKGDIR}/lisp/${f}/i18n-man.el
-	${ECHO} "pkginfo/MANIFEST.${f}" > ${SITEPKGDIR}/pkginfo/MANIFEST.${f}
-	${ECHO} "lisp/${f}/${f}.el" >> ${SITEPKGDIR}/pkginfo/MANIFEST.${f}
-	${ECHO} "lisp/${f}/i18n-man.el" >> ${SITEPKGDIR}/pkginfo/MANIFEST.${f}
+	${ECHO_CMD} "pkginfo/MANIFEST.${f}" > ${SITEPKGDIR}/pkginfo/MANIFEST.${f}
+	${ECHO_CMD} "lisp/${f}/${f}.el" >> ${SITEPKGDIR}/pkginfo/MANIFEST.${f}
+	${ECHO_CMD} "lisp/${f}/i18n-man.el" >> ${SITEPKGDIR}/pkginfo/MANIFEST.${f}
 .endfor
 	${INSTALL_SCRIPT} ${FILESDIR}/byte-compile ${PREFIX}/share/doc/i18n-man
 
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index b6df70df3e42..08dc1ac3414c 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -45,7 +45,7 @@ pre-patch:
 PLIST=		${WRKDIR}/PLIST
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist > ${PLIST}
-	@${ECHO} bin/mcedit >> ${PLIST}
+	@${ECHO_CMD} bin/mcedit >> ${PLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/patanjali/Makefile b/misc/patanjali/Makefile
index ef948beb01ad..cb0470bf7e55 100644
--- a/misc/patanjali/Makefile
+++ b/misc/patanjali/Makefile
@@ -27,8 +27,8 @@ do-build:
 		-DVERSION=\"1.0\" ${WRKSRC}/patanjali.c -o ${WRKSRC}/patanjali
 
 pre-install:
-	${ECHO} bin/patanjali > ${PLIST}
-	${ECHO} share/patanjali/patanjali-sutras-english.txt >> ${PLIST}
+	${ECHO_CMD} bin/patanjali > ${PLIST}
+	${ECHO_CMD} share/patanjali/patanjali-sutras-english.txt >> ${PLIST}
 
 do-install:
 	${MKDIR} ${DATADIR}
diff --git a/misc/sword-modules/Makefile b/misc/sword-modules/Makefile
index b6f4297eadbb..e090de95cdfd 100644
--- a/misc/sword-modules/Makefile
+++ b/misc/sword-modules/Makefile
@@ -70,12 +70,12 @@ post-install:
 	 for i in ${MODULE_FILES}; do \
 		tfiles=`${EXTRACT_CMD} -Z -1 ${DISTDIR}/${DIST_SUBDIR}/$${i}`; \
 		for j in $${tfiles}; do \
-			${ECHO} "share/sword/$${j}" >>${TMPPLIST}; \
-			if [ "`${ECHO} $${j} | ${GREP} -v mods.d`" ]; then \
+			${ECHO_CMD} "share/sword/$${j}" >>${TMPPLIST}; \
+			if [ "`${ECHO_CMD} $${j} | ${GREP} -v mods.d`" ]; then \
 				dirn=`${DIRNAME} $${j}`; \
 				while [ "$${dirn}" -a "$${dirn}" != "." -a \
 					"$${dirn}" != "/" ]; do \
-					if [ ! "`${ECHO} \"$${tdirs}\" | ${GREP} \"$${dirn} \"`" ]; then \
+					if [ ! "`${ECHO_CMD} \"$${tdirs}\" | ${GREP} \"$${dirn} \"`" ]; then \
 						tdirs="$${tdirs}$${dirn} "; \
 					fi; \
 					dirn=`${DIRNAME} $${dirn}`; \
@@ -85,8 +85,8 @@ post-install:
 	 done; \
 	 ksorted=`for k in $${tdirs}; do printf "%s\n" $${k}; done | ${SORT} -r -t" "`;\
 	 for j in $${ksorted}; do \
-		${ECHO} "@dirrm share/sword/$${j}" >>${TMPPLIST}; \
+		${ECHO_CMD} "@dirrm share/sword/$${j}" >>${TMPPLIST}; \
 	 done; \
-	 ${ECHO} "@dirrm share/sword/mods.d" >>${TMPPLIST};
+	 ${ECHO_CMD} "@dirrm share/sword/mods.d" >>${TMPPLIST};
 
 .include <bsd.port.mk>
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index d8b0d13efcf6..a025c3492fc8 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -34,14 +34,14 @@ INCLUDES=	Greek2Greek.h GreekChars.h canon.h cipherfil.h defs.h \
 		zipcomprs.h zlib.h ztext.h zverse.h
 
 pre-build:
-	@${ECHO} "instdir:=	${PREFIX}" >${WRKSRC}/localport.cfg
+	@${ECHO_CMD} "instdir:=	${PREFIX}" >${WRKSRC}/localport.cfg
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.a ${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.so ${PREFIX}/lib/libsword.so.1
 	${LN} -sf ${PREFIX}/lib/libsword.so.1 ${PREFIX}/lib/libsword.so
-	@${ECHO} "[Install]" >${PREFIX}/etc/sword.conf
-	@${ECHO} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf
+	@${ECHO_CMD} "[Install]" >${PREFIX}/etc/sword.conf
+	@${ECHO_CMD} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf
 	${MKDIR} ${DATADIR}
 	${MKDIR} ${PREFIX}/include/sword
 .for file in ${INCLUDES}
diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile
index d8b0d13efcf6..a025c3492fc8 100644
--- a/misc/sword15/Makefile
+++ b/misc/sword15/Makefile
@@ -34,14 +34,14 @@ INCLUDES=	Greek2Greek.h GreekChars.h canon.h cipherfil.h defs.h \
 		zipcomprs.h zlib.h ztext.h zverse.h
 
 pre-build:
-	@${ECHO} "instdir:=	${PREFIX}" >${WRKSRC}/localport.cfg
+	@${ECHO_CMD} "instdir:=	${PREFIX}" >${WRKSRC}/localport.cfg
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.a ${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.so ${PREFIX}/lib/libsword.so.1
 	${LN} -sf ${PREFIX}/lib/libsword.so.1 ${PREFIX}/lib/libsword.so
-	@${ECHO} "[Install]" >${PREFIX}/etc/sword.conf
-	@${ECHO} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf
+	@${ECHO_CMD} "[Install]" >${PREFIX}/etc/sword.conf
+	@${ECHO_CMD} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf
 	${MKDIR} ${DATADIR}
 	${MKDIR} ${PREFIX}/include/sword
 .for file in ${INCLUDES}