From owner-svn-ports-all@FreeBSD.ORG  Tue Apr  8 16:50:14 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 54E86FA3;
 Tue,  8 Apr 2014 16:50:14 +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 4111916F9;
 Tue,  8 Apr 2014 16:50:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38GoEMI010010;
 Tue, 8 Apr 2014 16:50:14 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38GoEHg010008;
 Tue, 8 Apr 2014 16:50:14 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201404081650.s38GoEHg010008@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 8 Apr 2014 16:50:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350634 - 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.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: Tue, 08 Apr 2014 16:50:14 -0000

Author: antoine
Date: Tue Apr  8 16:50:13 2014
New Revision: 350634
URL: http://svnweb.freebsd.org/changeset/ports/350634
QAT: https://qat.redports.org/buildarchive/r350634/

Log:
  Rewrite the sharedmimeinfo qa check so that it doesn't produce a false
  positive on misc/shared-mime-info
  
  With help from:	bdrewery
  With hat:	portmgr

Modified:
  head/Mk/Scripts/qa.sh

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Tue Apr  8 16:48:57 2014	(r350633)
+++ head/Mk/Scripts/qa.sh	Tue Apr  8 16:50:13 2014	(r350634)
@@ -114,11 +114,18 @@ desktopfileutils() {
 }
 
 sharedmimeinfo() {
-	if [ -z "${USESSHAREDMIMEINFO}" ]; then
-		find ${STAGEDIR}${PREFIX}/share/mime/packages/*.xml ! -name "freedesktop\.org\.xml" -quit 2>/dev/null &&
+	local f found
+
+	found=0
+	for f in ${STAGEDIR}${PREFIX}/share/mime/packages/*.xml; do
+		[ "${f}" = "${STAGEDIR}${PREFIX}/share/mime/packages/*.xml" ] && break #no matches
+		[ "${f}" = "${STAGEDIR}${PREFIX}/share/mime/packages/freedesktop.org.xml" ] && continue
+		found=1
+		break
+	done
+	if [ -z "${USESSHAREDMIMEINFO}" -a ${found} -eq 1 ]; then
 		warn "you need USES=shared-mime-info"
-	else
-		find ${STAGEDIR}${PREFIX}/share/mime/packages/*.xml ! -name "freedesktop\.org\.xml" -quit 2>/dev/null ||
+	elif [ -n "${USESSHAREDMIMEINFO}" -a ${found} -eq 0 ]; then
 		warn "you may not need USES=shared-mime-info"
 	fi
 	return 0