From owner-svn-ports-all@FreeBSD.ORG  Mon Aug 25 22:10:43 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 051AA867;
 Mon, 25 Aug 2014 22:10:43 +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 D2627322E;
 Mon, 25 Aug 2014 22:10:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMAgpp063683;
 Mon, 25 Aug 2014 22:10:42 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMAgGs063681;
 Mon, 25 Aug 2014 22:10:42 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201408252210.s7PMAgGs063681@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 25 Aug 2014 22:10:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r366159 - in head/Mk: . Scripts
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 <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, 25 Aug 2014 22:10:43 -0000

Author: antoine
Date: Mon Aug 25 22:10:42 2014
New Revision: 366159
URL: http://svnweb.freebsd.org/changeset/ports/366159
QAT: https://qat.redports.org/buildarchive/r366159/

Log:
  Check that the plist doesn't reference the stage dir during stage-qa
  
  ====> Running Q/A tests (stage-qa)
  Error: '/usr/ports/www/claroline/work/.PLIST.mktmp' is referring to /usr/ports/www/claroline/work/stage
  *** Error code 1
  
  Differential Revision: https://reviews.freebsd.org/D685
  Reviewed by:	bdrewery
  With hat:	portmgr

Modified:
  head/Mk/Scripts/qa.sh
  head/Mk/bsd.stage.mk

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Mon Aug 25 22:06:03 2014	(r366158)
+++ head/Mk/Scripts/qa.sh	Mon Aug 25 22:10:42 2014	(r366159)
@@ -126,7 +126,7 @@ paths() {
 		rc=1
 	# Use heredoc to avoid losing rc from find|while subshell
 	done <<-EOF
-	$(find ${STAGEDIR} -type f -exec grep -l "${STAGEDIR}" {} +)
+	$(find ${TMPPLIST} ${STAGEDIR} -type f -exec grep -l "${STAGEDIR}" {} +)
 	EOF
 
 	return ${rc}

Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk	Mon Aug 25 22:06:03 2014	(r366158)
+++ head/Mk/bsd.stage.mk	Mon Aug 25 22:10:42 2014	(r366159)
@@ -13,7 +13,8 @@ MAKE_ARGS+=	${DESTDIRNAME}=${STAGEDIR}
 QA_ENV+=	STAGEDIR=${STAGEDIR} \
 		PREFIX=${PREFIX} \
 		LOCALBASE=${LOCALBASE} \
-		"STRIP=${STRIP}"
+		"STRIP=${STRIP}" \
+		TMPPLIST=${TMPPLIST}
 .if !empty(USES:Mdesktop-file-utils)
 QA_ENV+=	USESDESKTOPFILEUTILS=yes
 .endif