mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

Mk/Uses: replace bare ${ECHO} with ${ECHO_CMD} or ${ECHO_MSG}

Browse Source 
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
This commit is contained in:
Alexey Dokuchaev 2021-06-11 07:34:42 +00:00
parent 0280b83766
commit f16e30b305
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Mk/Uses/apache.mk
View File

@ -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

2
Mk/Uses/gem.mk
View File

@ -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}

2
Mk/Uses/mono.mk
View File

@ -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; \

2
Mk/Uses/perl5.mk
View File

@ -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) || :