45 files changed, 45 insertions, 135 deletions

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}