4 files changed, 65 insertions, 47 deletions

diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile
index 3bc1a4a3899f..28fb1a88c822 100644
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	ktts
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +16,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE text-to-speech subsystem
 
-LIB_DEPENDS+=	speechd.4:${PORTSDIR}/accessibility/speech-dispatcher
+BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
+LIB_DEPENDS=	speechd.4:${PORTSDIR}/accessibility/speech-dispatcher
 
 USE_BZIP2=	yes
 USE_CMAKE=	yes
@@ -28,18 +28,18 @@ USE_LDCONFIG=	yes
 MD5_FILE=	${PORTSDIR}/accessibility/kdeaccessibility4/distinfo
 MAKE_JOBS_SAFE=	yes
 
-CMAKE_ARGS+=	-DKDE4_KTTSD_ALSA:BOOL=OFF
+CMAKE_ARGS+=	-DKDE4_JOVIE_ALSA:BOOL=OFF
 
-BUILD_WRKSRC=	${WRKSRC}/kttsd
+BUILD_WRKSRC=	${WRKSRC}/jovie
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|speechd|$$$\{SPEECHD_LIBRARY}|g' \
-		${PATCH_WRKSRC}/kttsd/kcmkttsmgr/CMakeLists.txt \
-		${PATCH_WRKSRC}/kttsd/kttsd/CMakeLists.txt
+		${PATCH_WRKSRC}/jovie/kcmkttsmgr/CMakeLists.txt \
+		${PATCH_WRKSRC}/jovie/jovie/CMakeLists.txt
 
 post-install:
-	cd ${WRKSRC}/doc/kttsd && ${MAKE} install
+	cd ${WRKSRC}/doc/jovie && ${MAKE} install
 	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/accessibility/jovie/files/patch-jovie__CMakeLists.txt b/accessibility/jovie/files/patch-jovie__CMakeLists.txt
new file mode 100644
index 000000000000..e2ed95040734
--- /dev/null
+++ b/accessibility/jovie/files/patch-jovie__CMakeLists.txt
@@ -0,0 +1,17 @@
+--- ./jovie/CMakeLists.txt.orig	2010-07-30 11:04:09.892079431 +0400
++++ ./jovie/CMakeLists.txt	2010-07-30 11:04:27.027110608 +0400
+@@ -8,12 +8,12 @@
+ 
+ # if speechd was found use it
+ if (SPEECHD_FOUND)
+-  set (SPEECH_LIB speechd)
++  set (SPEECH_LIB ${SPEECHD_LIBRARY})
+ endif (SPEECHD_FOUND)
+ 
+ # prefer opentts if it was also found (or if it was the only one found)
+ if (OPENTTS_FOUND)
+-  set (SPEECH_LIB opentts)
++  set (SPEECH_LIB ${OPENTTS_LIBRARY})
+ endif (OPENTTS_FOUND)
+ 
+ # we found speechd or opentts, so continue
diff --git a/accessibility/jovie/pkg-message b/accessibility/jovie/pkg-message
index 7aa77b9472c1..e85b1510ea29 100644
--- a/accessibility/jovie/pkg-message
+++ b/accessibility/jovie/pkg-message
@@ -1,10 +1,11 @@
 ======================================================================
 
 To enable Text-to-Speech System (KTTSD), you first need to start
-speech-dispatcher (locally):
+speech-dispatcher and Jovie (locally):
 
 $ speech-dispatcher
+$ jovie
 
-You may want to launch it via the KDE Autostart module.
+You may want to launch them via the KDE Autostart module.
 
 ======================================================================
diff --git a/accessibility/jovie/pkg-plist b/accessibility/jovie/pkg-plist
index 8a37a66a9f98..a2899aeae5d3 100644
--- a/accessibility/jovie/pkg-plist
+++ b/accessibility/jovie/pkg-plist
@@ -1,38 +1,36 @@
-bin/kttsd
-bin/kttsmgr
+bin/jovie
 lib/kde4/kcm_kttsd.so
-lib/kde4/libkttsd_stringreplacerplugin.so
-lib/kde4/libkttsd_talkerchooserplugin.so
-lib/kde4/libkttsd_xmltransformerplugin.so
+lib/kde4/libjovie_stringreplacerplugin.so
+lib/kde4/libjovie_talkerchooserplugin.so
+lib/kde4/libjovie_xmltransformerplugin.so
 lib/libkttsd.so
 lib/libkttsd.so.5
 lib/libkttsd.so.5.0.1
-share/applications/kde4/kttsmgr.desktop
-share/apps/kttsd/kcmkttsd_testmessage.desktop
-share/apps/kttsd/stringreplacer/abbreviations.xml
-share/apps/kttsd/stringreplacer/chat-de.xml
-share/apps/kttsd/stringreplacer/chat.xml
-share/apps/kttsd/stringreplacer/emoticons.xml
-share/apps/kttsd/stringreplacer/festival_unspeakable_chars.xml
-share/apps/kttsd/stringreplacer/kmail.xml
-share/apps/kttsd/stringreplacer/polish_festival_fixes.xml
-share/apps/kttsd/stringreplacer/polish_festival_unspeakables.xml
-share/apps/kttsd/stringreplacer/qt2plaintext.xml
-share/apps/kttsd/talkerchooser/female_notifications_rc
-share/apps/kttsd/xmltransformer/xhtml2ssml.xsl
-share/apps/kttsd/xmltransformer/xhtml2ssml_simple.xsl
+share/apps/jovie/kcmkttsd_testmessage.desktop
+share/apps/jovie/stringreplacer/abbreviations.xml
+share/apps/jovie/stringreplacer/chat-de.xml
+share/apps/jovie/stringreplacer/chat.xml
+share/apps/jovie/stringreplacer/emoticons.xml
+share/apps/jovie/stringreplacer/festival_unspeakable_chars.xml
+share/apps/jovie/stringreplacer/kmail.xml
+share/apps/jovie/stringreplacer/polish_festival_fixes.xml
+share/apps/jovie/stringreplacer/polish_festival_unspeakables.xml
+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/doc/HTML/en/kttsd/addtalker.png
-share/doc/HTML/en/kttsd/common
-share/doc/HTML/en/kttsd/filters.png
-share/doc/HTML/en/kttsd/general.png
-share/doc/HTML/en/kttsd/index.cache.bz2
-share/doc/HTML/en/kttsd/index.docbook
-share/doc/HTML/en/kttsd/jobs.png
-share/doc/HTML/en/kttsd/stringreplacer.png
-share/doc/HTML/en/kttsd/talkerchooser.png
-share/doc/HTML/en/kttsd/talkers.png
-share/doc/HTML/en/kttsd/xmltransformer.png
+share/doc/HTML/en/jovie/addtalker.png
+share/doc/HTML/en/jovie/common
+share/doc/HTML/en/jovie/filters.png
+share/doc/HTML/en/jovie/general.png
+share/doc/HTML/en/jovie/index.cache.bz2
+share/doc/HTML/en/jovie/index.docbook
+share/doc/HTML/en/jovie/jobs.png
+share/doc/HTML/en/jovie/stringreplacer.png
+share/doc/HTML/en/jovie/talkerchooser.png
+share/doc/HTML/en/jovie/talkers.png
+share/doc/HTML/en/jovie/xmltransformer.png
 share/icons/hicolor/16x16/actions/female.png
 share/icons/hicolor/16x16/actions/male.png
 share/icons/hicolor/16x16/actions/nospeak.png
@@ -43,15 +41,17 @@ share/icons/hicolor/32x32/actions/nospeak.png
 share/icons/hicolor/32x32/actions/speak.png
 share/icons/hicolor/48x48/actions/nospeak.png
 share/icons/hicolor/48x48/actions/speak.png
+share/kde4/services/jovie.desktop
+share/kde4/services/jovie_stringreplacerplugin.desktop
+share/kde4/services/jovie_talkerchooserplugin.desktop
+share/kde4/services/jovie_xmltransformerplugin.desktop
 share/kde4/services/kcmkttsd.desktop
 share/kde4/services/kttsd.desktop
-share/kde4/services/kttsd_stringreplacerplugin.desktop
-share/kde4/services/kttsd_talkerchooserplugin.desktop
-share/kde4/services/kttsd_xmltransformerplugin.desktop
-share/kde4/servicetypes/kttsd_filterplugin.desktop
-@dirrm share/doc/HTML/en/kttsd
+share/kde4/servicetypes/jovie_filterplugin.desktop
+@dirrm share/doc/HTML/en/jovie
 @dirrm share/apps/kttsd/xslt
-@dirrm share/apps/kttsd/xmltransformer
-@dirrm share/apps/kttsd/talkerchooser
-@dirrm share/apps/kttsd/stringreplacer
 @dirrm share/apps/kttsd
+@dirrm share/apps/jovie/xmltransformer
+@dirrm share/apps/jovie/talkerchooser
+@dirrm share/apps/jovie/stringreplacer
+@dirrm share/apps/jovie