From owner-svn-ports-all@FreeBSD.ORG  Fri Jun  6 22:59:55 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 3970A21D;
 Fri,  6 Jun 2014 22:59:55 +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 265722929;
 Fri,  6 Jun 2014 22:59:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56MxtEo009131;
 Fri, 6 Jun 2014 22:59:55 GMT (envelope-from mi@svn.freebsd.org)
Received: (from mi@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56MxsrZ009129;
 Fri, 6 Jun 2014 22:59:54 GMT (envelope-from mi@svn.freebsd.org)
Message-Id: <201406062259.s56MxsrZ009129@svn.freebsd.org>
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Fri, 6 Jun 2014 22:59:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356865 - in head/devel/qmake: . files
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.18
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: Fri, 06 Jun 2014 22:59:55 -0000

Author: mi
Date: Fri Jun  6 22:59:54 2014
New Revision: 356865
URL: http://svnweb.freebsd.org/changeset/ports/356865
QAT: https://qat.redports.org/buildarchive/r356865/

Log:
  Add staging support.

Modified:
  head/devel/qmake/Makefile
  head/devel/qmake/files/Makefile.bsd

Modified: head/devel/qmake/Makefile
==============================================================================
--- head/devel/qmake/Makefile	Fri Jun  6 22:48:58 2014	(r356864)
+++ head/devel/qmake/Makefile	Fri Jun  6 22:59:54 2014	(r356865)
@@ -17,10 +17,10 @@ REINPLACE_ARGS=	-i ""
 WRKSRC=		${WRKDIR}/${DISTNAME}/qmake
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 PLIST_SUB+=	_PREFIX="${PREFIX}"
-MAKE_ENV+=	FILESDIR="${FILESDIR}"
-NO_STAGE=	yes
+MAKE_ENV+=	FILESDIR="${FILESDIR}" STAGEDIR="${STAGEDIR}"
 
 USE_BZIP2=	yes
+USES=	uidfix
 
 EXTRACT_AFTER_ARGS= \
 	'${DISTNAME}/mkspecs' \

Modified: head/devel/qmake/files/Makefile.bsd
==============================================================================
--- head/devel/qmake/files/Makefile.bsd	Fri Jun  6 22:48:58 2014	(r356864)
+++ head/devel/qmake/files/Makefile.bsd	Fri Jun  6 22:59:54 2014	(r356865)
@@ -32,7 +32,7 @@ CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNIC
 
 PROG_CXX=	qmake
 BINDIR=	${PREFIX}/bin
-SHAREDIR=${PREFIX}/share/qt
+SHAREDIR=${STAGEDIR}${PREFIX}/share/qt
 
 ${SHAREDIR}:
 	mkdir -p "$@"