From owner-svn-ports-head@FreeBSD.ORG  Tue Jan 28 22:19:31 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 600E62D5;
 Tue, 28 Jan 2014 22:19:31 +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 4BA121F9F;
 Tue, 28 Jan 2014 22:19:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SMJVYk002085;
 Tue, 28 Jan 2014 22:19:31 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SMJUq4002083;
 Tue, 28 Jan 2014 22:19:30 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201401282219.s0SMJUq4002083@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 28 Jan 2014 22:19:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341664 - 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Jan 2014 22:19:31 -0000

Author: antoine
Date: Tue Jan 28 22:19:30 2014
New Revision: 341664
URL: http://svnweb.freebsd.org/changeset/ports/341664
QAT: https://qat.redports.org/buildarchive/r341664/

Log:
  - Do not check for ${WRKDIR} in staged files, there are lots of false
    positives as some .o files may embed the source path [1]
  - Only check shebang of files with executable bit set
  
  Requested by:	bapt [1]
  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	Tue Jan 28 22:13:46 2014	(r341663)
+++ head/Mk/Scripts/qa.sh	Tue Jan 28 22:19:30 2014	(r341664)
@@ -20,7 +20,7 @@ err() {
 
 shebang() {
 	rc=0
-	IFS="$LF" ; for f in `find ${STAGEDIR} -type f`; do
+	IFS="$LF" ; for f in `find ${STAGEDIR} -type f -perm +111`; do
 		interp=$(sed -n -e '1s/^#![[:space:]]*\([^[:space:]]*\).*/\1/p;2q' $f)
 		case "$interp" in
 		"") ;;
@@ -55,12 +55,10 @@ symlinks() {
 paths() {
 	rc=0
 	IFS="$LF" ; for f in `find ${STAGEDIR} -type f`;do
-		for d in ${STAGEDIR} ${WRKDIR}; do
-			if grep -q ${d} ${f} ; then
-				err "${f} is referring to ${d}"
-				rc=1
-			fi
-		done
+		if grep -q ${STAGEDIR} ${f} ; then
+			err "${f} is referring to ${STAGEDIR}"
+			rc=1
+		fi
 	done
 }
 

Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk	Tue Jan 28 22:13:46 2014	(r341663)
+++ head/Mk/bsd.stage.mk	Tue Jan 28 22:19:30 2014	(r341664)
@@ -13,7 +13,6 @@ MAKE_ARGS+=	${DESTDIRNAME}=${STAGEDIR}
 QA_ENV+=	STAGEDIR=${STAGEDIR} \
 		PREFIX=${PREFIX} \
 		LOCALBASE=${LOCALBASE} \
-		WRKDIR=${WRKDIR} \
 		USESDESKTOPFILEUTILS=${USES:Mdesktop-file-utils} \
 		USESSHAREDMIMEINFO=${USES:Mshared-mime-info} \
 		"STRIP=${STRIP}"