29 files changed, 343 insertions, 144 deletions

diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde
index 5caac1294006..da73119350fd 100644
--- a/x11/kde3/Makefile.kde
+++ b/x11/kde3/Makefile.kde
@@ -11,6 +11,38 @@ CONFIGURE_ARGS?=
 # Stop the docs from regenerating.
 COPY=	-c -p
 
+# For ports that have I18N components only.
+.if defined(KDE_I18N)
+_NO_KDE_FINAL=	yes
+_NO_KDE_NDEBUG=	yes
+.endif
+
+# Unfortunately, this feature doesn't work right now due to binary files.
+_NO_KDE_PATCHUP=yes
+
+# Start options here.
+.if !defined(_NO_KDE_PATCHUP)
+.if !defined(KDE_PATCHFROM_VER)
+PATCHFROM_VER=	${KDE_ORIGVER}
+.else
+PATCHFROM_VER=	${KDE_PATCHFROM_VER}
+.endif
+.if !defined(KDE_PATCHTO_VER)
+PATCHTO_VER=	${KDE_VERSION}
+.else
+PATCHTO_VER=	${KDE_PATCHTO_VER}
+.endif
+.if !defined(KDE_DISTNAME)
+DISTNAME=	${PORTNAME}-${PATCHFROM_VER}
+.else
+DISTNAME=	${KDE_DISTNAME}
+.endif
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	will/kde-diffs/${KDE_VERSION}
+PATCHFILES=	${PORTNAME}-${PATCHFROM_VER}-${PATCHTO_VER}.diff.bz2
+PATCH_DIST_STRIP=-p1
+.endif
+
 .if !defined(_NO_KDE_CONFTARGET_HACK)
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 786604e592c1..90854ebb4d7b 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	3.0.1
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index dcd456cdb4a0..2393bf59dc7c 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.0.1.tar.bz2) = 30399832405fa2286f8fb4fd57148b5c
+MD5 (KDE/kdebase-3.0.2.tar.bz2) = db63f6cdb586b64ffe666be2badec940
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index f24b20880fe5..42719af06e8c 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -549,9 +549,9 @@ share/applnk/System/kfmclient_dir.desktop
 share/applnk/System/kfmclient_html.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/konquerorsu.desktop
+share/applnk/System/kpersonalizer.desktop
 share/applnk/System/konsole.desktop
 share/applnk/System/konsolesu.desktop
-share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
@@ -1353,7 +1353,6 @@ share/apps/naughtyapplet/pics/naughty-sad.png
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
-share/autostart/kpersonalizer.desktop
 share/autostart/ktip.desktop
 share/autostart/kwrited.desktop
 share/autostart/panel.desktop
@@ -2157,6 +2156,8 @@ share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
 share/locale/l10n/africa.desktop
+share/locale/l10n/ae/entry.desktop
+share/locale/l10n/ae/flag.png
 share/locale/l10n/ag/entry.desktop
 share/locale/l10n/ag/flag.png
 share/locale/l10n/ar/entry.desktop
@@ -2178,6 +2179,8 @@ share/locale/l10n/be/entry.desktop
 share/locale/l10n/be/flag.png
 share/locale/l10n/bg/entry.desktop
 share/locale/l10n/bg/flag.png
+share/locale/l10n/bh/entry.desktop
+share/locale/l10n/bh/flag.png
 share/locale/l10n/bo/entry.desktop
 share/locale/l10n/bo/flag.png
 share/locale/l10n/br/entry.desktop
@@ -2200,10 +2203,14 @@ share/locale/l10n/cz/entry.desktop
 share/locale/l10n/cz/flag.png
 share/locale/l10n/de/entry.desktop
 share/locale/l10n/de/flag.png
+share/locale/l10n/dj/entry.desktop
+share/locale/l10n/dj/flag.png
 share/locale/l10n/dk/entry.desktop
 share/locale/l10n/dk/flag.png
 share/locale/l10n/do/entry.desktop
 share/locale/l10n/do/flag.png
+share/locale/l10n/dz/entry.desktop
+share/locale/l10n/dz/flag.png
 share/locale/l10n/easteurope.desktop
 share/locale/l10n/ec/entry.desktop
 share/locale/l10n/ec/flag.png
@@ -2257,6 +2264,8 @@ share/locale/l10n/kp/entry.desktop
 share/locale/l10n/kp/flag.png
 share/locale/l10n/kr/entry.desktop
 share/locale/l10n/kr/flag.png
+share/locale/l10n/lb/entry.desktop
+share/locale/l10n/lb/flag.png
 share/locale/l10n/lc/entry.desktop
 share/locale/l10n/lc/flag.png
 share/locale/l10n/lt/entry.desktop
@@ -2265,6 +2274,8 @@ share/locale/l10n/lu/entry.desktop
 share/locale/l10n/lu/flag.png
 share/locale/l10n/lv/entry.desktop
 share/locale/l10n/lv/flag.png
+share/locale/l10n/ly/entry.desktop
+share/locale/l10n/ly/flag.png
 share/locale/l10n/mk/entry.desktop
 share/locale/l10n/mk/flag.png
 share/locale/l10n/mt/entry.desktop
@@ -2279,20 +2290,28 @@ share/locale/l10n/northamerica.desktop
 share/locale/l10n/northeurope.desktop
 share/locale/l10n/nz/entry.desktop
 share/locale/l10n/nz/flag.png
+share/locale/l10n/om/entry.desktop
+share/locale/l10n/om/flag.png
 share/locale/l10n/pa/entry.desktop
 share/locale/l10n/pa/flag.png
 share/locale/l10n/pe/entry.desktop
 share/locale/l10n/pe/flag.png
 share/locale/l10n/pl/entry.desktop
 share/locale/l10n/pl/flag.png
+share/locale/l10n/ps/entry.desktop
+share/locale/l10n/ps/flag.png
 share/locale/l10n/pt/entry.desktop
 share/locale/l10n/pt/flag.png
 share/locale/l10n/py/entry.desktop
 share/locale/l10n/py/flag.png
+share/locale/l10n/qa/entry.desktop
+share/locale/l10n/qa/flag.png
 share/locale/l10n/ro/entry.desktop
 share/locale/l10n/ro/flag.png
 share/locale/l10n/ru/entry.desktop
 share/locale/l10n/ru/flag.png
+share/locale/l10n/sa/entry.desktop
+share/locale/l10n/sa/flag.png
 share/locale/l10n/sd/entry.desktop
 share/locale/l10n/sd/flag.png
 share/locale/l10n/se/entry.desktop
@@ -2307,6 +2326,8 @@ share/locale/l10n/sr/entry.desktop
 share/locale/l10n/sr/flag.png
 share/locale/l10n/sv/entry.desktop
 share/locale/l10n/sv/flag.png
+share/locale/l10n/sy/entry.desktop
+share/locale/l10n/sy/flag.png
 share/locale/l10n/th/entry.desktop
 share/locale/l10n/th/flag.png
 share/locale/l10n/tr/entry.desktop
@@ -2328,6 +2349,8 @@ share/locale/l10n/ve/flag.png
 share/locale/l10n/vn/entry.desktop
 share/locale/l10n/vn/flag.png
 share/locale/l10n/westeurope.desktop
+share/locale/l10n/ye/entry.desktop
+share/locale/l10n/ye/flag.png
 share/locale/l10n/za/entry.desktop
 share/locale/l10n/za/flag.png
 share/mimelnk/application/x-konsole.desktop
@@ -2540,6 +2563,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
 @dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/ye
 @dirrm share/locale/l10n/vn
 @dirrm share/locale/l10n/ve
 @dirrm share/locale/l10n/vc
@@ -2550,29 +2574,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/tt
 @dirrm share/locale/l10n/tr
 @dirrm share/locale/l10n/th
+@dirrm share/locale/l10n/sy
 @dirrm share/locale/l10n/sv
 @dirrm share/locale/l10n/sr
 @dirrm share/locale/l10n/sk
 @dirrm share/locale/l10n/si
 @dirrm share/locale/l10n/se
 @dirrm share/locale/l10n/sd
+@dirrm share/locale/l10n/sa
 @dirrm share/locale/l10n/ru
 @dirrm share/locale/l10n/ro
+@dirrm share/locale/l10n/qa
 @dirrm share/locale/l10n/py
 @dirrm share/locale/l10n/pt
+@dirrm share/locale/l10n/ps
 @dirrm share/locale/l10n/pl
 @dirrm share/locale/l10n/pe
 @dirrm share/locale/l10n/pa
+@dirrm share/locale/l10n/om
 @dirrm share/locale/l10n/nz
 @dirrm share/locale/l10n/no
 @dirrm share/locale/l10n/nl
 @dirrm share/locale/l10n/mx
 @dirrm share/locale/l10n/mt
 @dirrm share/locale/l10n/mk
+@dirrm share/locale/l10n/ly
 @dirrm share/locale/l10n/lv
 @dirrm share/locale/l10n/lu
 @dirrm share/locale/l10n/lt
 @dirrm share/locale/l10n/lc
+@dirrm share/locale/l10n/lb
 @dirrm share/locale/l10n/kr
 @dirrm share/locale/l10n/kp
 @dirrm share/locale/l10n/kn
@@ -2599,8 +2630,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/eg
 @dirrm share/locale/l10n/ee
 @dirrm share/locale/l10n/ec
+@dirrm share/locale/l10n/dz
 @dirrm share/locale/l10n/do
 @dirrm share/locale/l10n/dk
+@dirrm share/locale/l10n/dj
 @dirrm share/locale/l10n/de
 @dirrm share/locale/l10n/cz
 @dirrm share/locale/l10n/co
@@ -2611,6 +2644,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/by
 @dirrm share/locale/l10n/br
 @dirrm share/locale/l10n/bo
+@dirrm share/locale/l10n/bh
 @dirrm share/locale/l10n/bg
 @dirrm share/locale/l10n/be
 @dirrm share/locale/l10n/bd
@@ -2621,6 +2655,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/at
 @dirrm share/locale/l10n/ar
 @dirrm share/locale/l10n/ag
+@dirrm share/locale/l10n/ae
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
 @dirrm share/locale/en_US
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 786604e592c1..90854ebb4d7b 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	3.0.1
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index dcd456cdb4a0..2393bf59dc7c 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.0.1.tar.bz2) = 30399832405fa2286f8fb4fd57148b5c
+MD5 (KDE/kdebase-3.0.2.tar.bz2) = db63f6cdb586b64ffe666be2badec940
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index f24b20880fe5..42719af06e8c 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -549,9 +549,9 @@ share/applnk/System/kfmclient_dir.desktop
 share/applnk/System/kfmclient_html.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/konquerorsu.desktop
+share/applnk/System/kpersonalizer.desktop
 share/applnk/System/konsole.desktop
 share/applnk/System/konsolesu.desktop
-share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
@@ -1353,7 +1353,6 @@ share/apps/naughtyapplet/pics/naughty-sad.png
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
-share/autostart/kpersonalizer.desktop
 share/autostart/ktip.desktop
 share/autostart/kwrited.desktop
 share/autostart/panel.desktop
@@ -2157,6 +2156,8 @@ share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
 share/locale/l10n/africa.desktop
+share/locale/l10n/ae/entry.desktop
+share/locale/l10n/ae/flag.png
 share/locale/l10n/ag/entry.desktop
 share/locale/l10n/ag/flag.png
 share/locale/l10n/ar/entry.desktop
@@ -2178,6 +2179,8 @@ share/locale/l10n/be/entry.desktop
 share/locale/l10n/be/flag.png
 share/locale/l10n/bg/entry.desktop
 share/locale/l10n/bg/flag.png
+share/locale/l10n/bh/entry.desktop
+share/locale/l10n/bh/flag.png
 share/locale/l10n/bo/entry.desktop
 share/locale/l10n/bo/flag.png
 share/locale/l10n/br/entry.desktop
@@ -2200,10 +2203,14 @@ share/locale/l10n/cz/entry.desktop
 share/locale/l10n/cz/flag.png
 share/locale/l10n/de/entry.desktop
 share/locale/l10n/de/flag.png
+share/locale/l10n/dj/entry.desktop
+share/locale/l10n/dj/flag.png
 share/locale/l10n/dk/entry.desktop
 share/locale/l10n/dk/flag.png
 share/locale/l10n/do/entry.desktop
 share/locale/l10n/do/flag.png
+share/locale/l10n/dz/entry.desktop
+share/locale/l10n/dz/flag.png
 share/locale/l10n/easteurope.desktop
 share/locale/l10n/ec/entry.desktop
 share/locale/l10n/ec/flag.png
@@ -2257,6 +2264,8 @@ share/locale/l10n/kp/entry.desktop
 share/locale/l10n/kp/flag.png
 share/locale/l10n/kr/entry.desktop
 share/locale/l10n/kr/flag.png
+share/locale/l10n/lb/entry.desktop
+share/locale/l10n/lb/flag.png
 share/locale/l10n/lc/entry.desktop
 share/locale/l10n/lc/flag.png
 share/locale/l10n/lt/entry.desktop
@@ -2265,6 +2274,8 @@ share/locale/l10n/lu/entry.desktop
 share/locale/l10n/lu/flag.png
 share/locale/l10n/lv/entry.desktop
 share/locale/l10n/lv/flag.png
+share/locale/l10n/ly/entry.desktop
+share/locale/l10n/ly/flag.png
 share/locale/l10n/mk/entry.desktop
 share/locale/l10n/mk/flag.png
 share/locale/l10n/mt/entry.desktop
@@ -2279,20 +2290,28 @@ share/locale/l10n/northamerica.desktop
 share/locale/l10n/northeurope.desktop
 share/locale/l10n/nz/entry.desktop
 share/locale/l10n/nz/flag.png
+share/locale/l10n/om/entry.desktop
+share/locale/l10n/om/flag.png
 share/locale/l10n/pa/entry.desktop
 share/locale/l10n/pa/flag.png
 share/locale/l10n/pe/entry.desktop
 share/locale/l10n/pe/flag.png
 share/locale/l10n/pl/entry.desktop
 share/locale/l10n/pl/flag.png
+share/locale/l10n/ps/entry.desktop
+share/locale/l10n/ps/flag.png
 share/locale/l10n/pt/entry.desktop
 share/locale/l10n/pt/flag.png
 share/locale/l10n/py/entry.desktop
 share/locale/l10n/py/flag.png
+share/locale/l10n/qa/entry.desktop
+share/locale/l10n/qa/flag.png
 share/locale/l10n/ro/entry.desktop
 share/locale/l10n/ro/flag.png
 share/locale/l10n/ru/entry.desktop
 share/locale/l10n/ru/flag.png
+share/locale/l10n/sa/entry.desktop
+share/locale/l10n/sa/flag.png
 share/locale/l10n/sd/entry.desktop
 share/locale/l10n/sd/flag.png
 share/locale/l10n/se/entry.desktop
@@ -2307,6 +2326,8 @@ share/locale/l10n/sr/entry.desktop
 share/locale/l10n/sr/flag.png
 share/locale/l10n/sv/entry.desktop
 share/locale/l10n/sv/flag.png
+share/locale/l10n/sy/entry.desktop
+share/locale/l10n/sy/flag.png
 share/locale/l10n/th/entry.desktop
 share/locale/l10n/th/flag.png
 share/locale/l10n/tr/entry.desktop
@@ -2328,6 +2349,8 @@ share/locale/l10n/ve/flag.png
 share/locale/l10n/vn/entry.desktop
 share/locale/l10n/vn/flag.png
 share/locale/l10n/westeurope.desktop
+share/locale/l10n/ye/entry.desktop
+share/locale/l10n/ye/flag.png
 share/locale/l10n/za/entry.desktop
 share/locale/l10n/za/flag.png
 share/mimelnk/application/x-konsole.desktop
@@ -2540,6 +2563,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
 @dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/ye
 @dirrm share/locale/l10n/vn
 @dirrm share/locale/l10n/ve
 @dirrm share/locale/l10n/vc
@@ -2550,29 +2574,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/tt
 @dirrm share/locale/l10n/tr
 @dirrm share/locale/l10n/th
+@dirrm share/locale/l10n/sy
 @dirrm share/locale/l10n/sv
 @dirrm share/locale/l10n/sr
 @dirrm share/locale/l10n/sk
 @dirrm share/locale/l10n/si
 @dirrm share/locale/l10n/se
 @dirrm share/locale/l10n/sd
+@dirrm share/locale/l10n/sa
 @dirrm share/locale/l10n/ru
 @dirrm share/locale/l10n/ro
+@dirrm share/locale/l10n/qa
 @dirrm share/locale/l10n/py
 @dirrm share/locale/l10n/pt
+@dirrm share/locale/l10n/ps
 @dirrm share/locale/l10n/pl
 @dirrm share/locale/l10n/pe
 @dirrm share/locale/l10n/pa
+@dirrm share/locale/l10n/om
 @dirrm share/locale/l10n/nz
 @dirrm share/locale/l10n/no
 @dirrm share/locale/l10n/nl
 @dirrm share/locale/l10n/mx
 @dirrm share/locale/l10n/mt
 @dirrm share/locale/l10n/mk
+@dirrm share/locale/l10n/ly
 @dirrm share/locale/l10n/lv
 @dirrm share/locale/l10n/lu
 @dirrm share/locale/l10n/lt
 @dirrm share/locale/l10n/lc
+@dirrm share/locale/l10n/lb
 @dirrm share/locale/l10n/kr
 @dirrm share/locale/l10n/kp
 @dirrm share/locale/l10n/kn
@@ -2599,8 +2630,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/eg
 @dirrm share/locale/l10n/ee
 @dirrm share/locale/l10n/ec
+@dirrm share/locale/l10n/dz
 @dirrm share/locale/l10n/do
 @dirrm share/locale/l10n/dk
+@dirrm share/locale/l10n/dj
 @dirrm share/locale/l10n/de
 @dirrm share/locale/l10n/cz
 @dirrm share/locale/l10n/co
@@ -2611,6 +2644,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/by
 @dirrm share/locale/l10n/br
 @dirrm share/locale/l10n/bo
+@dirrm share/locale/l10n/bh
 @dirrm share/locale/l10n/bg
 @dirrm share/locale/l10n/be
 @dirrm share/locale/l10n/bd
@@ -2621,6 +2655,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/at
 @dirrm share/locale/l10n/ar
 @dirrm share/locale/l10n/ag
+@dirrm share/locale/l10n/ae
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
 @dirrm share/locale/en_US
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 786604e592c1..90854ebb4d7b 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	3.0.1
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index dcd456cdb4a0..2393bf59dc7c 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.0.1.tar.bz2) = 30399832405fa2286f8fb4fd57148b5c
+MD5 (KDE/kdebase-3.0.2.tar.bz2) = db63f6cdb586b64ffe666be2badec940
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index f24b20880fe5..42719af06e8c 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -549,9 +549,9 @@ share/applnk/System/kfmclient_dir.desktop
 share/applnk/System/kfmclient_html.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/konquerorsu.desktop
+share/applnk/System/kpersonalizer.desktop
 share/applnk/System/konsole.desktop
 share/applnk/System/konsolesu.desktop
-share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
@@ -1353,7 +1353,6 @@ share/apps/naughtyapplet/pics/naughty-sad.png
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
-share/autostart/kpersonalizer.desktop
 share/autostart/ktip.desktop
 share/autostart/kwrited.desktop
 share/autostart/panel.desktop
@@ -2157,6 +2156,8 @@ share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
 share/locale/l10n/africa.desktop
+share/locale/l10n/ae/entry.desktop
+share/locale/l10n/ae/flag.png
 share/locale/l10n/ag/entry.desktop
 share/locale/l10n/ag/flag.png
 share/locale/l10n/ar/entry.desktop
@@ -2178,6 +2179,8 @@ share/locale/l10n/be/entry.desktop
 share/locale/l10n/be/flag.png
 share/locale/l10n/bg/entry.desktop
 share/locale/l10n/bg/flag.png
+share/locale/l10n/bh/entry.desktop
+share/locale/l10n/bh/flag.png
 share/locale/l10n/bo/entry.desktop
 share/locale/l10n/bo/flag.png
 share/locale/l10n/br/entry.desktop
@@ -2200,10 +2203,14 @@ share/locale/l10n/cz/entry.desktop
 share/locale/l10n/cz/flag.png
 share/locale/l10n/de/entry.desktop
 share/locale/l10n/de/flag.png
+share/locale/l10n/dj/entry.desktop
+share/locale/l10n/dj/flag.png
 share/locale/l10n/dk/entry.desktop
 share/locale/l10n/dk/flag.png
 share/locale/l10n/do/entry.desktop
 share/locale/l10n/do/flag.png
+share/locale/l10n/dz/entry.desktop
+share/locale/l10n/dz/flag.png
 share/locale/l10n/easteurope.desktop
 share/locale/l10n/ec/entry.desktop
 share/locale/l10n/ec/flag.png
@@ -2257,6 +2264,8 @@ share/locale/l10n/kp/entry.desktop
 share/locale/l10n/kp/flag.png
 share/locale/l10n/kr/entry.desktop
 share/locale/l10n/kr/flag.png
+share/locale/l10n/lb/entry.desktop
+share/locale/l10n/lb/flag.png
 share/locale/l10n/lc/entry.desktop
 share/locale/l10n/lc/flag.png
 share/locale/l10n/lt/entry.desktop
@@ -2265,6 +2274,8 @@ share/locale/l10n/lu/entry.desktop
 share/locale/l10n/lu/flag.png
 share/locale/l10n/lv/entry.desktop
 share/locale/l10n/lv/flag.png
+share/locale/l10n/ly/entry.desktop
+share/locale/l10n/ly/flag.png
 share/locale/l10n/mk/entry.desktop
 share/locale/l10n/mk/flag.png
 share/locale/l10n/mt/entry.desktop
@@ -2279,20 +2290,28 @@ share/locale/l10n/northamerica.desktop
 share/locale/l10n/northeurope.desktop
 share/locale/l10n/nz/entry.desktop
 share/locale/l10n/nz/flag.png
+share/locale/l10n/om/entry.desktop
+share/locale/l10n/om/flag.png
 share/locale/l10n/pa/entry.desktop
 share/locale/l10n/pa/flag.png
 share/locale/l10n/pe/entry.desktop
 share/locale/l10n/pe/flag.png
 share/locale/l10n/pl/entry.desktop
 share/locale/l10n/pl/flag.png
+share/locale/l10n/ps/entry.desktop
+share/locale/l10n/ps/flag.png
 share/locale/l10n/pt/entry.desktop
 share/locale/l10n/pt/flag.png
 share/locale/l10n/py/entry.desktop
 share/locale/l10n/py/flag.png
+share/locale/l10n/qa/entry.desktop
+share/locale/l10n/qa/flag.png
 share/locale/l10n/ro/entry.desktop
 share/locale/l10n/ro/flag.png
 share/locale/l10n/ru/entry.desktop
 share/locale/l10n/ru/flag.png
+share/locale/l10n/sa/entry.desktop
+share/locale/l10n/sa/flag.png
 share/locale/l10n/sd/entry.desktop
 share/locale/l10n/sd/flag.png
 share/locale/l10n/se/entry.desktop
@@ -2307,6 +2326,8 @@ share/locale/l10n/sr/entry.desktop
 share/locale/l10n/sr/flag.png
 share/locale/l10n/sv/entry.desktop
 share/locale/l10n/sv/flag.png
+share/locale/l10n/sy/entry.desktop
+share/locale/l10n/sy/flag.png
 share/locale/l10n/th/entry.desktop
 share/locale/l10n/th/flag.png
 share/locale/l10n/tr/entry.desktop
@@ -2328,6 +2349,8 @@ share/locale/l10n/ve/flag.png
 share/locale/l10n/vn/entry.desktop
 share/locale/l10n/vn/flag.png
 share/locale/l10n/westeurope.desktop
+share/locale/l10n/ye/entry.desktop
+share/locale/l10n/ye/flag.png
 share/locale/l10n/za/entry.desktop
 share/locale/l10n/za/flag.png
 share/mimelnk/application/x-konsole.desktop
@@ -2540,6 +2563,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
 @dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/ye
 @dirrm share/locale/l10n/vn
 @dirrm share/locale/l10n/ve
 @dirrm share/locale/l10n/vc
@@ -2550,29 +2574,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/tt
 @dirrm share/locale/l10n/tr
 @dirrm share/locale/l10n/th
+@dirrm share/locale/l10n/sy
 @dirrm share/locale/l10n/sv
 @dirrm share/locale/l10n/sr
 @dirrm share/locale/l10n/sk
 @dirrm share/locale/l10n/si
 @dirrm share/locale/l10n/se
 @dirrm share/locale/l10n/sd
+@dirrm share/locale/l10n/sa
 @dirrm share/locale/l10n/ru
 @dirrm share/locale/l10n/ro
+@dirrm share/locale/l10n/qa
 @dirrm share/locale/l10n/py
 @dirrm share/locale/l10n/pt
+@dirrm share/locale/l10n/ps
 @dirrm share/locale/l10n/pl
 @dirrm share/locale/l10n/pe
 @dirrm share/locale/l10n/pa
+@dirrm share/locale/l10n/om
 @dirrm share/locale/l10n/nz
 @dirrm share/locale/l10n/no
 @dirrm share/locale/l10n/nl
 @dirrm share/locale/l10n/mx
 @dirrm share/locale/l10n/mt
 @dirrm share/locale/l10n/mk
+@dirrm share/locale/l10n/ly
 @dirrm share/locale/l10n/lv
 @dirrm share/locale/l10n/lu
 @dirrm share/locale/l10n/lt
 @dirrm share/locale/l10n/lc
+@dirrm share/locale/l10n/lb
 @dirrm share/locale/l10n/kr
 @dirrm share/locale/l10n/kp
 @dirrm share/locale/l10n/kn
@@ -2599,8 +2630,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/eg
 @dirrm share/locale/l10n/ee
 @dirrm share/locale/l10n/ec
+@dirrm share/locale/l10n/dz
 @dirrm share/locale/l10n/do
 @dirrm share/locale/l10n/dk
+@dirrm share/locale/l10n/dj
 @dirrm share/locale/l10n/de
 @dirrm share/locale/l10n/cz
 @dirrm share/locale/l10n/co
@@ -2611,6 +2644,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/by
 @dirrm share/locale/l10n/br
 @dirrm share/locale/l10n/bo
+@dirrm share/locale/l10n/bh
 @dirrm share/locale/l10n/bg
 @dirrm share/locale/l10n/be
 @dirrm share/locale/l10n/bd
@@ -2621,6 +2655,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/at
 @dirrm share/locale/l10n/ar
 @dirrm share/locale/l10n/ag
+@dirrm share/locale/l10n/ae
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
 @dirrm share/locale/en_US
diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde
index 5caac1294006..da73119350fd 100644
--- a/x11/kde4/Makefile.kde
+++ b/x11/kde4/Makefile.kde
@@ -11,6 +11,38 @@ CONFIGURE_ARGS?=
 # Stop the docs from regenerating.
 COPY=	-c -p
 
+# For ports that have I18N components only.
+.if defined(KDE_I18N)
+_NO_KDE_FINAL=	yes
+_NO_KDE_NDEBUG=	yes
+.endif
+
+# Unfortunately, this feature doesn't work right now due to binary files.
+_NO_KDE_PATCHUP=yes
+
+# Start options here.
+.if !defined(_NO_KDE_PATCHUP)
+.if !defined(KDE_PATCHFROM_VER)
+PATCHFROM_VER=	${KDE_ORIGVER}
+.else
+PATCHFROM_VER=	${KDE_PATCHFROM_VER}
+.endif
+.if !defined(KDE_PATCHTO_VER)
+PATCHTO_VER=	${KDE_VERSION}
+.else
+PATCHTO_VER=	${KDE_PATCHTO_VER}
+.endif
+.if !defined(KDE_DISTNAME)
+DISTNAME=	${PORTNAME}-${PATCHFROM_VER}
+.else
+DISTNAME=	${KDE_DISTNAME}
+.endif
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	will/kde-diffs/${KDE_VERSION}
+PATCHFILES=	${PORTNAME}-${PATCHFROM_VER}-${PATCHTO_VER}.diff.bz2
+PATCH_DIST_STRIP=-p1
+.endif
+
 .if !defined(_NO_KDE_CONFTARGET_HACK)
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 786604e592c1..90854ebb4d7b 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	3.0.1
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index dcd456cdb4a0..2393bf59dc7c 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.0.1.tar.bz2) = 30399832405fa2286f8fb4fd57148b5c
+MD5 (KDE/kdebase-3.0.2.tar.bz2) = db63f6cdb586b64ffe666be2badec940
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index f24b20880fe5..42719af06e8c 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -549,9 +549,9 @@ share/applnk/System/kfmclient_dir.desktop
 share/applnk/System/kfmclient_html.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/konquerorsu.desktop
+share/applnk/System/kpersonalizer.desktop
 share/applnk/System/konsole.desktop
 share/applnk/System/konsolesu.desktop
-share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
@@ -1353,7 +1353,6 @@ share/apps/naughtyapplet/pics/naughty-sad.png
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
-share/autostart/kpersonalizer.desktop
 share/autostart/ktip.desktop
 share/autostart/kwrited.desktop
 share/autostart/panel.desktop
@@ -2157,6 +2156,8 @@ share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
 share/locale/l10n/africa.desktop
+share/locale/l10n/ae/entry.desktop
+share/locale/l10n/ae/flag.png
 share/locale/l10n/ag/entry.desktop
 share/locale/l10n/ag/flag.png
 share/locale/l10n/ar/entry.desktop
@@ -2178,6 +2179,8 @@ share/locale/l10n/be/entry.desktop
 share/locale/l10n/be/flag.png
 share/locale/l10n/bg/entry.desktop
 share/locale/l10n/bg/flag.png
+share/locale/l10n/bh/entry.desktop
+share/locale/l10n/bh/flag.png
 share/locale/l10n/bo/entry.desktop
 share/locale/l10n/bo/flag.png
 share/locale/l10n/br/entry.desktop
@@ -2200,10 +2203,14 @@ share/locale/l10n/cz/entry.desktop
 share/locale/l10n/cz/flag.png
 share/locale/l10n/de/entry.desktop
 share/locale/l10n/de/flag.png
+share/locale/l10n/dj/entry.desktop
+share/locale/l10n/dj/flag.png
 share/locale/l10n/dk/entry.desktop
 share/locale/l10n/dk/flag.png
 share/locale/l10n/do/entry.desktop
 share/locale/l10n/do/flag.png
+share/locale/l10n/dz/entry.desktop
+share/locale/l10n/dz/flag.png
 share/locale/l10n/easteurope.desktop
 share/locale/l10n/ec/entry.desktop
 share/locale/l10n/ec/flag.png
@@ -2257,6 +2264,8 @@ share/locale/l10n/kp/entry.desktop
 share/locale/l10n/kp/flag.png
 share/locale/l10n/kr/entry.desktop
 share/locale/l10n/kr/flag.png
+share/locale/l10n/lb/entry.desktop
+share/locale/l10n/lb/flag.png
 share/locale/l10n/lc/entry.desktop
 share/locale/l10n/lc/flag.png
 share/locale/l10n/lt/entry.desktop
@@ -2265,6 +2274,8 @@ share/locale/l10n/lu/entry.desktop
 share/locale/l10n/lu/flag.png
 share/locale/l10n/lv/entry.desktop
 share/locale/l10n/lv/flag.png
+share/locale/l10n/ly/entry.desktop
+share/locale/l10n/ly/flag.png
 share/locale/l10n/mk/entry.desktop
 share/locale/l10n/mk/flag.png
 share/locale/l10n/mt/entry.desktop
@@ -2279,20 +2290,28 @@ share/locale/l10n/northamerica.desktop
 share/locale/l10n/northeurope.desktop
 share/locale/l10n/nz/entry.desktop
 share/locale/l10n/nz/flag.png
+share/locale/l10n/om/entry.desktop
+share/locale/l10n/om/flag.png
 share/locale/l10n/pa/entry.desktop
 share/locale/l10n/pa/flag.png
 share/locale/l10n/pe/entry.desktop
 share/locale/l10n/pe/flag.png
 share/locale/l10n/pl/entry.desktop
 share/locale/l10n/pl/flag.png
+share/locale/l10n/ps/entry.desktop
+share/locale/l10n/ps/flag.png
 share/locale/l10n/pt/entry.desktop
 share/locale/l10n/pt/flag.png
 share/locale/l10n/py/entry.desktop
 share/locale/l10n/py/flag.png
+share/locale/l10n/qa/entry.desktop
+share/locale/l10n/qa/flag.png
 share/locale/l10n/ro/entry.desktop
 share/locale/l10n/ro/flag.png
 share/locale/l10n/ru/entry.desktop
 share/locale/l10n/ru/flag.png
+share/locale/l10n/sa/entry.desktop
+share/locale/l10n/sa/flag.png
 share/locale/l10n/sd/entry.desktop
 share/locale/l10n/sd/flag.png
 share/locale/l10n/se/entry.desktop
@@ -2307,6 +2326,8 @@ share/locale/l10n/sr/entry.desktop
 share/locale/l10n/sr/flag.png
 share/locale/l10n/sv/entry.desktop
 share/locale/l10n/sv/flag.png
+share/locale/l10n/sy/entry.desktop
+share/locale/l10n/sy/flag.png
 share/locale/l10n/th/entry.desktop
 share/locale/l10n/th/flag.png
 share/locale/l10n/tr/entry.desktop
@@ -2328,6 +2349,8 @@ share/locale/l10n/ve/flag.png
 share/locale/l10n/vn/entry.desktop
 share/locale/l10n/vn/flag.png
 share/locale/l10n/westeurope.desktop
+share/locale/l10n/ye/entry.desktop
+share/locale/l10n/ye/flag.png
 share/locale/l10n/za/entry.desktop
 share/locale/l10n/za/flag.png
 share/mimelnk/application/x-konsole.desktop
@@ -2540,6 +2563,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
 @dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/ye
 @dirrm share/locale/l10n/vn
 @dirrm share/locale/l10n/ve
 @dirrm share/locale/l10n/vc
@@ -2550,29 +2574,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/tt
 @dirrm share/locale/l10n/tr
 @dirrm share/locale/l10n/th
+@dirrm share/locale/l10n/sy
 @dirrm share/locale/l10n/sv
 @dirrm share/locale/l10n/sr
 @dirrm share/locale/l10n/sk
 @dirrm share/locale/l10n/si
 @dirrm share/locale/l10n/se
 @dirrm share/locale/l10n/sd
+@dirrm share/locale/l10n/sa
 @dirrm share/locale/l10n/ru
 @dirrm share/locale/l10n/ro
+@dirrm share/locale/l10n/qa
 @dirrm share/locale/l10n/py
 @dirrm share/locale/l10n/pt
+@dirrm share/locale/l10n/ps
 @dirrm share/locale/l10n/pl
 @dirrm share/locale/l10n/pe
 @dirrm share/locale/l10n/pa
+@dirrm share/locale/l10n/om
 @dirrm share/locale/l10n/nz
 @dirrm share/locale/l10n/no
 @dirrm share/locale/l10n/nl
 @dirrm share/locale/l10n/mx
 @dirrm share/locale/l10n/mt
 @dirrm share/locale/l10n/mk
+@dirrm share/locale/l10n/ly
 @dirrm share/locale/l10n/lv
 @dirrm share/locale/l10n/lu
 @dirrm share/locale/l10n/lt
 @dirrm share/locale/l10n/lc
+@dirrm share/locale/l10n/lb
 @dirrm share/locale/l10n/kr
 @dirrm share/locale/l10n/kp
 @dirrm share/locale/l10n/kn
@@ -2599,8 +2630,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/eg
 @dirrm share/locale/l10n/ee
 @dirrm share/locale/l10n/ec
+@dirrm share/locale/l10n/dz
 @dirrm share/locale/l10n/do
 @dirrm share/locale/l10n/dk
+@dirrm share/locale/l10n/dj
 @dirrm share/locale/l10n/de
 @dirrm share/locale/l10n/cz
 @dirrm share/locale/l10n/co
@@ -2611,6 +2644,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/by
 @dirrm share/locale/l10n/br
 @dirrm share/locale/l10n/bo
+@dirrm share/locale/l10n/bh
 @dirrm share/locale/l10n/bg
 @dirrm share/locale/l10n/be
 @dirrm share/locale/l10n/bd
@@ -2621,6 +2655,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/at
 @dirrm share/locale/l10n/ar
 @dirrm share/locale/l10n/ag
+@dirrm share/locale/l10n/ae
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
 @dirrm share/locale/en_US
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 786604e592c1..90854ebb4d7b 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	3.0.1
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index dcd456cdb4a0..2393bf59dc7c 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.0.1.tar.bz2) = 30399832405fa2286f8fb4fd57148b5c
+MD5 (KDE/kdebase-3.0.2.tar.bz2) = db63f6cdb586b64ffe666be2badec940
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index f24b20880fe5..42719af06e8c 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -549,9 +549,9 @@ share/applnk/System/kfmclient_dir.desktop
 share/applnk/System/kfmclient_html.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/konquerorsu.desktop
+share/applnk/System/kpersonalizer.desktop
 share/applnk/System/konsole.desktop
 share/applnk/System/konsolesu.desktop
-share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
@@ -1353,7 +1353,6 @@ share/apps/naughtyapplet/pics/naughty-sad.png
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
-share/autostart/kpersonalizer.desktop
 share/autostart/ktip.desktop
 share/autostart/kwrited.desktop
 share/autostart/panel.desktop
@@ -2157,6 +2156,8 @@ share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
 share/locale/l10n/africa.desktop
+share/locale/l10n/ae/entry.desktop
+share/locale/l10n/ae/flag.png
 share/locale/l10n/ag/entry.desktop
 share/locale/l10n/ag/flag.png
 share/locale/l10n/ar/entry.desktop
@@ -2178,6 +2179,8 @@ share/locale/l10n/be/entry.desktop
 share/locale/l10n/be/flag.png
 share/locale/l10n/bg/entry.desktop
 share/locale/l10n/bg/flag.png
+share/locale/l10n/bh/entry.desktop
+share/locale/l10n/bh/flag.png
 share/locale/l10n/bo/entry.desktop
 share/locale/l10n/bo/flag.png
 share/locale/l10n/br/entry.desktop
@@ -2200,10 +2203,14 @@ share/locale/l10n/cz/entry.desktop
 share/locale/l10n/cz/flag.png
 share/locale/l10n/de/entry.desktop
 share/locale/l10n/de/flag.png
+share/locale/l10n/dj/entry.desktop
+share/locale/l10n/dj/flag.png
 share/locale/l10n/dk/entry.desktop
 share/locale/l10n/dk/flag.png
 share/locale/l10n/do/entry.desktop
 share/locale/l10n/do/flag.png
+share/locale/l10n/dz/entry.desktop
+share/locale/l10n/dz/flag.png
 share/locale/l10n/easteurope.desktop
 share/locale/l10n/ec/entry.desktop
 share/locale/l10n/ec/flag.png
@@ -2257,6 +2264,8 @@ share/locale/l10n/kp/entry.desktop
 share/locale/l10n/kp/flag.png
 share/locale/l10n/kr/entry.desktop
 share/locale/l10n/kr/flag.png
+share/locale/l10n/lb/entry.desktop
+share/locale/l10n/lb/flag.png
 share/locale/l10n/lc/entry.desktop
 share/locale/l10n/lc/flag.png
 share/locale/l10n/lt/entry.desktop
@@ -2265,6 +2274,8 @@ share/locale/l10n/lu/entry.desktop
 share/locale/l10n/lu/flag.png
 share/locale/l10n/lv/entry.desktop
 share/locale/l10n/lv/flag.png
+share/locale/l10n/ly/entry.desktop
+share/locale/l10n/ly/flag.png
 share/locale/l10n/mk/entry.desktop
 share/locale/l10n/mk/flag.png
 share/locale/l10n/mt/entry.desktop
@@ -2279,20 +2290,28 @@ share/locale/l10n/northamerica.desktop
 share/locale/l10n/northeurope.desktop
 share/locale/l10n/nz/entry.desktop
 share/locale/l10n/nz/flag.png
+share/locale/l10n/om/entry.desktop
+share/locale/l10n/om/flag.png
 share/locale/l10n/pa/entry.desktop
 share/locale/l10n/pa/flag.png
 share/locale/l10n/pe/entry.desktop
 share/locale/l10n/pe/flag.png
 share/locale/l10n/pl/entry.desktop
 share/locale/l10n/pl/flag.png
+share/locale/l10n/ps/entry.desktop
+share/locale/l10n/ps/flag.png
 share/locale/l10n/pt/entry.desktop
 share/locale/l10n/pt/flag.png
 share/locale/l10n/py/entry.desktop
 share/locale/l10n/py/flag.png
+share/locale/l10n/qa/entry.desktop
+share/locale/l10n/qa/flag.png
 share/locale/l10n/ro/entry.desktop
 share/locale/l10n/ro/flag.png
 share/locale/l10n/ru/entry.desktop
 share/locale/l10n/ru/flag.png
+share/locale/l10n/sa/entry.desktop
+share/locale/l10n/sa/flag.png
 share/locale/l10n/sd/entry.desktop
 share/locale/l10n/sd/flag.png
 share/locale/l10n/se/entry.desktop
@@ -2307,6 +2326,8 @@ share/locale/l10n/sr/entry.desktop
 share/locale/l10n/sr/flag.png
 share/locale/l10n/sv/entry.desktop
 share/locale/l10n/sv/flag.png
+share/locale/l10n/sy/entry.desktop
+share/locale/l10n/sy/flag.png
 share/locale/l10n/th/entry.desktop
 share/locale/l10n/th/flag.png
 share/locale/l10n/tr/entry.desktop
@@ -2328,6 +2349,8 @@ share/locale/l10n/ve/flag.png
 share/locale/l10n/vn/entry.desktop
 share/locale/l10n/vn/flag.png
 share/locale/l10n/westeurope.desktop
+share/locale/l10n/ye/entry.desktop
+share/locale/l10n/ye/flag.png
 share/locale/l10n/za/entry.desktop
 share/locale/l10n/za/flag.png
 share/mimelnk/application/x-konsole.desktop
@@ -2540,6 +2563,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
 @dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/ye
 @dirrm share/locale/l10n/vn
 @dirrm share/locale/l10n/ve
 @dirrm share/locale/l10n/vc
@@ -2550,29 +2574,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/tt
 @dirrm share/locale/l10n/tr
 @dirrm share/locale/l10n/th
+@dirrm share/locale/l10n/sy
 @dirrm share/locale/l10n/sv
 @dirrm share/locale/l10n/sr
 @dirrm share/locale/l10n/sk
 @dirrm share/locale/l10n/si
 @dirrm share/locale/l10n/se
 @dirrm share/locale/l10n/sd
+@dirrm share/locale/l10n/sa
 @dirrm share/locale/l10n/ru
 @dirrm share/locale/l10n/ro
+@dirrm share/locale/l10n/qa
 @dirrm share/locale/l10n/py
 @dirrm share/locale/l10n/pt
+@dirrm share/locale/l10n/ps
 @dirrm share/locale/l10n/pl
 @dirrm share/locale/l10n/pe
 @dirrm share/locale/l10n/pa
+@dirrm share/locale/l10n/om
 @dirrm share/locale/l10n/nz
 @dirrm share/locale/l10n/no
 @dirrm share/locale/l10n/nl
 @dirrm share/locale/l10n/mx
 @dirrm share/locale/l10n/mt
 @dirrm share/locale/l10n/mk
+@dirrm share/locale/l10n/ly
 @dirrm share/locale/l10n/lv
 @dirrm share/locale/l10n/lu
 @dirrm share/locale/l10n/lt
 @dirrm share/locale/l10n/lc
+@dirrm share/locale/l10n/lb
 @dirrm share/locale/l10n/kr
 @dirrm share/locale/l10n/kp
 @dirrm share/locale/l10n/kn
@@ -2599,8 +2630,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/eg
 @dirrm share/locale/l10n/ee
 @dirrm share/locale/l10n/ec
+@dirrm share/locale/l10n/dz
 @dirrm share/locale/l10n/do
 @dirrm share/locale/l10n/dk
+@dirrm share/locale/l10n/dj
 @dirrm share/locale/l10n/de
 @dirrm share/locale/l10n/cz
 @dirrm share/locale/l10n/co
@@ -2611,6 +2644,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/by
 @dirrm share/locale/l10n/br
 @dirrm share/locale/l10n/bo
+@dirrm share/locale/l10n/bh
 @dirrm share/locale/l10n/bg
 @dirrm share/locale/l10n/be
 @dirrm share/locale/l10n/bd
@@ -2621,6 +2655,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/at
 @dirrm share/locale/l10n/ar
 @dirrm share/locale/l10n/ag
+@dirrm share/locale/l10n/ae
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
 @dirrm share/locale/en_US
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 786604e592c1..90854ebb4d7b 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	3.0.1
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index dcd456cdb4a0..2393bf59dc7c 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.0.1.tar.bz2) = 30399832405fa2286f8fb4fd57148b5c
+MD5 (KDE/kdebase-3.0.2.tar.bz2) = db63f6cdb586b64ffe666be2badec940
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index f24b20880fe5..42719af06e8c 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -549,9 +549,9 @@ share/applnk/System/kfmclient_dir.desktop
 share/applnk/System/kfmclient_html.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/konquerorsu.desktop
+share/applnk/System/kpersonalizer.desktop
 share/applnk/System/konsole.desktop
 share/applnk/System/konsolesu.desktop
-share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
@@ -1353,7 +1353,6 @@ share/apps/naughtyapplet/pics/naughty-sad.png
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
-share/autostart/kpersonalizer.desktop
 share/autostart/ktip.desktop
 share/autostart/kwrited.desktop
 share/autostart/panel.desktop
@@ -2157,6 +2156,8 @@ share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
 share/locale/l10n/africa.desktop
+share/locale/l10n/ae/entry.desktop
+share/locale/l10n/ae/flag.png
 share/locale/l10n/ag/entry.desktop
 share/locale/l10n/ag/flag.png
 share/locale/l10n/ar/entry.desktop
@@ -2178,6 +2179,8 @@ share/locale/l10n/be/entry.desktop
 share/locale/l10n/be/flag.png
 share/locale/l10n/bg/entry.desktop
 share/locale/l10n/bg/flag.png
+share/locale/l10n/bh/entry.desktop
+share/locale/l10n/bh/flag.png
 share/locale/l10n/bo/entry.desktop
 share/locale/l10n/bo/flag.png
 share/locale/l10n/br/entry.desktop
@@ -2200,10 +2203,14 @@ share/locale/l10n/cz/entry.desktop
 share/locale/l10n/cz/flag.png
 share/locale/l10n/de/entry.desktop
 share/locale/l10n/de/flag.png
+share/locale/l10n/dj/entry.desktop
+share/locale/l10n/dj/flag.png
 share/locale/l10n/dk/entry.desktop
 share/locale/l10n/dk/flag.png
 share/locale/l10n/do/entry.desktop
 share/locale/l10n/do/flag.png
+share/locale/l10n/dz/entry.desktop
+share/locale/l10n/dz/flag.png
 share/locale/l10n/easteurope.desktop
 share/locale/l10n/ec/entry.desktop
 share/locale/l10n/ec/flag.png
@@ -2257,6 +2264,8 @@ share/locale/l10n/kp/entry.desktop
 share/locale/l10n/kp/flag.png
 share/locale/l10n/kr/entry.desktop
 share/locale/l10n/kr/flag.png
+share/locale/l10n/lb/entry.desktop
+share/locale/l10n/lb/flag.png
 share/locale/l10n/lc/entry.desktop
 share/locale/l10n/lc/flag.png
 share/locale/l10n/lt/entry.desktop
@@ -2265,6 +2274,8 @@ share/locale/l10n/lu/entry.desktop
 share/locale/l10n/lu/flag.png
 share/locale/l10n/lv/entry.desktop
 share/locale/l10n/lv/flag.png
+share/locale/l10n/ly/entry.desktop
+share/locale/l10n/ly/flag.png
 share/locale/l10n/mk/entry.desktop
 share/locale/l10n/mk/flag.png
 share/locale/l10n/mt/entry.desktop
@@ -2279,20 +2290,28 @@ share/locale/l10n/northamerica.desktop
 share/locale/l10n/northeurope.desktop
 share/locale/l10n/nz/entry.desktop
 share/locale/l10n/nz/flag.png
+share/locale/l10n/om/entry.desktop
+share/locale/l10n/om/flag.png
 share/locale/l10n/pa/entry.desktop
 share/locale/l10n/pa/flag.png
 share/locale/l10n/pe/entry.desktop
 share/locale/l10n/pe/flag.png
 share/locale/l10n/pl/entry.desktop
 share/locale/l10n/pl/flag.png
+share/locale/l10n/ps/entry.desktop
+share/locale/l10n/ps/flag.png
 share/locale/l10n/pt/entry.desktop
 share/locale/l10n/pt/flag.png
 share/locale/l10n/py/entry.desktop
 share/locale/l10n/py/flag.png
+share/locale/l10n/qa/entry.desktop
+share/locale/l10n/qa/flag.png
 share/locale/l10n/ro/entry.desktop
 share/locale/l10n/ro/flag.png
 share/locale/l10n/ru/entry.desktop
 share/locale/l10n/ru/flag.png
+share/locale/l10n/sa/entry.desktop
+share/locale/l10n/sa/flag.png
 share/locale/l10n/sd/entry.desktop
 share/locale/l10n/sd/flag.png
 share/locale/l10n/se/entry.desktop
@@ -2307,6 +2326,8 @@ share/locale/l10n/sr/entry.desktop
 share/locale/l10n/sr/flag.png
 share/locale/l10n/sv/entry.desktop
 share/locale/l10n/sv/flag.png
+share/locale/l10n/sy/entry.desktop
+share/locale/l10n/sy/flag.png
 share/locale/l10n/th/entry.desktop
 share/locale/l10n/th/flag.png
 share/locale/l10n/tr/entry.desktop
@@ -2328,6 +2349,8 @@ share/locale/l10n/ve/flag.png
 share/locale/l10n/vn/entry.desktop
 share/locale/l10n/vn/flag.png
 share/locale/l10n/westeurope.desktop
+share/locale/l10n/ye/entry.desktop
+share/locale/l10n/ye/flag.png
 share/locale/l10n/za/entry.desktop
 share/locale/l10n/za/flag.png
 share/mimelnk/application/x-konsole.desktop
@@ -2540,6 +2563,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
 @dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/ye
 @dirrm share/locale/l10n/vn
 @dirrm share/locale/l10n/ve
 @dirrm share/locale/l10n/vc
@@ -2550,29 +2574,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/tt
 @dirrm share/locale/l10n/tr
 @dirrm share/locale/l10n/th
+@dirrm share/locale/l10n/sy
 @dirrm share/locale/l10n/sv
 @dirrm share/locale/l10n/sr
 @dirrm share/locale/l10n/sk
 @dirrm share/locale/l10n/si
 @dirrm share/locale/l10n/se
 @dirrm share/locale/l10n/sd
+@dirrm share/locale/l10n/sa
 @dirrm share/locale/l10n/ru
 @dirrm share/locale/l10n/ro
+@dirrm share/locale/l10n/qa
 @dirrm share/locale/l10n/py
 @dirrm share/locale/l10n/pt
+@dirrm share/locale/l10n/ps
 @dirrm share/locale/l10n/pl
 @dirrm share/locale/l10n/pe
 @dirrm share/locale/l10n/pa
+@dirrm share/locale/l10n/om
 @dirrm share/locale/l10n/nz
 @dirrm share/locale/l10n/no
 @dirrm share/locale/l10n/nl
 @dirrm share/locale/l10n/mx
 @dirrm share/locale/l10n/mt
 @dirrm share/locale/l10n/mk
+@dirrm share/locale/l10n/ly
 @dirrm share/locale/l10n/lv
 @dirrm share/locale/l10n/lu
 @dirrm share/locale/l10n/lt
 @dirrm share/locale/l10n/lc
+@dirrm share/locale/l10n/lb
 @dirrm share/locale/l10n/kr
 @dirrm share/locale/l10n/kp
 @dirrm share/locale/l10n/kn
@@ -2599,8 +2630,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/eg
 @dirrm share/locale/l10n/ee
 @dirrm share/locale/l10n/ec
+@dirrm share/locale/l10n/dz
 @dirrm share/locale/l10n/do
 @dirrm share/locale/l10n/dk
+@dirrm share/locale/l10n/dj
 @dirrm share/locale/l10n/de
 @dirrm share/locale/l10n/cz
 @dirrm share/locale/l10n/co
@@ -2611,6 +2644,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/by
 @dirrm share/locale/l10n/br
 @dirrm share/locale/l10n/bo
+@dirrm share/locale/l10n/bh
 @dirrm share/locale/l10n/bg
 @dirrm share/locale/l10n/be
 @dirrm share/locale/l10n/bd
@@ -2621,6 +2655,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/at
 @dirrm share/locale/l10n/ar
 @dirrm share/locale/l10n/ag
+@dirrm share/locale/l10n/ae
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
 @dirrm share/locale/en_US
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 786604e592c1..90854ebb4d7b 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	3.0.1
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index dcd456cdb4a0..2393bf59dc7c 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.0.1.tar.bz2) = 30399832405fa2286f8fb4fd57148b5c
+MD5 (KDE/kdebase-3.0.2.tar.bz2) = db63f6cdb586b64ffe666be2badec940
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index f24b20880fe5..42719af06e8c 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -549,9 +549,9 @@ share/applnk/System/kfmclient_dir.desktop
 share/applnk/System/kfmclient_html.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/konquerorsu.desktop
+share/applnk/System/kpersonalizer.desktop
 share/applnk/System/konsole.desktop
 share/applnk/System/konsolesu.desktop
-share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
@@ -1353,7 +1353,6 @@ share/apps/naughtyapplet/pics/naughty-sad.png
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
-share/autostart/kpersonalizer.desktop
 share/autostart/ktip.desktop
 share/autostart/kwrited.desktop
 share/autostart/panel.desktop
@@ -2157,6 +2156,8 @@ share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
 share/locale/l10n/africa.desktop
+share/locale/l10n/ae/entry.desktop
+share/locale/l10n/ae/flag.png
 share/locale/l10n/ag/entry.desktop
 share/locale/l10n/ag/flag.png
 share/locale/l10n/ar/entry.desktop
@@ -2178,6 +2179,8 @@ share/locale/l10n/be/entry.desktop
 share/locale/l10n/be/flag.png
 share/locale/l10n/bg/entry.desktop
 share/locale/l10n/bg/flag.png
+share/locale/l10n/bh/entry.desktop
+share/locale/l10n/bh/flag.png
 share/locale/l10n/bo/entry.desktop
 share/locale/l10n/bo/flag.png
 share/locale/l10n/br/entry.desktop
@@ -2200,10 +2203,14 @@ share/locale/l10n/cz/entry.desktop
 share/locale/l10n/cz/flag.png
 share/locale/l10n/de/entry.desktop
 share/locale/l10n/de/flag.png
+share/locale/l10n/dj/entry.desktop
+share/locale/l10n/dj/flag.png
 share/locale/l10n/dk/entry.desktop
 share/locale/l10n/dk/flag.png
 share/locale/l10n/do/entry.desktop
 share/locale/l10n/do/flag.png
+share/locale/l10n/dz/entry.desktop
+share/locale/l10n/dz/flag.png
 share/locale/l10n/easteurope.desktop
 share/locale/l10n/ec/entry.desktop
 share/locale/l10n/ec/flag.png
@@ -2257,6 +2264,8 @@ share/locale/l10n/kp/entry.desktop
 share/locale/l10n/kp/flag.png
 share/locale/l10n/kr/entry.desktop
 share/locale/l10n/kr/flag.png
+share/locale/l10n/lb/entry.desktop
+share/locale/l10n/lb/flag.png
 share/locale/l10n/lc/entry.desktop
 share/locale/l10n/lc/flag.png
 share/locale/l10n/lt/entry.desktop
@@ -2265,6 +2274,8 @@ share/locale/l10n/lu/entry.desktop
 share/locale/l10n/lu/flag.png
 share/locale/l10n/lv/entry.desktop
 share/locale/l10n/lv/flag.png
+share/locale/l10n/ly/entry.desktop
+share/locale/l10n/ly/flag.png
 share/locale/l10n/mk/entry.desktop
 share/locale/l10n/mk/flag.png
 share/locale/l10n/mt/entry.desktop
@@ -2279,20 +2290,28 @@ share/locale/l10n/northamerica.desktop
 share/locale/l10n/northeurope.desktop
 share/locale/l10n/nz/entry.desktop
 share/locale/l10n/nz/flag.png
+share/locale/l10n/om/entry.desktop
+share/locale/l10n/om/flag.png
 share/locale/l10n/pa/entry.desktop
 share/locale/l10n/pa/flag.png
 share/locale/l10n/pe/entry.desktop
 share/locale/l10n/pe/flag.png
 share/locale/l10n/pl/entry.desktop
 share/locale/l10n/pl/flag.png
+share/locale/l10n/ps/entry.desktop
+share/locale/l10n/ps/flag.png
 share/locale/l10n/pt/entry.desktop
 share/locale/l10n/pt/flag.png
 share/locale/l10n/py/entry.desktop
 share/locale/l10n/py/flag.png
+share/locale/l10n/qa/entry.desktop
+share/locale/l10n/qa/flag.png
 share/locale/l10n/ro/entry.desktop
 share/locale/l10n/ro/flag.png
 share/locale/l10n/ru/entry.desktop
 share/locale/l10n/ru/flag.png
+share/locale/l10n/sa/entry.desktop
+share/locale/l10n/sa/flag.png
 share/locale/l10n/sd/entry.desktop
 share/locale/l10n/sd/flag.png
 share/locale/l10n/se/entry.desktop
@@ -2307,6 +2326,8 @@ share/locale/l10n/sr/entry.desktop
 share/locale/l10n/sr/flag.png
 share/locale/l10n/sv/entry.desktop
 share/locale/l10n/sv/flag.png
+share/locale/l10n/sy/entry.desktop
+share/locale/l10n/sy/flag.png
 share/locale/l10n/th/entry.desktop
 share/locale/l10n/th/flag.png
 share/locale/l10n/tr/entry.desktop
@@ -2328,6 +2349,8 @@ share/locale/l10n/ve/flag.png
 share/locale/l10n/vn/entry.desktop
 share/locale/l10n/vn/flag.png
 share/locale/l10n/westeurope.desktop
+share/locale/l10n/ye/entry.desktop
+share/locale/l10n/ye/flag.png
 share/locale/l10n/za/entry.desktop
 share/locale/l10n/za/flag.png
 share/mimelnk/application/x-konsole.desktop
@@ -2540,6 +2563,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
 @dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/ye
 @dirrm share/locale/l10n/vn
 @dirrm share/locale/l10n/ve
 @dirrm share/locale/l10n/vc
@@ -2550,29 +2574,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/tt
 @dirrm share/locale/l10n/tr
 @dirrm share/locale/l10n/th
+@dirrm share/locale/l10n/sy
 @dirrm share/locale/l10n/sv
 @dirrm share/locale/l10n/sr
 @dirrm share/locale/l10n/sk
 @dirrm share/locale/l10n/si
 @dirrm share/locale/l10n/se
 @dirrm share/locale/l10n/sd
+@dirrm share/locale/l10n/sa
 @dirrm share/locale/l10n/ru
 @dirrm share/locale/l10n/ro
+@dirrm share/locale/l10n/qa
 @dirrm share/locale/l10n/py
 @dirrm share/locale/l10n/pt
+@dirrm share/locale/l10n/ps
 @dirrm share/locale/l10n/pl
 @dirrm share/locale/l10n/pe
 @dirrm share/locale/l10n/pa
+@dirrm share/locale/l10n/om
 @dirrm share/locale/l10n/nz
 @dirrm share/locale/l10n/no
 @dirrm share/locale/l10n/nl
 @dirrm share/locale/l10n/mx
 @dirrm share/locale/l10n/mt
 @dirrm share/locale/l10n/mk
+@dirrm share/locale/l10n/ly
 @dirrm share/locale/l10n/lv
 @dirrm share/locale/l10n/lu
 @dirrm share/locale/l10n/lt
 @dirrm share/locale/l10n/lc
+@dirrm share/locale/l10n/lb
 @dirrm share/locale/l10n/kr
 @dirrm share/locale/l10n/kp
 @dirrm share/locale/l10n/kn
@@ -2599,8 +2630,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/eg
 @dirrm share/locale/l10n/ee
 @dirrm share/locale/l10n/ec
+@dirrm share/locale/l10n/dz
 @dirrm share/locale/l10n/do
 @dirrm share/locale/l10n/dk
+@dirrm share/locale/l10n/dj
 @dirrm share/locale/l10n/de
 @dirrm share/locale/l10n/cz
 @dirrm share/locale/l10n/co
@@ -2611,6 +2644,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/by
 @dirrm share/locale/l10n/br
 @dirrm share/locale/l10n/bo
+@dirrm share/locale/l10n/bh
 @dirrm share/locale/l10n/bg
 @dirrm share/locale/l10n/be
 @dirrm share/locale/l10n/bd
@@ -2621,6 +2655,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/at
 @dirrm share/locale/l10n/ar
 @dirrm share/locale/l10n/ag
+@dirrm share/locale/l10n/ae
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
 @dirrm share/locale/en_US
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 62c8a4fdff0b..98f7ab0f5d0a 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -36,6 +35,7 @@ SOMINOR=	0
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+PREFIX?=	${KDE_PREFIX}
 CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install
 
 .include "${.CURDIR}/../kde3/Makefile.kde"
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index e3b0d1a9d84b..530b93986456 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.0.1.tar.bz2) = 3a9b75af1d8916194cae27935c1c59d5
+MD5 (KDE/kdelibs-3.0.2.tar.bz2) = 0ad90a338aed63e54d073f511a99f0f2
diff --git a/x11/kdelibs3/files/patch-kdecore-kiconloader.cpp b/x11/kdelibs3/files/patch-kdecore-kiconloader.cpp
deleted file mode 100644
index 0fc6507298c4..000000000000
--- a/x11/kdelibs3/files/patch-kdecore-kiconloader.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
---- kdecore/kiconloader.cpp	Wed May  8 14:27:24 2002
-+++ /home/alane/kiconloader-3.0.cpp	Sat Jun  8 12:05:25 2002
-@@ -1,6 +1,6 @@
- /* vi: ts=8 sts=4 sw=4
-  *
-- * $Id: kiconloader.cpp,v 1.186 2002/03/18 00:27:25 carewolf Exp $
-+ * $Id: kiconloader.cpp,v 1.186.2.2 2002/06/03 11:14:08 faure Exp $
-  *
-  * This file is part of the KDE project, module kdecore.
-  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
-@@ -220,7 +220,7 @@
- 	d->mpGroups[i].size = config->readNumEntry("Size", 0);
- 	d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false);
- 	if (QPixmap::defaultDepth()>8)
--	    d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", false);
-+	    d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", true);
- 	else
- 	    d->mpGroups[i].alphaBlending = false;
- 
-@@ -266,21 +266,23 @@
- 
- void KIconLoader::addAppThemes(const QString& appname)
- {
--    KIconThemeNode *node = 0L;
--    KIconTheme *theme = 0L;
--
--    theme = new KIconTheme("hicolor", appname);
--    if (theme->isValid())
--	node = new KIconThemeNode(theme);
--    else
--	delete theme;
--
--    if (node)
-+    if ( KIconTheme::current() != "hicolor" )
-     {
--	node->links.append(d->mpThemeRoot);
--	d->mpThemeRoot = node;
-+        KIconTheme *def = new KIconTheme(KIconTheme::current(), appname);
-+        if (def->isValid())
-+        {
-+            KIconThemeNode* node = new KIconThemeNode(def);
-+            d->mpThemeRoot->links.append(node);
-+            addBaseThemes(node, appname);
-+        }
-+        else
-+            delete def;
-     }
- 
-+    KIconTheme *def = new KIconTheme(QString::fromLatin1("hicolor"), appname);
-+    KIconThemeNode* node = new KIconThemeNode(def);
-+    d->mpThemeRoot->links.append(node);
-+    addBaseThemes(node, appname);
- }
- 
- void KIconLoader::addBaseThemes(KIconThemeNode *node, const QString &appname)
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 62c8a4fdff0b..98f7ab0f5d0a 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -36,6 +35,7 @@ SOMINOR=	0
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+PREFIX?=	${KDE_PREFIX}
 CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install
 
 .include "${.CURDIR}/../kde3/Makefile.kde"
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index e3b0d1a9d84b..530b93986456 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.0.1.tar.bz2) = 3a9b75af1d8916194cae27935c1c59d5
+MD5 (KDE/kdelibs-3.0.2.tar.bz2) = 0ad90a338aed63e54d073f511a99f0f2
diff --git a/x11/kdelibs4/files/patch-kdecore-kiconloader.cpp b/x11/kdelibs4/files/patch-kdecore-kiconloader.cpp
deleted file mode 100644
index 0fc6507298c4..000000000000
--- a/x11/kdelibs4/files/patch-kdecore-kiconloader.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
---- kdecore/kiconloader.cpp	Wed May  8 14:27:24 2002
-+++ /home/alane/kiconloader-3.0.cpp	Sat Jun  8 12:05:25 2002
-@@ -1,6 +1,6 @@
- /* vi: ts=8 sts=4 sw=4
-  *
-- * $Id: kiconloader.cpp,v 1.186 2002/03/18 00:27:25 carewolf Exp $
-+ * $Id: kiconloader.cpp,v 1.186.2.2 2002/06/03 11:14:08 faure Exp $
-  *
-  * This file is part of the KDE project, module kdecore.
-  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
-@@ -220,7 +220,7 @@
- 	d->mpGroups[i].size = config->readNumEntry("Size", 0);
- 	d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false);
- 	if (QPixmap::defaultDepth()>8)
--	    d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", false);
-+	    d->mpGroups[i].alphaBlending = config->readBoolEntry("AlphaBlending", true);
- 	else
- 	    d->mpGroups[i].alphaBlending = false;
- 
-@@ -266,21 +266,23 @@
- 
- void KIconLoader::addAppThemes(const QString& appname)
- {
--    KIconThemeNode *node = 0L;
--    KIconTheme *theme = 0L;
--
--    theme = new KIconTheme("hicolor", appname);
--    if (theme->isValid())
--	node = new KIconThemeNode(theme);
--    else
--	delete theme;
--
--    if (node)
-+    if ( KIconTheme::current() != "hicolor" )
-     {
--	node->links.append(d->mpThemeRoot);
--	d->mpThemeRoot = node;
-+        KIconTheme *def = new KIconTheme(KIconTheme::current(), appname);
-+        if (def->isValid())
-+        {
-+            KIconThemeNode* node = new KIconThemeNode(def);
-+            d->mpThemeRoot->links.append(node);
-+            addBaseThemes(node, appname);
-+        }
-+        else
-+            delete def;
-     }
- 
-+    KIconTheme *def = new KIconTheme(QString::fromLatin1("hicolor"), appname);
-+    KIconThemeNode* node = new KIconThemeNode(def);
-+    d->mpThemeRoot->links.append(node);
-+    addBaseThemes(node, appname);
- }
- 
- void KIconLoader::addBaseThemes(KIconThemeNode *node, const QString &appname)