svn commit: r383665 - head/Mk

Bryan Drewery bdrewery at FreeBSD.org
Thu Apr 9 17:34:03 UTC 2015


Author: bdrewery
Date: Thu Apr  9 17:34:02 2015
New Revision: 383665
URL: https://svnweb.freebsd.org/changeset/ports/383665

Log:
  Follow-up the check added in r383191 for validating the first CATEGORY so it
  does not error when using ports outside of PORTSDIR and the general ports
  directory structure.
  
  With hat:	portmgr
  Tested by:	amdmi3, danfe
  Reported by:	amdmi3

Modified:
  head/Mk/bsd.sanity.mk

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Thu Apr  9 17:21:32 2015	(r383664)
+++ head/Mk/bsd.sanity.mk	Thu Apr  9 17:34:02 2015	(r383665)
@@ -15,9 +15,13 @@ WARNING+=	"WITH_NEW_XORG and WITHOUT_NEW
 WARNING+=	"WITH_KMS was removed and has no effect"
 .endif
 
+.if ${.CURDIR:M${PORTSDIR}*}
 .if ${.CURDIR:H:T} != ${PKGCATEGORY}
 DEV_ERROR+=	"The first entry in CATEGORIES should be the directory where the port lives"
 .endif
+.else
+WARNING+=	"Not validating first entry in CATEGORIES due to being outside of PORTSDIR. Please ensure this is proper when committing."
+.endif
 
 #.if defined(WITHOUT_X11)
 #WARNING+=	"WITHOUT_X11 is deprecated use X11 option instead"


More information about the svn-ports-all mailing list