22 files changed, 100 insertions, 654 deletions

diff --git a/accessibility/Makefile b/accessibility/Makefile
index 45bce4ec1b7a..e62543133192 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -20,8 +20,12 @@
     SUBDIR += gok
     SUBDIR += java-access-bridge
     SUBDIR += jovie
+    SUBDIR += kaccessible
     SUBDIR += kdeaccessibility
     SUBDIR += kdeaccessibility4
+    SUBDIR += kmag
+    SUBDIR += kmousetool
+    SUBDIR += kmouth
     SUBDIR += linux-atk
     SUBDIR += linux-f10-atk
     SUBDIR += mousetweaks
diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile
index 5a487eb499ee..2caff327609f 100644
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@@ -7,11 +7,9 @@
 
 PORTNAME=	jovie
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DISTNAME=	kdeaccessibility-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -21,19 +19,14 @@ LIB_DEPENDS=	speechd.5:${PORTSDIR}/accessibility/speech-dispatcher
 
 CONFLICTS=	ktts-4.[4-6].*
 
-DISTINFO_FILE=	${PORTSDIR}/accessibility/kdeaccessibility4/distinfo
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4
 USE_QT_VER=	4
 QT_COMPONENTS=	xml qmake_build moc_build uic_build rcc_build
-CMAKE_ARGS+=	-DBUILD_kmousetool:BOOL=OFF
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/accessibility/jovie/distinfo b/accessibility/jovie/distinfo
new file mode 100644
index 000000000000..4715575665f0
--- /dev/null
+++ b/accessibility/jovie/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/jovie-4.8.3.tar.xz) = 59a4226acec116e59ac1ef26092f0c7fa28197e267dd52ceff5faf9190de827e
+SIZE (KDE/jovie-4.8.3.tar.xz) = 371064
diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile
index ce746ea0ff10..a6915bbb09aa 100644
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@@ -1,43 +1,29 @@
-# New ports collection Makefile for:	kdeaccessibility
-# Date created:				2008-01-31
-# Whom:					Martin Wilke <miwi@FreeBSD.org>
+# New ports collection makefile for:	kaccessible
+# Date created:		2012-02-23
+# Whom:			Max Brazhnikov <makc@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
-PORTNAME=	kdeaccessibility
+PORTNAME=	kaccessible
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Accessibility applications for KDE4
+COMMENT=	Accessibility services for KDE
 
 LIB_DEPENDS=	speechd.5:${PORTSDIR}/accessibility/speech-dispatcher
 
-LATEST_LINK=	${PORTNAME}4
+CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11 xext xtst
+QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-MAN1=	kmag.1 \
-	kmousetool.1 \
-	kmouth.1
-
-OPTIONS=	JOVIE "Install Jovie text-to-speech system" on
-
-.include <bsd.port.options.mk>
-
-.ifndef(WITHOUT_JOVIE)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
-.endif
 
 .include <bsd.port.mk>
diff --git a/accessibility/kaccessible/distinfo b/accessibility/kaccessible/distinfo
index 3d8735242957..92dc13e2240b 100644
--- a/accessibility/kaccessible/distinfo
+++ b/accessibility/kaccessible/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeaccessibility-4.7.4.tar.bz2) = 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
-SIZE (KDE/kdeaccessibility-4.7.4.tar.bz2) = 876933
+SHA256 (KDE/kaccessible-4.8.3.tar.xz) = aa071c9b590dfe9a4cac4cdfe487d8376cd818a79e6cce6eb469c92d2ccad4cb
+SIZE (KDE/kaccessible-4.8.3.tar.xz) = 21056
diff --git a/accessibility/kaccessible/pkg-descr b/accessibility/kaccessible/pkg-descr
index 88482fe6f50d..65c2666a47ed 100644
--- a/accessibility/kaccessible/pkg-descr
+++ b/accessibility/kaccessible/pkg-descr
@@ -1,4 +1,5 @@
-This port contains a set of KDE-based applications for
-accessibility needs.
+Kaccessible implements a QAccessibleBridgePlugin to provide
+accessibility services like focus tracking and a screenreader.
+
+WWW:	http://www.kde.org
 
-WWW:	http://www.kde.org/
diff --git a/accessibility/kaccessible/pkg-plist b/accessibility/kaccessible/pkg-plist
index 0eed894e6d69..017b1a4fcf3e 100644
--- a/accessibility/kaccessible/pkg-plist
+++ b/accessibility/kaccessible/pkg-plist
@@ -1,127 +1,4 @@
-bin/kmag
-bin/kmousetool
-bin/kmouth
 lib/kde4/libexec/kaccessibleapp
 lib/kde4/plugins/accessiblebridge/kaccessiblebridge.so
-share/applications/kde4/kmag.desktop
-share/applications/kde4/kmousetool.desktop
-share/applications/kde4/kmouth.desktop
-share/apps/kmag/kmagui.rc
-share/apps/kmousetool/sounds/mousetool_tap.wav
-share/apps/kmouth/books/de/de-courteousness.phrasebook
-share/apps/kmouth/books/de/de-greetings.phrasebook
-share/apps/kmouth/books/de/de-howareyou.phrasebook
-share/apps/kmouth/books/de/de-personal.phrasebook
-share/apps/kmouth/books/de/de.desktop
-share/apps/kmouth/books/en/en-courteousness.phrasebook
-share/apps/kmouth/books/en/en-greetings.phrasebook
-share/apps/kmouth/books/en/en-howareyou.phrasebook
-share/apps/kmouth/books/en/en-personal.phrasebook
-share/apps/kmouth/books/en/en.desktop
-share/apps/kmouth/books/sv/sv-courteousness.phrasebook
-share/apps/kmouth/books/sv/sv-greetings.phrasebook
-share/apps/kmouth/books/sv/sv-howareyou.phrasebook
-share/apps/kmouth/books/sv/sv-personal.phrasebook
-share/apps/kmouth/books/sv/sv.desktop
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/speak.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/speak.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/speak.png
-share/apps/kmouth/icons/hicolor/48x48/actions/speak.png
-share/apps/kmouth/kmouthui.rc
-share/apps/kmouth/phrasebookdialogui.rc
-share/config/kmouthrc
 share/dbus-1/services/org.kde.kaccessible.service
-share/doc/HTML/en/kmag/common
-share/doc/HTML/en/kmag/index.cache.bz2
-share/doc/HTML/en/kmag/index.docbook
-share/doc/HTML/en/kmag/man-kmag.1.docbook
-share/doc/HTML/en/kmag/screenshot.png
-share/doc/HTML/en/kmousetool/common
-share/doc/HTML/en/kmousetool/index.cache.bz2
-share/doc/HTML/en/kmousetool/index.docbook
-share/doc/HTML/en/kmousetool/man-kmousetool.1.docbook
-share/doc/HTML/en/kmouth/common
-share/doc/HTML/en/kmouth/index.cache.bz2
-share/doc/HTML/en/kmouth/index.docbook
-share/doc/HTML/en/kmouth/kmouthcpref.png
-share/doc/HTML/en/kmouth/kmouthctts.png
-share/doc/HTML/en/kmouth/kmouthcwcp.png
-share/doc/HTML/en/kmouth/kmouthedit.png
-share/doc/HTML/en/kmouth/kmouthmain.png
-share/doc/HTML/en/kmouth/kmouthwizard1.png
-share/doc/HTML/en/kmouth/kmouthwizard2.png
-share/doc/HTML/en/kmouth/kmouthwizard3.png
-share/doc/HTML/en/kmouth/man-kmouth.1.docbook
-share/icons/hicolor/16x16/actions/followmouse.png
-share/icons/hicolor/16x16/actions/hidemouse.png
-share/icons/hicolor/16x16/actions/kmousetool_off.png
-share/icons/hicolor/16x16/actions/kmousetool_on.png
-share/icons/hicolor/16x16/actions/window.png
-share/icons/hicolor/16x16/apps/kmag.png
-share/icons/hicolor/16x16/apps/kmousetool.png
-share/icons/hicolor/16x16/apps/kmouth.png
-share/icons/hicolor/22x22/apps/kmouth.png
-share/icons/hicolor/32x32/actions/kmousetool_off.png
-share/icons/hicolor/32x32/actions/kmousetool_on.png
-share/icons/hicolor/32x32/apps/kmag.png
-share/icons/hicolor/32x32/apps/kmousetool.png
-share/icons/hicolor/32x32/apps/kmouth.png
-share/icons/hicolor/48x48/apps/kmouth.png
-@dirrm share/doc/HTML/en/kmouth
-@dirrm share/doc/HTML/en/kmousetool
-@dirrm share/doc/HTML/en/kmag
-@dirrm share/apps/kmouth/icons/hicolor/48x48/actions
-@dirrm share/apps/kmouth/icons/hicolor/48x48
-@dirrm share/apps/kmouth/icons/hicolor/32x32/actions
-@dirrm share/apps/kmouth/icons/hicolor/32x32
-@dirrm share/apps/kmouth/icons/hicolor/22x22/actions
-@dirrm share/apps/kmouth/icons/hicolor/22x22
-@dirrm share/apps/kmouth/icons/hicolor/16x16/actions
-@dirrm share/apps/kmouth/icons/hicolor/16x16
-@dirrm share/apps/kmouth/icons/hicolor
-@dirrm share/apps/kmouth/icons
-@dirrm share/apps/kmouth/books/sv
-@dirrm share/apps/kmouth/books/en
-@dirrm share/apps/kmouth/books/de
-@dirrm share/apps/kmouth/books
-@dirrm share/apps/kmouth
-@dirrm share/apps/kmousetool/sounds
-@dirrm share/apps/kmousetool
-@dirrm share/apps/kmag
 @dirrm lib/kde4/plugins/accessiblebridge
diff --git a/accessibility/kdeaccessibility4/Makefile b/accessibility/kdeaccessibility4/Makefile
index ce746ea0ff10..1ea7a38c5273 100644
--- a/accessibility/kdeaccessibility4/Makefile
+++ b/accessibility/kdeaccessibility4/Makefile
@@ -6,33 +6,21 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Accessibility applications for KDE4
 
-LIB_DEPENDS=	speechd.5:${PORTSDIR}/accessibility/speech-dispatcher
+USE_KDE4=	kdeprefix
+NO_BUILD=	yes
 
-LATEST_LINK=	${PORTNAME}4
-
-USE_BZIP2=	yes
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11 xext xtst
-MAKE_JOBS_SAFE=	yes
-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-MAN1=	kmag.1 \
-	kmousetool.1 \
-	kmouth.1
-
-OPTIONS=	JOVIE "Install Jovie text-to-speech system" on
+OPTIONS=	JOVIE "Install Jovie text-to-speech system" on \
+		KACCESSIBLE "Install Accessibility services for KDE" on \
+		KMAG "Install Screen magnifier" on \
+		KMOUSETOOL "Install Automatic mouse click tool" on \
+		KMOUTH "Install Speech synthesizer frontend" on
 
 .include <bsd.port.options.mk>
 
@@ -40,4 +28,23 @@ OPTIONS=	JOVIE "Install Jovie text-to-speech system" on
 RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
 .endif
 
+.ifndef(WITHOUT_KACCESSIBLE)
+RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/libexec/kaccessibleapp:${PORTSDIR}/accessibility/kaccessible
+.endif
+
+.ifndef(WITHOUT_KMAG)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmag:${PORTSDIR}/accessibility/kmag
+.endif
+
+.ifndef(WITHOUT_KMOUSETOOL)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmousetool:${PORTSDIR}/accessibility/kmousetool
+.endif
+
+.ifndef(WITHOUT_KMOUTH)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmouth:${PORTSDIR}/accessibility/kmouth
+.endif
+
+do-install:
+	${DO_NADA}
+
 .include <bsd.port.mk>
diff --git a/accessibility/kdeaccessibility4/distinfo b/accessibility/kdeaccessibility4/distinfo
deleted file mode 100644
index 3d8735242957..000000000000
--- a/accessibility/kdeaccessibility4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/kdeaccessibility-4.7.4.tar.bz2) = 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
-SIZE (KDE/kdeaccessibility-4.7.4.tar.bz2) = 876933
diff --git a/accessibility/kdeaccessibility4/pkg-plist b/accessibility/kdeaccessibility4/pkg-plist
deleted file mode 100644
index 0eed894e6d69..000000000000
--- a/accessibility/kdeaccessibility4/pkg-plist
+++ /dev/null
@@ -1,127 +0,0 @@
-bin/kmag
-bin/kmousetool
-bin/kmouth
-lib/kde4/libexec/kaccessibleapp
-lib/kde4/plugins/accessiblebridge/kaccessiblebridge.so
-share/applications/kde4/kmag.desktop
-share/applications/kde4/kmousetool.desktop
-share/applications/kde4/kmouth.desktop
-share/apps/kmag/kmagui.rc
-share/apps/kmousetool/sounds/mousetool_tap.wav
-share/apps/kmouth/books/de/de-courteousness.phrasebook
-share/apps/kmouth/books/de/de-greetings.phrasebook
-share/apps/kmouth/books/de/de-howareyou.phrasebook
-share/apps/kmouth/books/de/de-personal.phrasebook
-share/apps/kmouth/books/de/de.desktop
-share/apps/kmouth/books/en/en-courteousness.phrasebook
-share/apps/kmouth/books/en/en-greetings.phrasebook
-share/apps/kmouth/books/en/en-howareyou.phrasebook
-share/apps/kmouth/books/en/en-personal.phrasebook
-share/apps/kmouth/books/en/en.desktop
-share/apps/kmouth/books/sv/sv-courteousness.phrasebook
-share/apps/kmouth/books/sv/sv-greetings.phrasebook
-share/apps/kmouth/books/sv/sv-howareyou.phrasebook
-share/apps/kmouth/books/sv/sv-personal.phrasebook
-share/apps/kmouth/books/sv/sv.desktop
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/speak.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/speak.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/speak.png
-share/apps/kmouth/icons/hicolor/48x48/actions/speak.png
-share/apps/kmouth/kmouthui.rc
-share/apps/kmouth/phrasebookdialogui.rc
-share/config/kmouthrc
-share/dbus-1/services/org.kde.kaccessible.service
-share/doc/HTML/en/kmag/common
-share/doc/HTML/en/kmag/index.cache.bz2
-share/doc/HTML/en/kmag/index.docbook
-share/doc/HTML/en/kmag/man-kmag.1.docbook
-share/doc/HTML/en/kmag/screenshot.png
-share/doc/HTML/en/kmousetool/common
-share/doc/HTML/en/kmousetool/index.cache.bz2
-share/doc/HTML/en/kmousetool/index.docbook
-share/doc/HTML/en/kmousetool/man-kmousetool.1.docbook
-share/doc/HTML/en/kmouth/common
-share/doc/HTML/en/kmouth/index.cache.bz2
-share/doc/HTML/en/kmouth/index.docbook
-share/doc/HTML/en/kmouth/kmouthcpref.png
-share/doc/HTML/en/kmouth/kmouthctts.png
-share/doc/HTML/en/kmouth/kmouthcwcp.png
-share/doc/HTML/en/kmouth/kmouthedit.png
-share/doc/HTML/en/kmouth/kmouthmain.png
-share/doc/HTML/en/kmouth/kmouthwizard1.png
-share/doc/HTML/en/kmouth/kmouthwizard2.png
-share/doc/HTML/en/kmouth/kmouthwizard3.png
-share/doc/HTML/en/kmouth/man-kmouth.1.docbook
-share/icons/hicolor/16x16/actions/followmouse.png
-share/icons/hicolor/16x16/actions/hidemouse.png
-share/icons/hicolor/16x16/actions/kmousetool_off.png
-share/icons/hicolor/16x16/actions/kmousetool_on.png
-share/icons/hicolor/16x16/actions/window.png
-share/icons/hicolor/16x16/apps/kmag.png
-share/icons/hicolor/16x16/apps/kmousetool.png
-share/icons/hicolor/16x16/apps/kmouth.png
-share/icons/hicolor/22x22/apps/kmouth.png
-share/icons/hicolor/32x32/actions/kmousetool_off.png
-share/icons/hicolor/32x32/actions/kmousetool_on.png
-share/icons/hicolor/32x32/apps/kmag.png
-share/icons/hicolor/32x32/apps/kmousetool.png
-share/icons/hicolor/32x32/apps/kmouth.png
-share/icons/hicolor/48x48/apps/kmouth.png
-@dirrm share/doc/HTML/en/kmouth
-@dirrm share/doc/HTML/en/kmousetool
-@dirrm share/doc/HTML/en/kmag
-@dirrm share/apps/kmouth/icons/hicolor/48x48/actions
-@dirrm share/apps/kmouth/icons/hicolor/48x48
-@dirrm share/apps/kmouth/icons/hicolor/32x32/actions
-@dirrm share/apps/kmouth/icons/hicolor/32x32
-@dirrm share/apps/kmouth/icons/hicolor/22x22/actions
-@dirrm share/apps/kmouth/icons/hicolor/22x22
-@dirrm share/apps/kmouth/icons/hicolor/16x16/actions
-@dirrm share/apps/kmouth/icons/hicolor/16x16
-@dirrm share/apps/kmouth/icons/hicolor
-@dirrm share/apps/kmouth/icons
-@dirrm share/apps/kmouth/books/sv
-@dirrm share/apps/kmouth/books/en
-@dirrm share/apps/kmouth/books/de
-@dirrm share/apps/kmouth/books
-@dirrm share/apps/kmouth
-@dirrm share/apps/kmousetool/sounds
-@dirrm share/apps/kmousetool
-@dirrm share/apps/kmag
-@dirrm lib/kde4/plugins/accessiblebridge
diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
index ce746ea0ff10..6b9b8e396942 100644
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@@ -1,43 +1,29 @@
-# New ports collection Makefile for:	kdeaccessibility
-# Date created:				2008-01-31
-# Whom:					Martin Wilke <miwi@FreeBSD.org>
+# New ports collection makefile for:	kmag
+# Date created:		2012-02-23
+# Whom:			Max Brazhnikov <makc@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
-PORTNAME=	kdeaccessibility
+PORTNAME=	kmag
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Accessibility applications for KDE4
-
-LIB_DEPENDS=	speechd.5:${PORTSDIR}/accessibility/speech-dispatcher
+COMMENT=	KDE Screen magnifier
 
-LATEST_LINK=	${PORTNAME}4
+CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11 xext xtst
+QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-MAN1=	kmag.1 \
-	kmousetool.1 \
-	kmouth.1
-
-OPTIONS=	JOVIE "Install Jovie text-to-speech system" on
-
-.include <bsd.port.options.mk>
 
-.ifndef(WITHOUT_JOVIE)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
-.endif
+MAN1=	kmag.1
 
 .include <bsd.port.mk>
diff --git a/accessibility/kmag/distinfo b/accessibility/kmag/distinfo
index 3d8735242957..af5880a97769 100644
--- a/accessibility/kmag/distinfo
+++ b/accessibility/kmag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeaccessibility-4.7.4.tar.bz2) = 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
-SIZE (KDE/kdeaccessibility-4.7.4.tar.bz2) = 876933
+SHA256 (KDE/kmag-4.8.3.tar.xz) = b4cb23489a1b1190ec9b60664da4b967294e4007c700c1bad4f24cdf8ea7721d
+SIZE (KDE/kmag-4.8.3.tar.xz) = 93416
diff --git a/accessibility/kmag/pkg-descr b/accessibility/kmag/pkg-descr
index 88482fe6f50d..b0a7b3d75286 100644
--- a/accessibility/kmag/pkg-descr
+++ b/accessibility/kmag/pkg-descr
@@ -1,4 +1,5 @@
-This port contains a set of KDE-based applications for
-accessibility needs.
+KMag is a small utility to magnify a part of the screen. KMag is
+very useful for people with visual disabilities and for those working
+in the fields of image analysis, web development etc.
 
-WWW:	http://www.kde.org/
+WWW:    http://www.kde.org/applications/utilities/kmag/
diff --git a/accessibility/kmag/pkg-plist b/accessibility/kmag/pkg-plist
index 0eed894e6d69..94ca7bbf8b13 100644
--- a/accessibility/kmag/pkg-plist
+++ b/accessibility/kmag/pkg-plist
@@ -1,127 +1,15 @@
 bin/kmag
-bin/kmousetool
-bin/kmouth
-lib/kde4/libexec/kaccessibleapp
-lib/kde4/plugins/accessiblebridge/kaccessiblebridge.so
 share/applications/kde4/kmag.desktop
-share/applications/kde4/kmousetool.desktop
-share/applications/kde4/kmouth.desktop
 share/apps/kmag/kmagui.rc
-share/apps/kmousetool/sounds/mousetool_tap.wav
-share/apps/kmouth/books/de/de-courteousness.phrasebook
-share/apps/kmouth/books/de/de-greetings.phrasebook
-share/apps/kmouth/books/de/de-howareyou.phrasebook
-share/apps/kmouth/books/de/de-personal.phrasebook
-share/apps/kmouth/books/de/de.desktop
-share/apps/kmouth/books/en/en-courteousness.phrasebook
-share/apps/kmouth/books/en/en-greetings.phrasebook
-share/apps/kmouth/books/en/en-howareyou.phrasebook
-share/apps/kmouth/books/en/en-personal.phrasebook
-share/apps/kmouth/books/en/en.desktop
-share/apps/kmouth/books/sv/sv-courteousness.phrasebook
-share/apps/kmouth/books/sv/sv-greetings.phrasebook
-share/apps/kmouth/books/sv/sv-howareyou.phrasebook
-share/apps/kmouth/books/sv/sv-personal.phrasebook
-share/apps/kmouth/books/sv/sv.desktop
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/speak.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/speak.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/speak.png
-share/apps/kmouth/icons/hicolor/48x48/actions/speak.png
-share/apps/kmouth/kmouthui.rc
-share/apps/kmouth/phrasebookdialogui.rc
-share/config/kmouthrc
-share/dbus-1/services/org.kde.kaccessible.service
 share/doc/HTML/en/kmag/common
 share/doc/HTML/en/kmag/index.cache.bz2
 share/doc/HTML/en/kmag/index.docbook
 share/doc/HTML/en/kmag/man-kmag.1.docbook
 share/doc/HTML/en/kmag/screenshot.png
-share/doc/HTML/en/kmousetool/common
-share/doc/HTML/en/kmousetool/index.cache.bz2
-share/doc/HTML/en/kmousetool/index.docbook
-share/doc/HTML/en/kmousetool/man-kmousetool.1.docbook
-share/doc/HTML/en/kmouth/common
-share/doc/HTML/en/kmouth/index.cache.bz2
-share/doc/HTML/en/kmouth/index.docbook
-share/doc/HTML/en/kmouth/kmouthcpref.png
-share/doc/HTML/en/kmouth/kmouthctts.png
-share/doc/HTML/en/kmouth/kmouthcwcp.png
-share/doc/HTML/en/kmouth/kmouthedit.png
-share/doc/HTML/en/kmouth/kmouthmain.png
-share/doc/HTML/en/kmouth/kmouthwizard1.png
-share/doc/HTML/en/kmouth/kmouthwizard2.png
-share/doc/HTML/en/kmouth/kmouthwizard3.png
-share/doc/HTML/en/kmouth/man-kmouth.1.docbook
 share/icons/hicolor/16x16/actions/followmouse.png
 share/icons/hicolor/16x16/actions/hidemouse.png
-share/icons/hicolor/16x16/actions/kmousetool_off.png
-share/icons/hicolor/16x16/actions/kmousetool_on.png
 share/icons/hicolor/16x16/actions/window.png
 share/icons/hicolor/16x16/apps/kmag.png
-share/icons/hicolor/16x16/apps/kmousetool.png
-share/icons/hicolor/16x16/apps/kmouth.png
-share/icons/hicolor/22x22/apps/kmouth.png
-share/icons/hicolor/32x32/actions/kmousetool_off.png
-share/icons/hicolor/32x32/actions/kmousetool_on.png
 share/icons/hicolor/32x32/apps/kmag.png
-share/icons/hicolor/32x32/apps/kmousetool.png
-share/icons/hicolor/32x32/apps/kmouth.png
-share/icons/hicolor/48x48/apps/kmouth.png
-@dirrm share/doc/HTML/en/kmouth
-@dirrm share/doc/HTML/en/kmousetool
 @dirrm share/doc/HTML/en/kmag
-@dirrm share/apps/kmouth/icons/hicolor/48x48/actions
-@dirrm share/apps/kmouth/icons/hicolor/48x48
-@dirrm share/apps/kmouth/icons/hicolor/32x32/actions
-@dirrm share/apps/kmouth/icons/hicolor/32x32
-@dirrm share/apps/kmouth/icons/hicolor/22x22/actions
-@dirrm share/apps/kmouth/icons/hicolor/22x22
-@dirrm share/apps/kmouth/icons/hicolor/16x16/actions
-@dirrm share/apps/kmouth/icons/hicolor/16x16
-@dirrm share/apps/kmouth/icons/hicolor
-@dirrm share/apps/kmouth/icons
-@dirrm share/apps/kmouth/books/sv
-@dirrm share/apps/kmouth/books/en
-@dirrm share/apps/kmouth/books/de
-@dirrm share/apps/kmouth/books
-@dirrm share/apps/kmouth
-@dirrm share/apps/kmousetool/sounds
-@dirrm share/apps/kmousetool
 @dirrm share/apps/kmag
-@dirrm lib/kde4/plugins/accessiblebridge
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
index ce746ea0ff10..2f08b6f55877 100644
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -1,43 +1,30 @@
-# New ports collection Makefile for:	kdeaccessibility
-# Date created:				2008-01-31
-# Whom:					Martin Wilke <miwi@FreeBSD.org>
+# New ports collection makefile for:	kmousetool
+# Date created:		2012-02-23
+# Whom:			Max Brazhnikov <makc@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
-PORTNAME=	kdeaccessibility
+PORTNAME=	kmousetool
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Accessibility applications for KDE4
-
-LIB_DEPENDS=	speechd.5:${PORTSDIR}/accessibility/speech-dispatcher
+COMMENT=	Automatic mouse click tool for KDE
 
-LATEST_LINK=	${PORTNAME}4
+CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11 xext xtst
+QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_XORG=	xtst
 MAKE_JOBS_SAFE=	yes
-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-MAN1=	kmag.1 \
-	kmousetool.1 \
-	kmouth.1
-
-OPTIONS=	JOVIE "Install Jovie text-to-speech system" on
-
-.include <bsd.port.options.mk>
 
-.ifndef(WITHOUT_JOVIE)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
-.endif
+MAN1=	kmousetool.1
 
 .include <bsd.port.mk>
diff --git a/accessibility/kmousetool/distinfo b/accessibility/kmousetool/distinfo
index 3d8735242957..98d9e967ad3d 100644
--- a/accessibility/kmousetool/distinfo
+++ b/accessibility/kmousetool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeaccessibility-4.7.4.tar.bz2) = 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
-SIZE (KDE/kdeaccessibility-4.7.4.tar.bz2) = 876933
+SHA256 (KDE/kmousetool-4.8.3.tar.xz) = 6e770444fabc9e5e9f0a595cd4f4bc70118a497726142f9797e8a3d899711846
+SIZE (KDE/kmousetool-4.8.3.tar.xz) = 46308
diff --git a/accessibility/kmousetool/pkg-descr b/accessibility/kmousetool/pkg-descr
index 88482fe6f50d..9ba2c456e17d 100644
--- a/accessibility/kmousetool/pkg-descr
+++ b/accessibility/kmousetool/pkg-descr
@@ -1,4 +1,5 @@
-This port contains a set of KDE-based applications for
-accessibility needs.
+KMouseTool clicks the mouse whenever the mouse cursor pauses briefly.
+It was designed to help those with repetitive strain injuries, for
+whom pressing buttons hurts.
 
-WWW:	http://www.kde.org/
+WWW:    http://www.kde.org/applications/utilities/kmousetool/
diff --git a/accessibility/kmousetool/pkg-plist b/accessibility/kmousetool/pkg-plist
index 0eed894e6d69..480f6676a5d9 100644
--- a/accessibility/kmousetool/pkg-plist
+++ b/accessibility/kmousetool/pkg-plist
@@ -1,127 +1,16 @@
-bin/kmag
 bin/kmousetool
-bin/kmouth
-lib/kde4/libexec/kaccessibleapp
-lib/kde4/plugins/accessiblebridge/kaccessiblebridge.so
-share/applications/kde4/kmag.desktop
 share/applications/kde4/kmousetool.desktop
-share/applications/kde4/kmouth.desktop
-share/apps/kmag/kmagui.rc
 share/apps/kmousetool/sounds/mousetool_tap.wav
-share/apps/kmouth/books/de/de-courteousness.phrasebook
-share/apps/kmouth/books/de/de-greetings.phrasebook
-share/apps/kmouth/books/de/de-howareyou.phrasebook
-share/apps/kmouth/books/de/de-personal.phrasebook
-share/apps/kmouth/books/de/de.desktop
-share/apps/kmouth/books/en/en-courteousness.phrasebook
-share/apps/kmouth/books/en/en-greetings.phrasebook
-share/apps/kmouth/books/en/en-howareyou.phrasebook
-share/apps/kmouth/books/en/en-personal.phrasebook
-share/apps/kmouth/books/en/en.desktop
-share/apps/kmouth/books/sv/sv-courteousness.phrasebook
-share/apps/kmouth/books/sv/sv-greetings.phrasebook
-share/apps/kmouth/books/sv/sv-howareyou.phrasebook
-share/apps/kmouth/books/sv/sv-personal.phrasebook
-share/apps/kmouth/books/sv/sv.desktop
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/16x16/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/16x16/actions/speak.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/22x22/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/22x22/actions/speak.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_new.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrase_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_closed.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_new.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasebook_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_open.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_print.png
-share/apps/kmouth/icons/hicolor/32x32/actions/phrasehistory_save.png
-share/apps/kmouth/icons/hicolor/32x32/actions/speak.png
-share/apps/kmouth/icons/hicolor/48x48/actions/speak.png
-share/apps/kmouth/kmouthui.rc
-share/apps/kmouth/phrasebookdialogui.rc
-share/config/kmouthrc
-share/dbus-1/services/org.kde.kaccessible.service
-share/doc/HTML/en/kmag/common
-share/doc/HTML/en/kmag/index.cache.bz2
-share/doc/HTML/en/kmag/index.docbook
-share/doc/HTML/en/kmag/man-kmag.1.docbook
-share/doc/HTML/en/kmag/screenshot.png
 share/doc/HTML/en/kmousetool/common
 share/doc/HTML/en/kmousetool/index.cache.bz2
 share/doc/HTML/en/kmousetool/index.docbook
 share/doc/HTML/en/kmousetool/man-kmousetool.1.docbook
-share/doc/HTML/en/kmouth/common
-share/doc/HTML/en/kmouth/index.cache.bz2
-share/doc/HTML/en/kmouth/index.docbook
-share/doc/HTML/en/kmouth/kmouthcpref.png
-share/doc/HTML/en/kmouth/kmouthctts.png
-share/doc/HTML/en/kmouth/kmouthcwcp.png
-share/doc/HTML/en/kmouth/kmouthedit.png
-share/doc/HTML/en/kmouth/kmouthmain.png
-share/doc/HTML/en/kmouth/kmouthwizard1.png
-share/doc/HTML/en/kmouth/kmouthwizard2.png
-share/doc/HTML/en/kmouth/kmouthwizard3.png
-share/doc/HTML/en/kmouth/man-kmouth.1.docbook
-share/icons/hicolor/16x16/actions/followmouse.png
-share/icons/hicolor/16x16/actions/hidemouse.png
 share/icons/hicolor/16x16/actions/kmousetool_off.png
 share/icons/hicolor/16x16/actions/kmousetool_on.png
-share/icons/hicolor/16x16/actions/window.png
-share/icons/hicolor/16x16/apps/kmag.png
 share/icons/hicolor/16x16/apps/kmousetool.png
-share/icons/hicolor/16x16/apps/kmouth.png
-share/icons/hicolor/22x22/apps/kmouth.png
 share/icons/hicolor/32x32/actions/kmousetool_off.png
 share/icons/hicolor/32x32/actions/kmousetool_on.png
-share/icons/hicolor/32x32/apps/kmag.png
 share/icons/hicolor/32x32/apps/kmousetool.png
-share/icons/hicolor/32x32/apps/kmouth.png
-share/icons/hicolor/48x48/apps/kmouth.png
-@dirrm share/doc/HTML/en/kmouth
 @dirrm share/doc/HTML/en/kmousetool
-@dirrm share/doc/HTML/en/kmag
-@dirrm share/apps/kmouth/icons/hicolor/48x48/actions
-@dirrm share/apps/kmouth/icons/hicolor/48x48
-@dirrm share/apps/kmouth/icons/hicolor/32x32/actions
-@dirrm share/apps/kmouth/icons/hicolor/32x32
-@dirrm share/apps/kmouth/icons/hicolor/22x22/actions
-@dirrm share/apps/kmouth/icons/hicolor/22x22
-@dirrm share/apps/kmouth/icons/hicolor/16x16/actions
-@dirrm share/apps/kmouth/icons/hicolor/16x16
-@dirrm share/apps/kmouth/icons/hicolor
-@dirrm share/apps/kmouth/icons
-@dirrm share/apps/kmouth/books/sv
-@dirrm share/apps/kmouth/books/en
-@dirrm share/apps/kmouth/books/de
-@dirrm share/apps/kmouth/books
-@dirrm share/apps/kmouth
 @dirrm share/apps/kmousetool/sounds
 @dirrm share/apps/kmousetool
-@dirrm share/apps/kmag
-@dirrm lib/kde4/plugins/accessiblebridge
diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
index ce746ea0ff10..44a2c63abbfd 100644
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@@ -1,43 +1,29 @@
-# New ports collection Makefile for:	kdeaccessibility
-# Date created:				2008-01-31
-# Whom:					Martin Wilke <miwi@FreeBSD.org>
+# New ports collection makefile for:	kmouth
+# Date created:		2012-02-23
+# Whom:			Max Brazhnikov <makc@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
-PORTNAME=	kdeaccessibility
+PORTNAME=	kmouth
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Accessibility applications for KDE4
-
-LIB_DEPENDS=	speechd.5:${PORTSDIR}/accessibility/speech-dispatcher
+COMMENT=	Speech synthesizer frontend for KDE
 
-LATEST_LINK=	${PORTNAME}4
+CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11 xext xtst
+QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
-CMAKE_ARGS+=	-DBUILD_jovie=OFF
-
-MAN1=	kmag.1 \
-	kmousetool.1 \
-	kmouth.1
-
-OPTIONS=	JOVIE "Install Jovie text-to-speech system" on
-
-.include <bsd.port.options.mk>
 
-.ifndef(WITHOUT_JOVIE)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
-.endif
+MAN1=	kmouth.1
 
 .include <bsd.port.mk>
diff --git a/accessibility/kmouth/distinfo b/accessibility/kmouth/distinfo
index 3d8735242957..2bd3102e1ad1 100644
--- a/accessibility/kmouth/distinfo
+++ b/accessibility/kmouth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeaccessibility-4.7.4.tar.bz2) = 031251969c0edcbfd93ceffce5665574df7af476e24112fe5af6f9e261d0bb8a
-SIZE (KDE/kdeaccessibility-4.7.4.tar.bz2) = 876933
+SHA256 (KDE/kmouth-4.8.3.tar.xz) = 1969b6b846b07e26c2dddd5e8a64bfd429b8353685ca8f0847beb515fb3148d8
+SIZE (KDE/kmouth-4.8.3.tar.xz) = 323232
diff --git a/accessibility/kmouth/pkg-descr b/accessibility/kmouth/pkg-descr
index 88482fe6f50d..91cb869fdc86 100644
--- a/accessibility/kmouth/pkg-descr
+++ b/accessibility/kmouth/pkg-descr
@@ -1,4 +1,6 @@
-This port contains a set of KDE-based applications for
-accessibility needs.
+KMouth is a program which enables persons that cannot speak to let
+their computer speak, e.g. mutal people or people who have lost
+their voice. It has a text input field and speaks the sentences
+that you enter. It also has support for user defined phrasebooks.
 
-WWW:	http://www.kde.org/
+WWW:    http://www.kde.org/applications/utilities/kmouth/
diff --git a/accessibility/kmouth/pkg-plist b/accessibility/kmouth/pkg-plist
index 0eed894e6d69..f191d75110a2 100644
--- a/accessibility/kmouth/pkg-plist
+++ b/accessibility/kmouth/pkg-plist
@@ -1,13 +1,5 @@
-bin/kmag
-bin/kmousetool
 bin/kmouth
-lib/kde4/libexec/kaccessibleapp
-lib/kde4/plugins/accessiblebridge/kaccessiblebridge.so
-share/applications/kde4/kmag.desktop
-share/applications/kde4/kmousetool.desktop
 share/applications/kde4/kmouth.desktop
-share/apps/kmag/kmagui.rc
-share/apps/kmousetool/sounds/mousetool_tap.wav
 share/apps/kmouth/books/de/de-courteousness.phrasebook
 share/apps/kmouth/books/de/de-greetings.phrasebook
 share/apps/kmouth/books/de/de-howareyou.phrasebook
@@ -66,16 +58,6 @@ share/apps/kmouth/icons/hicolor/48x48/actions/speak.png
 share/apps/kmouth/kmouthui.rc
 share/apps/kmouth/phrasebookdialogui.rc
 share/config/kmouthrc
-share/dbus-1/services/org.kde.kaccessible.service
-share/doc/HTML/en/kmag/common
-share/doc/HTML/en/kmag/index.cache.bz2
-share/doc/HTML/en/kmag/index.docbook
-share/doc/HTML/en/kmag/man-kmag.1.docbook
-share/doc/HTML/en/kmag/screenshot.png
-share/doc/HTML/en/kmousetool/common
-share/doc/HTML/en/kmousetool/index.cache.bz2
-share/doc/HTML/en/kmousetool/index.docbook
-share/doc/HTML/en/kmousetool/man-kmousetool.1.docbook
 share/doc/HTML/en/kmouth/common
 share/doc/HTML/en/kmouth/index.cache.bz2
 share/doc/HTML/en/kmouth/index.docbook
@@ -88,24 +70,11 @@ share/doc/HTML/en/kmouth/kmouthwizard1.png
 share/doc/HTML/en/kmouth/kmouthwizard2.png
 share/doc/HTML/en/kmouth/kmouthwizard3.png
 share/doc/HTML/en/kmouth/man-kmouth.1.docbook
-share/icons/hicolor/16x16/actions/followmouse.png
-share/icons/hicolor/16x16/actions/hidemouse.png
-share/icons/hicolor/16x16/actions/kmousetool_off.png
-share/icons/hicolor/16x16/actions/kmousetool_on.png
-share/icons/hicolor/16x16/actions/window.png
-share/icons/hicolor/16x16/apps/kmag.png
-share/icons/hicolor/16x16/apps/kmousetool.png
 share/icons/hicolor/16x16/apps/kmouth.png
 share/icons/hicolor/22x22/apps/kmouth.png
-share/icons/hicolor/32x32/actions/kmousetool_off.png
-share/icons/hicolor/32x32/actions/kmousetool_on.png
-share/icons/hicolor/32x32/apps/kmag.png
-share/icons/hicolor/32x32/apps/kmousetool.png
 share/icons/hicolor/32x32/apps/kmouth.png
 share/icons/hicolor/48x48/apps/kmouth.png
 @dirrm share/doc/HTML/en/kmouth
-@dirrm share/doc/HTML/en/kmousetool
-@dirrm share/doc/HTML/en/kmag
 @dirrm share/apps/kmouth/icons/hicolor/48x48/actions
 @dirrm share/apps/kmouth/icons/hicolor/48x48
 @dirrm share/apps/kmouth/icons/hicolor/32x32/actions
@@ -121,7 +90,3 @@ share/icons/hicolor/48x48/apps/kmouth.png
 @dirrm share/apps/kmouth/books/de
 @dirrm share/apps/kmouth/books
 @dirrm share/apps/kmouth
-@dirrm share/apps/kmousetool/sounds
-@dirrm share/apps/kmousetool
-@dirrm share/apps/kmag
-@dirrm lib/kde4/plugins/accessiblebridge