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, 18 insertions, 10 deletions

diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 286c7d1228cc..c36fa988f682 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -3,15 +3,12 @@
 PORTNAME=	ktouch
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	misc 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=	Touch typing tutor for KDE 4
 
-CONFLICTS=	kdeedu-4.[0-6].*
-
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USES=		cmake:outsource
 USE_QT4=	corelib declarative opengl phonon script sql xmlpatterns \
@@ -19,7 +16,4 @@ USE_QT4=	corelib declarative opengl phonon script sql xmlpatterns \
 USE_XZ=		yes
 USE_XORG=	xkbfile
 
-MAN1=		ktouch.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/misc/ktouch/distinfo b/misc/ktouch/distinfo
index a8a5ea1d72aa..0d1aafa24844 100644
--- a/misc/ktouch/distinfo
+++ b/misc/ktouch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/ktouch-4.10.5.tar.xz) = 9fdfe24f01c837961a78b114a549dcc9b2df3d2e5c39bab1346df037aa373d29
-SIZE (KDE/4.10.5/ktouch-4.10.5.tar.xz) = 2625592
+SHA256 (KDE/4.12.2/ktouch-4.12.2.tar.xz) = 1bdcf114186997fec14c33bf028455a718681d5849453353e7fd6c36c05d1eed
+SIZE (KDE/4.12.2/ktouch-4.12.2.tar.xz) = 2448840
diff --git a/misc/ktouch/pkg-plist b/misc/ktouch/pkg-plist
index d497bb65b616..4d45d68a7a10 100644
--- a/misc/ktouch/pkg-plist
+++ b/misc/ktouch/pkg-plist
@@ -6,6 +6,7 @@ lib/kde4/imports/org/kde/ktouch/graph/LineGraph.qml
 lib/kde4/imports/org/kde/ktouch/graph/LineLabel.qml
 lib/kde4/imports/org/kde/ktouch/graph/libgraphplugin.so
 lib/kde4/imports/org/kde/ktouch/graph/qmldir
+man/man1/ktouch.1.gz
 share/applications/kde4/ktouch.desktop
 share/apps/ktouch/courses/ara.xml
 share/apps/ktouch/courses/bg1.xml
@@ -22,12 +23,15 @@ share/apps/ktouch/courses/es.dvorak.xml
 share/apps/ktouch/courses/es1.xml
 share/apps/ktouch/courses/es2.xml
 share/apps/ktouch/courses/es3.xml
+share/apps/ktouch/courses/es4.xml
 share/apps/ktouch/courses/fi.xml
+share/apps/ktouch/courses/fr.bepo.xml
 share/apps/ktouch/courses/fr.dvarok.xml
 share/apps/ktouch/courses/fr.xml
 share/apps/ktouch/courses/gb.xml
 share/apps/ktouch/courses/gr.xml
 share/apps/ktouch/courses/it.xml
+share/apps/ktouch/courses/ir.xml
 share/apps/ktouch/courses/lt.std.xml
 share/apps/ktouch/courses/nl1.xml
 share/apps/ktouch/courses/nl2.xml
@@ -43,6 +47,7 @@ share/apps/ktouch/courses/ua.xml
 share/apps/ktouch/courses/us.colemak.xml
 share/apps/ktouch/courses/us.dvorak1.xml
 share/apps/ktouch/courses/us.dvorak2.xml
+share/apps/ktouch/courses/us.workman.xml
 share/apps/ktouch/courses/us.xml
 share/apps/ktouch/data.xml
 share/apps/ktouch/images/accuracymeter.svgz
@@ -68,6 +73,7 @@ share/apps/ktouch/keyboardlayouts/ee.xml
 share/apps/ktouch/keyboardlayouts/es.dvorak.xml
 share/apps/ktouch/keyboardlayouts/es.xml
 share/apps/ktouch/keyboardlayouts/fi.xml
+share/apps/ktouch/keyboardlayouts/fr.bepo.xml
 share/apps/ktouch/keyboardlayouts/fr.dvorak.xml
 share/apps/ktouch/keyboardlayouts/fr.xml
 share/apps/ktouch/keyboardlayouts/gb.dvorak.xml
@@ -77,6 +83,7 @@ share/apps/ktouch/keyboardlayouts/il.xml
 share/apps/ktouch/keyboardlayouts/in.kan.xml
 share/apps/ktouch/keyboardlayouts/in.tam_unicode.xml
 share/apps/ktouch/keyboardlayouts/it.xml
+share/apps/ktouch/keyboardlayouts/ir.xml
 share/apps/ktouch/keyboardlayouts/latam.xml
 share/apps/ktouch/keyboardlayouts/lt.std.xml
 share/apps/ktouch/keyboardlayouts/no.xml
@@ -91,6 +98,7 @@ share/apps/ktouch/keyboardlayouts/tr.f.xml
 share/apps/ktouch/keyboardlayouts/ua.xml
 share/apps/ktouch/keyboardlayouts/us.colemak.xml
 share/apps/ktouch/keyboardlayouts/us.dvorak.xml
+share/apps/ktouch/keyboardlayouts/us.workman.xml
 share/apps/ktouch/keyboardlayouts/us.xml
 share/apps/ktouch/qml/AccuracyMeter.qml
 share/apps/ktouch/qml/Balloon.qml
@@ -98,11 +106,13 @@ share/apps/ktouch/qml/CharactersPerMinuteMeter.qml
 share/apps/ktouch/qml/CourseDescriptionItem.qml
 share/apps/ktouch/qml/CoursePage.qml
 share/apps/ktouch/qml/CourseSelector.qml
+share/apps/ktouch/qml/CustomLessonSelector.qml
 share/apps/ktouch/qml/ElapsedTimeMeter.qml
 share/apps/ktouch/qml/HomeScreen.qml
 share/apps/ktouch/qml/InfoItem.qml
 share/apps/ktouch/qml/InformationTable.qml
 share/apps/ktouch/qml/InitialProfileForm.qml
+share/apps/ktouch/qml/InlineToolbar.qml
 share/apps/ktouch/qml/KeyItem.qml
 share/apps/ktouch/qml/KeyLabel.qml
 share/apps/ktouch/qml/Keyboard.qml
@@ -112,6 +122,7 @@ share/apps/ktouch/qml/LearningProgressGraph.qml
 share/apps/ktouch/qml/LessonLockedNotice.qml
 share/apps/ktouch/qml/LessonPreview.qml
 share/apps/ktouch/qml/LessonSelector.qml
+share/apps/ktouch/qml/LessonSelectorBase.qml
 share/apps/ktouch/qml/ListItem.qml
 share/apps/ktouch/qml/MessageBox.qml
 share/apps/ktouch/qml/Meter.qml
@@ -124,7 +135,6 @@ share/apps/ktouch/qml/SelectionGrip.qml
 share/apps/ktouch/qml/SelectionRectangle.qml
 share/apps/ktouch/qml/SheetDialog.qml
 share/apps/ktouch/qml/StatBox.qml
-share/apps/ktouch/qml/TrainingLine.qml
 share/apps/ktouch/qml/TrainingScreen.qml
 share/apps/ktouch/qml/TrainingScreenMenuOverlay.qml
 share/apps/ktouch/qml/TrainingScreenToolbar.qml
@@ -141,7 +151,9 @@ share/doc/HTML/en/ktouch/Icon-arrow-up.png
 share/doc/HTML/en/ktouch/Icon-configure.png
 share/doc/HTML/en/ktouch/Icon-dialog-information.png
 share/doc/HTML/en/ktouch/Icon-document-new.png
+share/doc/HTML/en/ktouch/Icon-document-open.png
 share/doc/HTML/en/ktouch/Icon-edit-delete.png
+share/doc/HTML/en/ktouch/Icon-format-justify-fill.png
 share/doc/HTML/en/ktouch/Icon-go-home.png
 share/doc/HTML/en/ktouch/Icon-list-add.png
 share/doc/HTML/en/ktouch/Icon-list-remove.png
@@ -158,6 +170,8 @@ share/doc/HTML/en/ktouch/create_course3.png
 share/doc/HTML/en/ktouch/create_layout1.png
 share/doc/HTML/en/ktouch/create_layout2.png
 share/doc/HTML/en/ktouch/create_layout3.png
+share/doc/HTML/en/ktouch/custom-lessons-edit.png
+share/doc/HTML/en/ktouch/custom-lessons.png
 share/doc/HTML/en/ktouch/home_screen.png
 share/doc/HTML/en/ktouch/index.cache.bz2
 share/doc/HTML/en/ktouch/index.docbook