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.

10 files changed, 14 insertions, 14 deletions

diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
index 168d69ede379..1614e21ffd6a 100644
--- a/textproc/docbook-300/Makefile
+++ b/textproc/docbook-300/Makefile
@@ -37,7 +37,7 @@ pre-install:
 do-install:
 	@zcat ${DISTDIR}/docbk30.tar.Z |(cd ${INSTDIR}/3.0; pax -r)
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.0/catalog
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog
+	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.0/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile
index f2fcb16dbaa8..ca3d4ca4162e 100644
--- a/textproc/docbook-310/Makefile
+++ b/textproc/docbook-310/Makefile
@@ -38,7 +38,7 @@ pre-install:
 do-install:
 	@unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/3.1
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.1/catalog
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog
+	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/docbook-400/Makefile b/textproc/docbook-400/Makefile
index 0a1672ef6118..6f015e568c19 100644
--- a/textproc/docbook-400/Makefile
+++ b/textproc/docbook-400/Makefile
@@ -38,7 +38,7 @@ pre-install:
 do-install:
 	@unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/4.0
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/4.0/catalog
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.0/catalog
+	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.0/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.0/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/docbook-410/Makefile b/textproc/docbook-410/Makefile
index 7cd3e906782f..9935c298f60a 100644
--- a/textproc/docbook-410/Makefile
+++ b/textproc/docbook-410/Makefile
@@ -38,7 +38,7 @@ pre-install:
 do-install:
 	@unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/4.1
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/4.1/catalog
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.1/catalog
+	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.1/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.1/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index a3205944ca58..e5f47420e29c 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -161,9 +161,9 @@ post-patch:
 
 
 post-configure:
-	@${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
+	@${ECHO_CMD} "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
 .if defined(MASKBITS)
-	@${ECHO} "#define MASKBITS ${MASKBITS}" >> ${WRKSRC}/local.h
+	@${ECHO_CMD} "#define MASKBITS ${MASKBITS}" >> ${WRKSRC}/local.h
 .endif
 
 post-build:
@@ -257,6 +257,6 @@ post-install:
 .else
 	@${CAT} ${MASTERDIR}/pkg-plist.am >> ${TMPPLIST}
 .endif
-	@${ECHO} "@dirrm share/ispell" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm share/ispell" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 1ff22a7f2fc2..9c275b710137 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -49,7 +49,7 @@ post-install:
 	${MKDIR} ${PREFIX}/share/sgml/jade
 	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/jade
 	@if [ ! -f ${PREFIX}/share/sgml/catalog ]; then \
-		${ECHO} "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"" > ${PREFIX}/share/sgml/catalog; \
+		${ECHO_CMD} "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"" > ${PREFIX}/share/sgml/catalog; \
 	else \
 		${SETENV} LANG=C ${PERL} -ni -e 'print if !m|${PREFIX}/share/sgml/jade/catalog|;print "CATALOG \"${PREFIX}/share/sgml/jade/catalog\"\n" if eof;' ${PREFIX}/share/sgml/catalog; \
 	fi
diff --git a/textproc/nicetext/Makefile b/textproc/nicetext/Makefile
index 3bc3d45e753a..1b64216eb0cd 100644
--- a/textproc/nicetext/Makefile
+++ b/textproc/nicetext/Makefile
@@ -23,8 +23,8 @@ PROGRAMS=	bitcp dct2mstr expgram genmodel gramtest impkimmo impmsc \
 		sortdct txt2dct
 
 post-install:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd
-	@${ECHO} ${PREFIX}/bin/"nttpd -b " ${PREFIX}/share/examples/nicetext/database >> ${WRKSRC}/bin/qstart-nttpd
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd
+	@${ECHO_CMD} ${PREFIX}/bin/"nttpd -b " ${PREFIX}/share/examples/nicetext/database >> ${WRKSRC}/bin/qstart-nttpd
 	${CHMOD} a+rx ${WRKSRC}/bin/qstart-nttpd
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/qstart-nttpd ${PREFIX}/bin/
 .for f in ${MAN1}
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 06523f4a4628..0403d19b9836 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -40,12 +40,12 @@ post-patch:
 .if defined(XMLPARSER_EUCJP)
 	@cd ${WRKSRC}/Parser/Encodings; \
 		${CONV_ENC} euc-jp ${XMLPARSER_EUCJP}.enc > euc-jp.enc
-	@${ECHO} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST
+	@${ECHO_CMD} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST
 .endif
 .if defined(XMLPARSER_SJIS)
 	@cd ${WRKSRC}/Parser/Encodings; \
 		${CONV_ENC} shift_jis ${XMLPARSER_SJIS}.enc > shift_jis.enc
-	@${ECHO} Parser/Encodings/Shift_JIS.enc >> ${WRKSRC}/MANIFEST
+	@${ECHO_CMD} Parser/Encodings/Shift_JIS.enc >> ${WRKSRC}/MANIFEST
 .endif
 
 post-configure:
diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile
index d86cfce43da7..8ea459561098 100644
--- a/textproc/sdocbook-xml/Makefile
+++ b/textproc/sdocbook-xml/Makefile
@@ -32,7 +32,7 @@ do-install:
 			*.dtd *.mod *.css *.xml ${DTDDIR}; \
 		${INSTALL_DATA} ent/* ${ENTDIR}
 	if [ ! -f ${INSTDIR}/catalog ]; then \
-		${ECHO} "CATALOG \"sdocbook/catalog\"" > ${INSTDIR}/catalog; \
+		${ECHO_CMD} "CATALOG \"sdocbook/catalog\"" > ${INSTDIR}/catalog; \
 	else \
 		${SETENV} LANG=C ${PERL} -ni -e 'print if !m|sdocbook/catalog|;print "CATALOG \"sdocbook/catalog\"\n" if eof;' ${INSTDIR}/catalog; \
 	fi
diff --git a/textproc/sgmltools-lite/Makefile b/textproc/sgmltools-lite/Makefile
index 8e4ae344d9d8..02409d3dc528 100644
--- a/textproc/sgmltools-lite/Makefile
+++ b/textproc/sgmltools-lite/Makefile
@@ -30,6 +30,6 @@ pre-install:
 	${MKDIR} ${PREFIX}/etc/sgml
 
 post-install:
-	${ECHO} "3.0.0" > ${LOCALBASE}/share/sgml/misc/sgmltools/VERSION
+	${ECHO_CMD} "3.0.0" > ${LOCALBASE}/share/sgml/misc/sgmltools/VERSION
 
 .include <bsd.port.mk>