From owner-svn-ports-all@FreeBSD.ORG Thu Apr 9 17:34:03 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B837B30C; Thu, 9 Apr 2015 17:34:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A2E53BDE; Thu, 9 Apr 2015 17:34:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t39HY3oA027988; Thu, 9 Apr 2015 17:34:03 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t39HY3bU027987; Thu, 9 Apr 2015 17:34:03 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201504091734.t39HY3bU027987@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 9 Apr 2015 17:34:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383665 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Apr 2015 17:34:03 -0000 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"