speech-dispatcher: Update to 0.9.1

Version 0.9.1
* Add module for the non-free IBM TTS (voxin) speech synthesis.
* Extend licence to later versions of GPL and LGPL.
* Update mailing list address to savannah.
* Make generic modules fallback to existing voices.

Version 0.9
* Add modules for non-free Baratinoo (VoxyGen) and Kali speech syntheses.
* Add configuration file for the Mary-TTS system.
* Add configuration file for espeak-ng + mbrola.
* Set the pulse client name when using the generic module with paplay.
* espeak-*-mbrola-generic: Update voice list.
* Auto-detect module availability.
* Make generic module provide voice list.
* Add systemd service file.

Version 0.8.8
* Add German translation, thanks to Chris Leick for the patch
* Fix some spelling mistakes, thanks to Paul Gevers for the patch
* Some slight code improvements

Version 0.8.7
* Further fixes to spd-conf, which should now work properly.
* Split the espeak-ng driver code into its own source file.
* Add a work-around to the espeak-ng driver to account for spaces in voice
  names which recently appeared in espeak-ng git master. This will properly
  be fixed in 0.9.
* Voice names are not forced to lower case, due to espeak-ng git master now
  having multi-case voice names.
* Fix stripped audio output from the flite module, thanks to Samuel Thibault.
* Further code and build improvements.

Version 0.8.6
* Various internal code improvements.
* Fix more compiler warnings.
* Python bug fixes with thanks to Sebastian Humenda.

Version 0.8.5
* More unused code removal.
* Fix more compiler warnings.
* Use GLib main loop for the main server thread.
* Implement a shutdown timer in the server, which activates after 5 seconds
  with no clients connected.
* Add support for espeak-ng.
* Configuration documentation for the ibmtts module.
* Removal of unused configuration options from the ibmtts module.
* Add command-line argument to allow for custom modules location

4 files changed, 98 insertions, 26 deletions

diff --git a/audio/speech-dispatcher/Makefile b/audio/speech-dispatcher/Makefile
index df60eade7ce..b2b9e24b3d0 100644
--- a/audio/speech-dispatcher/Makefile
+++ b/audio/speech-dispatcher/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2019/11/28 16:18:54 nia Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/28 16:51:49 nia Exp $
 
-DISTNAME=	speech-dispatcher-0.8.4
-PKGREVISION=	7
+DISTNAME=	speech-dispatcher-0.9.1
 CATEGORIES=	audio
-MASTER_SITES=	http://devel.freebsoft.org/pub/projects/speechd/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=brailcom/}
+GITHUB_PROJECT=	speechd
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	https://devel.freebsoft.org/speechd
@@ -12,11 +13,14 @@ LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	intltool pkg-config
+USE_TOOLS+=	gmake intltool pkg-config
 USE_TOOLS+=	msgfmt msgmerge xgettext
+USE_LANGUAGES=	c c++
 
 INFO_FILES=	yes
 
+TOOL_DEPENDS+=	help2man-[0-9]*:../../converters/help2man
+
 # To avoid PLIST complexity, let the libao package select the most
 # fitting audio backend for the platform.
 CONFIGURE_ARGS+=	--with-libao
@@ -25,14 +29,24 @@ CONFIGURE_ARGS+=	--without-nas
 CONFIGURE_ARGS+=	--without-oss
 CONFIGURE_ARGS+=	--without-pulse
 
+CONFIGURE_ARGS+=	--disable-python
+
+# msgfmt: unknown option -- desktop
+_TOOLS_USE_PKGSRC.msgfmt=	yes
+
 PKGCONFIG_OVERRIDE+=	speech-dispatcher.pc.in
 
 PKG_SYSCONFSUBDIR=	speech-dispatcher
 
+OWN_DIRS+=	${PKG_SYSCONFDIR}/clients
+OWN_DIRS+=	${PKG_SYSCONFDIR}/modules
+
 CONF_FILES+=	${PREFIX}/share/examples/speech-dispatcher/clients/emacs.conf \
 		${PKG_SYSCONFDIR}/clients/emacs.conf
 CONF_FILES+=	${PREFIX}/share/examples/speech-dispatcher/modules/cicero.conf \
 		${PKG_SYSCONFDIR}/modules/cicero.conf
+CONF_FILES+=	${PREFIX}/share/examples/speech-dispatcher/speechd.conf \
+		${PKG_SYSCONFDIR}/speechd.conf
 CONF_FILES+=	${PREFIX}/share/examples/speech-dispatcher/modules/dtk-generic.conf \
 		${PKG_SYSCONFDIR}/modules/dtk-generic.conf
 CONF_FILES+=	${PREFIX}/share/examples/speech-dispatcher/modules/epos-generic.conf \
@@ -68,4 +82,6 @@ CONF_FILES+=	${PREFIX}/share/examples/speech-dispatcher/speechd.conf \
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/speech-dispatcher/PLIST b/audio/speech-dispatcher/PLIST
index 279fdc57ebd..ade56e7aefa 100644
--- a/audio/speech-dispatcher/PLIST
+++ b/audio/speech-dispatcher/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/11/28 16:18:54 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/11/28 16:51:49 nia Exp $
 bin/spd-say
 bin/spdsend
 bin/speech-dispatcher
@@ -13,41 +13,97 @@ info/speech-dispatcher.info
 info/ssip.info
 lib/libspeechd.la
 lib/pkgconfig/speech-dispatcher.pc
+lib/speech-dispatcher-modules/sd_baratinoo
 lib/speech-dispatcher-modules/sd_cicero
 lib/speech-dispatcher-modules/sd_dummy
 lib/speech-dispatcher-modules/sd_espeak
 lib/speech-dispatcher-modules/sd_festival
 lib/speech-dispatcher-modules/sd_flite
 lib/speech-dispatcher-modules/sd_generic
+lib/speech-dispatcher-modules/sd_ibmtts
+lib/speech-dispatcher-modules/sd_kali
 lib/speech-dispatcher/spd_libao.la
+man/man1/spd-say.1
+man/man1/speech-dispatcher.1
 share/examples/speech-dispatcher/clients/emacs.conf
+share/examples/speech-dispatcher/modules/baratinoo.conf
 share/examples/speech-dispatcher/modules/cicero.conf
 share/examples/speech-dispatcher/modules/dtk-generic.conf
 share/examples/speech-dispatcher/modules/epos-generic.conf
 share/examples/speech-dispatcher/modules/espeak-generic.conf
 share/examples/speech-dispatcher/modules/espeak-mbrola-generic.conf
+share/examples/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf
+share/examples/speech-dispatcher/modules/espeak-ng.conf
 share/examples/speech-dispatcher/modules/espeak.conf
 share/examples/speech-dispatcher/modules/festival.conf
 share/examples/speech-dispatcher/modules/flite.conf
 share/examples/speech-dispatcher/modules/ibmtts.conf
 share/examples/speech-dispatcher/modules/ivona.conf
+share/examples/speech-dispatcher/modules/kali.conf
 share/examples/speech-dispatcher/modules/llia_phon-generic.conf
+share/examples/speech-dispatcher/modules/mary-generic.conf
 share/examples/speech-dispatcher/modules/pico-generic.conf
 share/examples/speech-dispatcher/modules/swift-generic.conf
 share/examples/speech-dispatcher/speechd.conf
+share/locale/cs/LC_MESSAGES/speech-dispatcher.mo
+share/locale/de/LC_MESSAGES/speech-dispatcher.mo
+share/locale/hu/LC_MESSAGES/speech-dispatcher.mo
 share/sounds/speech-dispatcher/dummy-message.wav
 share/speech-dispatcher/conf/clients/emacs.conf
+share/speech-dispatcher/conf/modules/baratinoo.conf
 share/speech-dispatcher/conf/modules/cicero.conf
-share/speech-dispatcher/conf/modules/dtk-generic.conf
-share/speech-dispatcher/conf/modules/epos-generic.conf
-share/speech-dispatcher/conf/modules/espeak-generic.conf
-share/speech-dispatcher/conf/modules/espeak-mbrola-generic.conf
+share/speech-dispatcher/conf/modules/espeak-ng.conf
 share/speech-dispatcher/conf/modules/espeak.conf
 share/speech-dispatcher/conf/modules/festival.conf
-share/speech-dispatcher/conf/modules/flite.conf
-share/speech-dispatcher/conf/modules/ibmtts.conf
-share/speech-dispatcher/conf/modules/ivona.conf
-share/speech-dispatcher/conf/modules/llia_phon-generic.conf
-share/speech-dispatcher/conf/modules/pico-generic.conf
-share/speech-dispatcher/conf/modules/swift-generic.conf
+share/speech-dispatcher/conf/modules/kali.conf
 share/speech-dispatcher/conf/speechd.conf
+share/speech-dispatcher/locale/an/symbols.dic
+share/speech-dispatcher/locale/ar/symbols.dic
+share/speech-dispatcher/locale/bg/symbols.dic
+share/speech-dispatcher/locale/ca/symbols.dic
+share/speech-dispatcher/locale/cs/symbols.dic
+share/speech-dispatcher/locale/da/symbols.dic
+share/speech-dispatcher/locale/de/symbols.dic
+share/speech-dispatcher/locale/el/symbols.dic
+share/speech-dispatcher/locale/en/symbols.dic
+share/speech-dispatcher/locale/es/symbols.dic
+share/speech-dispatcher/locale/es_CO/symbols.dic
+share/speech-dispatcher/locale/fa/symbols.dic
+share/speech-dispatcher/locale/fi/symbols.dic
+share/speech-dispatcher/locale/fr/symbols.dic
+share/speech-dispatcher/locale/ga/symbols.dic
+share/speech-dispatcher/locale/gl/symbols.dic
+share/speech-dispatcher/locale/he/symbols.dic
+share/speech-dispatcher/locale/hi/symbols.dic
+share/speech-dispatcher/locale/hr/symbols.dic
+share/speech-dispatcher/locale/hu/symbols.dic
+share/speech-dispatcher/locale/is/symbols.dic
+share/speech-dispatcher/locale/it/symbols.dic
+share/speech-dispatcher/locale/ja/symbols.dic
+share/speech-dispatcher/locale/ka/symbols.dic
+share/speech-dispatcher/locale/kn/symbols.dic
+share/speech-dispatcher/locale/ko/symbols.dic
+share/speech-dispatcher/locale/lt/symbols.dic
+share/speech-dispatcher/locale/my/symbols.dic
+share/speech-dispatcher/locale/nb_NO/symbols.dic
+share/speech-dispatcher/locale/nl/symbols.dic
+share/speech-dispatcher/locale/nn_NO/symbols.dic
+share/speech-dispatcher/locale/pa/symbols.dic
+share/speech-dispatcher/locale/pl/symbols.dic
+share/speech-dispatcher/locale/pt_BR/symbols.dic
+share/speech-dispatcher/locale/pt_PT/symbols.dic
+share/speech-dispatcher/locale/ro/symbols.dic
+share/speech-dispatcher/locale/ru/symbols.dic
+share/speech-dispatcher/locale/sk/symbols.dic
+share/speech-dispatcher/locale/sl/symbols.dic
+share/speech-dispatcher/locale/sq/symbols.dic
+share/speech-dispatcher/locale/sr/symbols.dic
+share/speech-dispatcher/locale/sv/symbols.dic
+share/speech-dispatcher/locale/ta/symbols.dic
+share/speech-dispatcher/locale/tr/symbols.dic
+share/speech-dispatcher/locale/uk/symbols.dic
+share/speech-dispatcher/locale/vi/symbols.dic
+share/speech-dispatcher/locale/zh/symbols.dic
+share/speech-dispatcher/locale/zh_CN/symbols.dic
+share/speech-dispatcher/locale/zh_HK/symbols.dic
+share/speech-dispatcher/locale/zh_TW/symbols.dic
diff --git a/audio/speech-dispatcher/distinfo b/audio/speech-dispatcher/distinfo
index 99510de21cf..f282f01796b 100644
--- a/audio/speech-dispatcher/distinfo
+++ b/audio/speech-dispatcher/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2019/11/28 16:18:54 nia Exp $
+$NetBSD: distinfo,v 1.3 2019/11/28 16:51:49 nia Exp $
 
-SHA1 (speech-dispatcher-0.8.4.tar.gz) = 0acef5da6a128f329d0edaaf5cec64e408e534f1
-RMD160 (speech-dispatcher-0.8.4.tar.gz) = e2dbbc41169087a5f0ec15dc4bb5f429aa209d1c
-SHA512 (speech-dispatcher-0.8.4.tar.gz) = 94a764a04385aca74bc36816575dc688b376ae9f0e2865a990ffc0b9e6d558a268edec39039e67bd84064bb8430a0ca0e84ab77e865dcf449e40867809fbacf3
-Size (speech-dispatcher-0.8.4.tar.gz) = 1341968 bytes
+SHA1 (speech-dispatcher-0.9.1.tar.gz) = 42be256a3238f5d38984fba0d371623bf6e4dd17
+RMD160 (speech-dispatcher-0.9.1.tar.gz) = d6da283a216c425186743d9335f34ccf1ac87b26
+SHA512 (speech-dispatcher-0.9.1.tar.gz) = 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2
+Size (speech-dispatcher-0.9.1.tar.gz) = 1662222 bytes
 SHA1 (patch-config_Makefile.in) = dd58a389bc9820d85e4fe912faff7e2cf969fa8e
 SHA1 (patch-config_clients_Makefile.in) = 4c172a7c33336343b88707ae17702c80c97c28f5
 SHA1 (patch-config_modules_Makefile.in) = 566c25934686d56c8e9a54cf520d121c9458bfae
-SHA1 (patch-src_modules_espeak.c) = c86d1ae94334d491d7dba2cd94a3a9aea03ebd59
+SHA1 (patch-src_modules_espeak.c) = 336b85e9901ee92348c04dc888a897f16a09c26d
diff --git a/audio/speech-dispatcher/patches/patch-src_modules_espeak.c b/audio/speech-dispatcher/patches/patch-src_modules_espeak.c
index 6c65ea31587..51b21f74d13 100644
--- a/audio/speech-dispatcher/patches/patch-src_modules_espeak.c
+++ b/audio/speech-dispatcher/patches/patch-src_modules_espeak.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_modules_espeak.c,v 1.1 2019/11/28 16:18:54 nia Exp $
+$NetBSD: patch-src_modules_espeak.c,v 1.2 2019/11/28 16:51:49 nia Exp $
 
 Fix path to espeak header file
 
---- src/modules/espeak.c.orig	2016-04-17 22:05:32.000000000 +0000
+--- src/modules/espeak.c.orig	2019-01-01 17:32:54.000000000 +0000
 +++ src/modules/espeak.c
-@@ -37,7 +37,7 @@
+@@ -35,7 +35,7 @@
  #include <semaphore.h>
  
  /* espeak header file */
 -#include <espeak/speak_lib.h>
 +#include <speak_lib.h>
+ 
  #ifndef ESPEAK_API_REVISION
  #define ESPEAK_API_REVISION 1
- #endif