Attachment 225720 Details for Bug 256185 – replace ECHO use in framework

[patch] replace ECHO use in framework

framework-echo.diff (text/plain), 2.85 KB, created by Franco Fichtner on 2021-06-11 05:57:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2021-06-11 05:57:13 UTC

Size: 2.85 KB

patch

obsolete

>diff --git a/Mk/Uses/apache.mk b/Mk/Uses/apache.mk
>index 92b7c5c76026..b83b44e22fa1 100644
>--- a/Mk/Uses/apache.mk
>+++ b/Mk/Uses/apache.mk
>@@ -372,7 +372,7 @@ show-modules:
> .for module in ${AVAILABLE_MODULES}
> 	@${PRINTF} "%-20s : " ${module}
> .	if ${APACHE_MODULES:M${module}}
>-		@${ECHO} -n "enabled "
>+		@${ECHO_MSG} -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) || :
>

Actions: View | Diff

Attachments on bug 256185: 225304 | 225720