KDE/FreeBSD team presents KDE SC 4.9.5 ports!

- kdebindings ports have been renamed to match upstream.
- kdemultimedia and kdenetwork have been split.
- New port games/pairs added.
- Trim Makefile header
- Convert to new option framework
- New USE_KDE4 components: libkcddb, libkcompactdisc
- Update:
	databases/akonadi to 1.9.0
	devel/grantlee to 0.3.0
	textproc/rasqal to 0.9.30
	textproc/redland-bindings to 1.0.16.1
	textproc/soprano to 2.9.0
	x11-toolkits/attica to 0.4.1

The area51 repository features commits by Schaich Alonso, avilla, dbn,
jhale, makc and rakuco.

Contributors:
- Oleg Sidorkin
- Tobias Berner
- Kurt Jaeger

6 files changed, 53 insertions, 22 deletions

diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index b1b391a1e9ac..63ea5838775d 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -12,11 +11,11 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
-		assuan.0:${PORTSDIR}/security/libassuan \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
+		assuan:${PORTSDIR}/security/libassuan \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
-		grantlee_gui.0:${PORTSDIR}/devel/grantlee \
+		grantlee_gui:${PORTSDIR}/devel/grantlee \
 		clucene-core:${PORTSDIR}/textproc/clucene
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 439745425abd..b8464b053fa6 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-4.8.4.tar.xz) = ce21f36563fd2c71f65a3e8c495252084de782d23f2ef7fbae0e8ef78cc08e60
-SIZE (KDE/kdepim-4.8.4.tar.xz) = 14614276
+SHA256 (KDE/kdepim-4.9.5.tar.xz) = e873b9cef574db851cd0341073215412a08a6832c1a32a2ef1b3f94fa45bcd6e
+SIZE (KDE/kdepim-4.9.5.tar.xz) = 13942832
diff --git a/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt b/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt
new file mode 100644
index 000000000000..3710688f8e97
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-kleopatra__CMakeLists.txt
@@ -0,0 +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 )
+ 
+ 
+ kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
diff --git a/deskutils/kdepim4/files/patch-kmail__avscripts__kmail_clamav.sh b/deskutils/kdepim4/files/patch-kmail__avscripts__kmail_clamav.sh
deleted file mode 100644
index 76185fcc74e2..000000000000
--- a/deskutils/kdepim4/files/patch-kmail__avscripts__kmail_clamav.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kmail/avscripts/kmail_clamav.sh.orig	2008-01-15 04:57:51.000000000 +0300
-+++ ./kmail/avscripts/kmail_clamav.sh	2010-03-27 01:28:30.548465474 +0300
-@@ -35,7 +35,7 @@
- cat > $TEMPFILE
- 
- # check for a running daemon
--if [ "`ps -eo comm|grep clamd`" = "clamd" ]; then
-+if [ "`ps -axo comm|grep clamd`" = "clamd" ]; then
-     chmod a+r $TEMPFILE
-     CLAMCOMANDO="clamdscan --stdout --no-summary "
- else
diff --git a/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt b/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt
index a06653e8ebd3..ab88fcdd6b5a 100644
--- a/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt
+++ b/deskutils/kdepim4/files/patch-messageviewer__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ./messageviewer/CMakeLists.txt.orig	2012-08-25 03:19:01.387668126 +0200
-+++ ./messageviewer/CMakeLists.txt	2012-08-25 03:19:18.597652001 +0200
+--- ./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 @@
  
  configure_file(messageviewer.kcfg.cmake ${CMAKE_CURRENT_BINARY_DIR}/messageviewer.kcfg)
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index ada6282fc63d..aeb504396ead 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -1,9 +1,12 @@
+bin/akonadi_archivemail_agent
 bin/akonadi_mailfilter_agent
 bin/akonadiconsole
 bin/akregator
 bin/akregatorstorageexporter
+bin/backupmail
 bin/blogilo
 bin/ical2vcal
+bin/importwizard
 bin/kabc2mutt
 bin/kabcclient
 bin/kaddressbook
@@ -28,6 +31,7 @@ bin/korgac
 bin/korganizer
 bin/ksendemail
 bin/ktimetracker
+bin/ktnef
 bin/kwatchgnupg
 etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
 lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
@@ -168,6 +172,9 @@ lib/libksieveui.so.5.0.1
 lib/libmailcommon.so
 lib/libmailcommon.so.5
 lib/libmailcommon.so.5.0.1
+lib/libmailimporter.so
+lib/libmailimporter.so.5
+lib/libmailimporter.so.5.0.1
 lib/libmessagecomposer.so
 lib/libmessagecomposer.so.5
 lib/libmessagecomposer.so.5.0.1
@@ -187,6 +194,7 @@ lib/strigi/strigiea_ctg.so
 lib/strigi/strigiea_ics.so
 lib/strigi/strigiea_mail.so
 lib/strigi/strigiea_vcf.so
+share/akonadi/agents/archivemailagent.desktop
 share/akonadi/agents/mailfilteragent.desktop
 share/applications/kde4/KMail2.desktop
 share/applications/kde4/KNode.desktop
@@ -195,6 +203,7 @@ share/applications/kde4/Kontact.desktop
 share/applications/kde4/akonadiconsole.desktop
 share/applications/kde4/akregator.desktop
 share/applications/kde4/blogilo.desktop
+share/applications/kde4/importwizard.desktop
 share/applications/kde4/kaddressbook.desktop
 share/applications/kde4/kalarm.desktop
 share/applications/kde4/kleopatra.desktop
@@ -206,6 +215,9 @@ share/applications/kde4/kontact-admin.desktop
 share/applications/kde4/korganizer-import.desktop
 share/applications/kde4/korganizer.desktop
 share/applications/kde4/ktimetracker.desktop
+share/applications/kde4/ktnef.desktop
+share/apps/akonadi_archivemail_agent/akonadi_archivemail_agent.notifyrc
+share/apps/akonadi_mailfilter_agent/akonadi_mailfilter_agent.notifyrc
 share/apps/akonadiconsole/akonadiconsoleui.rc
 share/apps/akregator/about/akregator.css
 share/apps/akregator/about/main.html
@@ -218,10 +230,12 @@ 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
 share/apps/kaddressbook/kaddressbookui.rc
+share/apps/kaddressbook/printing/compact-style.png
 share/apps/kaddressbook/printing/detailed-style.png
 share/apps/kaddressbook/printing/mike-style.png
 share/apps/kaddressbook/printing/ringbinder-style.png
@@ -410,6 +424,7 @@ share/apps/ktimetracker/pics/watch-4.xpm
 share/apps/ktimetracker/pics/watch-5.xpm
 share/apps/ktimetracker/pics/watch-6.xpm
 share/apps/ktimetracker/pics/watch-7.xpm
+share/apps/ktnef/ktnefui.rc
 share/apps/kwatchgnupg/kwatchgnupgui.rc
 share/apps/kwatchgnupg/pics/kwatchgnupg.png
 share/apps/kwatchgnupg/pics/kwatchgnupg2.png
@@ -684,6 +699,9 @@ share/doc/HTML/en/ktimetracker/index.cache.bz2
 share/doc/HTML/en/ktimetracker/index.docbook
 share/doc/HTML/en/ktimetracker/ktimetracker.png
 share/doc/HTML/en/ktimetracker/systray.png
+share/doc/HTML/en/ktnef/common
+share/doc/HTML/en/ktnef/index.cache.bz2
+share/doc/HTML/en/ktnef/index.docbook
 share/doc/HTML/en/kwatchgnupg/common
 share/doc/HTML/en/kwatchgnupg/index.cache.bz2
 share/doc/HTML/en/kwatchgnupg/index.docbook
@@ -728,6 +746,8 @@ share/icons/hicolor/16x16/apps/ktimetracker.png
 share/icons/hicolor/22x22/actions/format-text-blockquote.png
 share/icons/hicolor/22x22/actions/format-text-code.png
 share/icons/hicolor/22x22/actions/insert-more-mark.png
+share/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
+share/icons/hicolor/22x22/actions/ktnef_extract_to.png
 share/icons/hicolor/22x22/actions/remove-link.png
 share/icons/hicolor/22x22/actions/upload-media.png
 share/icons/hicolor/22x22/apps/akonadiconsole.png
@@ -782,6 +802,7 @@ share/icons/hicolor/48x48/apps/korg-journal.png
 share/icons/hicolor/48x48/apps/korg-todo.png
 share/icons/hicolor/48x48/apps/korganizer.png
 share/icons/hicolor/48x48/apps/ktimetracker.png
+share/icons/hicolor/48x48/apps/ktnef.png
 share/icons/hicolor/64x64/actions/upload-media.png
 share/icons/hicolor/64x64/apps/akonadiconsole.png
 share/icons/hicolor/64x64/apps/akregator.png
@@ -808,6 +829,10 @@ share/icons/hicolor/scalable/apps/kontact.svgz
 share/icons/hicolor/scalable/apps/korg-journal.svgz
 share/icons/hicolor/scalable/apps/korg-todo.svgz
 share/icons/hicolor/scalable/apps/korganizer.svgz
+share/icons/locolor/16x16/actions/ktnef_extract_all_to.png
+share/icons/locolor/16x16/actions/ktnef_extract_to.png
+share/icons/locolor/16x16/apps/ktnef.png
+share/icons/locolor/32x32/apps/ktnef.png
 share/icons/oxygen/128x128/apps/kalarm.png
 share/icons/oxygen/128x128/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
@@ -876,7 +901,6 @@ share/kde4/services/kmail_config_composer.desktop
 share/kde4/services/kmail_config_identity.desktop
 share/kde4/services/kmail_config_misc.desktop
 share/kde4/services/kmail_config_security.desktop
-share/kde4/services/knewsservice.protocol
 share/kde4/services/knode_config_accounts.desktop
 share/kde4/services/knode_config_appearance.desktop
 share/kde4/services/knode_config_cleanup.desktop
@@ -943,9 +967,14 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
 @dirrm share/kde4/services/kontact
 @dirrmtry share/icons/oxygen/512x512/mimetypes
 @dirrmtry share/icons/oxygen/512x512
-@dirrmtry share/icons/hicolor/256x256/apps
-@dirrmtry share/icons/hicolor/256x256
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16/actions
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
 @dirrm share/doc/HTML/en/kwatchgnupg
+@dirrm share/doc/HTML/en/ktnef
 @dirrm share/doc/HTML/en/ktimetracker
 @dirrm share/doc/HTML/en/korganizer
 @dirrm share/doc/HTML/en/kontact-admin
@@ -973,6 +1002,7 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
 @dirrm share/apps/libkleopatra
 @dirrm share/apps/kwatchgnupg/pics
 @dirrm share/apps/kwatchgnupg
+@dirrm share/apps/ktnef
 @dirrm share/apps/ktimetracker/pics
 @dirrm share/apps/ktimetracker/icons/oxygen/scalable/actions
 @dirrm share/apps/ktimetracker/icons/oxygen/scalable
@@ -1047,7 +1077,10 @@ 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