Attachment 171410 Details for Bug 210255 – Update Mk/bsd.kde.mk and x11/kde4 (v2)

[patch] Update Mk/bsd.kde.mk and x11/kde4 (v2)

kde4.patch (text/plain), 48.82 KB, created by groot on 2016-06-14 07:31:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: groot

Created: 2016-06-14 07:31:37 UTC

Size: 48.82 KB

patch

obsolete

>--- Mk/bsd.kde4.mk	2016-05-27 11:18:43.689614000 +0200
>+++ Mk/bsd.kde4.mk	2016-05-27 22:01:09.879315000 +0200
>@@ -74,8 +74,9 @@
> #
> 
> KDE4_VERSION?=		4.14.3
>+KDE4_KDELIBS_VERSION=	4.14.9
> KDE4_ACTIVITES_VERSION=	4.13.3
>-KDE4_WORKSPACE_VERSION=	4.11.14
>+KDE4_WORKSPACE_VERSION=	4.11.20
> KDE4_APPLICATIONS_VERSION?=	15.04.3
> KDE4_APPLICATIONS_BRANCH?=	Attic
> KDE4_BRANCH?=		stable
>@@ -94,8 +95,11 @@
> 
> PLIST_SUB+=	KDE4_PREFIX="${KDE4_PREFIX}" \
> 		KDE4_VERSION="${KDE4_VERSION}" \
>-		KDE4_GENERIC_LIB_VERSION=${KDE4_VERSION} \
>-		KDE4_NON_GENERIC_LIB_VERSION=${KDE4_VERSION:S,^4,5,}
>+		KDE4_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION} \
>+		KDE4_NON_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} \
>+		KDE4_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION} \
>+		KDE4_NG_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,}
>+
> 
> # Keep in sync with cmake/modules/PythonMacros.cmake
> _PYTHON_SHORT_VER=	${PYTHON_VERSION:S/^python//:S/.//}
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepim4/Makefile deskutils/kdepim4/Makefile
>--- deskutils/kdepim4/Makefile	2016-05-27 11:18:45.358072000 +0200
>+++ deskutils/kdepim4/Makefile	2016-05-27 15:21:04.872343000 +0200
>@@ -1,11 +1,10 @@
> # Created by: Martin Wilke <miwi@FreeBSD.org>
>-# $FreeBSD: head/deskutils/kdepim4/Makefile 415864 2016-05-25 20:56:06Z rene $
>+# $FreeBSD$
> 
> PORTNAME=	kdepim
>-PORTVERSION=	${KDE4_VERSION}
>-PORTREVISION=	4
>+PORTVERSION=	${KDE4_KDELIBS_VERSION}
> CATEGORIES=	deskutils kde
>-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
>+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
> DIST_SUBDIR=	KDE/${PORTVERSION}
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -25,7 +24,7 @@
> USE_GNOME=	libxml2 libxslt:build
> USE_KDE4=	kdelibs pimlibs kactivities \
> 		akonadi automoc4 soprano nepomuk-widgets baloo
>-USES=		cmake:outsource gmake shebangfix tar:xz
>+USES=		cmake:outsource gmake iconv shebangfix tar:xz
> SHEBANG_FILES=	agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \
> 		kalarm/*.pl kmail/kconf_update/*.pl \
> 		libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepim4/distinfo deskutils/kdepim4/distinfo
>--- deskutils/kdepim4/distinfo	2016-03-30 11:03:10.781110947 +0200
>+++ deskutils/kdepim4/distinfo	2016-02-21 11:07:40.657164845 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (KDE/4.14.3/kdepim-4.14.3.tar.xz) = a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944
>-SIZE (KDE/4.14.3/kdepim-4.14.3.tar.xz) = 14483432
>+SHA256 (KDE/4.14.9/kdepim-4.14.9.tar.xz) = 8ef9b34dce7e613d4323df042c44066a7993f4be6ed5bfcee0a8a4091c739650
>+SIZE (KDE/4.14.9/kdepim-4.14.9.tar.xz) = 14584812
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepim4/pkg-plist deskutils/kdepim4/pkg-plist
>--- deskutils/kdepim4/pkg-plist	2016-03-30 11:03:10.780301663 +0200
>+++ deskutils/kdepim4/pkg-plist	2016-03-12 12:50:44.105378834 +0100
>@@ -161,58 +161,61 @@
> lib/kde4/plugins/grantlee/%%GRANTLEE_VER%%/grantlee_messageheaderfilters.so
> lib/libakonadi_next.so
> lib/libakonadi_next.so.4
>-lib/libakonadi_next.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi_next.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakregatorinterfaces.so
> lib/libakregatorinterfaces.so.4
>-lib/libakregatorinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakregatorinterfaces.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakregatorprivate.so.4
>-lib/libakregatorprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakregatorprivate.so.%%KDE4_KDELIBS_VERSION%%
>+lib/libcalendarsupportcollectionpage.so
>+lib/libcalendarsupportcollectionpage.so.4
>+lib/libcalendarsupportcollectionpage.so.%%KDE4_KDELIBS_VERSION%%
> lib/libcalendarsupport.so
> lib/libcalendarsupport.so.4
>-lib/libcalendarsupport.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libcalendarsupport.so.%%KDE4_KDELIBS_VERSION%%
> lib/libcomposereditorng.so
> lib/libcomposereditorng.so.4
>-lib/libcomposereditorng.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libcomposereditorng.so.%%KDE4_KDELIBS_VERSION%%
> lib/libeventviews.so
> lib/libeventviews.so.4
>-lib/libeventviews.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libeventviews.so.%%KDE4_KDELIBS_VERSION%%
> lib/libfollowupreminder.so
> lib/libfollowupreminder.so.4
>-lib/libfollowupreminder.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libfollowupreminder.so.%%KDE4_KDELIBS_VERSION%%
> lib/libgrantleetheme.so
> lib/libgrantleetheme.so.4
>-lib/libgrantleetheme.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libgrantleetheme.so.%%KDE4_KDELIBS_VERSION%%
> lib/libgrantleethemeeditor.so
> lib/libgrantleethemeeditor.so.4
>-lib/libgrantleethemeeditor.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libgrantleethemeeditor.so.%%KDE4_KDELIBS_VERSION%%
> lib/libincidenceeditorsng.so
> lib/libincidenceeditorsng.so.4
>-lib/libincidenceeditorsng.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libincidenceeditorsng.so.%%KDE4_KDELIBS_VERSION%%
> lib/libincidenceeditorsngmobile.so
> lib/libincidenceeditorsngmobile.so.4
>-lib/libincidenceeditorsngmobile.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libincidenceeditorsngmobile.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkaddressbookgrantlee.so.4
>-lib/libkaddressbookgrantlee.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkaddressbookgrantlee.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkaddressbookprivate.so.4
>-lib/libkaddressbookprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkaddressbookprivate.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkcal_resourceblog.so
> lib/libkcal_resourceblog.so.4
>-lib/libkcal_resourceblog.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkcal_resourceblog.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkcal_resourceremote.so
> lib/libkcal_resourceremote.so.4
>-lib/libkcal_resourceremote.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkcal_resourceremote.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkdepim.so
> lib/libkdepim.so.4
>-lib/libkdepim.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkdepim.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkdepimdbusinterfaces.so
> lib/libkdepimdbusinterfaces.so.4
>-lib/libkdepimdbusinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkdepimdbusinterfaces.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkdgantt2.so
> lib/libkdgantt2.so.0
> lib/libkdgantt2.so.0.1.0
> lib/libkleo.so
> lib/libkleo.so.4
>-lib/libkleo.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkleo.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkleopatraclientcore.so
> lib/libkleopatraclientcore.so.0
> lib/libkleopatraclientcore.so.0.3.0
>@@ -220,64 +223,66 @@
> lib/libkleopatraclientgui.so.0
> lib/libkleopatraclientgui.so.0.3.0
> lib/libkmailprivate.so.4
>-lib/libkmailprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkmailprivate.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkmanagesieve.so
> lib/libkmanagesieve.so.4
>-lib/libkmanagesieve.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkmanagesieve.so.%%KDE4_KDELIBS_VERSION%%
> lib/libknodecommon.so
> lib/libknodecommon.so.4
>-lib/libknodecommon.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libknodecommon.so.%%KDE4_KDELIBS_VERSION%%
> lib/libknotesprivate.so.4
>-lib/libknotesprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libknotesprivate.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkontactprivate.so.4
>-lib/libkontactprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkontactprivate.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkorganizer_core.so
> lib/libkorganizer_core.so.4
>-lib/libkorganizer_core.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkorganizer_core.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkorganizer_interfaces.so
> lib/libkorganizer_interfaces.so.4
>-lib/libkorganizer_interfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkorganizer_interfaces.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkorganizerprivate.so.4
>-lib/libkorganizerprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkorganizerprivate.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkpgp.so
> lib/libkpgp.so.4
>-lib/libkpgp.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkpgp.so.%%KDE4_KDELIBS_VERSION%%
> lib/libksieve.so
> lib/libksieve.so.4
>-lib/libksieve.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libksieve.so.%%KDE4_KDELIBS_VERSION%%
> lib/libksieveui.so
> lib/libksieveui.so.4
>-lib/libksieveui.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libksieveui.so.%%KDE4_KDELIBS_VERSION%%
> lib/libmailcommon.so
> lib/libmailcommon.so.4
>-lib/libmailcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libmailcommon.so.%%KDE4_KDELIBS_VERSION%%
> lib/libmailimporter.so
> lib/libmailimporter.so.4
>-lib/libmailimporter.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libmailimporter.so.%%KDE4_KDELIBS_VERSION%%
> lib/libmessagecomposer.so
> lib/libmessagecomposer.so.4
>-lib/libmessagecomposer.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libmessagecomposer.so.%%KDE4_KDELIBS_VERSION%%
> lib/libmessagecore.so
> lib/libmessagecore.so.4
>-lib/libmessagecore.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libmessagecore.so.%%KDE4_KDELIBS_VERSION%%
> lib/libmessagelist.so
> lib/libmessagelist.so.4
>-lib/libmessagelist.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libmessagelist.so.%%KDE4_KDELIBS_VERSION%%
> lib/libmessageviewer.so
> lib/libmessageviewer.so.4
>-lib/libmessageviewer.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libmessageviewer.so.%%KDE4_KDELIBS_VERSION%%
> lib/libnoteshared.so
> lib/libnoteshared.so.4
>-lib/libnoteshared.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libnoteshared.so.%%KDE4_KDELIBS_VERSION%%
> lib/libpimcommon.so
> lib/libpimcommon.so.4
>-lib/libpimcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libpimcommon.so.%%KDE4_KDELIBS_VERSION%%
>+lib/libpimsettingexporterprivate.so.4
>+lib/libpimsettingexporterprivate.so.%%KDE4_KDELIBS_VERSION%%
> lib/libsendlater.so
> lib/libsendlater.so.4
>-lib/libsendlater.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libsendlater.so.%%KDE4_KDELIBS_VERSION%%
> lib/libtemplateparser.so
> lib/libtemplateparser.so.4
>-lib/libtemplateparser.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libtemplateparser.so.%%KDE4_KDELIBS_VERSION%%
> man/man1/kabcclient.1.gz
> share/akonadi/agents/archivemailagent.desktop
> share/akonadi/agents/folderarchiveagent.desktop
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepim4-runtime/Makefile deskutils/kdepim4-runtime/Makefile
>--- deskutils/kdepim4-runtime/Makefile	2016-05-27 11:18:45.459372000 +0200
>+++ deskutils/kdepim4-runtime/Makefile	2016-05-27 15:21:09.240300000 +0200
>@@ -1,10 +1,10 @@
> # Created by: miwi
>-# $FreeBSD: head/deskutils/kdepim4-runtime/Makefile 415864 2016-05-25 20:56:06Z rene $
>+# $FreeBSD$
> 
> PORTNAME=	kdepim-runtime
>-PORTVERSION=	${KDE4_VERSION}
>+PORTVERSION=	${KDE4_KDELIBS_VERSION}
> CATEGORIES=	deskutils kde
>-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
>+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
> DIST_SUBDIR=	KDE/${PORTVERSION}
> 
> MAINTAINER=	kde@FreeBSD.org
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepim4-runtime/distinfo deskutils/kdepim4-runtime/distinfo
>--- deskutils/kdepim4-runtime/distinfo	2016-03-30 11:03:11.532110799 +0200
>+++ deskutils/kdepim4-runtime/distinfo	2016-02-21 11:07:40.819165031 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (KDE/4.14.3/kdepim-runtime-4.14.3.tar.xz) = 2d8fe881c86b74015e3aa44df042110f8fc21156b5e596f93229435e58aab50f
>-SIZE (KDE/4.14.3/kdepim-runtime-4.14.3.tar.xz) = 1168856
>+SHA256 (KDE/4.14.9/kdepim-runtime-4.14.9.tar.xz) = 8032b13b187b555e08dc21280ffad291d97d9c6f5d359136dd908a582402d840
>+SIZE (KDE/4.14.9/kdepim-runtime-4.14.9.tar.xz) = 1173760
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepim4-runtime/pkg-plist deskutils/kdepim4-runtime/pkg-plist
>--- deskutils/kdepim4-runtime/pkg-plist	2016-03-30 11:03:11.532110799 +0200
>+++ deskutils/kdepim4-runtime/pkg-plist	2016-02-21 11:07:40.820165134 +0100
>@@ -83,19 +83,19 @@
> lib/kde4/kio_akonadi.so
> lib/libakonadi-filestore.so
> lib/libakonadi-filestore.so.4
>-lib/libakonadi-filestore.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-filestore.so.%%KDE4_KDELIBS_VERSION%%
> lib/libfolderarchivesettings.so
> lib/libfolderarchivesettings.so.4
>-lib/libfolderarchivesettings.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libfolderarchivesettings.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkdepim-copy.so
> lib/libkdepim-copy.so.4
>-lib/libkdepim-copy.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkdepim-copy.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkmindexreader.so
> lib/libkmindexreader.so.4
>-lib/libkmindexreader.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkmindexreader.so.%%KDE4_KDELIBS_VERSION%%
> lib/libmaildir.so
> lib/libmaildir.so.4
>-lib/libmaildir.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libmaildir.so.%%KDE4_KDELIBS_VERSION%%
> share/akonadi/agents/akonadinepomukfeederagent.desktop
> share/akonadi/agents/akonotesresource.desktop
> share/akonadi/agents/birthdaysresource.desktop
>@@ -161,6 +161,7 @@
> share/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.desktop
> share/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.es
> share/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.ui
>+share/apps/akonadi/firstrun/birthdaycalendar
> share/apps/akonadi/firstrun/defaultaddressbook
> share/apps/akonadi/firstrun/defaultcalendar
> share/apps/akonadi/firstrun/defaultnotebook
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepimlibs4/Makefile deskutils/kdepimlibs4/Makefile
>--- deskutils/kdepimlibs4/Makefile	2016-05-27 11:18:45.286997000 +0200
>+++ deskutils/kdepimlibs4/Makefile	2016-05-27 15:21:13.608604000 +0200
>@@ -1,11 +1,11 @@
> # Created by: arved
>-# $FreeBSD: head/deskutils/kdepimlibs4/Makefile 415864 2016-05-25 20:56:06Z rene $
>+# $FreeBSD$
> 
> PORTNAME=	kdepimlibs
>-PORTVERSION=	${KDE4_VERSION}
>+PORTVERSION=	${KDE4_KDELIBS_VERSION}
> PORTREVISION=	2
> CATEGORIES=	deskutils kde
>-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
>+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
> DIST_SUBDIR=	KDE/${PORTVERSION}
> 
> MAINTAINER=	kde@FreeBSD.org
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepimlibs4/distinfo deskutils/kdepimlibs4/distinfo
>--- deskutils/kdepimlibs4/distinfo	2016-03-30 11:03:11.974110783 +0200
>+++ deskutils/kdepimlibs4/distinfo	2016-02-21 11:07:40.370165125 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (KDE/4.14.3/kdepimlibs-4.14.3.tar.xz) = 65edb1bec191be1b6f8450dc71eadae734f4ab0585aab0a885207390399868d7
>-SIZE (KDE/4.14.3/kdepimlibs-4.14.3.tar.xz) = 2790888
>+SHA256 (KDE/4.14.9/kdepimlibs-4.14.9.tar.xz) = d20be3b7c436fd84f2ba7cd3177eccce1f7f03f1589d5c25db3492c0be564b56
>+SIZE (KDE/4.14.9/kdepimlibs-4.14.9.tar.xz) = 2830748
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepimlibs4/files/patch-git_8d49c611 deskutils/kdepimlibs4/files/patch-git_8d49c611
>--- deskutils/kdepimlibs4/files/patch-git_8d49c611	2016-03-30 11:03:12.006942024 +0200
>+++ deskutils/kdepimlibs4/files/patch-git_8d49c611	1970-01-01 01:00:00.000000000 +0100
>@@ -1,24 +0,0 @@
>-Avoid errors on FreeBSD 9.3:
>-
>-/usr/local/include/kde4/akonadi/resourcebase.h:784: error: extra ';'
>-/usr/local/include/kde4/akonadi/resourcebase.h:785: error: extra ';'
>-
>-commit 8d49c611948364aa9e7594b4e130e26ccd72da5e
>-Author: Sergio Martins <iamsergio@gmail.com>
>-Date:   Sun May 3 00:18:51 2015 +0100
>-
>-    Remove uneeded semi-colon from Q_PRIVATE_SLOT
>-
>---- akonadi/resourcebase.h.orig	2014-11-04 21:19:27 UTC
>-+++ akonadi/resourcebase.h
>-@@ -781,8 +781,8 @@ private:
>-     Q_PRIVATE_SLOT(d_func(), void slotSessionReconnected())
>-     Q_PRIVATE_SLOT(d_func(), void slotRecursiveMoveReplay(RecursiveMover *))
>-     Q_PRIVATE_SLOT(d_func(), void slotRecursiveMoveReplayResult(KJob *))
>--    Q_PRIVATE_SLOT(d_func(), void slotItemRetrievalCollectionFetchDone(KJob *));
>--    Q_PRIVATE_SLOT(d_func(), void slotAttributeRetrievalCollectionFetchDone(KJob *));
>-+    Q_PRIVATE_SLOT(d_func(), void slotItemRetrievalCollectionFetchDone(KJob *))
>-+    Q_PRIVATE_SLOT(d_func(), void slotAttributeRetrievalCollectionFetchDone(KJob *))
>- };
>- 
>- }
>diff -Nru -I '$FreeBSD.*$' deskutils/kdepimlibs4/pkg-plist deskutils/kdepimlibs4/pkg-plist
>--- deskutils/kdepimlibs4/pkg-plist	2016-03-30 11:03:11.969110797 +0200
>+++ deskutils/kdepimlibs4/pkg-plist	2016-03-12 12:50:44.079379034 +0100
>@@ -162,11 +162,13 @@
> include/kde4/KDE/KABC/ContactGroupTool
> include/kde4/KDE/KABC/DistributionList
> include/kde4/KDE/KABC/DistributionListDialog
>+include/kde4/KDE/KABC/Email
> include/kde4/KDE/KABC/EmailSelectDialog
> include/kde4/KDE/KABC/ErrorHandler
> include/kde4/KDE/KABC/Field
> include/kde4/KDE/KABC/Format
> include/kde4/KDE/KABC/FormatFactory
>+include/kde4/KDE/KABC/Gender
> include/kde4/KDE/KABC/Geo
> include/kde4/KDE/KABC/Key
> include/kde4/KDE/KABC/LDIFConverter
>@@ -632,12 +634,14 @@
> include/kde4/akonadi/tagattribute.h
> include/kde4/akonadi/tagcreatejob.h
> include/kde4/akonadi/tagdeletejob.h
>+include/kde4/akonadi/tageditwidget.h
> include/kde4/akonadi/tagfetchjob.h
> include/kde4/akonadi/tagfetchscope.h
> include/kde4/akonadi/tagmanagementdialog.h
> include/kde4/akonadi/tagmodel.h
> include/kde4/akonadi/tagmodifyjob.h
> include/kde4/akonadi/tagselectiondialog.h
>+include/kde4/akonadi/tagselectwidget.h
> include/kde4/akonadi/tagwidget.h
> include/kde4/akonadi/transactionjobs.h
> include/kde4/akonadi/transactionsequence.h
>@@ -693,18 +697,23 @@
> include/kde4/kabc/addresseedialog.h
> include/kde4/kabc/addresseelist.h
> include/kde4/kabc/addresslineedit.h
>+include/kde4/kabc/calendarurl.h
> include/kde4/kabc/contactgroup.h
> include/kde4/kabc/contactgrouptool.h
> include/kde4/kabc/distributionlist.h
> include/kde4/kabc/distributionlistdialog.h
>+include/kde4/kabc/email.h
> include/kde4/kabc/emailselectdialog.h
> include/kde4/kabc/errorhandler.h
> include/kde4/kabc/field.h
> include/kde4/kabc/format.h
> include/kde4/kabc/formatfactory.h
>+include/kde4/kabc/gender.h
> include/kde4/kabc/geo.h
>+include/kde4/kabc/impp.h
> include/kde4/kabc/kabc_export.h
> include/kde4/kabc/key.h
>+include/kde4/kabc/lang.h
> include/kde4/kabc/ldifconverter.h
> include/kde4/kabc/lock.h
> include/kde4/kabc/locknull.h
>@@ -1106,31 +1115,31 @@
> lib/kde4/plugins/designer/kholidayswidgets.so
> lib/libakonadi-calendar.so
> lib/libakonadi-calendar.so.4
>-lib/libakonadi-calendar.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-calendar.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakonadi-contact.so
> lib/libakonadi-contact.so.4
>-lib/libakonadi-contact.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-contact.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakonadi-kabc.so
> lib/libakonadi-kabc.so.4
>-lib/libakonadi-kabc.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-kabc.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakonadi-kcal.so
> lib/libakonadi-kcal.so.4
>-lib/libakonadi-kcal.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-kcal.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakonadi-kde.so
> lib/libakonadi-kde.so.4
>-lib/libakonadi-kde.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-kde.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakonadi-kmime.so
> lib/libakonadi-kmime.so.4
>-lib/libakonadi-kmime.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-kmime.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakonadi-notes.so
> lib/libakonadi-notes.so.4
>-lib/libakonadi-notes.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-notes.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakonadi-socialutils.so
> lib/libakonadi-socialutils.so.4
>-lib/libakonadi-socialutils.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-socialutils.so.%%KDE4_KDELIBS_VERSION%%
> lib/libakonadi-xml.so
> lib/libakonadi-xml.so.4
>-lib/libakonadi-xml.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libakonadi-xml.so.%%KDE4_KDELIBS_VERSION%%
> lib/libgpgme++-pthread.so
> lib/libgpgme++-pthread.so.2
> lib/libgpgme++-pthread.so.2.8.0
>@@ -1139,73 +1148,73 @@
> lib/libgpgme++.so.2.8.0
> lib/libkabc.so
> lib/libkabc.so.4
>-lib/libkabc.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkabc.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkabc_file_core.so
> lib/libkabc_file_core.so.4
>-lib/libkabc_file_core.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkabc_file_core.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkalarmcal.so
> lib/libkalarmcal.so.2
> lib/libkalarmcal.so.2.7.0
> lib/libkblog.so
> lib/libkblog.so.4
>-lib/libkblog.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkblog.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkcal.so
> lib/libkcal.so.4
>-lib/libkcal.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkcal.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkcalcore.so
> lib/libkcalcore.so.4
>-lib/libkcalcore.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkcalcore.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkcalutils.so
> lib/libkcalutils.so.4
>-lib/libkcalutils.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkcalutils.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkholidays.so
> lib/libkholidays.so.4
>-lib/libkholidays.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkholidays.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkimap.so
> lib/libkimap.so.4
>-lib/libkimap.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkimap.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkldap.so
> lib/libkldap.so.4
>-lib/libkldap.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkldap.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkmbox.so
> lib/libkmbox.so.4
>-lib/libkmbox.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkmbox.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkmime.so
> lib/libkmime.so.4
>-lib/libkmime.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkmime.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkontactinterface.so
> lib/libkontactinterface.so.4
>-lib/libkontactinterface.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkontactinterface.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkpimidentities.so
> lib/libkpimidentities.so.4
>-lib/libkpimidentities.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkpimidentities.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkpimtextedit.so
> lib/libkpimtextedit.so.4
>-lib/libkpimtextedit.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkpimtextedit.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkpimutils.so
> lib/libkpimutils.so.4
>-lib/libkpimutils.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkpimutils.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkresources.so
> lib/libkresources.so.4
>-lib/libkresources.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkresources.so.%%KDE4_KDELIBS_VERSION%%
> lib/libktnef.so
> lib/libktnef.so.4
>-lib/libktnef.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libktnef.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkxmlrpcclient.so
> lib/libkxmlrpcclient.so.4
>-lib/libkxmlrpcclient.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkxmlrpcclient.so.%%KDE4_KDELIBS_VERSION%%
> lib/libmailtransport.so
> lib/libmailtransport.so.4
>-lib/libmailtransport.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libmailtransport.so.%%KDE4_KDELIBS_VERSION%%
> lib/libmicroblog.so
> lib/libmicroblog.so.4
>-lib/libmicroblog.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libmicroblog.so.%%KDE4_KDELIBS_VERSION%%
> lib/libqgpgme.so
> lib/libqgpgme.so.1
> lib/libqgpgme.so.1.0.1
> lib/libsyndication.so
> lib/libsyndication.so.4
>-lib/libsyndication.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libsyndication.so.%%KDE4_KDELIBS_VERSION%%
> share/akonadi/agents/knutresource.desktop
> share/apps/akonadi-kde/kcfg2dbus.xsl
> share/apps/akonadi/akonadi-xml.xsd
>diff -Nru -I '$FreeBSD.*$' graphics/okular/files/patch-OkularConfig.cmake graphics/okular/files/patch-OkularConfig.cmake
>--- graphics/okular/files/patch-OkularConfig.cmake	2016-03-30 11:02:07.014115348 +0200
>+++ graphics/okular/files/patch-OkularConfig.cmake	2016-03-12 12:50:44.152379225 +0100
>@@ -1,3 +1,6 @@
>+Find the okular headers when they are installed into a subdirectory of
>+${LOCALBASE}/include too (it currently follows x11/kdelibs4 and installs into
>+include/kde4).
> --- OkularConfig.cmake.orig	2016-03-11 08:43:22 UTC
> +++ OkularConfig.cmake
> @@ -7,7 +7,7 @@ get_filename_component( _okularBaseDir  
>diff -Nru -I '$FreeBSD.*$' sysutils/baloo/Makefile sysutils/baloo/Makefile
>--- sysutils/baloo/Makefile	2016-05-27 11:18:37.866508000 +0200
>+++ sysutils/baloo/Makefile	2016-05-27 14:57:48.714941000 +0200
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	baloo
> PORTVERSION=	${KDE4_VERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils kde
> MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
> DIST_SUBDIR=	KDE/${PORTVERSION}
>diff -Nru -I '$FreeBSD.*$' sysutils/baloo/pkg-plist sysutils/baloo/pkg-plist
>--- sysutils/baloo/pkg-plist	2016-03-30 11:03:49.604339212 +0200
>+++ sysutils/baloo/pkg-plist	2016-03-12 12:50:43.934378805 +0100
>@@ -49,19 +49,19 @@
> lib/kde4/libexec/kde_baloo_filewatch_raiselimit
> lib/libbaloocore.so
> lib/libbaloocore.so.4
>-lib/libbaloocore.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libbaloocore.so.%%KDE4_VERSION%%
> lib/libbaloofiles.so
> lib/libbaloofiles.so.4
>-lib/libbaloofiles.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libbaloofiles.so.%%KDE4_VERSION%%
> lib/libbaloopim.so
> lib/libbaloopim.so.4
>-lib/libbaloopim.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libbaloopim.so.%%KDE4_VERSION%%
> lib/libbalooqueryparser.so
> lib/libbalooqueryparser.so.4
>-lib/libbalooqueryparser.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libbalooqueryparser.so.%%KDE4_VERSION%%
> lib/libbalooxapian.so
> lib/libbalooxapian.so.4
>-lib/libbalooxapian.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libbalooxapian.so.%%KDE4_VERSION%%
> share/akonadi/agents/akonadibalooindexingagent.desktop
> share/autostart/baloo_file.desktop
> share/dbus-1/interfaces/org.kde.baloo.file.indexer.xml
>diff -Nru -I '$FreeBSD.*$' sysutils/kfilemetadata/pkg-plist sysutils/kfilemetadata/pkg-plist
>--- sysutils/kfilemetadata/pkg-plist	2016-03-30 11:03:50.366109568 +0200
>+++ sysutils/kfilemetadata/pkg-plist	2016-03-12 12:50:43.932379498 +0100
>@@ -21,7 +21,7 @@
> lib/kde4/kfilemetadata_taglibextractor.so
> lib/libkfilemetadata.so
> lib/libkfilemetadata.so.4
>-lib/libkfilemetadata.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkfilemetadata.so.%%KDE4_KDELIBS_VERSION%%
> share/kde4/services/kfilemetadata_epubextractor.desktop
> share/kde4/services/kfilemetadata_exiv2extractor.desktop
> share/kde4/services/kfilemetadata_ffmpegextractor.desktop
>diff -Nru -I '$FreeBSD.*$' sysutils/ksysguardd/Makefile sysutils/ksysguardd/Makefile
>--- sysutils/ksysguardd/Makefile	2016-05-27 11:18:37.820665000 +0200
>+++ sysutils/ksysguardd/Makefile	2016-05-27 15:38:56.565500000 +0200
>@@ -3,14 +3,14 @@
> PORTNAME=	ksysguardd
> PORTVERSION=	${KDE4_WORKSPACE_VERSION}
> CATEGORIES=	sysutils kde
>-MASTER_SITES=	KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
>+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
> DISTNAME=	kde-workspace-${PORTVERSION}
> DIST_SUBDIR=	KDE/${PORTVERSION}
> 
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	KDE System Guard Daemon
> 
>-DISTINFO_FILE=	${PORTSDIR}/x11/kde4-workspace/distinfo
>+DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-workspace/distinfo
> USE_KDE4=	# blank, needed to get KDE4_VERSION
> USES=		cmake tar:xz
> CMAKE_ARGS+=	-DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \
>diff -Nru -I '$FreeBSD.*$' sysutils/nepomuk-core/Makefile sysutils/nepomuk-core/Makefile
>--- sysutils/nepomuk-core/Makefile	2016-05-27 11:18:39.321682000 +0200
>+++ sysutils/nepomuk-core/Makefile	2016-05-27 15:42:07.873328000 +0200
>@@ -1,4 +1,5 @@
>-# $FreeBSD: head/sysutils/nepomuk-core/Makefile 415864 2016-05-25 20:56:06Z rene $
>+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
>+# $FreeBSD$
> 
> PORTNAME=	nepomuk-core
> PORTVERSION=	${KDE4_VERSION}
>diff -Nru -I '$FreeBSD.*$' sysutils/nepomuk-core/pkg-plist sysutils/nepomuk-core/pkg-plist
>--- sysutils/nepomuk-core/pkg-plist	2016-03-30 11:03:50.019108325 +0200
>+++ sysutils/nepomuk-core/pkg-plist	2016-03-12 12:50:43.930379176 +0100
>@@ -134,11 +134,11 @@
> lib/libkdeinit4_nepomukserver.so
> lib/libnepomukcleaner.so
> lib/libnepomukcleaner.so.4
>-lib/libnepomukcleaner.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libnepomukcleaner.so.%%KDE4_KDELIBS_VERSION%%
> lib/libnepomukcommon.so
> lib/libnepomukcore.so
> lib/libnepomukcore.so.4
>-lib/libnepomukcore.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libnepomukcore.so.%%KDE4_KDELIBS_VERSION%%
> lib/libnepomukextractor.so
> share/applications/kde4/nepomukbackup.desktop
> share/applications/kde4/nepomukcleaner.desktop
>diff -Nru -I '$FreeBSD.*$' sysutils/nepomuk-widgets/pkg-plist sysutils/nepomuk-widgets/pkg-plist
>--- sysutils/nepomuk-widgets/pkg-plist	2016-03-30 11:03:53.249349718 +0200
>+++ sysutils/nepomuk-widgets/pkg-plist	2016-03-12 12:50:43.927378760 +0100
>@@ -9,4 +9,4 @@
> lib/cmake/NepomukWidgets/NepomukWidgetsTargetsWithPrefix.cmake
> lib/libnepomukwidgets.so
> lib/libnepomukwidgets.so.4
>-lib/libnepomukwidgets.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libnepomukwidgets.so.%%KDE4_KDELIBS_VERSION%%
>diff -Nru -I '$FreeBSD.*$' x11/kactivities/Makefile x11/kactivities/Makefile
>--- x11/kactivities/Makefile	2016-05-27 11:18:41.768504000 +0200
>+++ x11/kactivities/Makefile	2016-05-27 15:13:46.203937000 +0200
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	kactivities
> PORTVERSION=	${KDE4_ACTIVITES_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	x11 kde
> MASTER_SITES=	KDE/Attic/${PORTVERSION}/src
> DIST_SUBDIR=	KDE/${PORTVERSION}
>diff -Nru -I '$FreeBSD.*$' x11/kde4-workspace/Makefile x11/kde4-workspace/Makefile
>--- x11/kde4-workspace/Makefile	2016-05-27 11:18:40.866493000 +0200
>+++ x11/kde4-workspace/Makefile	2016-05-27 15:13:46.204224000 +0200
>@@ -2,9 +2,8 @@
> 
> PORTNAME=	kde-workspace
> PORTVERSION=	${KDE4_WORKSPACE_VERSION}
>-PORTREVISION=	6
> CATEGORIES=	x11 kde
>-MASTER_SITES=	KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
>+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
> DIST_SUBDIR=	KDE/${PORTVERSION}
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -134,5 +133,6 @@
> post-install-GSTREAMER-off:
> 	@${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE}
> 	@${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE}
>+	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>diff -Nru -I '$FreeBSD.*$' x11/kde4-workspace/distinfo x11/kde4-workspace/distinfo
>--- x11/kde4-workspace/distinfo	2016-03-30 11:02:15.330115238 +0200
>+++ x11/kde4-workspace/distinfo	2016-02-21 11:07:45.830164661 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (KDE/4.11.14/kde-workspace-4.11.14.tar.xz) = cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01
>-SIZE (KDE/4.11.14/kde-workspace-4.11.14.tar.xz) = 13529808
>+SHA256 (KDE/4.11.20/kde-workspace-4.11.20.tar.xz) = 6c8c9b27037c2a102d2a519c733b381805268d7f9def85b50ecd8c580156c41a
>+SIZE (KDE/4.11.20/kde-workspace-4.11.20.tar.xz) = 13547720
>diff -Nru -I '$FreeBSD.*$' x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt
>--- x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt	2016-03-30 11:02:15.243359165 +0200
>+++ x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,15 +0,0 @@
>---- kwin/opengltest/CMakeLists.txt.orig	2014-11-06 22:36:58 UTC
>-+++ kwin/opengltest/CMakeLists.txt
>-@@ -2,9 +2,11 @@
>- 
>- set(kwin_opengl_test_SRCS opengltest.cpp )
>- 
>-+find_package(Threads)
>-+
>- kde4_add_executable(kwin_opengl_test ${kwin_opengl_test_SRCS})
>- 
>--target_link_libraries(kwin_opengl_test ${X11_LIBRARIES} ${OPENGL_gl_LIBRARY})
>-+target_link_libraries(kwin_opengl_test ${X11_LIBRARIES} ${OPENGL_gl_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
>- 
>- install(TARGETS kwin_opengl_test DESTINATION ${LIBEXEC_INSTALL_DIR} )
>- 
>diff -Nru -I '$FreeBSD.*$' x11/kde4-workspace/pkg-plist x11/kde4-workspace/pkg-plist
>--- x11/kde4-workspace/pkg-plist	2016-03-30 11:02:15.329114888 +0200
>+++ x11/kde4-workspace/pkg-plist	2016-03-12 12:50:44.281379279 +0100
>@@ -336,7 +336,7 @@
> lib/kde4/powerdevilsuspendsessionaction_config.so
> lib/libkdecorations.so
> lib/libkdecorations.so.4
>-lib/libkdecorations.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkdecorations.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkdeinit4_kaccess.so
> lib/libkdeinit4_kcminit.so
> lib/libkdeinit4_kcminit_startup.so
>@@ -353,25 +353,25 @@
> lib/libkdeinit4_plasma-windowed.so
> lib/libkephal.so
> lib/libkephal.so.4
>-lib/libkephal.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkephal.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkfontinst.so
> lib/libkfontinst.so.4
>-lib/libkfontinst.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkfontinst.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkfontinstui.so
> lib/libkfontinstui.so.4
>-lib/libkfontinstui.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkfontinstui.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkhotkeysprivate.so.4
>-lib/libkhotkeysprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkhotkeysprivate.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkickoff.so
> lib/libkscreensaver.so
> lib/libkscreensaver.so.5
> lib/libkscreensaver.so.5.0.0
> lib/libksgrd.so
> lib/libksgrd.so.4
>-lib/libksgrd.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libksgrd.so.%%KDE4_KDELIBS_VERSION%%
> lib/libksignalplotter.so
> lib/libksignalplotter.so.4
>-lib/libksignalplotter.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libksignalplotter.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkwineffects.so
> lib/libkwineffects.so.1
> lib/libkwineffects.so.1.0.0
>@@ -383,48 +383,48 @@
> lib/libkwinglutils.so.1.0.0
> lib/libkworkspace.so
> lib/libkworkspace.so.4
>-lib/libkworkspace.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkworkspace.so.%%KDE4_KDELIBS_VERSION%%
> lib/liblsofui.so
> lib/liblsofui.so.4
>-lib/liblsofui.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/liblsofui.so.%%KDE4_KDELIBS_VERSION%%
> lib/liboxygenstyle.so
> lib/liboxygenstyle.so.4
>-lib/liboxygenstyle.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/liboxygenstyle.so.%%KDE4_KDELIBS_VERSION%%
> lib/liboxygenstyleconfig.so
> lib/liboxygenstyleconfig.so.4
>-lib/liboxygenstyleconfig.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/liboxygenstyleconfig.so.%%KDE4_KDELIBS_VERSION%%
> lib/libplasma-geolocation-interface.so
> lib/libplasma-geolocation-interface.so.4
>-lib/libplasma-geolocation-interface.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libplasma-geolocation-interface.so.%%KDE4_KDELIBS_VERSION%%
> lib/libplasma_applet-system-monitor.so
> lib/libplasma_applet-system-monitor.so.4
>-lib/libplasma_applet-system-monitor.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libplasma_applet-system-monitor.so.%%KDE4_KDELIBS_VERSION%%
> lib/libplasmaclock.so
> lib/libplasmaclock.so.4
>-lib/libplasmaclock.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libplasmaclock.so.%%KDE4_KDELIBS_VERSION%%
> lib/libplasmagenericshell.so
> lib/libplasmagenericshell.so.4
>-lib/libplasmagenericshell.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libplasmagenericshell.so.%%KDE4_KDELIBS_VERSION%%
> lib/libpowerdevilconfigcommonprivate.so
> lib/libpowerdevilconfigcommonprivate.so.4
>-lib/libpowerdevilconfigcommonprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libpowerdevilconfigcommonprivate.so.%%KDE4_KDELIBS_VERSION%%
> lib/libpowerdevilcore.so
> lib/libpowerdevilcore.so.0
> lib/libpowerdevilcore.so.0.1.0
> lib/libpowerdevilui.so
> lib/libpowerdevilui.so.4
>-lib/libpowerdevilui.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libpowerdevilui.so.%%KDE4_KDELIBS_VERSION%%
> lib/libprocesscore.so
> lib/libprocesscore.so.4
>-lib/libprocesscore.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libprocesscore.so.%%KDE4_KDELIBS_VERSION%%
> lib/libprocessui.so
> lib/libprocessui.so.4
>-lib/libprocessui.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libprocessui.so.%%KDE4_KDELIBS_VERSION%%
> lib/libsystemsettingsview.so
> lib/libsystemsettingsview.so.2
> lib/libtaskmanager.so
> lib/libtaskmanager.so.4
>-lib/libtaskmanager.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libtaskmanager.so.%%KDE4_KDELIBS_VERSION%%
> lib/libweather_ion.so
> lib/libweather_ion.so.6
> lib/libweather_ion.so.6.0.0
>diff -Nru -I '$FreeBSD.*$' x11/kdelibs4/Makefile x11/kdelibs4/Makefile
>--- x11/kdelibs4/Makefile	2016-05-27 11:18:40.682971000 +0200
>+++ x11/kdelibs4/Makefile	2016-06-14 09:08:46.921565000 +0200
>@@ -1,11 +1,11 @@
> # Created by: arved@FreeBSD.org
>-# $FreeBSD: head/x11/kdelibs4/Makefile 415864 2016-05-25 20:56:06Z rene $
>+# $FreeBSD$
> 
> PORTNAME=	kdelibs
>-PORTVERSION=	${KDE4_VERSION}
>+PORTVERSION=	${KDE4_KDELIBS_VERSION}
> PORTREVISION=	6
> CATEGORIES=	x11 kde
>-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
>+MASTER_SITES=   KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
> DIST_SUBDIR=	KDE/${PORTVERSION}
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -14,13 +14,11 @@
> LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
> 		libjasper.so:graphics/jasper \
> 		libpcre.so:devel/pcre \
>-		libavahi-core.so:net/avahi-app \
> 		libenchant.so:textproc/enchant \
> 		libgif.so:graphics/giflib \
> 		libpng.so:graphics/png \
> 		libhal.so:sysutils/hal \
> 		libqca.so:devel/qca \
>-		libHUpnp.so:net/hupnp \
> 		libpolkit-qt-core-1.so:sysutils/polkit-qt \
> 		libdbusmenu-qt.so:devel/libdbusmenu-qt \
> 		libgrantlee_gui.so:devel/grantlee
>@@ -36,7 +34,8 @@
> USE_GNOME=	libxml2 libxslt
> USE_KDE4=	oxygen \
> 		attica automoc4 ontologies soprano strigi
>-USES=		cmake:outsource fam gettext jpeg perl5 shared-mime-info shebangfix tar:xz
>+USES=		cmake:outsource fam gettext jpeg perl5 shared-mime-info \
>+		shebangfix tar:xz
> USE_OPENSSL=	yes
> USE_QT4=	corelib dbus declarative designer_build gui \
> 		network opengl phonon qt3support \
>@@ -52,7 +51,6 @@
> 		-DWITH_ASPELL:BOOL=Off \
> 		-DWITH_HSPELL:BOOL=Off \
> 		-DWITH_UDev:BOOL=Off \
>-		-DHUPNP_ENABLED:BOOL=On \
> 		-DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \
> 		-DKDE_DEFAULT_HOME:STRING=".kde4"
> 
>@@ -76,6 +74,15 @@
> 		kio/proxytype.pl \
> 		kioslave/http/kcookiejar/kcookiescfg.pl
> 
>+OPTIONS_DEFINE=	AVAHI UPNP
>+OPTIONS_DEFAULT=AVAHI
>+
>+AVAHI_LIB_DEPENDS=	libavahi-core.so:${PORTSDIR}/net/avahi-app
>+
>+UPNP_DESC=	UPnP backend for Solid (WARNING: Unstable)
>+UPNP_LIB_DEPENDS=	libHUpnp.so:${PORTSDIR}/net/hupnp
>+UPNP_CMAKE_ON=	-DHUPNP_ENABLED:BOOL=On
>+
> post-patch:
> 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
> 		${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \
>diff -Nru -I '$FreeBSD.*$' x11/kdelibs4/distinfo x11/kdelibs4/distinfo
>--- x11/kdelibs4/distinfo	2016-03-30 11:02:15.918114655 +0200
>+++ x11/kdelibs4/distinfo	2016-02-21 11:07:45.499164741 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (KDE/4.14.3/kdelibs-4.14.3.tar.xz) = f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e
>-SIZE (KDE/4.14.3/kdelibs-4.14.3.tar.xz) = 11600500
>+SHA256 (KDE/4.14.9/kdelibs-4.14.9.tar.xz) = 3d32be2aba9f6775dabc515267c4696e6c92c308dc57d169413ce0d7e1d8741e
>+SIZE (KDE/4.14.9/kdelibs-4.14.9.tar.xz) = 11646880
>diff -Nru -I '$FreeBSD.*$' x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake
>--- x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ x11/kdelibs4/files/extra-patch-ConfigureChecks.cmake	2016-02-21 11:07:45.503164641 +0100
>@@ -0,0 +1,17 @@
>+--- ./ConfigureChecks.cmake.orig	2009-06-09 20:09:30.000000000 +0400
>++++ ./ConfigureChecks.cmake	2009-08-06 13:42:18.000000000 +0400
>+@@ -144,11 +144,11 @@
>+ 
>+   set(UTIL_LIBRARY)
>+ 
>+-  check_library_exists(utempter addToUtmp "" HAVE_ADDTOUTEMP)
>+-  check_include_files(utempter.h HAVE_UTEMPTER_H)
>++  check_library_exists(utempter addToUtmp "/usr/local/lib" HAVE_ADDTOUTEMP)
>++  check_include_files(/usr/local/include/utempter.h HAVE_UTEMPTER_H)
>+   if (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H)
>+     set(HAVE_UTEMPTER 1)
>+-    set(UTEMPTER_LIBRARY utempter)
>++    set(UTEMPTER_LIBRARY /usr/local/lib/libutempter.so)
>+   else (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H)
>+     check_function_exists(login login_in_libc)
>+     if (NOT login_in_libc)
>diff -Nru -I '$FreeBSD.*$' x11/kdelibs4/files/patch-mimetypes_kde.xml x11/kdelibs4/files/patch-mimetypes_kde.xml
>--- x11/kdelibs4/files/patch-mimetypes_kde.xml	2016-03-30 11:02:15.918114655 +0200
>+++ x11/kdelibs4/files/patch-mimetypes_kde.xml	2016-02-21 11:07:45.502164658 +0100
>@@ -1,6 +1,6 @@
>---- mimetypes/kde.xml.orig	2014-08-21 16:18:35.265799343 +0200
>-+++ mimetypes/kde.xml	2014-08-21 16:24:17.444776007 +0200
>-@@ -13,64 +13,6 @@
>+--- mimetypes/kde.xml.orig	2015-06-05 04:11:32 UTC
>++++ mimetypes/kde.xml
>+@@ -13,64 +13,6 @@ Notes:
>    the mime type there.
>  -->
>  <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
>@@ -9,7 +9,7 @@
> -    <comment>Metalink download</comment>
> -    <comment xml:lang="ar">ØªÙØ²ÙÙ Metalink</comment>
> -    <comment xml:lang="ast">Descarga Metalink</comment>
>--    <comment xml:lang="bs">metalink preuzimanje</comment>
>+-    <comment xml:lang="bs">Metalink preuzimanje</comment>
> -    <comment xml:lang="ca">Baixada de Â«MetalinkÂ»</comment>
> -    <comment xml:lang="ca@valencia">Baixada de Â«MetalinkÂ»</comment>
> -    <comment xml:lang="cs">StahovÃ¡nÃ Metalink</comment>
>@@ -65,7 +65,7 @@
>    <mime-type type="application/relaxng">
>      <sub-class-of type="application/xml"/>
>      <comment>RELAX NG</comment>
>-@@ -662,66 +604,6 @@
>+@@ -662,66 +604,6 @@ Notes:
>      <glob pattern="*.mhtml"/>
>      <glob pattern="*.mht"/>
>    </mime-type>
>@@ -132,7 +132,7 @@
>    <mime-type type="application/x-plasma">
>      <sub-class-of type="application/zip"/>
>      <comment>plasmoid</comment>
>-@@ -1544,9 +1426,6 @@
>+@@ -1544,9 +1426,6 @@ Notes:
>      <glob pattern="*.pnx"/>
>      <glob pattern="*.rdc"/>
>    </mime-type>
>@@ -142,7 +142,7 @@
>    <mime-type type="text/x-hex">
>      <sub-class-of type="text/plain"/>
>      <comment>IntelÂ® hexadecimal object file</comment>
>-@@ -3804,236 +3683,6 @@
>+@@ -3460,236 +3339,6 @@ Notes:
>      <glob pattern="*.wmp"/>
>    </mime-type>
>  
>@@ -379,7 +379,7 @@
>    
>    
>    <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info" type="application/x-trig"> 
>-@@ -4213,121 +3862,4 @@
>+@@ -3869,121 +3518,4 @@ Notes:
>      </magic>
>      <glob pattern="*.pic"/>
>    </mime-type>
>diff -Nru -I '$FreeBSD.*$' x11/kdelibs4/files/patch-solid__solid__managerbase.cpp x11/kdelibs4/files/patch-solid__solid__managerbase.cpp
>--- x11/kdelibs4/files/patch-solid__solid__managerbase.cpp	2016-02-21 11:07:45.000000000 +0100
>+++ x11/kdelibs4/files/patch-solid__solid__managerbase.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,15 +0,0 @@
>---- ./solid/solid/managerbase.cpp.orig	2012-04-17 23:58:05.745260976 +0200
>-+++ ./solid/solid/managerbase.cpp	2012-04-18 00:00:48.605183174 +0200
>-@@ -90,7 +90,11 @@
>- #        endif
>- 
>- #        if defined (HUPNP_FOUND)
>--            m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
>-+            bool solidUPnPEnabled
>-+                = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1;
>-+            if (solidUPnPEnabled) {
>-+                m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
>-+            }
>- #        endif
>-     }
>- }
>diff -Nru -I '$FreeBSD.*$' x11/kdelibs4/pkg-message x11/kdelibs4/pkg-message
>--- x11/kdelibs4/pkg-message	2016-02-21 11:07:45.000000000 +0100
>+++ x11/kdelibs4/pkg-message	2016-06-13 21:45:16.104269000 +0200
>@@ -1,14 +0,0 @@
>-======================================================================
>-
>-Due to severe instability, the Solid UPnP backend was disabled. Thus,
>-you will not get notifications about networked shares in the device
>-notifier. The UPnP functionality can be re-enabled by setting the
>-SOLID_UPNP environment variable:
>-
>-$ cat > ~/.kde4/env/upnp.sh << EOF
>-SOLID_UPNP=1
>-export SOLID_UPNP
>-EOF
>-$ chmod +x ~/.kde4/env/upnp.sh
>-
>-======================================================================
>diff -Nru -I '$FreeBSD.*$' x11/kdelibs4/pkg-plist x11/kdelibs4/pkg-plist
>--- x11/kdelibs4/pkg-plist	2016-03-30 11:02:15.917114778 +0200
>+++ x11/kdelibs4/pkg-plist	2016-03-12 12:50:44.273379357 +0100
>@@ -2002,23 +2002,23 @@
> lib/kde4/plugins/kauth/helper/kauth_helper_plugin.so
> lib/kde4/plugins/script/libkrossqtsplugin.so
> lib/kde4/plugins/script/libkrossqtsplugin.so.4
>-lib/kde4/plugins/script/libkrossqtsplugin.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/kde4/plugins/script/libkrossqtsplugin.so.%%KDE4_KDELIBS_VERSION%%
> lib/kde4/spellcheckplugin.so
> lib/libkcmutils.so
> lib/libkcmutils.so.4
>-lib/libkcmutils.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkcmutils.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkde3support.so
> lib/libkde3support.so.4
>-lib/libkde3support.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkde3support.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkdeclarative.so
> lib/libkdeclarative.so.5
>-lib/libkdeclarative.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
>+lib/libkdeclarative.so.%%KDE4_NG_KDELIBS_VERSION%%
> lib/libkdecore.so
> lib/libkdecore.so.5
>-lib/libkdecore.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
>+lib/libkdecore.so.%%KDE4_NG_KDELIBS_VERSION%%
> lib/libkdefakes.so
> lib/libkdefakes.so.5
>-lib/libkdefakes.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
>+lib/libkdefakes.so.%%KDE4_NG_KDELIBS_VERSION%%
> lib/libkdeinit4_kbuildsycoca4.so
> lib/libkdeinit4_kconf_update.so
> lib/libkdeinit4_kded4.so
>@@ -2026,103 +2026,103 @@
> lib/libkdeinit4_klauncher.so
> lib/libkdesu.so
> lib/libkdesu.so.5
>-lib/libkdesu.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
>+lib/libkdesu.so.%%KDE4_NG_KDELIBS_VERSION%%
> lib/libkdeui.so
> lib/libkdeui.so.5
>-lib/libkdeui.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
>+lib/libkdeui.so.%%KDE4_NG_KDELIBS_VERSION%%
> lib/libkdewebkit.so
> lib/libkdewebkit.so.5
>-lib/libkdewebkit.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
>+lib/libkdewebkit.so.%%KDE4_NG_KDELIBS_VERSION%%
> lib/libkdnssd.so
> lib/libkdnssd.so.4
>-lib/libkdnssd.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkdnssd.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkemoticons.so
> lib/libkemoticons.so.4
>-lib/libkemoticons.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkemoticons.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkfile.so
> lib/libkfile.so.4
>-lib/libkfile.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkfile.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkhtml.so
> lib/libkhtml.so.5
>-lib/libkhtml.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
>+lib/libkhtml.so.%%KDE4_NG_KDELIBS_VERSION%%
> lib/libkidletime.so
> lib/libkidletime.so.4
>-lib/libkidletime.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkidletime.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkimproxy.so
> lib/libkimproxy.so.4
>-lib/libkimproxy.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkimproxy.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkio.so
> lib/libkio.so.5
>-lib/libkio.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
>+lib/libkio.so.%%KDE4_NG_KDELIBS_VERSION%%
> lib/libkjs.so
> lib/libkjs.so.4
>-lib/libkjs.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkjs.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkjsapi.so
> lib/libkjsapi.so.4
>-lib/libkjsapi.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkjsapi.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkjsembed.so
> lib/libkjsembed.so.4
>-lib/libkjsembed.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkjsembed.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkmediaplayer.so
> lib/libkmediaplayer.so.4
>-lib/libkmediaplayer.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkmediaplayer.so.%%KDE4_KDELIBS_VERSION%%
> lib/libknewstuff2.so
> lib/libknewstuff2.so.4
>-lib/libknewstuff2.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libknewstuff2.so.%%KDE4_KDELIBS_VERSION%%
> lib/libknewstuff3.so
> lib/libknewstuff3.so.4
>-lib/libknewstuff3.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libknewstuff3.so.%%KDE4_KDELIBS_VERSION%%
> lib/libknotifyconfig.so
> lib/libknotifyconfig.so.4
>-lib/libknotifyconfig.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libknotifyconfig.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkntlm.so
> lib/libkntlm.so.4
>-lib/libkntlm.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkntlm.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkparts.so
> lib/libkparts.so.4
>-lib/libkparts.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkparts.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkprintutils.so
> lib/libkprintutils.so.4
>-lib/libkprintutils.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkprintutils.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkpty.so
> lib/libkpty.so.4
>-lib/libkpty.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkpty.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkrosscore.so
> lib/libkrosscore.so.4
>-lib/libkrosscore.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkrosscore.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkrossui.so
> lib/libkrossui.so.4
>-lib/libkrossui.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkrossui.so.%%KDE4_KDELIBS_VERSION%%
> lib/libktexteditor.so
> lib/libktexteditor.so.4
>-lib/libktexteditor.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libktexteditor.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkunitconversion.so
> lib/libkunitconversion.so.4
>-lib/libkunitconversion.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkunitconversion.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkunittest.so
> lib/libkunittest.so.4
>-lib/libkunittest.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkunittest.so.%%KDE4_KDELIBS_VERSION%%
> lib/libkutils.so
> lib/libkutils.so.4
>-lib/libkutils.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libkutils.so.%%KDE4_KDELIBS_VERSION%%
> lib/libnepomuk.so
> lib/libnepomuk.so.4
>-lib/libnepomuk.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libnepomuk.so.%%KDE4_KDELIBS_VERSION%%
> lib/libnepomukquery.so
> lib/libnepomukquery.so.4
>-lib/libnepomukquery.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libnepomukquery.so.%%KDE4_KDELIBS_VERSION%%
> lib/libnepomukutils.so
> lib/libnepomukutils.so.4
>-lib/libnepomukutils.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libnepomukutils.so.%%KDE4_KDELIBS_VERSION%%
> lib/libplasma.so
> lib/libplasma.so.3
> lib/libplasma.so.3.0.0
> lib/libsolid.so
> lib/libsolid.so.4
>-lib/libsolid.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libsolid.so.%%KDE4_KDELIBS_VERSION%%
> lib/libthreadweaver.so
> lib/libthreadweaver.so.4
>-lib/libthreadweaver.so.%%KDE4_GENERIC_LIB_VERSION%%
>+lib/libthreadweaver.so.%%KDE4_KDELIBS_VERSION%%
> man/man1/checkXML.1.gz
> man/man1/kconfig_compiler.1.gz
> man/man1/kde4-config.1.gz
>@@ -3340,6 +3340,7 @@
> share/doc/HTML/en/common/lgpl-license.html
> share/doc/HTML/en/common/mainfooter.html
> share/doc/HTML/en/common/mainheader.html
>+share/doc/HTML/en/common/part_of_the_kde_family_horizontal_190.png
> share/doc/HTML/en/common/qpl-license.html
> share/doc/HTML/en/common/tabs.css
> share/doc/HTML/en/common/top-kde.jpg
>diff -Nru -I '$FreeBSD.*$' x11/plasma-scriptengine-python/Makefile x11/plasma-scriptengine-python/Makefile
>--- x11/plasma-scriptengine-python/Makefile	2016-05-27 11:18:40.887283000 +0200
>+++ x11/plasma-scriptengine-python/Makefile	2016-05-27 15:41:52.727342000 +0200
>@@ -2,9 +2,8 @@
> 
> PORTNAME=	plasma-scriptengine-python
> PORTVERSION=	${KDE4_WORKSPACE_VERSION}
>-PORTREVISION=	1
> CATEGORIES=	x11 kde
>-MASTER_SITES=	KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
>+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
> DISTNAME=	kde-workspace-${PORTVERSION}
> DIST_SUBDIR=	KDE/${PORTVERSION}
> 
>@@ -13,7 +12,7 @@
> 
> USE_KDE4=	kdelibs pykde4 automoc4
> USE_QT4=	qmake_build moc_build uic_build rcc_build
>-DISTINFO_FILE=	${PORTSDIR}/x11/kde4-workspace/distinfo
>+DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-workspace/distinfo
> USES=		cmake:outsource python:2 tar:xz
> 
> CMAKE_SOURCE_PATH=	${WRKSRC}/plasma/generic/scriptengines/python
>diff -Nru -I '$FreeBSD.*$' x11/plasma-scriptengine-ruby/Makefile x11/plasma-scriptengine-ruby/Makefile
>--- x11/plasma-scriptengine-ruby/Makefile	2016-05-31 19:35:15.372336000 +0200
>+++ x11/plasma-scriptengine-ruby/Makefile	2016-05-27 15:41:55.719356000 +0200
>@@ -3,7 +3,7 @@
> PORTNAME=	plasma-scriptengine-ruby
> PORTVERSION=	${KDE4_WORKSPACE_VERSION}
> CATEGORIES=	x11 kde
>-MASTER_SITES=	KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
>+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
> DISTNAME=	kde-workspace-${PORTVERSION}
> DIST_SUBDIR=	KDE/${PORTVERSION}
> 
>@@ -13,7 +13,7 @@
> USE_KDE4=	kdelibs korundum automoc4
> USE_QT4=	qmake_build moc_build uic_build rcc_build
> USE_RUBY=	yes
>-DISTINFO_FILE=	${PORTSDIR}/x11/kde4-workspace/distinfo
>+DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-workspace/distinfo
> USES=		cmake:outsource tar:xz
> 
> CMAKE_SOURCE_PATH=	${WRKSRC}/plasma/generic/scriptengines/ruby

Actions: View | Diff

Attachments on bug 210255: 171389 | 171410 | 171446 | 171487 | 171504