svn commit: r388301 - head/Mk/Uses
Kubilay Kocak
koobs at FreeBSD.org
Tue Jun 2 03:25:01 UTC 2015
Author: koobs
Date: Tue Jun 2 03:25:00 2015
New Revision: 388301
URL: https://svnweb.freebsd.org/changeset/ports/388301
Log:
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)
Modified:
head/Mk/Uses/uniquefiles.mk
Modified: head/Mk/Uses/uniquefiles.mk
==============================================================================
--- head/Mk/Uses/uniquefiles.mk Tue Jun 2 02:53:44 2015 (r388300)
+++ head/Mk/Uses/uniquefiles.mk Tue Jun 2 03:25:00 2015 (r388301)
@@ -92,7 +92,7 @@ _UNIQUEPKGLIST= ${WRKDIR}/.PLIST.unique
.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}; \
More information about the svn-ports-all
mailing list