aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/Uses/kde.mk40
-rw-r--r--Mk/bsd.port.mk2
-rw-r--r--accessibility/jovie/Makefile4
-rw-r--r--accessibility/kaccessible/Makefile4
-rw-r--r--accessibility/kmag/Makefile4
-rw-r--r--accessibility/kmousetool/Makefile4
-rw-r--r--accessibility/kmouth/Makefile5
-rw-r--r--archivers/ark/Makefile4
-rw-r--r--astro/kstars/Makefile4
-rw-r--r--astro/marble/Makefile4
-rw-r--r--audio/juk/Makefile4
-rw-r--r--audio/kio-audiocd/Makefile4
-rw-r--r--audio/kmix/Makefile4
-rw-r--r--audio/kscd/Makefile4
-rw-r--r--audio/libkcddb/Makefile4
-rw-r--r--audio/libkcompactdisc/Makefile4
-rw-r--r--comms/kremotecontrol/Makefile4
-rw-r--r--deskutils/kcharselect/Makefile4
-rw-r--r--deskutils/kdeplasma-addons/Makefile4
-rw-r--r--deskutils/kruler/Makefile4
-rw-r--r--deskutils/superkaramba/Makefile4
-rw-r--r--devel/cervisia/Makefile4
-rw-r--r--devel/dolphin-plugins/Makefile4
-rw-r--r--devel/kapptemplate/Makefile4
-rw-r--r--devel/kcachegrind/Makefile4
-rw-r--r--devel/kde-dev-scripts/Makefile4
-rw-r--r--devel/kde-dev-utils/Makefile4
-rw-r--r--devel/kdesdk4-kioslaves/Makefile4
-rw-r--r--devel/kdesdk4-strigi-analyzers/Makefile4
-rw-r--r--devel/kdesdk4-thumbnailers/Makefile4
-rw-r--r--devel/lokalize/Makefile4
-rw-r--r--devel/okteta/Makefile4
-rw-r--r--devel/p5-perlkde/Makefile4
-rw-r--r--devel/p5-perlqt/Makefile4
-rw-r--r--devel/poxml/Makefile4
-rw-r--r--devel/py-krosspython/Makefile4
-rw-r--r--devel/py-pykde4/Makefile4
-rw-r--r--devel/py-pykdeuic4/Makefile4
-rw-r--r--devel/ruby-korundum/Makefile4
-rw-r--r--devel/ruby-krossruby/Makefile4
-rw-r--r--devel/ruby-qtruby/Makefile4
-rw-r--r--devel/smokegen/Makefile5
-rw-r--r--devel/smokekde/Makefile4
-rw-r--r--devel/smokeqt/Makefile4
-rw-r--r--devel/umbrello/Makefile4
-rw-r--r--editors/kate-plugin-pate/Makefile4
-rw-r--r--editors/kate/Makefile4
-rw-r--r--games/blinken/Makefile4
-rw-r--r--games/bomber/Makefile4
-rw-r--r--games/bovo/Makefile4
-rw-r--r--games/granatier/Makefile4
-rw-r--r--games/kajongg/Makefile4
-rw-r--r--games/kanagram/Makefile4
-rw-r--r--games/kapman/Makefile4
-rw-r--r--games/katomic/Makefile4
-rw-r--r--games/kblackbox/Makefile4
-rw-r--r--games/kblocks/Makefile4
-rw-r--r--games/kbounce/Makefile4
-rw-r--r--games/kbreakout/Makefile4
-rw-r--r--games/kdiamond/Makefile4
-rw-r--r--games/kfourinline/Makefile4
-rw-r--r--games/kgoldrunner/Makefile4
-rw-r--r--games/khangman/Makefile4
-rw-r--r--games/kigo/Makefile4
-rw-r--r--games/killbots/Makefile4
-rw-r--r--games/kiriki/Makefile4
-rw-r--r--games/kjumpingcube/Makefile4
-rw-r--r--games/klickety/Makefile4
-rw-r--r--games/klines/Makefile4
-rw-r--r--games/kmahjongg/Makefile4
-rw-r--r--games/kmines/Makefile4
-rw-r--r--games/knavalbattle/Makefile4
-rw-r--r--games/knetwalk/Makefile4
-rw-r--r--games/kolf/Makefile4
-rw-r--r--games/kollision/Makefile4
-rw-r--r--games/konquest/Makefile4
-rw-r--r--games/kpat/Makefile4
-rw-r--r--games/kreversi/Makefile4
-rw-r--r--games/kshisen/Makefile4
-rw-r--r--games/ksirk/Makefile4
-rw-r--r--games/ksnakeduel/Makefile4
-rw-r--r--games/kspaceduel/Makefile4
-rw-r--r--games/ksquares/Makefile4
-rw-r--r--games/ksudoku/Makefile4
-rw-r--r--games/ktuberling/Makefile4
-rw-r--r--games/kubrick/Makefile4
-rw-r--r--games/libkdegames/Makefile4
-rw-r--r--games/libkmahjongg/Makefile4
-rw-r--r--games/lskat/Makefile4
-rw-r--r--games/pairs/Makefile4
-rw-r--r--games/palapeli/Makefile4
-rw-r--r--games/picmi/Makefile4
-rw-r--r--graphics/gwenview-kde4/Makefile4
-rw-r--r--graphics/kamera-kde4/Makefile4
-rw-r--r--graphics/kcolorchooser/Makefile4
-rw-r--r--graphics/kdegraphics4-mobipocket/Makefile4
-rw-r--r--graphics/kdegraphics4-strigi-analyzer/Makefile4
-rw-r--r--graphics/kdegraphics4-svgpart/Makefile4
-rw-r--r--graphics/kdegraphics4-thumbnailers/Makefile4
-rw-r--r--graphics/kolourpaint/Makefile4
-rw-r--r--graphics/kqtquickcharts/Makefile4
-rw-r--r--graphics/ksaneplugin/Makefile4
-rw-r--r--graphics/ksnapshot/Makefile4
-rw-r--r--graphics/libkdcraw-kde4/Makefile4
-rw-r--r--graphics/libkexiv2-kde4/Makefile4
-rw-r--r--graphics/libkipi-kde4/Makefile4
-rw-r--r--graphics/libksane/Makefile4
-rw-r--r--graphics/okular/Makefile4
-rw-r--r--japanese/kiten/Makefile4
-rw-r--r--lang/kturtle/Makefile4
-rw-r--r--math/analitza/Makefile4
-rw-r--r--math/cantor/Makefile4
-rw-r--r--math/kalgebra/Makefile4
-rw-r--r--math/kbruch/Makefile4
-rw-r--r--math/kcalc/Makefile4
-rw-r--r--math/kig/Makefile4
-rw-r--r--math/kmplot/Makefile4
-rw-r--r--math/rocs/Makefile4
-rw-r--r--misc/artikulate/Makefile4
-rw-r--r--misc/kgeography/Makefile4
-rw-r--r--misc/klettres/Makefile4
-rw-r--r--misc/ktouch/Makefile4
-rw-r--r--misc/kwordquiz/Makefile4
-rw-r--r--misc/libkdeedu/Makefile4
-rw-r--r--misc/parley/Makefile4
-rw-r--r--multimedia/dragon/Makefile4
-rw-r--r--multimedia/kdemultimedia4-ffmpegthumbs/Makefile4
-rw-r--r--multimedia/kdemultimedia4-mplayerthumbs/Makefile4
-rw-r--r--net-im/kopete-kde4/Makefile4
-rw-r--r--net/kdenetwork4-filesharing/Makefile4
-rw-r--r--net/kdenetwork4-strigi-analyzers/Makefile4
-rw-r--r--net/kget/Makefile5
-rw-r--r--net/krdc/Makefile4
-rw-r--r--net/krfb/Makefile4
-rw-r--r--net/zeroconf-ioslave/Makefile4
-rw-r--r--print/kde4-print-manager/Makefile4
-rw-r--r--science/kalzium/Makefile4
-rw-r--r--science/step/Makefile4
-rw-r--r--security/kgpg-kde4/Makefile4
-rw-r--r--security/kwalletmanager/Makefile4
-rw-r--r--sysutils/baloo-widgets/Makefile4
-rw-r--r--sysutils/baloo/Makefile4
-rw-r--r--sysutils/filelight-kde4/Makefile4
-rw-r--r--sysutils/kcron/Makefile4
-rw-r--r--sysutils/kdf/Makefile4
-rw-r--r--sysutils/kfilemetadata/Makefile4
-rw-r--r--sysutils/kfloppy/Makefile4
-rw-r--r--sysutils/ksystemlog/Makefile4
-rw-r--r--sysutils/kuser/Makefile4
-rw-r--r--sysutils/nepomuk-core/Makefile4
-rw-r--r--sysutils/nepomuk-widgets/Makefile4
-rw-r--r--sysutils/sweeper/Makefile4
-rw-r--r--textproc/kompare/Makefile4
-rw-r--r--textproc/libkomparediff2/Makefile4
-rw-r--r--www/kdewebdev4/Makefile4
-rw-r--r--x11-clocks/amor/Makefile4
-rw-r--r--x11-clocks/kteatime/Makefile4
-rw-r--r--x11-clocks/ktimer/Makefile4
-rw-r--r--x11-clocks/ktux/Makefile4
-rw-r--r--x11-themes/kde4-base-artwork/Makefile4
-rw-r--r--x11-themes/kde4-icons-oxygen/Makefile4
-rw-r--r--x11-themes/kde4-wallpapers/Makefile4
-rw-r--r--x11-themes/kdeartwork4/Makefile4
-rw-r--r--x11/kde4-baseapps/Makefile4
-rw-r--r--x11/kde4-runtime/Makefile4
-rw-r--r--x11/kgamma/Makefile4
-rw-r--r--x11/konsole/Makefile4
-rw-r--r--x11/libkonq/Makefile4
168 files changed, 207 insertions, 502 deletions
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 0371e1717e1d..dd81a08d12f9 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -16,6 +16,14 @@
# * foo_run Add a run-time dependency (RUN_DEPENDS)
# * foo (default) Add both dependencies on component <foo>
#
+#
+# To simplify the ports, also:
+# CATEGORIES If the port is part of one of the KDE Software distribution,
+# it can add, in addition to 'kde' one of the following:
+# kde-kde4: part of kde4 release
+# this will then set default values for MASTER_SITES and DIST_SUBDIR
+# as well as CPE_VENDOR and LICENSE.
+#
# MAINTAINER: kde@FreeBSD.org
.if !defined(_INCLUDE_USES_KDE_MK)
@@ -72,6 +80,38 @@ KTP_BRANCH?= stable
KDE_PREFIX= ${LOCALBASE}
# ==============================================================================
+# === _KDE_DIST HANDLING -- SETTING DEFAULT VALUES =============================
+# Doing MASTER_SITES magic based on the category of the port
+_KDE_CATEGORIES_SUPPORTED= kde-kde4
+. for cat in ${_KDE_CATEGORIES_SUPPORTED}
+. if ${CATEGORIES:M${cat}}
+. if !defined(_KDE_CATEGORY)
+_KDE_CATEGORY= ${cat}
+. else
+IGNORE?= cannot be installed: multiple kde-<...> categories specified via CATEGORIES=${CATEGORIES} #'
+. endif
+. endif
+. endfor
+
+. if defined(_KDE_CATEGORY)
+# KDE is normally licencensed LGPL 2.0.
+LICENSE?= LGPL20
+
+# Set CPE Vendor Information
+# As KDE_DIST is set we can assume it is port release by KDE and the vendor
+# is therefore kde.
+CPE_VENDOR?= kde
+
+. if ${_KDE_CATEGORY:Mkde-kde4}
+PORTVERSION?= ${KDE4_VERSION}
+MASTER_SITES?= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
+DIST_SUBDIR?= KDE/${KDE4_VERSION}
+. else
+IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #'
+. endif
+. endif #defined(_KDE_CATEGORY)
+# ==============================================================================
+
# ==== SETUP CMAKE ENVIRONMENT =================================================
# Help cmake to find files when testing ports with non-default PREFIX.
CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE}"
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index d7384b713e35..c5f7bf75c21b 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2439,7 +2439,7 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
benchmarks biology cad chinese comms converters databases \
deskutils devel docs dns editors elisp emulators enlightenment finance french ftp \
games geography german gnome gnustep graphics hamradio haskell hebrew hungarian \
- ipv6 irc japanese java kde kld korean lang linux lisp \
+ ipv6 irc japanese java kde ${_KDE_CATEGORIES_SUPPORTED} kld korean lang linux lisp \
mail mate math mbone misc multimedia net net-im net-mgmt net-p2p news \
palm parallel pear perl5 plan9 polish portuguese ports-mgmt \
print python ruby rubygems russian \
diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile
index 7cbd242ce01e..2ff5ed73e255 100644
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@@ -2,9 +2,7 @@
PORTNAME= jovie
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= accessibility kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= accessibility kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE text-to-speech system
diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile
index 6e8b859bf56a..f61db635e093 100644
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kaccessible
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= accessibility kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= accessibility kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Accessibility services for KDE
diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
index 0d02a6093ddf..bdf0a2bfd478 100644
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kmag
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= accessibility kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= accessibility kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Screen magnifier
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
index bade9179b698..fa097ae35661 100644
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kmousetool
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= accessibility kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= accessibility kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Automatic mouse click tool for KDE
diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
index 63549d65ca8e..5174088ed15a 100644
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@@ -2,10 +2,7 @@
PORTNAME= kmouth
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= accessibility kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
-
+CATEGORIES= accessibility kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Speech synthesizer frontend for KDE
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 6a7e23a7b6b7..758a55f65ea6 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -4,9 +4,7 @@
PORTNAME= ark
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= archivers kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= archivers kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Archiving tool for KDE
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index aa4597a2e3ae..34527a47c596 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kstars
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= astro kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= astro kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 desktop planetarium
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index b995df8d2d39..1df0436ed514 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -2,9 +2,7 @@
PORTNAME= marble
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= astro kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= astro kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Virtual globe and world atlas for KDE
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 40568273eeb4..4c5f1886cd2f 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -3,9 +3,7 @@
PORTNAME= juk
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= audio kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Jukebox, tagger and music collection manager
diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd/Makefile
index dad3c0626f3c..9f0da3f827a4 100644
--- a/audio/kio-audiocd/Makefile
+++ b/audio/kio-audiocd/Makefile
@@ -3,10 +3,8 @@
PORTNAME= kio-audiocd
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= audio kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= audio kde kde-kde4
DISTNAME= audiocd-kio-${PORTVERSION}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE IOSlave for accessing audio CDs
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index 82737f530554..5c9ae6bad798 100644
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kmix
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= audio kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Sound mixer for KDE
diff --git a/audio/kscd/Makefile b/audio/kscd/Makefile
index ec1692255722..ff0be5979524 100644
--- a/audio/kscd/Makefile
+++ b/audio/kscd/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kscd
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= audio kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= CD Player for KDE
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
index bd3c09b362e6..cb72ed33a85c 100644
--- a/audio/libkcddb/Makefile
+++ b/audio/libkcddb/Makefile
@@ -4,9 +4,7 @@
PORTNAME= libkcddb
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= audio kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE CDDB library
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
index 6d99e4a4af1a..d6997963dc00 100644
--- a/audio/libkcompactdisc/Makefile
+++ b/audio/libkcompactdisc/Makefile
@@ -4,9 +4,7 @@
PORTNAME= libkcompactdisc
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= audio kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE library for interfacing with audio CDs
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 6efd20d92055..fa247ed68226 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kremotecontrol
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= comms kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= comms kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE frontend for your remote controls
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 3faa58068abd..f976840da941 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kcharselect
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= deskutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= deskutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Character selector for KDE
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 778baa3f6658..a4fc1185ac86 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kdeplasma-addons
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= deskutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= deskutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Extra plasmoids for KDE SC 4
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
index 6f6286ffd095..1f2a52492e88 100644
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kruler
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= deskutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= deskutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 screen ruler
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index 878e987d70b5..0c8f584218d4 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -3,9 +3,7 @@
PORTNAME= superkaramba
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= deskutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= deskutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Widget framework for KDE
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index b8a8406b9b1e..e6b432675b89 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -2,9 +2,7 @@
PORTNAME= cervisia
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= CVS Frontend for KDE
diff --git a/devel/dolphin-plugins/Makefile b/devel/dolphin-plugins/Makefile
index 89762ccdd395..d28b96bc6f63 100644
--- a/devel/dolphin-plugins/Makefile
+++ b/devel/dolphin-plugins/Makefile
@@ -2,9 +2,7 @@
PORTNAME= dolphin-plugins
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Plugins for Dolphin file manager
diff --git a/devel/kapptemplate/Makefile b/devel/kapptemplate/Makefile
index 9427e813b061..950ad57620c2 100644
--- a/devel/kapptemplate/Makefile
+++ b/devel/kapptemplate/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kapptemplate
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE template generator
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index 9d98d3c1a898..5c4352d03ec7 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kcachegrind
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Profiler frontend for KDE
diff --git a/devel/kde-dev-scripts/Makefile b/devel/kde-dev-scripts/Makefile
index 0f839727f140..7cfebe5496fa 100644
--- a/devel/kde-dev-scripts/Makefile
+++ b/devel/kde-dev-scripts/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kde-dev-scripts
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE development scripts
diff --git a/devel/kde-dev-utils/Makefile b/devel/kde-dev-utils/Makefile
index e305f8b58bce..d05065f4b5ad 100644
--- a/devel/kde-dev-utils/Makefile
+++ b/devel/kde-dev-utils/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kde-dev-utils
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE development utilities
diff --git a/devel/kdesdk4-kioslaves/Makefile b/devel/kdesdk4-kioslaves/Makefile
index 2bf4c1508559..8e5ed745f7c3 100644
--- a/devel/kdesdk4-kioslaves/Makefile
+++ b/devel/kdesdk4-kioslaves/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kdesdk-kioslaves
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= SDK related KIO slaves
diff --git a/devel/kdesdk4-strigi-analyzers/Makefile b/devel/kdesdk4-strigi-analyzers/Makefile
index bb9cd6a4e540..94ac97e26917 100644
--- a/devel/kdesdk4-strigi-analyzers/Makefile
+++ b/devel/kdesdk4-strigi-analyzers/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kdesdk-strigi-analyzers
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Strigi analyzers for SDK related file formats
diff --git a/devel/kdesdk4-thumbnailers/Makefile b/devel/kdesdk4-thumbnailers/Makefile
index 725b1fb5091e..26c7f60600fc 100644
--- a/devel/kdesdk4-thumbnailers/Makefile
+++ b/devel/kdesdk4-thumbnailers/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kdesdk-thumbnailers
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE thumbnail generator for gettext po files
diff --git a/devel/lokalize/Makefile b/devel/lokalize/Makefile
index 1edf86a3cada..13e0e0ea85d4 100644
--- a/devel/lokalize/Makefile
+++ b/devel/lokalize/Makefile
@@ -2,9 +2,7 @@
PORTNAME= lokalize
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Computer-aided translation system
diff --git a/devel/okteta/Makefile b/devel/okteta/Makefile
index 8ec7cf199db1..11f151f2cb96 100644
--- a/devel/okteta/Makefile
+++ b/devel/okteta/Makefile
@@ -3,9 +3,7 @@
PORTNAME= okteta
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE hex editor
diff --git a/devel/p5-perlkde/Makefile b/devel/p5-perlkde/Makefile
index 66d5e5cb058e..509a502df1a2 100644
--- a/devel/p5-perlkde/Makefile
+++ b/devel/p5-perlkde/Makefile
@@ -2,10 +2,8 @@
PORTNAME= perlkde
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde perl5
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= devel kde kde-kde4 perl5
PKGNAMEPREFIX= p5-
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Perl bindings for KDE
diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile
index 1e247ea0d205..6bee8d7ea783 100644
--- a/devel/p5-perlqt/Makefile
+++ b/devel/p5-perlqt/Makefile
@@ -2,10 +2,8 @@
PORTNAME= perlqt
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde perl5
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= devel kde kde-kde4 perl5
PKGNAMEPREFIX= p5-
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Perl bindings for Qt
diff --git a/devel/poxml/Makefile b/devel/poxml/Makefile
index 65f7e7683199..c7071a246fd7 100644
--- a/devel/poxml/Makefile
+++ b/devel/poxml/Makefile
@@ -2,9 +2,7 @@
PORTNAME= poxml
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Tools to translate Docbook XML using gettext
diff --git a/devel/py-krosspython/Makefile b/devel/py-krosspython/Makefile
index 581d3d4eb78e..52da2a5e32fd 100644
--- a/devel/py-krosspython/Makefile
+++ b/devel/py-krosspython/Makefile
@@ -2,11 +2,9 @@
PORTNAME= krosspython
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde python
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= devel kde kde-kde4 python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= kross-interpreters-${PORTVERSION}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Kross Python scripting library
diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4/Makefile
index 7825856082e0..41fce26f526e 100644
--- a/devel/py-pykde4/Makefile
+++ b/devel/py-pykde4/Makefile
@@ -3,10 +3,8 @@
PORTNAME= pykde4
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= devel kde python
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= devel kde kde-kde4 python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for KDE
diff --git a/devel/py-pykdeuic4/Makefile b/devel/py-pykdeuic4/Makefile
index bbb99d2a3cb2..b0fa437238ec 100644
--- a/devel/py-pykdeuic4/Makefile
+++ b/devel/py-pykdeuic4/Makefile
@@ -2,11 +2,9 @@
PORTNAME= pykdeuic4
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde python
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= devel kde kde-kde4 python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pykde4-${PORTVERSION}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Enhanced version of pyuic4
diff --git a/devel/ruby-korundum/Makefile b/devel/ruby-korundum/Makefile
index f2939ae9f637..812bbc037b5c 100644
--- a/devel/ruby-korundum/Makefile
+++ b/devel/ruby-korundum/Makefile
@@ -2,10 +2,8 @@
PORTNAME= korundum
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde ruby
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= devel kde kde-kde4 ruby
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Ruby bindings for KDE
diff --git a/devel/ruby-krossruby/Makefile b/devel/ruby-krossruby/Makefile
index eb9f1500775e..af5e2214262f 100644
--- a/devel/ruby-krossruby/Makefile
+++ b/devel/ruby-krossruby/Makefile
@@ -2,11 +2,9 @@
PORTNAME= krossruby
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde ruby
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= devel kde kde-kde4 ruby
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= kross-interpreters-${PORTVERSION}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Ruby bindings for Qt/KDE
diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile
index dddfe9c48043..3c5fbc1c9205 100644
--- a/devel/ruby-qtruby/Makefile
+++ b/devel/ruby-qtruby/Makefile
@@ -3,10 +3,8 @@
PORTNAME= qtruby
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= devel kde ruby
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= devel kde kde-kde4 ruby
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Ruby bindings for Qt
diff --git a/devel/smokegen/Makefile b/devel/smokegen/Makefile
index 72948f3c4685..19a4c2ca0328 100644
--- a/devel/smokegen/Makefile
+++ b/devel/smokegen/Makefile
@@ -2,10 +2,7 @@
PORTNAME= smokegen
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
-
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= SMOKE bindings for KDE
diff --git a/devel/smokekde/Makefile b/devel/smokekde/Makefile
index bb4ae4c0fb3f..7c53151fbeac 100644
--- a/devel/smokekde/Makefile
+++ b/devel/smokekde/Makefile
@@ -2,9 +2,7 @@
PORTNAME= smokekde
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= SMOKE bindings for KDE
diff --git a/devel/smokeqt/Makefile b/devel/smokeqt/Makefile
index 3529fe3c52f9..3bc788e1c235 100644
--- a/devel/smokeqt/Makefile
+++ b/devel/smokeqt/Makefile
@@ -3,9 +3,7 @@
PORTNAME= smokeqt
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= SMOKE bindings for Qt
diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
index 3d4bdf484061..076c7eb13c33 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello/Makefile
@@ -2,9 +2,7 @@
PORTNAME= umbrello
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= UML modeller for KDE
diff --git a/editors/kate-plugin-pate/Makefile b/editors/kate-plugin-pate/Makefile
index 193dc1810522..a3c6391e49a9 100644
--- a/editors/kate-plugin-pate/Makefile
+++ b/editors/kate-plugin-pate/Makefile
@@ -2,10 +2,8 @@
PORTNAME= kate-plugin-pate
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= editors kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= editors kde kde-kde4
DISTNAME= kate-${PORTVERSION}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Support for Python plugins in Kate
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index ac58768ad7ad..67f20d3e4b7f 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -4,9 +4,7 @@
PORTNAME= kate
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= editors kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= editors kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic editor framework for the KDE system
diff --git a/games/blinken/Makefile b/games/blinken/Makefile
index 529149e2527d..d1e143873229 100644
--- a/games/blinken/Makefile
+++ b/games/blinken/Makefile
@@ -2,9 +2,7 @@
PORTNAME= blinken
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Memory enhancement game for KDE 4
diff --git a/games/bomber/Makefile b/games/bomber/Makefile
index babbe5bb4555..d128f30734f5 100644
--- a/games/bomber/Makefile
+++ b/games/bomber/Makefile
@@ -2,9 +2,7 @@
PORTNAME= bomber
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/bovo/Makefile b/games/bovo/Makefile
index ccec6e08496b..a17a28481292 100644
--- a/games/bovo/Makefile
+++ b/games/bovo/Makefile
@@ -2,9 +2,7 @@
PORTNAME= bovo
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/granatier/Makefile b/games/granatier/Makefile
index 09b516b91aee..0522ed2974a5 100644
--- a/games/granatier/Makefile
+++ b/games/granatier/Makefile
@@ -2,9 +2,7 @@
PORTNAME= granatier
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile
index 6eb7c106b656..fa2abc352cef 100644
--- a/games/kajongg/Makefile
+++ b/games/kajongg/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kajongg
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile
index 9401a755ee40..20cd537f69a2 100644
--- a/games/kanagram/Makefile
+++ b/games/kanagram/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kanagram
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Letter order game for KDE 4
diff --git a/games/kapman/Makefile b/games/kapman/Makefile
index 82087d646833..415cd489c2ae 100644
--- a/games/kapman/Makefile
+++ b/games/kapman/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kapman
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/katomic/Makefile b/games/katomic/Makefile
index 182531b12c1f..90a0e6471657 100644
--- a/games/katomic/Makefile
+++ b/games/katomic/Makefile
@@ -3,9 +3,7 @@
PORTNAME= katomic
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kblackbox/Makefile b/games/kblackbox/Makefile
index 9a3fa67d3653..ac2564aa104c 100644
--- a/games/kblackbox/Makefile
+++ b/games/kblackbox/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kblackbox
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kblocks/Makefile b/games/kblocks/Makefile
index 14a656a03374..367dceb7994a 100644
--- a/games/kblocks/Makefile
+++ b/games/kblocks/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kblocks
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kbounce/Makefile b/games/kbounce/Makefile
index 30fbc30fab8a..017c7f92ca7c 100644
--- a/games/kbounce/Makefile
+++ b/games/kbounce/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kbounce
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kbreakout/Makefile b/games/kbreakout/Makefile
index 4e78ceca01d0..cb6891d454c6 100644
--- a/games/kbreakout/Makefile
+++ b/games/kbreakout/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kbreakout
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kdiamond/Makefile b/games/kdiamond/Makefile
index 95b2fcbbbdcc..8649b96a1486 100644
--- a/games/kdiamond/Makefile
+++ b/games/kdiamond/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kdiamond
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kfourinline/Makefile b/games/kfourinline/Makefile
index d575aa16d2c8..c19f1f8607fd 100644
--- a/games/kfourinline/Makefile
+++ b/games/kfourinline/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kfourinline
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kgoldrunner/Makefile b/games/kgoldrunner/Makefile
index 0ccd8fe4fe19..2bb226e27cfb 100644
--- a/games/kgoldrunner/Makefile
+++ b/games/kgoldrunner/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kgoldrunner
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/khangman/Makefile b/games/khangman/Makefile
index def91cc87ddb..1c1c0514fd57 100644
--- a/games/khangman/Makefile
+++ b/games/khangman/Makefile
@@ -2,9 +2,7 @@
PORTNAME= khangman
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Hangman game for KDE 4
diff --git a/games/kigo/Makefile b/games/kigo/Makefile
index 9b3209463f18..5d2c83acc144 100644
--- a/games/kigo/Makefile
+++ b/games/kigo/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kigo
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/killbots/Makefile b/games/killbots/Makefile
index d379cc4a63a3..cd4875777c68 100644
--- a/games/killbots/Makefile
+++ b/games/killbots/Makefile
@@ -2,9 +2,7 @@
PORTNAME= killbots
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kiriki/Makefile b/games/kiriki/Makefile
index a2b20a4392c8..1ff33329faf5 100644
--- a/games/kiriki/Makefile
+++ b/games/kiriki/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kiriki
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kjumpingcube/Makefile b/games/kjumpingcube/Makefile
index c92162990cdb..bdddc51ef82e 100644
--- a/games/kjumpingcube/Makefile
+++ b/games/kjumpingcube/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kjumpingcube
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/klickety/Makefile b/games/klickety/Makefile
index 6a6c1b58f2c5..b3a3b6adf642 100644
--- a/games/klickety/Makefile
+++ b/games/klickety/Makefile
@@ -3,9 +3,7 @@
PORTNAME= klickety
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/klines/Makefile b/games/klines/Makefile
index 3e8d8a47dc95..91eab7ec8085 100644
--- a/games/klines/Makefile
+++ b/games/klines/Makefile
@@ -2,9 +2,7 @@
PORTNAME= klines
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kmahjongg/Makefile b/games/kmahjongg/Makefile
index 0d3b63d3aa5b..9b7841a17d7a 100644
--- a/games/kmahjongg/Makefile
+++ b/games/kmahjongg/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kmahjongg
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kmines/Makefile b/games/kmines/Makefile
index d28a88a01145..ce700d567781 100644
--- a/games/kmines/Makefile
+++ b/games/kmines/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kmines
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/knavalbattle/Makefile b/games/knavalbattle/Makefile
index 2bc857c25fa9..b6d17728adec 100644
--- a/games/knavalbattle/Makefile
+++ b/games/knavalbattle/Makefile
@@ -2,9 +2,7 @@
PORTNAME= knavalbattle
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/knetwalk/Makefile b/games/knetwalk/Makefile
index 527bbc76bece..019d338681ff 100644
--- a/games/knetwalk/Makefile
+++ b/games/knetwalk/Makefile
@@ -2,9 +2,7 @@
PORTNAME= knetwalk
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kolf/Makefile b/games/kolf/Makefile
index 244b75abc766..a59147c0cd3f 100644
--- a/games/kolf/Makefile
+++ b/games/kolf/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kolf
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kollision/Makefile b/games/kollision/Makefile
index e454c1baf58d..bb8912fcbfc2 100644
--- a/games/kollision/Makefile
+++ b/games/kollision/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kollision
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/konquest/Makefile b/games/konquest/Makefile
index 2819afa46bb1..73c25492a524 100644
--- a/games/konquest/Makefile
+++ b/games/konquest/Makefile
@@ -2,9 +2,7 @@
PORTNAME= konquest
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kpat/Makefile b/games/kpat/Makefile
index ba4357c7e3c8..97df52ffafb1 100644
--- a/games/kpat/Makefile
+++ b/games/kpat/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kpat
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kreversi/Makefile b/games/kreversi/Makefile
index 56a9283a0c79..517660ddd514 100644
--- a/games/kreversi/Makefile
+++ b/games/kreversi/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kreversi
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kshisen/Makefile b/games/kshisen/Makefile
index 2f7296983ea9..a8e80600526e 100644
--- a/games/kshisen/Makefile
+++ b/games/kshisen/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kshisen
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/ksirk/Makefile b/games/ksirk/Makefile
index 33cd9dafe072..7c91302539c1 100644
--- a/games/ksirk/Makefile
+++ b/games/ksirk/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ksirk
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/ksnakeduel/Makefile b/games/ksnakeduel/Makefile
index 1e7f20b93a59..7ebcbde1a4b9 100644
--- a/games/ksnakeduel/Makefile
+++ b/games/ksnakeduel/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ksnakeduel
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kspaceduel/Makefile b/games/kspaceduel/Makefile
index a7994fed0f00..9de1ffdf8d5b 100644
--- a/games/kspaceduel/Makefile
+++ b/games/kspaceduel/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kspaceduel
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/ksquares/Makefile b/games/ksquares/Makefile
index b47ebfd4b21e..d611fc3dc5bc 100644
--- a/games/ksquares/Makefile
+++ b/games/ksquares/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ksquares
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile
index 66d0471f4639..b7d734d9a4db 100644
--- a/games/ksudoku/Makefile
+++ b/games/ksudoku/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ksudoku
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/ktuberling/Makefile b/games/ktuberling/Makefile
index c2ffa58bb87f..8a7d60c5d66b 100644
--- a/games/ktuberling/Makefile
+++ b/games/ktuberling/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ktuberling
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/kubrick/Makefile b/games/kubrick/Makefile
index 1fa833e0837c..3503718bb17f 100644
--- a/games/kubrick/Makefile
+++ b/games/kubrick/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kubrick
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/libkdegames/Makefile b/games/libkdegames/Makefile
index fa492e13efc2..b5a175991a9a 100644
--- a/games/libkdegames/Makefile
+++ b/games/libkdegames/Makefile
@@ -3,9 +3,7 @@
PORTNAME= libkdegames
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Libraries used by KDE 4 games
diff --git a/games/libkmahjongg/Makefile b/games/libkmahjongg/Makefile
index 057cc682b5a7..88165c6d72a7 100644
--- a/games/libkmahjongg/Makefile
+++ b/games/libkmahjongg/Makefile
@@ -3,9 +3,7 @@
PORTNAME= libkmahjongg
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Library for the Mahjongg Solitaire for KDE 4
diff --git a/games/lskat/Makefile b/games/lskat/Makefile
index 794cf7d333e2..739f7a4a4c15 100644
--- a/games/lskat/Makefile
+++ b/games/lskat/Makefile
@@ -2,9 +2,7 @@
PORTNAME= lskat
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/pairs/Makefile b/games/pairs/Makefile
index de56a0492226..7d553653f78d 100644
--- a/games/pairs/Makefile
+++ b/games/pairs/Makefile
@@ -3,9 +3,7 @@
PORTNAME= pairs
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Memory and pairs game for KDE
diff --git a/games/palapeli/Makefile b/games/palapeli/Makefile
index b0bbdeb27562..9c1bfa1954a8 100644
--- a/games/palapeli/Makefile
+++ b/games/palapeli/Makefile
@@ -3,9 +3,7 @@
PORTNAME= palapeli
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/games/picmi/Makefile b/games/picmi/Makefile
index a5181cba6135..27440934fb07 100644
--- a/games/picmi/Makefile
+++ b/games/picmi/Makefile
@@ -2,9 +2,7 @@
PORTNAME= picmi
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= games kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index ad4baf3012a6..b56d5abe0342 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -3,9 +3,7 @@
PORTNAME= gwenview
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Image viewer and browser for KDE 4
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index 6eacc3ee43a4..263ab6f4a08d 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kamera
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Digital camera manager for KDE 4
diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile
index f0280e30d9c6..049f6d99caf9 100644
--- a/graphics/kcolorchooser/Makefile
+++ b/graphics/kcolorchooser/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kcolorchooser
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 application to select colors from the screen or from a palette
diff --git a/graphics/kdegraphics4-mobipocket/Makefile b/graphics/kdegraphics4-mobipocket/Makefile
index 1a898fb996c4..c2f74a03f20c 100644
--- a/graphics/kdegraphics4-mobipocket/Makefile
+++ b/graphics/kdegraphics4-mobipocket/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kdegraphics-mobipocket
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Mobipocket plugins for Strigi indexing and thumbnails
diff --git a/graphics/kdegraphics4-strigi-analyzer/Makefile b/graphics/kdegraphics4-strigi-analyzer/Makefile
index 8db1339db672..b80a1e699197 100644
--- a/graphics/kdegraphics4-strigi-analyzer/Makefile
+++ b/graphics/kdegraphics4-strigi-analyzer/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kdegraphics-strigi-analyzer
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Strigi analyzers for various graphics file formats
diff --git a/graphics/kdegraphics4-svgpart/Makefile b/graphics/kdegraphics4-svgpart/Makefile
index cde0bbf54615..5a9efe21432e 100644
--- a/graphics/kdegraphics4-svgpart/Makefile
+++ b/graphics/kdegraphics4-svgpart/Makefile
@@ -2,10 +2,8 @@
PORTNAME= svgpart
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= graphics kde kde-kde4
PKGNAMEPREFIX= kdegraphics-
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= SVG KPart
diff --git a/graphics/kdegraphics4-thumbnailers/Makefile b/graphics/kdegraphics4-thumbnailers/Makefile
index 1fe6ea375915..4f44c3ea0b1d 100644
--- a/graphics/kdegraphics4-thumbnailers/Makefile
+++ b/graphics/kdegraphics4-thumbnailers/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kdegraphics-thumbnailers
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Thumbnailers for various graphics file formats
diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile
index 39081a3444af..1376a51232cb 100644
--- a/graphics/kolourpaint/Makefile
+++ b/graphics/kolourpaint/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kolourpaint
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 paint program
diff --git a/graphics/kqtquickcharts/Makefile b/graphics/kqtquickcharts/Makefile
index 757039e63b0f..debd0005d95f 100644
--- a/graphics/kqtquickcharts/Makefile
+++ b/graphics/kqtquickcharts/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kqtquickcharts
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= QtQuick plugin to render interactive charts
diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin/Makefile
index 341a968c2ec5..f847e94acb10 100644
--- a/graphics/ksaneplugin/Makefile
+++ b/graphics/ksaneplugin/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ksaneplugin
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 plugin for scanning through libksane
diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot/Makefile
index 7c033472d58b..33161dd5cd05 100644
--- a/graphics/ksnapshot/Makefile
+++ b/graphics/ksnapshot/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ksnapshot
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 screen capture program
diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile
index 527712f8eddb..ea102441dc08 100644
--- a/graphics/libkdcraw-kde4/Makefile
+++ b/graphics/libkdcraw-kde4/Makefile
@@ -4,9 +4,7 @@
PORTNAME= libkdcraw
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 4
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= LibRaw interface for KDE
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index 20b39c3a5e70..0a86275282be 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -3,9 +3,7 @@
PORTNAME= libkexiv2
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Exiv2 library interface for KDE
diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index 70acb29c33ce..c7b3332bbacd 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -4,9 +4,7 @@
PORTNAME= libkipi
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Image Plugin Interface
diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
index 81f75515629c..e541b36873d3 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane/Makefile
@@ -3,9 +3,7 @@
PORTNAME= libksane
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= SANE library interface for KDE
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index dba1305c828a..71ad2d029a8f 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -3,9 +3,7 @@
PORTNAME= okular
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 5
-CATEGORIES= graphics kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 universal document viewer
diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile
index 411c77400024..d1fa9e85316a 100644
--- a/japanese/kiten/Makefile
+++ b/japanese/kiten/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kiten
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= japanese kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= japanese kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Japanese reference/study tool for KDE 4
diff --git a/lang/kturtle/Makefile b/lang/kturtle/Makefile
index 82b778978c95..d9b163ef6baa 100644
--- a/lang/kturtle/Makefile
+++ b/lang/kturtle/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kturtle
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= lang kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= lang kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Educational programming environment for KDE 4
diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index c1093c6e077e..d8ba5f8da156 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -3,9 +3,7 @@
PORTNAME= analitza
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= math kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= math kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Library from KDE Education project
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 8212115ddea7..dcfa6ab64df9 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -3,9 +3,7 @@
PORTNAME= cantor
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= math kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= math kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 frontend to mathematical software
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index 154ff7c93e5c..38831374ac1e 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kalgebra
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= math kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= math kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE graph calculator
diff --git a/math/kbruch/Makefile b/math/kbruch/Makefile
index 0e734b345b19..fe782e0341db 100644
--- a/math/kbruch/Makefile
+++ b/math/kbruch/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kbruch
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= math kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= math kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 application to exercise fractions
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 6fd5a50ae8ef..acd202e4c1f6 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kcalc
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= math kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= math kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Scientific calculator for KDE
diff --git a/math/kig/Makefile b/math/kig/Makefile
index 36912f3562db..1072b4857d2c 100644
--- a/math/kig/Makefile
+++ b/math/kig/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kig
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= math kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= math kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 interactive geometry application
diff --git a/math/kmplot/Makefile b/math/kmplot/Makefile
index 745b5496dfc1..b6771c1ed9fb 100644
--- a/math/kmplot/Makefile
+++ b/math/kmplot/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kmplot
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= math kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= math kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Mathematical function plotter for KDE 4
diff --git a/math/rocs/Makefile b/math/rocs/Makefile
index b9515df4b230..12ad3a21d554 100644
--- a/math/rocs/Makefile
+++ b/math/rocs/Makefile
@@ -3,9 +3,7 @@
PORTNAME= rocs
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= math kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= math kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Graph theory IDE
diff --git a/misc/artikulate/Makefile b/misc/artikulate/Makefile
index dda746e56cc6..e15e78fe2a2d 100644
--- a/misc/artikulate/Makefile
+++ b/misc/artikulate/Makefile
@@ -2,9 +2,7 @@
PORTNAME= artikulate
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= misc kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= misc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Pronunciation trainer for KDE
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index 6e562ad25122..87bfa0aa8194 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kgeography
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= misc kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= misc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 geography trainer
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index 51b8ef408c21..3e305c3e7708 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -2,9 +2,7 @@
PORTNAME= klettres
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= misc kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= misc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Alphabet learning tool for KDE 4
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 39492df2fae2..c6946edbc554 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ktouch
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= misc kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= misc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Touch typing tutor for KDE 4
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index 4984b8e1c31a..ee6d3cdc69ff 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kwordquiz
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= misc kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= misc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Flash card trainer for KDE 4
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile
index b809e1a7856a..2eeab1f9bcbf 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/Makefile
@@ -3,9 +3,7 @@
PORTNAME= libkdeedu
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= misc kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= misc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Libraries used by KDE educational applications
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index 73dbf41642e3..48983528fe9e 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -2,9 +2,7 @@
PORTNAME= parley
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= misc kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= misc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Vocabulary trainer for KDE 4
diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile
index 201ac723f7ec..1abeea862341 100644
--- a/multimedia/dragon/Makefile
+++ b/multimedia/dragon/Makefile
@@ -3,11 +3,9 @@
PORTNAME= dragon
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= multimedia kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= multimedia kde kde-kde4
# Avoid clash with devel/dragon
PKGNAMESUFFIX= -player
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE multimedia player with a focus on simplicity
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
index f5b4309a0b92..48cd89d6ef6e 100644
--- a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
+++ b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
@@ -3,10 +3,8 @@
PORTNAME= ffmpegthumbs
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= multimedia kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= multimedia kde kde-kde4
PKGNAMEPREFIX= kdemultimedia-
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= FFmpeg-based thumbnail generator for video files
diff --git a/multimedia/kdemultimedia4-mplayerthumbs/Makefile b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
index 150e59a1043e..3e1260cf39db 100644
--- a/multimedia/kdemultimedia4-mplayerthumbs/Makefile
+++ b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
@@ -3,10 +3,8 @@
PORTNAME= mplayerthumbs
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= multimedia kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= multimedia kde kde-kde4
PKGNAMEPREFIX= kdemultimedia-
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= MPlayer-based thumbnail generator for video files
diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile
index 5f0e5faeaad1..d480c01733cb 100644
--- a/net-im/kopete-kde4/Makefile
+++ b/net-im/kopete-kde4/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kopete
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 3
-CATEGORIES= net-im kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= net-im kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE multi-protocol instant messenger
diff --git a/net/kdenetwork4-filesharing/Makefile b/net/kdenetwork4-filesharing/Makefile
index a57d84be74e0..07275fcfbd2e 100644
--- a/net/kdenetwork4-filesharing/Makefile
+++ b/net/kdenetwork4-filesharing/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kdenetwork-filesharing
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= net kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= net kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Filesharing via Samba
diff --git a/net/kdenetwork4-strigi-analyzers/Makefile b/net/kdenetwork4-strigi-analyzers/Makefile
index 620971ad349a..51dc88219a7d 100644
--- a/net/kdenetwork4-strigi-analyzers/Makefile
+++ b/net/kdenetwork4-strigi-analyzers/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kdenetwork-strigi-analyzers
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= net kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= net kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Strigi analyzers for network-related file formats
diff --git a/net/kget/Makefile b/net/kget/Makefile
index 5a06cabc7abd..4c1212761937 100644
--- a/net/kget/Makefile
+++ b/net/kget/Makefile
@@ -3,10 +3,7 @@
PORTNAME= kget
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= net kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
-
+CATEGORIES= net kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE download manager
diff --git a/net/krdc/Makefile b/net/krdc/Makefile
index 6f7e85aa9bda..32e5e4494608 100644
--- a/net/krdc/Makefile
+++ b/net/krdc/Makefile
@@ -3,9 +3,7 @@
PORTNAME= krdc
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= net kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= net kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= RDP and VNC client for KDE
diff --git a/net/krfb/Makefile b/net/krfb/Makefile
index 8eaee33e6919..207f1c4ff5d3 100644
--- a/net/krfb/Makefile
+++ b/net/krfb/Makefile
@@ -2,9 +2,7 @@
PORTNAME= krfb
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= net kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= net kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= VNC server for KDE
diff --git a/net/zeroconf-ioslave/Makefile b/net/zeroconf-ioslave/Makefile
index 770beb791a1b..508141574a15 100644
--- a/net/zeroconf-ioslave/Makefile
+++ b/net/zeroconf-ioslave/Makefile
@@ -2,9 +2,7 @@
PORTNAME= zeroconf-ioslave
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= net kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= net kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Network monitor for DNS-SD services (Zeroconf)
diff --git a/print/kde4-print-manager/Makefile b/print/kde4-print-manager/Makefile
index e4bedc2e16db..7a6e56ef98c7 100644
--- a/print/kde4-print-manager/Makefile
+++ b/print/kde4-print-manager/Makefile
@@ -3,9 +3,7 @@
PORTNAME= print-manager
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= print kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= print kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Printer manager for KDE 4
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
index f3f0c9fe1313..1f39190bb56a 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kalzium
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= science kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= science kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Periodic table of elements for KDE 4
diff --git a/science/step/Makefile b/science/step/Makefile
index 6c3a60489dab..e3d1c6049d2a 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -3,9 +3,7 @@
PORTNAME= step
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= science kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= science kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 interactive physics simulator
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 06a8e9bbf8b4..607ecb60444c 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kgpg
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= security kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= security kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Encryption tool for KDE
diff --git a/security/kwalletmanager/Makefile b/security/kwalletmanager/Makefile
index e0e5cd42bf01..4a3f64eca9ef 100644
--- a/security/kwalletmanager/Makefile
+++ b/security/kwalletmanager/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kwalletmanager
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= security kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= security kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Password manager for KDE
diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile
index 288cb18a961f..e794d8b059ff 100644
--- a/sysutils/baloo-widgets/Makefile
+++ b/sysutils/baloo-widgets/Makefile
@@ -3,9 +3,7 @@
PORTNAME= baloo-widgets
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= The BalooWidgets library
diff --git a/sysutils/baloo/Makefile b/sysutils/baloo/Makefile
index 4e8e88b2f0c1..9617e06c7f15 100644
--- a/sysutils/baloo/Makefile
+++ b/sysutils/baloo/Makefile
@@ -3,9 +3,7 @@
PORTNAME= baloo
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE framework for searching and managing user metadata
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index 1e32f993b39d..66d7388df320 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -3,9 +3,7 @@
PORTNAME= filelight
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Map of concentric segmented-rings representing file system
diff --git a/sysutils/kcron/Makefile b/sysutils/kcron/Makefile
index 31b1577ea088..e7318ae1404f 100644
--- a/sysutils/kcron/Makefile
+++ b/sysutils/kcron/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kcron
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE task scheduler
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 3abd5b64556c..fc4a471a539b 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kdf
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Shows free space of devices for KDE
diff --git a/sysutils/kfilemetadata/Makefile b/sysutils/kfilemetadata/Makefile
index 410ad0812e4f..50ab3fd6d02d 100644
--- a/sysutils/kfilemetadata/Makefile
+++ b/sysutils/kfilemetadata/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kfilemetadata
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 7
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Library for extracting file metadata
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 1379fc6ef8d3..a4dd72b999f4 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kfloppy
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Floppy disk formatter for KDE
diff --git a/sysutils/ksystemlog/Makefile b/sysutils/ksystemlog/Makefile
index a3e660ce2751..9bee2e7d3491 100644
--- a/sysutils/ksystemlog/Makefile
+++ b/sysutils/ksystemlog/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ksystemlog
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE system log application
diff --git a/sysutils/kuser/Makefile b/sysutils/kuser/Makefile
index 69e42f00060b..56b0125515f0 100644
--- a/sysutils/kuser/Makefile
+++ b/sysutils/kuser/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kuser
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE user manager
diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile
index 6bfbcf1f2ad7..ecd3c0c17806 100644
--- a/sysutils/nepomuk-core/Makefile
+++ b/sysutils/nepomuk-core/Makefile
@@ -4,9 +4,7 @@
PORTNAME= nepomuk-core
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 7
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Core Nepomuk system libraries and services for KDE
diff --git a/sysutils/nepomuk-widgets/Makefile b/sysutils/nepomuk-widgets/Makefile
index ce06cf0b7139..9300209caeb0 100644
--- a/sysutils/nepomuk-widgets/Makefile
+++ b/sysutils/nepomuk-widgets/Makefile
@@ -3,9 +3,7 @@
PORTNAME= nepomuk-widgets
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= The NepomukWidget libraries
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 332f4d11f3dd..d75c7af8e3fd 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -3,9 +3,7 @@
PORTNAME= sweeper
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= sysutils kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Cleans temporal files for KDE
diff --git a/textproc/kompare/Makefile b/textproc/kompare/Makefile
index cfd3d8170c9b..61127ac6c32d 100644
--- a/textproc/kompare/Makefile
+++ b/textproc/kompare/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kompare
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= textproc kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= textproc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Diff/Patch Frontend
diff --git a/textproc/libkomparediff2/Makefile b/textproc/libkomparediff2/Makefile
index 88884a28b1a0..a319eb2f4dc6 100644
--- a/textproc/libkomparediff2/Makefile
+++ b/textproc/libkomparediff2/Makefile
@@ -3,9 +3,7 @@
PORTNAME= libkomparediff2
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= textproc kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= textproc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Library to compare files and strings
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 717ed7677c27..1e0765f75f82 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -4,9 +4,7 @@
PORTNAME= kdewebdev
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= www kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= www kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Comprehensive html/website development environment
diff --git a/x11-clocks/amor/Makefile b/x11-clocks/amor/Makefile
index f45664970feb..4d9c63757a84 100644
--- a/x11-clocks/amor/Makefile
+++ b/x11-clocks/amor/Makefile
@@ -2,9 +2,7 @@
PORTNAME= amor
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11-clocks kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11-clocks kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Small animation which sits on top of active window
diff --git a/x11-clocks/kteatime/Makefile b/x11-clocks/kteatime/Makefile
index 7487ed6c45a9..ab14861ceae4 100644
--- a/x11-clocks/kteatime/Makefile
+++ b/x11-clocks/kteatime/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kteatime
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11-clocks kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11-clocks kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Handy timer for steeping tea
diff --git a/x11-clocks/ktimer/Makefile b/x11-clocks/ktimer/Makefile
index 73ead3e4c0f9..4ef0a28a0c42 100644
--- a/x11-clocks/ktimer/Makefile
+++ b/x11-clocks/ktimer/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ktimer
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11-clocks kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11-clocks kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Countdown launcher for KDE
diff --git a/x11-clocks/ktux/Makefile b/x11-clocks/ktux/Makefile
index fd3ab43bf930..6b1faea7bf8b 100644
--- a/x11-clocks/ktux/Makefile
+++ b/x11-clocks/ktux/Makefile
@@ -2,9 +2,7 @@
PORTNAME= ktux
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11-clocks kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11-clocks kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Tux-in-a-Spaceship screen saver
diff --git a/x11-themes/kde4-base-artwork/Makefile b/x11-themes/kde4-base-artwork/Makefile
index 00fe2d304c8d..9c1c4a07f75c 100644
--- a/x11-themes/kde4-base-artwork/Makefile
+++ b/x11-themes/kde4-base-artwork/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kde-base-artwork
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11-themes kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11-themes kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Base artwork for the KDE Plasma Desktop
diff --git a/x11-themes/kde4-icons-oxygen/Makefile b/x11-themes/kde4-icons-oxygen/Makefile
index 455b0a2ef697..7fabbf661659 100644
--- a/x11-themes/kde4-icons-oxygen/Makefile
+++ b/x11-themes/kde4-icons-oxygen/Makefile
@@ -2,11 +2,9 @@
PORTNAME= oxygen
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11-themes kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= x11-themes kde kde-kde4
PKGNAMEPREFIX= kde4-icons-
DISTNAME= ${PORTNAME}-icons-${PORTVERSION}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= The Oxygen icon theme for KDE
diff --git a/x11-themes/kde4-wallpapers/Makefile b/x11-themes/kde4-wallpapers/Makefile
index b1d7edca4fc0..34ed3f94523e 100644
--- a/x11-themes/kde4-wallpapers/Makefile
+++ b/x11-themes/kde4-wallpapers/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kde-wallpapers
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11-themes kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11-themes kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Set of wallpapers for the KDE Plasma workspace
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 30c0fd883fe9..c94e04d70608 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kdeartwork
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11-themes kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11-themes kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Artworks Themes
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 2addbb5d5b56..6e3bc53c8aee 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kde-baseapps
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= x11 kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11 kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for KDE
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index edcd6f0f93ba..ecf01aaa8adb 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -3,9 +3,7 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 3
-CATEGORIES= x11 kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11 kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= Runtime components for KDE Plasma Desktop
diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile
index a9991593c02a..8c05739958a5 100644
--- a/x11/kgamma/Makefile
+++ b/x11/kgamma/Makefile
@@ -2,9 +2,7 @@
PORTNAME= kgamma
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11 kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11 kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 monitor calibration tool
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index 2b8661351b1b..4227cc56f000 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -2,9 +2,7 @@
PORTNAME= konsole
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= x11 kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR= KDE/${PORTVERSION}
+CATEGORIES= x11 kde kde-kde4
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE terminal emulator
diff --git a/x11/libkonq/Makefile b/x11/libkonq/Makefile
index 0f89e7aadbfd..0ca773a9f9d9 100644
--- a/x11/libkonq/Makefile
+++ b/x11/libkonq/Makefile
@@ -3,10 +3,8 @@
PORTNAME= libkonq
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
-CATEGORIES= x11 kde
-MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= x11 kde kde-kde4
DISTNAME= kde-baseapps-${PORTVERSION}
-DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Core library for Konqueror