Attachment 175650 Details for Bug 213406 – Add ${_KDE_CATEGORIES_SUPPORTED} to the valid categories, and wire it into ports

[patch] Add ${_KDE_CATEGORIES_SUPPORTED} to the valid categories, and wire it into ports

kde-categories.diff.v1 (text/plain), 82.45 KB, created by Tobias C. Berner on 2016-10-12 06:59:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias C. Berner

Created: 2016-10-12 06:59:22 UTC

Size: 82.45 KB

patch

obsolete

>Index: Mk/Uses/kde.mk
>===================================================================
>--- Mk/Uses/kde.mk	(revision 423781)
>+++ Mk/Uses/kde.mk	(working copy)
>@@ -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 @@
> 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}"
>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 423781)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -2439,7 +2439,7 @@
> 	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 \
>Index: accessibility/jovie/Makefile
>===================================================================
>--- accessibility/jovie/Makefile	(revision 423781)
>+++ accessibility/jovie/Makefile	(working copy)
>@@ -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
>Index: accessibility/kaccessible/Makefile
>===================================================================
>--- accessibility/kaccessible/Makefile	(revision 423781)
>+++ accessibility/kaccessible/Makefile	(working copy)
>@@ -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
>Index: accessibility/kmag/Makefile
>===================================================================
>--- accessibility/kmag/Makefile	(revision 423781)
>+++ accessibility/kmag/Makefile	(working copy)
>@@ -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
>Index: accessibility/kmousetool/Makefile
>===================================================================
>--- accessibility/kmousetool/Makefile	(revision 423781)
>+++ accessibility/kmousetool/Makefile	(working copy)
>@@ -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
>Index: accessibility/kmouth/Makefile
>===================================================================
>--- accessibility/kmouth/Makefile	(revision 423781)
>+++ accessibility/kmouth/Makefile	(working copy)
>@@ -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
> 
>Index: archivers/ark/Makefile
>===================================================================
>--- archivers/ark/Makefile	(revision 423781)
>+++ archivers/ark/Makefile	(working copy)
>@@ -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
>Index: astro/kstars/Makefile
>===================================================================
>--- astro/kstars/Makefile	(revision 423781)
>+++ astro/kstars/Makefile	(working copy)
>@@ -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
>Index: astro/marble/Makefile
>===================================================================
>--- astro/marble/Makefile	(revision 423781)
>+++ astro/marble/Makefile	(working copy)
>@@ -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
>Index: audio/juk/Makefile
>===================================================================
>--- audio/juk/Makefile	(revision 423781)
>+++ audio/juk/Makefile	(working copy)
>@@ -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
>Index: audio/kio-audiocd/Makefile
>===================================================================
>--- audio/kio-audiocd/Makefile	(revision 423781)
>+++ audio/kio-audiocd/Makefile	(working copy)
>@@ -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
>Index: audio/kmix/Makefile
>===================================================================
>--- audio/kmix/Makefile	(revision 423781)
>+++ audio/kmix/Makefile	(working copy)
>@@ -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
>Index: audio/kscd/Makefile
>===================================================================
>--- audio/kscd/Makefile	(revision 423781)
>+++ audio/kscd/Makefile	(working copy)
>@@ -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
>Index: audio/libkcddb/Makefile
>===================================================================
>--- audio/libkcddb/Makefile	(revision 423781)
>+++ audio/libkcddb/Makefile	(working copy)
>@@ -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
>Index: audio/libkcompactdisc/Makefile
>===================================================================
>--- audio/libkcompactdisc/Makefile	(revision 423781)
>+++ audio/libkcompactdisc/Makefile	(working copy)
>@@ -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
>Index: comms/kremotecontrol/Makefile
>===================================================================
>--- comms/kremotecontrol/Makefile	(revision 423781)
>+++ comms/kremotecontrol/Makefile	(working copy)
>@@ -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
>Index: deskutils/kcharselect/Makefile
>===================================================================
>--- deskutils/kcharselect/Makefile	(revision 423781)
>+++ deskutils/kcharselect/Makefile	(working copy)
>@@ -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
>Index: deskutils/kdeplasma-addons/Makefile
>===================================================================
>--- deskutils/kdeplasma-addons/Makefile	(revision 423781)
>+++ deskutils/kdeplasma-addons/Makefile	(working copy)
>@@ -3,9 +3,7 @@
> PORTNAME=	kdeplasma-addons
> 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=	Extra plasmoids for KDE SC 4
>Index: deskutils/kruler/Makefile
>===================================================================
>--- deskutils/kruler/Makefile	(revision 423781)
>+++ deskutils/kruler/Makefile	(working copy)
>@@ -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
>Index: deskutils/superkaramba/Makefile
>===================================================================
>--- deskutils/superkaramba/Makefile	(revision 423781)
>+++ deskutils/superkaramba/Makefile	(working copy)
>@@ -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
>Index: devel/cervisia/Makefile
>===================================================================
>--- devel/cervisia/Makefile	(revision 423781)
>+++ devel/cervisia/Makefile	(working copy)
>@@ -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
>Index: devel/dolphin-plugins/Makefile
>===================================================================
>--- devel/dolphin-plugins/Makefile	(revision 423781)
>+++ devel/dolphin-plugins/Makefile	(working copy)
>@@ -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
>Index: devel/kapptemplate/Makefile
>===================================================================
>--- devel/kapptemplate/Makefile	(revision 423781)
>+++ devel/kapptemplate/Makefile	(working copy)
>@@ -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
>Index: devel/kcachegrind/Makefile
>===================================================================
>--- devel/kcachegrind/Makefile	(revision 423781)
>+++ devel/kcachegrind/Makefile	(working copy)
>@@ -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
>Index: devel/kde-dev-scripts/Makefile
>===================================================================
>--- devel/kde-dev-scripts/Makefile	(revision 423781)
>+++ devel/kde-dev-scripts/Makefile	(working copy)
>@@ -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
>Index: devel/kde-dev-utils/Makefile
>===================================================================
>--- devel/kde-dev-utils/Makefile	(revision 423781)
>+++ devel/kde-dev-utils/Makefile	(working copy)
>@@ -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
>Index: devel/kdesdk4-kioslaves/Makefile
>===================================================================
>--- devel/kdesdk4-kioslaves/Makefile	(revision 423781)
>+++ devel/kdesdk4-kioslaves/Makefile	(working copy)
>@@ -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
>Index: devel/kdesdk4-strigi-analyzers/Makefile
>===================================================================
>--- devel/kdesdk4-strigi-analyzers/Makefile	(revision 423781)
>+++ devel/kdesdk4-strigi-analyzers/Makefile	(working copy)
>@@ -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
>Index: devel/kdesdk4-thumbnailers/Makefile
>===================================================================
>--- devel/kdesdk4-thumbnailers/Makefile	(revision 423781)
>+++ devel/kdesdk4-thumbnailers/Makefile	(working copy)
>@@ -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
>Index: devel/lokalize/Makefile
>===================================================================
>--- devel/lokalize/Makefile	(revision 423781)
>+++ devel/lokalize/Makefile	(working copy)
>@@ -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
>Index: devel/okteta/Makefile
>===================================================================
>--- devel/okteta/Makefile	(revision 423781)
>+++ devel/okteta/Makefile	(working copy)
>@@ -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
>Index: devel/p5-perlkde/Makefile
>===================================================================
>--- devel/p5-perlkde/Makefile	(revision 423781)
>+++ devel/p5-perlkde/Makefile	(working copy)
>@@ -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
>Index: devel/p5-perlqt/Makefile
>===================================================================
>--- devel/p5-perlqt/Makefile	(revision 423781)
>+++ devel/p5-perlqt/Makefile	(working copy)
>@@ -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
>Index: devel/poxml/Makefile
>===================================================================
>--- devel/poxml/Makefile	(revision 423781)
>+++ devel/poxml/Makefile	(working copy)
>@@ -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
>Index: devel/py-krosspython/Makefile
>===================================================================
>--- devel/py-krosspython/Makefile	(revision 423781)
>+++ devel/py-krosspython/Makefile	(working copy)
>@@ -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
>Index: devel/py-pykde4/Makefile
>===================================================================
>--- devel/py-pykde4/Makefile	(revision 423781)
>+++ devel/py-pykde4/Makefile	(working copy)
>@@ -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
>Index: devel/py-pykdeuic4/Makefile
>===================================================================
>--- devel/py-pykdeuic4/Makefile	(revision 423781)
>+++ devel/py-pykdeuic4/Makefile	(working copy)
>@@ -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
>Index: devel/ruby-korundum/Makefile
>===================================================================
>--- devel/ruby-korundum/Makefile	(revision 423781)
>+++ devel/ruby-korundum/Makefile	(working copy)
>@@ -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
>Index: devel/ruby-krossruby/Makefile
>===================================================================
>--- devel/ruby-krossruby/Makefile	(revision 423781)
>+++ devel/ruby-krossruby/Makefile	(working copy)
>@@ -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
>Index: devel/ruby-qtruby/Makefile
>===================================================================
>--- devel/ruby-qtruby/Makefile	(revision 423781)
>+++ devel/ruby-qtruby/Makefile	(working copy)
>@@ -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
>Index: devel/smokegen/Makefile
>===================================================================
>--- devel/smokegen/Makefile	(revision 423781)
>+++ devel/smokegen/Makefile	(working copy)
>@@ -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
> 
>Index: devel/smokekde/Makefile
>===================================================================
>--- devel/smokekde/Makefile	(revision 423781)
>+++ devel/smokekde/Makefile	(working copy)
>@@ -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
>Index: devel/smokeqt/Makefile
>===================================================================
>--- devel/smokeqt/Makefile	(revision 423781)
>+++ devel/smokeqt/Makefile	(working copy)
>@@ -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
>Index: devel/umbrello/Makefile
>===================================================================
>--- devel/umbrello/Makefile	(revision 423781)
>+++ devel/umbrello/Makefile	(working copy)
>@@ -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
>Index: editors/calligra-l10n/files/bsd.l10n.mk
>===================================================================
>--- editors/calligra-l10n/files/bsd.l10n.mk	(revision 423781)
>+++ editors/calligra-l10n/files/bsd.l10n.mk	(working copy)
>@@ -1,8 +1,6 @@
> .if defined(CALLIGRA_L10N)
>-MASTER_SITES?=	KDE/${CALLIGRA_BRANCH}/calligra-${PORTVERSION}/calligra-l10n
> PKGNAMEPREFIX=	${CALLIGRA_L10N:S/@/_/}-
> DISTNAME=	${PORTNAME}-${CALLIGRA_L10N}-${PORTVERSION}
>-DIST_SUBDIR=	KDE/calligra/${PORTVERSION}/l10n
> 
> PLIST_SUB+=	LANG=${CALLIGRA_L10N}
> 
>Index: editors/kate/Makefile
>===================================================================
>--- editors/kate/Makefile	(revision 423781)
>+++ editors/kate/Makefile	(working copy)
>@@ -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
>Index: editors/kate-plugin-pate/Makefile
>===================================================================
>--- editors/kate-plugin-pate/Makefile	(revision 423781)
>+++ editors/kate-plugin-pate/Makefile	(working copy)
>@@ -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
>Index: games/blinken/Makefile
>===================================================================
>--- games/blinken/Makefile	(revision 423781)
>+++ games/blinken/Makefile	(working copy)
>@@ -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
>Index: games/bomber/Makefile
>===================================================================
>--- games/bomber/Makefile	(revision 423781)
>+++ games/bomber/Makefile	(working copy)
>@@ -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}
>Index: games/bovo/Makefile
>===================================================================
>--- games/bovo/Makefile	(revision 423781)
>+++ games/bovo/Makefile	(working copy)
>@@ -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}
>Index: games/granatier/Makefile
>===================================================================
>--- games/granatier/Makefile	(revision 423781)
>+++ games/granatier/Makefile	(working copy)
>@@ -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}
>Index: games/kajongg/Makefile
>===================================================================
>--- games/kajongg/Makefile	(revision 423781)
>+++ games/kajongg/Makefile	(working copy)
>@@ -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}
>Index: games/kanagram/Makefile
>===================================================================
>--- games/kanagram/Makefile	(revision 423781)
>+++ games/kanagram/Makefile	(working copy)
>@@ -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
>Index: games/kapman/Makefile
>===================================================================
>--- games/kapman/Makefile	(revision 423781)
>+++ games/kapman/Makefile	(working copy)
>@@ -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}
>Index: games/katomic/Makefile
>===================================================================
>--- games/katomic/Makefile	(revision 423781)
>+++ games/katomic/Makefile	(working copy)
>@@ -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}
>Index: games/kblackbox/Makefile
>===================================================================
>--- games/kblackbox/Makefile	(revision 423781)
>+++ games/kblackbox/Makefile	(working copy)
>@@ -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}
>Index: games/kblocks/Makefile
>===================================================================
>--- games/kblocks/Makefile	(revision 423781)
>+++ games/kblocks/Makefile	(working copy)
>@@ -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}
>Index: games/kbounce/Makefile
>===================================================================
>--- games/kbounce/Makefile	(revision 423781)
>+++ games/kbounce/Makefile	(working copy)
>@@ -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}
>Index: games/kbreakout/Makefile
>===================================================================
>--- games/kbreakout/Makefile	(revision 423781)
>+++ games/kbreakout/Makefile	(working copy)
>@@ -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}
>Index: games/kdiamond/Makefile
>===================================================================
>--- games/kdiamond/Makefile	(revision 423781)
>+++ games/kdiamond/Makefile	(working copy)
>@@ -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}
>Index: games/kfourinline/Makefile
>===================================================================
>--- games/kfourinline/Makefile	(revision 423781)
>+++ games/kfourinline/Makefile	(working copy)
>@@ -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}
>Index: games/kgoldrunner/Makefile
>===================================================================
>--- games/kgoldrunner/Makefile	(revision 423781)
>+++ games/kgoldrunner/Makefile	(working copy)
>@@ -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}
>Index: games/khangman/Makefile
>===================================================================
>--- games/khangman/Makefile	(revision 423781)
>+++ games/khangman/Makefile	(working copy)
>@@ -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
>Index: games/kigo/Makefile
>===================================================================
>--- games/kigo/Makefile	(revision 423781)
>+++ games/kigo/Makefile	(working copy)
>@@ -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}
>Index: games/killbots/Makefile
>===================================================================
>--- games/killbots/Makefile	(revision 423781)
>+++ games/killbots/Makefile	(working copy)
>@@ -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}
>Index: games/kiriki/Makefile
>===================================================================
>--- games/kiriki/Makefile	(revision 423781)
>+++ games/kiriki/Makefile	(working copy)
>@@ -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}
>Index: games/kjumpingcube/Makefile
>===================================================================
>--- games/kjumpingcube/Makefile	(revision 423781)
>+++ games/kjumpingcube/Makefile	(working copy)
>@@ -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}
>Index: games/klickety/Makefile
>===================================================================
>--- games/klickety/Makefile	(revision 423781)
>+++ games/klickety/Makefile	(working copy)
>@@ -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}
>Index: games/klines/Makefile
>===================================================================
>--- games/klines/Makefile	(revision 423781)
>+++ games/klines/Makefile	(working copy)
>@@ -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}
>Index: games/kmahjongg/Makefile
>===================================================================
>--- games/kmahjongg/Makefile	(revision 423781)
>+++ games/kmahjongg/Makefile	(working copy)
>@@ -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}
>Index: games/kmines/Makefile
>===================================================================
>--- games/kmines/Makefile	(revision 423781)
>+++ games/kmines/Makefile	(working copy)
>@@ -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}
>Index: games/knavalbattle/Makefile
>===================================================================
>--- games/knavalbattle/Makefile	(revision 423781)
>+++ games/knavalbattle/Makefile	(working copy)
>@@ -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}
>Index: games/knetwalk/Makefile
>===================================================================
>--- games/knetwalk/Makefile	(revision 423781)
>+++ games/knetwalk/Makefile	(working copy)
>@@ -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}
>Index: games/kolf/Makefile
>===================================================================
>--- games/kolf/Makefile	(revision 423781)
>+++ games/kolf/Makefile	(working copy)
>@@ -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}
>Index: games/kollision/Makefile
>===================================================================
>--- games/kollision/Makefile	(revision 423781)
>+++ games/kollision/Makefile	(working copy)
>@@ -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}
>Index: games/konquest/Makefile
>===================================================================
>--- games/konquest/Makefile	(revision 423781)
>+++ games/konquest/Makefile	(working copy)
>@@ -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}
>Index: games/kpat/Makefile
>===================================================================
>--- games/kpat/Makefile	(revision 423781)
>+++ games/kpat/Makefile	(working copy)
>@@ -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}
>Index: games/kreversi/Makefile
>===================================================================
>--- games/kreversi/Makefile	(revision 423781)
>+++ games/kreversi/Makefile	(working copy)
>@@ -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}
>Index: games/kshisen/Makefile
>===================================================================
>--- games/kshisen/Makefile	(revision 423781)
>+++ games/kshisen/Makefile	(working copy)
>@@ -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}
>Index: games/ksirk/Makefile
>===================================================================
>--- games/ksirk/Makefile	(revision 423781)
>+++ games/ksirk/Makefile	(working copy)
>@@ -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}
>Index: games/ksnakeduel/Makefile
>===================================================================
>--- games/ksnakeduel/Makefile	(revision 423781)
>+++ games/ksnakeduel/Makefile	(working copy)
>@@ -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}
>Index: games/kspaceduel/Makefile
>===================================================================
>--- games/kspaceduel/Makefile	(revision 423781)
>+++ games/kspaceduel/Makefile	(working copy)
>@@ -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}
>Index: games/ksquares/Makefile
>===================================================================
>--- games/ksquares/Makefile	(revision 423781)
>+++ games/ksquares/Makefile	(working copy)
>@@ -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}
>Index: games/ksudoku/Makefile
>===================================================================
>--- games/ksudoku/Makefile	(revision 423781)
>+++ games/ksudoku/Makefile	(working copy)
>@@ -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}
>Index: games/ktuberling/Makefile
>===================================================================
>--- games/ktuberling/Makefile	(revision 423781)
>+++ games/ktuberling/Makefile	(working copy)
>@@ -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}
>Index: games/kubrick/Makefile
>===================================================================
>--- games/kubrick/Makefile	(revision 423781)
>+++ games/kubrick/Makefile	(working copy)
>@@ -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}
>Index: games/libkdegames/Makefile
>===================================================================
>--- games/libkdegames/Makefile	(revision 423781)
>+++ games/libkdegames/Makefile	(working copy)
>@@ -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
>Index: games/libkmahjongg/Makefile
>===================================================================
>--- games/libkmahjongg/Makefile	(revision 423781)
>+++ games/libkmahjongg/Makefile	(working copy)
>@@ -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
>Index: games/lskat/Makefile
>===================================================================
>--- games/lskat/Makefile	(revision 423781)
>+++ games/lskat/Makefile	(working copy)
>@@ -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}
>Index: games/pairs/Makefile
>===================================================================
>--- games/pairs/Makefile	(revision 423781)
>+++ games/pairs/Makefile	(working copy)
>@@ -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
>Index: games/palapeli/Makefile
>===================================================================
>--- games/palapeli/Makefile	(revision 423781)
>+++ games/palapeli/Makefile	(working copy)
>@@ -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}
>Index: games/picmi/Makefile
>===================================================================
>--- games/picmi/Makefile	(revision 423781)
>+++ games/picmi/Makefile	(working copy)
>@@ -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}
>Index: graphics/gwenview-kde4/Makefile
>===================================================================
>--- graphics/gwenview-kde4/Makefile	(revision 423781)
>+++ graphics/gwenview-kde4/Makefile	(working copy)
>@@ -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
>Index: graphics/kamera-kde4/Makefile
>===================================================================
>--- graphics/kamera-kde4/Makefile	(revision 423781)
>+++ graphics/kamera-kde4/Makefile	(working copy)
>@@ -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
>Index: graphics/kcolorchooser/Makefile
>===================================================================
>--- graphics/kcolorchooser/Makefile	(revision 423781)
>+++ graphics/kcolorchooser/Makefile	(working copy)
>@@ -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
>Index: graphics/kdegraphics4-mobipocket/Makefile
>===================================================================
>--- graphics/kdegraphics4-mobipocket/Makefile	(revision 423781)
>+++ graphics/kdegraphics4-mobipocket/Makefile	(working copy)
>@@ -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
>Index: graphics/kdegraphics4-strigi-analyzer/Makefile
>===================================================================
>--- graphics/kdegraphics4-strigi-analyzer/Makefile	(revision 423781)
>+++ graphics/kdegraphics4-strigi-analyzer/Makefile	(working copy)
>@@ -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
>Index: graphics/kdegraphics4-svgpart/Makefile
>===================================================================
>--- graphics/kdegraphics4-svgpart/Makefile	(revision 423781)
>+++ graphics/kdegraphics4-svgpart/Makefile	(working copy)
>@@ -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
>Index: graphics/kdegraphics4-thumbnailers/Makefile
>===================================================================
>--- graphics/kdegraphics4-thumbnailers/Makefile	(revision 423781)
>+++ graphics/kdegraphics4-thumbnailers/Makefile	(working copy)
>@@ -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
>Index: graphics/kolourpaint/Makefile
>===================================================================
>--- graphics/kolourpaint/Makefile	(revision 423781)
>+++ graphics/kolourpaint/Makefile	(working copy)
>@@ -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
>Index: graphics/kqtquickcharts/Makefile
>===================================================================
>--- graphics/kqtquickcharts/Makefile	(revision 423781)
>+++ graphics/kqtquickcharts/Makefile	(working copy)
>@@ -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
>Index: graphics/ksaneplugin/Makefile
>===================================================================
>--- graphics/ksaneplugin/Makefile	(revision 423781)
>+++ graphics/ksaneplugin/Makefile	(working copy)
>@@ -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
>Index: graphics/ksnapshot/Makefile
>===================================================================
>--- graphics/ksnapshot/Makefile	(revision 423781)
>+++ graphics/ksnapshot/Makefile	(working copy)
>@@ -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
>Index: graphics/libkdcraw-kde4/Makefile
>===================================================================
>--- graphics/libkdcraw-kde4/Makefile	(revision 423781)
>+++ graphics/libkdcraw-kde4/Makefile	(working copy)
>@@ -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
>Index: graphics/libkexiv2-kde4/Makefile
>===================================================================
>--- graphics/libkexiv2-kde4/Makefile	(revision 423781)
>+++ graphics/libkexiv2-kde4/Makefile	(working copy)
>@@ -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
>Index: graphics/libkipi-kde4/Makefile
>===================================================================
>--- graphics/libkipi-kde4/Makefile	(revision 423781)
>+++ graphics/libkipi-kde4/Makefile	(working copy)
>@@ -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
>Index: graphics/libksane/Makefile
>===================================================================
>--- graphics/libksane/Makefile	(revision 423781)
>+++ graphics/libksane/Makefile	(working copy)
>@@ -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
>Index: graphics/okular/Makefile
>===================================================================
>--- graphics/okular/Makefile	(revision 423781)
>+++ graphics/okular/Makefile	(working copy)
>@@ -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
>Index: japanese/kiten/Makefile
>===================================================================
>--- japanese/kiten/Makefile	(revision 423781)
>+++ japanese/kiten/Makefile	(working copy)
>@@ -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
>Index: lang/kturtle/Makefile
>===================================================================
>--- lang/kturtle/Makefile	(revision 423781)
>+++ lang/kturtle/Makefile	(working copy)
>@@ -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
>Index: math/analitza/Makefile
>===================================================================
>--- math/analitza/Makefile	(revision 423781)
>+++ math/analitza/Makefile	(working copy)
>@@ -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
>Index: math/cantor/Makefile
>===================================================================
>--- math/cantor/Makefile	(revision 423781)
>+++ math/cantor/Makefile	(working copy)
>@@ -3,9 +3,7 @@
> PORTNAME=	cantor
> 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 4 frontend to mathematical software
>Index: math/kalgebra/Makefile
>===================================================================
>--- math/kalgebra/Makefile	(revision 423781)
>+++ math/kalgebra/Makefile	(working copy)
>@@ -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
>Index: math/kbruch/Makefile
>===================================================================
>--- math/kbruch/Makefile	(revision 423781)
>+++ math/kbruch/Makefile	(working copy)
>@@ -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
>Index: math/kcalc/Makefile
>===================================================================
>--- math/kcalc/Makefile	(revision 423781)
>+++ math/kcalc/Makefile	(working copy)
>@@ -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
>Index: math/kig/Makefile
>===================================================================
>--- math/kig/Makefile	(revision 423781)
>+++ math/kig/Makefile	(working copy)
>@@ -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
>Index: math/kmplot/Makefile
>===================================================================
>--- math/kmplot/Makefile	(revision 423781)
>+++ math/kmplot/Makefile	(working copy)
>@@ -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
>Index: math/rocs/Makefile
>===================================================================
>--- math/rocs/Makefile	(revision 423781)
>+++ math/rocs/Makefile	(working copy)
>@@ -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
>Index: misc/artikulate/Makefile
>===================================================================
>--- misc/artikulate/Makefile	(revision 423781)
>+++ misc/artikulate/Makefile	(working copy)
>@@ -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
>Index: misc/kgeography/Makefile
>===================================================================
>--- misc/kgeography/Makefile	(revision 423781)
>+++ misc/kgeography/Makefile	(working copy)
>@@ -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
>Index: misc/klettres/Makefile
>===================================================================
>--- misc/klettres/Makefile	(revision 423781)
>+++ misc/klettres/Makefile	(working copy)
>@@ -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
>Index: misc/ktouch/Makefile
>===================================================================
>--- misc/ktouch/Makefile	(revision 423781)
>+++ misc/ktouch/Makefile	(working copy)
>@@ -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
>Index: misc/kwordquiz/Makefile
>===================================================================
>--- misc/kwordquiz/Makefile	(revision 423781)
>+++ misc/kwordquiz/Makefile	(working copy)
>@@ -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
>Index: misc/libkdeedu/Makefile
>===================================================================
>--- misc/libkdeedu/Makefile	(revision 423781)
>+++ misc/libkdeedu/Makefile	(working copy)
>@@ -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
>Index: misc/parley/Makefile
>===================================================================
>--- misc/parley/Makefile	(revision 423781)
>+++ misc/parley/Makefile	(working copy)
>@@ -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
>Index: multimedia/dragon/Makefile
>===================================================================
>--- multimedia/dragon/Makefile	(revision 423781)
>+++ multimedia/dragon/Makefile	(working copy)
>@@ -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
>Index: multimedia/kdemultimedia4-ffmpegthumbs/Makefile
>===================================================================
>--- multimedia/kdemultimedia4-ffmpegthumbs/Makefile	(revision 423781)
>+++ multimedia/kdemultimedia4-ffmpegthumbs/Makefile	(working copy)
>@@ -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
>Index: multimedia/kdemultimedia4-mplayerthumbs/Makefile
>===================================================================
>--- multimedia/kdemultimedia4-mplayerthumbs/Makefile	(revision 423781)
>+++ multimedia/kdemultimedia4-mplayerthumbs/Makefile	(working copy)
>@@ -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
>Index: net/kdenetwork4-filesharing/Makefile
>===================================================================
>--- net/kdenetwork4-filesharing/Makefile	(revision 423781)
>+++ net/kdenetwork4-filesharing/Makefile	(working copy)
>@@ -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
>Index: net/kdenetwork4-strigi-analyzers/Makefile
>===================================================================
>--- net/kdenetwork4-strigi-analyzers/Makefile	(revision 423781)
>+++ net/kdenetwork4-strigi-analyzers/Makefile	(working copy)
>@@ -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
>Index: net/kget/Makefile
>===================================================================
>--- net/kget/Makefile	(revision 423781)
>+++ net/kget/Makefile	(working copy)
>@@ -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
> 
>Index: net/krdc/Makefile
>===================================================================
>--- net/krdc/Makefile	(revision 423781)
>+++ net/krdc/Makefile	(working copy)
>@@ -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
>Index: net/krfb/Makefile
>===================================================================
>--- net/krfb/Makefile	(revision 423781)
>+++ net/krfb/Makefile	(working copy)
>@@ -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
>Index: net/zeroconf-ioslave/Makefile
>===================================================================
>--- net/zeroconf-ioslave/Makefile	(revision 423781)
>+++ net/zeroconf-ioslave/Makefile	(working copy)
>@@ -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)
>Index: net-im/kopete-kde4/Makefile
>===================================================================
>--- net-im/kopete-kde4/Makefile	(revision 423781)
>+++ net-im/kopete-kde4/Makefile	(working copy)
>@@ -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
>Index: print/kde4-print-manager/Makefile
>===================================================================
>--- print/kde4-print-manager/Makefile	(revision 423781)
>+++ print/kde4-print-manager/Makefile	(working copy)
>@@ -3,9 +3,7 @@
> PORTNAME=	print-manager
> PORTVERSION=	${KDE4_VERSION}
> PORTREVISION=	1
>-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
>Index: science/kalzium/Makefile
>===================================================================
>--- science/kalzium/Makefile	(revision 423781)
>+++ science/kalzium/Makefile	(working copy)
>@@ -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
>Index: science/step/Makefile
>===================================================================
>--- science/step/Makefile	(revision 423781)
>+++ science/step/Makefile	(working copy)
>@@ -2,9 +2,7 @@
> 
> PORTNAME=	step
> PORTVERSION=	${KDE4_VERSION}
>-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
>Index: security/kgpg-kde4/Makefile
>===================================================================
>--- security/kgpg-kde4/Makefile	(revision 423781)
>+++ security/kgpg-kde4/Makefile	(working copy)
>@@ -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
>Index: security/kwalletmanager/Makefile
>===================================================================
>--- security/kwalletmanager/Makefile	(revision 423781)
>+++ security/kwalletmanager/Makefile	(working copy)
>@@ -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
>Index: sysutils/baloo/Makefile
>===================================================================
>--- sysutils/baloo/Makefile	(revision 423781)
>+++ sysutils/baloo/Makefile	(working copy)
>@@ -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
>Index: sysutils/baloo-widgets/Makefile
>===================================================================
>--- sysutils/baloo-widgets/Makefile	(revision 423781)
>+++ sysutils/baloo-widgets/Makefile	(working copy)
>@@ -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
>Index: sysutils/filelight-kde4/Makefile
>===================================================================
>--- sysutils/filelight-kde4/Makefile	(revision 423781)
>+++ sysutils/filelight-kde4/Makefile	(working copy)
>@@ -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
>Index: sysutils/kcron/Makefile
>===================================================================
>--- sysutils/kcron/Makefile	(revision 423781)
>+++ sysutils/kcron/Makefile	(working copy)
>@@ -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
>Index: sysutils/kdf/Makefile
>===================================================================
>--- sysutils/kdf/Makefile	(revision 423781)
>+++ sysutils/kdf/Makefile	(working copy)
>@@ -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
>Index: sysutils/kfilemetadata/Makefile
>===================================================================
>--- sysutils/kfilemetadata/Makefile	(revision 423781)
>+++ sysutils/kfilemetadata/Makefile	(working copy)
>@@ -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
>Index: sysutils/kfloppy/Makefile
>===================================================================
>--- sysutils/kfloppy/Makefile	(revision 423781)
>+++ sysutils/kfloppy/Makefile	(working copy)
>@@ -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
>Index: sysutils/ksystemlog/Makefile
>===================================================================
>--- sysutils/ksystemlog/Makefile	(revision 423781)
>+++ sysutils/ksystemlog/Makefile	(working copy)
>@@ -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
>Index: sysutils/kuser/Makefile
>===================================================================
>--- sysutils/kuser/Makefile	(revision 423781)
>+++ sysutils/kuser/Makefile	(working copy)
>@@ -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
>Index: sysutils/nepomuk-core/Makefile
>===================================================================
>--- sysutils/nepomuk-core/Makefile	(revision 423781)
>+++ sysutils/nepomuk-core/Makefile	(working copy)
>@@ -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
>Index: sysutils/nepomuk-widgets/Makefile
>===================================================================
>--- sysutils/nepomuk-widgets/Makefile	(revision 423781)
>+++ sysutils/nepomuk-widgets/Makefile	(working copy)
>@@ -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
>Index: sysutils/sweeper/Makefile
>===================================================================
>--- sysutils/sweeper/Makefile	(revision 423781)
>+++ sysutils/sweeper/Makefile	(working copy)
>@@ -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
>Index: textproc/kompare/Makefile
>===================================================================
>--- textproc/kompare/Makefile	(revision 423781)
>+++ textproc/kompare/Makefile	(working copy)
>@@ -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
>Index: textproc/libkomparediff2/Makefile
>===================================================================
>--- textproc/libkomparediff2/Makefile	(revision 423781)
>+++ textproc/libkomparediff2/Makefile	(working copy)
>@@ -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
>Index: www/kdewebdev4/Makefile
>===================================================================
>--- www/kdewebdev4/Makefile	(revision 423781)
>+++ www/kdewebdev4/Makefile	(working copy)
>@@ -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
>Index: x11/kde4-baseapps/Makefile
>===================================================================
>--- x11/kde4-baseapps/Makefile	(revision 423781)
>+++ x11/kde4-baseapps/Makefile	(working copy)
>@@ -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
>Index: x11/kde4-runtime/Makefile
>===================================================================
>--- x11/kde4-runtime/Makefile	(revision 423781)
>+++ x11/kde4-runtime/Makefile	(working copy)
>@@ -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
>Index: x11/kgamma/Makefile
>===================================================================
>--- x11/kgamma/Makefile	(revision 423781)
>+++ x11/kgamma/Makefile	(working copy)
>@@ -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
>Index: x11/konsole/Makefile
>===================================================================
>--- x11/konsole/Makefile	(revision 423781)
>+++ x11/konsole/Makefile	(working copy)
>@@ -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
>Index: x11/libkonq/Makefile
>===================================================================
>--- x11/libkonq/Makefile	(revision 423781)
>+++ x11/libkonq/Makefile	(working copy)
>@@ -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
>Index: x11-clocks/amor/Makefile
>===================================================================
>--- x11-clocks/amor/Makefile	(revision 423781)
>+++ x11-clocks/amor/Makefile	(working copy)
>@@ -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
>Index: x11-clocks/kteatime/Makefile
>===================================================================
>--- x11-clocks/kteatime/Makefile	(revision 423781)
>+++ x11-clocks/kteatime/Makefile	(working copy)
>@@ -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
>Index: x11-clocks/ktimer/Makefile
>===================================================================
>--- x11-clocks/ktimer/Makefile	(revision 423781)
>+++ x11-clocks/ktimer/Makefile	(working copy)
>@@ -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
>Index: x11-clocks/ktux/Makefile
>===================================================================
>--- x11-clocks/ktux/Makefile	(revision 423781)
>+++ x11-clocks/ktux/Makefile	(working copy)
>@@ -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
>Index: x11-themes/kde4-base-artwork/Makefile
>===================================================================
>--- x11-themes/kde4-base-artwork/Makefile	(revision 423781)
>+++ x11-themes/kde4-base-artwork/Makefile	(working copy)
>@@ -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
>Index: x11-themes/kde4-icons-oxygen/Makefile
>===================================================================
>--- x11-themes/kde4-icons-oxygen/Makefile	(revision 423781)
>+++ x11-themes/kde4-icons-oxygen/Makefile	(working copy)
>@@ -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
>Index: x11-themes/kde4-wallpapers/Makefile
>===================================================================
>--- x11-themes/kde4-wallpapers/Makefile	(revision 423781)
>+++ x11-themes/kde4-wallpapers/Makefile	(working copy)
>@@ -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
>Index: x11-themes/kdeartwork4/Makefile
>===================================================================
>--- x11-themes/kdeartwork4/Makefile	(revision 423781)
>+++ x11-themes/kdeartwork4/Makefile	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 213406: 175650 | 175815 | 175816