Index: Mk/Uses/kde.mk =================================================================== --- Mk/Uses/kde.mk +++ Mk/Uses/kde.mk @@ -124,14 +124,15 @@ MASTER_SITES?= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src DIST_SUBDIR?= KDE/${KDE4_VERSION} PKGNAMESUFFIX= -kde4 -CONFLICTS_INSTALL= ${PORTNAME} +CONFLICTS_INSTALL+= ${PORTNAME} . elif ${_KDE_CATEGORY:Mkde-applications} PORTVERSION?= ${KDE_APPLICATIONS_VERSION} . if ${_KDE_VERSION:M4} -CONFLICTS_INSTALL?= ${PORTNAME}-[0-9]* +CONFLICTS_INSTALL+= ${PORTNAME}-[0-9]* PKGNAMESUFFIX?= -kde4 . else -CONFLICTS_INSTALL?= ${PORTNAME}-kde4 +CONFLICTS_INSTALL+= ${PORTNAME}-kde4 \ + .*kde-l10n-4.* . endif # Decide where the file lies on KDE's servers: Check whether the file lies in Attic . if ${KDE_APPLICATIONS_VERSION:R:R} <= ${_KDE_APPLICATIONS_ATTIC_VERSION:R:R} @@ -153,6 +154,7 @@ PKGNAMEPREFIX?= plasma5- MASTER_SITES?= KDE/${KDE_PLASMA_BRANCH}/plasma/${KDE_PLASMA_VERSION} DIST_SUBDIR?= KDE/plasma/${KDE_PLASMA_VERSION} +CONFLICTS_INSTALL+= .*kde-l10n-4.* . elif ${_KDE_CATEGORY:Mkde-frameworks} PORTVERSION?= ${KDE_FRAMEWORKS_VERSION} PKGNAMEPREFIX?= kf5- Index: astro/kstars/Makefile =================================================================== --- astro/kstars/Makefile +++ astro/kstars/Makefile @@ -12,6 +12,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS_INSTALL= .*kde-l10n-4.* \ + ${PORTNAME}-kde4 + LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ libraw.so:graphics/libraw \ libwcs.so:astro/wcslib Index: audio/audiocd-kio/Makefile =================================================================== --- audio/audiocd-kio/Makefile +++ audio/audiocd-kio/Makefile @@ -9,6 +9,9 @@ LICENSE= GPLv2 +CONFLICTS_INSTALL= kio-audiocd-kde4 \ + .*kde-l10n-4.* + LIB_DEPENDS= libFLAC.so:audio/flac \ libcdda_paranoia.so:audio/cdparanoia \ libogg.so:audio/libogg \ Index: audio/kio-audiocd-kde4/Makefile =================================================================== --- audio/kio-audiocd-kde4/Makefile +++ audio/kio-audiocd-kde4/Makefile @@ -11,6 +11,8 @@ LICENSE= GPLv2 +CONFLICTS_INSTALL= audiocd-kio + LIB_DEPENDS= libFLAC.so:audio/flac \ libcdda_paranoia.so:audio/cdparanoia \ libogg.so:audio/libogg \ Index: databases/akonadi-kde4/Makefile =================================================================== --- databases/akonadi-kde4/Makefile +++ databases/akonadi-kde4/Makefile @@ -14,6 +14,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= akonadi + LIB_DEPENDS= libboost_thread.so:devel/boost-libs # Let process generate meaningful backtrace on core dump. BUILD_DEPENDS= xsltproc:textproc/libxslt Index: databases/akonadi/Makefile =================================================================== --- databases/akonadi/Makefile +++ databases/akonadi/Makefile @@ -13,7 +13,7 @@ # Let process generate meaningful backtrace on core dump. BUILD_DEPENDS= xsltproc:textproc/libxslt -CONFLICTS= akonadi-[0-9]* akonadi-kf5-git-[0-9]* +CONFLICTS_INSTALL= akonadi-kde4 kdepimlibs-kde4 USES= cmake:outsource compiler:c++11-lib gettext kde:5 \ shared-mime-info tar:xz Index: deskutils/akonadi-calendar-tools/Makefile =================================================================== --- deskutils/akonadi-calendar-tools/Makefile +++ deskutils/akonadi-calendar-tools/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= CLI tools to manage akonadi calendars +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libical.so:devel/libical USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz Index: deskutils/akonadi-import-wizard/Makefile =================================================================== --- deskutils/akonadi-import-wizard/Makefile +++ deskutils/akonadi-import-wizard/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Import data from other mail clients to KMail +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/akonadiconsole/Makefile =================================================================== --- deskutils/akonadiconsole/Makefile +++ deskutils/akonadiconsole/Makefile @@ -9,6 +9,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/akregator/Makefile =================================================================== --- deskutils/akregator/Makefile +++ deskutils/akregator/Makefile @@ -9,6 +9,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/grantlee-editor/Makefile =================================================================== --- deskutils/grantlee-editor/Makefile +++ deskutils/grantlee-editor/Makefile @@ -9,6 +9,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/kaddressbook/Makefile =================================================================== --- deskutils/kaddressbook/Makefile +++ deskutils/kaddressbook/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE contact manager +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/kalarm/Makefile =================================================================== --- deskutils/kalarm/Makefile +++ deskutils/kalarm/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Personal alarm scheduler +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libical.so:devel/libical USES= cmake:outsource compiler:c++11-lib gettext kde:5 shebangfix tar:xz Index: deskutils/kdepim-addons/Makefile =================================================================== --- deskutils/kdepim-addons/Makefile +++ deskutils/kdepim-addons/Makefile @@ -9,6 +9,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/kdepim-kde4/Makefile =================================================================== --- deskutils/kdepim-kde4/Makefile +++ deskutils/kdepim-kde4/Makefile @@ -20,7 +20,11 @@ RUN_DEPENDS= ${KDE_PREFIX}/bin/accountwizard:deskutils/kdepim-runtime-kde4 \ ${LOCALBASE}/bin/gmd5sum:sysutils/coreutils -CONFLICTS_INSTALL= kdepim44-4.* +CONFLICTS_INSTALL= kdepim44-4.* \ + akonadi-calendar-tools akonadi-import-wizard akonadiconsole \ + akregator grantlee-editor kaddressbook kalarm kdepim-addons \ + kleopatra kmail knotes kontact korganizer libkdepim \ + mbox-importer messagelib pim-data-exporter pim-sieve-editor USE_GNOME= libxml2 libxslt:build USE_KDE= kdelibs pimlibs kactivities \ Index: deskutils/kdepim-runtime-kde4/Makefile =================================================================== --- deskutils/kdepim-runtime-kde4/Makefile +++ deskutils/kdepim-runtime-kde4/Makefile @@ -12,14 +12,15 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE PIM tools and services +CONFLICTS_INSTALL= kdepim-runtime44-4.* \ + kdepim-kde4 kdepim-runtime kmail-account-wizard + LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libkgapi2.so:devel/libkgapi-kde4 \ libkolab.so:devel/libkolab \ libkolabxml.so:textproc/libkolabxml \ libkfbapi.so:net/libkfbapi \ libqjson.so:devel/qjson@qt4 - -CONFLICTS_INSTALL= kdepim-runtime44-4.* USES= cmake:outsource kde:4 shared-mime-info tar:xz USE_GNOME= libxml2 libxslt:build Index: deskutils/kdepimlibs-kde4/Makefile =================================================================== --- deskutils/kdepimlibs-kde4/Makefile +++ deskutils/kdepimlibs-kde4/Makefile @@ -12,6 +12,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE PIM Libraries +CONFLICTS_INSTALL= akonadi akonadi-mime kmailtransport kdepim-kde4 + BUILD_DEPENDS= xsltproc:textproc/libxslt LIB_DEPENDS= libgpgme.so:security/gpgme \ libsasl2.so:security/cyrus-sasl2 \ Index: deskutils/keditbookmarks/Makefile =================================================================== --- deskutils/keditbookmarks/Makefile +++ deskutils/keditbookmarks/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Bookmark Organizer and Editor +CONFLICTS_INSTALL= kde-baseapps-kde4 + USES= cmake:outsource gettext kde:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons ecm i18n iconthemes jobwidgets kio parts service \ Index: deskutils/kfind/Makefile =================================================================== --- deskutils/kfind/Makefile +++ deskutils/kfind/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Find files and folders +CONFLICTS_INSTALL= kde-baseapps-kde4 + USES= cmake:outsource gettext kde:5 tar:xz USE_KDE= archive auth bookmarks codecs completion config configwidgets \ coreaddons crash ecm guiaddons i18n iconthemes itemviews \ Index: deskutils/kmail-account-wizard/Makefile =================================================================== --- deskutils/kmail-account-wizard/Makefile +++ deskutils/kmail-account-wizard/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE mail account wizard +CONFLICTS_INSTALL= kdepim-kde4 kdepim-runtime-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/kmail/Makefile =================================================================== --- deskutils/kmail/Makefile +++ deskutils/kmail/Makefile @@ -9,6 +9,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/knotes/Makefile =================================================================== --- deskutils/knotes/Makefile +++ deskutils/knotes/Makefile @@ -9,6 +9,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libical.so:devel/libical USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz Index: deskutils/kontact/Makefile =================================================================== --- deskutils/kontact/Makefile +++ deskutils/kontact/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Personal Information Manager +CONFLICTS_INSTALL= kdepim-kde4 + LICENSE= LGPL21 USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz Index: deskutils/korganizer/Makefile =================================================================== --- deskutils/korganizer/Makefile +++ deskutils/korganizer/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Calendar and scheduling Program +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libical.so:devel/libical USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz Index: deskutils/libkdepim/Makefile =================================================================== --- deskutils/libkdepim/Makefile +++ deskutils/libkdepim/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE PIM Libraries +CONFLICTS_INSTALL= kdepim-kde4 + LICENSE= LGPL21 LIB_DEPENDS= libboost_thread.so:devel/boost-libs Index: deskutils/mbox-importer/Makefile =================================================================== --- deskutils/mbox-importer/Makefile +++ deskutils/mbox-importer/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Import mbox files to KMail +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/pim-data-exporter/Makefile =================================================================== --- deskutils/pim-data-exporter/Makefile +++ deskutils/pim-data-exporter/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Import and export KDE PIM settings +CONFLICTS_INSTALL= kdepim-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ Index: deskutils/pim-sieve-editor/Makefile =================================================================== --- deskutils/pim-sieve-editor/Makefile +++ deskutils/pim-sieve-editor/Makefile @@ -7,8 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Mail sieve editor +CONFLICTS_INSTALL= kdepim-kde4 - USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz USE_KDE= auth bookmarks codecs config configwidgets coreaddons crash \ dbusaddons ecm i18n iconthemes kio service wallet \ widgetsaddons xmlgui Index: devel/kdesvn-kde4/Makefile =================================================================== --- devel/kdesvn-kde4/Makefile +++ devel/kdesvn-kde4/Makefile @@ -19,7 +19,7 @@ libgdbm.so:databases/gdbm \ libexpat.so:textproc/expat2 -CONFLICTS= kdesvn-2.* \ +CONFLICTS_INSTALL= kdesvn-2.* \ qsvn-[0-9]* CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \ Index: devel/kdev-php/Makefile =================================================================== --- devel/kdev-php/Makefile +++ devel/kdev-php/Makefile @@ -9,6 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= PHP support for KDevelop +CONFLICTS_INSTALL= kdevelop-php-kde4 + BUILD_DEPENDS= kdev-pg-qt:devel/kdevelop-pg-qt LIB_DEPENDS= libkdevcmakecommon.so:devel/kdevelop Index: devel/kdevelop-kde4/Makefile =================================================================== --- devel/kdevelop-kde4/Makefile +++ devel/kdevelop-kde4/Makefile @@ -12,6 +12,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plugin extensible IDE for KDE +CONFLICTS_INSTALL= kdevelop + LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform-kde4 RUN_DEPENDS= gmake:devel/gmake Index: devel/kdevelop-pg-qt-kde4/Makefile =================================================================== --- devel/kdevelop-pg-qt-kde4/Makefile +++ devel/kdevelop-pg-qt-kde4/Makefile @@ -12,6 +12,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Parser-generator from KDevplatform +CONFLICTS_INSTALL= kdevelop-pg-qt + BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex USES= bison cmake:outsource compiler:c++11-lib kde:4 tar:bzip2 Index: devel/kdevelop-pg-qt/Makefile =================================================================== --- devel/kdevelop-pg-qt/Makefile +++ devel/kdevelop-pg-qt/Makefile @@ -20,6 +20,6 @@ USE_QT5= core testlib \ buildtools_build qmake_build -CONFLICTS= kdevelop-pg-qt-1.0* +CONFLICTS_INSTALL= kdevelop-pg-qt-1.0* kdevelop-pg-qt-kde4 .include Index: devel/kdevelop-php-kde4/Makefile =================================================================== --- devel/kdevelop-php-kde4/Makefile +++ devel/kdevelop-php-kde4/Makefile @@ -11,6 +11,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= PHP support for KDevelop +CONFLICTS_INSTALL= kdev-php + LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform-kde4 BUILD_DEPENDS= ${KDE_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt-kde4 Index: devel/kdevelop/Makefile =================================================================== --- devel/kdevelop/Makefile +++ devel/kdevelop/Makefile @@ -12,6 +12,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS_INSTALL= kdevelop-kde4 kdevplatform-kde4 + BUILD_DEPENDS= kdev-pg-qt:devel/kdevelop-pg-qt LIB_DEPENDS= libkasten3controllers.so:devel/okteta \ libapr-1.so:devel/apr1 \ Index: devel/kdevplatform-kde4/Makefile =================================================================== --- devel/kdevplatform-kde4/Makefile +++ devel/kdevplatform-kde4/Makefile @@ -12,6 +12,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Set of libraries for KDE IDE-like programs +CONFLICTS_INSTALL= kdevelop + LIB_DEPENDS= libsvn_client-1.so:devel/subversion \ libboost_thread.so:devel/boost-libs \ libqjson.so:devel/qjson@qt4 Index: devel/plasma5-khotkeys/Makefile =================================================================== --- devel/plasma5-khotkeys/Makefile +++ devel/plasma5-khotkeys/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 library for hotkeys +CONFLICTS_INSTALL= kde-workspace-kde4 + USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons ecm emoticons globalaccel \ Index: graphics/digikam-kde4-doc/Makefile =================================================================== --- graphics/digikam-kde4-doc/Makefile +++ graphics/digikam-kde4-doc/Makefile @@ -8,8 +8,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Documentation for digiKam, showFoto, and Kipi-plugins -CONFLICTS_INSTALL= digikam-2.* kipi-plugins-2.* - WRKSRC= ${WRKDIR}/${DISTNAME}/doc .include "${.CURDIR}/../digikam-kde4/Makefile.common" Index: graphics/digikam-kde4-l10n/Makefile =================================================================== --- graphics/digikam-kde4-l10n/Makefile +++ graphics/digikam-kde4-l10n/Makefile @@ -8,8 +8,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= l10n for digiKam, showFoto, and Kipi-plugins -CONFLICTS_INSTALL= digikam-2.* kipi-plugins-2.* libkgeomap-2.* - USES= gettext-tools WRKSRC= ${WRKDIR}/${DISTNAME}/po Index: graphics/digikam-kde4/Makefile.common =================================================================== --- graphics/digikam-kde4/Makefile.common +++ graphics/digikam-kde4/Makefile.common @@ -115,6 +115,7 @@ LICENSE?= GPLv2 USES+= tar:bzip2 +CONFLICTS_INSTALL= digikam .if !defined(NO_BUILD) USES+= cmake:noninja kde:4 @@ -126,7 +127,8 @@ PLIST_SUB+= SHLIB_VER=${DIGIKAM_VER} . if defined(KIPI_PLUGIN) -CONFLICTS_INSTALL= kipi-plugins-2.* +CONFLICTS_INSTALL+= kipi-plugins-2.* \ + kipiplugins DESCR= ${.CURDIR:H:H}/graphics/kipi-plugins-kde4/pkg-descr USES+= pkgconfig Index: graphics/digikam/Makefile =================================================================== --- graphics/digikam/Makefile +++ graphics/digikam/Makefile @@ -13,6 +13,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS_INSTALL= digikam-doc digikam-kde4 digikam-l10n + LIB_DEPENDS= libKF5KGeoMap.so:astro/libkgeomap \ libKF5Sane.so:graphics/libksane \ libboost_graph.so:devel/boost-libs \ Index: graphics/kimagemapeditor/Makefile =================================================================== --- graphics/kimagemapeditor/Makefile +++ graphics/kimagemapeditor/Makefile @@ -8,6 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE generator of HTML image maps +CONFLICTS_INSTALL= kdewebdev-kde4 + USES= cmake:outsource kde:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash guiaddons i18n iconthemes itemviews \ Index: graphics/kipiplugins/Makefile =================================================================== --- graphics/kipiplugins/Makefile +++ graphics/kipiplugins/Makefile @@ -9,6 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plugins for digikam +CONFLICTS_INSTALL= kipi-plugin-.* + LIB_DEPENDS= libdigikamcore.so:graphics/digikam USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \ Index: math/analitza-kde4/Makefile =================================================================== --- math/analitza-kde4/Makefile +++ math/analitza-kde4/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE_GFDL= ${WRKSRC}/COPYING.DOC LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING +CONFLICTS_INSTALL= kalgebra + USES= cmake:outsource ncurses kde:4 readline tar:xz USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus gui opengl svg xml \ Index: math/kalgebra/Makefile =================================================================== --- math/kalgebra/Makefile +++ math/kalgebra/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE graph calculator +CONFLICTS_INSTALL= analitza-kde4 kalgebra-kde4 .*kde-l10n-4.* + LIB_DEPENDS= libAnalitza.so:math/analitza BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ docbook-xml>0:textproc/docbook-xml Index: misc/kde4-l10n/files/bsd.l10n.mk =================================================================== --- misc/kde4-l10n/files/bsd.l10n.mk +++ misc/kde4-l10n/files/bsd.l10n.mk @@ -3,9 +3,56 @@ DISTNAME= ${PORTNAME}-${KDE4_L10N}-${PORTVERSION} DIST_SUBDIR?= KDE/${PORTVERSION}/kde-l10n -CONFLICTS_INSTALL= kf5-baloo-5.* \ - kf5-kdelibs4support-5.* \ - kf5-kfilemetadata-5.* +# Conflicts with other kde@ ports +_CONFLICTS_KDE_APPLICATIONS= akonadi akonadi-calendar-tools akregator ark \ + artikulate audiocd-kio blinken bomber bovo \ + calendarsupport cantor cervisia dolphin \ + dragon-player eventviews granatier \ + grantlee-editor grantleetheme gwenview \ + incidenceeditor ja-kiten juk kaddressbook \ + kajongg kalarm kalgebra kalzium kamera \ + kanagram kapman kapptemplate kate katomic \ + kblackbox kblocks kbounce kbreakout kbruch \ + kcachegrind kcalc kcharselect kcolorchooser \ + kcron kde-dev-utils kdegraphics-svgpart \ + kdenetwork-filesharing kdepim-addons \ + kdepim-apps-libs kdepim-runtime \ + kdesdk-thumbnailers kdf kdialog kdiamond \ + keditbookmarks kfloppy kfourinline kgeography \ + kget kgoldrunner kgpg khangman kig killbots \ + kimagemapeditor kiriki kjumpingcube kldap \ + kleopatra klettres klickety klines kmag \ + kmahjongg kmail kmines kmix kmousetool kmouth \ + kmplot knavalbattle knetwalk knotes kolf \ + kollision kolourpaint kompare konqueror \ + konquest konsole kontact kopete korganizer \ + kpat kpimtextedit krdc kreversi krfb kruler \ + kshisen ksirk kspaceduel ksquares ksudoku \ + ksystemlog kteatime ktimer ktouch ktuberling \ + kturtle kubrick kwalletmanager kwordquiz \ + libkcddb libkcompactdisc libkdepim libkleo \ + libkomparediff2 libksane libksieve lokalize \ + lskat mailcommon mailimporter marble \ + mbox-importer messagelib okteta okular \ + palapeli parley picmi pim-data-exporter \ + pim-sieve-editor pimcommon print-manager rocs \ + step sweeper umbrello kde-dev-scripts \ + kdeedu-data kfind poxml +_CONFLICTS_KDE_FRAMEWORKS= kf5-baloo kf5-kdelibs4support kf5-kfilemetadata +_CONFLICTS_KDE_PLASMA= plasma5-kdeplasma-addons plasma5-kde-cli-tools \ + plasma5-kgamma5 plasma5-khotkeys plasma5-kinfocenter \ + plasma5-kmenuedit plasma5-kscreenlocker \ + plasma5-ksysguard plasma5-kwin \ + plasma5-libksysguard plasma5-oxygen \ + plasma5-plasma-desktop \ + plasma5-plasma-workspace plasma5-powerdevil \ + plasma5-systemsettings +_CONFLICTS_KDE_OTHER= digikam kstars + +CONFLICTS_INSTALL= ${_CONFLICTS_KDE_APPLICATIONS} \ + ${_CONFLICTS_KDE_FRAMEWORKS} \ + ${_CONFLICTS_KDE_PLASMA} \ + ${_CONFLICTS_KDE_OTHER} USE_QT4= uic_build moc_build qmake_build rcc_build xml USE_KDE= kdelibs automoc4 Index: misc/kdeedu-data/Makefile =================================================================== --- misc/kdeedu-data/Makefile +++ misc/kdeedu-data/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE edu data files +CONFLICTS_INSTALL= libkdeedu-kde4 + USES= cmake:outsource kde:5 tar:xz USE_KDE= ecm USE_QT5= buildtools_build qmake_build Index: misc/libkdeedu-kde4/Makefile =================================================================== --- misc/libkdeedu-kde4/Makefile +++ misc/libkdeedu-kde4/Makefile @@ -8,6 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Libraries used by KDE educational applications +CONFLICTS_INSTALL= kdeedu-data + USES= cmake:outsource kde:4 tar:xz USE_KDE= kdelibs automoc4 USE_QT4= corelib gui xml moc_build qmake_build rcc_build uic_build Index: multimedia/gstreamer-qt4/Makefile =================================================================== --- multimedia/gstreamer-qt4/Makefile +++ multimedia/gstreamer-qt4/Makefile @@ -15,6 +15,8 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS_INSTALL= gstreamer1-qt4 + LIB_DEPENDS= libboost_thread.so:devel/boost-libs USES= bison cmake:noninja gmake kde:4 pathfix pkgconfig tar:bzip2 Index: multimedia/kdenlive-kde4/Makefile =================================================================== --- multimedia/kdenlive-kde4/Makefile +++ multimedia/kdenlive-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE professional quality non-linear video editing suite +CONFLICTS_INSTALL= kdenlive + LICENSE= GPLv2 LIB_DEPENDS= libmlt.so:multimedia/mlt \ Index: multimedia/phonon-gstreamer/Makefile =================================================================== --- multimedia/phonon-gstreamer/Makefile +++ multimedia/phonon-gstreamer/Makefile @@ -15,6 +15,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= qt5-phonon4-gstreamer + WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} USES= cmake kde:4 pkgconfig tar:xz Index: multimedia/qt5-phonon4-gstreamer/Makefile =================================================================== --- multimedia/qt5-phonon4-gstreamer/Makefile +++ multimedia/qt5-phonon4-gstreamer/Makefile @@ -16,6 +16,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= phonon-gstreamer + WRKSRC= ${WRKDIR}/${DISTNAME:S/-backend//} USES= cmake:outsource kde:5 pkgconfig tar:xz Index: net-im/ktp-accounts-kcm-kde4/Makefile =================================================================== --- net-im/ktp-accounts-kcm-kde4/Makefile +++ net-im/ktp-accounts-kcm-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging account management module +CONFLICTS_INSTALL= ktp-accounts-kcm + LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 Index: net-im/ktp-approver-kde4/Makefile =================================================================== --- net-im/ktp-approver-kde4/Makefile +++ net-im/ktp-approver-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging notifier +CONFLICTS_INSTALL= ktp-approver + LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4 Index: net-im/ktp-auth-handler-kde4/Makefile =================================================================== --- net-im/ktp-auth-handler-kde4/Makefile +++ net-im/ktp-auth-handler-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KWallet integration module for KDE Telepathy +CONFLICTS_INSTALL= ktp-auth-handler + LIB_DEPENDS= libqjson.so:devel/qjson \ libqca.so:devel/qca \ libtelepathy-qt4.so:net-im/telepathy-qt4 \ Index: net-im/ktp-common-internals-kde4/Makefile =================================================================== --- net-im/ktp-common-internals-kde4/Makefile +++ net-im/ktp-common-internals-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Telepathy internal library +CONFLICTS_INSTALL= ktp-common-internals + LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 RUN_DEPENDS= ${LOCALBASE}/libexec/mission-control-5:net-im/telepathy-mission-control Index: net-im/ktp-contact-list-kde4/Makefile =================================================================== --- net-im/ktp-contact-list-kde4/Makefile +++ net-im/ktp-contact-list-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging contact list application +CONFLICTS_INSTALL= ktp-contact-list + LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 Index: net-im/ktp-contact-runner-kde4/Makefile =================================================================== --- net-im/ktp-contact-runner-kde4/Makefile +++ net-im/ktp-contact-runner-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KRunner integration module for KDE Telepathy +CONFLICTS_INSTALL= ktp-contact-runner + LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 Index: net-im/ktp-desktop-applets-kde4/Makefile =================================================================== --- net-im/ktp-desktop-applets-kde4/Makefile +++ net-im/ktp-desktop-applets-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging plasma widgets +CONFLICTS_INSTALL= ktp-desktop-applets plasma-applet-ktp-kde4 + LIB_DEPENDS= libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 USES= cmake gettext kde:4 tar:bzip2 Index: net-im/ktp-desktop-applets/Makefile =================================================================== --- net-im/ktp-desktop-applets/Makefile +++ net-im/ktp-desktop-applets/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging plasma widgets +CONFLICTS_INSTALL= ktp-desktop-applets-kde4 + LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals USES= cmake:outsource gettext kde:5 tar:xz Index: net-im/ktp-filetransfer-handler-kde4/Makefile =================================================================== --- net-im/ktp-filetransfer-handler-kde4/Makefile +++ net-im/ktp-filetransfer-handler-kde4/Makefile @@ -8,7 +8,9 @@ PKGNAMESUFFIX= -kde4 MAINTAINER= kde@FreeBSD.org -COMMENT= KDE instant messaging file transfer handler +COMMENT= KDE instant messaging file transfer handlerktp-filetransfer-handler + +CONFLICTS_INSTALL= ktp-filetransfer-handler LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 Index: net-im/ktp-filetransfer-handler/Makefile =================================================================== --- net-im/ktp-filetransfer-handler/Makefile +++ net-im/ktp-filetransfer-handler/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging file transfer handler +CONFLICTS_INSTALL= ktp-filetransfer-handler-kde4 + LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals Index: net-im/ktp-kded-integration-module-kde4/Makefile =================================================================== --- net-im/ktp-kded-integration-module-kde4/Makefile +++ net-im/ktp-kded-integration-module-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Module for integration of instant messaging into KDE Workspaces +CONFLICTS_INSTALL= ktp-kded-module + LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 Index: net-im/ktp-kded-module/Makefile =================================================================== --- net-im/ktp-kded-module/Makefile +++ net-im/ktp-kded-module/Makefile @@ -10,6 +10,8 @@ LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals +CONFLICTS_INSTALL= ktp-kded-integration-module-kde4 + USES= cmake:outsource gettext kde:5 tar:xz USE_KDE= activities auth codecs completion config configwidgets coreaddons \ dbusaddons i18n idletime jobwidgets kcmutils kio notifications \ Index: net-im/ktp-send-file-kde4/Makefile =================================================================== --- net-im/ktp-send-file-kde4/Makefile +++ net-im/ktp-send-file-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging file transfer application +CONFLICTS_INSTALL= ktp-send-file + LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler-kde4 \ Index: net-im/ktp-send-file/Makefile =================================================================== --- net-im/ktp-send-file/Makefile +++ net-im/ktp-send-file/Makefile @@ -7,6 +7,9 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging file transfer application +CONFLICTS_INSTALL= ktp-send-file-kde4 + + LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals RUN_DEPENDS= ${KDE_PREFIX}/lib/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \ Index: net-im/ktp-text-ui-kde4/Makefile =================================================================== --- net-im/ktp-text-ui-kde4/Makefile +++ net-im/ktp-text-ui-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE chat window application +CONFLICTS_INSTALL= ktp-text-ui + LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 Index: net-im/ktp-text-ui/Makefile =================================================================== --- net-im/ktp-text-ui/Makefile +++ net-im/ktp-text-ui/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE chat window application +CONFLICTS_INSTALL= ktp-text-ui-kde4 + LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals Index: net-im/plasma-applet-ktp-kde4/Makefile =================================================================== --- net-im/plasma-applet-ktp-kde4/Makefile +++ net-im/plasma-applet-ktp-kde4/Makefile @@ -12,6 +12,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging Plasma applets +CONFLICTS_INSTALL= ktp-desktop-applets-kde4 + LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 Index: net-p2p/ktorrent-kde4/Makefile =================================================================== --- net-p2p/ktorrent-kde4/Makefile +++ net-p2p/ktorrent-kde4/Makefile @@ -11,6 +11,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= BitTorrent client for KDE +CONFLICTS_INSTALL= ktorrent + BUILD_DEPENDS= ${LOCALBASE}/include/boost/bind.hpp:devel/boost-libs LIB_DEPENDS= libtag.so:audio/taglib \ libgmp.so:math/gmp \ Index: net-p2p/ktorrent/Makefile =================================================================== --- net-p2p/ktorrent/Makefile +++ net-p2p/ktorrent/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= BitTorrent client for KDE +CONFLICTS_INSTALL= ktorrent + USES= cmake:outsource gettext kde:5 tar:xz LIB_DEPENDS= libKF5Torrent.so:net-p2p/libktorrent \ Index: net/akonadi-mime/Makefile =================================================================== --- net/akonadi-mime/Makefile +++ net/akonadi-mime/Makefile @@ -9,6 +9,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= kdepimlibs-kde4 + USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \ i18n itemmodels kio service widgetsaddons xmlgui Index: net/kmailtransport/Makefile =================================================================== --- net/kmailtransport/Makefile +++ net/kmailtransport/Makefile @@ -9,6 +9,8 @@ LICENSE= LGPL21 +CONFLICTS_INSTALL= kdepimlibs-kde4 + LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz Index: net/libkvkontakte-kde4/Makefile =================================================================== --- net/libkvkontakte-kde4/Makefile +++ net/libkvkontakte-kde4/Makefile @@ -14,6 +14,8 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB +CONFLICTS_INSTALL= libkvkontakte + LIB_DEPENDS= libqjson.so:devel/qjson@qt4 USES= cmake:outsource gettext kde:4 pkgconfig tar:xz Index: net/libkvkontakte/Makefile =================================================================== --- net/libkvkontakte/Makefile +++ net/libkvkontakte/Makefile @@ -13,6 +13,8 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB +CONFLICTS_INSTALL= libkvkontakte-kde4 + USES= cmake:outsource gettext kde:5 tar:xz USE_KDE= config coreaddons ecm i18n kdewebkit kio service widgetsaddons USE_QT5= core gui network webkit widgets \ Index: net/messagelib/Makefile =================================================================== --- net/messagelib/Makefile +++ net/messagelib/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ - + PORTNAME= messagelib DISTVERSION= ${KDE_APPLICATIONS_VERSION} CATEGORIES= net kde kde-applications @@ -8,6 +8,8 @@ COMMENT= Library for handling messages LICENSE= LGPL21 + +CONFLICTS_INSTALL= kdepim-kde4 kdepimlibs-kde4 LIB_DEPENDS= libassuan.so:security/libassuan \ libboost_system.so:devel/boost-libs \ Index: security/kleopatra/Makefile =================================================================== --- security/kleopatra/Makefile +++ security/kleopatra/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Certificate manager for KDE +CONFLICTS_INSTALL= kdepim-kde4 kdepimlibs-kde4 + LIB_DEPENDS= libassuan.so:security/libassuan \ libboost_thread.so:devel/boost-libs \ libgpgme.so:security/gpgme \ Index: sysutils/k3b-kde4/Makefile =================================================================== --- sysutils/k3b-kde4/Makefile +++ sysutils/k3b-kde4/Makefile @@ -12,6 +12,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE CD/DVD writing suite +CONFLICTS_INSTALL= k3b + LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia \ libsamplerate.so:audio/libsamplerate RUN_DEPENDS= cdrecord:sysutils/cdrtools Index: sysutils/kdialog/Makefile =================================================================== --- sysutils/kdialog/Makefile +++ sysutils/kdialog/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Show nice dialog boxes from shell scripts +CONFLICTS_INSTALL= kde-baseapps-kde4 + USES= cmake:outsource gettext kde:5 pkgconfig tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \ Index: sysutils/kf5-baloo/Makefile =================================================================== --- sysutils/kf5-baloo/Makefile +++ sysutils/kf5-baloo/Makefile @@ -20,6 +20,7 @@ # Frameworks ports install localization files that conflict with some # KDE4 localization ports CONFLICTS_INSTALL= baloo-4.* \ - kde4-l10n-* + kde4-l10n-* \ + baloo-kde4 .include Index: sysutils/khelpcenter/Makefile =================================================================== --- sysutils/khelpcenter/Makefile +++ sysutils/khelpcenter/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 application to show KDE application documentation +CONFLICTS_INSTALL= kde-runtime-kde4 + LIB_DEPENDS= libxapian.so:databases/xapian-core USES= cmake:outsource compiler:c++11-lib cpe gettext grantlee:5 \ Index: sysutils/ksysguardd-kde4/Makefile =================================================================== --- sysutils/ksysguardd-kde4/Makefile +++ sysutils/ksysguardd-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE System Guard Daemon +CONFLICTS_INSTALL= plasma5-ksysguard + DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde-workspace-kde4/distinfo USES= cmake kde:4 tar:xz CMAKE_ARGS+= -DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \ Index: sysutils/plasma5-kde-cli-tools/Makefile =================================================================== --- sysutils/plasma5-kde-cli-tools/Makefile +++ sysutils/plasma5-kde-cli-tools/Makefile @@ -7,7 +7,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 non-interactive system tools -CONFLICTS_INSTALL= kde-runtime-kde4 +CONFLICTS_INSTALL= kde-runtime-kde4 .*kde-l10n-4.* USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz USE_KDE= activities auth bookmarks codecs completion config configwidgets \ Index: sysutils/plasma5-kinfocenter/Makefile =================================================================== --- sysutils/plasma5-kinfocenter/Makefile +++ sysutils/plasma5-kinfocenter/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 utility providing system information +CONFLICTS_INSTALL= kde-workspace-kde4 + LIB_DEPENDS= libpci.so:devel/libpci USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig \ Index: sysutils/plasma5-kmenuedit/Makefile =================================================================== --- sysutils/plasma5-kmenuedit/Makefile +++ sysutils/plasma5-kmenuedit/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 menu editor +CONFLICTS_INSTALL= kde-workspace-kde4 + USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons guiaddons ecm emoticons hotkeys \ Index: sysutils/plasma5-ksysguard/Makefile =================================================================== --- sysutils/plasma5-ksysguard/Makefile +++ sysutils/plasma5-ksysguard/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 utility to track and control the running processes +CONFLICTS_INSTALL= kde-workspace-kde4 ksysguardd-kde4 + USES= cmake:outsource compiler:c++11-lib cpe desktop-file-utils \ gettext kde:5 tar:xz USE_KDE= attica auth codecs completion config configwidgets coreaddons \ Index: sysutils/plasma5-libksysguard/Makefile =================================================================== --- sysutils/plasma5-libksysguard/Makefile +++ sysutils/plasma5-libksysguard/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 library to track and control running processes +CONFLICTS_INSTALL= kde-workspace-kde4 + USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons i18n \ iconthemes package plasma-framework service widgetsaddons \ Index: sysutils/plasma5-polkit-kde-agent-1/Makefile =================================================================== --- sysutils/plasma5-polkit-kde-agent-1/Makefile +++ sysutils/plasma5-polkit-kde-agent-1/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 daemon providing a polkit authentication UI +CONFLICTS_INSTALL= kde-workspace-kde4 polkit-kde + LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt@qt5 USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz Index: sysutils/plasma5-powerdevil/Makefile =================================================================== --- sysutils/plasma5-powerdevil/Makefile +++ sysutils/plasma5-powerdevil/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 tool to manage the power consumption settings +CONFLICTS_INSTALL= kde-workspace-kde4 + USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 pkgconfig tar:xz USE_KDE= activities auth bookmarks codecs completion configwidgets \ coreaddons crash config dbusaddons ecm emoticons globalaccel \ Index: sysutils/plasma5-systemsettings/Makefile =================================================================== --- sysutils/plasma5-systemsettings/Makefile +++ sysutils/plasma5-systemsettings/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 system settings +CONFLICTS_INSTALL= kde-workspace-kde4 + USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz USE_KDE= activities activities-stats auth codecs completion config \ configwidgets coreaddons crash dbusaddons doctools ecm i18n \ Index: sysutils/polkit-kde/Makefile =================================================================== --- sysutils/polkit-kde/Makefile +++ sysutils/polkit-kde/Makefile @@ -13,6 +13,8 @@ LICENSE= GPLv2 +CONFLICTS_INSTALL= plasma5-polkit-kde-agent-1 + LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt@qt4 USES= cmake kde:4 tar:bzip2 Index: www/kdewebdev-kde4/Makefile =================================================================== --- www/kdewebdev-kde4/Makefile +++ www/kdewebdev-kde4/Makefile @@ -10,6 +10,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Comprehensive html/website development environment +CONFLICTS_INSTALL= kimagemapeditor + LIB_DEPENDS= libtidy.so:www/tidy-lib \ libboost_thread.so:devel/boost-libs Index: x11-fm/dolphin/Makefile =================================================================== --- x11-fm/dolphin/Makefile +++ x11-fm/dolphin/Makefile @@ -10,6 +10,8 @@ LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS_INSTALL= kde-baseapps-kde4 + RUN_DEPENDS= ${QT_PLUGINDIR}/ffmpegthumbs.so:multimedia/kdemultimedia-ffmpegthumbs \ ${QT_PLUGINDIR}/gsthumbnail.so:graphics/kdegraphics-thumbnailers \ ${QT_PLUGINDIR}/audiothumbnail.so:devel/kio-extras Index: x11-fm/konqueror/Makefile =================================================================== --- x11-fm/konqueror/Makefile +++ x11-fm/konqueror/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE system log application +CONFLICTS_INSTALL= kde-baseapps-kde4 + LIB_DEPENDS= libtidy.so:www/tidy-lib USES= cmake:outsource desktop-file-utils gettext kde:5 pkgconfig tar:xz Index: x11-fm/krusader2-kde4/Makefile =================================================================== --- x11-fm/krusader2-kde4/Makefile +++ x11-fm/krusader2-kde4/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL= krusader2-2.* +CONFLICTS_INSTALL= krusader USES= cmake:outsource gettext kde:4 tar:bzip2 USE_KDE= kdelibs automoc4 Index: x11-fm/krusader2/Makefile =================================================================== --- x11-fm/krusader2/Makefile +++ x11-fm/krusader2/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL= krusader2-kde4 +CONFLICTS_INSTALL= krusader-kde4 USES= cmake:outsource gettext kde:5 tar:xz USE_KDE= archive auth auth bookmarks codecs completion config \ Index: x11-themes/kde-gtk-config/Makefile =================================================================== --- x11-themes/kde-gtk-config/Makefile +++ x11-themes/kde-gtk-config/Makefile @@ -9,6 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= GTK2 and GTK3 Configurator for KDE +CONFLICTS_INSTALL= plasma5-kde-gtk-config + USES= cmake:outsource gettext kde:4 pkgconfig tar:xz USE_GNOME= gtk20 gtk30 USE_KDE= automoc4 kdelibs Index: x11-themes/kde-wallpapers-kde4/Makefile =================================================================== --- x11-themes/kde-wallpapers-kde4/Makefile +++ x11-themes/kde-wallpapers-kde4/Makefile @@ -8,6 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Set of wallpapers for the KDE Plasma workspace +CONFLICTS_INSTALL= plasma5-plasma-workspace-wallpapers + USES= cmake:outsource kde:4 tar:xz USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build Index: x11-themes/plasma5-kde-gtk-config/Makefile =================================================================== --- x11-themes/plasma5-kde-gtk-config/Makefile +++ x11-themes/plasma5-kde-gtk-config/Makefile @@ -12,6 +12,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB +CONFLICTS_INSTALL= kde-gtk-config + BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas Index: x11-themes/plasma5-oxygen/Makefile =================================================================== --- x11-themes/plasma5-oxygen/Makefile +++ x11-themes/plasma5-oxygen/Makefile @@ -12,6 +12,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB +CONFLICTS_INSTALL= kde-workspace-kde4 + USES= cmake:outsource compiler:c++11-lib cpe gettext \ kde:5 pkgconfig tar:xz USE_LDCONFIG= yes Index: x11-themes/plasma5-plasma-workspace-wallpapers/Makefile =================================================================== --- x11-themes/plasma5-plasma-workspace-wallpapers/Makefile +++ x11-themes/plasma5-plasma-workspace-wallpapers/Makefile @@ -12,6 +12,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPL3 +CONFLICTS_INSTALL= kde-wallpapers-kde4 + USES= cmake:outsource cpe kde:5 tar:xz USE_KDE= ecm USE_QT5= buildtools_build qmake_build Index: x11-toolkits/plasma5-kdeplasma-addons/Makefile =================================================================== --- x11-toolkits/plasma5-kdeplasma-addons/Makefile +++ x11-toolkits/plasma5-kdeplasma-addons/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 addons to improve the Plasma experience +CONFLICTS_INSTALL= kdeplasma-addons-kde4 + USES= cmake:outsource compiler:c++11-lib cpe gettext \ kde:5 pkgconfig tar:xz USE_KDE= activities archive attica auth bookmarks codecs completion \ Index: x11-wm/plasma5-kwin/Makefile =================================================================== --- x11-wm/plasma5-kwin/Makefile +++ x11-wm/plasma5-kwin/Makefile @@ -10,6 +10,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS_INSTALL= kde-workspace-kde4 + LIB_DEPENDS= libXcursor.so:x11/libXcursor \ libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ Index: x11/kactivitymanagerd/Makefile =================================================================== --- x11/kactivitymanagerd/Makefile +++ x11/kactivitymanagerd/Makefile @@ -11,6 +11,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Activity Manager daemon +CONFLICTS_INSTALL= plasma5-kactivitymanagerd + USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz USE_KDE= automoc4 kdelibs soprano nepomuk-core \ kactivities Index: x11/kde-baseapps-kde4/Makefile =================================================================== --- x11/kde-baseapps-kde4/Makefile +++ x11/kde-baseapps-kde4/Makefile @@ -9,6 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for KDE +CONFLICTS_INSTALL= dolphin kdialog keditbookmarks kfind konqueror + LIB_DEPENDS= libtidy.so:www/tidy-lib USES= cmake:outsource gettext kde:4 tar:xz Index: x11/kde-runtime-kde4/Makefile =================================================================== --- x11/kde-runtime-kde4/Makefile +++ x11/kde-runtime-kde4/Makefile @@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Runtime components for KDE Plasma Desktop -CONFLICTS_INSTALL= plasma5-kde-cli-tools +CONFLICTS_INSTALL= plasma5-kde-cli-tools khelpcenter plasma5-plasma-desktop LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libwebp.so:graphics/webp \ Index: x11/kde-workspace-kde4/Makefile =================================================================== --- x11/kde-workspace-kde4/Makefile +++ x11/kde-workspace-kde4/Makefile @@ -9,6 +9,12 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Plasma Desktop +CONFLICTS_INSTALL= plasma5-khotkeys plasma5-kinfocenter \ + plasma5-kmenuedit plasma5-ksysguard plasma5-kwin \ + plasma5-libksysguard plasma5-oxygen \ + plasma5-plasma-desktop plasma5-plasma-workspace \ + plasma5-powerdevil plasma5-systemsettings + LIB_DEPENDS= libdbus-1.so:devel/dbus \ libck-connector.so:sysutils/consolekit2 \ libpci.so:devel/libpci \ Index: x11/plasma5-kactivitymanagerd/Makefile =================================================================== --- x11/plasma5-kactivitymanagerd/Makefile +++ x11/plasma5-kactivitymanagerd/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= System service to manage user's activities, track the usage patterns +CONFLICTS_INSTALL= kactivitymanagerd + USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \ globalaccel i18n kio service widgetsaddons windowsystem xmlgui Index: x11/plasma5-kgamma5/Makefile =================================================================== --- x11/plasma5-kgamma5/Makefile +++ x11/plasma5-kgamma5/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 monitor's gamma settings +CONFLICTS_INSTALL= kgamma-kde4 + USES= cmake:outsource cpe gettext kde:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash doctools ecm emoticons guiaddons i18n \ Index: x11/plasma5-plasma-desktop/Makefile =================================================================== --- x11/plasma5-plasma-desktop/Makefile +++ x11/plasma5-plasma-desktop/Makefile @@ -7,6 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 plasma desktop +CONFLICTS_INSTALL= kde-runtime-kde4 kde-workspace-kde4 + # TODO: update packagekit-qt5 #LIB_DEPENDS= libpackagekit-qt.so:ports-mgmt/packagekit-qt5 LIB_DEPENDS= libboost_system.so:devel/boost-libs \ Index: x11/plasma5-plasma-workspace/Makefile =================================================================== --- x11/plasma5-plasma-workspace/Makefile +++ x11/plasma5-plasma-workspace/Makefile @@ -8,6 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 Plasma workspace +CONFLICTS_INSTALL= kde-workspace-kde4 + LIB_DEPENDS= libcln.so:math/cln \ libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \ libqalculate.so:math/libqalculate \ Index: x11/yakuake-kde4/Makefile =================================================================== --- x11/yakuake-kde4/Makefile +++ x11/yakuake-kde4/Makefile @@ -11,6 +11,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Drop-down terminal emulator for KDE +CONFLICTS_INSTALL= yakuake + LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING Index: x11/yakuake/Makefile =================================================================== --- x11/yakuake/Makefile +++ x11/yakuake/Makefile @@ -9,6 +9,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Drop-down terminal emulator for KDE +CONFLICTS_INSTALL= yakuake-kde4 + LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING