From owner-svn-ports-head@FreeBSD.ORG Fri Nov 22 12:54:49 2013 Return-Path: Delivered-To: svn-ports-head@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 9AB7D27C; Fri, 22 Nov 2013 12:54:49 +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 7B39622D9; Fri, 22 Nov 2013 12:54:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAMCsnP7083958; Fri, 22 Nov 2013 12:54:49 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAMCsmMl083953; Fri, 22 Nov 2013 12:54:48 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201311221254.rAMCsmMl083953@svn.freebsd.org> From: Max Brazhnikov Date: Fri, 22 Nov 2013 12:54:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334584 - in head: graphics/structuresynth graphics/tiled x11-themes/qt4-style-float x11-themes/qt4-style-phase x11-themes/qt4-style-quantumstyle X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Nov 2013 12:54:49 -0000 Author: makc Date: Fri Nov 22 12:54:48 2013 New Revision: 334584 URL: http://svnweb.freebsd.org/changeset/ports/334584 Log: Convert to USES=qmake Approved by: portmgr (blanket approval) Modified: head/graphics/structuresynth/Makefile head/graphics/tiled/Makefile head/x11-themes/qt4-style-float/Makefile head/x11-themes/qt4-style-phase/Makefile head/x11-themes/qt4-style-quantumstyle/Makefile Modified: head/graphics/structuresynth/Makefile ============================================================================== --- head/graphics/structuresynth/Makefile Fri Nov 22 12:43:10 2013 (r334583) +++ head/graphics/structuresynth/Makefile Fri Nov 22 12:54:48 2013 (r334584) @@ -11,9 +11,10 @@ DISTNAME= StructureSynth-Source-v${PORTV MAINTAINER= amdmi3@FreeBSD.org COMMENT= Rule-based 3D structure generator +USES= qmake USE_GL= glu USE_ZIP= yes -USE_QT4= qmake_build corelib gui opengl moc_build rcc_build xml script +USE_QT4= corelib gui opengl moc_build rcc_build xml script WRKSRC= ${WRKDIR}/structure-synth USE_DOS2UNIX= *.cpp *.h @@ -26,11 +27,10 @@ post-patch: /miscDir/ s|"Misc"|"${DATADIR}/Misc"|' \ ${WRKSRC}/StructureSynth/GUI/MainWindow.cpp -do-configure: +pre-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} -project \ -after "CONFIG+=opengl" -after "QT+=xml opengl script" \ -after "LIBS+=-lGLU" - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/structure-synth ${STAGEDIR}${PREFIX}/bin/ Modified: head/graphics/tiled/Makefile ============================================================================== --- head/graphics/tiled/Makefile Fri Nov 22 12:43:10 2013 (r334583) +++ head/graphics/tiled/Makefile Fri Nov 22 12:54:48 2013 (r334584) @@ -10,10 +10,10 @@ DISTNAME= tiled-qt-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= General purpose tile map editor +USES= qmake USE_QT4= corelib gui opengl \ - linguist_build qmake_build moc_build uic_build rcc_build + linguist_build moc_build uic_build rcc_build USE_LDCONFIG= yes -DESTDIRNAME= INSTALL_ROOT PORTDOCS= * @@ -30,10 +30,6 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/docs/tiled.desktop @${FIND} ${WRKSRC} -name "*.pro" -exec ${REINPLACE_CMD} -e 's|share/man|man|' {} \; -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX="${PREFIX}" tiled.pro - post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/ Modified: head/x11-themes/qt4-style-float/Makefile ============================================================================== --- head/x11-themes/qt4-style-float/Makefile Fri Nov 22 12:43:10 2013 (r334583) +++ head/x11-themes/qt4-style-float/Makefile Fri Nov 22 12:54:48 2013 (r334584) @@ -15,17 +15,15 @@ COMMENT= Style for Qt 4 and KDE LICENSE= GPLv2 +USES= qmake USE_BZIP2= yes -USE_QT4= corelib gui qmake_build moc_build rcc_build +USE_QT4= corelib gui moc_build rcc_build WRKSRC= ${WRKDIR}/floatstyle-${PORTVERSION} PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/libfloatstyle.so PLIST_DIRSTRY= ${QT_PLUGINDIR_REL}/styles -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} - do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ ${INSTALL_PROGRAM} ${WRKSRC}/libfloatstyle.so ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ Modified: head/x11-themes/qt4-style-phase/Makefile ============================================================================== --- head/x11-themes/qt4-style-phase/Makefile Fri Nov 22 12:43:10 2013 (r334583) +++ head/x11-themes/qt4-style-phase/Makefile Fri Nov 22 12:54:48 2013 (r334584) @@ -15,17 +15,15 @@ COMMENT= Widget style for Qt 4 and KDE 4 LICENSE= MIT +USES= qmake USE_BZIP2= yes -USE_QT4= corelib gui qmake_build moc_build +USE_QT4= corelib gui moc_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/libphasestyle.so PLIST_DIRSTRY= ${QT_PLUGINDIR_REL}/styles -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} - do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ ${INSTALL_PROGRAM} ${WRKSRC}/libphasestyle.so ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ Modified: head/x11-themes/qt4-style-quantumstyle/Makefile ============================================================================== --- head/x11-themes/qt4-style-quantumstyle/Makefile Fri Nov 22 12:43:10 2013 (r334583) +++ head/x11-themes/qt4-style-quantumstyle/Makefile Fri Nov 22 12:54:48 2013 (r334584) @@ -16,16 +16,14 @@ COMMENT= SVG themeable style for Qt 4 an LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USE_QT4= corelib gui svg qmake_build rcc_build uic_build moc_build +USES= qmake +USE_QT4= corelib gui svg rcc_build uic_build moc_build WRKSRC= ${WRKDIR}/QuantumStyle PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/libquantumstyle.so PLIST_DIRSTRY= ${QT_PLUGINDIR_REL}/styles -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} - do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ ${INSTALL_PROGRAM} ${WRKSRC}/style/libquantumstyle.so ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/