From owner-svn-ports-head@freebsd.org Thu Apr 20 11:13:38 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E308BD457C2; Thu, 20 Apr 2017 11:13:38 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B3A37208; Thu, 20 Apr 2017 11:13:38 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3KBDbWO049902; Thu, 20 Apr 2017 11:13:37 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3KBDb45049901; Thu, 20 Apr 2017 11:13:37 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201704201113.v3KBDb45049901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 20 Apr 2017 11:13:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438939 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2017 11:13:39 -0000 Author: mat Date: Thu Apr 20 11:13:37 2017 New Revision: 438939 URL: https://svnweb.freebsd.org/changeset/ports/438939 Log: Use the new ${RLN} relative symlink magic to create uniquefiles. Before, the symlinks were created as absolute paths, so it would look like this: $ ls -l /usr/local/bin/ [...] lrwxr-xr-x 1 root wheel 12 Apr 14 14:28 autopep8 -> /usr/local/bin/autopep8-2.7 -rwxr-xr-x 1 root wheel 395 Apr 14 14:28 autopep8-2.7 [...] After, the symlinks are created with relative paths: $ ls -l /usr/local/bin/ [...] lrwxr-xr-x 1 root wheel 12 Apr 14 14:28 autopep8 -> autopep8-2.7 -rwxr-xr-x 1 root wheel 395 Apr 14 14:28 autopep8-2.7 [...] Reviewed by: bapt Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D10395 Modified: head/Mk/Uses/uniquefiles.mk Modified: head/Mk/Uses/uniquefiles.mk ============================================================================== --- head/Mk/Uses/uniquefiles.mk Thu Apr 20 11:13:32 2017 (r438938) +++ head/Mk/Uses/uniquefiles.mk Thu Apr 20 11:13:37 2017 (r438939) @@ -93,7 +93,7 @@ _UNIQUEPKGLIST= ${WRKDIR}/.PLIST.unique _DO_CONDITIONAL_SYMLINK= \ if [ ! -e ${STAGEDIR}${PREFIX}/$${fname} -a ! -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ ${ECHO_MSG} "Link: @$${fname} --> $${newf}"; \ - ${LN} -s ${PREFIX}/$${newf} ${STAGEDIR}${PREFIX}/$${fname}; \ + ${RLN} ${STAGEDIR}${PREFIX}/$${newf} ${STAGEDIR}${PREFIX}/$${fname}; \ ${ECHO_CMD} LINKED:$${newf}:$${fname} >> ${_UNIQUEPKGLIST}; \ fi .else