Date: Tue, 11 Apr 2017 14:22:41 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438265 - in head/Mk: . Uses Message-ID: <201704111422.v3BEMf6p076448@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Apr 11 14:22:41 2017 New Revision: 438265 URL: https://svnweb.freebsd.org/changeset/ports/438265 Log: Use dedicated macro FMT_80 instead of ${FMT} 75 79 magical constants Suggested by: mat Approved by: portmgr (mat) Differential Revision: D10342 Modified: head/Mk/Uses/gem.mk head/Mk/bsd.commands.mk head/Mk/bsd.gecko.mk head/Mk/bsd.port.mk Modified: head/Mk/Uses/gem.mk ============================================================================== --- head/Mk/Uses/gem.mk Tue Apr 11 14:17:57 2017 (r438264) +++ head/Mk/Uses/gem.mk Tue Apr 11 14:22:41 2017 (r438265) @@ -85,7 +85,7 @@ do-extract: @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Extraction failed unexpectedly."; \ - (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \ + (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \ fi; \ ${FALSE}; \ fi) @@ -96,7 +96,7 @@ do-build: @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${GEMSPEC} ; then \ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ - (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \ + (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \ fi; \ ${FALSE}; \ fi) Modified: head/Mk/bsd.commands.mk ============================================================================== --- head/Mk/bsd.commands.mk Tue Apr 11 14:17:57 2017 (r438264) +++ head/Mk/bsd.commands.mk Tue Apr 11 14:22:41 2017 (r438265) @@ -42,6 +42,7 @@ FILE?= /usr/bin/file FIND?= /usr/bin/find FLEX?= /usr/bin/flex FMT?= /usr/bin/fmt +FMT_80?= ${FMT} 75 79 GMAKE?= gmake GREP?= /usr/bin/grep GUNZIP_CMD?= /usr/bin/gunzip -f Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Tue Apr 11 14:17:57 2017 (r438264) +++ head/Mk/bsd.gecko.mk Tue Apr 11 14:22:41 2017 (r438265) @@ -590,7 +590,7 @@ do-configure: gecko-do-configure gecko-do-configure: @(if ! ${CONFIGURE_ENV} ${DO_MAKE_BUILD} configure; then \ ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ - (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT_80} ; \ ${FALSE}; \ fi) Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Apr 11 14:17:57 2017 (r438264) +++ head/Mk/bsd.port.mk Tue Apr 11 14:22:41 2017 (r438265) @@ -1161,9 +1161,9 @@ WARNING+= "${_UNSUPPORTED_SYSTEM_MESSA show-unsupported-system-error: @${ECHO_MSG} "/!\\ ERROR: /!\\" @${ECHO_MSG} - @${ECHO_MSG} "${_UNSUPPORTED_SYSTEM_MESSAGE}" | ${FMT} 75 79 + @${ECHO_MSG} "${_UNSUPPORTED_SYSTEM_MESSAGE}" | ${FMT_80} @${ECHO_MSG} - @${ECHO_MSG} "No support will be provided if you silence this message by defining ALLOW_UNSUPPORTED_SYSTEM." | ${FMT} 75 79 + @${ECHO_MSG} "No support will be provided if you silence this message by defining ALLOW_UNSUPPORTED_SYSTEM." | ${FMT_80} @${ECHO_MSG} @${FALSE} . endif @@ -2756,7 +2756,7 @@ clean: .if defined(IGNORE_SILENT) IGNORECMD= ${DO_NADA} .else -IGNORECMD= ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE:Q}. | ${FMT} 75 79 ; exit 1 +IGNORECMD= ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE:Q}. | ${FMT_80} ; exit 1 .endif _TARGETS= check-sanity fetch checksum extract patch configure all build \ @@ -3144,7 +3144,7 @@ do-configure: INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}; then \ ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ - (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT_80} ; \ ${FALSE}; \ fi) .endif @@ -3158,7 +3158,7 @@ do-build: @(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ - (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \ + (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \ fi; \ ${FALSE}; \ fi) @@ -3277,7 +3277,7 @@ do-test: @(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \ if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Tests failed unexpectedly."; \ - (${ECHO_CMD} "${TEST_FAIL_MESSAGE}") | ${FMT} 75 79 ; \ + (${ECHO_CMD} "${TEST_FAIL_MESSAGE}") | ${FMT_80} ; \ fi; \ ${FALSE}; \ fi) @@ -5092,7 +5092,7 @@ show-warnings: @${ECHO_MSG} "/!\\ WARNING /!\\" @${ECHO_MSG} .for m in ${WARNING} - @${ECHO_MSG} "${m}" | ${FMT} 75 79 + @${ECHO_MSG} "${m}" | ${FMT_80} @${ECHO_MSG} .endfor @sleep ${WARNING_WAIT} @@ -5105,7 +5105,7 @@ show-dev-warnings: @${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile warnings, please consider fixing /!\\" @${ECHO_MSG} .for m in ${DEV_WARNING} - @${ECHO_MSG} ${m} | ${FMT} 75 79 + @${ECHO_MSG} ${m} | ${FMT_80} @${ECHO_MSG} .endfor .if defined(DEV_WARNING_FATAL) @@ -5120,7 +5120,7 @@ show-dev-errors: @${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile errors /!\\" @${ECHO_MSG} .for m in ${DEV_ERROR} - @${ECHO_MSG} "${m}" | ${FMT} 75 79 + @${ECHO_MSG} "${m}" | ${FMT_80} @${ECHO_MSG} .endfor @${FALSE}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704111422.v3BEMf6p076448>