From owner-svn-ports-all@FreeBSD.ORG Sat Nov 23 16:56:51 2013 Return-Path: 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 AB8E4841; Sat, 23 Nov 2013 16:56:51 +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 8303D20D7; Sat, 23 Nov 2013 16:56:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rANGup97079355; Sat, 23 Nov 2013 16:56:51 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rANGupHF079354; Sat, 23 Nov 2013 16:56:51 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201311231656.rANGupHF079354@svn.freebsd.org> From: Max Brazhnikov Date: Sat, 23 Nov 2013 16:56:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334684 - head/devel/qtscriptgenerator 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Nov 2013 16:56:51 -0000 Author: makc Date: Sat Nov 23 16:56:50 2013 New Revision: 334684 URL: http://svnweb.freebsd.org/changeset/ports/334684 Log: - Convert to USES - Pass QMAKE_ARGS to qmake - Support staging Approved by: portmgr (blanket approval) Modified: head/devel/qtscriptgenerator/Makefile Modified: head/devel/qtscriptgenerator/Makefile ============================================================================== --- head/devel/qtscriptgenerator/Makefile Sat Nov 23 16:52:43 2013 (r334683) +++ head/devel/qtscriptgenerator/Makefile Sat Nov 23 16:56:50 2013 (r334684) @@ -15,16 +15,15 @@ OPTIONS_DEFINE= PHONON PHONON_DESC= Build Phonon support OPTIONS_DEFAULT= PHONON +USES= gmake qmake USE_QT4= corelib declarative designer doc help help-tools gui \ iconengines imageformats inputmethods linguist network \ opengl pixeltool porting qdbusviewer \ qt3support qtestlib qvfb script scripttools \ sql svg webkit xml xmlpatterns xmlpatterns-tool \ - qmake_build moc_build rcc_build uic_build -USE_GMAKE= yes + moc_build rcc_build uic_build USE_LDCONFIG= yes -NO_STAGE= yes .include .if ${PORT_OPTIONS:MPHONON} @@ -37,30 +36,26 @@ PLIST_SUB+= PHONON="@comment " do-configure: @cd ${WRKSRC}/generator && \ - ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \ - PREFIX=${PREFIX} \ - generator.pro + ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS} do-build: @echo "---> Building generator" @cd ${WRKSRC}/generator && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} && \ ${SETENV} ${CONFIGURE_ENV} ./generator \ --include-paths=${PREFIX}/include/:${PREFIX}/include/qt4/ @echo "---> Configuring generated files" @cd ${WRKSRC}/qtbindings && \ - ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \ - PREFIX=${PREFIX} \ + ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS} \ INCLUDEPATH+=${PREFIX}/include/qt4/phonon \ - LIBS+=-L${PREFIX}/lib \ - qtbindings.pro + LIBS+=-L${PREFIX}/lib @echo "---> Building generated files" @cd ${WRKSRC}/qtbindings && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} do-install: - ${MKDIR} ${PREFIX}/${QT_PLUGINDIR_REL}/script + ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/script cd ${WRKSRC}/plugins/script && \ - ${COPYTREE_SHARE} \* ${PREFIX}/${QT_PLUGINDIR_REL}/script + ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/script .include