svn commit: r424182 - in head: Mk Mk/Uses accessibility/jovie accessibility/kaccessible accessibility/kmag accessibility/kmousetool accessibility/kmouth archivers/ark astro/kstars astro/marble audi...

Tobias C. Berner tcberner at FreeBSD.org
Tue Oct 18 17:22:45 UTC 2016 

Author: tcberner
Date: Tue Oct 18 17:22:35 2016
New Revision: 424182
URL: https://svnweb.freebsd.org/changeset/ports/424182

Log:
  Introduce new extensible virtual categories for KDE
  
  A lot of KDE Ports share MASTERSITES, LICENSE and so one, as they are
  released as a bundle upstream, however, there was not really a clean
  way to share this information.
  
  Using these new categories, we can simplify the Makefiles for the diverse
  KDE ports.
  At the moment we support the virtual category
  	* kde-kde4
  In the future, this will be extended to
  	* kde-frameworks
  	* kde-plasma
  	* kde-applications
  
  PR:						213406
  Differential Revision:	https://reviews.freebsd.org/D7645
  Exp-run by :			antoine
  Reviewed by:			mat, rakuco
  Approved by: 			portmgr (mat), rakuco (mentor)

Modified:
  head/Mk/Uses/kde.mk
  head/Mk/bsd.port.mk
  head/accessibility/jovie/Makefile
  head/accessibility/kaccessible/Makefile
  head/accessibility/kmag/Makefile
  head/accessibility/kmousetool/Makefile
  head/accessibility/kmouth/Makefile
  head/archivers/ark/Makefile
  head/astro/kstars/Makefile
  head/astro/marble/Makefile
  head/audio/juk/Makefile
  head/audio/kio-audiocd/Makefile
  head/audio/kmix/Makefile
  head/audio/kscd/Makefile
  head/audio/libkcddb/Makefile
  head/audio/libkcompactdisc/Makefile
  head/comms/kremotecontrol/Makefile
  head/deskutils/kcharselect/Makefile
  head/deskutils/kdeplasma-addons/Makefile
  head/deskutils/kruler/Makefile
  head/deskutils/superkaramba/Makefile
  head/devel/cervisia/Makefile
  head/devel/dolphin-plugins/Makefile
  head/devel/kapptemplate/Makefile
  head/devel/kcachegrind/Makefile
  head/devel/kde-dev-scripts/Makefile
  head/devel/kde-dev-utils/Makefile
  head/devel/kdesdk4-kioslaves/Makefile
  head/devel/kdesdk4-strigi-analyzers/Makefile
  head/devel/kdesdk4-thumbnailers/Makefile
  head/devel/lokalize/Makefile
  head/devel/okteta/Makefile
  head/devel/p5-perlkde/Makefile
  head/devel/p5-perlqt/Makefile
  head/devel/poxml/Makefile
  head/devel/py-krosspython/Makefile
  head/devel/py-pykde4/Makefile
  head/devel/py-pykdeuic4/Makefile
  head/devel/ruby-korundum/Makefile
  head/devel/ruby-krossruby/Makefile
  head/devel/ruby-qtruby/Makefile
  head/devel/smokegen/Makefile
  head/devel/smokekde/Makefile
  head/devel/smokeqt/Makefile
  head/devel/umbrello/Makefile
  head/editors/kate-plugin-pate/Makefile
  head/editors/kate/Makefile
  head/games/blinken/Makefile
  head/games/bomber/Makefile
  head/games/bovo/Makefile
  head/games/granatier/Makefile
  head/games/kajongg/Makefile
  head/games/kanagram/Makefile
  head/games/kapman/Makefile
  head/games/katomic/Makefile
  head/games/kblackbox/Makefile
  head/games/kblocks/Makefile
  head/games/kbounce/Makefile
  head/games/kbreakout/Makefile
  head/games/kdiamond/Makefile
  head/games/kfourinline/Makefile
  head/games/kgoldrunner/Makefile
  head/games/khangman/Makefile
  head/games/kigo/Makefile
  head/games/killbots/Makefile
  head/games/kiriki/Makefile
  head/games/kjumpingcube/Makefile
  head/games/klickety/Makefile
  head/games/klines/Makefile
  head/games/kmahjongg/Makefile
  head/games/kmines/Makefile
  head/games/knavalbattle/Makefile
  head/games/knetwalk/Makefile
  head/games/kolf/Makefile
  head/games/kollision/Makefile
  head/games/konquest/Makefile
  head/games/kpat/Makefile
  head/games/kreversi/Makefile
  head/games/kshisen/Makefile
  head/games/ksirk/Makefile
  head/games/ksnakeduel/Makefile
  head/games/kspaceduel/Makefile
  head/games/ksquares/Makefile
  head/games/ksudoku/Makefile
  head/games/ktuberling/Makefile
  head/games/kubrick/Makefile
  head/games/libkdegames/Makefile
  head/games/libkmahjongg/Makefile
  head/games/lskat/Makefile
  head/games/pairs/Makefile
  head/games/palapeli/Makefile
  head/games/picmi/Makefile
  head/graphics/gwenview-kde4/Makefile
  head/graphics/kamera-kde4/Makefile
  head/graphics/kcolorchooser/Makefile
  head/graphics/kdegraphics4-mobipocket/Makefile
  head/graphics/kdegraphics4-strigi-analyzer/Makefile
  head/graphics/kdegraphics4-svgpart/Makefile
  head/graphics/kdegraphics4-thumbnailers/Makefile
  head/graphics/kolourpaint/Makefile
  head/graphics/kqtquickcharts/Makefile
  head/graphics/ksaneplugin/Makefile
  head/graphics/ksnapshot/Makefile
  head/graphics/libkdcraw-kde4/Makefile
  head/graphics/libkexiv2-kde4/Makefile
  head/graphics/libkipi-kde4/Makefile
  head/graphics/libksane/Makefile
  head/graphics/okular/Makefile
  head/japanese/kiten/Makefile
  head/lang/kturtle/Makefile
  head/math/analitza/Makefile
  head/math/cantor/Makefile
  head/math/kalgebra/Makefile
  head/math/kbruch/Makefile
  head/math/kcalc/Makefile
  head/math/kig/Makefile
  head/math/kmplot/Makefile
  head/math/rocs/Makefile
  head/misc/artikulate/Makefile
  head/misc/kgeography/Makefile
  head/misc/klettres/Makefile
  head/misc/ktouch/Makefile
  head/misc/kwordquiz/Makefile
  head/misc/libkdeedu/Makefile
  head/misc/parley/Makefile
  head/multimedia/dragon/Makefile
  head/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
  head/multimedia/kdemultimedia4-mplayerthumbs/Makefile
  head/net-im/kopete-kde4/Makefile
  head/net/kdenetwork4-filesharing/Makefile
  head/net/kdenetwork4-strigi-analyzers/Makefile
  head/net/kget/Makefile
  head/net/krdc/Makefile
  head/net/krfb/Makefile
  head/net/zeroconf-ioslave/Makefile
  head/print/kde4-print-manager/Makefile
  head/science/kalzium/Makefile
  head/science/step/Makefile
  head/security/kgpg-kde4/Makefile
  head/security/kwalletmanager/Makefile
  head/sysutils/baloo-widgets/Makefile
  head/sysutils/baloo/Makefile
  head/sysutils/filelight-kde4/Makefile
  head/sysutils/kcron/Makefile
  head/sysutils/kdf/Makefile
  head/sysutils/kfilemetadata/Makefile
  head/sysutils/kfloppy/Makefile
  head/sysutils/ksystemlog/Makefile
  head/sysutils/kuser/Makefile
  head/sysutils/nepomuk-core/Makefile
  head/sysutils/nepomuk-widgets/Makefile
  head/sysutils/sweeper/Makefile
  head/textproc/kompare/Makefile
  head/textproc/libkomparediff2/Makefile
  head/www/kdewebdev4/Makefile
  head/x11-clocks/amor/Makefile
  head/x11-clocks/kteatime/Makefile
  head/x11-clocks/ktimer/Makefile
  head/x11-clocks/ktux/Makefile
  head/x11-themes/kde4-base-artwork/Makefile
  head/x11-themes/kde4-icons-oxygen/Makefile
  head/x11-themes/kde4-wallpapers/Makefile
  head/x11-themes/kdeartwork4/Makefile
  head/x11/kde4-baseapps/Makefile
  head/x11/kde4-runtime/Makefile
  head/x11/kgamma/Makefile
  head/x11/konsole/Makefile
  head/x11/libkonq/Makefile

Modified: head/Mk/Uses/kde.mk
==============================================================================
--- head/Mk/Uses/kde.mk	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/Mk/Uses/kde.mk	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 
 .if !defined(_INCLUDE_USES_KDE_MK)
@@ -72,6 +80,38 @@ KTP_BRANCH?=			stable
 KDE_PREFIX=	${LOCALBASE}
 # ==============================================================================
 
+# === _KDE_DIST HANDLING -- SETTING DEFAULT VALUES =============================
+# Doing MASTER_SITES magic based on the category of the port
+_KDE_CATEGORIES_SUPPORTED=	kde-kde4
+.  for cat in ${_KDE_CATEGORIES_SUPPORTED}
+.    if ${CATEGORIES:M${cat}}
+.      if !defined(_KDE_CATEGORY)
+_KDE_CATEGORY=	${cat}
+.      else
+IGNORE?=	cannot be installed: multiple kde-<...> categories specified via CATEGORIES=${CATEGORIES} #'
+.      endif
+.    endif
+.  endfor
+
+.  if defined(_KDE_CATEGORY)
+# KDE is normally licencensed LGPL 2.0.
+LICENSE?=		LGPL20
+
+# Set CPE Vendor Information
+#    As KDE_DIST is set we can assume it is port release by KDE and the vendor
+#    is therefore kde.
+CPE_VENDOR?=		kde
+
+.    if  ${_KDE_CATEGORY:Mkde-kde4}
+PORTVERSION?=		${KDE4_VERSION}
+MASTER_SITES?=		KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
+DIST_SUBDIR?=		KDE/${KDE4_VERSION}
+.    else
+IGNORE?=		unknown CATEGORY value '${_KDE_CATEGORY}' #'
+.    endif
+.  endif #defined(_KDE_CATEGORY)
+# ==============================================================================
+
 # ==== SETUP CMAKE ENVIRONMENT =================================================
 # Help cmake to find files when testing ports with non-default PREFIX.
 CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH="${LOCALBASE}"

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/Mk/bsd.port.mk	Tue Oct 18 17:22:35 2016	(r424182)
@@ -2439,7 +2439,7 @@ VALID_CATEGORIES+= accessibility afterst
 	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 \

Modified: head/accessibility/jovie/Makefile
==============================================================================
--- head/accessibility/jovie/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/accessibility/jovie/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE text-to-speech system

Modified: head/accessibility/kaccessible/Makefile
==============================================================================
--- head/accessibility/kaccessible/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/accessibility/kaccessible/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Accessibility services for KDE

Modified: head/accessibility/kmag/Makefile
==============================================================================
--- head/accessibility/kmag/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/accessibility/kmag/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE Screen magnifier

Modified: head/accessibility/kmousetool/Makefile
==============================================================================
--- head/accessibility/kmousetool/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/accessibility/kmousetool/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Automatic mouse click tool for KDE

Modified: head/accessibility/kmouth/Makefile
==============================================================================
--- head/accessibility/kmouth/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/accessibility/kmouth/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Speech synthesizer frontend for KDE
 

Modified: head/archivers/ark/Makefile
==============================================================================
--- head/archivers/ark/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/archivers/ark/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Archiving tool for KDE

Modified: head/astro/kstars/Makefile
==============================================================================
--- head/astro/kstars/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/astro/kstars/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE 4 desktop planetarium

Modified: head/astro/marble/Makefile
==============================================================================
--- head/astro/marble/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/astro/marble/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Virtual globe and world atlas for KDE

Modified: head/audio/juk/Makefile
==============================================================================
--- head/audio/juk/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/audio/juk/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Jukebox, tagger and music collection manager

Modified: head/audio/kio-audiocd/Makefile
==============================================================================
--- head/audio/kio-audiocd/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/audio/kio-audiocd/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE IOSlave for accessing audio CDs

Modified: head/audio/kmix/Makefile
==============================================================================
--- head/audio/kmix/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/audio/kmix/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Sound mixer for KDE

Modified: head/audio/kscd/Makefile
==============================================================================
--- head/audio/kscd/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/audio/kscd/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	CD Player for KDE

Modified: head/audio/libkcddb/Makefile
==============================================================================
--- head/audio/libkcddb/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/audio/libkcddb/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE CDDB library

Modified: head/audio/libkcompactdisc/Makefile
==============================================================================
--- head/audio/libkcompactdisc/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/audio/libkcompactdisc/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE library for interfacing with audio CDs

Modified: head/comms/kremotecontrol/Makefile
==============================================================================
--- head/comms/kremotecontrol/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/comms/kremotecontrol/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE frontend for your remote controls

Modified: head/deskutils/kcharselect/Makefile
==============================================================================
--- head/deskutils/kcharselect/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/deskutils/kcharselect/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Character selector for KDE

Modified: head/deskutils/kdeplasma-addons/Makefile
==============================================================================
--- head/deskutils/kdeplasma-addons/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/deskutils/kdeplasma-addons/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -3,9 +3,7 @@
 PORTNAME=	kdeplasma-addons
 PORTVERSION=	${KDE4_VERSION}
 PORTREVISION=	2
-CATEGORIES=	deskutils kde
-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE/${PORTVERSION}
+CATEGORIES=	deskutils kde kde-kde4
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Extra plasmoids for KDE SC 4

Modified: head/deskutils/kruler/Makefile
==============================================================================
--- head/deskutils/kruler/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/deskutils/kruler/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE 4 screen ruler

Modified: head/deskutils/superkaramba/Makefile
==============================================================================
--- head/deskutils/superkaramba/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/deskutils/superkaramba/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Widget framework for KDE

Modified: head/devel/cervisia/Makefile
==============================================================================
--- head/devel/cervisia/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/cervisia/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	CVS Frontend for KDE

Modified: head/devel/dolphin-plugins/Makefile
==============================================================================
--- head/devel/dolphin-plugins/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/dolphin-plugins/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Plugins for Dolphin file manager

Modified: head/devel/kapptemplate/Makefile
==============================================================================
--- head/devel/kapptemplate/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/kapptemplate/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE template generator

Modified: head/devel/kcachegrind/Makefile
==============================================================================
--- head/devel/kcachegrind/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/kcachegrind/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Profiler frontend for KDE

Modified: head/devel/kde-dev-scripts/Makefile
==============================================================================
--- head/devel/kde-dev-scripts/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/kde-dev-scripts/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE development scripts

Modified: head/devel/kde-dev-utils/Makefile
==============================================================================
--- head/devel/kde-dev-utils/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/kde-dev-utils/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE development utilities

Modified: head/devel/kdesdk4-kioslaves/Makefile
==============================================================================
--- head/devel/kdesdk4-kioslaves/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/kdesdk4-kioslaves/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	SDK related KIO slaves

Modified: head/devel/kdesdk4-strigi-analyzers/Makefile
==============================================================================
--- head/devel/kdesdk4-strigi-analyzers/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/kdesdk4-strigi-analyzers/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Strigi analyzers for SDK related file formats

Modified: head/devel/kdesdk4-thumbnailers/Makefile
==============================================================================
--- head/devel/kdesdk4-thumbnailers/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/kdesdk4-thumbnailers/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE thumbnail generator for gettext po files

Modified: head/devel/lokalize/Makefile
==============================================================================
--- head/devel/lokalize/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/lokalize/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Computer-aided translation system

Modified: head/devel/okteta/Makefile
==============================================================================
--- head/devel/okteta/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/okteta/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	KDE hex editor

Modified: head/devel/p5-perlkde/Makefile
==============================================================================
--- head/devel/p5-perlkde/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/p5-perlkde/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Perl bindings for KDE

Modified: head/devel/p5-perlqt/Makefile
==============================================================================
--- head/devel/p5-perlqt/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/p5-perlqt/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Perl bindings for Qt

Modified: head/devel/poxml/Makefile
==============================================================================
--- head/devel/poxml/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/poxml/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Tools to translate Docbook XML using gettext

Modified: head/devel/py-krosspython/Makefile
==============================================================================
--- head/devel/py-krosspython/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/py-krosspython/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Kross Python scripting library

Modified: head/devel/py-pykde4/Makefile
==============================================================================
--- head/devel/py-pykde4/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/py-pykde4/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Python bindings for KDE

Modified: head/devel/py-pykdeuic4/Makefile
==============================================================================
--- head/devel/py-pykdeuic4/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/py-pykdeuic4/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Enhanced version of pyuic4

Modified: head/devel/ruby-korundum/Makefile
==============================================================================
--- head/devel/ruby-korundum/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/ruby-korundum/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Ruby bindings for KDE

Modified: head/devel/ruby-krossruby/Makefile
==============================================================================
--- head/devel/ruby-krossruby/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/ruby-krossruby/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Ruby bindings for Qt/KDE

Modified: head/devel/ruby-qtruby/Makefile
==============================================================================
--- head/devel/ruby-qtruby/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/ruby-qtruby/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Ruby bindings for Qt

Modified: head/devel/smokegen/Makefile
==============================================================================
--- head/devel/smokegen/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/smokegen/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	SMOKE bindings for KDE
 

Modified: head/devel/smokekde/Makefile
==============================================================================
--- head/devel/smokekde/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/smokekde/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	SMOKE bindings for KDE

Modified: head/devel/smokeqt/Makefile
==============================================================================
--- head/devel/smokeqt/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/smokeqt/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	SMOKE bindings for Qt

Modified: head/devel/umbrello/Makefile
==============================================================================
--- head/devel/umbrello/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/devel/umbrello/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	UML modeller for KDE

Modified: head/editors/kate-plugin-pate/Makefile
==============================================================================
--- head/editors/kate-plugin-pate/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/editors/kate-plugin-pate/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Support for Python plugins in Kate

Modified: head/editors/kate/Makefile
==============================================================================
--- head/editors/kate/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/editors/kate/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Basic editor framework for the KDE system

Modified: head/games/blinken/Makefile
==============================================================================
--- head/games/blinken/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/blinken/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Memory enhancement game for KDE 4

Modified: head/games/bomber/Makefile
==============================================================================
--- head/games/bomber/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/bomber/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/bovo/Makefile
==============================================================================
--- head/games/bovo/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/bovo/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/granatier/Makefile
==============================================================================
--- head/games/granatier/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/granatier/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kajongg/Makefile
==============================================================================
--- head/games/kajongg/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kajongg/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kanagram/Makefile
==============================================================================
--- head/games/kanagram/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kanagram/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Letter order game for KDE 4

Modified: head/games/kapman/Makefile
==============================================================================
--- head/games/kapman/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kapman/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/katomic/Makefile
==============================================================================
--- head/games/katomic/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/katomic/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kblackbox/Makefile
==============================================================================
--- head/games/kblackbox/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kblackbox/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kblocks/Makefile
==============================================================================
--- head/games/kblocks/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kblocks/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kbounce/Makefile
==============================================================================
--- head/games/kbounce/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kbounce/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kbreakout/Makefile
==============================================================================
--- head/games/kbreakout/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kbreakout/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kdiamond/Makefile
==============================================================================
--- head/games/kdiamond/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kdiamond/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kfourinline/Makefile
==============================================================================
--- head/games/kfourinline/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kfourinline/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kgoldrunner/Makefile
==============================================================================
--- head/games/kgoldrunner/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kgoldrunner/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/khangman/Makefile
==============================================================================
--- head/games/khangman/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/khangman/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	Hangman game for KDE 4

Modified: head/games/kigo/Makefile
==============================================================================
--- head/games/kigo/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kigo/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/killbots/Makefile
==============================================================================
--- head/games/killbots/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/killbots/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kiriki/Makefile
==============================================================================
--- head/games/kiriki/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kiriki/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kjumpingcube/Makefile
==============================================================================
--- head/games/kjumpingcube/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kjumpingcube/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/klickety/Makefile
==============================================================================
--- head/games/klickety/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/klickety/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/klines/Makefile
==============================================================================
--- head/games/klines/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/klines/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kmahjongg/Makefile
==============================================================================
--- head/games/kmahjongg/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kmahjongg/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/kmines/Makefile
==============================================================================
--- head/games/kmines/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/kmines/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/knavalbattle/Makefile
==============================================================================
--- head/games/knavalbattle/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/knavalbattle/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -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 at FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}

Modified: head/games/knetwalk/Makefile
==============================================================================
--- head/games/knetwalk/Makefile	Tue Oct 18 17:00:27 2016	(r424181)
+++ head/games/knetwalk/Makefile	Tue Oct 18 17:22:35 2016	(r424182)
@@ -2,9 +2,7 @@
 
 PORTNAME=	knetwalk
 PORTVERSION=	${KDE4_VERSION}
-CATEGORIES=	games kde
-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list