Page MenuHomeFreeBSD
Files F169206268

D799.diff
No OneTemporary
Actions

D799.diff
View Options

Index: share/mk/bsd.port.mk
===================================================================
--- share/mk/bsd.port.mk
+++ share/mk/bsd.port.mk
@@ -1,6 +1,22 @@
# $FreeBSD$
-PORTSDIR?= /usr/ports
+.if !defined(PORTSDIR)
+# Autodetect if the command is being run in a ports tree that's not rooted
+# 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}
+.elif exists(${.CURDIR}/../Mk/bsd.port.mk)
+PORTSDIR= ${.CURDIR}/..
+.elif exists(${.CURDIR}/../../Mk/bsd.port.mk)
+PORTSDIR= ${.CURDIR}/../..
+.elif exists(${.CURDIR}/../../../Mk/bsd.port.mk)
+PORTSDIR= ${.CURDIR}/../../..
+.else
+PORTSDIR= /usr/ports
+.endif
+.endif
+
BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk
# Needed to keep bsd.own.mk from reading in /etc/src.conf
Index: share/mk/bsd.port.subdir.mk
===================================================================
--- share/mk/bsd.port.subdir.mk
+++ share/mk/bsd.port.subdir.mk
@@ -1,6 +1,22 @@
# $FreeBSD$
-PORTSDIR?= /usr/ports
+.if !defined(PORTSDIR)
+# Autodetect if the command is being run in a ports tree that's not rooted
+# 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}
+.elif exists(${.CURDIR}/../Mk/bsd.port.mk)
+PORTSDIR= ${.CURDIR}/..
+.elif exists(${.CURDIR}/../../Mk/bsd.port.mk)
+PORTSDIR= ${.CURDIR}/../..
+.elif exists(${.CURDIR}/../../../Mk/bsd.port.mk)
+PORTSDIR= ${.CURDIR}/../../..
+.else
+PORTSDIR= /usr/ports
+.endif
+.endif
+
BSDPORTSUBDIRMK?= ${PORTSDIR}/Mk/bsd.port.subdir.mk
.include "${BSDPORTSUBDIRMK}"

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 1, 8:11 PM (15 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37747849
Default Alt Text
D799.diff (1 KB)

Event Timeline