Date: Wed, 23 Apr 2014 22:19:59 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351977 - head/Mk Message-ID: <201404232219.s3NMJxNL069753@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404232219.s3NMJxNL069753>