svn commit: r272363 - head/share/mk

[Will Andrews]

Author: will
Date: Wed Oct  1 15:02:37 2014
New Revision: 272363
URL: https://svnweb.freebsd.org/changeset/base/272363

Log:
  Always resolve PORTSDIR to absolute paths using realpath(1).
  
  Reported by:	madpilot
  Reviewed by:	bapt
  X-MFC-With:	272282

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

Modified: head/share/mk/bsd.port.mk
==============================================================================
--- head/share/mk/bsd.port.mk	Wed Oct  1 15:00:21 2014	(r272362)
+++ head/share/mk/bsd.port.mk	Wed Oct  1 15:02:37 2014	(r272363)
@@ -5,13 +5,13 @@
 # in the default /usr/ports.  The ../../.. case is in case ports ever grows
 # a third level.
 .if exists(${.CURDIR}/Mk/bsd.port.mk)
-PORTSDIR=	${.CURDIR}
+PORTSDIR!=	realpath ${.CURDIR}
 .elif exists(${.CURDIR}/../Mk/bsd.port.mk)
-PORTSDIR=	${.CURDIR}/..
+PORTSDIR!=	realpath ${.CURDIR}/..
 .elif exists(${.CURDIR}/../../Mk/bsd.port.mk)
-PORTSDIR=	${.CURDIR}/../..
+PORTSDIR!=	realpath ${.CURDIR}/../..
 .elif exists(${.CURDIR}/../../../Mk/bsd.port.mk)
-PORTSDIR=	${.CURDIR}/../../..
+PORTSDIR!=	realpath ${.CURDIR}/../../..
 .else
 PORTSDIR=	/usr/ports
 .endif

Modified: head/share/mk/bsd.port.subdir.mk
==============================================================================
--- head/share/mk/bsd.port.subdir.mk	Wed Oct  1 15:00:21 2014	(r272362)
+++ head/share/mk/bsd.port.subdir.mk	Wed Oct  1 15:02:37 2014	(r272363)
@@ -5,13 +5,13 @@
 # in the default /usr/ports.  The ../../.. case is in case ports ever grows
 # a third level.
 .if exists(${.CURDIR}/Mk/bsd.port.mk)
-PORTSDIR=	${.CURDIR}
+PORTSDIR!=	realpath ${.CURDIR}
 .elif exists(${.CURDIR}/../Mk/bsd.port.mk)
-PORTSDIR=	${.CURDIR}/..
+PORTSDIR!=	realpath ${.CURDIR}/..
 .elif exists(${.CURDIR}/../../Mk/bsd.port.mk)
-PORTSDIR=	${.CURDIR}/../..
+PORTSDIR!=	realpath ${.CURDIR}/../..
 .elif exists(${.CURDIR}/../../../Mk/bsd.port.mk)
-PORTSDIR=	${.CURDIR}/../../..
+PORTSDIR!=	realpath ${.CURDIR}/../../..
 .else
 PORTSDIR=	/usr/ports
 .endif