From owner-svn-ports-all@freebsd.org Sat Apr 14 13:16:36 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4A61F9FA62; Sat, 14 Apr 2018 13:16:35 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 843817B03C; Sat, 14 Apr 2018 13:16:35 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B95128B64; Sat, 14 Apr 2018 13:16:35 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3EDGZYX058934; Sat, 14 Apr 2018 13:16:35 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3EDGW1Y058903; Sat, 14 Apr 2018 13:16:32 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201804141316.w3EDGW1Y058903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 14 Apr 2018 13:16:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467317 - in head: . archivers/ark-kde4 audio/amarok-kde4 audio/clementine-player audio/libechonest deskutils/kdepim-runtime-kde4 deskutils/kdepimlibs-kde4 deskutils/kdeplasma-addons-kd... X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: . archivers/ark-kde4 audio/amarok-kde4 audio/clementine-player audio/libechonest deskutils/kdepim-runtime-kde4 deskutils/kdepimlibs-kde4 deskutils/kdeplasma-addons-kde4 devel devel/kdevplatfo... X-SVN-Commit-Revision: 467317 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2018 13:16:36 -0000 Author: tcberner Date: Sat Apr 14 13:16:32 2018 New Revision: 467317 URL: https://svnweb.freebsd.org/changeset/ports/467317 Log: devel/qjson, devel-qjson-qt5 create flavors * additionally, give the maintainership to kde@. Approved by: portmgr (mat), avilla (timeout) Differential Revision: https://reviews.freebsd.org/D14650 Deleted: head/devel/qjson-qt5/ Modified: head/MOVED head/archivers/ark-kde4/Makefile head/audio/amarok-kde4/Makefile head/audio/clementine-player/Makefile head/audio/libechonest/Makefile head/deskutils/kdepim-runtime-kde4/Makefile head/deskutils/kdepimlibs-kde4/Makefile head/deskutils/kdeplasma-addons-kde4/Makefile head/devel/Makefile head/devel/kdevplatform/Makefile head/devel/libkgapi-kde4/Makefile head/devel/qjson/Makefile head/editors/kate-kde4/Makefile head/graphics/kipi-plugin-debianscreenshots/Makefile head/graphics/kipi-plugin-dropbox/Makefile head/graphics/kipi-plugin-facebook/Makefile head/graphics/kipi-plugin-googleservices/Makefile head/graphics/kipi-plugin-imgurexport/Makefile head/graphics/libkscreen/Makefile head/graphics/qgis/Makefile head/misc/tellico-kde4/Makefile head/multimedia/kdenlive/Makefile head/net-p2p/torrent-file-editor/Makefile head/net/libkfbapi/Makefile head/net/libkvkontakte/Makefile head/net/qtweetlib/Makefile head/sysutils/baloo-kde4/Makefile head/www/choqok/Makefile head/x11/kde-workspace-kde4/Makefile head/x11/leechcraft/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sat Apr 14 12:59:08 2018 (r467316) +++ head/MOVED Sat Apr 14 13:16:32 2018 (r467317) @@ -10146,3 +10146,4 @@ finance/libalkimia|finance/alkimia-qt4|2018-04-13|Proj 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 Modified: head/archivers/ark-kde4/Makefile ============================================================================== --- head/archivers/ark-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/archivers/ark-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/audio/amarok-kde4/Makefile ============================================================================== --- head/audio/amarok-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/audio/amarok-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/audio/clementine-player/Makefile ============================================================================== --- head/audio/clementine-player/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/audio/clementine-player/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/audio/libechonest/Makefile ============================================================================== --- head/audio/libechonest/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/audio/libechonest/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libqjson.so:devel/qjson +LIB_DEPENDS= libqjson.so:devel/qjson@qt4 GH_ACCOUNT= lfranchi Modified: head/deskutils/kdepim-runtime-kde4/Makefile ============================================================================== --- head/deskutils/kdepim-runtime-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/deskutils/kdepim-runtime-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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.* Modified: head/deskutils/kdepimlibs-kde4/Makefile ============================================================================== --- head/deskutils/kdepimlibs-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/deskutils/kdepimlibs-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 \ Modified: head/deskutils/kdeplasma-addons-kde4/Makefile ============================================================================== --- head/deskutils/kdeplasma-addons-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/deskutils/kdeplasma-addons-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/devel/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -5197,7 +5197,6 @@ SUBDIR += qdevelop SUBDIR += qgit SUBDIR += qjson - SUBDIR += qjson-qt5 SUBDIR += qmake SUBDIR += qprog SUBDIR += qross Modified: head/devel/kdevplatform/Makefile ============================================================================== --- head/devel/kdevplatform/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/devel/kdevplatform/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/devel/libkgapi-kde4/Makefile ============================================================================== --- head/devel/libkgapi-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/devel/libkgapi-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Googl 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 Modified: head/devel/qjson/Makefile ============================================================================== --- head/devel/qjson/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/devel/qjson/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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}/,,} Modified: head/editors/kate-kde4/Makefile ============================================================================== --- head/editors/kate-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/editors/kate-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/graphics/kipi-plugin-debianscreenshots/Makefile ============================================================================== --- head/graphics/kipi-plugin-debianscreenshots/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/graphics/kipi-plugin-debianscreenshots/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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" Modified: head/graphics/kipi-plugin-dropbox/Makefile ============================================================================== --- head/graphics/kipi-plugin-dropbox/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/graphics/kipi-plugin-dropbox/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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" Modified: head/graphics/kipi-plugin-facebook/Makefile ============================================================================== --- head/graphics/kipi-plugin-facebook/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/graphics/kipi-plugin-facebook/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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" Modified: head/graphics/kipi-plugin-googleservices/Makefile ============================================================================== --- head/graphics/kipi-plugin-googleservices/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/graphics/kipi-plugin-googleservices/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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-* Modified: head/graphics/kipi-plugin-imgurexport/Makefile ============================================================================== --- head/graphics/kipi-plugin-imgurexport/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/graphics/kipi-plugin-imgurexport/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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" Modified: head/graphics/libkscreen/Makefile ============================================================================== --- head/graphics/libkscreen/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/graphics/libkscreen/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/graphics/qgis/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 \ Modified: head/misc/tellico-kde4/Makefile ============================================================================== --- head/misc/tellico-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/misc/tellico-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/multimedia/kdenlive/Makefile ============================================================================== --- head/multimedia/kdenlive/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/multimedia/kdenlive/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 edi 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 Modified: head/net-p2p/torrent-file-editor/Makefile ============================================================================== --- head/net-p2p/torrent-file-editor/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/net-p2p/torrent-file-editor/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/net/libkfbapi/Makefile ============================================================================== --- head/net/libkfbapi/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/net/libkfbapi/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/net/libkvkontakte/Makefile ============================================================================== --- head/net/libkvkontakte/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/net/libkvkontakte/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/net/qtweetlib/Makefile ============================================================================== --- head/net/qtweetlib/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/net/qtweetlib/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/sysutils/baloo-kde4/Makefile ============================================================================== --- head/sysutils/baloo-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/sysutils/baloo-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 \ Modified: head/www/choqok/Makefile ============================================================================== --- head/www/choqok/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/www/choqok/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 Modified: head/x11/kde-workspace-kde4/Makefile ============================================================================== --- head/x11/kde-workspace-kde4/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/x11/kde-workspace-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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 \ Modified: head/x11/leechcraft/Makefile ============================================================================== --- head/x11/leechcraft/Makefile Sat Apr 14 12:59:08 2018 (r467316) +++ head/x11/leechcraft/Makefile Sat Apr 14 13:16:32 2018 (r467317) @@ -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}