Date: Tue, 29 Jan 2002 21:49:01 +0900 From: "Akinori MUSHA" <knu@iDaemons.org> To: Maxim Sobolev <sobomax@FreeBSD.org> Cc: portmgr@FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: ports/editors/color-mate Makefile ports/editors/emacs20-mule-develMakefile ports/editors/mule Makefile ports/editors/staroffice52Makefile ports/editors/staroffice60 Makefile ports/editors/vimMakefile ports/editors/vim5 Makefile ... Message-ID: <86zo2xb9vm.wl@archon.local.idaemons.org> In-Reply-To: <3C567CFD.98B0D8F9@FreeBSD.org> References: <200201291034.g0TAYNK36477@freefall.freebsd.org> <3C567CFD.98B0D8F9@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
At Tue, 29 Jan 2002 12:44:13 +0200, sobomax wrote: > > Log: > > Use ${ECHO_CMD} instead of ${ECHO} where you mean the echo command; > > the ECHO macro is set to "echo" by default, but it is set to "true" if > > make(1) is invoked with the -s option while ECHO_CMD is always set to > > the echo command. > > I'm sure that this will make bde happy. :) I had his request to do > something like that on my plate for quite some time now and really > glad to see that the issue is finally resolved. Thanks! Okay, you've just asked for it; now you have a patch to review. Please test the enclosed patch and commit it. :) -- / /__ __ Akinori.org / MUSHA.org / ) ) ) ) / FreeBSD.org / Ruby-lang.org Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp "Somewhere out of a memory.. of lighted streets on quiet nights.." Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.397 diff -u -u -r1.397 bsd.port.mk --- bsd.port.mk 24 Jan 2002 01:15:03 -0000 1.397 +++ bsd.port.mk 29 Jan 2002 12:42:30 -0000 @@ -1573,7 +1573,7 @@ .if !target(maintainer) maintainer: - @${ECHO} ${MAINTAINER} + @${ECHO_CMD} ${MAINTAINER} .endif .if !defined(CATEGORIES) @@ -1594,7 +1594,7 @@ x11 x11-clocks x11-fm x11-fonts x11-servers x11-toolkits x11-wm zope check-categories: .for cat in ${CATEGORIES} - @if ${ECHO} ${VALID_CATEGORIES} | ${GREP} -wq ${cat}; then \ + @if ${ECHO_CMD} ${VALID_CATEGORIES} | ${GREP} -wq ${cat}; then \ ${TRUE}; \ else \ ${ECHO} "${PKGNAME}: category ${cat} not in list of valid categories."; \ @@ -1659,7 +1659,7 @@ .endif .if (defined(MLINKS) || defined(_MLINKS_PREPEND)) && !defined(_MLINKS) -__pmlinks!= ${ECHO} '${MLINKS:S/ / /}' | ${AWK} \ +__pmlinks!= ${ECHO_CMD} '${MLINKS:S/ / /}' | ${AWK} \ '{ if (NF % 2 != 0) { print "broken"; exit; } \ for (i=1; i<=NF; i++) { \ if ($$i ~ /^-$$/ && i != 1 && i % 2 != 0) \ @@ -1704,7 +1704,7 @@ .endfor .if defined(_MLINKS) && make(generate-plist) -_TMLINKS!= ${ECHO} ${_MLINKS} | ${AWK} '{for (i=2; i<=NF; i+=2) print $$i}' +_TMLINKS!= ${ECHO_CMD} ${_MLINKS} | ${AWK} '{for (i=2; i<=NF; i+=2) print $$i}' .else _TMLINKS= .endif @@ -1733,8 +1733,8 @@ .if defined(INSTALLS_SHLIB) LDCONFIG_DIRS?= %%PREFIX%%/lib -LDCONFIG_PLIST!= ${ECHO} ${LDCONFIG_DIRS} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -LDCONFIG_RUNLIST!= ${ECHO} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!g" +LDCONFIG_PLIST!= ${ECHO_CMD} ${LDCONFIG_DIRS} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} +LDCONFIG_RUNLIST!= ${ECHO_CMD} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!g" .endif DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} @@ -2284,7 +2284,7 @@ exit 1; \ fi; \ fi; \ - ${LN} -sf `${ECHO} $$cat | ${SED} -e 'sa[^/]*a..ag'`/${PKGREPOSITORYSUBDIR}/${PKGNAME}${PKG_SUFX} ${PACKAGES}/$$cat; \ + ${LN} -sf `${ECHO_CMD} $$cat | ${SED} -e 'sa[^/]*a..ag'`/${PKGREPOSITORYSUBDIR}/${PKGNAME}${PKG_SUFX} ${PACKAGES}/$$cat; \ done .if !defined(NO_LATEST_LINK) @if [ ! -d ${PKGLATESTREPOSITORY} ]; then \ @@ -2316,17 +2316,17 @@ .if !target(delete-package-links-list) delete-package-links-list: @for cat in ${CATEGORIES}; do \ - ${ECHO} ${RM} -f ${PACKAGES}/$$cat/${PKGNAME}${PKG_SUFX}; \ + ${ECHO_CMD} ${RM} -f ${PACKAGES}/$$cat/${PKGNAME}${PKG_SUFX}; \ done .if !defined(NO_LATEST_LINK) - @${ECHO} ${RM} -f ${PKGLATESTFILE} + @${ECHO_CMD} ${RM} -f ${PKGLATESTFILE} .endif .endif .if !target(delete-package-list) delete-package-list: @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} delete-package-links-list - @${ECHO} "[ -f ${PKGFILE} ] && (${ECHO} deleting ${PKGFILE}; ${RM} -f ${PKGFILE})" + @${ECHO_CMD} "[ -f ${PKGFILE} ] && (${ECHO_CMD} deleting ${PKGFILE}; ${RM} -f ${PKGFILE})" .endif ################################################################ @@ -2693,18 +2693,18 @@ .if !target(delete-distfiles-list) delete-distfiles-list: - @${ECHO} "# ${PKGNAME}" + @${ECHO_CMD} "# ${PKGNAME}" @if [ "X${RESTRICTED_FILES}" != "X" ]; then \ for file in ${RESTRICTED_FILES}; do \ - ${ECHO} "[ -f ${_DISTDIR}/$$file ] && (${ECHO} deleting ${_DISTDIR}/$$file; ${RM} -f ${_DISTDIR}/$$file)"; \ + ${ECHO_CMD} "[ -f ${_DISTDIR}/$$file ] && (${ECHO_CMD} deleting ${_DISTDIR}/$$file; ${RM} -f ${_DISTDIR}/$$file)"; \ dir=$${file%/*}; \ if [ "$${dir}" != "$${file}" ]; then \ - ${ECHO} "(cd ${_DISTDIR} && ${RMDIR} -p $${dir} 2>/dev/null)"; \ + ${ECHO_CMD} "(cd ${_DISTDIR} && ${RMDIR} -p $${dir} 2>/dev/null)"; \ fi; \ done; \ fi .if defined(DIST_SUBDIR) - @${ECHO} "${RMDIR} ${_DISTDIR} 2>/dev/null || ${TRUE}" + @${ECHO_CMD} "${RMDIR} ${_DISTDIR} 2>/dev/null || ${TRUE}" .endif .endif @@ -2739,7 +2739,7 @@ */*) args="-o $${file} $${site}$${file}";; \ *) args=$${site}$${file};; \ esac; \ - ${ECHO} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \ + ${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \ done; \ ${ECHO} "echo $${file} not fetched" ; \ fi \ @@ -2771,7 +2771,7 @@ */*) args="-o $${file} $${site}$${file}";; \ *) args=$${site}$${file};; \ esac; \ - ${ECHO} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \ + ${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \ done; \ ${ECHO} "echo $${file} not fetched" ; \ fi \ @@ -2790,7 +2790,7 @@ ${MD5} $$file >> ${MD5_FILE}; \ done) @for file in ${_IGNOREFILES}; do \ - ${ECHO} "MD5 ($$file) = IGNORE" >> ${MD5_FILE}; \ + ${ECHO_CMD} "MD5 ($$file) = IGNORE" >> ${MD5_FILE}; \ done .endif # this line goes after the ${MD5} above @@ -2852,7 +2852,7 @@ .if !target(package-name) package-name: - @${ECHO} ${PKGNAME} + @${ECHO_CMD} ${PKGNAME} .endif # Build a package but don't check the package cookie @@ -2907,11 +2907,11 @@ .if defined(DEPENDS_TMP) .if !defined(NO_DEPENDS) @for i in ${DEPENDS_TMP}; do \ - prog=`${ECHO} $$i | ${SED} -e 's/:.*//'`; \ - dir=`${ECHO} $$i | ${SED} -e 's/[^:]*://'`; \ + prog=`${ECHO_CMD} $$i | ${SED} -e 's/:.*//'`; \ + dir=`${ECHO_CMD} $$i | ${SED} -e 's/[^:]*://'`; \ if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ - target=`${ECHO} $$dir | ${SED} -e 's/.*://'`; \ - dir=`${ECHO} $$dir | ${SED} -e 's/:.*//'`; \ + target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \ + dir=`${ECHO_CMD} $$dir | ${SED} -e 's/:.*//'`; \ else \ target="${DEPENDS_TARGET}"; \ depends_args="${DEPENDS_ARGS}"; \ @@ -2966,11 +2966,11 @@ .if defined(LIB_DEPENDS) .if !defined(NO_DEPENDS) @for i in ${LIB_DEPENDS}; do \ - lib=`${ECHO} $$i | ${SED} -e 's/:.*//'`; \ - dir=`${ECHO} $$i | ${SED} -e 's/[^:]*://'`; \ + lib=`${ECHO_CMD} $$i | ${SED} -e 's/:.*//'`; \ + dir=`${ECHO_CMD} $$i | ${SED} -e 's/[^:]*://'`; \ if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ - target=`${ECHO} $$dir | ${SED} -e 's/.*://'`; \ - dir=`${ECHO} $$dir | ${SED} -e 's/:.*//'`; \ + target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \ + dir=`${ECHO_CMD} $$dir | ${SED} -e 's/:.*//'`; \ else \ target="${DEPENDS_TARGET}"; \ depends_args="${DEPENDS_ARGS}"; \ @@ -3013,8 +3013,8 @@ .if !defined(NO_DEPENDS) @for dir in ${DEPENDS}; do \ if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ - target=`${ECHO} $$dir | ${SED} -e 's/.*://'`; \ - dir=`${ECHO} $$dir | ${SED} -e 's/:.*//'`; \ + target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \ + dir=`${ECHO_CMD} $$dir | ${SED} -e 's/:.*//'`; \ else \ target="${DEPENDS_TARGET}"; \ depends_args="${DEPENDS_ARGS}"; \ @@ -3042,12 +3042,12 @@ ALL-DEPENDS-LIST= \ checked="${PARENT_CHECKED}"; \ - for dir in $$(${ECHO} "${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//') $$(${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//'); do \ + for dir in $$(${ECHO_CMD} "${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//') $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//'); do \ if [ -d $$dir ]; then \ - if (${ECHO} $$checked | ${GREP} -qwv "$$dir"); then \ + if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \ child=$$(cd $$dir; ${MAKE} PARENT_CHECKED="$$checked" all-depends-list); \ - for d in $$child; do ${ECHO} $$d; done; \ - ${ECHO} $$dir; \ + for d in $$child; do ${ECHO_CMD} $$d; done; \ + ${ECHO_CMD} $$dir; \ checked="$$dir $$child $$checked"; \ fi; \ else \ @@ -3098,9 +3098,9 @@ @${BUILD-DEPENDS-LIST} BUILD-DEPENDS-LIST= \ - for dir in $$(${ECHO} "${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u) $$(${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u); do \ + for dir in $$(${ECHO_CMD} "${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u); do \ if [ -d $$dir ]; then \ - ${ECHO} $$dir; \ + ${ECHO_CMD} $$dir; \ else \ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \ fi; \ @@ -3110,9 +3110,9 @@ @${RUN-DEPENDS-LIST} RUN-DEPENDS-LIST= \ - for dir in $$(${ECHO} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u) $$(${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u); do \ + for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u); do \ if [ -d $$dir ]; then \ - ${ECHO} $$dir; \ + ${ECHO_CMD} $$dir; \ else \ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \ fi; \ @@ -3125,12 +3125,12 @@ PACKAGE-DEPENDS-LIST= \ checked="${PARENT_CHECKED}"; \ - for dir in $$(${ECHO} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//') $$(${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//'); do \ + for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//') $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//'); do \ if [ -d $$dir ]; then \ - if (${ECHO} $$checked | ${GREP} -qwv "$$dir"); then \ + if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \ child=$$(cd $$dir; ${MAKE} PARENT_CHECKED="$$checked" package-depends-list); \ - for d in $$child; do ${ECHO} $$d; done; \ - ${ECHO} $$dir; \ + for d in $$child; do ${ECHO_CMD} $$d; done; \ + ${ECHO_CMD} $$dir; \ checked="$$dir $$child $$checked"; \ fi; \ else \ @@ -3158,7 +3158,7 @@ .if !target(describe) describe: - @${ECHO} "`perl -e ' \ + @${ECHO_CMD} "`perl -e ' \ print q{${PKGNAME}|${.CURDIR}|${PREFIX}|}; \ if (open(COMMENT, q{${COMMENT}})) { \ $$_ = <COMMENT>; \ @@ -3213,7 +3213,7 @@ .if exists(${DESCR}) @${GREP} '^WWW:[ ]' ${DESCR} | ${AWK} '{print $$2}' | ${HEAD} -1 .else - @${ECHO} + @${ECHO_CMD} .endif .if !target(readmes) @@ -3229,14 +3229,14 @@ ${.CURDIR}/README.html: @${ECHO_MSG} "===> Creating README.html for ${PKGNAME}" @${CAT} ${TEMPLATES}/README.port | \ - ${SED} -e 's%%PORT%%'`${ECHO} ${.CURDIR} | ${SED} -e 's.*/\([^/]*/[^/]*\)$$\1'`'g' \ + ${SED} -e 's%%PORT%%'`${ECHO_CMD} ${.CURDIR} | ${SED} -e 's.*/\([^/]*/[^/]*\)$$\1'`'g' \ -e 's%%PKG%%${PKGNAME}g' \ -e '/%%COMMENT%%/r${COMMENT}' \ -e '/%%COMMENT%%/d' \ - -e 's%%DESCR%%'"`${ECHO} ${DESCR} | ${SED} -e 's${.CURDIR}/'`"'' \ + -e 's%%DESCR%%'"`${ECHO_CMD} ${DESCR} | ${SED} -e 's${.CURDIR}/'`"'' \ -e 's%%BUILD_DEPENDS%%'"`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pretty-print-build-depends-list`"'' \ -e 's%%RUN_DEPENDS%%'"`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pretty-print-run-depends-list`"'' \ - -e 's%%TOP%%'"`${ECHO} ${CATEGORIES} | ${SED} -e 'sa .*aa' -e 'sa[^/]*a..ag'`"'/..' \ + -e 's%%TOP%%'"`${ECHO_CMD} ${CATEGORIES} | ${SED} -e 'sa .*aa' -e 'sa[^/]*a..ag'`"'/..' \ >> $@ # The following two targets require an up-to-date INDEX in ${PORTSDIR} @@ -3270,20 +3270,20 @@ @if [ ! -f ${PLIST} -o ! -f ${COMMENT} -o ! -f ${DESCR} ]; then ${ECHO} "** Missing package files for ${PKGNAME}."; exit 1; fi @>${TMPPLIST} @for man in ${__MANPAGES}; do \ - ${ECHO} $${man} >> ${TMPPLIST}; \ + ${ECHO_CMD} $${man} >> ${TMPPLIST}; \ done .for _PREFIX in ${PREFIX} .if ${_TMLINKS:M${_PREFIX}*}x != x @for i in ${_TMLINKS:M${_PREFIX}*:S,^${_PREFIX}/,,}; do \ - ${ECHO} "$$i" >> ${TMPPLIST}; \ + ${ECHO_CMD} "$$i" >> ${TMPPLIST}; \ done .endif .if ${_TMLINKS:N${_PREFIX}*}x != x - @${ECHO} @cwd / >> ${TMPPLIST} + @${ECHO_CMD} @cwd / >> ${TMPPLIST} @for i in ${_TMLINKS:N${_PREFIX}*:S,^/,,}; do \ - ${ECHO} "$$i" >> ${TMPPLIST}; \ + ${ECHO_CMD} "$$i" >> ${TMPPLIST}; \ done - @${ECHO} '@cwd ${PREFIX}' >> ${TMPPLIST} + @${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST} .endif .if ${XFREE86_HTML_MAN} == "yes" .for mansect in 1 2 3 4 5 6 7 8 9 L N @@ -3295,11 +3295,11 @@ .endfor @${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST} .if !defined(NO_MTREE) - @${ECHO} "@unexec if [ -f %D/info/dir ]; then if sed -e '1,/Menu:/d' %D/info/dir | grep -q '^[*] '; then true; else rm %D/info/dir; fi; fi" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec if [ -f %D/info/dir ]; then if sed -e '1,/Menu:/d' %D/info/dir | grep -q '^[*] '; then true; else rm %D/info/dir; fi; fi" >> ${TMPPLIST} .endif .if defined(INSTALLS_SHLIB) - @${ECHO} "@exec ${LDCONFIG} -m ${LDCONFIG_PLIST}" >> ${TMPPLIST} - @${ECHO} "@unexec ${LDCONFIG} -R" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${LDCONFIG} -m ${LDCONFIG_PLIST}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${LDCONFIG} -R" >> ${TMPPLIST} .endif .if !defined(NO_FILTER_SHLIBS) .if (${PORTOBJFORMAT} == "aout") @@ -3329,7 +3329,7 @@ while :; do \ [ $$# -eq 0 ] && break || ${TRUE}; \ ${RM} -f $${2%.gz}; ${RM} -f $$2.gz; \ - ${LN} -fs `${ECHO} $$1 $$2 | ${AWK} '{ \ + ${LN} -fs `${ECHO_CMD} $$1 $$2 | ${AWK} '{ \ z=split($$1, a, /\//); x=split($$2, b, /\//); \ while (a[i] == b[i]) i++; \ for (q=i; q<x; q++) printf "../"; \ @@ -3375,7 +3375,7 @@ if [ -d ${PKG_DBDIR}/$$dep -a -z `echo $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \ if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \ >/dev/null 2>&1; then \ - ${ECHO} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \ + ${ECHO_CMD} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \ fi; \ fi; \ done; \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86zo2xb9vm.wl>