speech-dispatcher: Various fixes.

- Add some missing dependencies.
- Use libao for sound output so more backends are available.
- Install config files to the proper location.
- Install info fiels to the proper location.

This now actually works without tweaks.

Bump PKGREVISION

4 files changed, 43 insertions, 13 deletions

diff --git a/audio/speech-dispatcher/Makefile b/audio/speech-dispatcher/Makefile
index ee9a0e43c00..df60eade7ce 100644
--- a/audio/speech-dispatcher/Makefile
+++ b/audio/speech-dispatcher/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2019/11/28 13:38:06 nia Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/28 16:18:54 nia Exp $
 
 DISTNAME=	speech-dispatcher-0.8.4
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://devel.freebsoft.org/pub/projects/speechd/
 
@@ -15,8 +15,20 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	intltool pkg-config
 USE_TOOLS+=	msgfmt msgmerge xgettext
 
+INFO_FILES=	yes
+
+# To avoid PLIST complexity, let the libao package select the most
+# fitting audio backend for the platform.
+CONFIGURE_ARGS+=	--with-libao
+CONFIGURE_ARGS+=	--without-alsa
+CONFIGURE_ARGS+=	--without-nas
+CONFIGURE_ARGS+=	--without-oss
+CONFIGURE_ARGS+=	--without-pulse
+
 PKGCONFIG_OVERRIDE+=	speech-dispatcher.pc.in
 
+PKG_SYSCONFSUBDIR=	speech-dispatcher
+
 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 \
@@ -48,10 +60,12 @@ CONF_FILES+=	${PREFIX}/share/examples/speech-dispatcher/modules/swift-generic.co
 CONF_FILES+=	${PREFIX}/share/examples/speech-dispatcher/speechd.conf \
 		${PKG_SYSCONFDIR}/speechd.conf
 
+.include "../../audio/espeak/buildlink3.mk"
+.include "../../audio/flite/buildlink3.mk"
+.include "../../audio/libao/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../devel/dotconf/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/speech-dispatcher/PLIST b/audio/speech-dispatcher/PLIST
index 815b1f0d1ed..279fdc57ebd 100644
--- a/audio/speech-dispatcher/PLIST
+++ b/audio/speech-dispatcher/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/07/20 11:51:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/11/28 16:18:54 nia Exp $
 bin/spd-say
 bin/spdsend
 bin/speech-dispatcher
@@ -7,14 +7,19 @@ include/speech-dispatcher/libspeechd_version.h
 include/speech-dispatcher/spd_audio_plugin.h
 include/speech-dispatcher/speechd_defines.h
 include/speech-dispatcher/speechd_types.h
+info/spd-say.info
+info/speech-dispatcher-cs.info
+info/speech-dispatcher.info
+info/ssip.info
 lib/libspeechd.la
 lib/pkgconfig/speech-dispatcher.pc
 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/spd_oss.la
-lib/speech-dispatcher/spd_pulse.la
+lib/speech-dispatcher/spd_libao.la
 share/examples/speech-dispatcher/clients/emacs.conf
 share/examples/speech-dispatcher/modules/cicero.conf
 share/examples/speech-dispatcher/modules/dtk-generic.conf
@@ -30,11 +35,6 @@ share/examples/speech-dispatcher/modules/llia_phon-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/info/dir
-share/info/spd-say.info
-share/info/speech-dispatcher-cs.info
-share/info/speech-dispatcher.info
-share/info/ssip.info
 share/sounds/speech-dispatcher/dummy-message.wav
 share/speech-dispatcher/conf/clients/emacs.conf
 share/speech-dispatcher/conf/modules/cicero.conf
diff --git a/audio/speech-dispatcher/distinfo b/audio/speech-dispatcher/distinfo
index ca894d60e2a..99510de21cf 100644
--- a/audio/speech-dispatcher/distinfo
+++ b/audio/speech-dispatcher/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2016/07/20 11:51:58 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2019/11/28 16:18:54 nia Exp $
 
 SHA1 (speech-dispatcher-0.8.4.tar.gz) = 0acef5da6a128f329d0edaaf5cec64e408e534f1
 RMD160 (speech-dispatcher-0.8.4.tar.gz) = e2dbbc41169087a5f0ec15dc4bb5f429aa209d1c
@@ -7,3 +7,4 @@ Size (speech-dispatcher-0.8.4.tar.gz) = 1341968 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
diff --git a/audio/speech-dispatcher/patches/patch-src_modules_espeak.c b/audio/speech-dispatcher/patches/patch-src_modules_espeak.c
new file mode 100644
index 00000000000..6c65ea31587
--- /dev/null
+++ b/audio/speech-dispatcher/patches/patch-src_modules_espeak.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_modules_espeak.c,v 1.1 2019/11/28 16:18:54 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
+@@ -37,7 +37,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