From owner-svn-ports-all@FreeBSD.ORG  Mon Jan 20 07:42:00 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 B233774E;
 Mon, 20 Jan 2014 07:42:00 +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 9E1E01AF0;
 Mon, 20 Jan 2014 07:42:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0K7g0Qs045374;
 Mon, 20 Jan 2014 07:42:00 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0K7g0kF045373;
 Mon, 20 Jan 2014 07:42:00 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401200742.s0K7g0kF045373@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 20 Jan 2014 07:42:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340369 - 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: Mon, 20 Jan 2014 07:42:00 -0000

Author: bapt
Date: Mon Jan 20 07:42:00 2014
New Revision: 340369
URL: http://svnweb.freebsd.org/changeset/ports/340369
QAT: https://qat.redports.org/buildarchive/r340369/

Log:
  NO_STAGEd ports will fail if STAGEDIR is defined.
  
  Undefined STAGEDIR if already set from make.conf
  Raise an error if set from command line (which cannot be undefined)
  
  PR:		ports/182972
  Submitted by:	"Scot W. Hetzel" <swhetzel@gmail.com>

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Jan 20 07:32:06 2014	(r340368)
+++ head/Mk/bsd.port.mk	Mon Jan 20 07:42:00 2014	(r340369)
@@ -1821,6 +1821,11 @@ RUN_DEPENDS+=	${_GL_${_component}_RUN_DE
 
 .if !defined(NO_STAGE)
 .include "${PORTSDIR}/Mk/bsd.stage.mk"
+.else
+# Ignore STAGEDIR if set from make.conf
+.undef STAGEDIR
+# From command line it is impossible to undefined so we must raise an error
+IGNORE=	Do not define STAGEDIR in command line
 .endif
 
 .if defined(WITH_PKGNG)