10 files changed, 36 insertions, 31 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index d1ab65405c28..bd21ac898aaf 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -14,16 +14,16 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
-LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
+LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
-RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
-KDE4_BUILDENV= yes
+KDE4_BUILDENV=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
@@ -34,4 +34,9 @@ MAN1=		ark.1
 post-extract:
 	${MKDIR} ${WRKSRC}
 
+post-patch:
+#disable printer-applet, it comes with print/kdeutils4-printer-applet
+	${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \
+		${WRKSRC}/../CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 076fd4604272..d39e54bf8490 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.2.2.tar.bz2) = 3df5186f9dacddbce48a1c7eb35515cd
-SHA256 (KDE/kdeutils-4.2.2.tar.bz2) = b005a16f5c4cb5ce0a3e2b886f6b5a051d1d2170c013cdc154528a357ac3bb8b
-SIZE (KDE/kdeutils-4.2.2.tar.bz2) = 2376713
+MD5 (KDE/kdeutils-4.2.3.tar.bz2) = 8fddacea28f6c0a6c2ac2462750b7e50
+SHA256 (KDE/kdeutils-4.2.3.tar.bz2) = 154b37701adb4ba7c870020b95621e128c51145ae78aee6cbd181b17cb25a224
+SIZE (KDE/kdeutils-4.2.3.tar.bz2) = 2378200
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index 6fa2d33299a7..bdd61ec32069 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -155,16 +155,16 @@ share/doc/HTML/en/ktimer/two.at.once.png
 share/doc/HTML/en/kwallet/common
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
+share/doc/HTML/en/kwallet/first-open-request.png
 share/doc/HTML/en/kwallet/index.cache.bz2
 share/doc/HTML/en/kwallet/index.docbook
 share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/save-login-information.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
 share/doc/HTML/en/kwallet/openwallet-request.png
 share/doc/HTML/en/kwallet/oxygen48-status-wallet-closed.png
+share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
 share/doc/HTML/en/kwallet/password1.png
-share/doc/HTML/en/kwallet/first-open-request.png
 share/doc/HTML/en/kwallet/password2.png
+share/doc/HTML/en/kwallet/save-login-information.png
 share/doc/HTML/en/okteta/basics.docbook
 share/doc/HTML/en/okteta/common
 share/doc/HTML/en/okteta/credits.docbook
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 1a23b1fcb8d5..0dbb3bf22c44 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.2.2.tar.bz2) = 964208d570845c75e0c482bb3d33892f
-SHA256 (KDE/kdepim-4.2.2.tar.bz2) = a9d1d4acaea5a60163f51379e713609bede9b69534edfb9eaaafafe86becb2f1
-SIZE (KDE/kdepim-4.2.2.tar.bz2) = 12082557
+MD5 (KDE/kdepim-4.2.3.tar.bz2) = 94ad0eb531eb8ca03e3355ea9e2e90d6
+SHA256 (KDE/kdepim-4.2.3.tar.bz2) = a4a938c004271e20bc4573a55620a93a0e076634f2210967f0d6b3b83e48bc79
+SIZE (KDE/kdepim-4.2.3.tar.bz2) = 12131940
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 1a23b1fcb8d5..0dbb3bf22c44 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.2.2.tar.bz2) = 964208d570845c75e0c482bb3d33892f
-SHA256 (KDE/kdepim-4.2.2.tar.bz2) = a9d1d4acaea5a60163f51379e713609bede9b69534edfb9eaaafafe86becb2f1
-SIZE (KDE/kdepim-4.2.2.tar.bz2) = 12082557
+MD5 (KDE/kdepim-4.2.3.tar.bz2) = 94ad0eb531eb8ca03e3355ea9e2e90d6
+SHA256 (KDE/kdepim-4.2.3.tar.bz2) = a4a938c004271e20bc4573a55620a93a0e076634f2210967f0d6b3b83e48bc79
+SIZE (KDE/kdepim-4.2.3.tar.bz2) = 12131940
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 12cacc5bdfa2..46a92f8cf79e 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepimlibs-4.2.2.tar.bz2) = 62562a3025138a08ffdf08e6466b5065
-SHA256 (KDE/kdepimlibs-4.2.2.tar.bz2) = a5effac6724a66fe70711f449fb0472cc60637fec4357f8dbec21d71da9c6692
-SIZE (KDE/kdepimlibs-4.2.2.tar.bz2) = 1594954
+MD5 (KDE/kdepimlibs-4.2.3.tar.bz2) = 0c6f760fd1b3e031254b0a3082396657
+SHA256 (KDE/kdepimlibs-4.2.3.tar.bz2) = e5b5910ea8a432529355e882575efc8984961f9becb8a744defb954689972448
+SIZE (KDE/kdepimlibs-4.2.3.tar.bz2) = 1595636
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 1e21cdcc2697..90da0681b6ae 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeplasma-addons-4.2.2.tar.bz2) = 809887da8ee9f7674761e0f46fa966a2
-SHA256 (KDE/kdeplasma-addons-4.2.2.tar.bz2) = a47479a29b8224fa35997d60e1ca5f3c649888910ae67c0da2162a483f1f22de
-SIZE (KDE/kdeplasma-addons-4.2.2.tar.bz2) = 4275084
+MD5 (KDE/kdeplasma-addons-4.2.3.tar.bz2) = 7f29b7dbb46b5b468fd7867e4907e858
+SHA256 (KDE/kdeplasma-addons-4.2.3.tar.bz2) = b5f6a5933319336cef386a2f52bfbb0e3afeacc4766cab09aa132c662a6f06ae
+SIZE (KDE/kdeplasma-addons-4.2.3.tar.bz2) = 4275320
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index 263c4dfc3a31..13714ef35b44 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	strigi
-PORTVERSION=	0.6.3
-PORTREVISION=	2
+PORTVERSION=	0.6.4
 CATEGORIES=	deskutils
 MASTER_SITES=	SF
 
@@ -24,6 +23,7 @@ USE_GNOME=	libxml2 pkgconfig
 # USE_FAM=	yes
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
+MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	${MKDIR} ${WRKSRC}
diff --git a/deskutils/strigi/distinfo b/deskutils/strigi/distinfo
index eaad360a4348..2e4ffeddc105 100644
--- a/deskutils/strigi/distinfo
+++ b/deskutils/strigi/distinfo
@@ -1,3 +1,3 @@
-MD5 (strigi-0.6.3.tar.bz2) = 56088c25dedacf55cfc11f7ba7c18ba7
-SHA256 (strigi-0.6.3.tar.bz2) = 5671cc0b8e98b59ffd809e59390d420f4650d6a298737af19fb2d32c2ad8fd99
-SIZE (strigi-0.6.3.tar.bz2) = 881044
+MD5 (strigi-0.6.4.tar.bz2) = 324fd9606ac77765501717ff92c04f9a
+SHA256 (strigi-0.6.4.tar.bz2) = 1e07476c3b38dbff6af73e223cf52ff4f8e40a44450f66f87c10323e15df7488
+SIZE (strigi-0.6.4.tar.bz2) = 895552
diff --git a/deskutils/strigi/pkg-plist b/deskutils/strigi/pkg-plist
index a21428c1d0d2..7c39c3aa1ca1 100644
--- a/deskutils/strigi/pkg-plist
+++ b/deskutils/strigi/pkg-plist
@@ -55,19 +55,19 @@ include/strigi/textutils.h
 include/strigi/variant.h
 lib/libsearchclient.so
 lib/libsearchclient.so.0
-lib/libsearchclient.so.0.6.3
+lib/libsearchclient.so.0.6.4
 lib/libstreamanalyzer.so
 lib/libstreamanalyzer.so.0
-lib/libstreamanalyzer.so.0.6.3
+lib/libstreamanalyzer.so.0.6.4
 lib/libstreams.so
 lib/libstreams.so.0
-lib/libstreams.so.0.6.3
+lib/libstreams.so.0.6.4
 lib/libstrigihtmlgui.so
 lib/libstrigihtmlgui.so.0
-lib/libstrigihtmlgui.so.0.6.3
+lib/libstrigihtmlgui.so.0.6.4
 lib/libstrigiqtdbusclient.so
 lib/libstrigiqtdbusclient.so.0
-lib/libstrigiqtdbusclient.so.0.6.3
+lib/libstrigiqtdbusclient.so.0.6.4
 lib/strigi/StrigiConfig.cmake
 lib/strigi/strigiea_jpeg.so
 lib/strigi/strigiindex_clucene.so