From owner-svn-ports-all@FreeBSD.ORG  Wed Mar 12 11:36:05 2014
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BFA22A45;
 Wed, 12 Mar 2014 11:36:05 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id ACE7BEDC;
 Wed, 12 Mar 2014 11:36:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2CBa5gZ045986;
 Wed, 12 Mar 2014 11:36:05 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2CBa5pW045985;
 Wed, 12 Mar 2014 11:36:05 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201403121136.s2CBa5pW045985@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 12 Mar 2014 11:36:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347976 - 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.17
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, 12 Mar 2014 11:36:05 -0000

Author: bapt
Date: Wed Mar 12 11:36:05 2014
New Revision: 347976
URL: http://svnweb.freebsd.org/changeset/ports/347976
QAT: https://qat.redports.org/buildarchive/r347976/

Log:
  Fix collision with DEPRECATED
  
  Pointyhat to:	bapt

Modified:
  head/Mk/bsd.sanity.mk

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Wed Mar 12 11:20:47 2014	(r347975)
+++ head/Mk/bsd.sanity.mk	Wed Mar 12 11:36:05 2014	(r347976)
@@ -112,11 +112,11 @@ DEV_WARNING+=	"USE_PYDISTUTILS=easy_inst
 DEV_WARNING+=	"PYDISTUTILS_PKGNAME has no effect for USE_PYDISTUTILS=yes and PYDISTUTILS_AUTOPLIST=yes"
 .endif
 
-UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
+SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \
 		USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \
 		USE_GETTEXT
-DEPRECATED=	USE_XZ USE_BZIP2 USE_GMAKE USE_SCONS
+SANITY_DEPRECATED=	USE_XZ USE_BZIP2 USE_GMAKE USE_SCONS
 
 USE_OPENAL_ALT=		USES=openal
 USE_FAM_ALT=		USES=fam
@@ -138,13 +138,13 @@ USE_FUSE_ALT=		USES=fuse
 USE_GETTEXT_ALT=	USES=gettext
 USE_SCONS_ALT=		USES=scons
 
-.for a in ${DEPRECATED}
+.for a in ${SANITY_DEPRECATED}
 .if defined(${a})
 DEV_WARNING+=	"${a} is deprecated, please use ${${a}_ALT}"
 .endif
 .endfor
 
-.for a in ${UNSUPPORTED}
+.for a in ${SANITY_UNSUPPORTED}
 .if defined(${a})
 DEV_ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
 .endif