From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 23 22:19:59 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 56384320;
 Wed, 23 Apr 2014 22:19:59 +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 430171E7E;
 Wed, 23 Apr 2014 22:19:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NMJxt6069754;
 Wed, 23 Apr 2014 22:19:59 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NMJxNL069753;
 Wed, 23 Apr 2014 22:19:59 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201404232219.s3NMJxNL069753@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 23 Apr 2014 22:19:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351977 - 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: Wed, 23 Apr 2014 22:19:59 -0000

Author: bdrewery
Date: Wed Apr 23 22:19:58 2014
New Revision: 351977
URL: http://svnweb.freebsd.org/changeset/ports/351977
QAT: https://qat.redports.org/buildarchive/r351977/

Log:
  - Fix stage-qa when USES contains desktop-file-utils twice
  
  Reported by:	mandree
  With hat:	portmgr

Modified:
  head/Mk/bsd.stage.mk

Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk	Wed Apr 23 22:01:27 2014	(r351976)
+++ head/Mk/bsd.stage.mk	Wed Apr 23 22:19:58 2014	(r351977)
@@ -13,9 +13,13 @@ MAKE_ARGS+=	${DESTDIRNAME}=${STAGEDIR}
 QA_ENV+=	STAGEDIR=${STAGEDIR} \
 		PREFIX=${PREFIX} \
 		LOCALBASE=${LOCALBASE} \
-		USESDESKTOPFILEUTILS=${USES:Mdesktop-file-utils} \
-		USESSHAREDMIMEINFO=${USES:Mshared-mime-info} \
 		"STRIP=${STRIP}"
+.if ${USES:Mdesktop-file-utils}
+QA_ENV+=	USESDESKTOPFILEUTILS=yes
+.endif
+.if ${USES:Mshared-mime-info}
+QA_ENV+=	USESSHAREDMIMEINFO=yes
+.endif
 CO_ENV+=	STAGEDIR=${STAGEDIR} \
 		PREFIX=${PREFIX} \
 		LOCALBASE=${LOCALBASE} \