Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Apr 2015 15:49:02 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r384058 - head/Mk
Message-ID:  <201504151549.t3FFn2uC038945@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504151549.t3FFn2uC038945>