Date: Wed, 22 Jun 2016 18:57:33 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417328 - in head: Mk deskutils/kdepim4 deskutils/kdepim4-runtime deskutils/kdepimlibs4 deskutils/kdepimlibs4/files graphics/okular/files sysutils/baloo sysutils/kfilemetadata sysutils/... Message-ID: <201606221857.u5MIvX6E041225@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Wed Jun 22 18:57:33 2016 New Revision: 417328 URL: https://svnweb.freebsd.org/changeset/ports/417328 Log: x11/kde4: update to kdelibs version 4.14.10 This is based on the area51 testing repository of the KDE-FreeBSD project, containing work by Raphael Kubo da Costa, Tobias Berner, Ralf Nolden, Adriaan de Groot and probably many more from the KDE team. KDE4 releases have fallen into three tracks now that KDE4 is pretty much end-of-life upstream. There's the libraries, the workspace (Plasma4) and applications. This patch introduces KDE4_KDELIBS_VERSION to track library releases, which are still done infrequently. It bumps the workspace version. It leaves applications alone. This has an effect on some applications pkg-plists where library version numbers need to be changed. Other than that it's supposed to be a minor upgrade, which opens the doors for more reorganization and getting KDE Frameworks 5 in. PR: 210255 Submitted by: Adriaan de Groot <groot@kde.org> (kde), Tobias C.Berner <tcberner@gmail.com> (kde) Exp-run by: antoine Deleted: head/deskutils/kdepimlibs4/files/patch-git_8d49c611 head/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt head/x11/kdelibs4/files/patch-solid__solid__managerbase.cpp head/x11/kdelibs4/pkg-message Modified: head/Mk/bsd.kde4.mk head/deskutils/kdepim4-runtime/Makefile head/deskutils/kdepim4-runtime/distinfo head/deskutils/kdepim4-runtime/pkg-plist head/deskutils/kdepim4/Makefile head/deskutils/kdepim4/distinfo head/deskutils/kdepim4/pkg-plist head/deskutils/kdepimlibs4/Makefile head/deskutils/kdepimlibs4/distinfo head/deskutils/kdepimlibs4/pkg-plist head/graphics/okular/files/patch-OkularConfig.cmake head/sysutils/baloo/Makefile head/sysutils/baloo/pkg-plist head/sysutils/kfilemetadata/pkg-plist head/sysutils/ksysguardd/Makefile head/sysutils/nepomuk-core/Makefile head/sysutils/nepomuk-core/pkg-plist head/sysutils/nepomuk-widgets/pkg-plist head/x11/kde4-workspace/Makefile head/x11/kde4-workspace/distinfo head/x11/kde4-workspace/pkg-plist head/x11/kdelibs4/Makefile head/x11/kdelibs4/distinfo head/x11/kdelibs4/files/patch-mimetypes_kde.xml head/x11/kdelibs4/pkg-plist head/x11/plasma-scriptengine-python/Makefile head/x11/plasma-scriptengine-ruby/Makefile Modified: head/Mk/bsd.kde4.mk ============================================================================== --- head/Mk/bsd.kde4.mk Wed Jun 22 17:30:57 2016 (r417327) +++ head/Mk/bsd.kde4.mk Wed Jun 22 18:57:33 2016 (r417328) @@ -74,8 +74,9 @@ Kde_Pre_Include= bsd.kde4.mk # KDE4_VERSION?= 4.14.3 +KDE4_KDELIBS_VERSION= 4.14.10 KDE4_ACTIVITES_VERSION= 4.13.3 -KDE4_WORKSPACE_VERSION= 4.11.14 +KDE4_WORKSPACE_VERSION= 4.11.21 KDE4_APPLICATIONS_VERSION?= 15.04.3 KDE4_APPLICATIONS_BRANCH?= Attic KDE4_BRANCH?= stable @@ -94,8 +95,11 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCA 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/.//} Modified: head/deskutils/kdepim4-runtime/Makefile ============================================================================== --- head/deskutils/kdepim4-runtime/Makefile Wed Jun 22 17:30:57 2016 (r417327) +++ head/deskutils/kdepim4-runtime/Makefile Wed Jun 22 18:57:33 2016 (r417328) @@ -2,9 +2,9 @@ # $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 Modified: head/deskutils/kdepim4-runtime/distinfo ============================================================================== --- head/deskutils/kdepim4-runtime/distinfo Wed Jun 22 17:30:57 2016 (r417327) +++ head/deskutils/kdepim4-runtime/distinfo Wed Jun 22 18:57:33 2016 (r417328) @@ -1,2 +1,3 @@ -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 +TIMESTAMP = 1465935706 +SHA256 (KDE/4.14.10/kdepim-runtime-4.14.10.tar.xz) = d68d1e3278646c3e82c7913dd443b5e10c887fb983fad7d24b26916ed4afcd52 +SIZE (KDE/4.14.10/kdepim-runtime-4.14.10.tar.xz) = 1175432 Modified: head/deskutils/kdepim4-runtime/pkg-plist ============================================================================== --- head/deskutils/kdepim4-runtime/pkg-plist Wed Jun 22 17:30:57 2016 (r417327) +++ head/deskutils/kdepim4-runtime/pkg-plist Wed Jun 22 18:57:33 2016 (r417328) @@ -83,19 +83,19 @@ lib/kde4/kcm_akonadi_server.so 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/vcard/v 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 Modified: head/deskutils/kdepim4/Makefile ============================================================================== --- head/deskutils/kdepim4/Makefile Wed Jun 22 17:30:57 2016 (r417327) +++ head/deskutils/kdepim4/Makefile Wed Jun 22 18:57:33 2016 (r417328) @@ -2,10 +2,9 @@ # $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 @@ CONFLICTS_INSTALL= kdepim44-4.* 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 Modified: head/deskutils/kdepim4/distinfo ============================================================================== --- head/deskutils/kdepim4/distinfo Wed Jun 22 17:30:57 2016 (r417327) +++ head/deskutils/kdepim4/distinfo Wed Jun 22 18:57:33 2016 (r417328) @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/kdepim-4.14.3.tar.xz) = a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 -SIZE (KDE/4.14.3/kdepim-4.14.3.tar.xz) = 14483432 +TIMESTAMP = 1465935710 +SHA256 (KDE/4.14.10/kdepim-4.14.10.tar.xz) = edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 +SIZE (KDE/4.14.10/kdepim-4.14.10.tar.xz) = 14585020 Modified: head/deskutils/kdepim4/pkg-plist ============================================================================== --- head/deskutils/kdepim4/pkg-plist Wed Jun 22 17:30:57 2016 (r417327) +++ head/deskutils/kdepim4/pkg-plist Wed Jun 22 18:57:33 2016 (r417328) @@ -161,58 +161,61 @@ lib/kde4/plugins/designer/pimcommonwidge 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 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 Modified: head/deskutils/kdepimlibs4/Makefile ============================================================================== --- head/deskutils/kdepimlibs4/Makefile Wed Jun 22 17:30:57 2016 (r417327) +++ head/deskutils/kdepimlibs4/Makefile Wed Jun 22 18:57:33 2016 (r417328) @@ -2,10 +2,10 @@ # $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 Modified: head/deskutils/kdepimlibs4/distinfo ============================================================================== --- head/deskutils/kdepimlibs4/distinfo Wed Jun 22 17:30:57 2016 (r417327) +++ head/deskutils/kdepimlibs4/distinfo Wed Jun 22 18:57:33 2016 (r417328) @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/kdepimlibs-4.14.3.tar.xz) = 65edb1bec191be1b6f8450dc71eadae734f4ab0585aab0a885207390399868d7 -SIZE (KDE/4.14.3/kdepimlibs-4.14.3.tar.xz) = 2790888 +TIMESTAMP = 1465935711 +SHA256 (KDE/4.14.10/kdepimlibs-4.14.10.tar.xz) = c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2 +SIZE (KDE/4.14.10/kdepimlibs-4.14.10.tar.xz) = 2831160 Modified: head/deskutils/kdepimlibs4/pkg-plist ============================================================================== --- head/deskutils/kdepimlibs4/pkg-plist Wed Jun 22 17:30:57 2016 (r417327) +++ head/deskutils/kdepimlibs4/pkg-plist Wed Jun 22 18:57:33 2016 (r417328) @@ -162,11 +162,13 @@ include/kde4/KDE/KABC/ContactGroup 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/tag.h 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/addressee.h 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/akonadiwidgets 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 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 Modified: head/graphics/okular/files/patch-OkularConfig.cmake ============================================================================== --- head/graphics/okular/files/patch-OkularConfig.cmake Wed Jun 22 17:30:57 2016 (r417327) +++ head/graphics/okular/files/patch-OkularConfig.cmake Wed Jun 22 18:57:33 2016 (r417328) @@ -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 Modified: head/sysutils/baloo/Makefile ============================================================================== --- head/sysutils/baloo/Makefile Wed Jun 22 17:30:57 2016 (r417327) +++ head/sysutils/baloo/Makefile Wed Jun 22 18:57:33 2016 (r417328) @@ -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} Modified: head/sysutils/baloo/pkg-plist ============================================================================== --- head/sysutils/baloo/pkg-plist Wed Jun 22 17:30:57 2016 (r417327) +++ head/sysutils/baloo/pkg-plist Wed Jun 22 18:57:33 2016 (r417328) @@ -49,19 +49,19 @@ lib/kde4/krunner_baloosearchrunner.so 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 Modified: head/sysutils/kfilemetadata/pkg-plist ============================================================================== --- head/sysutils/kfilemetadata/pkg-plist Wed Jun 22 17:30:57 2016 (r417327) +++ head/sysutils/kfilemetadata/pkg-plist Wed Jun 22 18:57:33 2016 (r417328) @@ -21,7 +21,7 @@ lib/kde4/kfilemetadata_popplerextractor. 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 Modified: head/sysutils/ksysguardd/Makefile ============================================================================== --- head/sysutils/ksysguardd/Makefile Wed Jun 22 17:30:57 2016 (r417327) +++ head/sysutils/ksysguardd/Makefile Wed Jun 22 18:57:33 2016 (r417328) @@ -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" \ Modified: head/sysutils/nepomuk-core/Makefile ============================================================================== --- head/sysutils/nepomuk-core/Makefile Wed Jun 22 17:30:57 2016 (r417327) +++ head/sysutils/nepomuk-core/Makefile Wed Jun 22 18:57:33 2016 (r417328) @@ -1,3 +1,4 @@ +# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org> # $FreeBSD$ PORTNAME= nepomuk-core Modified: head/sysutils/nepomuk-core/pkg-plist ============================================================================== --- head/sysutils/nepomuk-core/pkg-plist Wed Jun 22 17:30:57 2016 (r417327) +++ head/sysutils/nepomuk-core/pkg-plist Wed Jun 22 18:57:33 2016 (r417328) @@ -134,11 +134,11 @@ lib/kde4/nepomuktaglibextractor.so 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 Modified: head/sysutils/nepomuk-widgets/pkg-plist ============================================================================== --- head/sysutils/nepomuk-widgets/pkg-plist Wed Jun 22 17:30:57 2016 (r417327) +++ head/sysutils/nepomuk-widgets/pkg-plist Wed Jun 22 18:57:33 2016 (r417328) @@ -9,4 +9,4 @@ lib/cmake/NepomukWidgets/NepomukWidgetsT 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%% Modified: head/x11/kde4-workspace/Makefile ============================================================================== --- head/x11/kde4-workspace/Makefile Wed Jun 22 17:30:57 2016 (r417327) +++ head/x11/kde4-workspace/Makefile Wed Jun 22 18:57:33 2016 (r417328) @@ -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-on: post-install-GSTREAMER-off: @${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE} @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/x11/kde4-workspace/distinfo ============================================================================== --- head/x11/kde4-workspace/distinfo Wed Jun 22 17:30:57 2016 (r417327) +++ head/x11/kde4-workspace/distinfo Wed Jun 22 18:57:33 2016 (r417328) @@ -1,2 +1,3 @@ -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 +TIMESTAMP = 1466144753 +SHA256 (KDE/4.11.21/kde-workspace-4.11.21.tar.xz) = 7196c68802af335b15a3b8e14c55a15ed7c2c0e9145a047dc6d4a281fe7f7c8f +SIZE (KDE/4.11.21/kde-workspace-4.11.21.tar.xz) = 13550508 Modified: head/x11/kde4-workspace/pkg-plist ============================================================================== --- head/x11/kde4-workspace/pkg-plist Wed Jun 22 17:30:57 2016 (r417327) +++ head/x11/kde4-workspace/pkg-plist Wed Jun 22 18:57:33 2016 (r417328) @@ -336,7 +336,7 @@ lib/kde4/powerdevilrunscriptaction_confi 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-netbook.so 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 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 Modified: head/x11/kdelibs4/Makefile ============================================================================== --- head/x11/kdelibs4/Makefile Wed Jun 22 17:30:57 2016 (r417327) +++ head/x11/kdelibs4/Makefile Wed Jun 22 18:57:33 2016 (r417328) @@ -2,10 +2,10 @@ # $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 @@ COMMENT= Base set of libraries needed by 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 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hi 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 @@ CMAKE_ARGS+= -DWITH_ACL:BOOL=Off \ -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 @@ SHEBANG_FILES= kdecore/kconfig_compiler/ 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 \ Modified: head/x11/kdelibs4/distinfo ============================================================================== --- head/x11/kdelibs4/distinfo Wed Jun 22 17:30:57 2016 (r417327) +++ head/x11/kdelibs4/distinfo Wed Jun 22 18:57:33 2016 (r417328) @@ -1,2 +1,3 @@ -SHA256 (KDE/4.14.3/kdelibs-4.14.3.tar.xz) = f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e -SIZE (KDE/4.14.3/kdelibs-4.14.3.tar.xz) = 11600500 +TIMESTAMP = 1465934303 +SHA256 (KDE/4.14.10/kdelibs-4.14.10.tar.xz) = 00f5a7bdb0b2bcb786ea630844c639ebe89c45eb1e88443dde421baa0895ca94 +SIZE (KDE/4.14.10/kdelibs-4.14.10.tar.xz) = 11644204 Modified: head/x11/kdelibs4/files/patch-mimetypes_kde.xml ============================================================================== --- head/x11/kdelibs4/files/patch-mimetypes_kde.xml Wed Jun 22 17:30:57 2016 (r417327) +++ head/x11/kdelibs4/files/patch-mimetypes_kde.xml Wed Jun 22 18:57:33 2016 (r417328) @@ -1,5 +1,5 @@ ---- mimetypes/kde.xml.orig 2014-08-21 16:18:35.265799343 +0200 -+++ mimetypes/kde.xml 2014-08-21 16:24:17.444776007 +0200 +--- mimetypes/kde.xml.orig 2016-06-14 20:05:36.032272000 +0000 ++++ mimetypes/kde.xml 2016-06-14 20:10:12.125459000 +0000 @@ -13,64 +13,6 @@ the mime type there. --> @@ -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> @@ -132,7 +132,7 @@ <mime-type type="application/x-plasma"> <sub-class-of type="application/zip"/> <comment>plasmoid</comment> -@@ -1544,9 +1426,6 @@ +@@ -1546,9 +1428,6 @@ <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 @@ +@@ -3462,236 +3341,6 @@ <glob pattern="*.wmp"/> </mime-type> @@ -379,7 +379,7 @@ <!-- http://www4.wiwiss.fu-berlin.de/bizer/TriG/ --> <!-- Used in Nepomuk to encode almost all ontologies --> <mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info" type="application/x-trig"> <!-- fdo #18089 --> -@@ -4213,121 +3862,4 @@ +@@ -3872,123 +3521,4 @@ </magic> <glob pattern="*.pic"/> </mime-type> @@ -415,6 +415,7 @@ - <comment xml:lang="nb">FIl for Qt oppmerkingsspråk</comment> - <comment xml:lang="nds">Qt-Schriftsatzspraakdatei</comment> - <comment xml:lang="nl">Qt Markup Language-bestand</comment> +- <comment xml:lang="nn">Fil for Qt-oppmerkingsspråk</comment> - <comment xml:lang="pl">Plik języka znaczników dla Qt</comment> - <comment xml:lang="pt">Ficheiro na Qt Markup Language</comment> - <comment xml:lang="pt_BR">Arquivo da Qt Markup Language</comment> @@ -470,6 +471,7 @@ - <comment xml:lang="nb">Mobipocket e-bok</comment> - <comment xml:lang="nds">E-Book för Mobipocket</comment> - <comment xml:lang="nl">Mobipocket e-book</comment> +- <comment xml:lang="nn">Mobipocket e-bøk</comment> - <comment xml:lang="pl">Mobipocket e-book</comment> - <comment xml:lang="pt">E-Book do Mobipocket</comment> - <comment xml:lang="pt_BR">E-book do Mobipocket</comment> Modified: head/x11/kdelibs4/pkg-plist ============================================================================== --- head/x11/kdelibs4/pkg-plist Wed Jun 22 17:30:57 2016 (r417327) +++ head/x11/kdelibs4/pkg-plist Wed Jun 22 18:57:33 2016 (r417328) @@ -2002,23 +2002,23 @@ lib/kde4/plugins/kauth/backend/kauth_bac 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_kio_http_cache_cleaner.s 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%% *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606221857.u5MIvX6E041225>