From owner-svn-ports-all@freebsd.org  Thu Nov  9 21:48:59 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 8CE4AE5D467;
 Thu,  9 Nov 2017 21:48:59 +0000 (UTC) (envelope-from jrm@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 517977A389;
 Thu,  9 Nov 2017 21:48:59 +0000 (UTC) (envelope-from jrm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA9Lmwg6005958;
 Thu, 9 Nov 2017 21:48:58 GMT (envelope-from jrm@FreeBSD.org)
Received: (from jrm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA9Lmwa6005957;
 Thu, 9 Nov 2017 21:48:58 GMT (envelope-from jrm@FreeBSD.org)
Message-Id: <201711092148.vA9Lmwa6005957@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org
 using -f
From: Joseph Mingrone <jrm@FreeBSD.org>
Date: Thu, 9 Nov 2017 21:48:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r453873 - head/Mk
X-SVN-Group: ports-head
X-SVN-Commit-Author: jrm
X-SVN-Commit-Paths: head/Mk
X-SVN-Commit-Revision: 453873
X-SVN-Commit-Repository: ports
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Nov 2017 21:48:59 -0000

Author: jrm
Date: Thu Nov  9 21:48:58 2017
New Revision: 453873
URL: https://svnweb.freebsd.org/changeset/ports/453873

Log:
  Ensure .CURDIR contains an absolute path without a trailing slash.
  
  Problems can occur when PORTSDIR is a symbolic link, or e.g.,
  
  make -C /usr/ports/ search key='!*'
  
  See also:
  
  r450002
  https://lists.freebsd.org/pipermail/freebsd-current/2017-November/067386.html
  
  Submitted by:	 rum1cro@yandex.ru
  Reported by:	 sergey.dyatko@gmail.com
  Approved by:	 portmgr (bdrewery)
  Differential Revision:	https://reviews.freebsd.org/D13019

Modified:
  head/Mk/bsd.port.subdir.mk

Modified: head/Mk/bsd.port.subdir.mk
==============================================================================
--- head/Mk/bsd.port.subdir.mk	Thu Nov  9 21:33:21 2017	(r453872)
+++ head/Mk/bsd.port.subdir.mk	Thu Nov  9 21:48:58 2017	(r453873)
@@ -47,6 +47,11 @@ README=			${TEMPLATES}/README.category
 MOVEDDIR?=		${PORTSDIR}
 MOVEDFILE?=		MOVED
 
+# Ensure .CURDIR contains an absolute path without a trailing slash.  Failed
+# builds can occur when PORTSDIR is a symbolic link, or with something like
+# make -C /usr/ports/category/port/.
+.CURDIR:=		${.CURDIR:tA}
+
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
 .MAIN: all