From 2a6acc2651ff252779e7c43d6045a132ec86189a Mon Sep 17 00:00:00 2001 From: will Date: Wed, 1 Oct 2014 15:02:37 +0000 Subject: Always resolve PORTSDIR to absolute paths using realpath(1). Reported by: madpilot Reviewed by: bapt X-MFC-With: 272282 --- share/mk/bsd.port.mk | 8 ++++---- share/mk/bsd.port.subdir.mk | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index ca9f857..0800c71 100644 --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -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 diff --git a/share/mk/bsd.port.subdir.mk b/share/mk/bsd.port.subdir.mk index bdf07d5..55a1a7e 100644 --- a/share/mk/bsd.port.subdir.mk +++ b/share/mk/bsd.port.subdir.mk @@ -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 -- cgit v1.1