diff options
| author | koobs <koobs@FreeBSD.org> | 2015-06-02 11:25:00 +0800 |
|---|---|---|
| committer | koobs <koobs@FreeBSD.org> | 2015-06-02 11:25:00 +0800 |
| commit | 7a2f02edebe1ed15b740a4cf36e2a4c1b2ab5f7d (patch) | |
| tree | cd2ad4a6a0d87bbf29ae5972032a1d3cdb574969 /Mk/Uses | |
| parent | d1082c7412bffb15176ec4d36096e4887c19a42d (diff) | |
| download | freebsd-ports-gnome-7a2f02edebe1ed15b740a4cf36e2a4c1b2ab5f7d.tar.gz freebsd-ports-gnome-7a2f02edebe1ed15b740a4cf36e2a4c1b2ab5f7d.tar.zst freebsd-ports-gnome-7a2f02edebe1ed15b740a4cf36e2a4c1b2ab5f7d.zip | |
Mk/Uses/uniquefiles.mk: Clearer and less ambiguous output
Make output messaging clearer about what uniquefiles is doing
especially with regard to moving and linking (default links).
- Add "action" prefix (Move, Link) to operations performed
- Use the form "Creating unique files" for the stage summary
- Be clear that we're processing files that *need* prefixes or
suffixes, and not moving files that *have* prefixes or suffixes"
Differential Revision: https://reviews.freebsd.org/D2706
Reviewed by: mat
Approved by: mat (portmgr)
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/uniquefiles.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Mk/Uses/uniquefiles.mk b/Mk/Uses/uniquefiles.mk index 1f073e16f952..c29fe9d00678 100644 --- a/Mk/Uses/uniquefiles.mk +++ b/Mk/Uses/uniquefiles.mk @@ -92,7 +92,7 @@ _UNIQUEPKGLIST= ${WRKDIR}/.PLIST.uniquefiles .if ${UNIQUE_DEFAULT_LINKS} == yes _DO_CONDITIONAL_SYMLINK= \ if [ ! -e ${STAGEDIR}${PREFIX}/$${fname} -a ! -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ - ${ECHO_MSG} " $${newf} --> @$${fname}"; \ + ${ECHO_MSG} "Link: @$${fname} --> $${newf}"; \ ${LN} -s ${PREFIX}/$${newf} ${STAGEDIR}${PREFIX}/$${fname}; \ ${ECHO_CMD} LINKED:$${newf}:$${fname} >> ${_UNIQUEPKGLIST}; \ fi @@ -103,13 +103,13 @@ _DO_CONDITIONAL_SYMLINK= ${DO_NADA} move-uniquefiles: .if ${UNIQUE_PREFIX_FILES} || ${UNIQUE_FIND_PREFIX_FILES} - @${ECHO_MSG} "===> Moving prefixed files around"; + @${ECHO_MSG} "===> Creating unique files: Move files needing PREFIX"; .endif .for entry in ${UNIQUE_PREFIX_FILES} @fname=${entry}; \ if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ newf=$${fname%/*}/${UNIQUE_PREFIX}$${fname##*/} ; \ - ${ECHO_MSG} " $${fname} --> $${newf}" ; \ + ${ECHO_MSG} "Move: $${fname} --> $${newf}" ; \ ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ ${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \ ${_DO_CONDITIONAL_SYMLINK}; \ @@ -122,7 +122,7 @@ move-uniquefiles: @for fname in `${UNIQUE_FIND_PREFIX_FILES}`; do \ if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ newf=$${fname%/*}/${UNIQUE_PREFIX}$${fname##*/} ; \ - ${ECHO_MSG} " $${fname} --> $${newf}" ; \ + ${ECHO_MSG} "Move: $${fname} --> $${newf}" ; \ ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ ${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \ ${_DO_CONDITIONAL_SYMLINK}; \ @@ -134,13 +134,13 @@ move-uniquefiles: .endif .if ${UNIQUE_SUFFIX_FILES} || ${UNIQUE_FIND_SUFFIX_FILES} - @${ECHO_MSG} "===> Moving suffixed files around"; + @${ECHO_MSG} "===> Creating unique files: Move files needing SUFFIX"; .endif .for entry in ${UNIQUE_SUFFIX_FILES} @fname=${entry}; \ if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \ - ${ECHO_MSG} " $${fname} --> $${newf}"; \ + ${ECHO_MSG} "Move: $${fname} --> $${newf}"; \ ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ ${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \ ${_DO_CONDITIONAL_SYMLINK}; \ @@ -153,7 +153,7 @@ move-uniquefiles: @for fname in `${UNIQUE_FIND_SUFFIX_FILES}`; do \ if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \ - ${ECHO_MSG} " $${fname} --> $${newf}"; \ + ${ECHO_MSG} "Move: $${fname} --> $${newf}"; \ ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ ${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \ ${_DO_CONDITIONAL_SYMLINK}; \ |