KDE/FreeBSD team presents KDE SC 4.10.1 ports!

- kdegames4 port has been split.
- kdeutils4-printer-applet and system-config-printer-kde have been
  replaced by print/kde4-print-manager.
- Recover misc/kde4-l10n-mr from attic.
- New USE_KDE4 components: kactivities, libkdegames, nepomuk-core,
  and nepomuk-widgets.
- Provide sharedmime component with magic: ports don't need to
  run update-mime-database themselves now.
- Switch some ports to out-of-source build.
- Update port comments.
- Adjust dependence on Qt4 components.
- x11/kde4 installs modern kdepim4 now.
- Remove redundant aspell and hspell from kdelibs4, both
  can be enabled in textproc/enchant if needed.
- Remove stale bits from bsd.kde4.mk

The area51 repository features commits by Schaich Alonso and myself.

Contributors:
- Tobias Berner

5 files changed, 28 insertions, 30 deletions

diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index ca7415724e57..754c30bbd6f3 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
@@ -23,15 +23,15 @@ RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runt
 LATEST_LINK=	${PORTNAME}4
 CONFLICTS_INSTALL=	kdepim-4.4.*
 
-USE_XZ=	yes
+USE_XZ=		yes
 USE_GNOME=	libxml2
 USE_ICONV=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix pimlibs \
-		akonadi automoc4 ontologies soprano strigi
+		akonadi automoc4 ontologies soprano strigi nepomuk-widgets
 USES=		cmake:outsource
 USE_OPENLDAP=	yes
-USE_QT4=	dbus designer gui network \
-		qt3support script sql webkit xml \
+USE_QT4=	corelib dbus declarative designer_build gui network opengl \
+		script sql webkit \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11 xscrnsaver
 CMAKE_ARGS+=	-DKDEPIM_BUILD_MOBILE:BOOL=FALSE
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index b8464b053fa6..7c4db655a569 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-4.9.5.tar.xz) = e873b9cef574db851cd0341073215412a08a6832c1a32a2ef1b3f94fa45bcd6e
-SIZE (KDE/kdepim-4.9.5.tar.xz) = 13942832
+SHA256 (KDE/4.10.1/kdepim-4.10.1.tar.xz) = 7b06ceed9e964dbef9fb801406dd44126363069cc89cb3ceb30ae271ea94515a
+SIZE (KDE/4.10.1/kdepim-4.10.1.tar.xz) = 14032628
diff --git a/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt b/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt
index 3710688f8e97..2a1de2975b97 100644
--- a/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt
+++ b/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt
@@ -1,10 +1,10 @@
---- kleopatra/CMakeLists.txt.orig	2012-11-30 08:38:45.000000000 +0100
-+++ kleopatra/CMakeLists.txt	2013-01-15 21:05:47.000000000 +0100
-@@ -365,6 +365,7 @@
- endif(KDEPIM_MOBILE_UI)
- 
- add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
-+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
+--- kleopatra/CMakeLists.txt.orig	2013-01-23 22:57:35.000000000 +0100
++++ kleopatra/CMakeLists.txt	2013-03-01 16:49:52.000000000 +0100
+@@ -361,6 +361,7 @@
+ endif()
  
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5151)
++add_definitions(-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
  
  kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
+ 
diff --git a/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt b/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt
index ab88fcdd6b5a..ea8e8cd349b4 100644
--- a/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt
+++ b/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt
@@ -1,10 +1,11 @@
 --- ./messageviewer/CMakeLists.txt.orig	2012-08-25 03:26:14.357593951 +0200
 +++ ./messageviewer/CMakeLists.txt	2012-08-25 03:26:19.147594463 +0200
-@@ -17,7 +17,6 @@
+@@ -17,7 +17,7 @@
  
  configure_file(messageviewer.kcfg.cmake ${CMAKE_CURRENT_BINARY_DIR}/messageviewer.kcfg)
  
 -check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
++add_definitions(-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
  macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H)
  configure_file(config-messageviewer.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-messageviewer.h)
  
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index aeb504396ead..0dac9e1a6c18 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -3,7 +3,6 @@ bin/akonadi_mailfilter_agent
 bin/akonadiconsole
 bin/akregator
 bin/akregatorstorageexporter
-bin/backupmail
 bin/blogilo
 bin/ical2vcal
 bin/importwizard
@@ -33,6 +32,7 @@ bin/ksendemail
 bin/ktimetracker
 bin/ktnef
 bin/kwatchgnupg
+bin/pimsettingexporter
 etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
 lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
 lib/kde4/akregator_config_advanced.so
@@ -74,7 +74,6 @@ lib/kde4/kontact_kmailplugin.so
 lib/kde4/kontact_knodeplugin.so
 lib/kde4/kontact_knotesplugin.so
 lib/kde4/kontact_korganizerplugin.so
-lib/kde4/kontact_ktimetrackerplugin.so
 lib/kde4/kontact_specialdatesplugin.so
 lib/kde4/kontact_summaryplugin.so
 lib/kde4/kontact_todoplugin.so
@@ -187,6 +186,9 @@ lib/libmessagelist.so.5.0.1
 lib/libmessageviewer.so
 lib/libmessageviewer.so.5
 lib/libmessageviewer.so.5.0.1
+lib/libpimcommon.so
+lib/libpimcommon.so.5
+lib/libpimcommon.so.5.0.1
 lib/libtemplateparser.so
 lib/libtemplateparser.so.5
 lib/libtemplateparser.so.5.0.1
@@ -230,7 +232,6 @@ share/apps/akregator/pageviewer.rc
 share/apps/akregator/pics/kmmsgnew.png
 share/apps/akregator/pics/kmmsgunseen.png
 share/apps/akregator_sharemicroblog_plugin/akregator_sharemicroblog_plugin.rc
-share/apps/backupmail/backupmail.rc
 share/apps/blogilo/TextEditorInitialHtml
 share/apps/blogilo/blogiloui.rc
 share/apps/desktoptheme/default/widgets/stickynote.svgz
@@ -314,10 +315,6 @@ share/apps/kleopatra/pics/kleopatra_splashscreen.png
 share/apps/kleopatra/pics/kleopatra_splashscreen.svgz
 share/apps/kleopatra/pics/kleopatra_wizard.png
 share/apps/kleopatra/pics/kleopatra_wizard.svgz
-share/apps/kmail/pics/key.png
-share/apps/kmail/pics/key_bad.png
-share/apps/kmail/pics/key_ok.png
-share/apps/kmail/pics/key_unknown.png
 share/apps/kmail2/about/kmail.css
 share/apps/kmail2/about/main.html
 share/apps/kmail2/about/top-left-kmail.png
@@ -326,6 +323,10 @@ share/apps/kmail2/kmail_part.rc
 share/apps/kmail2/kmcomposerui.rc
 share/apps/kmail2/kmmainwin.rc
 share/apps/kmail2/kmreadermainwin.rc
+share/apps/kmail2/pics/key.png
+share/apps/kmail2/pics/key_bad.png
+share/apps/kmail2/pics/key_ok.png
+share/apps/kmail2/pics/key_unknown.png
 share/apps/kmail2/pics/kmwizard.png
 share/apps/kmail2/pics/mail-deleted.png
 share/apps/kmail2/pics/mail-thread-ignored.png
@@ -374,10 +375,8 @@ share/apps/kontact/ksettingsdialog/kmail.setdlg
 share/apps/kontact/ksettingsdialog/knode.setdlg
 share/apps/kontact/ksettingsdialog/knotes.setdlg
 share/apps/kontact/ksettingsdialog/korganizer.setdlg
-share/apps/kontact/ksettingsdialog/ktimetracker.setdlg
 share/apps/kontact/ksettingsdialog/specialdates.setdlg
 share/apps/kontact/ksettingsdialog/summary.setdlg
-share/apps/kontact/ktimetrackerui.rc
 share/apps/kontactsummary/kontactsummary_part.rc
 share/apps/korgac/icons/hicolor/128x128/apps/korgac.png
 share/apps/korgac/icons/hicolor/16x16/apps/korgac.png
@@ -478,6 +477,7 @@ share/apps/messageviewer/plugins/bodypartformatter/application_ms-tnef.desktop
 share/apps/messageviewer/plugins/bodypartformatter/text_calendar.desktop
 share/apps/messageviewer/plugins/bodypartformatter/text_vcard.desktop
 share/apps/messageviewer/plugins/bodypartformatter/text_xdiff.desktop
+share/apps/pimsettingexporter/pimsettingexporter.rc
 share/autostart/kalarm.autostart.desktop
 share/autostart/korgac.desktop
 share/config.kcfg/akregator.kcfg
@@ -921,7 +921,6 @@ share/kde4/services/kontact/kmailplugin.desktop
 share/kde4/services/kontact/knodeplugin.desktop
 share/kde4/services/kontact/knotesplugin.desktop
 share/kde4/services/kontact/korganizerplugin.desktop
-share/kde4/services/kontact/ktimetracker_plugin.desktop
 share/kde4/services/kontact/specialdatesplugin.desktop
 share/kde4/services/kontact/summaryplugin.desktop
 share/kde4/services/kontact/todoplugin.desktop
@@ -990,6 +989,7 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
 @dirrm share/doc/HTML/en/kabcclient
 @dirrm share/doc/HTML/en/blogilo
 @dirrm share/doc/HTML/en/akregator
+@dirrm share/apps/pimsettingexporter
 @dirrm share/apps/messageviewer/plugins/bodypartformatter
 @dirrm share/apps/messageviewer/plugins
 @dirrm share/apps/messageviewer/about
@@ -1053,8 +1053,6 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
 @dirrm share/apps/kmail2/pics
 @dirrm share/apps/kmail2/about
 @dirrm share/apps/kmail2
-@dirrm share/apps/kmail/pics
-@dirrm share/apps/kmail
 @dirrm share/apps/kleopatra/pics
 @dirrm share/apps/kleopatra
 @dirrm share/apps/kjots/themes/xml_output
@@ -1077,14 +1075,13 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
 @dirrm share/apps/kaddressbook/printing
 @dirrm share/apps/kaddressbook
 @dirrm share/apps/blogilo
-@dirrm share/apps/backupmail
 @dirrm share/apps/akregator_sharemicroblog_plugin
-@dirrm share/apps/akonadi_mailfilter_agent
-@dirrm share/apps/akonadi_archivemail_agent
 @dirrmtry share/apps/akregator/pics
 @dirrm share/apps/akregator/about
 @dirrmtry share/apps/akregator
 @dirrmtry share/apps/akonadiconsole
+@dirrm share/apps/akonadi_mailfilter_agent
+@dirrm share/apps/akonadi_archivemail_agent
 @dirrmtry share/apps/akonadi/contact
 @dirrmtry share/akonadi/agents
 @dirrmtry share/akonadi