15 files changed, 34 insertions, 81 deletions

diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile
index 398e9594745f..a1fe610a082a 100644
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@@ -2,10 +2,8 @@
 
 PORTNAME=	jovie
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility 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
@@ -13,16 +11,10 @@ COMMENT=	KDE text-to-speech system
 
 LIB_DEPENDS=	libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher
 
-CONFLICTS=	ktts-4.[4-6].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USES=		cmake:outsource
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4
 USE_QT4=	xml qmake_build moc_build uic_build rcc_build
 USE_LDCONFIG=	yes
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/accessibility/jovie/distinfo b/accessibility/jovie/distinfo
index b57de7d31821..a5eb494be156 100644
--- a/accessibility/jovie/distinfo
+++ b/accessibility/jovie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/jovie-4.10.5.tar.xz) = 664f1de0e226a7d2d01f498093b603a1bf9750145328141fdeedc1643f368c15
-SIZE (KDE/4.10.5/jovie-4.10.5.tar.xz) = 370180
+SHA256 (KDE/4.12.2/jovie-4.12.2.tar.xz) = bc3249139211c45f70c06d0585fc7549f245f9b398e08ebc5b435844afbcfad4
+SIZE (KDE/4.12.2/jovie-4.12.2.tar.xz) = 379356
diff --git a/accessibility/jovie/pkg-plist b/accessibility/jovie/pkg-plist
index c6120a369671..b5d292d5ec3d 100644
--- a/accessibility/jovie/pkg-plist
+++ b/accessibility/jovie/pkg-plist
@@ -4,8 +4,8 @@ lib/kde4/jovie_talkerchooserplugin.so
 lib/kde4/jovie_xmltransformerplugin.so
 lib/kde4/kcm_kttsd.so
 lib/libkttsd.so
-lib/libkttsd.so.5
-lib/libkttsd.so.5.0.1
+lib/libkttsd.so.4
+lib/libkttsd.so.%%KDE4_GENERIC_LIB_VERSION%%
 share/applications/kde4/jovieapp.desktop
 share/apps/jovie/kcmkttsd_testmessage.desktop
 share/apps/jovie/stringreplacer/abbreviations.xml
@@ -20,7 +20,7 @@ share/apps/jovie/stringreplacer/qt2plaintext.xml
 share/apps/jovie/talkerchooser/female_notifications_rc
 share/apps/jovie/xmltransformer/xhtml2ssml.xsl
 share/apps/jovie/xmltransformer/xhtml2ssml_simple.xsl
-share/apps/kttsd/xslt/SSMLtoPlainText.xsl
+share/apps/jovie/xslt/SSMLtoPlainText.xsl
 share/doc/HTML/en/jovie/addtalker.png
 share/doc/HTML/en/jovie/common
 share/doc/HTML/en/jovie/filters.png
@@ -50,8 +50,7 @@ share/kde4/services/kcmkttsd.desktop
 share/kde4/services/kttsd.desktop
 share/kde4/servicetypes/jovie_filterplugin.desktop
 @dirrm share/doc/HTML/en/jovie
-@dirrm share/apps/kttsd/xslt
-@dirrm share/apps/kttsd
+@dirrm share/apps/jovie/xslt
 @dirrm share/apps/jovie/xmltransformer
 @dirrm share/apps/jovie/talkerchooser
 @dirrm share/apps/jovie/stringreplacer
diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile
index 184cb7d2ccd9..eb84b6669c31 100644
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@@ -2,10 +2,8 @@
 
 PORTNAME=	kaccessible
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility 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
@@ -13,9 +11,6 @@ COMMENT=	Accessibility services for KDE
 
 LIB_DEPENDS=	libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher
 
-CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USES=		cmake:outsource
diff --git a/accessibility/kaccessible/distinfo b/accessibility/kaccessible/distinfo
index 9b0602611fe1..a0a76e1f7678 100644
--- a/accessibility/kaccessible/distinfo
+++ b/accessibility/kaccessible/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kaccessible-4.10.5.tar.xz) = b665e8fbb671b675add3858cf6cd1bdaaf94e3355b5f9b8a1b51e0aaf0ef4d67
-SIZE (KDE/4.10.5/kaccessible-4.10.5.tar.xz) = 20844
+SHA256 (KDE/4.12.2/kaccessible-4.12.2.tar.xz) = 89061981c67eac6f7414f1d53b71c28c7545e2255d92483624f42411125a140a
+SIZE (KDE/4.12.2/kaccessible-4.12.2.tar.xz) = 20412
diff --git a/accessibility/kdeaccessibility4/Makefile b/accessibility/kdeaccessibility4/Makefile
index 9af3e8ad0d4b..e34bbda18cd1 100644
--- a/accessibility/kdeaccessibility4/Makefile
+++ b/accessibility/kdeaccessibility4/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	accessibility kde
-MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
@@ -12,42 +11,25 @@ COMMENT=	Accessibility applications for KDE 4
 
 USE_KDE4=	kdeprefix
 NO_BUILD=	yes
-NO_STAGE=	yes
-
-LATEST_LINK=	${PORTNAME}4
+NO_INSTALL=	yes
+NO_MTREE=	yes
 
 OPTIONS_DEFINE=	JOVIE KACCESSIBLE KMAG KMOUSETOOL KMOUTH
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
 
 JOVIE_DESC=		Install Jovie text-to-speech system
-KACCESSIBLE_DESC=	Install Accessibility services for KDE
-KMAG_DESC=		Install Screen magnifier
-KMOUSETOOL_DESC=	Install Automatic mouse click tool
-KMOUTH_DESC=		Install Speech synthesizer frontend
-
-.include <bsd.port.options.mk>
+JOVIE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
 
-.if ${PORT_OPTIONS:MJOVIE}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
-.endif
-
-.if ${PORT_OPTIONS:MKACCESSIBLE}
-RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/libexec/kaccessibleapp:${PORTSDIR}/accessibility/kaccessible
-.endif
-
-.if ${PORT_OPTIONS:MKMAG}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmag:${PORTSDIR}/accessibility/kmag
-.endif
+KACCESSIBLE_DESC=	Install Accessibility services for KDE
+KACCESSIBLE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/kaccessibleapp:${PORTSDIR}/accessibility/kaccessible
 
-.if ${PORT_OPTIONS:MKMOUSETOOL}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmousetool:${PORTSDIR}/accessibility/kmousetool
-.endif
+KMAG_DESC=		Install Screen magnifier
+KMAG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmag:${PORTSDIR}/accessibility/kmag
 
-.if ${PORT_OPTIONS:MKMOUTH}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmouth:${PORTSDIR}/accessibility/kmouth
-.endif
+KMOUSETOOL_DESC=	Install Automatic mouse click tool
+KMOUSETOOL_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmousetool:${PORTSDIR}/accessibility/kmousetool
 
-do-install:
-	${DO_NADA}
+KMOUTH_DESC=		Install Speech synthesizer frontend
+KMOUTH_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmouth:${PORTSDIR}/accessibility/kmouth
 
 .include <bsd.port.mk>
diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
index d2a0d40aa8d1..45db457f5617 100644
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@@ -3,23 +3,17 @@
 PORTNAME=	kmag
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	accessibility 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=	KDE Screen magnifier
 
-CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
-MAN1=	kmag.1
-
 # Somebody has to create port for libkdeaccessibilityclient first
 CMAKE_ARGS+=	-DWITH_QAccessibilityClient=off
 
diff --git a/accessibility/kmag/distinfo b/accessibility/kmag/distinfo
index 8343757f3c12..5c74cfb2522b 100644
--- a/accessibility/kmag/distinfo
+++ b/accessibility/kmag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kmag-4.10.5.tar.xz) = 44b81a8ac41e3fa2d3cc3a6c79e90b832366e0ebd363d8d6c4a4f97b918f55c5
-SIZE (KDE/4.10.5/kmag-4.10.5.tar.xz) = 93636
+SHA256 (KDE/4.12.2/kmag-4.12.2.tar.xz) = 710467f8301b116ca1a92b2cf4ce284419771a0a39abee062eade6086a0a1478
+SIZE (KDE/4.12.2/kmag-4.12.2.tar.xz) = 86080
diff --git a/accessibility/kmag/pkg-plist b/accessibility/kmag/pkg-plist
index 94ca7bbf8b13..f5843e651571 100644
--- a/accessibility/kmag/pkg-plist
+++ b/accessibility/kmag/pkg-plist
@@ -1,4 +1,5 @@
 bin/kmag
+man/man1/kmag.1.gz
 share/applications/kde4/kmag.desktop
 share/apps/kmag/kmagui.rc
 share/doc/HTML/en/kmag/common
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
index 6e424ec00cb4..cbd70ede94df 100644
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -3,22 +3,16 @@
 PORTNAME=	kmousetool
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	accessibility 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=	Automatic mouse click tool for KDE
 
-CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_XORG=	xtst
 
-MAN1=	kmousetool.1
-
 .include <bsd.port.mk>
diff --git a/accessibility/kmousetool/distinfo b/accessibility/kmousetool/distinfo
index e594bff0d2e6..dca4d0585f39 100644
--- a/accessibility/kmousetool/distinfo
+++ b/accessibility/kmousetool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kmousetool-4.10.5.tar.xz) = 012deb606b104778fff80dd3e9d7e9205bef046f2a00af08a282457b1f418f0a
-SIZE (KDE/4.10.5/kmousetool-4.10.5.tar.xz) = 43828
+SHA256 (KDE/4.12.2/kmousetool-4.12.2.tar.xz) = 2302d91ceb6c31f8f11a5a3d4ec2d3f3bd45903e0f5c18f82c9ad91df0d231d8
+SIZE (KDE/4.12.2/kmousetool-4.12.2.tar.xz) = 35932
diff --git a/accessibility/kmousetool/pkg-plist b/accessibility/kmousetool/pkg-plist
index 480f6676a5d9..41ba20ba29a5 100644
--- a/accessibility/kmousetool/pkg-plist
+++ b/accessibility/kmousetool/pkg-plist
@@ -1,4 +1,5 @@
 bin/kmousetool
+man/man1/kmousetool.1.gz
 share/applications/kde4/kmousetool.desktop
 share/apps/kmousetool/sounds/mousetool_tap.wav
 share/doc/HTML/en/kmousetool/common
diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
index c29b9f12ce5e..ac23f062e675 100644
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@@ -3,21 +3,15 @@
 PORTNAME=	kmouth
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	accessibility 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=	Speech synthesizer frontend for KDE
 
-CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
-MAN1=	kmouth.1
-
 .include <bsd.port.mk>
diff --git a/accessibility/kmouth/distinfo b/accessibility/kmouth/distinfo
index 7ba71c9cba97..50ca593e4017 100644
--- a/accessibility/kmouth/distinfo
+++ b/accessibility/kmouth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kmouth-4.10.5.tar.xz) = 55b182c3414059e5e164ca4079db7ded2a770a04d2e14018cbd95c9255174f26
-SIZE (KDE/4.10.5/kmouth-4.10.5.tar.xz) = 322248
+SHA256 (KDE/4.12.2/kmouth-4.12.2.tar.xz) = 613391b7ac5bbd82fa7ab15b8fcaf991a3fe5d61fc5164ded347683e3705351e
+SIZE (KDE/4.12.2/kmouth-4.12.2.tar.xz) = 307940
diff --git a/accessibility/kmouth/pkg-plist b/accessibility/kmouth/pkg-plist
index f191d75110a2..f65bc460ee6a 100644
--- a/accessibility/kmouth/pkg-plist
+++ b/accessibility/kmouth/pkg-plist
@@ -1,4 +1,5 @@
 bin/kmouth
+man/man1/kmouth.1.gz
 share/applications/kde4/kmouth.desktop
 share/apps/kmouth/books/de/de-courteousness.phrasebook
 share/apps/kmouth/books/de/de-greetings.phrasebook