git: f16e30b305b5 - main - Mk/Uses: replace bare ${ECHO} with ${ECHO_CMD} or ${ECHO_MSG}

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f16e30b305b5a94cae5e2568913299ced32f0492

commit f16e30b305b5a94cae5e2568913299ced32f0492
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-06-11 07:34:42 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-06-11 07:37:22 +0000

    Mk/Uses: replace bare ${ECHO} with ${ECHO_CMD} or ${ECHO_MSG}
    
    ECHO is builtin variable and is cleared when make(1) is invoked
    in silent mode, i.e. as ``make -s'', thus making statements that
    use it do nothing.  Depending on the context, replace it with
    either ${ECHO_CMD} or ${ECHO_MSG} (in one case), as appropriate.
    
    PR:             256185
    Submitted by:   Franco Fichtner
---
 Mk/Uses/apache.mk | 16 ++++++++--------
 Mk/Uses/gem.mk    |  2 +-
 Mk/Uses/mono.mk   |  2 +-
 Mk/Uses/perl5.mk  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Mk/Uses/apache.mk b/Mk/Uses/apache.mk
index 92b7c5c76026..244001c4d5ed 100644
--- a/Mk/Uses/apache.mk
+++ b/Mk/Uses/apache.mk
@@ -55,7 +55,7 @@
 #
 #
 # The following variables can be read by ports and must not be modified
-# 
+#
 #  APACHE_VERSION		The major-minor release version of the chosen
 #						Apache server, e.g. 2.2 or 2.4
 #
@@ -104,7 +104,7 @@ _APACHE_ARGS:=		${_APACHE_ARGS:Nrun}
 _APACHE_ARGS=		${APACHE_DEFAULT}
 .	endif
 # _APACHE_ARGS must now contain a version(-range)
-.	if !empty(_APACHE_ARGS:C/^2\.[0-9]//:S/^-//:C/^2\.[0-9]//:C/\+$//) 
+.	if !empty(_APACHE_ARGS:C/^2\.[0-9]//:S/^-//:C/^2\.[0-9]//:C/\+$//)
 IGNORE= ${_ERROR_MSG} Illegal use of USES= ${USES:Mapache*}
 # Catch USES= apache:[min]-[max]+
 .	elif ${apache_ARGS:C/[.a-z0-9]//g} == "-+"
@@ -372,7 +372,7 @@ show-modules:
 .for module in ${AVAILABLE_MODULES}
 	@${PRINTF} "%-20s : " ${module}
 .	if ${APACHE_MODULES:M${module}}
-		@${ECHO} -n "enabled "
+		@${ECHO_CMD} -n "enabled "
 .		if !empty(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M${module}}
 			@${ECHO_CMD} " (static)"
 .		else
@@ -404,11 +404,11 @@ _USES_build+=	490:ap-gen-plist
 ap-gen-plist:
 .if defined(AP_GENPLIST)
 .	if !exists(${PLIST})
-	@${ECHO} "===>  Generating apache plist"
-	@${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
-	@${ECHO} "@postexec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
-	@${ECHO} "@postunexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
-	@${ECHO} "@postunexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST}
+	@${ECHO_MSG} "===>  Generating apache plist"
+	@${ECHO_CMD} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
+	@${ECHO_CMD} "@postexec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
+	@${ECHO_CMD} "@postunexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
+	@${ECHO_CMD} "@postunexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"" >> ${PLIST}
 .	endif
 .endif
 .endif
diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk
index dd21a18d5632..b92a2dc21b96 100644
--- a/Mk/Uses/gem.mk
+++ b/Mk/Uses/gem.mk
@@ -118,7 +118,7 @@ do-install:
 .if empty(gem_ARGS:Mnoautoplist)
 _USES_install+=	820:gem-autoplist
 gem-autoplist:
-	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
+	@${ECHO_CMD} ${GEM_SPEC} >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
diff --git a/Mk/Uses/mono.mk b/Mk/Uses/mono.mk
index 8ee874fd279d..923adc517c30 100644
--- a/Mk/Uses/mono.mk
+++ b/Mk/Uses/mono.mk
@@ -224,7 +224,7 @@ makenupkg:
 				eval url="\$${$${feed}_URL}$${0%%=*}/$${0##*=}/$${0%%=*}.$${0##*=}.nupkg"; \
 			fi; \
 			if curl --output /dev/null --silent --head --fail $$url; then\
-				${ECHO} $$0 >> ${WRKDIR}/nupkg-$$feed; \
+				${ECHO_CMD} $$0 >> ${WRKDIR}/nupkg-$$feed; \
 				found=yes; \
 				break; \
 			fi; \
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 3309795cc044..eb1b65eee554 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -305,7 +305,7 @@ fix-perl-things:
 	@(if [ -d ${STAGEDIR}${PACKLIST_DIR} ] ; then \
 		${FIND} ${STAGEDIR}${PACKLIST_DIR} -name .packlist | while read f ; do \
 			${SED} -i '' 's|^${STAGEDIR}||' "$$f"; \
-			${ECHO} $$f | ${SED} -e 's|^${STAGEDIR}||' >> ${TMPPLIST}; \
+			${ECHO_CMD} $$f | ${SED} -e 's|^${STAGEDIR}||' >> ${TMPPLIST}; \
 		done \
 	fi) || :