From owner-svn-ports-head@FreeBSD.ORG  Mon Apr 21 20:17:01 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 0681DD3E;
 Mon, 21 Apr 2014 20:17:01 +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 E7D41125D;
 Mon, 21 Apr 2014 20:17:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LKH0PK010729;
 Mon, 21 Apr 2014 20:17:00 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LKH0gw010728;
 Mon, 21 Apr 2014 20:17:00 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201404212017.s3LKH0gw010728@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 21 Apr 2014 20:17:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351707 - 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: Mon, 21 Apr 2014 20:17:01 -0000

Author: antoine
Date: Mon Apr 21 20:17:00 2014
New Revision: 351707
URL: http://svnweb.freebsd.org/changeset/ports/351707
QAT: https://qat.redports.org/buildarchive/r351707/

Log:
  - Do not advise to strip non FreeBSD binaries [1]
  - Shorten messages
  
  Requested and tested by:	xmj [1]
  With hat:	portmgr

Modified:
  head/Mk/Scripts/qa.sh

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Mon Apr 21 20:16:04 2014	(r351706)
+++ head/Mk/Scripts/qa.sh	Mon Apr 21 20:17:00 2014	(r351707)
@@ -81,7 +81,7 @@ symlinks() {
 		[ -z "${l}" ] && continue
 		case "${link}" in
 			${STAGEDIR}*)
-				err "Bad symlinks ${l} pointing inside the stage directory"
+				err "Bad symlinks ${l#${STAGEDIR}${PREFIX}/} pointing inside the stage directory"
 				rc=1
 				;;
 		esac
@@ -106,7 +106,7 @@ paths() {
 			*/lib/ruby/gems/*/Makefile.html) continue ;;
 			*/lib/ruby/gems/*/mkmf.log) continue ;;
 		esac
-		err "${f} is referring to ${STAGEDIR}"
+		err "${f#${STAGEDIR}${PREFIX}/} is referring to ${STAGEDIR}"
 		rc=1
 	# Use heredoc to avoid losing rc from find|while subshell
 	done << EOF
@@ -123,8 +123,8 @@ stripped() {
 	find ${STAGEDIR} -type f -exec /usr/bin/file -nNF '' {} + | while
 	    read f output; do
 		case "${output}" in
-			ELF\ *\ executable,\ *,\ not\ stripped*|ELF\ *\ shared\ object,\ *,\ not\ stripped*)
-				warn "${f} is not stripped consider using \${STRIP_CMD}"
+			ELF\ *\ executable,\ *FreeBSD*,\ not\ stripped*|ELF\ *\ shared\ object,\ *FreeBSD*,\ not\ stripped*)
+				warn "${f#${STAGEDIR}${PREFIX}/} is not stripped consider using \${STRIP_CMD}"
 				;;
 		esac
 	done