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.

10 files changed, 45 insertions, 45 deletions

diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index c037c9aec888..c1008fd65939 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -34,18 +34,18 @@ post-patch:
 	cd ${WRKSRC} && ${RM} autozen seq2wav
 
 pre-install:
-	${ECHO} bin/autozen > ${PLIST}
-	${ECHO} bin/seq2wav >> ${PLIST}
+	${ECHO_CMD} bin/autozen > ${PLIST}
+	${ECHO_CMD} bin/seq2wav >> ${PLIST}
 .for i in ${DATA_FILES}
-	${ECHO} share/autozen/${i} >> ${PLIST}
+	${ECHO_CMD} share/autozen/${i} >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
 .for i in ${DOC_FILES}
-	${ECHO} share/doc/autozen/${i} >> ${PLIST}
+	${ECHO_CMD} share/doc/autozen/${i} >> ${PLIST}
 .endfor
-	${ECHO} @dirrm share/doc/autozen >> ${PLIST}
+	${ECHO_CMD} @dirrm share/doc/autozen >> ${PLIST}
 .endif
-	${ECHO} @dirrm share/autozen >> ${PLIST}
+	${ECHO_CMD} @dirrm share/autozen >> ${PLIST}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/autozen ${PREFIX}/bin
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index aa2c33120408..39872d65e7e3 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -27,18 +27,18 @@ PLIST=		${WRKDIR}/pkg-plist
 USE_X_PREFIX=	yes
 
 pre-build:
-	find ${WRKDIR} -type f -exec ${CHMOD} 644 \{\} \;
+	${FIND} ${WRKDIR} -type f -exec ${CHMOD} 644 \{\} \;
 
 post-build:
 	${RM} -f ${PLIST}
 	for i in `find ${WRKDIR} -type f -perm 755`; do \
-		${ECHO} bin/`${BASENAME} $${i}` >> ${PLIST}; \
+		${ECHO_CMD} bin/`${BASENAME} $${i}` >> ${PLIST}; \
 	done
-	${ECHO} share/csound/csound.xmg >> ${PLIST}
-	${ECHO} "@dirrm share/csound" >> ${PLIST}
-	${ECHO} "*** WARNING ***" > ${PKGMESSAGE}
-	${ECHO} "The sources for the csound package have not been" >> ${PKGMESSAGE}
-	${ECHO} "thoroughly reviewed by the FreeBSD maintainer." >> ${PKGMESSAGE}
+	${ECHO_CMD} share/csound/csound.xmg >> ${PLIST}
+	${ECHO_CMD} "@dirrm share/csound" >> ${PLIST}
+	${ECHO_CMD} "*** WARNING ***" > ${PKGMESSAGE}
+	${ECHO_CMD} "The sources for the csound package have not been" >> ${PKGMESSAGE}
+	${ECHO_CMD} "thoroughly reviewed by the FreeBSD maintainer." >> ${PKGMESSAGE}
 
 post-patch:
 	${PERL} -pi -e "s:/usr/local/lib:${DATADIR}:g" ${WRKSRC}/getstring.c
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 81aa6663bf5d..a9a45f34951e 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -30,15 +30,15 @@ post-configure:
 	${PERL} -pi -e "s:<wait.h:<sys/wait.h:g" ${WRKSRC}/*.c
 
 pre-install:
-	${ECHO} bin/${PORTNAME} > ${PLIST}
+	${ECHO_CMD} bin/${PORTNAME} > ${PLIST}
 .for i in ${SHARED}
-	${ECHO} share/denemo/$i >> ${PLIST}
+	${ECHO_CMD} share/denemo/$i >> ${PLIST}
 .endfor
 .for i in ${DOCS}
-	${ECHO} ${DOCDIR}/$i >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/$i >> ${PLIST}
 .endfor
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
-	${ECHO} @dirrm share/denemo >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm share/denemo >> ${PLIST}
 
 do-install:
 	${MKDIR} ${PREFIX}/share/denemo
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index f7e3a89ada79..9f6dddc3e236 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -26,12 +26,12 @@ USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/musicbox-1.01
 
 pre-install:
-	${ECHO} bin/musicbox > ${PLIST}
+	${ECHO_CMD} bin/musicbox > ${PLIST}
 .if !defined(NOPORTDOCS)
 .for i in ${DOCS}
-	${ECHO} share/doc/musicbox/${i} >> ${PLIST}
+	${ECHO_CMD} share/doc/musicbox/${i} >> ${PLIST}
 .endfor
-	${ECHO} @dirrm share/doc/musicbox >> ${PLIST}
+	${ECHO_CMD} @dirrm share/doc/musicbox >> ${PLIST}
 .endif
 
 do-install:
diff --git a/audio/mutemix/Makefile b/audio/mutemix/Makefile
index bdf91fce9c31..065d5d9fead5 100644
--- a/audio/mutemix/Makefile
+++ b/audio/mutemix/Makefile
@@ -25,7 +25,7 @@ do-extract:
 	${MKDIR} ${WRKDIR}
 
 pre-install:
-	${ECHO} "bin/mutemix" > ${PLIST}
+	${ECHO_CMD} "bin/mutemix" > ${PLIST}
 
 do-install:
 	${INSTALL_SCRIPT} ${_DISTDIR}/${DISTFILES} ${PREFIX}/bin/mutemix
diff --git a/audio/opennap/Makefile b/audio/opennap/Makefile
index c1ddaa00b0b8..19f611b88525 100644
--- a/audio/opennap/Makefile
+++ b/audio/opennap/Makefile
@@ -17,20 +17,20 @@ USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
 post-install:
-	(${ECHO} "" ; ${ECHO} "admin" ; ${ECHO} "opennap" ; ${ECHO} "") | ${WRKSRC}/setup
+	(${ECHO_CMD} "" ; ${ECHO_CMD} "admin" ; ${ECHO_CMD} "opennap" ; ${ECHO_CMD} "") | ${WRKSRC}/setup
 .if defined(NOPORTDOCS)
-	@echo "===> Documentation skipped."
+	@${ECHO_MSG} "===> Documentation skipped."
 .else
-	@echo "===> Installing documentation into ${PREFIX}/share/doc/opennap."
+	@${ECHO_MSG} "===> Installing documentation into ${PREFIX}/share/doc/opennap."
 	@${MKDIR} ${PREFIX}/share/doc/opennap
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/opennap
 	${INSTALL_DATA} ${WRKSRC}/napster.txt ${PREFIX}/share/doc/opennap
 .endif
-	@echo "===> Installing example config files into ${PREFIX}/share/doc/opennap."
+	@${ECHO_MSG} "===> Installing example config files into ${PREFIX}/share/doc/opennap."
 	@${MKDIR} ${PREFIX}/share/opennap/examples
 	${CHOWN} -R nobody:nobody ${PREFIX}/share/opennap
 	cd ${WRKSRC} ; for FILE in sample.*; do ${INSTALL_DATA} $${FILE} ${PREFIX}/share/opennap/examples ; done
-	@echo "===> Installing startup script into ${PREFIX}/etc/rc.d."
+	@${ECHO_MSG} "===> Installing startup script into ${PREFIX}/etc/rc.d."
 	${INSTALL_SCRIPT} ${FILESDIR}/opennap.sh ${PREFIX}/etc/rc.d
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile
index e0f9e7121eb0..33bcb74f0433 100644
--- a/audio/opmixer/Makefile
+++ b/audio/opmixer/Makefile
@@ -23,12 +23,12 @@ PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/opmixer
 
 pre-install:
-	${ECHO} "bin/opmixer" > ${PLIST}
-	${ECHO} "bin/opmixer-load" >> ${PLIST}
-	${ECHO} "bin/volset" >> ${PLIST}
+	${ECHO_CMD} "bin/opmixer" > ${PLIST}
+	${ECHO_CMD} "bin/opmixer-load" >> ${PLIST}
+	${ECHO_CMD} "bin/volset" >> ${PLIST}
 .if !defined(NOPORTDOCS)
-	${ECHO} ${DOCDIR}/README >> ${PLIST}
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/README >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-patch:
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 33e6c94b1588..7783cced6190 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -37,7 +37,7 @@ post-install:
 	@${INSTALL_SCRIPT} -m 751 ${FILESDIR}/rplayd.sh ${PREFIX}/etc/rc.d/rplayd.sh
 .endif
 .if !exists(${PREFIX}/etc/rplay.hosts)
-	@${ECHO} localhost > ${PREFIX}/etc/rplay.hosts
+	@${ECHO_CMD} localhost > ${PREFIX}/etc/rplay.hosts
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index a3c00c74d805..00a1db1db055 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -81,30 +81,30 @@ post-configure:
 	@${PERL} -pi -e "s: -ldl::g" ${WRKSRC}/makefile
 
 pre-install:
-	${ECHO} bin/snd > ${PLIST}
+	${ECHO_CMD} bin/snd > ${PLIST}
 .if !defined(WITHOUT_X11)
-	${ECHO} lib/X11/app-defaults/Snd.ad >> ${PLIST}
+	${ECHO_CMD} lib/X11/app-defaults/Snd.ad >> ${PLIST}
 .endif
 .for i in audinfo snd-info sndplay sndrecord sndsine
-	${ECHO} bin/${i} >> ${PLIST}
+	${ECHO_CMD} bin/${i} >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
 .for i in COPYING HISTORY.Snd README.Snd TODO.Snd
-	${ECHO} share/doc/snd/${i} >> ${PLIST}
+	${ECHO_CMD} share/doc/snd/${i} >> ${PLIST}
 .endfor
 	${FIND} ${WRKDIR} -name '*.html' | \
 		${PERL} -pi -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST}
 	${FIND} ${WRKDIR} -name '*.png' | \
 		${PERL} -pi -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST}
-	${ECHO} "@dirrm share/doc/snd" >> ${PLIST}
+	${ECHO_CMD} "@dirrm share/doc/snd" >> ${PLIST}
 .endif
 .if !defined(WITHOUT_GUILE)
 	${FIND} ${WRKSRC} -name '*.scm' | \
 		${PERL} -pi -e "s:^${WRKSRC}/:share/snd/:g" >> ${PLIST}
-	${ECHO} "share/snd/contrib/dlp/README" >> ${PLIST}
-	${ECHO} "@dirrm share/snd/contrib/dlp" >> ${PLIST}
-	${ECHO} "@dirrm share/snd/contrib" >> ${PLIST}
-	${ECHO} "@dirrm share/snd" >> ${PLIST}
+	${ECHO_CMD} "share/snd/contrib/dlp/README" >> ${PLIST}
+	${ECHO_CMD} "@dirrm share/snd/contrib/dlp" >> ${PLIST}
+	${ECHO_CMD} "@dirrm share/snd/contrib" >> ${PLIST}
+	${ECHO_CMD} "@dirrm share/snd" >> ${PLIST}
 .endif
 
 do-install:
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index bb2b60a6f8a2..29ff97c88732 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -33,12 +33,12 @@ post-patch:
 			s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile.in
 
 pre-install:
-	${ECHO} bin/SpiralLoops > ${PLIST}
+	${ECHO_CMD} bin/SpiralLoops > ${PLIST}
 .if !defined(NOPORTDOCS)
 .for i in ${DOC_FILES}
-	${ECHO} ${DOCDIR}/`${BASENAME} ${i}` >> ${PLIST}
+	${ECHO_CMD} ${DOCDIR}/`${BASENAME} ${i}` >> ${PLIST}
 .endfor
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install: