diff options
31 files changed, 68 insertions, 72 deletions
@@ -10146,3 +10146,4 @@ finance/libalkimia|finance/alkimia-qt4|2018-04-13|Project renamed security/py-zxcvbn-python|security/py-zxcvbn|2018-04-13|Renamed upstream devel/py-libusb115|devel/py-libusb1|2018-04-14|Unused and unmaintained upstream devel/qca-qt5|devel/qca@qt5|2018-04-14|Moved to a flavoured version +devel/qjson-qt5|devel/qjson@qt5|2018-04-14|Moved to a flavoured version diff --git a/archivers/ark-kde4/Makefile b/archivers/ark-kde4/Makefile index 4ceaebbd256..51c72818d7d 100644 --- a/archivers/ark-kde4/Makefile +++ b/archivers/ark-kde4/Makefile @@ -3,13 +3,13 @@ PORTNAME= ark PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= archivers kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Archiving tool for KDE -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile index b5e0ab609b0..44c1cae1ed0 100644 --- a/audio/amarok-kde4/Makefile +++ b/audio/amarok-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= amarok PORTVERSION= 2.8.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= audio kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtag.so:audio/taglib \ libtag-extras.so:audio/taglib-extras \ liblastfm.so:audio/liblastfm \ - libqjson.so:devel/qjson \ + libqjson.so:devel/qjson@qt4 \ libqca.so:devel/qca@qt4 \ libdbus-1.so:devel/dbus BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile index ddf1afbd7da..e3174af33e6 100644 --- a/audio/clementine-player/Makefile +++ b/audio/clementine-player/Makefile @@ -3,7 +3,7 @@ PORTNAME= clementine PORTVERSION= 1.3.1 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= audio PKGNAMESUFFIX= -player @@ -18,7 +18,7 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libchromaprint.so:audio/chromaprint \ libprotobuf.so:devel/protobuf \ libqca.so:devel/qca@qt4 \ - libqjson.so:devel/qjson \ + libqjson.so:devel/qjson@qt4 \ libfftw3.so:math/fftw3 \ libechonest.so:audio/libechonest \ libcryptopp.so:security/cryptopp diff --git a/audio/libechonest/Makefile b/audio/libechonest/Makefile index 4e4809fb81f..6e273067c23 100644 --- a/audio/libechonest/Makefile +++ b/audio/libechonest/Makefile @@ -3,7 +3,7 @@ PORTNAME= libechonest PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= nivit@FreeBSD.org @@ -12,7 +12,7 @@ COMMENT= Collection of C++/Qt classes designed to use the APIs of The Echo Nest LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 GH_ACCOUNT= lfranchi diff --git a/deskutils/kdepim-runtime-kde4/Makefile b/deskutils/kdepim-runtime-kde4/Makefile index 015dda2f6ae..97551e03551 100644 --- a/deskutils/kdepim-runtime-kde4/Makefile +++ b/deskutils/kdepim-runtime-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= kdepim-runtime PORTVERSION= ${KDE4_KDEPIM_VERSION} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} @@ -17,7 +17,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libkolab.so:devel/libkolab \ libkolabxml.so:textproc/libkolabxml \ libkfbapi.so:net/libkfbapi \ - libqjson.so:devel/qjson + libqjson.so:devel/qjson@qt4 CONFLICTS_INSTALL= kdepim-runtime44-4.* diff --git a/deskutils/kdepimlibs-kde4/Makefile b/deskutils/kdepimlibs-kde4/Makefile index e13b649daca..49206d2da66 100644 --- a/deskutils/kdepimlibs-kde4/Makefile +++ b/deskutils/kdepimlibs-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= kdepimlibs PORTVERSION= ${KDE4_KDEPIM_VERSION} -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} @@ -19,7 +19,7 @@ LIB_DEPENDS= libgpgme.so:security/gpgme \ libical.so:devel/libical \ libuuid.so:misc/e2fsprogs-libuuid \ libprison.so:graphics/prison \ - libqjson.so:devel/qjson + libqjson.so:devel/qjson@qt4 USES= cmake:outsource kde:4 shared-mime-info shebangfix tar:xz USE_KDE= kdelibs akonadi \ diff --git a/deskutils/kdeplasma-addons-kde4/Makefile b/deskutils/kdeplasma-addons-kde4/Makefile index 9917648ef5c..2131397a923 100644 --- a/deskutils/kdeplasma-addons-kde4/Makefile +++ b/deskutils/kdeplasma-addons-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kdeplasma-addons PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= deskutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org @@ -12,7 +12,7 @@ LIB_DEPENDS= libqalculate.so:math/libqalculate \ libqwt.so:x11-toolkits/qwt5 \ libqca.so:devel/qca@qt4 \ libqoauth.so:net/qoauth \ - libqjson.so:devel/qjson + libqjson.so:devel/qjson@qt4 CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].* USES= cmake:outsource eigen:2 kde:4 pkgconfig shared-mime-info tar:xz diff --git a/devel/Makefile b/devel/Makefile index 5967b6abe46..85899c7084a 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5197,7 +5197,6 @@ SUBDIR += qdevelop SUBDIR += qgit SUBDIR += qjson - SUBDIR += qjson-qt5 SUBDIR += qmake SUBDIR += qprog SUBDIR += qross diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile index 53a6331eac3..d8e859c0d23 100644 --- a/devel/kdevplatform/Makefile +++ b/devel/kdevplatform/Makefile @@ -3,7 +3,7 @@ PORTNAME= kdevplatform PORTVERSION= ${KDEVELOP_VERSION:S/4./1./} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel kde MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION} DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION} @@ -13,7 +13,7 @@ COMMENT= Set of libraries for KDE IDE-like programs LIB_DEPENDS= libsvn_client-1.so:devel/subversion \ libboost_thread.so:devel/boost-libs \ - libqjson.so:devel/qjson + libqjson.so:devel/qjson@qt4 USES= cmake:outsource compiler:c++11-lib grantlee:4 kde:4 shebangfix \ tar:xz diff --git a/devel/libkgapi-kde4/Makefile b/devel/libkgapi-kde4/Makefile index 9253b07d6bb..6b54cc04780 100644 --- a/devel/libkgapi-kde4/Makefile +++ b/devel/libkgapi-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= libkgapi PORTVERSION= 2.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel kde MASTER_SITES= KDE/stable/libkgapi/${PORTVERSION}/src PKGNAMESUFFIX= -kde4 @@ -13,7 +13,7 @@ COMMENT= KDE-based library for accessing various Google services LICENSE= GPLv2 -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 USES= cmake:outsource kde:4 tar:bzip2 USE_KDE= automoc4 kdelibs pimlibs diff --git a/devel/qjson-qt5/Makefile b/devel/qjson-qt5/Makefile deleted file mode 100644 index 9289199d1cd..00000000000 --- a/devel/qjson-qt5/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 1 -PKGNAMESUFFIX= -qt5 - -MASTERDIR= ${.CURDIR:H}/qjson - -.include "${MASTERDIR}/Makefile" diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile index dcc3c018bf7..e837921b104 100644 --- a/devel/qjson/Makefile +++ b/devel/qjson/Makefile @@ -1,33 +1,35 @@ # $FreeBSD$ PORTNAME= qjson -PORTVERSION= 0.9.0 -PORTREVISION?= 0 +DISTVERSION= 0.9.0 +PORTREVISION= 2 CATEGORIES= devel +PKGNAMESUFFIX= -${FLAVOR} -MAINTAINER= avilla@FreeBSD.org +MAINTAINER= kde@FreeBSD.org COMMENT= Library to manage JSON objects with Qt LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.lib +FLAVORS= qt4 qt5 +FLAVOR?= ${FLAVORS:[1]} + +USES= cmake pathfix USE_GITHUB= yes GH_ACCOUNT= flavio -USES= cmake pathfix USE_LDCONFIG= yes -.if empty(PKGNAMESUFFIX) +. if ${FLAVOR} == qt4 USE_QT4= corelib moc_build qmake_build rcc_build uic_build -CMAKE_ARGS+= -DQT4_BUILD:BOOL=TRUE +CMAKE_ON= QT4_BUILD PLIST_SUB= QT5="@comment " NO_QT5="" -.else -PORTSCOUT= ignore:1 - +. else USE_QT5= core buildtools_build qmake_build -CMAKE_ARGS+= -DQT4_BUILD:BOOL=FALSE +CMAKE_OFF= QT4_BUILD PLIST_SUB= QT5="" NO_QT5="@comment " QT_SUFFIX= -qt5 -.endif +. endif _DOCSDIR= ${DOCSDIR}${QT_SUFFIX} DOCSDIR_REL= ${_DOCSDIR:S,^${PREFIX}/,,} diff --git a/editors/kate-kde4/Makefile b/editors/kate-kde4/Makefile index d481bd102f0..1016dfe6eb5 100644 --- a/editors/kate-kde4/Makefile +++ b/editors/kate-kde4/Makefile @@ -3,13 +3,13 @@ PORTNAME= kate PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Basic editor framework for the KDE system -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 USES= cmake:outsource gettext kde:4 perl5 tar:xz USE_KDE= kdelibs automoc4 kactivities diff --git a/graphics/kipi-plugin-debianscreenshots/Makefile b/graphics/kipi-plugin-debianscreenshots/Makefile index afc0e431b8c..1ee94d39c2e 100644 --- a/graphics/kipi-plugin-debianscreenshots/Makefile +++ b/graphics/kipi-plugin-debianscreenshots/Makefile @@ -2,13 +2,13 @@ PORTNAME= kipi-plugin-${KIPI_PLUGIN} PORTVERSION= ${DIGIKAM_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 KIPI_PLUGIN= debianscreenshots .include "${.CURDIR}/../digikam-kde4/Makefile.common" diff --git a/graphics/kipi-plugin-dropbox/Makefile b/graphics/kipi-plugin-dropbox/Makefile index c4f38e65027..d30c88ad66c 100644 --- a/graphics/kipi-plugin-dropbox/Makefile +++ b/graphics/kipi-plugin-dropbox/Makefile @@ -2,13 +2,13 @@ PORTNAME= kipi-plugin-${KIPI_PLUGIN} PORTVERSION= ${DIGIKAM_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 KIPI_PLUGIN= dropbox .include "${.CURDIR}/../digikam-kde4/Makefile.common" diff --git a/graphics/kipi-plugin-facebook/Makefile b/graphics/kipi-plugin-facebook/Makefile index 7206d225800..4eb20dc6046 100644 --- a/graphics/kipi-plugin-facebook/Makefile +++ b/graphics/kipi-plugin-facebook/Makefile @@ -2,13 +2,13 @@ PORTNAME= kipi-plugin-${KIPI_PLUGIN} PORTVERSION= ${DIGIKAM_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 KIPI_PLUGIN= facebook .include "${.CURDIR}/../digikam-kde4/Makefile.common" diff --git a/graphics/kipi-plugin-googleservices/Makefile b/graphics/kipi-plugin-googleservices/Makefile index 63ae43b86c7..09667ae4812 100644 --- a/graphics/kipi-plugin-googleservices/Makefile +++ b/graphics/kipi-plugin-googleservices/Makefile @@ -2,13 +2,13 @@ PORTNAME= kipi-plugin-${KIPI_PLUGIN} PORTVERSION= ${DIGIKAM_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 CONFLICTS_INSTALL= kipi-plugin-googledrive-* \ kipi-plugin-picasawebexport-* diff --git a/graphics/kipi-plugin-imgurexport/Makefile b/graphics/kipi-plugin-imgurexport/Makefile index 13b54664cf5..fffd518eb3e 100644 --- a/graphics/kipi-plugin-imgurexport/Makefile +++ b/graphics/kipi-plugin-imgurexport/Makefile @@ -2,13 +2,13 @@ PORTNAME= kipi-plugin-${KIPI_PLUGIN} PORTVERSION= ${DIGIKAM_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 KIPI_PLUGIN= imgurexport .include "${.CURDIR}/../digikam-kde4/Makefile.common" diff --git a/graphics/libkscreen/Makefile b/graphics/libkscreen/Makefile index 2a8c5794d95..c959cdf6cea 100644 --- a/graphics/libkscreen/Makefile +++ b/graphics/libkscreen/Makefile @@ -3,14 +3,14 @@ PORTNAME= libkscreen PORTVERSION= 1.0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src MAINTAINER= kde@FreeBSD.org COMMENT= KDE screen management library -LIB_DEPENDS= libqjson.so:devel/qjson \ +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 \ libxcb.so:x11/libxcb \ libxcb-image.so:x11/xcb-util-image \ libxcb-render-util.so:x11/xcb-util-renderutil diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 3162923c5a3..ff0fb086646 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -4,7 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 2_18_17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -19,7 +19,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libgsl.so:math/gsl \ libproj.so:graphics/proj \ libqca.so:devel/qca@qt4 \ - libqjson.so:devel/qjson \ + libqjson.so:devel/qjson@qt4 \ libqscintilla2_qt4.so:devel/qscintilla2 \ libqwt.so:x11-toolkits/qwt5 \ libspatialindex.so:devel/spatialindex \ diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index ae2e35a668f..c8de0352bae 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= tellico PORTVERSION= 2.3.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc kde MASTER_SITES= http://tellico-project.org/files/ @@ -16,7 +16,7 @@ LIB_DEPENDS= libexempi.so:textproc/exempi \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libpoppler-qt4.so:graphics/poppler-qt4 \ - libqjson.so:devel/qjson \ + libqjson.so:devel/qjson@qt4 \ libtag.so:audio/taglib \ libyaz.so:net/yaz diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile index fb4cdd8f0fc..72d0f37401d 100644 --- a/multimedia/kdenlive/Makefile +++ b/multimedia/kdenlive/Makefile @@ -2,7 +2,7 @@ PORTNAME= kdenlive PORTVERSION= 0.9.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src/ @@ -12,7 +12,7 @@ COMMENT= KDE professional quality non-linear video editing suite LICENSE= GPLv2 LIB_DEPENDS= libmlt.so:multimedia/mlt \ - libqjson.so:devel/qjson + libqjson.so:devel/qjson@qt4 RUN_DEPENDS= ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} \ ${LOCALBASE}/lib/mlt/libmltqt.so:multimedia/mlt-qt4 diff --git a/net-p2p/torrent-file-editor/Makefile b/net-p2p/torrent-file-editor/Makefile index 8bb96105ebe..6a945b2feb6 100644 --- a/net-p2p/torrent-file-editor/Makefile +++ b/net-p2p/torrent-file-editor/Makefile @@ -3,6 +3,7 @@ PORTNAME= torrent-file-editor PORTVERSION= 0.3.10 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/v${PORTVERSION} @@ -28,7 +29,7 @@ DONATION_CMAKE_OFF= -DDISABLE_DONATION:BOOL=ON QT5_USE= QT5=${_QT5_DEPS:ts,} QT5_USE_OFF= QT4=${_QT4_DEPS:ts,} -QT5_LIB_DEPENDS_OFF= libqjson.so:devel/qjson +QT5_LIB_DEPENDS_OFF= libqjson.so:devel/qjson@qt4 QT5_CMAKE_ON= -DQT5_BUILD:BOOL=ON .include <bsd.port.mk> diff --git a/net/libkfbapi/Makefile b/net/libkfbapi/Makefile index a8dc68ca32c..f9fad999850 100644 --- a/net/libkfbapi/Makefile +++ b/net/libkfbapi/Makefile @@ -2,7 +2,7 @@ PORTNAME= libkfbapi PORTVERSION= 1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net kde MASTER_SITES= KDE/stable/libkfbapi/${PORTVERSION}/src DIST_SUBDIR= KDE @@ -12,7 +12,7 @@ COMMENT= Library for accessing Facebook services LICENSE= LGPL20 -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 USES= cmake:outsource gettext kde:4 tar:bzip2 USE_KDE= automoc4 kdelibs pimlibs diff --git a/net/libkvkontakte/Makefile b/net/libkvkontakte/Makefile index 30a69fe4455..bafeb2bd91e 100644 --- a/net/libkvkontakte/Makefile +++ b/net/libkvkontakte/Makefile @@ -2,7 +2,7 @@ PORTNAME= libkvkontakte PORTVERSION= 4.12.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src DIST_SUBDIR= KDE/digikam @@ -13,7 +13,7 @@ COMMENT= KDE library for accessing vk.com LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 USES= cmake:outsource gettext kde:4 pkgconfig tar:xz USE_QT4= moc_build qmake_build rcc_build uic_build diff --git a/net/qtweetlib/Makefile b/net/qtweetlib/Makefile index 0c2e22c1ead..5a32ca2f25b 100644 --- a/net/qtweetlib/Makefile +++ b/net/qtweetlib/Makefile @@ -3,6 +3,7 @@ PORTNAME= qtweetlib PORTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= nivit@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= C++ Qt based Twitter library LICENSE= LGPL21 -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 GH_ACCOUNT= minimoog GH_PROJECT= QTweetLib diff --git a/sysutils/baloo-kde4/Makefile b/sysutils/baloo-kde4/Makefile index 2f693ae4084..51a15e067eb 100644 --- a/sysutils/baloo-kde4/Makefile +++ b/sysutils/baloo-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= baloo PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org @@ -12,7 +12,7 @@ CONFLICTS_INSTALL= kde-runtime-4.12.* \ kf5-baloo-5.* LIB_DEPENDS= libxapian.so:databases/xapian-core \ - libqjson.so:devel/qjson + libqjson.so:devel/qjson@qt4 USES= cmake:outsource kde:4 tar:xz USE_KDE= akonadi automoc4 kdelibs kfilemetadata \ diff --git a/www/choqok/Makefile b/www/choqok/Makefile index d293aba21a1..a39ce74f363 100644 --- a/www/choqok/Makefile +++ b/www/choqok/Makefile @@ -3,7 +3,7 @@ PORTNAME= choqok PORTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www kde MASTER_SITES= SF/${PORTNAME}/Choqok/ @@ -13,7 +13,7 @@ COMMENT= KDE micro-blogging client LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libqjson.so:devel/qjson \ +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 \ libqoauth.so:net/qoauth \ libtelepathy-qt4.so:net-im/telepathy-qt4 diff --git a/x11/kde-workspace-kde4/Makefile b/x11/kde-workspace-kde4/Makefile index 91412a415e6..bef845b30cc 100644 --- a/x11/kde-workspace-kde4/Makefile +++ b/x11/kde-workspace-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= x11 kde kde-applications PKGNAMESUFFIX= -kde4 @@ -13,7 +13,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libck-connector.so:sysutils/consolekit2 \ libpci.so:devel/libpci \ libhal.so:sysutils/hal \ - libqjson.so:devel/qjson \ + libqjson.so:devel/qjson@qt4 \ libcln.so:math/cln \ libqalculate.so:math/libqalculate \ libprison.so:graphics/prison \ diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile index 7a550062b45..35cbeb242c3 100644 --- a/x11/leechcraft/Makefile +++ b/x11/leechcraft/Makefile @@ -3,7 +3,7 @@ PORTNAME= leechcraft PORTVERSION= 0.6.70 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= x11 MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/ @@ -383,7 +383,7 @@ USE_QT4+= xmlpatterns ${PORT_OPTIONS:MNETSTOREMANAGER} || ${PORT_OPTIONS:MPOSHUKU} || \ ${PORT_OPTIONS:MQROSP} || ${PORT_OPTIONS:MSB2} || \ ${PORT_OPTIONS:MTOUCHSTREAMS} -LIB_DEPENDS+= libqjson.so:devel/qjson +LIB_DEPENDS+= libqjson.so:devel/qjson@qt4 .endif .if ${PORT_OPTIONS:MELEEMINATOR} |