13 files changed, 27 insertions, 36 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 0c69fb6321cd..54897f73604e 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	0
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index a52b178dae06..03eb0c918fd2 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.4.3.tar.bz2) = 862ad8f17c0b2122a79c7d709a5ff5f3
-SHA256 (KDE/kdeutils-4.4.3.tar.bz2) = e5912b86c10ef6cd34647368f0fa6ff233324c396ee4afd8deeef06d257dccfa
-SIZE (KDE/kdeutils-4.4.3.tar.bz2) = 2692041
+MD5 (KDE/kdeutils-4.4.4.tar.bz2) = f09331f3a3b1afcf489726cc9f31a186
+SHA256 (KDE/kdeutils-4.4.4.tar.bz2) = ac201c3f3bd6bcda0c4b027ba6ba6e850af7a577b7be4e507e66560ecc50b7ed
+SIZE (KDE/kdeutils-4.4.4.tar.bz2) = 2693100
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
index 3e460fbae774..78a38a4e722b 100644
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-runtime-4.4.3.tar.bz2) = 6da3646063137eaadd5bfd90bcf46942
-SHA256 (KDE/kdepim-runtime-4.4.3.tar.bz2) = 6fd407f29abaf256cfca5b2c4fdd44be90e3f6bfc94d804e62df09be52ff0a89
-SIZE (KDE/kdepim-runtime-4.4.3.tar.bz2) = 631587
+MD5 (KDE/kdepim-runtime-4.4.4.tar.bz2) = 63dff808a6a6d4b4467fddd3bfbfc0da
+SHA256 (KDE/kdepim-runtime-4.4.4.tar.bz2) = 3071af7aaae0cf6e8a225546658a90fcb6f003bb917b47fcdf0f5856bb6177c5
+SIZE (KDE/kdepim-runtime-4.4.4.tar.bz2) = 632556
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 5c060000c59c..4aabc824ff58 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -32,9 +32,6 @@ QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 USE_OPENLDAP=	yes
 MAKE_JOBS_SAFE=	yes
 
-#fix build when kdepim3 is here
-CMAKE_ARGS+=	-DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
-
 MAN1=		kabcclient.1
 
 #OPTIONS=	KITCHENSYNC "PIM synchronization utility" off
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index b807416adab0..9018b894706d 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.4.3.tar.bz2) = c3edd9da3d626d19936f92b5da81677c
-SHA256 (KDE/kdepim-4.4.3.tar.bz2) = 0ad3a23d98932a1fe966a91e79d8b795978a604ccc17529a101c2674034ef952
-SIZE (KDE/kdepim-4.4.3.tar.bz2) = 9355438
+MD5 (KDE/kdepim-4.4.4.tar.bz2) = aae69bbf54ffac3563f19a72b06f60b3
+SHA256 (KDE/kdepim-4.4.4.tar.bz2) = 5bee3471a5b467775ec8b6201bd91a14a38de651e83c30e957720292d1596218
+SIZE (KDE/kdepim-4.4.4.tar.bz2) = 9354818
diff --git a/deskutils/kdepim44-runtime/distinfo b/deskutils/kdepim44-runtime/distinfo
index 3e460fbae774..78a38a4e722b 100644
--- a/deskutils/kdepim44-runtime/distinfo
+++ b/deskutils/kdepim44-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-runtime-4.4.3.tar.bz2) = 6da3646063137eaadd5bfd90bcf46942
-SHA256 (KDE/kdepim-runtime-4.4.3.tar.bz2) = 6fd407f29abaf256cfca5b2c4fdd44be90e3f6bfc94d804e62df09be52ff0a89
-SIZE (KDE/kdepim-runtime-4.4.3.tar.bz2) = 631587
+MD5 (KDE/kdepim-runtime-4.4.4.tar.bz2) = 63dff808a6a6d4b4467fddd3bfbfc0da
+SHA256 (KDE/kdepim-runtime-4.4.4.tar.bz2) = 3071af7aaae0cf6e8a225546658a90fcb6f003bb917b47fcdf0f5856bb6177c5
+SIZE (KDE/kdepim-runtime-4.4.4.tar.bz2) = 632556
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 5c060000c59c..4aabc824ff58 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -32,9 +32,6 @@ QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 USE_OPENLDAP=	yes
 MAKE_JOBS_SAFE=	yes
 
-#fix build when kdepim3 is here
-CMAKE_ARGS+=	-DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
-
 MAN1=		kabcclient.1
 
 #OPTIONS=	KITCHENSYNC "PIM synchronization utility" off
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index b807416adab0..9018b894706d 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.4.3.tar.bz2) = c3edd9da3d626d19936f92b5da81677c
-SHA256 (KDE/kdepim-4.4.3.tar.bz2) = 0ad3a23d98932a1fe966a91e79d8b795978a604ccc17529a101c2674034ef952
-SIZE (KDE/kdepim-4.4.3.tar.bz2) = 9355438
+MD5 (KDE/kdepim-4.4.4.tar.bz2) = aae69bbf54ffac3563f19a72b06f60b3
+SHA256 (KDE/kdepim-4.4.4.tar.bz2) = 5bee3471a5b467775ec8b6201bd91a14a38de651e83c30e957720292d1596218
+SIZE (KDE/kdepim-4.4.4.tar.bz2) = 9354818
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 375fa0ef46e5..62ed358f6ec3 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 5c81d4cc1a72..4c33a43123d9 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepimlibs-4.4.3.tar.bz2) = 4a1b1a0bb6b50ac55fe9572f3ce30044
-SHA256 (KDE/kdepimlibs-4.4.3.tar.bz2) = 8cac1460933ccf510d21728f716da578ba70ed4d7a9d1f374dbe296627ff25e1
-SIZE (KDE/kdepimlibs-4.4.3.tar.bz2) = 2431773
+MD5 (KDE/kdepimlibs-4.4.4.tar.bz2) = e92bc0f16a919d7ea9e9c4ae47418fde
+SHA256 (KDE/kdepimlibs-4.4.4.tar.bz2) = eeba661df37296f8cb4d1ae7cdc9395d052b7f267a3c118805e24b2a8fc47d04
+SIZE (KDE/kdepimlibs-4.4.4.tar.bz2) = 2431546
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index c9977efdf82d..3c82edc4f8e4 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Extra plasmoids for KDE4
 
 BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2
-LIB_DEPENDS=	kipi.7:${PORTSDIR}/graphics/kdegraphics4
+LIB_DEPENDS=	kipi.7:${PORTSDIR}/graphics/kdegraphics4 \
+		qalculate.5:${PORTSDIR}/math/libqalculate
 
 USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
 KDE4_BUILDENV=	yes
@@ -37,7 +38,7 @@ OPTIONS=	MARBLE "Marble globe wallpaper for Plasma" on \
 .if defined(WITHOUT_MARBLE)
 PLIST_SUB+=	MARBLE="@comment "
 .else
-LIB_DEPENDS+=	marblewidget.5:${PORTSDIR}/misc/kdeedu4
+LIB_DEPENDS+=	marblewidget.5:${PORTSDIR}/astro/marble
 PLIST_SUB+=	MARBLE=""
 .endif
 
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index a41fdfed14b6..b261b39c5b77 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeplasma-addons-4.4.3.tar.bz2) = e347d1ca1f1e3100e838287365de43e4
-SHA256 (KDE/kdeplasma-addons-4.4.3.tar.bz2) = 275d60b32ffa878be97ccd34070ee23e89c6642ba39a4dd4b11c210c3a39f902
-SIZE (KDE/kdeplasma-addons-4.4.3.tar.bz2) = 1645196
+MD5 (KDE/kdeplasma-addons-4.4.4.tar.bz2) = 143a792dbbbef01ae94e652239b1fe57
+SHA256 (KDE/kdeplasma-addons-4.4.4.tar.bz2) = 4db454b2ee83985afb368a4011ddec860cbdc0490d3bed3c823eb44451a2b45e
+SIZE (KDE/kdeplasma-addons-4.4.4.tar.bz2) = 1645647
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index cbeb4bce0314..1c837745ec62 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -304,6 +304,7 @@ share/icons/hicolor/128x128/apps/bball.png
 share/icons/hicolor/128x128/apps/lancelot-part.png
 share/icons/hicolor/128x128/apps/lancelot.png
 share/icons/hicolor/128x128/apps/previewer.png
+share/icons/hicolor/128x128/apps/qalculate-applet.png
 share/icons/hicolor/16x16/apps/bball.png
 %%OBSERVATORY%%share/icons/hicolor/16x16/apps/kdeobservatory.png
 share/icons/hicolor/16x16/apps/lancelot-part.png
@@ -323,6 +324,7 @@ share/icons/hicolor/48x48/apps/bball.png
 share/icons/hicolor/48x48/apps/lancelot-part.png
 share/icons/hicolor/48x48/apps/lancelot.png
 share/icons/hicolor/48x48/apps/previewer.png
+share/icons/hicolor/48x48/apps/qalculate-applet.png
 share/icons/hicolor/64x64/apps/bball.png
 %%OBSERVATORY%%share/icons/hicolor/64x64/apps/kdeobservatory.png
 share/icons/hicolor/64x64/apps/lancelot-part.png
@@ -332,8 +334,6 @@ share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
 share/icons/hicolor/scalable/apps/bball.svgz
 share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
 %%OBSERVATORY%%share/icons/hicolor/scalable/apps/kdeobservatory.svgz
-share/icons/oxygen/128x128/apps/qalculate-applet.png
-share/icons/oxygen/48x48/apps/qalculate-applet.png
 share/kde4/services/ServiceMenus/preview.desktop
 share/kde4/services/apodprovider.desktop
 share/kde4/services/browserhistory.desktop
@@ -422,8 +422,8 @@ share/mime/packages/lancelotpart-mime.xml
 @dirrm share/apps/plasma_wallpaper_pattern/patterns
 @dirrm share/apps/plasma_wallpaper_pattern
 @dirrm share/apps/plasma_pastebin
-@dirrm share/apps/plasma-applet-opendesktop
 @dirrm share/apps/plasma-applet-opendesktop-activities
+@dirrm share/apps/plasma-applet-opendesktop
 @dirrm share/apps/plasma-applet-frame
 @dirrm share/apps/lancelot
 @dirrm share/apps/desktoptheme/slim-glow/lancelot
@@ -446,8 +446,6 @@ share/mime/packages/lancelotpart-mime.xml
 @dirrmtry share/apps/desktoptheme/Clean-Bend
 @dirrm share/apps/desktoptheme/Aya/lancelot
 @dirrmtry share/apps/desktoptheme/Aya
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
 @dirrm share/apps/bball
 @dirrm include/lancelot/widgets
 @dirrm include/lancelot/models