From owner-svn-ports-all@FreeBSD.ORG  Mon Nov 25 18:11:03 2013
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 247CBD31;
 Mon, 25 Nov 2013 18:11:03 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 13F3A2D1B;
 Mon, 25 Nov 2013 18:11:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPIB2EK016904;
 Mon, 25 Nov 2013 18:11:02 GMT (envelope-from makc@svn.freebsd.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPIB2xS016903;
 Mon, 25 Nov 2013 18:11:02 GMT (envelope-from makc@svn.freebsd.org)
Message-Id: <201311251811.rAPIB2xS016903@svn.freebsd.org>
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Mon, 25 Nov 2013 18:11:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334876 - head/devel/qtcreator
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.16
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: Mon, 25 Nov 2013 18:11:03 -0000

Author: makc
Date: Mon Nov 25 18:11:02 2013
New Revision: 334876
URL: http://svnweb.freebsd.org/changeset/ports/334876

Log:
  Convert to USES=qmake

Modified:
  head/devel/qtcreator/Makefile

Modified: head/devel/qtcreator/Makefile
==============================================================================
--- head/devel/qtcreator/Makefile	Mon Nov 25 18:10:12 2013	(r334875)
+++ head/devel/qtcreator/Makefile	Mon Nov 25 18:11:02 2013	(r334876)
@@ -22,21 +22,19 @@ LIB_DEPENDS=	Imath:${PORTSDIR}/graphics/
 		jasper:${PORTSDIR}/graphics/jasper \
 		jpeg:${PORTSDIR}/graphics/jpeg
 
-USE_QT4=	qmake_build moc_build rcc_build uic_build \
+USES=		qmake
+USE_QT4=	moc_build rcc_build uic_build \
 		linguist_build assistant_run qt3support \
 		dbus designer gui help-tools_build network script \
 		sql svg xml webkit qdoc3_build
-HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	all docs
 INSTALL_TARGET=	install install_docs
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
-QMAKE_ARGS=	-recursive CONFIG+="configure" QTC_PREFIX=${PREFIX} ${QMAKE_PRO}
-QMAKE_PRO=	${WRKSRC}/${PORTNAME}.pro
-# stage support
-DESTDIRNAME=	INSTALL_ROOT
+QMAKE_ARGS=	CONFIG+="configure" QTC_PREFIX=${PREFIX}
+QMAKE_SOURCE_PATH=	${WRKSRC}
 
 # Build Qt Quick Designer (requires update on every Qt update).
 QT_DISTNAME=	qt-everywhere-opensource-src-${QT4_VERSION}
@@ -66,9 +64,7 @@ post-patch:
 
 	${RM} ${WRKSRC}/share/qtcreator/dumper/gbridge.py.bak
 
-do-configure:
+pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}
-	cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
 
 .include <bsd.port.mk>