aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-04-15 23:49:01 +0800
committerbdrewery <bdrewery@FreeBSD.org>2015-04-15 23:49:01 +0800
commit2a5f871421b73bc36e2868674fe3f63b8ce9e4d3 (patch)
treea0bcbc0f21052bf9accc6158bc775881fc9b8b07
parentbc3642e6353997b1b6f6e408bec91905fd5f8b6d (diff)
downloadfreebsd-ports-gnome-2a5f871421b73bc36e2868674fe3f63b8ce9e4d3.tar.gz
freebsd-ports-gnome-2a5f871421b73bc36e2868674fe3f63b8ce9e4d3.tar.zst
freebsd-ports-gnome-2a5f871421b73bc36e2868674fe3f63b8ce9e4d3.zip
Rework change from r383665 for CATEGORY validation so it does not show a
warning when PORTSDIR is set to a directory that is symlinked to the real ports directory. Reported by: smh With hat: portmgr
-rw-r--r--Mk/bsd.sanity.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index f182bb70e6d8..e965a117c7d4 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -15,7 +15,7 @@ WARNING+= "WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no eff
WARNING+= "WITH_KMS was removed and has no effect"
.endif
-.if ${.CURDIR:M${PORTSDIR}*}
+.if exists(${.CURDIR}/../../Mk/bsd.port.mk)
.if ${.CURDIR:H:T} != ${PKGCATEGORY}
DEV_ERROR+= "The first entry in CATEGORIES should be the directory where the port lives"
.endif