svn commit: r450002 - head/Mk

[Joseph Mingrone]

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 at utahime.org, rum1cro at 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