Page MenuHomeFreeBSD
Files F111162367

D2706.id5872.diff
No OneTemporary
Actions

D2706.id5872.diff
View Options

Index: head/Mk/Uses/uniquefiles.mk
===================================================================
--- head/Mk/Uses/uniquefiles.mk
+++ head/Mk/Uses/uniquefiles.mk
@@ -92,7 +92,7 @@
.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 @@
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 @@
@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 @@
.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 @@
@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}; \

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 6:41 AM (18 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16894389
Default Alt Text
D2706.id5872.diff (2 KB)

Event Timeline