From owner-dev-commits-ports-all@freebsd.org Fri Jun 11 07:39:03 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 92CB165A778; Fri, 11 Jun 2021 07:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G1Xlq3Wkqz3sMF; Fri, 11 Jun 2021 07:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A5AE1EE05; Fri, 11 Jun 2021 07:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15B7d3fq090778; Fri, 11 Jun 2021 07:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15B7d3Po090777; Fri, 11 Jun 2021 07:39:03 GMT (envelope-from git) Date: Fri, 11 Jun 2021 07:39:03 GMT Message-Id: <202106110739.15B7d3Po090777@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: f16e30b305b5 - main - Mk/Uses: replace bare ${ECHO} with ${ECHO_CMD} or ${ECHO_MSG} MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f16e30b305b5a94cae5e2568913299ced32f0492 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2021 07:39:03 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f16e30b305b5a94cae5e2568913299ced32f0492 commit f16e30b305b5a94cae5e2568913299ced32f0492 Author: Alexey Dokuchaev AuthorDate: 2021-06-11 07:34:42 +0000 Commit: Alexey Dokuchaev 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) || :