Date: Mon, 25 Nov 2013 18:01:02 +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: r334873 - in head: deskutils/epoch deskutils/vym devel/edb devel/fuel devel/qt4-qtsolutions-singleapplication devel/svn2git x11-toolkits/qt4pas Message-ID: <201311251801.rAPI12Ah061166@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Mon Nov 25 18:01:01 2013 New Revision: 334873 URL: http://svnweb.freebsd.org/changeset/ports/334873 Log: - Convert to USES=qmake - Add state support - Convert LIB_DEPENDS to new style, adjust USE_QT4 components, etc. Approved by: portmgr (blanket approval) Modified: head/deskutils/epoch/Makefile head/deskutils/vym/Makefile head/devel/edb/Makefile head/devel/edb/pkg-plist head/devel/fuel/Makefile head/devel/qt4-qtsolutions-singleapplication/Makefile (contents, props changed) head/devel/svn2git/Makefile head/x11-toolkits/qt4pas/Makefile (contents, props changed) Modified: head/deskutils/epoch/Makefile ============================================================================== --- head/deskutils/epoch/Makefile Mon Nov 25 18:00:55 2013 (r334872) +++ head/deskutils/epoch/Makefile Mon Nov 25 18:01:01 2013 (r334873) @@ -9,13 +9,14 @@ MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}${PORTVERSION}src MAINTAINER= vg@FreeBSD.org -COMMENT= Epoch is small and handy timeline application +COMMENT= Small and handy timeline application LINCENSE= GPLv3 PROJECTHOST= gepoch +USES= qmake USE_ZIP= yes -USE_QT4= gui qmake_build moc_build rcc_build +USE_QT4= gui moc_build rcc_build PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.png @@ -23,14 +24,10 @@ WRKSRC= ${WRKDIR} DESKTOP_ENTRIES="Epoch" "Timeline application" \ "${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}" \ - "" false - -NO_STAGE= yes -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} + "" true do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/epoch ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/images/epoha.png ${PREFIX}/share/pixmaps/${PORTNAME}.png + ${INSTALL_PROGRAM} ${WRKSRC}/epoch ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/images/epoha.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .include <bsd.port.mk> Modified: head/deskutils/vym/Makefile ============================================================================== --- head/deskutils/vym/Makefile Mon Nov 25 18:00:55 2013 (r334872) +++ head/deskutils/vym/Makefile Mon Nov 25 18:01:01 2013 (r334873) @@ -10,13 +10,12 @@ MASTER_SITES= SF/vym/${PORTVERSION} MAINTAINER= lichray@gmail.com COMMENT= VYM is a tool to generate and manipulate mind maps +USES= qmake USE_BZIP2= yes -USE_QT4= qmake_build uic_build moc_build \ +USE_QT4= uic_build moc_build \ qt3support network xml dbus svg -QMAKE_ARGS= PREFIX=${PREFIX} \ - DATADIR=${DATADIR:C,/vym$,,} \ +QMAKE_ARGS= DATADIR=${DATADIR:C,/vym$,,} \ DOCDIR=${DOCSDIR} -QT_LRELEASE= ${LOCALBASE}/bin/lrelease-qt4 STRIP_FILES= bin/vym @@ -25,35 +24,27 @@ DESKTOP_ENTRIES= "VYM" \ "${DATADIR}/icons/vym.png" \ "vym" \ "" \ - false + true -NO_STAGE= yes -.include <bsd.port.options.mk> +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes +NLS_USE= QT4=linguist_build -.if ${PORT_OPTIONS:MNLS} -USE_QT4+= linguist_build -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +.include <bsd.port.options.mk> post-patch: .if !${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/INSTALLS += doc/d' ${WRKSRC}/vym.pro .endif - -do-configure: .if ${PORT_OPTIONS:MNLS} - cd ${WRKSRC} && ${QT_LRELEASE} vym.pro + cd ${WRKSRC} && ${LRELEASE} vym.pro .endif - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \ - ${QMAKEFLAGS} ${QMAKE_ARGS} vym.pro post-install: - ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} + ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} .if ${PORT_OPTIONS:MNLS} - ${MKDIR} ${DATADIR}/lang - ${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/ + ${MKDIR} ${STAGEDIR}${DATADIR}/lang + ${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${STAGEDIR}${DATADIR}/lang/ .endif .include <bsd.port.mk> Modified: head/devel/edb/Makefile ============================================================================== --- head/devel/edb/Makefile Mon Nov 25 18:00:55 2013 (r334872) +++ head/devel/edb/Makefile Mon Nov 25 18:01:01 2013 (r334873) @@ -13,42 +13,30 @@ COMMENT= Cross-platform x86/x86-64 debug LICENSE= GPLv2 -LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs -USE_QT4= gui network xml moc_build qmake_build rcc_build uic_build -HAS_CONFIGURE= yes -QMAKE_ARGS= -recursive PREFIX=${PREFIX} \ - DEFAULT_PLUGIN_PATH="${PREFIX}/libexec/${PORTNAME}" +USES= qmake +USE_QT4= gui network xml moc_build rcc_build uic_build +QMAKE_ARGS= DEFAULT_PLUGIN_PATH="${PREFIX}/libexec/${PORTNAME}" WRKSRC= ${WRKDIR}/debugger -MAN1= edb.1 PORTDOCS= * ONLY_FOR_ARCHS= i386 amd64 STRIP_FILES= bin/${PORTNAME} libexec/${PORTNAME}/*.so -NO_STAGE= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800505 -BROKEN= doesn't build due to lack of memory map of ptrace -.endif - .include <bsd.port.options.mk> -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKE_ARGS} ${QMAKEFLAGS} - post-install: .if ${PORT_OPTIONS:MDOCS} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR} + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif - ${INSTALL_DATA} ${WRKSRC}/edb.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/src/images/edb48-logo.png ${PREFIX}/share/pixmaps/edb.png - ${INSTALL_MAN} ${WRKSRC}/edb.1 ${MANPREFIX}/man/man1/edb.1 - ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} + ${INSTALL_DATA} ${WRKSRC}/edb.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/src/images/edb48-logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/edb.png + ${INSTALL_MAN} ${WRKSRC}/edb.1 ${STAGEDIR}${MANPREFIX}/man/man1/edb.1 + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/edb/pkg-plist ============================================================================== --- head/devel/edb/pkg-plist Mon Nov 25 18:00:55 2013 (r334872) +++ head/devel/edb/pkg-plist Mon Nov 25 18:01:01 2013 (r334873) @@ -17,6 +17,7 @@ libexec/edb/libReferences.so libexec/edb/libSessionManager.so libexec/edb/libStringSearcher.so libexec/edb/libSymbolViewer.so +man/man1/edb.1.gz share/applications/edb.desktop share/pixmaps/edb.png @dirrm libexec/edb Modified: head/devel/fuel/Makefile ============================================================================== --- head/devel/fuel/Makefile Mon Nov 25 18:00:55 2013 (r334872) +++ head/devel/fuel/Makefile Mon Nov 25 18:01:01 2013 (r334873) @@ -13,18 +13,13 @@ LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/bin/fossil:${PORTSDIR}/devel/fossil +USES= qmake USE_QT4= corelib gui \ - qmake_build moc_build rcc_build uic_build + moc_build rcc_build uic_build -HAS_CONFIGURE= yes - -PLIST_FILES+= bin/Fuel - -NO_STAGE= yes -do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} +PLIST_FILES= bin/Fuel do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/Fuel ${PREFIX}/bin/Fuel + ${INSTALL_PROGRAM} ${WRKSRC}/Fuel ${STAGEDIR}${PREFIX}/bin/Fuel .include <bsd.port.mk> Modified: head/devel/qt4-qtsolutions-singleapplication/Makefile ============================================================================== --- head/devel/qt4-qtsolutions-singleapplication/Makefile Mon Nov 25 18:00:55 2013 (r334872) +++ head/devel/qt4-qtsolutions-singleapplication/Makefile Mon Nov 25 18:01:01 2013 (r334873) @@ -10,33 +10,27 @@ MASTER_SITES= ftp://ftp.pcbsd.org/pub/so DISTNAME= qt4-qtsolutions-singleinstance-${PORTVERSION} MAINTAINER= yurkis@gmail.com -COMMENT= QT4 Solutions Single Application Framework +COMMENT= Qt 4 Solutions Single Application Framework -USE_QT4?= qmake_build moc_build rcc_build uic_build gui network -HAS_CONFIGURE= yes +USES= qmake +USE_QT4= moc_build rcc_build uic_build gui network USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/qt-solutions-qt-solutions/${SUB_PROJECT_NAME} +WRKSRC= ${WRKDIR}/qt-solutions-qt-solutions/qtsingleapplication BUILD_WRKSRC= ${WRKSRC}/buildlib +CONFIGURE_WRKSRC= ${BUILD_WRKSRC} PLIST_FILES= ${LIBRARY_HEADERS:S,^,include/,} \ lib/${LIBRARY_NAME} \ lib/${LIBRARY_NAME}.1 -SUB_PROJECT_NAME= qtsingleapplication -QMAKE_PRO= buildlib.pro - LIBRARY_NAME= libQtSolutions_SingleApplication-head.so LIBRARY_HEADERS= qtsingleapplication.h qtsinglecoreapplication.h -NO_STAGE= yes -do-configure: - cd ${BUILD_WRKSRC} && ${QMAKE} ${QMAKEFLAGS} ${QMAKE_PRO} - do-install: - ${MKDIR} ${PREFIX}/include ${PREFIX}/lib - cd ${WRKSRC}/src && ${INSTALL_DATA} ${LIBRARY_HEADERS} ${PREFIX}/include - ${INSTALL_LIB} ${WRKSRC}/lib/${LIBRARY_NAME}.1.0.0 ${PREFIX}/lib/${LIBRARY_NAME}.1 - ${LN} -sf ${PREFIX}/lib/${LIBRARY_NAME}.1 ${PREFIX}/lib/${LIBRARY_NAME} + ${MKDIR} ${STAGEDIR}${PREFIX}/include ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${LIBRARY_HEADERS:S,^,${WRKSRC}/src/,} ${STAGEDIR}${PREFIX}/include + ${INSTALL_LIB} ${WRKSRC}/lib/${LIBRARY_NAME}.1.0.0 ${STAGEDIR}${PREFIX}/lib/${LIBRARY_NAME}.1 + ${LN} -sf ${LIBRARY_NAME}.1 ${STAGEDIR}${PREFIX}/lib/${LIBRARY_NAME} .include <bsd.port.mk> Modified: head/devel/svn2git/Makefile ============================================================================== --- head/devel/svn2git/Makefile Mon Nov 25 18:00:55 2013 (r334872) +++ head/devel/svn2git/Makefile Mon Nov 25 18:01:01 2013 (r334873) @@ -11,13 +11,14 @@ COMMENT= Imports svn repositories into g LICENSE= GPLv3 -LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion +LIB_DEPENDS= libsvn_client-1.so:${PORTSDIR}/devel/subversion RUN_DEPENDS+= git:${PORTSDIR}/devel/git \ p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \ p5-subversion>=0:${PORTSDIR}/devel/p5-subversion +USES= qmake USE_XZ= yes -USE_QT4= corelib qmake_build +USE_QT4= corelib OPTIONS_DEFINE= FREEBSD_REPO FREEBSD_REPO_DESC= FreeBSD-repo only mode @@ -33,9 +34,6 @@ EXTRA_PATCHES= ${PATCHDIR}/freebsd-expor post-patch: ${REINPLACE_CMD} "s|/usr/local|${LOCALBASE}|" ${WRKSRC}/src/src.pro -do-configure: - (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} fast-export2.pro) - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/svn2git ${STAGEDIR}${PREFIX}/bin/ Modified: head/x11-toolkits/qt4pas/Makefile ============================================================================== --- head/x11-toolkits/qt4pas/Makefile Mon Nov 25 18:00:55 2013 (r334872) +++ head/x11-toolkits/qt4pas/Makefile Mon Nov 25 18:01:01 2013 (r334873) @@ -12,12 +12,12 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Qt4 binding for FreePascal USE_LDCONFIG= yes -USE_QT4= corelib gui network script webkit qmake_build \ +USE_QT4= corelib gui network script webkit \ moc_build +USES= qmake QT4_VER_MIN= 4.5.3 -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${QT4_VERSION:S/.//g} < ${QT4_VER_MIN:S/.//g} @@ -27,7 +27,4 @@ IGNORE= Please update your current qt4 v post-patch: @${REINPLACE_CMD} -e 's|-mincoming-stack-boundary=2||g' ${WRKSRC}/Qt4Pas.pro -pre-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} - .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311251801.rAPI12Ah061166>