From 4cf9003fd4a076a626b6e2b469bf5ac9ec7e7562 Mon Sep 17 00:00:00 2001 From: makc Date: Fri, 22 Nov 2013 18:48:41 +0000 Subject: - Convert to USES=qmake (and other USES while I'm here) - Add state support - Convert LIB_DEPENDS to new style, adjust USE_QT4 components, etc. Approved by: portmgr (blanket approval) --- deskutils/qorganizer/Makefile | 25 +++++++++---------------- deskutils/tuxcards/Makefile | 15 ++++----------- devel/qgit/Makefile | 11 ++++------- devel/qprog/Makefile | 10 +++------- games/kcheckers/Makefile | 9 ++------- games/openpref/Makefile | 18 +++++++----------- games/qtads/Makefile | 12 ++++-------- mail/qgmailnotifier/Makefile | 16 ++++++---------- net-mgmt/nagiosagent/Makefile | 13 +++++-------- net-mgmt/qkismet/Makefile | 17 ++++++----------- ports-mgmt/kports-qt4/Makefile | 33 ++++----------------------------- ports-mgmt/portrac/Makefile | 16 ++++++---------- security/keepassx/Makefile | 16 +++------------- security/keepassx/pkg-plist | 2 -- 14 files changed, 63 insertions(+), 150 deletions(-) diff --git a/deskutils/qorganizer/Makefile b/deskutils/qorganizer/Makefile index dc96301..9c34f05 100644 --- a/deskutils/qorganizer/Makefile +++ b/deskutils/qorganizer/Makefile @@ -9,9 +9,10 @@ MASTER_SITES= SF/${PORTNAME}/OldFiles DISTNAME= qOrganizer-${PORTVERSION} MAINTAINER= miwi@FreeBSD.org -COMMENT= A general organizer that includes calendar with jurnal and schedule +COMMENT= General organizer that includes calendar with jurnal and schedule -USE_QT4= gui network qmake_build moc_build rcc_build sql +USES= qmake +USE_QT4= gui network moc_build rcc_build sql WRKSRC= ${WRKDIR}/qOrganizer/src PLIST_FILES= bin/qOrganizer share/pixmaps/qOrganizer.png @@ -22,20 +23,12 @@ DESKTOP_ENTRIES= "qOrganizer" \ "qOrganizer" \ "qOrganizer" \ "Qt;KDE;Office;" \ - "false" + "true" -NO_STAGE= yes -pre-build: - @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} - -post-install: - @${INSTALL_PROGRAM} ${WRKSRC}/qOrganizer ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/../qOrganizer.png ${PREFIX}/share/pixmaps -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for doc in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/../${doc} ${DOCSDIR} -.endfor -.endif +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/qOrganizer ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/../qOrganizer.png ${STAGEDIR}${PREFIX}/share/pixmaps + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../,} ${STAGEDIR}${DOCSDIR} .include diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile index 2f16663..4a90f0a 100644 --- a/deskutils/tuxcards/Makefile +++ b/deskutils/tuxcards/Makefile @@ -12,19 +12,12 @@ MAINTAINER= johans@FreeBSD.org COMMENT= Tool for managing notes within a hierarchical tree WRKSRC= ${WRKDIR}/${PORTNAME} -USE_QT4= gui xml qmake_build moc_build uic_build rcc_build +USES= qmake +USE_QT4= gui xml moc_build uic_build rcc_build -MAKE_ENV= QTDIR="${QT_PREFIX}" PLIST_FILES= bin/tuxcards -NO_STAGE= yes -.include - -do-configure: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${QMAKE} -spec ${QMAKESPEC} tuxcards.pro - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -.include +.include diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile index dd7ab7e..1a3d912 100644 --- a/devel/qgit/Makefile +++ b/devel/qgit/Makefile @@ -9,21 +9,18 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}4/${PORTVERSION} PKGNAMESUFFIX= -qt4 MAINTAINER= itetcu@FreeBSD.org -COMMENT= A graphical interface to git repositories +COMMENT= Graphical interface to git repositories +USES= qmake USE_BZIP2= yes -USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build +USE_QT4= corelib gui moc_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= bin/${PORTNAME} -NO_STAGE= yes -do-configure: - @cd ${WRKSRC} && ${QMAKE} ${PORTNAME}.pro - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include diff --git a/devel/qprog/Makefile b/devel/qprog/Makefile index 63bc868..54ef53a 100644 --- a/devel/qprog/Makefile +++ b/devel/qprog/Makefile @@ -12,18 +12,14 @@ EXTRACT_SUFX= .tgz MAINTAINER= bfoz@bfoz.net COMMENT= Cross-platform software for the DIY line of PIC programmers -USE_QT4= qmake_build moc_build gui network +USES= qmake +USE_QT4= moc_build gui network WRKSRC= ${WRKDIR}/QProg PLIST_FILES= bin/${PORTNAME} -NO_STAGE= yes -do-configure: - ( cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} -unix PREFIX=${PREFIX} QProg.pro ) - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/games/kcheckers/Makefile b/games/kcheckers/Makefile index 8a4a8e3..b59e0e1 100644 --- a/games/kcheckers/Makefile +++ b/games/kcheckers/Makefile @@ -10,17 +10,12 @@ MASTER_SITES= SF/qcheckers/${PORTNAME}/${PORTVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= Qt version of the classic boardgame checkers -USE_QT4= corelib gui qmake_build moc_build rcc_build -MAKE_ENV= QTDIR="${QT_PREFIX}" +USES= qmake +USE_QT4= corelib gui moc_build rcc_build -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common.h @${REINPLACE_CMD} -e 's|..PREFIX/share/kcheckers|${DATADIR}|' \ -e 's|..PREFIX|${PREFIX}|' ${WRKSRC}/kcheckers.pro -do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} kcheckers.pro - .include diff --git a/games/openpref/Makefile b/games/openpref/Makefile index 1a34f81..a12f183 100644 --- a/games/openpref/Makefile +++ b/games/openpref/Makefile @@ -10,21 +10,17 @@ MASTER_SITES= SF/${PORTNAME}/OpenPref-Qt4/${PORTNAME}-${PORTVERSION} MAINTAINER= annulen@yandex.ru COMMENT= Preferans game -USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build -HAS_CONFIGURE= yes +USES= qmake +USE_QT4= corelib gui moc_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes DESKTOP_ENTRIES="OpenPref" "${COMMENT}" "${DATADIR}/openpref.png" \ - "openpref" "Game;CardGame;" false - -NO_STAGE= yes -do-configure: - @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} ) + "openpref" "Game;CardGame;" true do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/openpref ${PREFIX}/bin - ${MKDIR} ${DATADIR}/i18n - ${INSTALL_DATA} ${WRKSRC}/openpref_ru.qm ${DATADIR}/i18n - ${INSTALL_DATA} ${WRKSRC}/pics/openpref.png ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/openpref ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DATADIR}/i18n + ${INSTALL_DATA} ${WRKSRC}/openpref_ru.qm ${STAGEDIR}${DATADIR}/i18n + ${INSTALL_DATA} ${WRKSRC}/pics/openpref.png ${STAGEDIR}${DATADIR} .include diff --git a/games/qtads/Makefile b/games/qtads/Makefile index 3b1e064..573acde 100644 --- a/games/qtads/Makefile +++ b/games/qtads/Makefile @@ -11,20 +11,16 @@ COMMENT= Cross-platform multimedia interpreter for TADS games LICENSE= GPLv2 -USES= gmake pkgconfig +USES= gmake pkgconfig qmake USE_BZIP2= yes -USE_QT4= gui moc_build network qmake_build rcc_build uic_build +USE_QT4= gui moc_build network rcc_build uic_build USE_SDL= sdl mixer sound -QMAKEFLAGS+= QMAKE_CFLAGS_RELEASE="" QMAKE_CXXFLAGS_RELEASE="" +QMAKE_ARGS+= QMAKE_CFLAGS_RELEASE="" QMAKE_CXXFLAGS_RELEASE="" PLIST_FILES= bin/qtads -NO_STAGE= yes -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include diff --git a/mail/qgmailnotifier/Makefile b/mail/qgmailnotifier/Makefile index d74b47a..b0e9035 100644 --- a/mail/qgmailnotifier/Makefile +++ b/mail/qgmailnotifier/Makefile @@ -9,28 +9,24 @@ MASTER_SITES= http://www.codef00.com/projects/ EXTRACT_SUFX= .tgz MAINTAINER= crees@FreeBSD.org -COMMENT= A portable QT4 based GMail notifier +COMMENT= Portable Qt 4 based GMail notifier -USE_QT4= qmake_build moc_build uic_build gui network xml rcc_build +USES= qmake +USE_QT4= moc_build uic_build gui network xml rcc_build WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= README PLIST_FILES= bin/${PORTNAME} -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|/bin|${PREFIX}/bin|g' ${WRKSRC}/qgmailnotifier.pro -do-configure: - @cd ${WRKSRC} \ - && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKE_ARGS} qgmailnotifier.pro - post-install: - @${STRIP_CMD} ${PREFIX}/bin/${PORTNAME} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .endif .include diff --git a/net-mgmt/nagiosagent/Makefile b/net-mgmt/nagiosagent/Makefile index 7510366..69befc2 100644 --- a/net-mgmt/nagiosagent/Makefile +++ b/net-mgmt/nagiosagent/Makefile @@ -15,19 +15,16 @@ COMMENT= Qt-based frontend to Nagios PLIST_FILES= bin/NagiosAgent \ share/pixmaps/NagiosAgent.png +USES= qmake USE_ZIP= yes -USE_QT4= gui network corelib qmake_build uic_build rcc_build moc_build +USE_QT4= gui network corelib uic_build rcc_build moc_build DESKTOP_ENTRIES= "NagiosAgent" "GUI client for Nagios" \ "${PREFIX}/share/pixmaps/NagiosAgent.png" \ - "NagiosAgent" "Network;Qt;" false - -NO_STAGE= yes -do-configure: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} -unix NagiosAgent.pro + "NagiosAgent" "Network;Qt;" true do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/NagiosAgent ${PREFIX}/bin/NagiosAgent - ${INSTALL_DATA} ${WRKSRC}/resources/icon16x16.png ${PREFIX}/share/pixmaps/NagiosAgent.png + ${INSTALL_PROGRAM} ${WRKSRC}/NagiosAgent ${STAGEDIR}${PREFIX}/bin/NagiosAgent + ${INSTALL_DATA} ${WRKSRC}/resources/icon16x16.png ${STAGEDIR}${PREFIX}/share/pixmaps/NagiosAgent.png .include diff --git a/net-mgmt/qkismet/Makefile b/net-mgmt/qkismet/Makefile index fd8e90e..fc53258 100644 --- a/net-mgmt/qkismet/Makefile +++ b/net-mgmt/qkismet/Makefile @@ -8,28 +8,23 @@ CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/qKismet/${PORTVERSION} MAINTAINER= vg@FreeBSD.org -COMMENT= This is graphical Kismet client writtent in Qt +COMMENT= Qt 4 GUI client for Kismet RUN_DEPENDS= kismet:${PORTSDIR}/net-mgmt/kismet +USES= qmake USE_BZIP2= yes -USE_QT4= gui xml qmake_build uic_build moc_build rcc_build network - -QMAKE_PRO= ${PORTNAME}.pro +USE_QT4= gui xml uic_build moc_build rcc_build network WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -NO_STAGE= yes do-patch: ${REINPLACE_CMD} -e 's,:/img/,${DATADIR}/img/,g' \ ${WRKSRC}/*.cpp -do-configure: - cd ${WRKSRC} && ${QMAKE} - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/../build/release/${PORTNAME} ${PREFIX}/bin/${PORTNAME} - ${MKDIR} ${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} img ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/../build/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} img ${STAGEDIR}${DATADIR} .include diff --git a/ports-mgmt/kports-qt4/Makefile b/ports-mgmt/kports-qt4/Makefile index 74abab0..9dddd8f 100644 --- a/ports-mgmt/kports-qt4/Makefile +++ b/ports-mgmt/kports-qt4/Makefile @@ -16,34 +16,22 @@ RUN_DEPENDS= portaudit:${PORTSDIR}/ports-mgmt/portaudit \ CONFLICTS= kports-0.[0-7]* USE_BZIP2= yes - -USE_QT4= corelib gui network qmake_build moc_build uic_build rcc_build -QMAKE_ARGS+= PREFIX=${PREFIX} - -HAS_CONFIGURE= yes - -LATEST_LINK= kports-qt4 +USES= qmake +USE_QT4= corelib gui network moc_build uic_build rcc_build OPTIONS_DEFINE= DEBUG OXYGEN KDEBASE OPTIONS_DEFAULT= OXYGEN KDEBASE OXYGEN_DESC= Pull in Oxygen icons (recommended) +OXYGEN_USE= KDE4=oxygen KDEBASE_DESC= Pull in kdebase-runtime for kdesu +KDEBASE_USE= KDE4=runtime .if defined(WITH_PKGNG) IGNORE= only works with traditional pkg-tools .endif -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MOXYGEN} -USE_KDE4= oxygen -.endif - -.if ${PORT_OPTIONS:MKDEBASE} -USE_KDE4= runtime -.endif - post-patch: ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/data/kports.desktop @@ -55,17 +43,4 @@ pre-configure: @(${ECHO_CMD} "DEFINES -= QT_NO_DEBUG_OUTPUT" >> ${WRKSRC}/src/src.pro) .endif -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} -unix ${QMAKE_ARGS} kports.pro - -post-install: -.if ! ${PORT_OPTIONS:MOXYGEN} - @${CAT} pkg-message.nooxygen -.endif - -.if ! ${PORT_OPTIONS:MKDEBASE} - @${CAT} pkg-message.nokdebase -.endif - .include diff --git a/ports-mgmt/portrac/Makefile b/ports-mgmt/portrac/Makefile index b1fa50d..fbf55c1 100644 --- a/ports-mgmt/portrac/Makefile +++ b/ports-mgmt/portrac/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://e-soul.org/distfiles/ \ http://home.e-soul.org/~mgp/distfiles/ MAINTAINER= mgp@e-soul.org -COMMENT= A simple GUI tool for tracking port updates +COMMENT= Simple GUI tool for tracking port updates LICENSE= BSD @@ -20,17 +20,13 @@ PLIST_FILES= bin/portrac \ PLIST_DIRS= share/portrac +USES= qmake USE_BZIP2= yes - -USE_QT4= gui moc_build qmake_build - -NO_STAGE= yes -do-configure: - @cd ${WRKDIR}/${DISTNAME} && ${QMAKE} portrac.pro +USE_QT4= gui moc_build do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/portrac ${PREFIX}/bin && \ - ${MKDIR} ${DATADIR} && \ - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/*.png ${DATADIR} + ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/portrac ${STAGEDIR}${PREFIX}/bin && \ + ${MKDIR} ${STAGEDIR}${DATADIR} && \ + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/*.png ${STAGEDIR}${DATADIR} .include diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile index a5a6f2b..103ab10 100644 --- a/security/keepassx/Makefile +++ b/security/keepassx/Makefile @@ -11,25 +11,15 @@ DISTNAME= ${PORTNAME:L}-${PORTVERSION} MAINTAINER= swills@FreeBSD.org COMMENT= Cross Platform Password Manager -RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info - DATADIR= ${PREFIX}/share/${PORTNAME:L} WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION} -USE_QT4= qmake_build moc_build uic_build qt3support_build rcc_build \ +USES= qmake shared-mime-info +USE_QT4= moc_build uic_build qt3support_build rcc_build \ corelib gui xml -HAS_CONFIGURE= yes USE_XORG= xt inputproto xtst xrender xrandr xfixes xcursor\ xext x11 sm ice xi -NO_STAGE= yes -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} -unix PREFIX=${PREFIX} \ - INCLUDEPATH+=${LOCALBASE}/include LIBS+=-L${LOCALBASE}/lib \ - keepassx.pro - -post-install: - -@update-mime-database ${LOCALBASE}/share/mime +QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include LIBS+=-L${LOCALBASE}/lib .include diff --git a/security/keepassx/pkg-plist b/security/keepassx/pkg-plist index bd1705e..03a4f25 100644 --- a/security/keepassx/pkg-plist +++ b/security/keepassx/pkg-plist @@ -103,5 +103,3 @@ share/pixmaps/keepassx.xpm @dirrmtry share/mimelnk @dirrmtry share/mime/packages @dirrmtry share/mime -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -- cgit v1.1