KDE/FreeBSD team presents KDE SC 4.12.2 and KDE Workspace 4.11.6!

Among changes:
- Switch KDE4_PREFIX to ${LOCALBASE}
- Remove now needless misc/kde4-shared-mime-info port
- Add stage support
- Remove ancient CONFLICTS (KDE 4.9 and less) and LATEST_LINK
- Squeeze MASTER_SITES/MASTER_SITE_SUBDIR
- Convert LIB_DEPENDS to new style
- Use options helpers
- Drop support for FreeBSD 7.x
- Remove Qt/KDE 3 related workarounds
- Remove local patches and use upstream version scheme for libraries
- sysutils/kdeadmin4, net/kdenetwork4, devel/kdesdk4,
  and x11-clocks/kdetoys4 ports have been split.
- devel/kcachegrind is now a part of KDE SC [1]
- more logs in area51 repo...

New ports:
  devel/kde-dev-scripts:	KDE development scripts
  devel/kde-dev-utils:		KDE development utilities
  games/klickety:		Tetris themed solitaire
  games/picmi:			Single player logic-based puzzle game
  textproc/libkomparediff2:	Library to compare files and strings

The area51 repository features commits by Schaich Alonso, avilla, rakuco
and myself.

PR:		ports/186491
Exp-run:	by bdrewery
Approved by:	beat (former maintainer) [1]

3 files changed, 27 insertions, 30 deletions

diff --git a/games/knavalbattle/Makefile b/games/knavalbattle/Makefile
index b2012689262f..9891aaa44d55 100644
--- a/games/knavalbattle/Makefile
+++ b/games/knavalbattle/Makefile
@@ -3,21 +3,17 @@
 PORTNAME=	knavalbattle
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	games kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}
 
-CONFLICTS_INSTALL=	kdegames-4.[0-9].*
-
 USE_KDE4=	kdehier kdelibs kdeprefix libkdegames automoc4
 USES=		cmake:outsource
 USE_QT4=	corelib gui network xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 
-NO_STAGE=	yes
 .include <${.CURDIR}/../kdegames4/Makefile.common>
 .include <bsd.port.mk>
diff --git a/games/knavalbattle/distinfo b/games/knavalbattle/distinfo
index aa3159f814e1..da872217d22f 100644
--- a/games/knavalbattle/distinfo
+++ b/games/knavalbattle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/knavalbattle-4.10.5.tar.xz) = 74f7dee34f1379c5a86a04926b1e94b5b4195ceaa097ff79d5642eb98a7d1797
-SIZE (KDE/4.10.5/knavalbattle-4.10.5.tar.xz) = 856984
+SHA256 (KDE/4.12.2/knavalbattle-4.12.2.tar.xz) = fafc622ee4f72c96ea41b393354af24b12ce8babaa6443e32a0a125cde9b87bd
+SIZE (KDE/4.12.2/knavalbattle-4.12.2.tar.xz) = 849460
diff --git a/games/knavalbattle/pkg-plist b/games/knavalbattle/pkg-plist
index 82bc2d3a743f..0a02119b9ccb 100644
--- a/games/knavalbattle/pkg-plist
+++ b/games/knavalbattle/pkg-plist
@@ -1,23 +1,24 @@
-bin/kbattleship
-share/applications/kde4/kbattleship.desktop
-share/apps/kbattleship/kbattleshipui.rc
-share/apps/kbattleship/pictures/default.desktop
-share/apps/kbattleship/pictures/default_theme.svgz
-share/apps/kbattleship/sounds/ship-player-shoot-water.ogg
-share/apps/kbattleship/sounds/ship-player1-shoot.ogg
-share/apps/kbattleship/sounds/ship-player2-shoot.ogg
-share/apps/kbattleship/sounds/ship-sink.ogg
-share/doc/HTML/en/kbattleship/common
-share/doc/HTML/en/kbattleship/index.cache.bz2
-share/doc/HTML/en/kbattleship/index.docbook
-share/icons/hicolor/128x128/apps/kbattleship.png
-share/icons/hicolor/16x16/apps/kbattleship.png
-share/icons/hicolor/22x22/apps/kbattleship.png
-share/icons/hicolor/32x32/apps/kbattleship.png
-share/icons/hicolor/48x48/apps/kbattleship.png
-share/icons/hicolor/64x64/apps/kbattleship.png
-share/kde4/services/kbattleship.protocol
-@dirrm share/doc/HTML/en/kbattleship
-@dirrm share/apps/kbattleship/sounds
-@dirrm share/apps/kbattleship/pictures
-@dirrm share/apps/kbattleship
+bin/knavalbattle
+share/applications/kde4/knavalbattle.desktop
+share/apps/kconf_update/knavalbattle.upd
+share/apps/knavalbattle/knavalbattleui.rc
+share/apps/knavalbattle/pictures/default.desktop
+share/apps/knavalbattle/pictures/default_theme.svgz
+share/apps/knavalbattle/sounds/ship-player-shoot-water.ogg
+share/apps/knavalbattle/sounds/ship-player1-shoot.ogg
+share/apps/knavalbattle/sounds/ship-player2-shoot.ogg
+share/apps/knavalbattle/sounds/ship-sink.ogg
+share/doc/HTML/en/knavalbattle/common
+share/doc/HTML/en/knavalbattle/index.cache.bz2
+share/doc/HTML/en/knavalbattle/index.docbook
+share/icons/hicolor/128x128/apps/knavalbattle.png
+share/icons/hicolor/16x16/apps/knavalbattle.png
+share/icons/hicolor/22x22/apps/knavalbattle.png
+share/icons/hicolor/32x32/apps/knavalbattle.png
+share/icons/hicolor/48x48/apps/knavalbattle.png
+share/icons/hicolor/64x64/apps/knavalbattle.png
+share/kde4/services/knavalbattle.protocol
+@dirrm share/doc/HTML/en/knavalbattle
+@dirrm share/apps/knavalbattle/sounds
+@dirrm share/apps/knavalbattle/pictures
+@dirrm share/apps/knavalbattle