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, 62 insertions, 62 deletions

diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index ba40ce9da892..be67fe17026f 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -23,8 +23,8 @@ DOCDIR=		${PREFIX}/share/doc/checkpassword
 .SILENT:
 
 do-configure:
-	${ECHO} 'cc -s -lcrypt' > ${WRKSRC}/conf-ld
-	${ECHO} ${PREFIX} >${WRKSRC}/conf-home
+	${ECHO_CMD} 'cc -s -lcrypt' > ${WRKSRC}/conf-ld
+	${ECHO_CMD} ${PREFIX} >${WRKSRC}/conf-home
 
 post-install:
 #	${INSTALL_MAN} ${WRKSRC}/${MAN8} ${PREFIX}/man/man8
diff --git a/security/crack/Makefile b/security/crack/Makefile
index f7393a73cc9a..19d67f2d0c6f 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -26,7 +26,7 @@ pre-configure:
 	@${MV} -f ${WRKSRC}/src/util/elcid.c ${WRKSRC}/src/util/elcid.c.orig
 	@${CP} -p ${WRKSRC}/src/util/elcid.c,bsd ${WRKSRC}/src/util/elcid.c
 .endif
-	@${ECHO} "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile
+	@${ECHO_CMD} "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile
 
 pre-build:
 	@(if [ ! -f /usr/share/dict/words ];then \
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 74b05c44e5a0..4e8d235a9e6e 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -129,8 +129,8 @@ post-patch:
 		-e "s;%%PREFIX%%;${PREFIX};g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 .ifdef LDAP_MYSQL_MSG
-	@${ECHO} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE}
-	@${ECHO} >> ${PKGMESSAGE}
+	@${ECHO_CMD} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE}
+	@${ECHO_CMD} >> ${PKGMESSAGE}
 .endif
 
 pre-configure:
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 74b05c44e5a0..4e8d235a9e6e 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -129,8 +129,8 @@ post-patch:
 		-e "s;%%PREFIX%%;${PREFIX};g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 .ifdef LDAP_MYSQL_MSG
-	@${ECHO} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE}
-	@${ECHO} >> ${PKGMESSAGE}
+	@${ECHO_CMD} ${LDAP_MYSQL_MSG} | /usr/bin/fmt -w 67 >> ${PKGMESSAGE}
+	@${ECHO_CMD} >> ${PKGMESSAGE}
 .endif
 
 pre-configure:
diff --git a/security/digest/Makefile b/security/digest/Makefile
index 2a62e113536d..70536d681e6e 100644
--- a/security/digest/Makefile
+++ b/security/digest/Makefile
@@ -27,6 +27,6 @@ do-extract:
 	cd ${FILESDIR} && pax -r -w * ${WRKSRC}
 
 pre-install:
-	${ECHO} bin/digest > ${PLIST}
+	${ECHO_CMD} bin/digest > ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/security/drweb-sendmail/Makefile b/security/drweb-sendmail/Makefile
index ba1e490d9cd1..3b8f07626d52 100644
--- a/security/drweb-sendmail/Makefile
+++ b/security/drweb-sendmail/Makefile
@@ -36,8 +36,8 @@ WITH_DRWEBSMF_HOSTNAME!=hostname
 .if exists( ${WITH_DRWEBSMF_SENDMAIL_DIR}/include/libmilter/mfapi.h )
 
 SENDMAIL_VERSION!=      ${AWK} '/^sendmail [0-9.]+$$/{print $$2}' ${WITH_DRWEBSMF_SENDMAIL_DIR}/FREEBSD-upgrade
-SENDMAIL_MAJOR!=	${ECHO} ${SENDMAIL_VERSION} | ${AWK} 'BEGIN{ FS="." }{ print $$1 }'
-SENDMAIL_MINOR!=	${ECHO} ${SENDMAIL_VERSION} | ${AWK} 'BEGIN{ FS="." }{ print $$2 }'
+SENDMAIL_MAJOR!=	${ECHO_CMD} ${SENDMAIL_VERSION} | ${AWK} 'BEGIN{ FS="." }{ print $$1 }'
+SENDMAIL_MINOR!=	${ECHO_CMD} ${SENDMAIL_VERSION} | ${AWK} 'BEGIN{ FS="." }{ print $$2 }'
 .if ${SENDMAIL_MAJOR} > 8 || ${SENDMAIL_MAJOR} == 8 && ${SENDMAIL_MINOR} >= 12
 SENDMAIL8_12=	y
 .elif ${SENDMAIL_MAJOR} == 8 && ${SENDMAIL_MINOR} >= 10
@@ -69,13 +69,13 @@ post-configure:
 	cd ${WRKSRC}/libmilter && ${MAKE} clean && ${MAKE} SENDMAIL_DIR=${WITH_DRWEBSMF_SENDMAIL_DIR}
 	cd ${WRKSRC}/libsmutil && ${MAKE} clean && ${MAKE} SENDMAIL_DIR=${WITH_DRWEBSMF_SENDMAIL_DIR}
 	cd ${WRKSRC} && { \
-		${ECHO} y; \
-		${ECHO} n; \
-		${ECHO} y; \
-		${ECHO} ${SENDMAIL8_12} ; \
-		${ECHO} ${WITH_DRWEBSMF_SENDMAIL_DIR} ; \
-		${ECHO} ${CFLAGS} ; \
-		${ECHO} y; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} n; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} ${SENDMAIL8_12} ; \
+		${ECHO_CMD} ${WITH_DRWEBSMF_SENDMAIL_DIR} ; \
+		${ECHO_CMD} ${CFLAGS} ; \
+		${ECHO_CMD} y; \
 	} | ./configure
 
 do-install:
@@ -83,33 +83,33 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/drweb-smf ${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${WRKSRC}/drwebdc ${PREFIX}/sbin/
 	cd ${WRKSRC}/../sendmail && { \
-		${ECHO} y; \
-		${ECHO} "${PREFIX}/sbin"; \
-		${ECHO} ; \
-		${ECHO} u; \
-		${ECHO} "${PREFIX}/drweb/run/drweb-smf.sock"; \
-		${ECHO} drweb; \
-		${ECHO} "${PREFIX}/drweb/infected"; \
-		${ECHO} y; \
-		${ECHO} /tmp; \
-		${ECHO} y; \
-		${ECHO} y; \
-		${ECHO} ; \
-		${ECHO} postmaster@${WITH_DRWEBSMF_HOSTNAME}; \
-		${ECHO} y; \
-		${ECHO} y; \
-		${ECHO} y; \
-		${ECHO} c; \
-		${ECHO} t; \
-		${ECHO} t; \
-		${ECHO} t; \
-		${ECHO} a; \
-		${ECHO} r; \
-		${ECHO} 160000; \
-		${ECHO} ${SENDMAIL8_12} ; \
-		${ECHO} n; \
-		${ECHO} y; \
-		${ECHO} ; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} "${PREFIX}/sbin"; \
+		${ECHO_CMD} ; \
+		${ECHO_CMD} u; \
+		${ECHO_CMD} "${PREFIX}/drweb/run/drweb-smf.sock"; \
+		${ECHO_CMD} drweb; \
+		${ECHO_CMD} "${PREFIX}/drweb/infected"; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} /tmp; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} ; \
+		${ECHO_CMD} postmaster@${WITH_DRWEBSMF_HOSTNAME}; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} c; \
+		${ECHO_CMD} t; \
+		${ECHO_CMD} t; \
+		${ECHO_CMD} t; \
+		${ECHO_CMD} a; \
+		${ECHO_CMD} r; \
+		${ECHO_CMD} 160000; \
+		${ECHO_CMD} ${SENDMAIL8_12} ; \
+		${ECHO_CMD} n; \
+		${ECHO_CMD} y; \
+		${ECHO_CMD} ; \
 	} | ./configure
 	cd ${WRKSRC}/../sendmail; \
 		${INSTALL_DATA} example* readme.* sendmail.*.addon ${DOC_DIR}
diff --git a/security/gnupg-idea/Makefile b/security/gnupg-idea/Makefile
index 72487687e03c..ae5e00135caf 100644
--- a/security/gnupg-idea/Makefile
+++ b/security/gnupg-idea/Makefile
@@ -67,7 +67,7 @@ do-patch:
 do-build:
 .for i in ${CONTRIB}
 	${CC} ${CFLAGS} -o ${WRKSRC}/${i} ${WRKSRC}/${i}.c
-	${ECHO} "lib/gnupg/${i}" >>${PLIST}
+	${ECHO_CMD} "lib/gnupg/${i}" >>${PLIST}
 .endfor
 
 do-install:
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 554ca6535dc7..4d3bc60076bb 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -95,11 +95,11 @@ pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist.des >> ${PLIST}
 .endif
 .if !exists(/usr/include/ifaddrs.h)
-	@${ECHO} include/ifaddrs.h >> ${PLIST}
+	@${ECHO_CMD} include/ifaddrs.h >> ${PLIST}
 .endif
 .if defined(WITH_CRACKLIB)
 	${INSTALL_PROGRAM} ${WRKSRC}/kpasswdd-cracklib.so ${PREFIX}/lib/
-	@${ECHO} lib/kpasswdd-cracklib.so >> ${PLIST}
+	@${ECHO_CMD} lib/kpasswdd-cracklib.so >> ${PLIST}
 .endif
 
 .include "Makefile.man"
diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index 22d3f0c5b973..49bb6c39207b 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -29,12 +29,12 @@ do-build:
 	cd ${WRKDIR} && ${CC} ${CFLAGS} -DMPU8086 *.c -o lc_CLI
 
 pre-install:
-	${ECHO} bin/lc_CLI > ${PLIST}
+	${ECHO_CMD} bin/lc_CLI > ${PLIST}
 .if !defined(NOPORTDOCS)
 	for i in `find ${WRKDIR} -name '*txt'`; \
-		do ${ECHO} ${DOCDIR}/`${BASENAME} $${i}` >> ${PLIST}; \
+		do ${ECHO_CMD} ${DOCDIR}/`${BASENAME} $${i}` >> ${PLIST}; \
 	done
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 77bf8e2c3d3a..9e0e1d93d44a 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -33,14 +33,14 @@ USE_AUTOCONF=		yes
 USE_LIBTOOL=		yes
 
 pre-install:
-	${ECHO} bin/${PORTNAME} > ${PLIST}
-	${ECHO} bin/mdecrypt >> ${PLIST}
+	${ECHO_CMD} bin/${PORTNAME} > ${PLIST}
+	${ECHO_CMD} bin/mdecrypt >> ${PLIST}
 .for i in cs el pl
-	${ECHO} share/locale/${i}/LC_MESSAGES/mcrypt.mo >> ${PLIST}
+	${ECHO_CMD} share/locale/${i}/LC_MESSAGES/mcrypt.mo >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
-	${ECHO} share/examples/${PORTNAME}/sample.mcryptrc >> ${PLIST}
-	${ECHO} @dirrm share/examples/${PORTNAME} >> ${PLIST}
+	${ECHO_CMD} share/examples/${PORTNAME}/sample.mcryptrc >> ${PLIST}
+	${ECHO_CMD} @dirrm share/examples/${PORTNAME} >> ${PLIST}
 .endif
 
 post-install:
diff --git a/security/outguess/Makefile b/security/outguess/Makefile
index 6446a7cd707e..e3bbdb1618ee 100644
--- a/security/outguess/Makefile
+++ b/security/outguess/Makefile
@@ -27,14 +27,14 @@ PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/outguess
 
 pre-install:
-	${ECHO} bin/extract > ${PLIST}
-	${ECHO} bin/outguess >> ${PLIST}
-#	${ECHO} bin/histogram >> ${PLIST}
+	${ECHO_CMD} bin/extract > ${PLIST}
+	${ECHO_CMD} bin/outguess >> ${PLIST}
+#	${ECHO_CMD} bin/histogram >> ${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/security/srp/Makefile b/security/srp/Makefile
index 38d680b9d1b0..3d85797ebe3a 100644
--- a/security/srp/Makefile
+++ b/security/srp/Makefile
@@ -30,9 +30,9 @@ post-install:
 .for f in ${PORTDOCS}
 	${MKDIR} ${PREFIX}/share/doc/srp
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/srp/${f}
-	@${ECHO} share/doc/srp/${f} >> ${TMPPLIST}
+	@${ECHO_CMD} share/doc/srp/${f} >> ${TMPPLIST}
 .endfor
-	@${ECHO} @dirrm share/doc/srp >> ${TMPPLIST}
+	@${ECHO_CMD} @dirrm share/doc/srp >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>