From owner-svn-ports-head@freebsd.org  Sun Sep 17 14:20:16 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
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 3DF26E14B37;
 Sun, 17 Sep 2017 14:20:16 +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 0DA64637;
 Sun, 17 Sep 2017 14:20:15 +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 v8HEKFRJ084735;
 Sun, 17 Sep 2017 14:20:15 GMT (envelope-from jrm@FreeBSD.org)
Received: (from jrm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8HEKFrv084734;
 Sun, 17 Sep 2017 14:20:15 GMT (envelope-from jrm@FreeBSD.org)
Message-Id: <201709171420.v8HEKFrv084734@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: Sun, 17 Sep 2017 14:20:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r450002 - head/Mk
X-SVN-Group: ports-head
X-SVN-Commit-Author: jrm
X-SVN-Commit-Paths: head/Mk
X-SVN-Commit-Revision: 450002
X-SVN-Commit-Repository: ports
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Sep 2017 14:20:16 -0000

Author: jrm
Date: Sun Sep 17 14:20:14 2017
New Revision: 450002
URL: https://svnweb.freebsd.org/changeset/ports/450002

Log:
  Ensure .CURDIR contains an absolute path without a trailing slash.
  
  Failed builds can occur when PORTSDIR is a symbolic link, or with
  
  make -C /usr/ports/category/port/
  
  PR:		221296
  Reported by:	yasu@utahime.org, rum1cro@yandex.ru
  Reviewed by:	bdrewery, sjg
  Approved by:	portmgr (bdrewery)
  Differential Revision:	https://reviews.freebsd.org/D11934

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sun Sep 17 13:51:04 2017	(r450001)
+++ head/Mk/bsd.port.mk	Sun Sep 17 14:20:14 2017	(r450002)
@@ -1061,6 +1061,11 @@ MINIMAL_PKG_VERSION=	1.6.0
 _PORTS_DIRECTORIES+=	${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \
 						${STAGEDIR}${PREFIX} ${WRKDIR}/pkg
 
+# 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}
+
 # make sure bmake treats -V as expected
 .MAKE.EXPAND_VARIABLES= yes