Date: Fri, 22 Nov 2013 18:48:31 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334602 - in head: games/bubble-chains games/capicity games/capitalism games/connectagram games/cutemaze games/gottet games/jag games/peg-e games/qnetwalk games/simsu games/tanglet game... Message-ID: <201311221848.rAMImV59002876@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Fri Nov 22 18:48:31 2013 New Revision: 334602 URL: http://svnweb.freebsd.org/changeset/ports/334602 Log: - Convert to USES=qmake - Adjust USE_QT4 components Approved by: portmgr (blanket approval) Modified: head/games/bubble-chains/Makefile head/games/capicity/Makefile head/games/capitalism/Makefile head/games/connectagram/Makefile head/games/cutemaze/Makefile head/games/gottet/Makefile head/games/jag/Makefile head/games/peg-e/Makefile head/games/qnetwalk/Makefile head/games/simsu/Makefile head/games/tanglet/Makefile head/games/tbe/Makefile head/security/tpmmanager/Makefile head/sysutils/pcbsd-utils-qt4/Makefile Modified: head/games/bubble-chains/Makefile ============================================================================== --- head/games/bubble-chains/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/bubble-chains/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -19,18 +19,19 @@ BUILD_DEPENDS= 7z:${PORTSDIR}/archivers WRKSRC= ${WRKDIR}/chains-${PORTVERSION}-src +USES= qmake USE_SDL= sdl image mixer USE_GL= glut glew glu USE_XORG= xrandr USE_DOS2UNIX= *.pro *.cpp *.h *.ui *.ui *.rc *.htm *.dat *.css -USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \ +USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ corelib svg xml opengl network -QMAKEFLAGS= QMAKE_LFLAGS="-L${LOCALBASE}/lib -lX11 -lSDL-1.2" +LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lSDL-1.2 PORTDOCS= README DESKTOP_ENTRIES="Bubble Chains" "${COMMENT}" "${PORTNAME}" \ - "${PORTNAME}" "Game;ArcadeGame;" false + "${PORTNAME}" "Game;ArcadeGame;" true OPTIONS_DEFINE= DOCS @@ -47,10 +48,6 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local/games/chains|${DATADIR}|' \ ${WRKSRC}/main.cpp ${WRKSRC}/Game.pro -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - post-configure: @${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS ?=|' \ -e 's|CXXFLAGS =|CXXFLAGS ?=|' \ Modified: head/games/capicity/Makefile ============================================================================== --- head/games/capicity/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/capicity/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -21,9 +21,9 @@ LIB_DEPENDS= libpthread-stubs.so:${PORTS WRKSRC= ${WRKDIR}/CapiCity_${PORTVERSION} -USES= iconv +USES= iconv qmake USE_XORG= ice sm x11 xau xcb xdmcp xext xrender -USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \ +USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ corelib gui network script xml PORTDOCS= README changelog @@ -43,13 +43,6 @@ NLS_USES= gettext NO_STAGE= yes .include <bsd.port.options.mk> -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - -post-configure: - @${REINPLACE_CMD} -e 's|-O2 -pthread||g' ${WRKSRC}/Makefile - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/CapiCity ${PREFIX}/bin/${PORTNAME} Modified: head/games/capitalism/Makefile ============================================================================== --- head/games/capitalism/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/capitalism/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -22,9 +22,9 @@ LIB_DEPENDS= libpthread-stubs.so:${PORTS WRKSRC= ${WRKDIR}/Capitalism-${PORTVERSION} -USES= iconv +USES= iconv qmake USE_XORG= ice sm x11 xau xcb xdmcp xext xrender -USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \ +USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ corelib gui network script xml PORTDOCS= README changelog readme.txt @@ -33,7 +33,7 @@ INSTALLS_ICONS= yes ICON_SIZES= 16x16 22x22 24x24 32x32 48x48 64x64 DESKTOP_ENTRIES="Capitalism" "${COMMENT}" "${PORTNAME}" \ - "${PORTNAME}" "Game;BoardGame;" false + "${PORTNAME}" "Game;BoardGame;" true OPTIONS_DEFINE= NLS OPTIONS_SUB= yes @@ -43,13 +43,6 @@ NLS_USES= gettext .include <bsd.port.options.mk> -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - -post-configure: - @${REINPLACE_CMD} -e 's|-O2 -pthread||g' ${WRKSRC}/Makefile - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Capitalism ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/games/connectagram/Makefile ============================================================================== --- head/games/connectagram/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/connectagram/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -13,9 +13,9 @@ COMMENT= Word unscrambling game LICENSE= GPLv3 USE_BZIP2= yes -USES= desktop-file-utils -USE_QT4= moc_build qmake_build rcc_build gui network iconengines \ - imageformats +USES= desktop-file-utils qmake +USE_QT4= moc_build rcc_build gui network iconengines_run \ + imageformats_run INSTALLS_ICONS= yes PORTDOCS= CREDITS ChangeLog @@ -23,10 +23,6 @@ PORTDOCS= CREDITS ChangeLog NO_STAGE= yes .include <bsd.port.options.mk> -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - post-install: @(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR}) @(cd ${WRKSRC}/icons && ${COPYTREE_SHARE} patterns ${DATADIR}) Modified: head/games/cutemaze/Makefile ============================================================================== --- head/games/cutemaze/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/cutemaze/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -14,8 +14,9 @@ LICENSE= GPLv3 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USES= qmake USE_BZIP2= yes -USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats +USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run INSTALLS_ICONS= yes PORTDOCS= ChangeLog README @@ -23,10 +24,6 @@ PORTDOCS= ChangeLog README NO_STAGE= yes .include <bsd.port.options.mk> -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} ${WRKSRC}/${PORTNAME}.pro - post-install: # Icons @(cd ${WRKSRC}/icons && ${COPYTREE_SHARE} oxygen ${PREFIX}/share/icons/) Modified: head/games/gottet/Makefile ============================================================================== --- head/games/gottet/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/gottet/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -12,8 +12,9 @@ COMMENT= Tetris clone LICENSE= GPLv3 +USES= qmake USE_BZIP2= yes -USE_QT4= moc_build qmake_build rcc_build iconengines imageformats +USE_QT4= moc_build rcc_build iconengines_run imageformats_run INSTALLS_ICONS= yes PORTDOCS= CREDITS ChangeLog @@ -21,14 +22,6 @@ PORTDOCS= CREDITS ChangeLog NO_STAGE= yes .include <bsd.port.options.mk> -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - -post-configure: - @${REINPLACE_CMD} 's|-O2 -Wall|-Wall|g' \ - ${WRKSRC}/Makefile - post-install: ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/ Modified: head/games/jag/Makefile ============================================================================== --- head/games/jag/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/jag/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -19,9 +19,8 @@ USE_SDL= sdl mixer USE_DOS2UNIX= Game.pro USE_XORG= x11 -MAKE_ARGS+= INSTALL_ROOT="${STAGEDIR}" - -USE_QT4= qmake_build uic_build moc_build rcc_build \ +USES= qmake +USE_QT4= uic_build moc_build rcc_build \ corelib svg xml opengl network PLIST_FILES= bin/${PORTNAME} @@ -32,10 +31,6 @@ post-patch: ${WRKSRC}/main.cpp ${WRKSRC}/Game.pro @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Game.pro -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} Game.pro - post-install: cd ${WRKDIR}/${DISTNAME:C/src/data/} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}/ Modified: head/games/peg-e/Makefile ============================================================================== --- head/games/peg-e/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/peg-e/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -11,15 +11,11 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Peg elimination game +USES= qmake USE_BZIP2= yes -USE_QT4= corelib gui moc_build qmake_build rcc_build +USE_QT4= corelib gui moc_build rcc_build INSTALLS_ICONS= yes -DESTDIRNAME= INSTALL_ROOT WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -do-configure: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} \ - PREFIX=${PREFIX} ${PORTNAME}.pro - .include <bsd.port.mk> Modified: head/games/qnetwalk/Makefile ============================================================================== --- head/games/qnetwalk/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/qnetwalk/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -12,9 +12,9 @@ COMMENT= Qt-version of the NetWalk game LICENSE= GPLv2 -USE_QT4= corelib gui qmake_build moc_build rcc_build +USES= qmake +USE_QT4= corelib gui moc_build rcc_build USE_SDL= mixer -DESTDIRNAME= INSTALL_ROOT PORTDOCS= ChangeLog README @@ -26,10 +26,6 @@ post-patch: s|/usr/share|$$$${PREFIX}/share|; \ /INSTALLS.*menu/ d' ${WRKSRC}/${PORTNAME}.pro -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/ Modified: head/games/simsu/Makefile ============================================================================== --- head/games/simsu/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/simsu/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -13,8 +13,9 @@ COMMENT= Basic Sudoku game LICENSE= GPLv3 +USES= qmake USE_BZIP2= yes -USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats +USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run INSTALLS_ICONS= yes PORTDOCS= CREDITS ChangeLog @@ -22,10 +23,6 @@ PORTDOCS= CREDITS ChangeLog NO_STAGE= yes .include <bsd.port.options.mk> -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - post-install: ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/ Modified: head/games/tanglet/Makefile ============================================================================== --- head/games/tanglet/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/tanglet/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -14,9 +14,9 @@ COMMENT= Single player word finding game LICENSE= GPLv3 USE_BZIP2= yes -USES= desktop-file-utils -USE_QT4= moc_build qmake_build rcc_build gui iconengines imageformats -QMAKEFLAGS= QMAKE_LFLAGS="-lz" +USES= desktop-file-utils qmake +USE_QT4= moc_build rcc_build gui iconengines_run imageformats_run +LDFLAGS+= -lz INSTALLS_ICONS= yes PORTDOCS= CREDITS ChangeLog NEWS @@ -28,10 +28,6 @@ post-patch: @${REINPLACE_CMD} -i '' -e '/PKGCONFIG += zlib/d' \ ${WRKSRC}/tanglet.pro -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - post-install: ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/ Modified: head/games/tbe/Makefile ============================================================================== --- head/games/tbe/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/games/tbe/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -13,8 +13,9 @@ COMMENT= The Butterfly Effect BUILD_DEPENDS= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo +USES= qmake USE_GMAKE= yes -USE_QT4= qmake_build corelib gui moc_build rcc_build svg uic_build xml +USE_QT4= corelib gui moc_build rcc_build svg uic_build xml WRKSRC= ${WRKDIR}/TheButterflyEffect-M${PORTVERSION}rc3 PLIST_FILES= bin/tbe @@ -34,10 +35,9 @@ post-patch: @${REINPLACE_CMD} -e '/ensure that no-one tries to build/,$$d' \ ${WRKSRC}/tbe.pro -pre-build: +pre-configure: # This is supposedly done by the ./configure script @cd ${WRKSRC}/3rdParty && ${GMAKE} - @cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} do-install: @${MKDIR} ${PREFIX}/bin Modified: head/security/tpmmanager/Makefile ============================================================================== --- head/security/tpmmanager/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/security/tpmmanager/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -13,20 +13,14 @@ LICENSE= GPLv2 LIB_DEPENDS= libtspi.so:${PORTSDIR}/security/trousers -QT_NONSTANDARD= YES -USE_QT4= gui moc_build qmake_build rcc_build uic_build - -HAS_CONFIGURE= YES +USES= qmake +USE_QT4= gui moc_build rcc_build uic_build PLIST_FILES= bin/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} PREFIX=${PREFIX} tpmmanager.pro - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/sysutils/pcbsd-utils-qt4/Makefile ============================================================================== --- head/sysutils/pcbsd-utils-qt4/Makefile Fri Nov 22 16:57:06 2013 (r334601) +++ head/sysutils/pcbsd-utils-qt4/Makefile Fri Nov 22 18:48:31 2013 (r334602) @@ -8,33 +8,23 @@ MASTER_SITES= http://www.pcbsd.org/~kris ftp://ftp.pcbsd.org/pub/software/ MAINTAINER= kmoore@FreeBSD.org -COMMENT= PC-BSD QT4 Utilities +COMMENT= PC-BSD Qt 4 Utilities RUN_DEPENDS= pc-metapkgmanager:${PORTSDIR}/sysutils/pcbsd-utils -LIB_DEPENDS= QtSolutions_SingleApplication-head.1:${PORTSDIR}/devel/qt4-qtsolutions-singleapplication \ - curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libQtSolutions_SingleApplication-head.so:${PORTSDIR}/devel/qt4-qtsolutions-singleapplication \ + libcurl.so:${PORTSDIR}/ftp/curl MAKE_JOBS_UNSAFE=yes USE_CDRTOOLS= yes USE_BZIP2= yes USE_LDCONFIG= yes -USE_QT4= accessible \ - clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \ - dbus declarative \ - graphicssystems-opengl gui help help-tools \ - iconengines imageformats inputmethods \ - linguist l10n makeqpf moc multimedia network opengl \ - pixeltool porting phonon phonon-gst \ - qdbusviewer qmlviewer qmake qtconfig qtestlib \ - qvfb rcc script scripttools \ - svg uic uic3 \ - xml xmlpatterns xmlpatterns-tool +USE_QT4= corelib gui network svg \ + moc_build rcc_build uic_build +USES= qmake WRKSRC= ${WRKDIR}/src-qt4 -HAS_CONFIGURE= yes -QMAKE_PRO= src-qt4.pro -QMAKE_ARGS= -recursive ${QMAKE_PRO} +QMAKE_ARGS+= CONFIG+="configure" .include <bsd.port.pre.mk> @@ -42,11 +32,4 @@ QMAKE_ARGS= -recursive ${QMAKE_PRO} IGNORE= requires FreeBSD 9.0 or later .endif -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} PREFIX=${PREFIX} -unix CONFIG+="configure" ${QMAKE_PRO} - -do-install: - cd ${WRKSRC} && make install INSTALL_ROOT=${STAGEDIR} - .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311221848.rAMImV59002876>