summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/ark/Makefile3
-rw-r--r--archivers/ark/distinfo8
-rw-r--r--devel/kdesdk4/Makefile3
-rw-r--r--devel/kdesdk4/PLIST6
-rw-r--r--devel/kdesdk4/distinfo8
-rw-r--r--editors/kate/Makefile3
-rw-r--r--editors/kate/PLIST8
-rw-r--r--editors/kate/distinfo8
-rw-r--r--games/blinken/Makefile3
-rw-r--r--games/blinken/distinfo8
-rw-r--r--games/kanagram/Makefile3
-rw-r--r--games/kanagram/distinfo8
-rw-r--r--games/kdegames4/Makefile3
-rw-r--r--games/kdegames4/PLIST5
-rw-r--r--games/kdegames4/distinfo8
-rw-r--r--games/kdetoys4/Makefile3
-rw-r--r--games/kdetoys4/distinfo8
-rw-r--r--games/khangman/Makefile3
-rw-r--r--games/khangman/distinfo8
-rw-r--r--graphics/gwenview/Makefile3
-rw-r--r--graphics/gwenview/distinfo8
-rw-r--r--graphics/kamera/Makefile3
-rw-r--r--graphics/kamera/distinfo8
-rw-r--r--graphics/kcolorchooser/Makefile3
-rw-r--r--graphics/kcolorchooser/distinfo8
-rw-r--r--graphics/kdegraphics-mobipocket/Makefile3
-rw-r--r--graphics/kdegraphics-mobipocket/distinfo8
-rw-r--r--graphics/kdegraphics-strigi-analyzer/Makefile3
-rw-r--r--graphics/kdegraphics-strigi-analyzer/distinfo8
-rw-r--r--graphics/kdegraphics-thumbnailers/Makefile3
-rw-r--r--graphics/kdegraphics-thumbnailers/distinfo8
-rw-r--r--graphics/kgamma/Makefile3
-rw-r--r--graphics/kgamma/distinfo8
-rw-r--r--graphics/kolourpaint/Makefile3
-rw-r--r--graphics/kolourpaint/distinfo8
-rw-r--r--graphics/kruler/Makefile3
-rw-r--r--graphics/kruler/distinfo8
-rw-r--r--graphics/ksaneplugin/Makefile3
-rw-r--r--graphics/ksaneplugin/distinfo8
-rw-r--r--graphics/ksnapshot/Makefile3
-rw-r--r--graphics/ksnapshot/distinfo8
-rw-r--r--graphics/libkdcraw/Makefile3
-rw-r--r--graphics/libkdcraw/distinfo8
-rw-r--r--graphics/libkexiv2/Makefile3
-rw-r--r--graphics/libkexiv2/distinfo8
-rw-r--r--graphics/libkipi/Makefile3
-rw-r--r--graphics/libkipi/distinfo8
-rw-r--r--graphics/libksane/Makefile3
-rw-r--r--graphics/libksane/distinfo8
-rw-r--r--graphics/oxygen-icons/Makefile7
-rw-r--r--graphics/oxygen-icons/PLIST5
-rw-r--r--graphics/oxygen-icons/distinfo8
-rw-r--r--graphics/svgpart/Makefile3
-rw-r--r--graphics/svgpart/distinfo8
-rw-r--r--math/analitza/Makefile3
-rw-r--r--math/analitza/distinfo8
-rw-r--r--math/cantor/Makefile3
-rw-r--r--math/cantor/distinfo8
-rw-r--r--math/kalgebra/Makefile3
-rw-r--r--math/kalgebra/distinfo8
-rw-r--r--math/kcalc/Makefile3
-rw-r--r--math/kcalc/distinfo8
-rw-r--r--meta-pkgs/kde4/Makefile142
-rw-r--r--meta-pkgs/kde4/Makefile.kde49
-rw-r--r--misc/kaccessible/Makefile3
-rw-r--r--misc/kaccessible/distinfo8
-rw-r--r--misc/kalzium/Makefile3
-rw-r--r--misc/kalzium/distinfo8
-rw-r--r--misc/kbruch/Makefile3
-rw-r--r--misc/kbruch/distinfo8
-rw-r--r--misc/kcharselect/Makefile3
-rw-r--r--misc/kcharselect/distinfo8
-rw-r--r--misc/kde-wallpapers4/Makefile3
-rw-r--r--misc/kde-wallpapers4/distinfo8
-rw-r--r--misc/kdeadmin4/Makefile3
-rw-r--r--misc/kdeadmin4/PLIST16
-rw-r--r--misc/kdeadmin4/distinfo8
-rw-r--r--misc/kdeartwork4/Makefile3
-rw-r--r--misc/kdeartwork4/distinfo8
-rw-r--r--misc/kdepimlibs4/Makefile3
-rw-r--r--misc/kdepimlibs4/distinfo8
-rw-r--r--misc/kdeplasma-addons4/Makefile3
-rw-r--r--misc/kdeplasma-addons4/distinfo8
-rw-r--r--misc/kgeography/Makefile3
-rw-r--r--misc/kgeography/distinfo8
-rw-r--r--misc/kig/Makefile3
-rw-r--r--misc/kig/distinfo8
-rw-r--r--misc/kiten/Makefile3
-rw-r--r--misc/kiten/distinfo8
-rw-r--r--misc/klettres/Makefile3
-rw-r--r--misc/klettres/distinfo8
-rw-r--r--misc/kmag/Makefile3
-rw-r--r--misc/kmag/distinfo8
-rw-r--r--misc/kmousetool/Makefile3
-rw-r--r--misc/kmousetool/distinfo8
-rw-r--r--misc/kmouth/Makefile3
-rw-r--r--misc/kmouth/distinfo8
-rw-r--r--misc/kremotecontrol/Makefile3
-rw-r--r--misc/kremotecontrol/distinfo8
-rw-r--r--misc/kstars/Makefile3
-rw-r--r--misc/kstars/distinfo8
-rw-r--r--misc/ktouch/Makefile3
-rw-r--r--misc/ktouch/distinfo8
-rw-r--r--misc/kturtle/Makefile3
-rw-r--r--misc/kturtle/distinfo8
-rw-r--r--misc/kwordquiz/Makefile3
-rw-r--r--misc/kwordquiz/distinfo8
-rw-r--r--misc/libkdeedu/Makefile3
-rw-r--r--misc/libkdeedu/distinfo8
-rw-r--r--misc/marble/Makefile3
-rw-r--r--misc/marble/distinfo8
-rw-r--r--misc/parley/Makefile3
-rw-r--r--misc/parley/distinfo8
-rw-r--r--misc/rocs/Makefile3
-rw-r--r--misc/rocs/distinfo8
-rw-r--r--misc/step/Makefile3
-rw-r--r--misc/step/distinfo8
-rw-r--r--misc/superkaramba/Makefile3
-rw-r--r--misc/superkaramba/distinfo8
-rw-r--r--misc/sweeper/Makefile3
-rw-r--r--misc/sweeper/distinfo8
-rw-r--r--multimedia/kdemultimedia4/Makefile3
-rw-r--r--multimedia/kdemultimedia4/distinfo8
-rw-r--r--net/kdenetwork4/Makefile3
-rw-r--r--net/kdenetwork4/distinfo8
-rw-r--r--print/okular/Makefile3
-rw-r--r--print/okular/distinfo8
-rw-r--r--print/printer-applet/Makefile3
-rw-r--r--print/printer-applet/distinfo8
-rw-r--r--security/kgpg/Makefile3
-rw-r--r--security/kgpg/distinfo8
-rw-r--r--security/ksecrets/Makefile3
-rw-r--r--security/ksecrets/distinfo8
-rw-r--r--security/kwallet/Makefile3
-rw-r--r--security/kwallet/distinfo8
-rw-r--r--sysutils/filelight/Makefile3
-rw-r--r--sysutils/filelight/distinfo8
-rw-r--r--sysutils/kdf/Makefile3
-rw-r--r--sysutils/kdf/distinfo8
-rw-r--r--sysutils/kfloppy/Makefile3
-rw-r--r--sysutils/kfloppy/distinfo8
-rw-r--r--time/ktimer/Makefile3
-rw-r--r--time/ktimer/distinfo8
-rw-r--r--www/kdewebdev4/Makefile3
-rw-r--r--www/kdewebdev4/distinfo8
-rw-r--r--x11/kactivities/Makefile3
-rw-r--r--x11/kactivities/PLIST4
-rw-r--r--x11/kactivities/distinfo8
-rw-r--r--x11/kde-baseapps4/Makefile3
-rw-r--r--x11/kde-baseapps4/PLIST3
-rw-r--r--x11/kde-baseapps4/distinfo8
-rw-r--r--x11/kde-runtime4/Makefile3
-rw-r--r--x11/kde-runtime4/PLIST7
-rw-r--r--x11/kde-runtime4/distinfo8
-rw-r--r--x11/kde-workspace4/Makefile3
-rw-r--r--x11/kde-workspace4/PLIST55
-rw-r--r--x11/kde-workspace4/distinfo8
-rw-r--r--x11/kde4-l10n-de/Makefile3
-rw-r--r--x11/kde4-l10n-de/PLIST14
-rw-r--r--x11/kde4-l10n-de/distinfo8
-rw-r--r--x11/kde4-l10n-en_GB/Makefile3
-rw-r--r--x11/kde4-l10n-en_GB/distinfo8
-rw-r--r--x11/kde4-l10n-nl/Makefile3
-rw-r--r--x11/kde4-l10n-nl/PLIST14
-rw-r--r--x11/kde4-l10n-nl/distinfo8
-rw-r--r--x11/kdelibs4/Makefile3
-rw-r--r--x11/kdelibs4/PLIST7
-rw-r--r--x11/kdelibs4/distinfo13
-rw-r--r--x11/kdelibs4/patches/patch-ConfigureChecks.cmake14
-rw-r--r--x11/kdelibs4/patches/patch-kjs_wtf_HashSet.h31
-rw-r--r--x11/kdelibs4/patches/patch-kpty_kpty.cpp26
-rw-r--r--x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp15
-rw-r--r--x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp16
-rw-r--r--x11/konsole/Makefile3
-rw-r--r--x11/konsole/distinfo8
-rw-r--r--x11/py-kde4/Makefile3
-rw-r--r--x11/py-kde4/distinfo8
177 files changed, 681 insertions, 594 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 53299757040..db5141268c2 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2012/06/14 07:44:52 sbd Exp $
+# $NetBSD: Makefile,v 1.5 2012/06/16 04:45:28 markd Exp $
DISTNAME= ark-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= archivers
COMMENT= for managing various archive formats within the KDE environment
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
index c87280c17cc..6b4d73d08e5 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:50 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:28 markd Exp $
-SHA1 (ark-4.8.2.tar.xz) = d39be864ed818dd49aeba84ca4c02c0e5813eadf
-RMD160 (ark-4.8.2.tar.xz) = 123ef62efa77e449531542581b0987eabbcf6957
-Size (ark-4.8.2.tar.xz) = 153440 bytes
+SHA1 (ark-4.8.4.tar.xz) = 1d0d311beb8beeee7f33a58baef7f95192eb69ac
+RMD160 (ark-4.8.4.tar.xz) = 7ed1b39055ca426ab5ba0cc82a2f5b17629bbf34
+Size (ark-4.8.4.tar.xz) = 157280 bytes
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 052e744c54a..cf6d7cd36d8 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2012/06/14 22:09:28 sbd Exp $
+# $NetBSD: Makefile,v 1.39 2012/06/16 04:45:28 markd Exp $
DISTNAME= kdesdk-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 3
CATEGORIES= devel
COMMENT= Support applications and tools used by KDE developers
diff --git a/devel/kdesdk4/PLIST b/devel/kdesdk4/PLIST
index 355bcb27e2d..c17f7535114 100644
--- a/devel/kdesdk4/PLIST
+++ b/devel/kdesdk4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/04/15 05:54:56 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/06/16 04:45:28 markd Exp $
bin/adddebug
bin/build-progress.sh
bin/cervisia
@@ -590,10 +590,14 @@ share/doc/kde/HTML/en/kompare/settings-view1.png
share/doc/kde/HTML/en/kompare/settings-view2.png
share/doc/kde/HTML/en/kompare/undock.png
share/doc/kde/HTML/en/lokalize/common
+share/doc/kde/HTML/en/lokalize/configure_shortcuts.png
+share/doc/kde/HTML/en/lokalize/configure_toolbar.png
+share/doc/kde/HTML/en/lokalize/default_editor_lokalize.png
share/doc/kde/HTML/en/lokalize/glossary.png
share/doc/kde/HTML/en/lokalize/index.cache.bz2
share/doc/kde/HTML/en/lokalize/index.docbook
share/doc/kde/HTML/en/lokalize/original-diff.png
+share/doc/kde/HTML/en/lokalize/project_overview.png
share/doc/kde/HTML/en/lokalize/sync.png
share/doc/kde/HTML/en/lokalize/tmview.png
share/doc/kde/HTML/en/okteta/common
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 60bbdcedc33..3b893a25653 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2012/04/15 05:54:56 markd Exp $
+$NetBSD: distinfo,v 1.16 2012/06/16 04:45:28 markd Exp $
-SHA1 (kdesdk-4.8.2.tar.xz) = 8c02ce158f42fa80b5f8536d885e3e232614bc7f
-RMD160 (kdesdk-4.8.2.tar.xz) = b0f33c0f1b7058c7ad7c6bc16d21d7142d660f38
-Size (kdesdk-4.8.2.tar.xz) = 4784068 bytes
+SHA1 (kdesdk-4.8.4.tar.xz) = 62c176ee3dda5bbc013db7d1033ff89c105e3fd1
+RMD160 (kdesdk-4.8.4.tar.xz) = cc28eaba87edb107b6b78f53b397ac90388bec71
+Size (kdesdk-4.8.4.tar.xz) = 5361480 bytes
SHA1 (patch-aa) = ab73e4306efb33344012f95c059ea0ed0adfafd1
SHA1 (patch-ab) = af132807eaca326ad0c5fe87ffced9e8b813f3f9
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index 41465311635..ba306cb1237 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:44:53 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:28 markd Exp $
DISTNAME= kate-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= editors
COMMENT= KDE advanced text editor
diff --git a/editors/kate/PLIST b/editors/kate/PLIST
index c1dd705c89d..d7a408abb14 100644
--- a/editors/kate/PLIST
+++ b/editors/kate/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:51 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/06/16 04:45:28 markd Exp $
bin/kate
bin/ktesnippets_editor
bin/kwrite
@@ -68,11 +68,17 @@ share/doc/kde/HTML/en/kate/configdialog01.png
share/doc/kde/HTML/en/kate/configuring-part.docbook
share/doc/kde/HTML/en/kate/configuring.docbook
share/doc/kde/HTML/en/kate/fundamentals.docbook
+share/doc/kde/HTML/en/kate/gdb-call-stack.png
+share/doc/kde/HTML/en/kate/gdb-io.png
+share/doc/kde/HTML/en/kate/gdb-locals.png
+share/doc/kde/HTML/en/kate/gdb-output.png
+share/doc/kde/HTML/en/kate/gdb-settings.png
share/doc/kde/HTML/en/kate/highlighted.png
share/doc/kde/HTML/en/kate/highlighting.docbook
share/doc/kde/HTML/en/kate/index.cache.bz2
share/doc/kde/HTML/en/kate/index.docbook
share/doc/kde/HTML/en/kate/kate.png
+share/doc/kde/HTML/en/kate/line-modification-system.png
share/doc/kde/HTML/en/kate/man-kate.1.docbook
share/doc/kde/HTML/en/kate/mdi.docbook
share/doc/kde/HTML/en/kate/menus.docbook
diff --git a/editors/kate/distinfo b/editors/kate/distinfo
index 1515e70be3b..f270f4976a6 100644
--- a/editors/kate/distinfo
+++ b/editors/kate/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:28 markd Exp $
-SHA1 (kate-4.8.2.tar.xz) = 6bf4796574a003a4edadfb2029725805235bd086
-RMD160 (kate-4.8.2.tar.xz) = 4e59da0d1ffc1d386e0befba98aebb753de2605d
-Size (kate-4.8.2.tar.xz) = 2083920 bytes
+SHA1 (kate-4.8.4.tar.xz) = 5a70b64c92892781d50781fcaac81ff352ec3ed9
+RMD160 (kate-4.8.4.tar.xz) = 949ecda0374b2b94a7ddb59c509471d34904d790
+Size (kate-4.8.4.tar.xz) = 2227504 bytes
diff --git a/games/blinken/Makefile b/games/blinken/Makefile
index 73769b8bc45..26500686056 100644
--- a/games/blinken/Makefile
+++ b/games/blinken/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:48 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:28 markd Exp $
DISTNAME= blinken-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= games
COMMENT= memory enhancement game
diff --git a/games/blinken/distinfo b/games/blinken/distinfo
index b5378c634ea..69adf34aa55 100644
--- a/games/blinken/distinfo
+++ b/games/blinken/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:56 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:28 markd Exp $
-SHA1 (blinken-4.8.2.tar.xz) = c86a67b2e3506e2c56307871afc77e3e67a967d6
-RMD160 (blinken-4.8.2.tar.xz) = 92d2b8433a191245359485fa34c7fcdfc9ee9af1
-Size (blinken-4.8.2.tar.xz) = 565684 bytes
+SHA1 (blinken-4.8.4.tar.xz) = 571e1f06270d38e56149a8770517bf892859e2eb
+RMD160 (blinken-4.8.4.tar.xz) = 0611fbb96862109182be122bcc820fe551109177
+Size (blinken-4.8.4.tar.xz) = 567144 bytes
diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile
index 266631b6ea0..bd927cf2460 100644
--- a/games/kanagram/Makefile
+++ b/games/kanagram/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:27 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:28 markd Exp $
DISTNAME= kanagram-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= games
COMMENT= KDE letter order game
diff --git a/games/kanagram/distinfo b/games/kanagram/distinfo
index 94feb36ca5e..71b69caf0c5 100644
--- a/games/kanagram/distinfo
+++ b/games/kanagram/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:52 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:28 markd Exp $
-SHA1 (kanagram-4.8.2.tar.xz) = 25f7733ddc451738575fe1af5a89833ab8295493
-RMD160 (kanagram-4.8.2.tar.xz) = 3bd1025cd01d7857aec45201eff01bc781db1c78
-Size (kanagram-4.8.2.tar.xz) = 621964 bytes
+SHA1 (kanagram-4.8.4.tar.xz) = e897cc67ae046a4d7580f22a0ace534525fa6f1b
+RMD160 (kanagram-4.8.4.tar.xz) = 3efb54c560908059461a79a4c254b8cd2f77e40e
+Size (kanagram-4.8.4.tar.xz) = 623480 bytes
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index e9762f71254..357e97367ce 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2012/06/14 07:44:30 sbd Exp $
+# $NetBSD: Makefile,v 1.30 2012/06/16 04:45:29 markd Exp $
DISTNAME= kdegames-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 2
CATEGORIES= games
COMMENT= Games for the KDE integrated X11 desktop
diff --git a/games/kdegames4/PLIST b/games/kdegames4/PLIST
index 8d2cbf87230..e31d009b4fc 100644
--- a/games/kdegames4/PLIST
+++ b/games/kdegames4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/03/19 21:40:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/06/16 04:45:29 markd Exp $
bin/bomber
bin/bovo
bin/granatier
@@ -394,6 +394,9 @@ share/doc/kde/HTML/en/kollision/index.docbook
share/doc/kde/HTML/en/konquest/common
share/doc/kde/HTML/en/konquest/index.cache.bz2
share/doc/kde/HTML/en/konquest/index.docbook
+share/doc/kde/HTML/en/konquest/ingame_window.png
+share/doc/kde/HTML/en/konquest/main_game_window.png
+share/doc/kde/HTML/en/konquest/new_game_settings.png
share/doc/kde/HTML/en/kpat/clubs.png
share/doc/kde/HTML/en/kpat/common
share/doc/kde/HTML/en/kpat/diamonds.png
diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo
index 1bd40e350cf..5ff29320305 100644
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2012/04/15 05:54:55 markd Exp $
+$NetBSD: distinfo,v 1.17 2012/06/16 04:45:29 markd Exp $
-SHA1 (kdegames-4.8.2.tar.xz) = 9aeeccbc5f79f7f6b1e91bac41857ac3818cd989
-RMD160 (kdegames-4.8.2.tar.xz) = 4a5adc7dea2c8e2fcd649b5e2df2b9f1ebb12190
-Size (kdegames-4.8.2.tar.xz) = 58839716 bytes
+SHA1 (kdegames-4.8.4.tar.xz) = 00a68215c3e8b41ec8b7949c5d82af8e54766e97
+RMD160 (kdegames-4.8.4.tar.xz) = e8291347fe80d209bcca3832fd5f35bbc0305168
+Size (kdegames-4.8.4.tar.xz) = 60008392 bytes
SHA1 (patch-ab) = 8f36bf07bf41905dda2da518c8930ffb2fc328bf
diff --git a/games/kdetoys4/Makefile b/games/kdetoys4/Makefile
index bfacd3355b5..d491cd0fd41 100644
--- a/games/kdetoys4/Makefile
+++ b/games/kdetoys4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2012/06/14 07:44:28 sbd Exp $
+# $NetBSD: Makefile,v 1.22 2012/06/16 04:45:29 markd Exp $
DISTNAME= kdetoys-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 1
CATEGORIES= games
COMMENT= Toys for the KDE integrated X11 desktop
diff --git a/games/kdetoys4/distinfo b/games/kdetoys4/distinfo
index 49a25f6d954..0f9041c121b 100644
--- a/games/kdetoys4/distinfo
+++ b/games/kdetoys4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2012/04/15 05:54:55 markd Exp $
+$NetBSD: distinfo,v 1.16 2012/06/16 04:45:29 markd Exp $
-SHA1 (kdetoys-4.8.2.tar.xz) = d6414aadd77a4c84fdd1d72c32bc066251b30bde
-RMD160 (kdetoys-4.8.2.tar.xz) = 763e6356ba906f0e86bde2c1c3e927fe88fd8364
-Size (kdetoys-4.8.2.tar.xz) = 381348 bytes
+SHA1 (kdetoys-4.8.4.tar.xz) = dd5f63f0e833135bac73a2e12692b1e6dd412f67
+RMD160 (kdetoys-4.8.4.tar.xz) = 8022a7abe3e0a4381ebad4aae3d2c3d211661e0a
+Size (kdetoys-4.8.4.tar.xz) = 391732 bytes
diff --git a/games/khangman/Makefile b/games/khangman/Makefile
index e5ca2cf6332..b1efa04c264 100644
--- a/games/khangman/Makefile
+++ b/games/khangman/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:26 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:29 markd Exp $
DISTNAME= khangman-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= games
COMMENT= KDE hangman game
diff --git a/games/khangman/distinfo b/games/khangman/distinfo
index 85047f51095..db3d2ba67ad 100644
--- a/games/khangman/distinfo
+++ b/games/khangman/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:53 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:29 markd Exp $
-SHA1 (khangman-4.8.2.tar.xz) = 3e37d43965c190ccf5bc4c4485751dbe3139bda6
-RMD160 (khangman-4.8.2.tar.xz) = 4f98644b82fc806ef2852bfa73e6e2479718e760
-Size (khangman-4.8.2.tar.xz) = 1152152 bytes
+SHA1 (khangman-4.8.4.tar.xz) = aa544ba55833983bd21ebf594f2003a66b251901
+RMD160 (khangman-4.8.4.tar.xz) = a2da44881e6b00cfcf044982f19d29fa22499029
+Size (khangman-4.8.4.tar.xz) = 1155292 bytes
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index c59787b0982..dc4a8226138 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2012/06/14 07:44:26 sbd Exp $
+# $NetBSD: Makefile,v 1.54 2012/06/16 04:45:31 markd Exp $
DISTNAME= gwenview-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE image viewer
diff --git a/graphics/gwenview/distinfo b/graphics/gwenview/distinfo
index c3272e67a31..36145ef0d63 100644
--- a/graphics/gwenview/distinfo
+++ b/graphics/gwenview/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2012/04/15 05:54:57 markd Exp $
+$NetBSD: distinfo,v 1.22 2012/06/16 04:45:31 markd Exp $
-SHA1 (gwenview-4.8.2.tar.xz) = 1c5293c258b5afeba5551bdd2029d83eb2ae7df3
-RMD160 (gwenview-4.8.2.tar.xz) = aea0fb5b137e42be0f806d7be75ae9d35f1e7eda
-Size (gwenview-4.8.2.tar.xz) = 1944196 bytes
+SHA1 (gwenview-4.8.4.tar.xz) = 6cc6da85f6e2c8c817c1402baace16eb58b7a423
+RMD160 (gwenview-4.8.4.tar.xz) = 6529317ccbbf991280db7e1038161069a909d9c2
+Size (gwenview-4.8.4.tar.xz) = 1954644 bytes
diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile
index c44b91f8777..95ef1a3d210 100644
--- a/graphics/kamera/Makefile
+++ b/graphics/kamera/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:48 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:31 markd Exp $
DISTNAME= kamera-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE digital camera manager
diff --git a/graphics/kamera/distinfo b/graphics/kamera/distinfo
index 8378184344b..d11b84175a1 100644
--- a/graphics/kamera/distinfo
+++ b/graphics/kamera/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:57 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:31 markd Exp $
-SHA1 (kamera-4.8.2.tar.xz) = 45beaa52b384e80a3c66f15587abc2938b64c4f1
-RMD160 (kamera-4.8.2.tar.xz) = 002f72635f3036a16b58827fae205c3d9d904f23
-Size (kamera-4.8.2.tar.xz) = 37072 bytes
+SHA1 (kamera-4.8.4.tar.xz) = fc92327482bf1cd9b067667285ede00e3e464653
+RMD160 (kamera-4.8.4.tar.xz) = 123690c9e8718309e0d7333d17f4f5e07bc69dd2
+Size (kamera-4.8.4.tar.xz) = 37880 bytes
diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile
index e3199b923ac..0f7028c9ca4 100644
--- a/graphics/kcolorchooser/Makefile
+++ b/graphics/kcolorchooser/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:47 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:30 markd Exp $
DISTNAME= kcolorchooser-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE color chooser
diff --git a/graphics/kcolorchooser/distinfo b/graphics/kcolorchooser/distinfo
index a08870a2669..33003b32fb5 100644
--- a/graphics/kcolorchooser/distinfo
+++ b/graphics/kcolorchooser/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:59 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
-SHA1 (kcolorchooser-4.8.2.tar.xz) = 0d1b46b7c90fc2910b3c7422469422efcebc39aa
-RMD160 (kcolorchooser-4.8.2.tar.xz) = aab807c430dc9ed6db6c708610a25c7337d9fc7f
-Size (kcolorchooser-4.8.2.tar.xz) = 4456 bytes
+SHA1 (kcolorchooser-4.8.4.tar.xz) = 2f5ee55c86a503e458b1884939a62408bedbfc70
+RMD160 (kcolorchooser-4.8.4.tar.xz) = 34fd5299d2ba5909952be09db3147e5413fbfb29
+Size (kcolorchooser-4.8.4.tar.xz) = 4732 bytes
diff --git a/graphics/kdegraphics-mobipocket/Makefile b/graphics/kdegraphics-mobipocket/Makefile
index d73e05f5a86..557d7d01afa 100644
--- a/graphics/kdegraphics-mobipocket/Makefile
+++ b/graphics/kdegraphics-mobipocket/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:51 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:31 markd Exp $
DISTNAME= kdegraphics-mobipocket-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= library to support mobipocket ebooks.
diff --git a/graphics/kdegraphics-mobipocket/distinfo b/graphics/kdegraphics-mobipocket/distinfo
index 2745e4423e2..517b2d51e3f 100644
--- a/graphics/kdegraphics-mobipocket/distinfo
+++ b/graphics/kdegraphics-mobipocket/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:55 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:31 markd Exp $
-SHA1 (kdegraphics-mobipocket-4.8.2.tar.xz) = 60ea4e3e0e7030ed61c35761c5542d967cd161fc
-RMD160 (kdegraphics-mobipocket-4.8.2.tar.xz) = 9f1be98c5066501ca8ab3d0240c628e88901454b
-Size (kdegraphics-mobipocket-4.8.2.tar.xz) = 19856 bytes
+SHA1 (kdegraphics-mobipocket-4.8.4.tar.xz) = 0c38ef851c054b0ee3689d41ff5f7f6fb3d83f67
+RMD160 (kdegraphics-mobipocket-4.8.4.tar.xz) = 9a67d9d0277136b98f12e517381b35f06307e7d8
+Size (kdegraphics-mobipocket-4.8.4.tar.xz) = 20576 bytes
diff --git a/graphics/kdegraphics-strigi-analyzer/Makefile b/graphics/kdegraphics-strigi-analyzer/Makefile
index 14cd9d4d2eb..ede16a84d54 100644
--- a/graphics/kdegraphics-strigi-analyzer/Makefile
+++ b/graphics/kdegraphics-strigi-analyzer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:53 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:30 markd Exp $
DISTNAME= kdegraphics-strigi-analyzer-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= graphics file format plugins for Strigi Desktop Search
diff --git a/graphics/kdegraphics-strigi-analyzer/distinfo b/graphics/kdegraphics-strigi-analyzer/distinfo
index b04e4cea2ac..1255259e7f3 100644
--- a/graphics/kdegraphics-strigi-analyzer/distinfo
+++ b/graphics/kdegraphics-strigi-analyzer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:55 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
-SHA1 (kdegraphics-strigi-analyzer-4.8.2.tar.xz) = 6b61e1a949d0de92d5f4f1a822fe6dcaaa52b03c
-RMD160 (kdegraphics-strigi-analyzer-4.8.2.tar.xz) = 1fcc337b14daf6018a3d81eaacd1fd6e3b256c34
-Size (kdegraphics-strigi-analyzer-4.8.2.tar.xz) = 40216 bytes
+SHA1 (kdegraphics-strigi-analyzer-4.8.4.tar.xz) = 208dd945c1ecfaee97457585dc7a52916dd2318f
+RMD160 (kdegraphics-strigi-analyzer-4.8.4.tar.xz) = 0d4ab5f2f23452e9ddb6fa149b1b8840580791fe
+Size (kdegraphics-strigi-analyzer-4.8.4.tar.xz) = 41756 bytes
diff --git a/graphics/kdegraphics-thumbnailers/Makefile b/graphics/kdegraphics-thumbnailers/Makefile
index 25c9561a9ee..47a38eba6b1 100644
--- a/graphics/kdegraphics-thumbnailers/Makefile
+++ b/graphics/kdegraphics-thumbnailers/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:30 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:30 markd Exp $
DISTNAME= kdegraphics-thumbnailers-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= graphics file format thumbnailers for KDE
diff --git a/graphics/kdegraphics-thumbnailers/distinfo b/graphics/kdegraphics-thumbnailers/distinfo
index 7ff638e78b7..0865d6f5729 100644
--- a/graphics/kdegraphics-thumbnailers/distinfo
+++ b/graphics/kdegraphics-thumbnailers/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:58 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
-SHA1 (kdegraphics-thumbnailers-4.8.2.tar.xz) = cd6e99a6c0db6bda765c765356ba9bbd601fba0d
-RMD160 (kdegraphics-thumbnailers-4.8.2.tar.xz) = 7ac151965bc2673000ae536cf2277f9b7ae54b14
-Size (kdegraphics-thumbnailers-4.8.2.tar.xz) = 41424 bytes
+SHA1 (kdegraphics-thumbnailers-4.8.4.tar.xz) = 57e753881f9ca78c4c188c49a3a1b258b92adb83
+RMD160 (kdegraphics-thumbnailers-4.8.4.tar.xz) = 3c292ba79f0156527c301aa428b4edd71f213379
+Size (kdegraphics-thumbnailers-4.8.4.tar.xz) = 42028 bytes
diff --git a/graphics/kgamma/Makefile b/graphics/kgamma/Makefile
index ddf2786a25a..7a12141b2d5 100644
--- a/graphics/kgamma/Makefile
+++ b/graphics/kgamma/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:49 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:30 markd Exp $
DISTNAME= kgamma-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE screen gamma values kcontrol module
diff --git a/graphics/kgamma/distinfo b/graphics/kgamma/distinfo
index fee1f25936b..9af71323c4a 100644
--- a/graphics/kgamma/distinfo
+++ b/graphics/kgamma/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:57 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
-SHA1 (kgamma-4.8.2.tar.xz) = 222c2f7f16bae3dd450b04225b88596f4817e3a6
-RMD160 (kgamma-4.8.2.tar.xz) = c82ba8f59c0c48cc276c605c57e95ceb9f07b869
-Size (kgamma-4.8.2.tar.xz) = 26660 bytes
+SHA1 (kgamma-4.8.4.tar.xz) = 812a84564db52fb6a8b8e0e829eb762d479092ec
+RMD160 (kgamma-4.8.4.tar.xz) = f0206468044df48b95dd993d96e0011e1abde461
+Size (kgamma-4.8.4.tar.xz) = 27532 bytes
diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile
index 45d936b67e7..2d9600672cc 100644
--- a/graphics/kolourpaint/Makefile
+++ b/graphics/kolourpaint/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:48 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:30 markd Exp $
DISTNAME= kolourpaint-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE paint program
diff --git a/graphics/kolourpaint/distinfo b/graphics/kolourpaint/distinfo
index 29cd283fba8..ad95f100486 100644
--- a/graphics/kolourpaint/distinfo
+++ b/graphics/kolourpaint/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:56 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
-SHA1 (kolourpaint-4.8.2.tar.xz) = 1a51dce10d29f5694216d99cb7c9b0964181fe50
-RMD160 (kolourpaint-4.8.2.tar.xz) = 87d8a47f3d240bbdbddc2d63fc58acd03cb6e875
-Size (kolourpaint-4.8.2.tar.xz) = 1181128 bytes
+SHA1 (kolourpaint-4.8.4.tar.xz) = 1dc706ed29339df9fcc68ee606588941319bbf09
+RMD160 (kolourpaint-4.8.4.tar.xz) = e6dc8533c2f79fa20efb6f876161b4fc63d1a52e
+Size (kolourpaint-4.8.4.tar.xz) = 1193560 bytes
diff --git a/graphics/kruler/Makefile b/graphics/kruler/Makefile
index aad05c0bb95..2a37277d10a 100644
--- a/graphics/kruler/Makefile
+++ b/graphics/kruler/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:53 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:30 markd Exp $
DISTNAME= kruler-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE screen ruler
diff --git a/graphics/kruler/distinfo b/graphics/kruler/distinfo
index c6ea01ef108..8e36383ec3c 100644
--- a/graphics/kruler/distinfo
+++ b/graphics/kruler/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:56 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
-SHA1 (kruler-4.8.2.tar.xz) = 3db2efcc53a0ef1ba46d5f908f732da708b2b14c
-RMD160 (kruler-4.8.2.tar.xz) = 86c6e1f57355266759cbf90f77d908e0e1d907fe
-Size (kruler-4.8.2.tar.xz) = 133724 bytes
+SHA1 (kruler-4.8.4.tar.xz) = b3fb40888f6cf2ad419e1f30a97c2052ffbae1d7
+RMD160 (kruler-4.8.4.tar.xz) = ff319c7dcb7fd7e93cd9ba3769afa32a60e1b2bd
+Size (kruler-4.8.4.tar.xz) = 134768 bytes
diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin/Makefile
index b8d36910ed5..7507c3e359c 100644
--- a/graphics/ksaneplugin/Makefile
+++ b/graphics/ksaneplugin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:29 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:31 markd Exp $
DISTNAME= ksaneplugin-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= SANE Plugin for KDE
diff --git a/graphics/ksaneplugin/distinfo b/graphics/ksaneplugin/distinfo
index 1b1643cd860..9db81ea6610 100644
--- a/graphics/ksaneplugin/distinfo
+++ b/graphics/ksaneplugin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:57 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:31 markd Exp $
-SHA1 (ksaneplugin-4.8.2.tar.xz) = 04a75bc260f0780a9c9dcbdd6b75418168ad5631
-RMD160 (ksaneplugin-4.8.2.tar.xz) = 5aa88b32d2383d22be6d1e2848b36415cec4578f
-Size (ksaneplugin-4.8.2.tar.xz) = 13272 bytes
+SHA1 (ksaneplugin-4.8.4.tar.xz) = b7a3204ef27f04bffca0fd77d84bd46b236687b7
+RMD160 (ksaneplugin-4.8.4.tar.xz) = 738fb97cc2526dda34e9960a4130f25adc33220f
+Size (ksaneplugin-4.8.4.tar.xz) = 13668 bytes
diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot/Makefile
index 2a36c46a80f..e4aa762a022 100644
--- a/graphics/ksnapshot/Makefile
+++ b/graphics/ksnapshot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:53 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:30 markd Exp $
DISTNAME= ksnapshot-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE screen capture program
diff --git a/graphics/ksnapshot/distinfo b/graphics/ksnapshot/distinfo
index f9d64862643..22ec332642d 100644
--- a/graphics/ksnapshot/distinfo
+++ b/graphics/ksnapshot/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:57 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
-SHA1 (ksnapshot-4.8.2.tar.xz) = 373362717f42b5996883eb405a756c8a570ce128
-RMD160 (ksnapshot-4.8.2.tar.xz) = ae28159e6c911a22e3fcf9c8afa82428eac2730d
-Size (ksnapshot-4.8.2.tar.xz) = 263668 bytes
+SHA1 (ksnapshot-4.8.4.tar.xz) = 1cbd1ea468e7722feb8c96dd5f1f3a18bb91d4ef
+RMD160 (ksnapshot-4.8.4.tar.xz) = 6aea7b32653f67e5edaaef50f842087c8625dae6
+Size (ksnapshot-4.8.4.tar.xz) = 264944 bytes
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 916522a1a1d..27743db7144 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2012/06/14 07:43:32 sbd Exp $
+# $NetBSD: Makefile,v 1.29 2012/06/16 04:45:30 markd Exp $
DISTNAME= libkdcraw-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE digital camera raw image library wrapper
diff --git a/graphics/libkdcraw/distinfo b/graphics/libkdcraw/distinfo
index 032935db0c8..ba3a16a0405 100644
--- a/graphics/libkdcraw/distinfo
+++ b/graphics/libkdcraw/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.11 2012/06/16 04:45:30 markd Exp $
-SHA1 (libkdcraw-4.8.2.tar.xz) = 38708f1b223740ae105295cdaa6ee372e31c43bc
-RMD160 (libkdcraw-4.8.2.tar.xz) = 9d6fc48b3ccad63dde4f26bd4204f25bb26f173d
-Size (libkdcraw-4.8.2.tar.xz) = 268048 bytes
+SHA1 (libkdcraw-4.8.4.tar.xz) = ba67432cb3353a55d57ae749b42919399dfda3e2
+RMD160 (libkdcraw-4.8.4.tar.xz) = 9c509763df5fb4065bea559eb0fe798412b02dd9
+Size (libkdcraw-4.8.4.tar.xz) = 271096 bytes
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 46d581243dc..9d80dba82c0 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2012/06/14 07:44:49 sbd Exp $
+# $NetBSD: Makefile,v 1.32 2012/06/16 04:45:29 markd Exp $
#
DISTNAME= libkexiv2-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= a KDE wrapper around exiv2
diff --git a/graphics/libkexiv2/distinfo b/graphics/libkexiv2/distinfo
index 2168e295296..d1b4b04dc89 100644
--- a/graphics/libkexiv2/distinfo
+++ b/graphics/libkexiv2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.12 2012/06/16 04:45:29 markd Exp $
-SHA1 (libkexiv2-4.8.2.tar.xz) = fe32631401be655d4692fec724743d5f623b880d
-RMD160 (libkexiv2-4.8.2.tar.xz) = 908b0af2f7c7310bd6fc8dfd83876dee1862d58b
-Size (libkexiv2-4.8.2.tar.xz) = 133676 bytes
+SHA1 (libkexiv2-4.8.4.tar.xz) = a3429dd70677498c890598cd1e3bf6a610669b77
+RMD160 (libkexiv2-4.8.4.tar.xz) = bd35dfa837847feb52860c9041785e45947b8c77
+Size (libkexiv2-4.8.4.tar.xz) = 134952 bytes
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index cc0f612fed8..e8ddfc3497a 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2012/06/14 07:43:34 sbd Exp $
+# $NetBSD: Makefile,v 1.41 2012/06/16 04:45:29 markd Exp $
DISTNAME= libkipi-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE image plugin interface
diff --git a/graphics/libkipi/distinfo b/graphics/libkipi/distinfo
index 8fd2bfcab5f..6c65b1bb162 100644
--- a/graphics/libkipi/distinfo
+++ b/graphics/libkipi/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.11 2012/06/16 04:45:29 markd Exp $
-SHA1 (libkipi-4.8.2.tar.xz) = c2f788e05f5e6d52e10578ebd58a2b1dd8f65c89
-RMD160 (libkipi-4.8.2.tar.xz) = acc90dbe41d2fdffd333dd8eafc6b2a8ce652e5f
-Size (libkipi-4.8.2.tar.xz) = 71984 bytes
+SHA1 (libkipi-4.8.4.tar.xz) = d30ef671be8caf8eb9ead68de53cf187f0fcf88b
+RMD160 (libkipi-4.8.4.tar.xz) = b3c76752c9299a4b243573c2811c0c33ae039c50
+Size (libkipi-4.8.4.tar.xz) = 73188 bytes
diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
index fdabfebb10b..8c99dfec09f 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:43:33 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:29 markd Exp $
DISTNAME= libksane-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= SANE Library interface for KDE
diff --git a/graphics/libksane/distinfo b/graphics/libksane/distinfo
index 59addff5393..4f69100b6f4 100644
--- a/graphics/libksane/distinfo
+++ b/graphics/libksane/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:29 markd Exp $
-SHA1 (libksane-4.8.2.tar.xz) = fe9376710687c2e9354bd5f8245755c53e2ad91c
-RMD160 (libksane-4.8.2.tar.xz) = 2be70b255c1480bf9b06d90169f17fb7dbb8c115
-Size (libksane-4.8.2.tar.xz) = 80932 bytes
+SHA1 (libksane-4.8.4.tar.xz) = 5ac35d8478ccace1495ae42eb2169918cebc8d95
+RMD160 (libksane-4.8.4.tar.xz) = abe5fb1a478182324f0bc10e610f2e07c72048ac
+Size (libksane-4.8.4.tar.xz) = 83108 bytes
diff --git a/graphics/oxygen-icons/Makefile b/graphics/oxygen-icons/Makefile
index e1693aef1aa..568ed42fe92 100644
--- a/graphics/oxygen-icons/Makefile
+++ b/graphics/oxygen-icons/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2012/04/15 05:54:59 markd Exp $
+# $NetBSD: Makefile,v 1.17 2012/06/16 04:45:29 markd Exp $
-DISTNAME= oxygen-icons-4.8.2
+DISTNAME= oxygen-icons-4.8.4
CATEGORIES= graphics kde
-MASTER_SITES= ${MASTER_SITE_KDE:=4.8.2/src/}
+MASTER_SITES= ${MASTER_SITE_KDE:=4.8.4/src/}
EXTRACT_SUFX= .tar.xz
+EXTRACT_USING= gtar
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.kde.org/
diff --git a/graphics/oxygen-icons/PLIST b/graphics/oxygen-icons/PLIST
index 36febb88bc8..06fe6801a3d 100644
--- a/graphics/oxygen-icons/PLIST
+++ b/graphics/oxygen-icons/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2012/04/15 05:54:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.17 2012/06/16 04:45:29 markd Exp $
share/icons/oxygen/128x128/actions/address-book-new.png
share/icons/oxygen/128x128/actions/application-exit.png
share/icons/oxygen/128x128/actions/appointment-new.png
@@ -135,6 +135,7 @@ share/icons/oxygen/128x128/apps/knewsticker.png
share/icons/oxygen/128x128/apps/knotes.png
share/icons/oxygen/128x128/apps/kolf.png
share/icons/oxygen/128x128/apps/konqueror.png
+share/icons/oxygen/128x128/apps/kontact-import-wizard.png
share/icons/oxygen/128x128/apps/kontact.png
share/icons/oxygen/128x128/apps/konversation.png
share/icons/oxygen/128x128/apps/korgac.png
@@ -3246,6 +3247,7 @@ share/icons/oxygen/256x256/apps/kig.png
share/icons/oxygen/256x256/apps/kivio.png
share/icons/oxygen/256x256/apps/kmail2.png
share/icons/oxygen/256x256/apps/konqueror.png
+share/icons/oxygen/256x256/apps/kontact-import-wizard.png
share/icons/oxygen/256x256/apps/korgac.png
share/icons/oxygen/256x256/apps/kplato.png
share/icons/oxygen/256x256/apps/kpresenter.png
@@ -6220,6 +6222,7 @@ share/icons/oxygen/64x64/apps/knewsticker.png
share/icons/oxygen/64x64/apps/knotes.png
share/icons/oxygen/64x64/apps/kolf.png
share/icons/oxygen/64x64/apps/konqueror.png
+share/icons/oxygen/64x64/apps/kontact-import-wizard.png
share/icons/oxygen/64x64/apps/kontact.png
share/icons/oxygen/64x64/apps/konversation.png
share/icons/oxygen/64x64/apps/korgac.png
diff --git a/graphics/oxygen-icons/distinfo b/graphics/oxygen-icons/distinfo
index f7c2ae5553c..3bc600b851c 100644
--- a/graphics/oxygen-icons/distinfo
+++ b/graphics/oxygen-icons/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2012/04/15 05:54:59 markd Exp $
+$NetBSD: distinfo,v 1.17 2012/06/16 04:45:29 markd Exp $
-SHA1 (oxygen-icons-4.8.2.tar.xz) = 8c16ad0a660bce0a5cddca6bf16aecb65bb892ee
-RMD160 (oxygen-icons-4.8.2.tar.xz) = d687a684fd8a6f748a4746b6b13524733dd8abe7
-Size (oxygen-icons-4.8.2.tar.xz) = 310108240 bytes
+SHA1 (oxygen-icons-4.8.4.tar.xz) = 4034b61585db7e8c03f3270d860aa7443f1a6193
+RMD160 (oxygen-icons-4.8.4.tar.xz) = b09007eaeb6c83bac88a28454481838a8f206dbe
+Size (oxygen-icons-4.8.4.tar.xz) = 310955984 bytes
diff --git a/graphics/svgpart/Makefile b/graphics/svgpart/Makefile
index c1faa7ff615..8e60a005ed6 100644
--- a/graphics/svgpart/Makefile
+++ b/graphics/svgpart/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:51 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:31 markd Exp $
DISTNAME= svgpart-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= graphics
COMMENT= KDE svg part
diff --git a/graphics/svgpart/distinfo b/graphics/svgpart/distinfo
index b544067077e..64a45d0a13e 100644
--- a/graphics/svgpart/distinfo
+++ b/graphics/svgpart/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:54:56 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:31 markd Exp $
-SHA1 (svgpart-4.8.2.tar.xz) = f29c38a0d82d96140770a4a354d8087aaca9ddb8
-RMD160 (svgpart-4.8.2.tar.xz) = a7e7a58e3525ebd96d17ea46b7474202942d0041
-Size (svgpart-4.8.2.tar.xz) = 9072 bytes
+SHA1 (svgpart-4.8.4.tar.xz) = 3c202f0a58035c56e7e46a983c254a6284b97ee9
+RMD160 (svgpart-4.8.4.tar.xz) = 0e6251c0de263ccc0ce94b55deac36ba5b92b9c5
+Size (svgpart-4.8.4.tar.xz) = 9344 bytes
diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index 2f7103d0467..31edf5ee5ff 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:43:32 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:31 markd Exp $
DISTNAME= analitza-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= math
COMMENT= KDE library for mathematical features
diff --git a/math/analitza/distinfo b/math/analitza/distinfo
index 00e47de872f..c3e45aa89c3 100644
--- a/math/analitza/distinfo
+++ b/math/analitza/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
-SHA1 (analitza-4.8.2.tar.xz) = bf76411269246581b09df98ca8ae33be200c4427
-RMD160 (analitza-4.8.2.tar.xz) = 0c2845e96cb7effbf7107d940628cd682e3733bd
-Size (analitza-4.8.2.tar.xz) = 142712 bytes
+SHA1 (analitza-4.8.4.tar.xz) = d3b831730408078c31b686bc49c1d465de5e80da
+RMD160 (analitza-4.8.4.tar.xz) = 269f2e1e947d5d62adcef70dff807ff72b8d6b3f
+Size (analitza-4.8.4.tar.xz) = 146556 bytes
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 5f1f59bf408..d68cd2d41d1 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:30 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:32 markd Exp $
DISTNAME= cantor-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= math
COMMENT= KDE frontend to mathematical software
diff --git a/math/cantor/distinfo b/math/cantor/distinfo
index ba414ed4ec4..ed87c8dd629 100644
--- a/math/cantor/distinfo
+++ b/math/cantor/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:58 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
-SHA1 (cantor-4.8.2.tar.xz) = 53a13c3594ea82b87a421e96b408355eea76fa89
-RMD160 (cantor-4.8.2.tar.xz) = 9b14a5da0d3203dd82fcd2d10413bcb5030abeec
-Size (cantor-4.8.2.tar.xz) = 263588 bytes
+SHA1 (cantor-4.8.4.tar.xz) = 8e284e632144a92f503092738d19843272d0412e
+RMD160 (cantor-4.8.4.tar.xz) = 3408b33bfd3e3216f9953e3c835f4428c55f65ad
+Size (cantor-4.8.4.tar.xz) = 272996 bytes
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index bcb196365a5..438e73ea75d 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:26 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:31 markd Exp $
DISTNAME= kalgebra-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= math
COMMENT= KDE graph calculator
diff --git a/math/kalgebra/distinfo b/math/kalgebra/distinfo
index 8e034c0de9a..0b83dbb9417 100644
--- a/math/kalgebra/distinfo
+++ b/math/kalgebra/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:52 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
-SHA1 (kalgebra-4.8.2.tar.xz) = 560efe77d842c0410986b294323eabef6226e6ff
-RMD160 (kalgebra-4.8.2.tar.xz) = 1d19a5466f655fd44a4586d9a3a962b8bebe4a8a
-Size (kalgebra-4.8.2.tar.xz) = 421640 bytes
+SHA1 (kalgebra-4.8.4.tar.xz) = be0bcd290c61713a0365e9eab2ddc8d58f447f34
+RMD160 (kalgebra-4.8.4.tar.xz) = 189031f8f7306e30c2e53e5d13b165a1017131ef
+Size (kalgebra-4.8.4.tar.xz) = 424864 bytes
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 6d4488f74e7..5d9e87f8573 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:48 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:31 markd Exp $
DISTNAME= kcalc-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= math
COMMENT= KDE scientific calculator
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index cbc4282e409..850e0828aff 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
-SHA1 (kcalc-4.8.2.tar.xz) = f2bbed3d7f991a4cd0484cc4fafe8c04bd29d986
-RMD160 (kcalc-4.8.2.tar.xz) = b1cfb7a7ae46e8ab89d9d1981913aac107671a75
-Size (kcalc-4.8.2.tar.xz) = 87180 bytes
+SHA1 (kcalc-4.8.4.tar.xz) = f1cb6cda210c67fd19eca387df2d2224393d45ef
+RMD160 (kcalc-4.8.4.tar.xz) = b291c9a62b9cd129a936301ec0875581ee8d56f6
+Size (kcalc-4.8.4.tar.xz) = 89360 bytes
diff --git a/meta-pkgs/kde4/Makefile b/meta-pkgs/kde4/Makefile
index 5bb908b4008..554815fbc26 100644
--- a/meta-pkgs/kde4/Makefile
+++ b/meta-pkgs/kde4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2012/04/15 05:54:55 markd Exp $
+# $NetBSD: Makefile,v 1.17 2012/06/16 04:45:32 markd Exp $
-DISTNAME= kde4-4.8.2
+DISTNAME= kde4-4.8.4
CATEGORIES= meta-pkgs x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
@@ -9,77 +9,77 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.kde.org/
COMMENT= "meta-package" for the KDE4 integrated X11 desktop
-DEPENDS+= oxygen-icons-4.8.2{,nb[0-9]*}:../../graphics/oxygen-icons
-DEPENDS+= kdelibs4-4.8.2{,nb[0-9]*}:../../x11/kdelibs4
-DEPENDS+= kdepimlibs4-4.8.2{,nb[0-9]*}:../../misc/kdepimlibs4
-DEPENDS+= kde-runtime4-4.8.2{,nb[0-9]*}:../../x11/kde-runtime4
-DEPENDS+= kde-workspace4-4.8.2{,nb[0-9]*}:../../x11/kde-workspace4
-DEPENDS+= kde-wallpapers4-4.8.2{,nb[0-9]*}:../../misc/kde-wallpapers4
-DEPENDS+= kde-baseapps4-4.8.2{,nb[0-9]*}:../../x11/kde-baseapps4
-DEPENDS+= konsole-4.8.2{,nb[0-9]*}:../../x11/konsole
-DEPENDS+= kaccessible-4.8.2{,nb[0-9]*}:../../misc/kaccessible
-DEPENDS+= kmag-4.8.2{,nb[0-9]*}:../../misc/kmag
-DEPENDS+= kmouth-4.8.2{,nb[0-9]*}:../../misc/kmouth
-DEPENDS+= kmousetool-4.8.2{,nb[0-9]*}:../../misc/kmousetool
-DEPENDS+= kdeadmin4-4.8.2{,nb[0-9]*}:../../misc/kdeadmin4
-DEPENDS+= kdeartwork4-4.8.2{,nb[0-9]*}:../../misc/kdeartwork4
-DEPENDS+= marble-4.8.2{,nb[0-9]*}:../../misc/marble
-DEPENDS+= blinken-4.8.2{,nb[0-9]*}:../../games/blinken
-DEPENDS+= analitza-4.8.2{,nb[0-9]*}:../../math/analitza
-DEPENDS+= cantor-4.8.2{,nb[0-9]*}:../../math/cantor
-DEPENDS+= kalgebra-4.8.2{,nb[0-9]*}:../../math/kalgebra
-DEPENDS+= kalzium-4.8.2{,nb[0-9]*}:../../misc/kalzium
-DEPENDS+= kanagram-4.8.2{,nb[0-9]*}:../../games/kanagram
-DEPENDS+= kbruch-4.8.2{,nb[0-9]*}:../../misc/kbruch
-DEPENDS+= kgeography-4.8.2{,nb[0-9]*}:../../misc/kgeography
-DEPENDS+= khangman-4.8.2{,nb[0-9]*}:../../games/khangman
-DEPENDS+= kig-4.8.2{,nb[0-9]*}:../../misc/kig
-DEPENDS+= kiten-4.8.2{,nb[0-9]*}:../../misc/kiten
-DEPENDS+= klettres-4.8.2{,nb[0-9]*}:../../misc/klettres
-DEPENDS+= kstars-4.8.2{,nb[0-9]*}:../../misc/kstars
-DEPENDS+= ktouch-4.8.2{,nb[0-9]*}:../../misc/ktouch
-DEPENDS+= kturtle-4.8.2{,nb[0-9]*}:../../misc/kturtle
-DEPENDS+= kwordquiz-4.8.2{,nb[0-9]*}:../../misc/kwordquiz
-DEPENDS+= parley-4.8.2{,nb[0-9]*}:../../misc/parley
-DEPENDS+= rocs-4.8.2{,nb[0-9]*}:../../misc/rocs
-DEPENDS+= step-4.8.2{,nb[0-9]*}:../../misc/step
-DEPENDS+= kdegames4-4.8.2{,nb[0-9]*}:../../games/kdegames4
-DEPENDS+= kamera-4.8.2{,nb[0-9]*}:../../graphics/kamera
-DEPENDS+= gwenview-4.8.2{,nb[0-9]*}:../../graphics/gwenview
-DEPENDS+= ksaneplugin-4.8.2{,nb[0-9]*}:../../graphics/ksaneplugin
-DEPENDS+= ksnapshot-4.8.2{,nb[0-9]*}:../../graphics/ksnapshot
-DEPENDS+= kcolorchooser-4.8.2{,nb[0-9]*}:../../graphics/kcolorchooser
-DEPENDS+= kgamma-4.8.2{,nb[0-9]*}:../../graphics/kgamma
-DEPENDS+= kruler-4.8.2{,nb[0-9]*}:../../graphics/kruler
-DEPENDS+= kolourpaint-4.8.2{,nb[0-9]*}:../../graphics/kolourpaint
-DEPENDS+= okular-4.8.2{,nb[0-9]*}:../../print/okular
-DEPENDS+= kdegraphics-mobipocket-4.8.2{,nb[0-9]*}:../../graphics/kdegraphics-mobipocket
-DEPENDS+= kdegraphics-strigi-analyzer-4.8.2{,nb[0-9]*}:../../graphics/kdegraphics-strigi-analyzer
-DEPENDS+= kdegraphics-thumbnailers-4.8.2{,nb[0-9]*}:../../graphics/kdegraphics-thumbnailers
-DEPENDS+= svgpart-4.8.2{,nb[0-9]*}:../../graphics/svgpart
-DEPENDS+= kdemultimedia4-4.8.2{,nb[0-9]*}:../../multimedia/kdemultimedia4
-DEPENDS+= kdenetwork4-4.8.2{,nb[0-9]*}:../../net/kdenetwork4
+DEPENDS+= oxygen-icons-4.8.4{,nb[0-9]*}:../../graphics/oxygen-icons
+DEPENDS+= kdelibs4-4.8.4{,nb[0-9]*}:../../x11/kdelibs4
+DEPENDS+= kdepimlibs4-4.8.4{,nb[0-9]*}:../../misc/kdepimlibs4
+DEPENDS+= kde-runtime4-4.8.4{,nb[0-9]*}:../../x11/kde-runtime4
+DEPENDS+= kde-workspace4-4.8.4{,nb[0-9]*}:../../x11/kde-workspace4
+DEPENDS+= kde-wallpapers4-4.8.4{,nb[0-9]*}:../../misc/kde-wallpapers4
+DEPENDS+= kde-baseapps4-4.8.4{,nb[0-9]*}:../../x11/kde-baseapps4
+DEPENDS+= konsole-4.8.4{,nb[0-9]*}:../../x11/konsole
+DEPENDS+= kaccessible-4.8.4{,nb[0-9]*}:../../misc/kaccessible
+DEPENDS+= kmag-4.8.4{,nb[0-9]*}:../../misc/kmag
+DEPENDS+= kmouth-4.8.4{,nb[0-9]*}:../../misc/kmouth
+DEPENDS+= kmousetool-4.8.4{,nb[0-9]*}:../../misc/kmousetool
+DEPENDS+= kdeadmin4-4.8.4{,nb[0-9]*}:../../misc/kdeadmin4
+DEPENDS+= kdeartwork4-4.8.4{,nb[0-9]*}:../../misc/kdeartwork4
+DEPENDS+= marble-4.8.4{,nb[0-9]*}:../../misc/marble
+DEPENDS+= blinken-4.8.4{,nb[0-9]*}:../../games/blinken
+DEPENDS+= analitza-4.8.4{,nb[0-9]*}:../../math/analitza
+DEPENDS+= cantor-4.8.4{,nb[0-9]*}:../../math/cantor
+DEPENDS+= kalgebra-4.8.4{,nb[0-9]*}:../../math/kalgebra
+DEPENDS+= kalzium-4.8.4{,nb[0-9]*}:../../misc/kalzium
+DEPENDS+= kanagram-4.8.4{,nb[0-9]*}:../../games/kanagram
+DEPENDS+= kbruch-4.8.4{,nb[0-9]*}:../../misc/kbruch
+DEPENDS+= kgeography-4.8.4{,nb[0-9]*}:../../misc/kgeography
+DEPENDS+= khangman-4.8.4{,nb[0-9]*}:../../games/khangman
+DEPENDS+= kig-4.8.4{,nb[0-9]*}:../../misc/kig
+DEPENDS+= kiten-4.8.4{,nb[0-9]*}:../../misc/kiten
+DEPENDS+= klettres-4.8.4{,nb[0-9]*}:../../misc/klettres
+DEPENDS+= kstars-4.8.4{,nb[0-9]*}:../../misc/kstars
+DEPENDS+= ktouch-4.8.4{,nb[0-9]*}:../../misc/ktouch
+DEPENDS+= kturtle-4.8.4{,nb[0-9]*}:../../misc/kturtle
+DEPENDS+= kwordquiz-4.8.4{,nb[0-9]*}:../../misc/kwordquiz
+DEPENDS+= parley-4.8.4{,nb[0-9]*}:../../misc/parley
+DEPENDS+= rocs-4.8.4{,nb[0-9]*}:../../misc/rocs
+DEPENDS+= step-4.8.4{,nb[0-9]*}:../../misc/step
+DEPENDS+= kdegames4-4.8.4{,nb[0-9]*}:../../games/kdegames4
+DEPENDS+= kamera-4.8.4{,nb[0-9]*}:../../graphics/kamera
+DEPENDS+= gwenview-4.8.4{,nb[0-9]*}:../../graphics/gwenview
+DEPENDS+= ksaneplugin-4.8.4{,nb[0-9]*}:../../graphics/ksaneplugin
+DEPENDS+= ksnapshot-4.8.4{,nb[0-9]*}:../../graphics/ksnapshot
+DEPENDS+= kcolorchooser-4.8.4{,nb[0-9]*}:../../graphics/kcolorchooser
+DEPENDS+= kgamma-4.8.4{,nb[0-9]*}:../../graphics/kgamma
+DEPENDS+= kruler-4.8.4{,nb[0-9]*}:../../graphics/kruler
+DEPENDS+= kolourpaint-4.8.4{,nb[0-9]*}:../../graphics/kolourpaint
+DEPENDS+= okular-4.8.4{,nb[0-9]*}:../../print/okular
+DEPENDS+= kdegraphics-mobipocket-4.8.4{,nb[0-9]*}:../../graphics/kdegraphics-mobipocket
+DEPENDS+= kdegraphics-strigi-analyzer-4.8.4{,nb[0-9]*}:../../graphics/kdegraphics-strigi-analyzer
+DEPENDS+= kdegraphics-thumbnailers-4.8.4{,nb[0-9]*}:../../graphics/kdegraphics-thumbnailers
+DEPENDS+= svgpart-4.8.4{,nb[0-9]*}:../../graphics/svgpart
+DEPENDS+= kdemultimedia4-4.8.4{,nb[0-9]*}:../../multimedia/kdemultimedia4
+DEPENDS+= kdenetwork4-4.8.4{,nb[0-9]*}:../../net/kdenetwork4
DEPENDS+= kdepim4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim4
DEPENDS+= kdepim-runtime4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim-runtime4
-DEPENDS+= kdeplasma-addons4-4.8.2{,nb[0-9]*}:../../misc/kdeplasma-addons4
-DEPENDS+= kdesdk4-4.8.2{,nb[0-9]*}:../../devel/kdesdk4
-DEPENDS+= kate-4.8.2{,nb[0-9]*}:../../editors/kate
-DEPENDS+= kdetoys4-4.8.2{,nb[0-9]*}:../../games/kdetoys4
-DEPENDS+= ark-4.8.2{,nb[0-9]*}:../../archivers/ark
-DEPENDS+= filelight-4.8.2{,nb[0-9]*}:../../sysutils/filelight
-DEPENDS+= kcalc-4.8.2{,nb[0-9]*}:../../math/kcalc
-DEPENDS+= kcharselect-4.8.2{,nb[0-9]*}:../../misc/kcharselect
-DEPENDS+= kdf-4.8.2{,nb[0-9]*}:../../sysutils/kdf
-DEPENDS+= kfloppy-4.8.2{,nb[0-9]*}:../../sysutils/kfloppy
-DEPENDS+= kremotecontrol-4.8.2{,nb[0-9]*}:../../misc/kremotecontrol
-DEPENDS+= ksecrets-4.8.2{,nb[0-9]*}:../../security/ksecrets
-DEPENDS+= ktimer-4.8.2{,nb[0-9]*}:../../time/ktimer
-DEPENDS+= kwallet-4.8.2{,nb[0-9]*}:../../security/kwallet
-DEPENDS+= kgpg-4.8.2{,nb[0-9]*}:../../security/kgpg
-DEPENDS+= printer-applet-4.8.2{,nb[0-9]*}:../../print/printer-applet
-DEPENDS+= superkaramba-4.8.2{,nb[0-9]*}:../../misc/superkaramba
-DEPENDS+= sweeper-4.8.2{,nb[0-9]*}:../../misc/sweeper
-DEPENDS+= kdewebdev4-4.8.2{,nb[0-9]*}:../../www/kdewebdev4
+DEPENDS+= kdeplasma-addons4-4.8.4{,nb[0-9]*}:../../misc/kdeplasma-addons4
+DEPENDS+= kdesdk4-4.8.4{,nb[0-9]*}:../../devel/kdesdk4
+DEPENDS+= kate-4.8.4{,nb[0-9]*}:../../editors/kate
+DEPENDS+= kdetoys4-4.8.4{,nb[0-9]*}:../../games/kdetoys4
+DEPENDS+= ark-4.8.4{,nb[0-9]*}:../../archivers/ark
+DEPENDS+= filelight-4.8.4{,nb[0-9]*}:../../sysutils/filelight
+DEPENDS+= kcalc-4.8.4{,nb[0-9]*}:../../math/kcalc
+DEPENDS+= kcharselect-4.8.4{,nb[0-9]*}:../../misc/kcharselect
+DEPENDS+= kdf-4.8.4{,nb[0-9]*}:../../sysutils/kdf
+DEPENDS+= kfloppy-4.8.4{,nb[0-9]*}:../../sysutils/kfloppy
+DEPENDS+= kremotecontrol-4.8.4{,nb[0-9]*}:../../misc/kremotecontrol
+DEPENDS+= ksecrets-4.8.4{,nb[0-9]*}:../../security/ksecrets
+DEPENDS+= ktimer-4.8.4{,nb[0-9]*}:../../time/ktimer
+DEPENDS+= kwallet-4.8.4{,nb[0-9]*}:../../security/kwallet
+DEPENDS+= kgpg-4.8.4{,nb[0-9]*}:../../security/kgpg
+DEPENDS+= printer-applet-4.8.4{,nb[0-9]*}:../../print/printer-applet
+DEPENDS+= superkaramba-4.8.4{,nb[0-9]*}:../../misc/superkaramba
+DEPENDS+= sweeper-4.8.4{,nb[0-9]*}:../../misc/sweeper
+DEPENDS+= kdewebdev4-4.8.4{,nb[0-9]*}:../../www/kdewebdev4
META_PACKAGE= yes
diff --git a/meta-pkgs/kde4/Makefile.kde4 b/meta-pkgs/kde4/Makefile.kde4
index 750a74d7cba..e6b9bdae10a 100644
--- a/meta-pkgs/kde4/Makefile.kde4
+++ b/meta-pkgs/kde4/Makefile.kde4
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile.kde4,v 1.15 2012/04/15 05:54:55 markd Exp $
+# $NetBSD: Makefile.kde4,v 1.16 2012/06/16 04:45:32 markd Exp $
#
# This Makefile fragment is included at the top of package Makefiles for
# KDE4-distributed packages (they all share common configure and build
# settings).
CATEGORIES+= kde
-_KDE_VERSION= 4.8.2
-MASTER_SITE_KDE_I18N= ${MASTER_SITE_KDE:=4.8.2/src/kde-l10n/}
-MASTER_SITES?= ${MASTER_SITE_KDE:=4.8.2/src/}
+_KDE_VERSION= 4.8.4
+MASTER_SITE_KDE_I18N= ${MASTER_SITE_KDE:=4.8.4/src/kde-l10n/}
+MASTER_SITES?= ${MASTER_SITE_KDE:=4.8.4/src/}
EXTRACT_SUFX?= .tar.xz
+EXTRACT_USING= gtar
MAINTAINER?= markd@NetBSD.org
HOMEPAGE?= http://www.kde.org/
diff --git a/misc/kaccessible/Makefile b/misc/kaccessible/Makefile
index c836ec23306..2f733d6623d 100644
--- a/misc/kaccessible/Makefile
+++ b/misc/kaccessible/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:49 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:32 markd Exp $
DISTNAME= kaccessible-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= Provides accessibility services like focus tracking for KDE
diff --git a/misc/kaccessible/distinfo b/misc/kaccessible/distinfo
index f0db1d94691..f31007501b0 100644
--- a/misc/kaccessible/distinfo
+++ b/misc/kaccessible/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:58 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
-SHA1 (kaccessible-4.8.2.tar.xz) = bc5cd13decd2456c91fd6973be038e6fea0da256
-RMD160 (kaccessible-4.8.2.tar.xz) = 83125de89561e1922e6bed7dee55b9ae4a1e6de1
-Size (kaccessible-4.8.2.tar.xz) = 20616 bytes
+SHA1 (kaccessible-4.8.4.tar.xz) = d467fa3857b2c5a2aa3a5421b5d7c74fe3c7f981
+RMD160 (kaccessible-4.8.4.tar.xz) = ca1e48d07921a5b2a117cd054f3cb75ce1aef895
+Size (kaccessible-4.8.4.tar.xz) = 21040 bytes
diff --git a/misc/kalzium/Makefile b/misc/kalzium/Makefile
index ad34b4eaf92..0e5aed5f348 100644
--- a/misc/kalzium/Makefile
+++ b/misc/kalzium/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:50 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:33 markd Exp $
DISTNAME= kalzium-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= periodic table of elements
diff --git a/misc/kalzium/distinfo b/misc/kalzium/distinfo
index 161065c02b7..ba6e2cc2990 100644
--- a/misc/kalzium/distinfo
+++ b/misc/kalzium/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
-SHA1 (kalzium-4.8.2.tar.xz) = e685430d183339dd06e718c0dee3c6aacdd1536a
-RMD160 (kalzium-4.8.2.tar.xz) = b452f1ae7fef5e2dd5e7ca311547cefe26575d43
-Size (kalzium-4.8.2.tar.xz) = 3677144 bytes
+SHA1 (kalzium-4.8.4.tar.xz) = 28ed27164680a28e478cc6e0a13c918bc2119dc2
+RMD160 (kalzium-4.8.4.tar.xz) = 96c3f92d2299990bdfb1b502c28bf7c01d9963da
+Size (kalzium-4.8.4.tar.xz) = 3690120 bytes
diff --git a/misc/kbruch/Makefile b/misc/kbruch/Makefile
index 58752ea3669..d7751e2f081 100644
--- a/misc/kbruch/Makefile
+++ b/misc/kbruch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:51 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:33 markd Exp $
DISTNAME= kbruch-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE exercise fractions
diff --git a/misc/kbruch/distinfo b/misc/kbruch/distinfo
index 02af0766725..d2c550d4f15 100644
--- a/misc/kbruch/distinfo
+++ b/misc/kbruch/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:53 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
-SHA1 (kbruch-4.8.2.tar.xz) = 92cc810935b3aeebe68a970720f4b418490488d8
-RMD160 (kbruch-4.8.2.tar.xz) = b21a39a13bd1e749e61e3775bfe5cff619ca7811
-Size (kbruch-4.8.2.tar.xz) = 907616 bytes
+SHA1 (kbruch-4.8.4.tar.xz) = 40c24efddc30441a8de2ec315e1933ca429da14b
+RMD160 (kbruch-4.8.4.tar.xz) = a22e4937c53375fc3d71a1c7cf5f04006b7d178c
+Size (kbruch-4.8.4.tar.xz) = 910148 bytes
diff --git a/misc/kcharselect/Makefile b/misc/kcharselect/Makefile
index 64511b46625..7782a4508cb 100644
--- a/misc/kcharselect/Makefile
+++ b/misc/kcharselect/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:51 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:33 markd Exp $
DISTNAME= kcharselect-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE character selector
diff --git a/misc/kcharselect/distinfo b/misc/kcharselect/distinfo
index fd90e8eaac9..7f905e3407d 100644
--- a/misc/kcharselect/distinfo
+++ b/misc/kcharselect/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:55 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
-SHA1 (kcharselect-4.8.2.tar.xz) = 527d28bf3bb22d38665a006ab835ff6d75f592a4
-RMD160 (kcharselect-4.8.2.tar.xz) = c7e1eabba950178b2a447d9990acaf252d49961c
-Size (kcharselect-4.8.2.tar.xz) = 86196 bytes
+SHA1 (kcharselect-4.8.4.tar.xz) = 0e00a25ca3c813ab335cd12ff0ec4b1f22c8076c
+RMD160 (kcharselect-4.8.4.tar.xz) = 1523d2803f25590996c6f50aafd72b703ea0c67f
+Size (kcharselect-4.8.4.tar.xz) = 86828 bytes
diff --git a/misc/kde-wallpapers4/Makefile b/misc/kde-wallpapers4/Makefile
index 131db5b7807..3dfd2647d19 100644
--- a/misc/kde-wallpapers4/Makefile
+++ b/misc/kde-wallpapers4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:28 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:34 markd Exp $
DISTNAME= kde-wallpapers-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= Wallpapers for the KDE integrated X11 desktop
diff --git a/misc/kde-wallpapers4/distinfo b/misc/kde-wallpapers4/distinfo
index 847d92c1dda..e623e5f8fd0 100644
--- a/misc/kde-wallpapers4/distinfo
+++ b/misc/kde-wallpapers4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
-SHA1 (kde-wallpapers-4.8.2.tar.xz) = f77598e4097dae3fcda524c9dc36b997cb9a91bf
-RMD160 (kde-wallpapers-4.8.2.tar.xz) = b76cd1e738257fa9065b84a91add59e55f732421
-Size (kde-wallpapers-4.8.2.tar.xz) = 77365376 bytes
+SHA1 (kde-wallpapers-4.8.4.tar.xz) = da11aa057c5b836ee026634bb61565244d614682
+RMD160 (kde-wallpapers-4.8.4.tar.xz) = a61241d0a45a5ef77b1a9eb5717440062f0685b4
+Size (kde-wallpapers-4.8.4.tar.xz) = 77372404 bytes
diff --git a/misc/kdeadmin4/Makefile b/misc/kdeadmin4/Makefile
index 05758e836af..b29275c8c30 100644
--- a/misc/kdeadmin4/Makefile
+++ b/misc/kdeadmin4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2012/06/14 22:09:28 sbd Exp $
+# $NetBSD: Makefile,v 1.27 2012/06/16 04:45:35 markd Exp $
DISTNAME= kdeadmin-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 2
CATEGORIES= misc
COMMENT= System administration tools for the KDE integrated X11 desktop
diff --git a/misc/kdeadmin4/PLIST b/misc/kdeadmin4/PLIST
index f573e2b94de..634fc2a4cdc 100644
--- a/misc/kdeadmin4/PLIST
+++ b/misc/kdeadmin4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/03/19 20:50:24 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/06/16 04:45:35 markd Exp $
bin/ksystemlog
bin/kuser
lib/kde4/kcm_cron.so
@@ -20,6 +20,20 @@ share/doc/kde/HTML/en/kuser/common
share/doc/kde/HTML/en/kuser/index.cache.bz2
share/doc/kde/HTML/en/kuser/index.docbook
share/doc/kde/HTML/en/kuser/kuser.png
+share/doc/kde/HTML/en/system-config-printer-kde/common
+share/doc/kde/HTML/en/system-config-printer-kde/index.cache.bz2
+share/doc/kde/HTML/en/system-config-printer-kde/index.docbook
+share/doc/kde/HTML/en/system-config-printer-kde/new-class.png
+share/doc/kde/HTML/en/system-config-printer-kde/new-details.png
+share/doc/kde/HTML/en/system-config-printer-kde/new-driver.png
+share/doc/kde/HTML/en/system-config-printer-kde/new-manufacturer.png
+share/doc/kde/HTML/en/system-config-printer-kde/new-uri.png
+share/doc/kde/HTML/en/system-config-printer-kde/new.png
+share/doc/kde/HTML/en/system-config-printer-kde/printer-job-options.png
+share/doc/kde/HTML/en/system-config-printer-kde/printer-options.png
+share/doc/kde/HTML/en/system-config-printer-kde/printer-policies.png
+share/doc/kde/HTML/en/system-config-printer-kde/printer-settings.png
+share/doc/kde/HTML/en/system-config-printer-kde/server.png
share/icons/hicolor/128x128/apps/kuser.png
share/icons/hicolor/16x16/apps/kuser.png
share/icons/hicolor/22x22/apps/kuser.png
diff --git a/misc/kdeadmin4/distinfo b/misc/kdeadmin4/distinfo
index a62b6eb424f..88a65c077ea 100644
--- a/misc/kdeadmin4/distinfo
+++ b/misc/kdeadmin4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2012/04/15 05:54:57 markd Exp $
+$NetBSD: distinfo,v 1.17 2012/06/16 04:45:35 markd Exp $
-SHA1 (kdeadmin-4.8.2.tar.xz) = 2952e5111f5e71671384db40d305630bd50c01c0
-RMD160 (kdeadmin-4.8.2.tar.xz) = c7fedbab78a26fdb018ece6541f6bac90a53917d
-Size (kdeadmin-4.8.2.tar.xz) = 747364 bytes
+SHA1 (kdeadmin-4.8.4.tar.xz) = b825e40b29b4ae684265cb13b7935737d7ae6d68
+RMD160 (kdeadmin-4.8.4.tar.xz) = adabe82678e84cef51dc7a0b1219cab165742d4c
+Size (kdeadmin-4.8.4.tar.xz) = 1169564 bytes
diff --git a/misc/kdeartwork4/Makefile b/misc/kdeartwork4/Makefile
index 5eb89105b69..830e9774647 100644
--- a/misc/kdeartwork4/Makefile
+++ b/misc/kdeartwork4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2012/06/14 07:44:27 sbd Exp $
+# $NetBSD: Makefile,v 1.24 2012/06/16 04:45:34 markd Exp $
DISTNAME= kdeartwork-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= Artwork for the KDE integrated X11 desktop
diff --git a/misc/kdeartwork4/distinfo b/misc/kdeartwork4/distinfo
index 08ac1a4d58d..b3229d7fd85 100644
--- a/misc/kdeartwork4/distinfo
+++ b/misc/kdeartwork4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.17 2012/06/16 04:45:34 markd Exp $
-SHA1 (kdeartwork-4.8.2.tar.xz) = 828d8f36eb55bc93800a8d799b3cf20c22146021
-RMD160 (kdeartwork-4.8.2.tar.xz) = 2ef272c5c4d471f459ab376476382b547a54ceec
-Size (kdeartwork-4.8.2.tar.xz) = 139835088 bytes
+SHA1 (kdeartwork-4.8.4.tar.xz) = c7e15538d3141af8673d16f498c6af7bff62a87f
+RMD160 (kdeartwork-4.8.4.tar.xz) = d02e90c45d762fd35aa7d833bd1f4dbd41237c0c
+Size (kdeartwork-4.8.4.tar.xz) = 140388032 bytes
SHA1 (patch-aa) = 9007028225dded2490e3181f853c17985bae9509
diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 9cb5a3256aa..6d62cc652c6 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2012/06/14 22:09:13 sbd Exp $
+# $NetBSD: Makefile,v 1.32 2012/06/16 04:45:32 markd Exp $
DISTNAME= kdepimlibs-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 2
CATEGORIES= misc
COMMENT= Support libraries for PIM for the KDE integrated X11 desktop
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index f784d9fc7e3..91d33a244ab 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2012/04/26 13:22:42 hans Exp $
+$NetBSD: distinfo,v 1.21 2012/06/16 04:45:32 markd Exp $
-SHA1 (kdepimlibs-4.8.2.tar.xz) = 038474d1c8a3d5c430f25823e25330fa464cfe40
-RMD160 (kdepimlibs-4.8.2.tar.xz) = 0f649f6154c171e54ce0999cad7808216b5a37e7
-Size (kdepimlibs-4.8.2.tar.xz) = 2711412 bytes
+SHA1 (kdepimlibs-4.8.4.tar.xz) = 34f693ac71896d0d8653fc2a81323d1e91531bb2
+RMD160 (kdepimlibs-4.8.4.tar.xz) = f9804ea6e6d016d879a16f1077e49aeef429ba13
+Size (kdepimlibs-4.8.4.tar.xz) = 2858756 bytes
SHA1 (patch-gpgmexx_config-gpgmexx.h.cmake) = bd8fd1e9a619d6bd52185f37adb5dc7f7b97423c
SHA1 (patch-kalarmcal_CMakeLists.txt) = 8237552f350f214c3380bf0fc54d19d36765c9b9
SHA1 (patch-kblog_CMakeLists.txt) = 183d17f2de6f5f4f2f6bd29666b2a35d22c055aa
diff --git a/misc/kdeplasma-addons4/Makefile b/misc/kdeplasma-addons4/Makefile
index 97e453680bc..3b60c3bddef 100644
--- a/misc/kdeplasma-addons4/Makefile
+++ b/misc/kdeplasma-addons4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2012/06/14 22:09:29 sbd Exp $
+# $NetBSD: Makefile,v 1.29 2012/06/16 04:45:37 markd Exp $
DISTNAME= kdeplasma-addons-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 2
CATEGORIES= misc
COMMENT= Plasmoids
diff --git a/misc/kdeplasma-addons4/distinfo b/misc/kdeplasma-addons4/distinfo
index 1e05abef344..ee54b5f4d73 100644
--- a/misc/kdeplasma-addons4/distinfo
+++ b/misc/kdeplasma-addons4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2012/04/15 05:54:56 markd Exp $
+$NetBSD: distinfo,v 1.16 2012/06/16 04:45:37 markd Exp $
-SHA1 (kdeplasma-addons-4.8.2.tar.xz) = 1f9db32c724ce9aee6f46bc11a8d2fc073975657
-RMD160 (kdeplasma-addons-4.8.2.tar.xz) = 6248bd1d332472b79c28f8e4e0db06b87c659a8f
-Size (kdeplasma-addons-4.8.2.tar.xz) = 1705584 bytes
+SHA1 (kdeplasma-addons-4.8.4.tar.xz) = 725d26e3aa59d02bc73a77b43e6aae92bc961254
+RMD160 (kdeplasma-addons-4.8.4.tar.xz) = b15e20fd44a96d383a565c125f78807e8411444f
+Size (kdeplasma-addons-4.8.4.tar.xz) = 1774416 bytes
SHA1 (patch-ab) = eb477ddc938d7eb9205df386e6f2f17e88de392e
SHA1 (patch-libs_lancelot-datamodels_CMakeLists.txt) = 0f8000457dbfc2de02e451a7a76faff089a1635a
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index 7c4105de074..89b5cc024c8 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2012/06/14 07:44:53 sbd Exp $
+# $NetBSD: Makefile,v 1.6 2012/06/16 04:45:34 markd Exp $
DISTNAME= kgeography-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE geography trainer
diff --git a/misc/kgeography/distinfo b/misc/kgeography/distinfo
index 07e44e4ba74..91bab4d3ff5 100644
--- a/misc/kgeography/distinfo
+++ b/misc/kgeography/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/04/15 05:54:53 markd Exp $
+$NetBSD: distinfo,v 1.6 2012/06/16 04:45:34 markd Exp $
-SHA1 (kgeography-4.8.2.tar.xz) = 795ddfb81e5f75d81b8eb332a07f58af85321197
-RMD160 (kgeography-4.8.2.tar.xz) = f7c843b1e17ef2bcd3d3a51da6a7a094565f253f
-Size (kgeography-4.8.2.tar.xz) = 6742124 bytes
+SHA1 (kgeography-4.8.4.tar.xz) = 4637c5a792164d083f0ea05e6733160922d8c73b
+RMD160 (kgeography-4.8.4.tar.xz) = d43714d9e197eb2a411452c5ff1beefc3ec56e8b
+Size (kgeography-4.8.4.tar.xz) = 6768292 bytes
diff --git a/misc/kig/Makefile b/misc/kig/Makefile
index cadab260932..a91067b662e 100644
--- a/misc/kig/Makefile
+++ b/misc/kig/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:47 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:33 markd Exp $
DISTNAME= kig-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE interactive geometry
diff --git a/misc/kig/distinfo b/misc/kig/distinfo
index 3519a2beaed..56942b2d0d7 100644
--- a/misc/kig/distinfo
+++ b/misc/kig/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:56 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
-SHA1 (kig-4.8.2.tar.xz) = 7532bb454d6379af2c0ff37819c76c6c1f20deac
-RMD160 (kig-4.8.2.tar.xz) = 0fb8d4461c9989fc5aab058d4d20f35b818e238e
-Size (kig-4.8.2.tar.xz) = 1516924 bytes
+SHA1 (kig-4.8.4.tar.xz) = dcbde5fbb34e0c569a2ef95a328cf69a924cd38e
+RMD160 (kig-4.8.4.tar.xz) = 0e466a7191c802cde9aa98b58982675fca72e3b7
+Size (kig-4.8.4.tar.xz) = 1529956 bytes
diff --git a/misc/kiten/Makefile b/misc/kiten/Makefile
index 148d6d68420..8c2972f39ec 100644
--- a/misc/kiten/Makefile
+++ b/misc/kiten/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:52 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:33 markd Exp $
DISTNAME= kiten-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE Japanese reference/learning tool
diff --git a/misc/kiten/distinfo b/misc/kiten/distinfo
index da66d72e7f9..946af084636 100644
--- a/misc/kiten/distinfo
+++ b/misc/kiten/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:52 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
-SHA1 (kiten-4.8.2.tar.xz) = db608b5550281e8ca0097e3c4ed15abe6018a002
-RMD160 (kiten-4.8.2.tar.xz) = 7cead162f7e3a56649c352619b521a7d27a5c348
-Size (kiten-4.8.2.tar.xz) = 12036740 bytes
+SHA1 (kiten-4.8.4.tar.xz) = f7b5f9b6cbbda37c539f1ffce9bd905f0be3658e
+RMD160 (kiten-4.8.4.tar.xz) = de8f2403916c25ec1eb36dbe5f2195c0802a2894
+Size (kiten-4.8.4.tar.xz) = 12039428 bytes
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index fad7b489a42..f3e8dbdd6e2 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:50 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:35 markd Exp $
DISTNAME= klettres-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE app to help learn the alphabet and read some syllables in languages
diff --git a/misc/klettres/distinfo b/misc/klettres/distinfo
index 21f917ed7b6..de37b244995 100644
--- a/misc/klettres/distinfo
+++ b/misc/klettres/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:35 markd Exp $
-SHA1 (klettres-4.8.2.tar.xz) = 2b107d5d4f07ab3a1364a5eb3cc5ba5a35b5ffa4
-RMD160 (klettres-4.8.2.tar.xz) = 7d8abbad6f292f80c56bd4867d9e98c6f3b921df
-Size (klettres-4.8.2.tar.xz) = 2653960 bytes
+SHA1 (klettres-4.8.4.tar.xz) = b5dc64cdd09f265cd7a84d0ee14a93ea4ae067be
+RMD160 (klettres-4.8.4.tar.xz) = ca490eb86c2494496a87bf8292cdb9b4f6d49daa
+Size (klettres-4.8.4.tar.xz) = 2657820 bytes
diff --git a/misc/kmag/Makefile b/misc/kmag/Makefile
index c48f04a533d..948dcb891e0 100644
--- a/misc/kmag/Makefile
+++ b/misc/kmag/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:50 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:33 markd Exp $
DISTNAME= kmag-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE screen magnifier
diff --git a/misc/kmag/distinfo b/misc/kmag/distinfo
index f62f6216cf8..32153baf7e2 100644
--- a/misc/kmag/distinfo
+++ b/misc/kmag/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:50 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
-SHA1 (kmag-4.8.2.tar.xz) = 5a88645d7af1f407e87fcd91911b1e94e4ffb271
-RMD160 (kmag-4.8.2.tar.xz) = 313ef89aa501de498486066dfb240c88ca039561
-Size (kmag-4.8.2.tar.xz) = 92484 bytes
+SHA1 (kmag-4.8.4.tar.xz) = 7b5b51422d4241d6303841805a04b2eace0c7a2d
+RMD160 (kmag-4.8.4.tar.xz) = b406c3a9ac47a152cec509b0d5500b0a9378ac2e
+Size (kmag-4.8.4.tar.xz) = 93388 bytes
diff --git a/misc/kmousetool/Makefile b/misc/kmousetool/Makefile
index 30a983a9d35..60783a5d647 100644
--- a/misc/kmousetool/Makefile
+++ b/misc/kmousetool/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:49 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:32 markd Exp $
DISTNAME= kmousetool-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE mouse manipulation tool
diff --git a/misc/kmousetool/distinfo b/misc/kmousetool/distinfo
index 3511ea97bcc..0b01da05c42 100644
--- a/misc/kmousetool/distinfo
+++ b/misc/kmousetool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
-SHA1 (kmousetool-4.8.2.tar.xz) = e0a66c42324d9ac09c3e85fea12a24a5ae2abb9b
-RMD160 (kmousetool-4.8.2.tar.xz) = 6708f573b0ab883aa50776e964fcebd9fb6a487a
-Size (kmousetool-4.8.2.tar.xz) = 45420 bytes
+SHA1 (kmousetool-4.8.4.tar.xz) = 6667336267a3a65bf0b33a8454299558ad458108
+RMD160 (kmousetool-4.8.4.tar.xz) = 842989b324aa6edd3f610e193f2c059f49f81892
+Size (kmousetool-4.8.4.tar.xz) = 46320 bytes
diff --git a/misc/kmouth/Makefile b/misc/kmouth/Makefile
index 33cf43c8017..992377023d3 100644
--- a/misc/kmouth/Makefile
+++ b/misc/kmouth/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:48 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:32 markd Exp $
DISTNAME= kmouth-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE Speech Synthesizer frontend
diff --git a/misc/kmouth/distinfo b/misc/kmouth/distinfo
index 03615d29943..ff1fe254401 100644
--- a/misc/kmouth/distinfo
+++ b/misc/kmouth/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:55 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
-SHA1 (kmouth-4.8.2.tar.xz) = f0192e531161544a803f8822b041d8c50ec9bb58
-RMD160 (kmouth-4.8.2.tar.xz) = 55e5c1c2c66ef8e16c59b5ee4f6cf12cb7e85f34
-Size (kmouth-4.8.2.tar.xz) = 320484 bytes
+SHA1 (kmouth-4.8.4.tar.xz) = 104bb2c434deabbaa57326fe567fc90c4067f36c
+RMD160 (kmouth-4.8.4.tar.xz) = 78f10eb56bc97df73d522d71658d3bcb12a33eeb
+Size (kmouth-4.8.4.tar.xz) = 323252 bytes
diff --git a/misc/kremotecontrol/Makefile b/misc/kremotecontrol/Makefile
index 8ad6b384f26..938cddaef0d 100644
--- a/misc/kremotecontrol/Makefile
+++ b/misc/kremotecontrol/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:49 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:35 markd Exp $
DISTNAME= kremotecontrol-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE frontend for your remote controls.
diff --git a/misc/kremotecontrol/distinfo b/misc/kremotecontrol/distinfo
index 07d16846d8d..1638b73245f 100644
--- a/misc/kremotecontrol/distinfo
+++ b/misc/kremotecontrol/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:57 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:35 markd Exp $
-SHA1 (kremotecontrol-4.8.2.tar.xz) = 2269320a9a33a29511c14c7e6c46bff22474076a
-RMD160 (kremotecontrol-4.8.2.tar.xz) = 3a2deb5d80e5d1ab41c1daa0df49ff64fef97f32
-Size (kremotecontrol-4.8.2.tar.xz) = 1080256 bytes
+SHA1 (kremotecontrol-4.8.4.tar.xz) = 2c967b6d5738d3947401d9055f0956dfd16b2ec2
+RMD160 (kremotecontrol-4.8.4.tar.xz) = 5b286f95bc83ae183d19105e0ffd3889d3cc9224
+Size (kremotecontrol-4.8.4.tar.xz) = 1084088 bytes
diff --git a/misc/kstars/Makefile b/misc/kstars/Makefile
index 59e5eb968f3..266a9ca29a3 100644
--- a/misc/kstars/Makefile
+++ b/misc/kstars/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2012/06/14 07:44:52 sbd Exp $
+# $NetBSD: Makefile,v 1.14 2012/06/16 04:45:35 markd Exp $
DISTNAME= kstars-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE desktop planetarium
diff --git a/misc/kstars/distinfo b/misc/kstars/distinfo
index 5055cc06112..7a8bc91601c 100644
--- a/misc/kstars/distinfo
+++ b/misc/kstars/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/04/15 05:54:57 markd Exp $
+$NetBSD: distinfo,v 1.6 2012/06/16 04:45:35 markd Exp $
-SHA1 (kstars-4.8.2.tar.xz) = 6447338ebed2f822c4c852bcfe50264ccaba2acb
-RMD160 (kstars-4.8.2.tar.xz) = d737a0607679a1fa70b500ff6d9d1cc7efdbebd2
-Size (kstars-4.8.2.tar.xz) = 12312548 bytes
+SHA1 (kstars-4.8.4.tar.xz) = 579cec66cfb172258d2967872a2b9c32d4514c75
+RMD160 (kstars-4.8.4.tar.xz) = 2e93c0c81515293cca7a13353475de58a73cf642
+Size (kstars-4.8.4.tar.xz) = 12345052 bytes
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 0cf5671b434..abfc8d13fe6 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:48 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:32 markd Exp $
DISTNAME= ktouch-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE touch typing tutor
diff --git a/misc/ktouch/distinfo b/misc/ktouch/distinfo
index f78cc2b0d4d..67a5f011a7b 100644
--- a/misc/ktouch/distinfo
+++ b/misc/ktouch/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:55 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
-SHA1 (ktouch-4.8.2.tar.xz) = 5f19f77d3d80058f70b7df2376ce339fda6239e0
-RMD160 (ktouch-4.8.2.tar.xz) = dcbaa1a20d49d6ed08efce1ac0896a156c05d5ae
-Size (ktouch-4.8.2.tar.xz) = 1717892 bytes
+SHA1 (ktouch-4.8.4.tar.xz) = 95e7712b9644d1b3491c988bc591d7c5b4e4d3b7
+RMD160 (ktouch-4.8.4.tar.xz) = ccff91e1f1eb1d8bdd9859f0200255aa9a4820fb
+Size (ktouch-4.8.4.tar.xz) = 1726028 bytes
diff --git a/misc/kturtle/Makefile b/misc/kturtle/Makefile
index 79c914a61d6..605642bac3d 100644
--- a/misc/kturtle/Makefile
+++ b/misc/kturtle/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:49 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:33 markd Exp $
DISTNAME= kturtle-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE educational programming environment
diff --git a/misc/kturtle/distinfo b/misc/kturtle/distinfo
index db9faa72229..5ee05f88c34 100644
--- a/misc/kturtle/distinfo
+++ b/misc/kturtle/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:52 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
-SHA1 (kturtle-4.8.2.tar.xz) = e27f02ae08b8cb3e6be4c0ad971681be5d55db8e
-RMD160 (kturtle-4.8.2.tar.xz) = bbff3e59e05ad24cd38b77e18108e89d163c695b
-Size (kturtle-4.8.2.tar.xz) = 213584 bytes
+SHA1 (kturtle-4.8.4.tar.xz) = 160972878f61c37575fb5953b88354fe174fe8ab
+RMD160 (kturtle-4.8.4.tar.xz) = 5edad9acca57995472d89426771d800a757dd90a
+Size (kturtle-4.8.4.tar.xz) = 216580 bytes
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index 466c5179fe2..19ed97564d4 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:26 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:33 markd Exp $
DISTNAME= kwordquiz-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE flash card trainer
diff --git a/misc/kwordquiz/distinfo b/misc/kwordquiz/distinfo
index 2e56f82c01f..88377522122 100644
--- a/misc/kwordquiz/distinfo
+++ b/misc/kwordquiz/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:52 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
-SHA1 (kwordquiz-4.8.2.tar.xz) = 4507a07bdf62e5af1ce14ba18523a44b065d090e
-RMD160 (kwordquiz-4.8.2.tar.xz) = 09e8497e122babf83b2d522fb844c20fbd9042df
-Size (kwordquiz-4.8.2.tar.xz) = 1212196 bytes
+SHA1 (kwordquiz-4.8.4.tar.xz) = ab6cf92bbedef4115951d3cc53a9f3b91ac11875
+RMD160 (kwordquiz-4.8.4.tar.xz) = 6366b46cc635d6dd023ef785d02037d44c412f43
+Size (kwordquiz-4.8.4.tar.xz) = 1217404 bytes
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile
index 78b8c3f5596..ee2184ed133 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:43:34 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:32 markd Exp $
DISTNAME= libkdeedu-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= Common library for KDE educational apps
diff --git a/misc/libkdeedu/distinfo b/misc/libkdeedu/distinfo
index 15427ccb6ad..a03496703e7 100644
--- a/misc/libkdeedu/distinfo
+++ b/misc/libkdeedu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:52 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
-SHA1 (libkdeedu-4.8.2.tar.xz) = 7c2bebb2d29793a1cab949382c19d2420398bf08
-RMD160 (libkdeedu-4.8.2.tar.xz) = 4f24eef2eba13761ba3201e7167c70edd201fcc2
-Size (libkdeedu-4.8.2.tar.xz) = 210688 bytes
+SHA1 (libkdeedu-4.8.4.tar.xz) = 055fa35db3c482c61f8eab7d1912532823a88726
+RMD160 (libkdeedu-4.8.4.tar.xz) = 7c27408bfb672545623fdab20cf11b67e8cce8dc
+Size (libkdeedu-4.8.4.tar.xz) = 214240 bytes
diff --git a/misc/marble/Makefile b/misc/marble/Makefile
index e4bf6d5f375..85414f6e0f7 100644
--- a/misc/marble/Makefile
+++ b/misc/marble/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:43:33 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:34 markd Exp $
DISTNAME= marble-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE desktop globe
diff --git a/misc/marble/distinfo b/misc/marble/distinfo
index 2633b5b9f69..01313d10d39 100644
--- a/misc/marble/distinfo
+++ b/misc/marble/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:53 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
-SHA1 (marble-4.8.2.tar.xz) = f57f134976b27fd0622ba2a24e32128ab23f5494
-RMD160 (marble-4.8.2.tar.xz) = 08785d2805706c25dd928c0e84d0f728ae2ba185
-Size (marble-4.8.2.tar.xz) = 19827392 bytes
+SHA1 (marble-4.8.4.tar.xz) = ec3cd41a1d333e9e3b34595adf6e4859315159b9
+RMD160 (marble-4.8.4.tar.xz) = a8c6a095ad8ff014156a24968259502b4853492c
+Size (marble-4.8.4.tar.xz) = 19899160 bytes
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index 8620dbaf19e..9822315116a 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:26 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:34 markd Exp $
DISTNAME= parley-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE vocabulary trainer
diff --git a/misc/parley/distinfo b/misc/parley/distinfo
index 8b615ce16bb..2d5d0d5fa01 100644
--- a/misc/parley/distinfo
+++ b/misc/parley/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:53 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
-SHA1 (parley-4.8.2.tar.xz) = 3b656361108b5c48e0c582c3ce724f6a439c7fe2
-RMD160 (parley-4.8.2.tar.xz) = a2892f20a6f0e27fe992f7793257313e181d7649
-Size (parley-4.8.2.tar.xz) = 8209812 bytes
+SHA1 (parley-4.8.4.tar.xz) = bfc361363fa0cb866fd1d704b86d71401c1c4ea6
+RMD160 (parley-4.8.4.tar.xz) = 69240319fb05c2e32b5125b93a8424936d8cd97d
+Size (parley-4.8.4.tar.xz) = 8222924 bytes
diff --git a/misc/rocs/Makefile b/misc/rocs/Makefile
index a232581dee3..87095fdbbc3 100644
--- a/misc/rocs/Makefile
+++ b/misc/rocs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:50 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:34 markd Exp $
DISTNAME= rocs-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE graph theory IDE
diff --git a/misc/rocs/distinfo b/misc/rocs/distinfo
index 9d7331f2f77..41b2c448ffa 100644
--- a/misc/rocs/distinfo
+++ b/misc/rocs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:52 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
-SHA1 (rocs-4.8.2.tar.xz) = 3e22d284ec0ba40bc82dfc5f3b58b4a5721a8c64
-RMD160 (rocs-4.8.2.tar.xz) = d73ec024f0ec940bb8d42162eec8a8fbad4d0c3e
-Size (rocs-4.8.2.tar.xz) = 656112 bytes
+SHA1 (rocs-4.8.4.tar.xz) = 991e5aa15e59cc432a9c9f140fe90bd47f8f8e15
+RMD160 (rocs-4.8.4.tar.xz) = 1960ba3fbaabf2a9658f260d7a96de2b699b0829
+Size (rocs-4.8.4.tar.xz) = 665416 bytes
diff --git a/misc/step/Makefile b/misc/step/Makefile
index cba39cdf8cc..e8b86ad13a7 100644
--- a/misc/step/Makefile
+++ b/misc/step/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:53 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:34 markd Exp $
DISTNAME= step-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE interactive physical simulator
diff --git a/misc/step/distinfo b/misc/step/distinfo
index 8aaf8caa817..e86c0b24c69 100644
--- a/misc/step/distinfo
+++ b/misc/step/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:52 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
-SHA1 (step-4.8.2.tar.xz) = 0620924f7683c29e855482af8822067722ced080
-RMD160 (step-4.8.2.tar.xz) = 97515c2e148f68708dcbafefa31631d7a8006e59
-Size (step-4.8.2.tar.xz) = 373140 bytes
+SHA1 (step-4.8.4.tar.xz) = 498d8243309388fa8b59cd968c0c92fc588eda11
+RMD160 (step-4.8.4.tar.xz) = 7e485bed29dc60f0e54fb32a3758437b8658901a
+Size (step-4.8.4.tar.xz) = 377912 bytes
diff --git a/misc/superkaramba/Makefile b/misc/superkaramba/Makefile
index 511e08e2d41..2d13d956115 100644
--- a/misc/superkaramba/Makefile
+++ b/misc/superkaramba/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:44:52 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:35 markd Exp $
DISTNAME= superkaramba-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= misc
COMMENT= KDE desktop widgets
diff --git a/misc/superkaramba/distinfo b/misc/superkaramba/distinfo
index 2fb5bf217c5..d2a70555641 100644
--- a/misc/superkaramba/distinfo
+++ b/misc/superkaramba/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:56 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:35 markd Exp $
-SHA1 (superkaramba-4.8.2.tar.xz) = 5cddf45820903fe3f44873ceda907e100dbdc66b
-RMD160 (superkaramba-4.8.2.tar.xz) = c5a51d89ffd9f95ba0faf3a7de7c5e5327580e52
-Size (superkaramba-4.8.2.tar.xz) = 387348 bytes
+SHA1 (superkaramba-4.8.4.tar.xz) = b013e4bd063790e5970cf798f247edb87d576900
+RMD160 (superkaramba-4.8.4.tar.xz) = 635b59dfde50e3f9b18f4428769563dd43c278f8
+Size (superkaramba-4.8.4.tar.xz) = 394084 bytes
diff --git a/misc/sweeper/Makefile b/misc/sweeper/Makefile
index 01ec156f405..3d63d80073d 100644
--- a/misc/sweeper/Makefile
+++ b/misc/sweeper/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:48 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:34 markd Exp $
DISTNAME= sweeper-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= KDE system cleaner
diff --git a/misc/sweeper/distinfo b/misc/sweeper/distinfo
index 02a3d61f6a2..d718a98bd4f 100644
--- a/misc/sweeper/distinfo
+++ b/misc/sweeper/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
-SHA1 (sweeper-4.8.2.tar.xz) = ddb2eeb947e43e52e166cad962b5b4bddd5efd37
-RMD160 (sweeper-4.8.2.tar.xz) = e9b6665af840b990bdf8ff2569889609e588fea0
-Size (sweeper-4.8.2.tar.xz) = 84248 bytes
+SHA1 (sweeper-4.8.4.tar.xz) = 8a4dd11724ed14987981dfaa60e742cfd80ee6d9
+RMD160 (sweeper-4.8.4.tar.xz) = 8f893ed97a83f7ef33f729495219ec9954387dc1
+Size (sweeper-4.8.4.tar.xz) = 84892 bytes
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 4cce20726ee..08328398085 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2012/06/14 07:44:30 sbd Exp $
+# $NetBSD: Makefile,v 1.31 2012/06/16 04:45:37 markd Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 1
CATEGORIES= multimedia
COMMENT= Multimedia tools for the KDE integrated X11 desktop
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 68fa102dd93..e044c71f68b 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2012/04/15 05:54:59 markd Exp $
+$NetBSD: distinfo,v 1.16 2012/06/16 04:45:37 markd Exp $
-SHA1 (kdemultimedia-4.8.2.tar.xz) = 8f54038cc68f91acef07fed711f83407c113b88b
-RMD160 (kdemultimedia-4.8.2.tar.xz) = 1014f75b0d07ead94ad5b7c1b137cd3245a53c5d
-Size (kdemultimedia-4.8.2.tar.xz) = 1480640 bytes
+SHA1 (kdemultimedia-4.8.4.tar.xz) = dac721e82308a6347d578361e25da7c466a26ba7
+RMD160 (kdemultimedia-4.8.4.tar.xz) = 5d2619d428f6f80cf4de11c5c2636348072e0f96
+Size (kdemultimedia-4.8.4.tar.xz) = 1500644 bytes
SHA1 (patch-ac) = ae443a0f352bf2eaa64c8f258fb5f10b1eaf468a
SHA1 (patch-ad) = 6137e6479ff6b0f16067f88686ae166d7d605f80
SHA1 (patch-af) = c5f9f5a41bc51a7277bb0fbf6a254aa1df75daa3
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 0e9f7341105..b978d99a35f 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2012/06/14 22:09:29 sbd Exp $
+# $NetBSD: Makefile,v 1.36 2012/06/16 04:45:37 markd Exp $
DISTNAME= kdenetwork-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 3
CATEGORIES= net
COMMENT= Network modules for the KDE integrated X11 desktop
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index fcb0e5753fc..fda7260d0e6 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2012/04/15 05:54:58 markd Exp $
+$NetBSD: distinfo,v 1.20 2012/06/16 04:45:37 markd Exp $
-SHA1 (kdenetwork-4.8.2.tar.xz) = a899a9ef1637612a5ec14bb3ff950f3ed565d60e
-RMD160 (kdenetwork-4.8.2.tar.xz) = d48800c6b6d894f551b2ac9d54e31e6277ef7b99
-Size (kdenetwork-4.8.2.tar.xz) = 9092180 bytes
+SHA1 (kdenetwork-4.8.4.tar.xz) = b3926c5cd929cec209421c2f1cb8659cc1c82458
+RMD160 (kdenetwork-4.8.4.tar.xz) = 593ebaa7821ffa9921817ab7ac651040f0d8d44b
+Size (kdenetwork-4.8.4.tar.xz) = 9268552 bytes
SHA1 (patch-aa) = 0359cd86501c57197242c398d63c1fc77c60a4d0
SHA1 (patch-ab) = 0743b3b6c994623c507b8bcd52ee01dad31cf56f
SHA1 (patch-ae) = 765d48550d2d8b7a59a1593a669b0909fef3bd96
diff --git a/print/okular/Makefile b/print/okular/Makefile
index 5c0a533241d..2723e23eab6 100644
--- a/print/okular/Makefile
+++ b/print/okular/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:44:40 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:37 markd Exp $
DISTNAME= okular-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= print
COMMENT= KDE universal document viewer
diff --git a/print/okular/distinfo b/print/okular/distinfo
index ec5d5a6ed47..a1e71c302de 100644
--- a/print/okular/distinfo
+++ b/print/okular/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:56 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:37 markd Exp $
-SHA1 (okular-4.8.2.tar.xz) = 174ff248e3a90246ee84d8aed4014d9864f9f807
-RMD160 (okular-4.8.2.tar.xz) = a8ef7f7ddd49a5eec15ab77248743b63ecbabb10
-Size (okular-4.8.2.tar.xz) = 1100328 bytes
+SHA1 (okular-4.8.4.tar.xz) = 34ff243a4fa77400631aa44b31cbe54910f8091e
+RMD160 (okular-4.8.4.tar.xz) = f210df71bb8021cf26a942ea21d4929eeb533417
+Size (okular-4.8.4.tar.xz) = 1114648 bytes
diff --git a/print/printer-applet/Makefile b/print/printer-applet/Makefile
index 7568b9f14a8..f29716a5735 100644
--- a/print/printer-applet/Makefile
+++ b/print/printer-applet/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:44:49 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:37 markd Exp $
DISTNAME= printer-applet-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= print
COMMENT= KDE printer applet
diff --git a/print/printer-applet/distinfo b/print/printer-applet/distinfo
index b8838fdc9c9..543d6870310 100644
--- a/print/printer-applet/distinfo
+++ b/print/printer-applet/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:55:00 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:37 markd Exp $
-SHA1 (printer-applet-4.8.2.tar.xz) = 92ec65b744d9a303c85b8b2df57f83db1f31a95a
-RMD160 (printer-applet-4.8.2.tar.xz) = 84316e4e2fd929a3a7143155f7acd7cab13c4196
-Size (printer-applet-4.8.2.tar.xz) = 36188 bytes
+SHA1 (printer-applet-4.8.4.tar.xz) = 451bb3d658a447c454918ea5b0299f1e85b8cfd2
+RMD160 (printer-applet-4.8.4.tar.xz) = 4684c2eb7a5956c09cd6d670b9366fa31dd119ae
+Size (printer-applet-4.8.4.tar.xz) = 37072 bytes
diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile
index b1b6b92254f..1882c4f91eb 100644
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 22:09:29 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:37 markd Exp $
DISTNAME= kgpg-${_KDE_VERSION}
-PKGREVISION= 2
CATEGORIES= security
COMMENT= KDE encryption tool
diff --git a/security/kgpg/distinfo b/security/kgpg/distinfo
index 3c9dc241b2a..3bb7581fc57 100644
--- a/security/kgpg/distinfo
+++ b/security/kgpg/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:52 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:37 markd Exp $
-SHA1 (kgpg-4.8.2.tar.xz) = ef4833daa82e277f2336e68c0d586cf180a1510f
-RMD160 (kgpg-4.8.2.tar.xz) = 1f302adeae98d2790a538284c0042617d68da421
-Size (kgpg-4.8.2.tar.xz) = 811072 bytes
+SHA1 (kgpg-4.8.4.tar.xz) = 4b201d0db0d97d258597b0b345848acec5bd0130
+RMD160 (kgpg-4.8.4.tar.xz) = 40b075ed7e0926cd8a6c5672c04204e6aafec211
+Size (kgpg-4.8.4.tar.xz) = 817180 bytes
diff --git a/security/ksecrets/Makefile b/security/ksecrets/Makefile
index 6288e6e6fa3..a5d39f5e076 100644
--- a/security/ksecrets/Makefile
+++ b/security/ksecrets/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:44:27 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:38 markd Exp $
DISTNAME= ksecrets-${_KDE_VERSION}
-PKGREVISION= 2
CATEGORIES= security
COMMENT= KDE secrets service
diff --git a/security/ksecrets/distinfo b/security/ksecrets/distinfo
index bac9a0be623..4db2f32e851 100644
--- a/security/ksecrets/distinfo
+++ b/security/ksecrets/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:58 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
-SHA1 (ksecrets-4.8.2.tar.xz) = 53a13dfd7b6f97195a9519497cd48d3304e6e39d
-RMD160 (ksecrets-4.8.2.tar.xz) = 2f6b99c55a9c515c65340a5a62f5f0d52329975d
-Size (ksecrets-4.8.2.tar.xz) = 146960 bytes
+SHA1 (ksecrets-4.8.4.tar.xz) = d0fd2c601833cf1ffe52760472e22d667a6a6408
+RMD160 (ksecrets-4.8.4.tar.xz) = a6bc00009ea454555fde3e9b282b32a328fb02f6
+Size (ksecrets-4.8.4.tar.xz) = 153268 bytes
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 827c526ecf7..6763275a392 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:48 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:38 markd Exp $
DISTNAME= kwallet-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= security
COMMENT= KDE wallet manager
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index 4bae565c0c8..07b546a7b5d 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:53 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
-SHA1 (kwallet-4.8.2.tar.xz) = 3a9b13fff2c156fb642b2fff1f93180b4b564c20
-RMD160 (kwallet-4.8.2.tar.xz) = cf625ef32db8161ea2f86000e18949e6b38d1d96
-Size (kwallet-4.8.2.tar.xz) = 282036 bytes
+SHA1 (kwallet-4.8.4.tar.xz) = 8c85c9de379f0e8ad8a3dffc2136c6b25c0fa4a9
+RMD160 (kwallet-4.8.4.tar.xz) = 80ef140f7f45df0b80d27f84ccf4a9697f85182d
+Size (kwallet-4.8.4.tar.xz) = 283536 bytes
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 6d507ae6bd2..cb62cb15a8e 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2012/06/14 07:44:53 sbd Exp $
+# $NetBSD: Makefile,v 1.30 2012/06/16 04:45:38 markd Exp $
DISTNAME= filelight-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= Graphical filesystem usage monitor
LICENSE= gnu-gpl-v3
diff --git a/sysutils/filelight/distinfo b/sysutils/filelight/distinfo
index 9fce9c26e67..821bced77ca 100644
--- a/sysutils/filelight/distinfo
+++ b/sysutils/filelight/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/04/15 05:54:57 markd Exp $
+$NetBSD: distinfo,v 1.6 2012/06/16 04:45:38 markd Exp $
-SHA1 (filelight-4.8.2.tar.xz) = 76d8c729e259e2395258f6114e737b07b6671846
-RMD160 (filelight-4.8.2.tar.xz) = 5f50de0f4f927da292e186095a8d1bbf3376bef8
-Size (filelight-4.8.2.tar.xz) = 294740 bytes
+SHA1 (filelight-4.8.4.tar.xz) = 3023e9daa8bc5271bed3f3c08076952bcaf75efd
+RMD160 (filelight-4.8.4.tar.xz) = 86d44193dd1da30b091cadd36dca68283558826d
+Size (filelight-4.8.4.tar.xz) = 296540 bytes
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 7dde766eaa8..74832563b80 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2012/06/14 07:44:51 sbd Exp $
+# $NetBSD: Makefile,v 1.24 2012/06/16 04:45:38 markd Exp $
DISTNAME= kdf-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= show mount points and disk usage under KDE desktop
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index b6f94379689..0677647352e 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2012/04/15 05:54:51 markd Exp $
+$NetBSD: distinfo,v 1.8 2012/06/16 04:45:38 markd Exp $
-SHA1 (kdf-4.8.2.tar.xz) = 50754775bacf562ff53862b2005901501f8eb1c4
-RMD160 (kdf-4.8.2.tar.xz) = 52a770833ef7f3e0f4fda72de9dd464b07c9bc85
-Size (kdf-4.8.2.tar.xz) = 155960 bytes
+SHA1 (kdf-4.8.4.tar.xz) = c83f9659d693f27166519969f85c630fdeaa3d9c
+RMD160 (kdf-4.8.4.tar.xz) = 1ec5a5610f99bdac172dfac0a2e636fcf0d72e56
+Size (kdf-4.8.4.tar.xz) = 157648 bytes
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index eec09b0a6dc..dafa1880177 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:50 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:38 markd Exp $
DISTNAME= kfloppy-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= KDE floppy formatter
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 004a2fdc9c2..4d9dfff9336 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:55 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
-SHA1 (kfloppy-4.8.2.tar.xz) = abbbd2908caeade32912cff7db13a50199fae453
-RMD160 (kfloppy-4.8.2.tar.xz) = 8a281730d8b49bd50cf10a123bedccbcb66a66e8
-Size (kfloppy-4.8.2.tar.xz) = 61044 bytes
+SHA1 (kfloppy-4.8.4.tar.xz) = 597e7d1fa546a898b4e46a9750632be8dc8a01a7
+RMD160 (kfloppy-4.8.4.tar.xz) = e1d67c61fc75a0aad5b9d5554a77a7227eb4ecaf
+Size (kfloppy-4.8.4.tar.xz) = 61860 bytes
diff --git a/time/ktimer/Makefile b/time/ktimer/Makefile
index 5afb9db8239..ce9c7d8056f 100644
--- a/time/ktimer/Makefile
+++ b/time/ktimer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:47 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:38 markd Exp $
DISTNAME= ktimer-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= time
COMMENT= KDE countdown launcher
diff --git a/time/ktimer/distinfo b/time/ktimer/distinfo
index 76958847f23..29be289e35e 100644
--- a/time/ktimer/distinfo
+++ b/time/ktimer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:53 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
-SHA1 (ktimer-4.8.2.tar.xz) = 4e92e995041043a8dcd62caf21ff91d602aaefdf
-RMD160 (ktimer-4.8.2.tar.xz) = 055a4c0ecb54c4d5c2018419428552cdcdaea8c5
-Size (ktimer-4.8.2.tar.xz) = 150540 bytes
+SHA1 (ktimer-4.8.4.tar.xz) = 39e117449beffa8e2a38f7b45f69965a71de3805
+RMD160 (ktimer-4.8.4.tar.xz) = de3b8a3931d92ec42d70bdb8cd2f4f6963eaf814
+Size (ktimer-4.8.4.tar.xz) = 151216 bytes
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index cbcbe45a977..1bbea3ae7f6 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2012/06/14 22:09:29 sbd Exp $
+# $NetBSD: Makefile,v 1.26 2012/06/16 04:45:38 markd Exp $
DISTNAME= kdewebdev-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 2
CATEGORIES= www
COMMENT= HTML editor and tools suitable for experienced web developers
diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo
index 384e03b2e13..1659b9023b8 100644
--- a/www/kdewebdev4/distinfo
+++ b/www/kdewebdev4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2012/04/15 05:54:59 markd Exp $
+$NetBSD: distinfo,v 1.16 2012/06/16 04:45:38 markd Exp $
-SHA1 (kdewebdev-4.8.2.tar.xz) = 34b229bf778109e0cbd10765c0bd7341f95cd46d
-RMD160 (kdewebdev-4.8.2.tar.xz) = 447f7d5bce17a65048cfb1f83be1023eba193dca
-Size (kdewebdev-4.8.2.tar.xz) = 2578972 bytes
+SHA1 (kdewebdev-4.8.4.tar.xz) = bab86ef6c04515a454298cee46eccb25e590f972
+RMD160 (kdewebdev-4.8.4.tar.xz) = 9397b030bc2ff44cc30e5227183cfe654a83c417
+Size (kdewebdev-4.8.4.tar.xz) = 2603352 bytes
SHA1 (patch-klinkstatus_src_CMakeLists.txt) = b3698f7edde82552e0395a27df980d0e58ce0994
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index b47796b6d31..039f48ba28a 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:43:33 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:38 markd Exp $
DISTNAME= kactivities-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= KDE Activity Manager
diff --git a/x11/kactivities/PLIST b/x11/kactivities/PLIST
index b49a0fe047c..9a4595bb387 100644
--- a/x11/kactivities/PLIST
+++ b/x11/kactivities/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:01 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/06/16 04:45:38 markd Exp $
bin/kactivitymanagerd
include/KDE/KActivities/Consumer
include/KDE/KActivities/Controller
@@ -14,6 +14,7 @@ lib/cmake/KActivities/KActivitiesConfigVersion.cmake
lib/cmake/KActivities/KActivitiesLibraryTargets-relwithdebinfo.cmake
lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
lib/kde4/activitymanager_plugin_dummy.so
+lib/kde4/activitymanager_plugin_globalshortcuts.so
lib/kde4/activitymanager_plugin_nepomuk.so
lib/kde4/activitymanager_plugin_slc.so
lib/libkactivities.so
@@ -21,6 +22,7 @@ lib/libkactivities.so.6
lib/libkactivities.so.6.0.0
lib/pkgconfig/libkactivities.pc
share/kde4/services/activitymanager-plugin-dummy.desktop
+share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
share/kde4/services/activitymanager-plugin-nepomuk.desktop
share/kde4/services/activitymanager-plugin-slc.desktop
share/kde4/services/kactivitymanagerd.desktop
diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo
index 9a269e31125..2615d43f28c 100644
--- a/x11/kactivities/distinfo
+++ b/x11/kactivities/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
-SHA1 (kactivities-4.8.2.tar.xz) = e97d0b82661fd3d886b87d673d7a1191073af7ff
-RMD160 (kactivities-4.8.2.tar.xz) = 265973e76c23cb8fb038ab16e8c01647232baced
-Size (kactivities-4.8.2.tar.xz) = 37472 bytes
+SHA1 (kactivities-4.8.4.tar.xz) = 3f42c18bae5a1d6bbd7fca471d8b4f9755875e06
+RMD160 (kactivities-4.8.4.tar.xz) = 0b5c95876f507e990b8d3e98f1964ad72b1c2c91
+Size (kactivities-4.8.4.tar.xz) = 42396 bytes
diff --git a/x11/kde-baseapps4/Makefile b/x11/kde-baseapps4/Makefile
index 931ea076a46..ef8dc696b7c 100644
--- a/x11/kde-baseapps4/Makefile
+++ b/x11/kde-baseapps4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2012/06/14 07:44:27 sbd Exp $
+# $NetBSD: Makefile,v 1.5 2012/06/16 04:45:39 markd Exp $
DISTNAME= kde-baseapps-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= Base modules for the KDE 4 integrated X11 desktop
diff --git a/x11/kde-baseapps4/PLIST b/x11/kde-baseapps4/PLIST
index 6c848ea06fd..a9ad59542ab 100644
--- a/x11/kde-baseapps4/PLIST
+++ b/x11/kde-baseapps4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:51 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/06/16 04:45:39 markd Exp $
bin/dolphin
bin/fsview
bin/kbookmarkmerger
@@ -117,6 +117,7 @@ share/doc/kde/HTML/en/dolphin/common
share/doc/kde/HTML/en/dolphin/default-ui.png
share/doc/kde/HTML/en/dolphin/index.cache.bz2
share/doc/kde/HTML/en/dolphin/index.docbook
+share/doc/kde/HTML/en/dolphin/grouping-view.png
share/doc/kde/HTML/en/dolphin/locationbar-breadcrumb.png
share/doc/kde/HTML/en/dolphin/locationbar-context-menu.png
share/doc/kde/HTML/en/dolphin/locationbar-editable.png
diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo
index f66f7bc4e75..af1c38f87c9 100644
--- a/x11/kde-baseapps4/distinfo
+++ b/x11/kde-baseapps4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:39 markd Exp $
-SHA1 (kde-baseapps-4.8.2.tar.xz) = 13dc2e6c8639feadc9a5a334d0720a60b1e3ccb6
-RMD160 (kde-baseapps-4.8.2.tar.xz) = 31def2b20abfc1df8cf03c830b7d7c01ba42678b
-Size (kde-baseapps-4.8.2.tar.xz) = 2663404 bytes
+SHA1 (kde-baseapps-4.8.4.tar.xz) = a1d6951b27c868c738a36dbd21702b658f3d6245
+RMD160 (kde-baseapps-4.8.4.tar.xz) = 779de14275b475bf556d47515b5219119c7ac969
+Size (kde-baseapps-4.8.4.tar.xz) = 2780696 bytes
diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile
index b6ac45f184b..9993494e6b6 100644
--- a/x11/kde-runtime4/Makefile
+++ b/x11/kde-runtime4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2012/06/14 07:43:32 sbd Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/16 04:45:38 markd Exp $
DISTNAME= kde-runtime-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 2
CATEGORIES= x11
COMMENT= Runtime requirements for the KDE integrated X11 desktop
diff --git a/x11/kde-runtime4/PLIST b/x11/kde-runtime4/PLIST
index aa02fee06ea..08effc5c84e 100644
--- a/x11/kde-runtime4/PLIST
+++ b/x11/kde-runtime4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:54 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/06/16 04:45:38 markd Exp $
bin/kcmshell4
bin/kde-cp
bin/kde-mv
@@ -369,6 +369,11 @@ share/doc/kde/HTML/en/kcontrol/icons/install-theme.png
share/doc/kde/HTML/en/kcontrol/icons/main.png
share/doc/kde/HTML/en/kcontrol/icons/size.png
share/doc/kde/HTML/en/kcontrol/icons/use-of-icons.png
+share/doc/kde/HTML/en/kcontrol/kcm_ssl/common
+share/doc/kde/HTML/en/kcontrol/kcm_ssl/details.png
+share/doc/kde/HTML/en/kcontrol/kcm_ssl/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/kcm_ssl/index.docbook
+share/doc/kde/HTML/en/kcontrol/kcm_ssl/module.png
share/doc/kde/HTML/en/kcontrol/kcmcgi/common
share/doc/kde/HTML/en/kcontrol/kcmcgi/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/kcmcgi/index.docbook
diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo
index 05b82bf3d40..d0047f036de 100644
--- a/x11/kde-runtime4/distinfo
+++ b/x11/kde-runtime4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
-SHA1 (kde-runtime-4.8.2.tar.xz) = d2931b8a7c744d6c2fc95d46b2195ed2cd253c00
-RMD160 (kde-runtime-4.8.2.tar.xz) = 30debc525c2e043babb30ef9e5f56fec68e13599
-Size (kde-runtime-4.8.2.tar.xz) = 5849868 bytes
+SHA1 (kde-runtime-4.8.4.tar.xz) = 557fada748de52e5275058c50ec3cf8a652c0001
+RMD160 (kde-runtime-4.8.4.tar.xz) = 258f7d62a763a4df1494f6eecfb8b9f1e3e18f7f
+Size (kde-runtime-4.8.4.tar.xz) = 6060492 bytes
SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
SHA1 (patch-ac) = fadc0c0d3b7c8f893a9249724f26e2fc2c7f0f1e
SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile
index 253114c6bff..efbc8a5b5bb 100644
--- a/x11/kde-workspace4/Makefile
+++ b/x11/kde-workspace4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/06/14 22:09:30 sbd Exp $
+# $NetBSD: Makefile,v 1.6 2012/06/16 04:45:39 markd Exp $
DISTNAME= kde-workspace-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 2
CATEGORIES= x11
COMMENT= Base workspace for the KDE 4 integrated X11 desktop
diff --git a/x11/kde-workspace4/PLIST b/x11/kde-workspace4/PLIST
index f77abfd89a1..65c79932be8 100644
--- a/x11/kde-workspace4/PLIST
+++ b/x11/kde-workspace4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/06/16 04:45:39 markd Exp $
bin/genkdmconf
bin/kaccess
bin/kapplymousetheme
@@ -553,6 +553,16 @@ share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook
share/doc/kde/HTML/en/kcontrol/keys/common
share/doc/kde/HTML/en/kcontrol/keys/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/keys/index.docbook
+share/doc/kde/HTML/en/kcontrol/khotkeys/common
+share/doc/kde/HTML/en/kcontrol/khotkeys/groups-comment.png
+share/doc/kde/HTML/en/kcontrol/khotkeys/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/khotkeys/index.docbook
+share/doc/kde/HTML/en/kcontrol/khotkeys/manage-export.png
+share/doc/kde/HTML/en/kcontrol/khotkeys/settings.png
+share/doc/kde/HTML/en/kcontrol/khotkeys/shortcuts-action-command.png
+share/doc/kde/HTML/en/kcontrol/khotkeys/shortcuts-action-keyboard.png
+share/doc/kde/HTML/en/kcontrol/khotkeys/shortcuts-trigger-keyboard.png
+share/doc/kde/HTML/en/kcontrol/khotkeys/shortcuts-trigger-mouse.png
share/doc/kde/HTML/en/kcontrol/kwincompositing/common
share/doc/kde/HTML/en/kcontrol/kwincompositing/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/kwincompositing/index.docbook
@@ -571,6 +581,11 @@ share/doc/kde/HTML/en/kcontrol/kwintabbox/index.docbook
share/doc/kde/HTML/en/kcontrol/mouse/common
share/doc/kde/HTML/en/kcontrol/mouse/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/mouse/index.docbook
+share/doc/kde/HTML/en/kcontrol/multiplemonitors/common
+share/doc/kde/HTML/en/kcontrol/multiplemonitors/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/multiplemonitors/index.docbook
+share/doc/kde/HTML/en/kcontrol/multiplemonitors/multiplemonitors-error.png
+share/doc/kde/HTML/en/kcontrol/multiplemonitors/multiplemonitors.png
share/doc/kde/HTML/en/kcontrol/paths/common
share/doc/kde/HTML/en/kcontrol/paths/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/paths/index.docbook
@@ -598,9 +613,47 @@ share/doc/kde/HTML/en/kcontrol/splashscreen/splash-main.png
share/doc/kde/HTML/en/kcontrol/windowbehaviour/common
share/doc/kde/HTML/en/kcontrol/windowbehaviour/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/windowbehaviour/index.docbook
+share/doc/kde/HTML/en/kcontrol/windowspecific/Face-smile.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/akgregator-info.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/akregator-attributes.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/akregator-fav.png
share/doc/kde/HTML/en/kcontrol/windowspecific/common
+share/doc/kde/HTML/en/kcontrol/windowspecific/config-win-behavior.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/emacs-attribute.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/emacs-info.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/focus-stealing-pop2top-attribute.png
share/doc/kde/HTML/en/kcontrol/windowspecific/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/windowspecific/index.docbook
+share/doc/kde/HTML/en/kcontrol/windowspecific/knotes-attribute.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/knotes-info.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kopete-attribute-2.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kopete-chat-attribute.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kopete-chat-info.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kopete-info.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kwin-detect-window.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kwin-kopete-rules.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kwin-rule-editor.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kwin-rules-main-n-akregator.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kwin-rules-main.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kwin-rules-ordering.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kwin-window-attributes.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/kwin-window-matching.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/pager-4-desktops.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/tbird-compose-attribute.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/tbird-compose-info.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/tbird-main-attribute.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/tbird-main-info.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/tbird-reminder-attribute-2.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/tbird-reminder-info.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/window-matching-emacs.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/window-matching-init.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/window-matching-knotes.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/window-matching-kopete-chat.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/window-matching-kopete.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/window-matching-ready-akregator.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/window-matching-tbird-compose.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/window-matching-tbird-main.png
+share/doc/kde/HTML/en/kcontrol/windowspecific/window-matching-tbird-reminder.png
share/doc/kde/HTML/en/kcontrol/workspaceoptions/common
share/doc/kde/HTML/en/kcontrol/workspaceoptions/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/workspaceoptions/index.docbook
diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo
index b1dc9d36f4a..4de8e8d0615 100644
--- a/x11/kde-workspace4/distinfo
+++ b/x11/kde-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 05:55:00 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/06/16 04:45:39 markd Exp $
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -9,9 +9,9 @@ Size (Daemon.png) = 15725 bytes
SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (kde-workspace-4.8.2.tar.xz) = 3cd36ed633def0db74ad872a0d6385bf06662121
-RMD160 (kde-workspace-4.8.2.tar.xz) = 3afa0b2bb7b037cadee947382b009a76c8fad843
-Size (kde-workspace-4.8.2.tar.xz) = 34081864 bytes
+SHA1 (kde-workspace-4.8.4.tar.xz) = a732ceacf34dfb79c8ab243f17cd5a70b9183212
+RMD160 (kde-workspace-4.8.4.tar.xz) = 3d7e1bf7dfd094dea8129681ac311db137b32710
+Size (kde-workspace-4.8.4.tar.xz) = 35841792 bytes
SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
diff --git a/x11/kde4-l10n-de/Makefile b/x11/kde4-l10n-de/Makefile
index 848a3bf86d8..c34ec559938 100644
--- a/x11/kde4-l10n-de/Makefile
+++ b/x11/kde4-l10n-de/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:44:54 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:39 markd Exp $
KDE_LANGUAGE= German
KDE_LANGCODE= de
-PKGREVISION= 1
.include "../../meta-pkgs/kde4/l10n.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde4-l10n-de/PLIST b/x11/kde4-l10n-de/PLIST
index 01a2fcd74d7..ab075181b07 100644
--- a/x11/kde4-l10n-de/PLIST
+++ b/x11/kde4-l10n-de/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/04/15 05:55:00 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/06/16 04:45:39 markd Exp $
man/de/man1/adddebug.1
man/de/man1/ark.1
man/de/man1/cheatmake.1
@@ -392,6 +392,9 @@ share/doc/kde/HTML/de/kcontrol/joystick/index.docbook
share/doc/kde/HTML/de/kcontrol/kamera/common
share/doc/kde/HTML/de/kcontrol/kamera/index.cache.bz2
share/doc/kde/HTML/de/kcontrol/kamera/index.docbook
+share/doc/kde/HTML/de/kcontrol/kcm_ssl/common
+share/doc/kde/HTML/de/kcontrol/kcm_ssl/index.cache.bz2
+share/doc/kde/HTML/de/kcontrol/kcm_ssl/index.docbook
share/doc/kde/HTML/de/kcontrol/kcmaccess/common
share/doc/kde/HTML/de/kcontrol/kcmaccess/index.cache.bz2
share/doc/kde/HTML/de/kcontrol/kcmaccess/index.docbook
@@ -425,6 +428,9 @@ share/doc/kde/HTML/de/kcontrol/keys/index.docbook
share/doc/kde/HTML/de/kcontrol/kgamma/common
share/doc/kde/HTML/de/kcontrol/kgamma/index.cache.bz2
share/doc/kde/HTML/de/kcontrol/kgamma/index.docbook
+share/doc/kde/HTML/de/kcontrol/khotkeys/common
+share/doc/kde/HTML/de/kcontrol/khotkeys/index.cache.bz2
+share/doc/kde/HTML/de/kcontrol/khotkeys/index.docbook
share/doc/kde/HTML/de/kcontrol/khtml-adblock/common
share/doc/kde/HTML/de/kcontrol/khtml-adblock/index.cache.bz2
share/doc/kde/HTML/de/kcontrol/khtml-adblock/index.docbook
@@ -475,6 +481,9 @@ share/doc/kde/HTML/de/kcontrol/language/index.docbook
share/doc/kde/HTML/de/kcontrol/mouse/common
share/doc/kde/HTML/de/kcontrol/mouse/index.cache.bz2
share/doc/kde/HTML/de/kcontrol/mouse/index.docbook
+share/doc/kde/HTML/de/kcontrol/multiplemonitors/common
+share/doc/kde/HTML/de/kcontrol/multiplemonitors/index.cache.bz2
+share/doc/kde/HTML/de/kcontrol/multiplemonitors/index.docbook
share/doc/kde/HTML/de/kcontrol/nepomuk/common
share/doc/kde/HTML/de/kcontrol/nepomuk/index.cache.bz2
share/doc/kde/HTML/de/kcontrol/nepomuk/index.docbook
@@ -1528,6 +1537,9 @@ share/doc/kde/HTML/de/sweeper/common
share/doc/kde/HTML/de/sweeper/index.cache.bz2
share/doc/kde/HTML/de/sweeper/index.docbook
share/doc/kde/HTML/de/sweeper/sweeper.png
+share/doc/kde/HTML/de/system-config-printer-kde/common
+share/doc/kde/HTML/de/system-config-printer-kde/index.cache.bz2
+share/doc/kde/HTML/de/system-config-printer-kde/index.docbook
share/doc/kde/HTML/de/systemsettings/common
share/doc/kde/HTML/de/systemsettings/index.cache.bz2
share/doc/kde/HTML/de/systemsettings/index.docbook
diff --git a/x11/kde4-l10n-de/distinfo b/x11/kde4-l10n-de/distinfo
index 87b3882aaf8..2992bead6f3 100644
--- a/x11/kde4-l10n-de/distinfo
+++ b/x11/kde4-l10n-de/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2012/04/15 05:55:00 markd Exp $
+$NetBSD: distinfo,v 1.16 2012/06/16 04:45:39 markd Exp $
-SHA1 (kde-l10n-de-4.8.2.tar.xz) = 8878e7331033e513cc5038f2b007cb4a0bab9c8b
-RMD160 (kde-l10n-de-4.8.2.tar.xz) = c750803d190cdd3488539a10ee60cf88dfa75211
-Size (kde-l10n-de-4.8.2.tar.xz) = 36358272 bytes
+SHA1 (kde-l10n-de-4.8.4.tar.xz) = 034e1d9276eb75735681e2d9ae71edfe7bdf8767
+RMD160 (kde-l10n-de-4.8.4.tar.xz) = c48a4dead7ce809180180528e3482d2712bdb90a
+Size (kde-l10n-de-4.8.4.tar.xz) = 36515420 bytes
diff --git a/x11/kde4-l10n-en_GB/Makefile b/x11/kde4-l10n-en_GB/Makefile
index defa4d68492..d6196143073 100644
--- a/x11/kde4-l10n-en_GB/Makefile
+++ b/x11/kde4-l10n-en_GB/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:44:54 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:39 markd Exp $
KDE_LANGUAGE= English (Great Britain)
KDE_LANGCODE= en_GB
-PKGREVISION= 1
.include "../../meta-pkgs/kde4/l10n.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde4-l10n-en_GB/distinfo b/x11/kde4-l10n-en_GB/distinfo
index 4a87366187f..0ddda0caea5 100644
--- a/x11/kde4-l10n-en_GB/distinfo
+++ b/x11/kde4-l10n-en_GB/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2012/04/15 05:55:00 markd Exp $
+$NetBSD: distinfo,v 1.16 2012/06/16 04:45:39 markd Exp $
-SHA1 (kde-l10n-en_GB-4.8.2.tar.xz) = 22784b4eac2b9f535fbefc246a36d077e206ec74
-RMD160 (kde-l10n-en_GB-4.8.2.tar.xz) = 0046955e55319c38fff3ef7657f0c847a41d25b3
-Size (kde-l10n-en_GB-4.8.2.tar.xz) = 3154732 bytes
+SHA1 (kde-l10n-en_GB-4.8.4.tar.xz) = fc17fb9c322b1de05ef3d1c5b5bbd4b8e2fc0514
+RMD160 (kde-l10n-en_GB-4.8.4.tar.xz) = 58bca659a40b8ac15993e2f635660b2850896e17
+Size (kde-l10n-en_GB-4.8.4.tar.xz) = 3186728 bytes
diff --git a/x11/kde4-l10n-nl/Makefile b/x11/kde4-l10n-nl/Makefile
index 894f7541828..187f50aaba1 100644
--- a/x11/kde4-l10n-nl/Makefile
+++ b/x11/kde4-l10n-nl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:44:54 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/06/16 04:45:39 markd Exp $
KDE_LANGUAGE= Netherlands
KDE_LANGCODE= nl
-PKGREVISION= 1
.include "../../meta-pkgs/kde4/l10n.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde4-l10n-nl/PLIST b/x11/kde4-l10n-nl/PLIST
index 43437a568fc..b25e0892caa 100644
--- a/x11/kde4-l10n-nl/PLIST
+++ b/x11/kde4-l10n-nl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/04/15 05:55:00 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/06/16 04:45:39 markd Exp $
man/nl/man1/adddebug.1
man/nl/man1/ark.1
man/nl/man1/cheatmake.1
@@ -330,6 +330,9 @@ share/doc/kde/HTML/nl/kcontrol/joystick/index.docbook
share/doc/kde/HTML/nl/kcontrol/kamera/common
share/doc/kde/HTML/nl/kcontrol/kamera/index.cache.bz2
share/doc/kde/HTML/nl/kcontrol/kamera/index.docbook
+share/doc/kde/HTML/nl/kcontrol/kcm_ssl/common
+share/doc/kde/HTML/nl/kcontrol/kcm_ssl/index.cache.bz2
+share/doc/kde/HTML/nl/kcontrol/kcm_ssl/index.docbook
share/doc/kde/HTML/nl/kcontrol/kcmaccess/common
share/doc/kde/HTML/nl/kcontrol/kcmaccess/index.cache.bz2
share/doc/kde/HTML/nl/kcontrol/kcmaccess/index.docbook
@@ -363,6 +366,9 @@ share/doc/kde/HTML/nl/kcontrol/keys/index.docbook
share/doc/kde/HTML/nl/kcontrol/kgamma/common
share/doc/kde/HTML/nl/kcontrol/kgamma/index.cache.bz2
share/doc/kde/HTML/nl/kcontrol/kgamma/index.docbook
+share/doc/kde/HTML/nl/kcontrol/khotkeys/common
+share/doc/kde/HTML/nl/kcontrol/khotkeys/index.cache.bz2
+share/doc/kde/HTML/nl/kcontrol/khotkeys/index.docbook
share/doc/kde/HTML/nl/kcontrol/khtml-adblock/common
share/doc/kde/HTML/nl/kcontrol/khtml-adblock/index.cache.bz2
share/doc/kde/HTML/nl/kcontrol/khtml-adblock/index.docbook
@@ -404,6 +410,9 @@ share/doc/kde/HTML/nl/kcontrol/language/index.docbook
share/doc/kde/HTML/nl/kcontrol/mouse/common
share/doc/kde/HTML/nl/kcontrol/mouse/index.cache.bz2
share/doc/kde/HTML/nl/kcontrol/mouse/index.docbook
+share/doc/kde/HTML/nl/kcontrol/multiplemonitors/common
+share/doc/kde/HTML/nl/kcontrol/multiplemonitors/index.cache.bz2
+share/doc/kde/HTML/nl/kcontrol/multiplemonitors/index.docbook
share/doc/kde/HTML/nl/kcontrol/nepomuk/common
share/doc/kde/HTML/nl/kcontrol/nepomuk/index.cache.bz2
share/doc/kde/HTML/nl/kcontrol/nepomuk/index.docbook
@@ -1161,6 +1170,9 @@ share/doc/kde/HTML/nl/step/tutorials.docbook
share/doc/kde/HTML/nl/sweeper/common
share/doc/kde/HTML/nl/sweeper/index.cache.bz2
share/doc/kde/HTML/nl/sweeper/index.docbook
+share/doc/kde/HTML/nl/system-config-printer-kde/common
+share/doc/kde/HTML/nl/system-config-printer-kde/index.cache.bz2
+share/doc/kde/HTML/nl/system-config-printer-kde/index.docbook
share/doc/kde/HTML/nl/systemsettings/common
share/doc/kde/HTML/nl/systemsettings/index.cache.bz2
share/doc/kde/HTML/nl/systemsettings/index.docbook
diff --git a/x11/kde4-l10n-nl/distinfo b/x11/kde4-l10n-nl/distinfo
index dc3625ab1e2..003db5a5dcb 100644
--- a/x11/kde4-l10n-nl/distinfo
+++ b/x11/kde4-l10n-nl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2012/04/15 05:55:00 markd Exp $
+$NetBSD: distinfo,v 1.16 2012/06/16 04:45:39 markd Exp $
-SHA1 (kde-l10n-nl-4.8.2.tar.xz) = d6f5682a8f091338a1fb66784309b8c9c67fa795
-RMD160 (kde-l10n-nl-4.8.2.tar.xz) = 0ad3e5e0240526545f09bf9f03796ade9291d3d5
-Size (kde-l10n-nl-4.8.2.tar.xz) = 15821708 bytes
+SHA1 (kde-l10n-nl-4.8.4.tar.xz) = c79535244f22fb3743a3ae6c992ee45f94395df5
+RMD160 (kde-l10n-nl-4.8.4.tar.xz) = 1f012bf1c374072ad3f2ae4eb65bedc9d317e04e
+Size (kde-l10n-nl-4.8.4.tar.xz) = 15959132 bytes
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index c51c8ebd8f3..3a1394494d0 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2012/06/14 07:43:17 sbd Exp $
+# $NetBSD: Makefile,v 1.43 2012/06/16 04:45:39 markd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index b5b62928401..f16292925d5 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/04/15 05:54:53 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/06/16 04:45:39 markd Exp $
bin/checkXML
bin/kbuildsycoca4
bin/kconfig_compiler
@@ -603,6 +603,7 @@ include/KDE/KRandomSequence
include/KDE/KRatingWidget
include/KDE/KRecentDocument
include/KDE/KRecentFilesAction
+include/KDE/KRecursiveFilterProxyModel
include/KDE/KRemoteEncoding
include/KDE/KReplace
include/KDE/KReplaceDialog
@@ -1905,6 +1906,10 @@ include/threadweaver/ThreadWeaver.h
include/threadweaver/WeaverInterface.h
include/threadweaver/WeaverObserver.h
include/threadweaver/threadweaver_export.h
+lib/cmake/KDeclarative/KDeclarativeConfig.cmake
+lib/cmake/KDeclarative/KDeclarativeConfigVersion.cmake
+lib/cmake/KDeclarative/KDeclarativeLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KDeclarative/KDeclarativeLibraryTargets.cmake
lib/kde4/emoticonstheme_adium.so
lib/kde4/emoticonstheme_kde.so
lib/kde4/emoticonstheme_pidgin.so
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 5a5a898e0c2..982686a2b6b 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.28 2012/04/19 21:10:59 joerg Exp $
+$NetBSD: distinfo,v 1.29 2012/06/16 04:45:39 markd Exp $
-SHA1 (kdelibs-4.8.2.tar.xz) = f844ae0877880563361144d9577706064c3483e7
-RMD160 (kdelibs-4.8.2.tar.xz) = 9c52ef42274f4ed5fd82a749ed7cf78f482c9c67
-Size (kdelibs-4.8.2.tar.xz) = 11966308 bytes
+SHA1 (kdelibs-4.8.4.tar.xz) = 35cd199a30d84eb37b2b213fed5ee3adf810ea49
+RMD160 (kdelibs-4.8.4.tar.xz) = dba94c16eb0df9d6a4fccefc8097f39f4b63e9ec
+Size (kdelibs-4.8.4.tar.xz) = 12182912 bytes
+SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
@@ -17,4 +18,6 @@ SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be
SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
-SHA1 (patch-kjs_wtf_HashSet.h) = 5ffa5db540a72c95e94c4c16cc0fe521d1f2516a
+SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
+SHA1 (patch-nepomuk_core_nepomukmainmodel.cpp) = bba701025aa1d33b9d6ce4b6d1fec2a92b4f5552
+SHA1 (patch-nepomuk_core_resourcemanager.cpp) = 99a1e6c319f4798e5c929e77bd6717ffb2e3f571
diff --git a/x11/kdelibs4/patches/patch-ConfigureChecks.cmake b/x11/kdelibs4/patches/patch-ConfigureChecks.cmake
new file mode 100644
index 00000000000..e5574f38d6d
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-ConfigureChecks.cmake
@@ -0,0 +1,14 @@
+$NetBSD: patch-ConfigureChecks.cmake,v 1.1 2012/06/16 04:45:40 markd Exp $
+
+NetBSD loginx() complains if ut_type not set before calling
+
+--- ConfigureChecks.cmake.orig 2012-06-06 20:54:04.000000000 +0000
++++ ConfigureChecks.cmake
+@@ -163,6 +163,7 @@ if (UNIX)
+ endif (HAVE_UTMPX)
+ if (login_in_libc OR login_in_libutil)
+ set(HAVE_LOGIN 1)
++ check_struct_member("struct ${utmp}" "ut_type" "${utmp}.h" HAVE_STRUCT_UTMP_UT_TYPE)
+ else (login_in_libc OR login_in_libutil)
+ set(HAVE_LOGIN)
+ check_struct_member("struct ${utmp}" "ut_type" "${utmp}.h" HAVE_STRUCT_UTMP_UT_TYPE)
diff --git a/x11/kdelibs4/patches/patch-kjs_wtf_HashSet.h b/x11/kdelibs4/patches/patch-kjs_wtf_HashSet.h
deleted file mode 100644
index 9d40ce57c6c..00000000000
--- a/x11/kdelibs4/patches/patch-kjs_wtf_HashSet.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-kjs_wtf_HashSet.h,v 1.1 2012/04/19 21:10:59 joerg Exp $
-
---- kjs/wtf/HashSet.h.orig 2012-04-19 16:21:41.000000000 +0000
-+++ kjs/wtf/HashSet.h
-@@ -181,7 +181,7 @@ namespace WTF {
- inline HashSet<Value, HashFunctions, Traits>::find(const T& value)
- {
- typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter;
-- return m_impl.find<T, Adapter>(value);
-+ return m_impl.template find<T, Adapter>(value);
- }
-
- template<typename Value, typename HashFunctions, typename Traits>
-@@ -190,7 +190,7 @@ namespace WTF {
- inline HashSet<Value, HashFunctions, Traits>::find(const T& value) const
- {
- typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter;
-- return m_impl.find<T, Adapter>(value);
-+ return m_impl.template find<T, Adapter>(value);
- }
-
- template<typename Value, typename HashFunctions, typename Traits>
-@@ -198,7 +198,7 @@ namespace WTF {
- inline bool HashSet<Value, HashFunctions, Traits>::contains(const T& value) const
- {
- typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter;
-- return m_impl.contains<T, Adapter>(value);
-+ return m_impl.template contains<T, Adapter>(value);
- }
-
- template<typename T, typename U, typename V>
diff --git a/x11/kdelibs4/patches/patch-kpty_kpty.cpp b/x11/kdelibs4/patches/patch-kpty_kpty.cpp
new file mode 100644
index 00000000000..a285a54eb29
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kpty_kpty.cpp
@@ -0,0 +1,26 @@
+$NetBSD: patch-kpty_kpty.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
+
+NetBSD loginx() complains if ut_type not set before calling
+
+--- kpty/kpty.cpp.orig 2012-06-06 20:49:52.000000000 +0000
++++ kpty/kpty.cpp
+@@ -543,6 +543,9 @@ void KPty::login(const char *user, const
+ l_struct.ut_time = time(0);
+ # endif
+
++# ifdef HAVE_STRUCT_UTMP_UT_TYPE
++ l_struct.ut_type = USER_PROCESS;
++# endif
+ # ifdef HAVE_LOGIN
+ # ifdef HAVE_LOGINX
+ ::loginx(&l_struct);
+@@ -550,9 +553,6 @@ void KPty::login(const char *user, const
+ ::login(&l_struct);
+ # endif
+ # else
+-# ifdef HAVE_STRUCT_UTMP_UT_TYPE
+- l_struct.ut_type = USER_PROCESS;
+-# endif
+ # ifdef HAVE_STRUCT_UTMP_UT_PID
+ l_struct.ut_pid = getpid();
+ # ifdef HAVE_STRUCT_UTMP_UT_SESSION
diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp
new file mode 100644
index 00000000000..177635f110c
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-nepomuk_core_nepomukmainmodel.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
+
+ID: 76e0376d7582cfe5b898c56bf3779ca2279dace8
+Revert "Disconnect before re-connecting. Soprano does not do that for us."
+
+--- nepomuk/core/nepomukmainmodel.cpp.orig 2012-06-06 20:49:52.000000000 +0000
++++ nepomuk/core/nepomukmainmodel.cpp
+@@ -97,7 +97,6 @@ public:
+ if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
+ delete localSocketModel;
+ localSocketModel = 0;
+- localSocketClient.disconnect();
+ QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
+ kDebug() << "Connecting to local socket" << socketName;
+ if ( localSocketClient.connect( socketName ) ) {
diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp
new file mode 100644
index 00000000000..e36e50c6bd8
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-nepomuk_core_resourcemanager.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
+
+ID: 528144c444ea983470b1cff678d40b1967bce3d5
+Increase the ResourceManager cache size to 10000
+
+--- nepomuk/core/resourcemanager.cpp.orig 2012-06-06 20:49:52.000000000 +0000
++++ nepomuk/core/resourcemanager.cpp
+@@ -178,7 +178,7 @@ QList<Nepomuk::ResourceData*> Nepomuk::R
+
+ bool Nepomuk::ResourceManagerPrivate::dataCacheFull() const
+ {
+- return dataCnt >= 1000;
++ return dataCnt >= 10000;
+ }
+
+
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index b14cd82de94..2b947c7523f 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 07:44:52 sbd Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/16 04:45:39 markd Exp $
DISTNAME= konsole-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= x11
COMMENT= a terminal emulator for the K Desktop Environment
diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo
index 71c6df33c4f..939e216c06f 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:54 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:39 markd Exp $
-SHA1 (konsole-4.8.2.tar.xz) = 4e9e9d373ce77160b098dbf4fe24b319e7942ff1
-RMD160 (konsole-4.8.2.tar.xz) = 1295bb2da2ded97da333691e032e62f642c19445
-Size (konsole-4.8.2.tar.xz) = 434900 bytes
+SHA1 (konsole-4.8.4.tar.xz) = a5900aa089a28fcaa69b45cfc7b46f556a38bd11
+RMD160 (konsole-4.8.4.tar.xz) = c4fa6494ea63cc7a8d7ad00f3987698f87dd509d
+Size (konsole-4.8.4.tar.xz) = 441968 bytes
SHA1 (patch-src_ProcessInfo.cpp) = aa0c1d6bfa7462681b82bdee4609e0cf26211300
diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile
index 489abdab6d4..c6cf2f95a17 100644
--- a/x11/py-kde4/Makefile
+++ b/x11/py-kde4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2012/06/15 23:06:04 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2012/06/16 04:45:39 markd Exp $
PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION}
-PKGREVISION= 3
DISTNAME= pykde4-${_KDE_VERSION}
CATEGORIES= misc
COMMENT= Python bindings for the KDE integrated X11 desktop
diff --git a/x11/py-kde4/distinfo b/x11/py-kde4/distinfo
index 8b43ad2d264..0cda7c552fe 100644
--- a/x11/py-kde4/distinfo
+++ b/x11/py-kde4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2012/04/15 05:54:51 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/06/16 04:45:39 markd Exp $
-SHA1 (pykde4-4.8.2.tar.xz) = 7d1a41e00794dba160ce8e2a3f750c9a4298ef15
-RMD160 (pykde4-4.8.2.tar.xz) = 24f9b9c114eedc3c5219d0f390ca3bd9cae30067
-Size (pykde4-4.8.2.tar.xz) = 2057044 bytes
+SHA1 (pykde4-4.8.4.tar.xz) = e629d7a1d7d1aa1d1dd24769dc5412a60b6ac256
+RMD160 (pykde4-4.8.4.tar.xz) = 563cca881a3f9c298be1c18979b6fcbc5eb8dcc0
+Size (pykde4-4.8.4.tar.xz) = 2111428 bytes
SHA1 (patch-CMakeLists.txt) = 6981a91671511739e63568d7bc2ee8899d28f8a9
SHA1 (patch-__init__.py) = 721287a0ec82b79ea4a502526ed98ba44c6d979f