From owner-svn-ports-all@FreeBSD.ORG Tue Jun 2 03:25:01 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38A0FADA; Tue, 2 Jun 2015 03:25:01 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26B1414CC; Tue, 2 Jun 2015 03:25:01 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t523P1xl011748; Tue, 2 Jun 2015 03:25:01 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t523P1I7011747; Tue, 2 Jun 2015 03:25:01 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201506020325.t523P1I7011747@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Tue, 2 Jun 2015 03:25:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388301 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2015 03:25:01 -0000 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}; \