Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F150676664
D14650.id40161.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
18 KB
Referenced Files
None
Subscribers
None
D14650.id40161.diff
View Options
Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -10197,3 +10197,4 @@
databases/php-memcached|databases/pecl-memcached|2018-03-10|Remove duplicate port, use databases/pecl-memcached instead
emulators/i386-wine-staging|emulators/i386-wine-devel|2018-03-10|Broken for months, abandoned upstream
archivers/quazip-qt5|archivers/quazip@qt5|2018-03-11|Moved to a flavoured version
+devel/qjson-qt5|devel/qjson@qt5|2018-03-11|Moved to a flavoured version
Index: archivers/ark-kde4/Makefile
===================================================================
--- archivers/ark-kde4/Makefile
+++ 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
Index: audio/amarok-kde4/Makefile
===================================================================
--- audio/amarok-kde4/Makefile
+++ audio/amarok-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amarok
PORTVERSION= 2.8.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= audio kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
@@ -16,7 +16,7 @@
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 \
libdbus-1.so:devel/dbus
BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator
Index: audio/clementine-player/Makefile
===================================================================
--- audio/clementine-player/Makefile
+++ audio/clementine-player/Makefile
@@ -3,7 +3,7 @@
PORTNAME= clementine
PORTVERSION= 1.3.1
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= audio
PKGNAMESUFFIX= -player
@@ -18,7 +18,7 @@
libchromaprint.so:audio/chromaprint \
libprotobuf.so:devel/protobuf \
libqca.so:devel/qca \
- libqjson.so:devel/qjson \
+ libqjson.so:devel/qjson@qt4 \
libfftw3.so:math/fftw3 \
libechonest.so:audio/libechonest \
libcryptopp.so:security/cryptopp
Index: audio/libechonest/Makefile
===================================================================
--- audio/libechonest/Makefile
+++ 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 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libqjson.so:devel/qjson
+LIB_DEPENDS= libqjson.so:devel/qjson@qt4
GH_ACCOUNT= lfranchi
Index: deskutils/kdepim-runtime-kde4/Makefile
===================================================================
--- deskutils/kdepim-runtime-kde4/Makefile
+++ deskutils/kdepim-runtime-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdepim-runtime
PORTVERSION= ${KDE4_KDEPIM_VERSION}
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -17,7 +17,7 @@
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.*
Index: deskutils/kdepimlibs-kde4/Makefile
===================================================================
--- deskutils/kdepimlibs-kde4/Makefile
+++ deskutils/kdepimlibs-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdepimlibs
PORTVERSION= ${KDE4_KDEPIM_VERSION}
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -19,7 +19,7 @@
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 \
Index: deskutils/kdeplasma-addons-kde4/Makefile
===================================================================
--- deskutils/kdeplasma-addons-kde4/Makefile
+++ deskutils/kdeplasma-addons-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kdeplasma-addons
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= deskutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +12,7 @@
libqwt.so:x11-toolkits/qwt5 \
libqca.so:devel/qca \
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
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -5145,7 +5145,6 @@
SUBDIR += qdevelop
SUBDIR += qgit
SUBDIR += qjson
- SUBDIR += qjson-qt5
SUBDIR += qmake
SUBDIR += qprog
SUBDIR += qross
Index: devel/kdevplatform/Makefile
===================================================================
--- devel/kdevplatform/Makefile
+++ 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 @@
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
Index: devel/libkgapi/Makefile
===================================================================
--- devel/libkgapi/Makefile
+++ devel/libkgapi/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libkgapi
PORTVERSION= 2.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel kde
MASTER_SITES= KDE/stable/libkgapi/${PORTVERSION}/src
DIST_SUBDIR= KDE
@@ -12,7 +12,7 @@
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
Index: devel/qjson-qt5/Makefile
===================================================================
--- devel/qjson-qt5/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PORTREVISION= 1
-PKGNAMESUFFIX= -qt5
-
-MASTERDIR= ${.CURDIR:H}/qjson
-
-.include "${MASTERDIR}/Makefile"
Index: devel/qjson/Makefile
===================================================================
--- devel/qjson/Makefile
+++ devel/qjson/Makefile
@@ -1,9 +1,10 @@
# $FreeBSD$
PORTNAME= qjson
-PORTVERSION= 0.9.0
-PORTREVISION?= 0
+DISTVERSION= 0.9.0
+PORTREVISION= 2
CATEGORIES= devel
+PKGNAMESUFFIX= -${FLAVOR}
MAINTAINER= avilla@FreeBSD.org
COMMENT= Library to manage JSON objects with Qt
@@ -11,23 +12,25 @@
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
+. else
PORTSCOUT= ignore:1
-
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}/,,}
Index: editors/kate-kde4/Makefile
===================================================================
--- editors/kate-kde4/Makefile
+++ 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
Index: graphics/kipi-plugin-debianscreenshots/Makefile
===================================================================
--- graphics/kipi-plugin-debianscreenshots/Makefile
+++ 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"
Index: graphics/kipi-plugin-dropbox/Makefile
===================================================================
--- graphics/kipi-plugin-dropbox/Makefile
+++ 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"
Index: graphics/kipi-plugin-facebook/Makefile
===================================================================
--- graphics/kipi-plugin-facebook/Makefile
+++ 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"
Index: graphics/kipi-plugin-googleservices/Makefile
===================================================================
--- graphics/kipi-plugin-googleservices/Makefile
+++ 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-*
Index: graphics/kipi-plugin-imgurexport/Makefile
===================================================================
--- graphics/kipi-plugin-imgurexport/Makefile
+++ 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"
Index: graphics/libkscreen/Makefile
===================================================================
--- graphics/libkscreen/Makefile
+++ 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
Index: graphics/qgis/Makefile
===================================================================
--- graphics/qgis/Makefile
+++ graphics/qgis/Makefile
@@ -4,7 +4,7 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
DISTVERSION= 2_18_17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics geography
MAINTAINER= rhurlin@gwdg.de
@@ -19,7 +19,7 @@
libgsl.so:math/gsl \
libproj.so:graphics/proj \
libqca.so:devel/qca \
- libqjson.so:devel/qjson \
+ libqjson.so:devel/qjson@qt4 \
libqscintilla2_qt4.so:devel/qscintilla2 \
libqwt.so:x11-toolkits/qwt5 \
libspatialindex.so:devel/spatialindex \
Index: misc/tellico-kde4/Makefile
===================================================================
--- misc/tellico-kde4/Makefile
+++ 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 @@
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
Index: multimedia/kdenlive/Makefile
===================================================================
--- multimedia/kdenlive/Makefile
+++ 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 @@
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
Index: net-im/ktp-auth-handler/Makefile
===================================================================
--- net-im/ktp-auth-handler/Makefile
+++ net-im/ktp-auth-handler/Makefile
@@ -2,14 +2,14 @@
PORTNAME= ktp-auth-handler
PORTVERSION= ${KTP_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im kde
MASTER_SITES= KDE/${KTP_BRANCH}/kde-telepathy/${PORTVERSION}/src
MAINTAINER= kde@FreeBSD.org
COMMENT= KWallet integration module for KDE Telepathy
-LIB_DEPENDS= libqjson.so:devel/qjson \
+LIB_DEPENDS= libqjson.so:devel/qjson@qt4 \
libqca.so:devel/qca \
libtelepathy-qt4.so:net-im/telepathy-qt4 \
libktpcommoninternalsprivate.so:net-im/ktp-common-internals
Index: net-p2p/torrent-file-editor/Makefile
===================================================================
--- net-p2p/torrent-file-editor/Makefile
+++ 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 @@
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>
Index: net/libkfbapi/Makefile
===================================================================
--- net/libkfbapi/Makefile
+++ 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 @@
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
Index: net/libkvkontakte/Makefile
===================================================================
--- net/libkvkontakte/Makefile
+++ 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 @@
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
Index: net/qtweetlib/Makefile
===================================================================
--- net/qtweetlib/Makefile
+++ net/qtweetlib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qtweetlib
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= nivit@FreeBSD.org
@@ -10,7 +11,7 @@
LICENSE= LGPL21
-LIB_DEPENDS= libqjson.so:devel/qjson
+LIB_DEPENDS= libqjson.so:devel/qjson@qt4
GH_ACCOUNT= minimoog
GH_PROJECT= QTweetLib
Index: sysutils/baloo-kde4/Makefile
===================================================================
--- sysutils/baloo-kde4/Makefile
+++ sysutils/baloo-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= baloo
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +12,7 @@
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 \
Index: www/choqok/Makefile
===================================================================
--- www/choqok/Makefile
+++ 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 @@
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
Index: x11/kde-workspace-kde4/Makefile
===================================================================
--- x11/kde-workspace-kde4/Makefile
+++ x11/kde-workspace-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kde-workspace
PORTVERSION= ${KDE4_WORKSPACE_VERSION}
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= x11 kde kde-applications
PKGNAMESUFFIX= -kde4
@@ -13,7 +13,7 @@
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 \
Index: x11/leechcraft/Makefile
===================================================================
--- x11/leechcraft/Makefile
+++ x11/leechcraft/Makefile
@@ -3,7 +3,7 @@
PORTNAME= leechcraft
PORTVERSION= 0.6.70
-PORTREVISION= 27
+PORTREVISION= 28
CATEGORIES= x11
MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/
@@ -383,7 +383,7 @@
${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}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Apr 4, 7:16 AM (7 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30751804
Default Alt Text
D14650.id40161.diff (18 KB)
Attached To
Mode
D14650: Convert devel/qjson & devel/qjson-qt5 into a flavor
Attached
Detach File
Event Timeline
Log In to Comment