From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 15 15:49:02 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9171CEBE;
 Wed, 15 Apr 2015 15:49:02 +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 7BC3D25D;
 Wed, 15 Apr 2015 15:49:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3FFn2WZ038946;
 Wed, 15 Apr 2015 15:49:02 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3FFn2uC038945;
 Wed, 15 Apr 2015 15:49:02 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201504151549.t3FFn2uC038945@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 15 Apr 2015 15:49:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r384058 - 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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Apr 2015 15:49:02 -0000

Author: bdrewery
Date: Wed Apr 15 15:49:01 2015
New Revision: 384058
URL: https://svnweb.freebsd.org/changeset/ports/384058

Log:
  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

Modified:
  head/Mk/bsd.sanity.mk

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Wed Apr 15 15:35:05 2015	(r384057)
+++ head/Mk/bsd.sanity.mk	Wed Apr 15 15:49:01 2015	(r384058)
@@ -15,7 +15,7 @@ WARNING+=	"WITH_NEW_XORG and WITHOUT_NEW
 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