aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.sanity.mk
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2016-12-25 12:46:14 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2016-12-25 12:46:14 +0000
commitdd2c2cb23e4001d59d07433af1283576a545b9bc (patch)
treeec0736641ebe66daed6945bdd8e75c9b52ebc51e /Mk/bsd.sanity.mk
parent91bbddb9250de6cfc0c750acb01ef6f61362507d (diff)
downloadports-dd2c2cb23e4001d59d07433af1283576a545b9bc.tar.gz
ports-dd2c2cb23e4001d59d07433af1283576a545b9bc.zip
Revert r429298 it has some unexpected side effects which I do not have time to
fix yet Approved by: portmgr (implicit)
Notes
Notes: svn path=/head/; revision=429411
Diffstat (limited to 'Mk/bsd.sanity.mk')
-rw-r--r--Mk/bsd.sanity.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index a0e2f3f5a332..913852be5b38 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -15,8 +15,8 @@ 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 exists(${.CURDIR}/../../Mk/bsd.port.mk) || exists(${.CURDIR}/../../../Mk/bsd.port.mk)
-.if ${PKGORIGIN:C/\/.*//} != ${PKGCATEGORY}
+.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
.else