diff options
| author | will <will@FreeBSD.org> | 2014-10-01 15:02:37 +0000 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2014-10-01 15:02:37 +0000 |
| commit | 2a6acc2651ff252779e7c43d6045a132ec86189a (patch) | |
| tree | f17c0a11e28f61758be3f3eb005cc0eedcbfb245 /share | |
| parent | 3308b6475400d8cf22c4e868759a862dbac3d2a3 (diff) | |
| download | FreeBSD-src-2a6acc2651ff252779e7c43d6045a132ec86189a.zip FreeBSD-src-2a6acc2651ff252779e7c43d6045a132ec86189a.tar.gz | |
Always resolve PORTSDIR to absolute paths using realpath(1).
Reported by: madpilot
Reviewed by: bapt
X-MFC-With: 272282
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.port.mk | 8 | ||||
| -rw-r--r-- | share/mk/bsd.port.subdir.mk | 8 |
2 files changed, 8 insertions, 8 deletions
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 |
