Index: head/accessibility/speech-dispatcher/Makefile =================================================================== --- head/accessibility/speech-dispatcher/Makefile (revision 390918) +++ head/accessibility/speech-dispatcher/Makefile (revision 390919) @@ -1,87 +1,100 @@ # $FreeBSD$ PORTNAME= speech-dispatcher -PORTVERSION= 0.8 -PORTREVISION= 2 +PORTVERSION= 0.8.3 CATEGORIES= accessibility audio MASTER_SITES= http://devel.freebsoft.org/pub/projects/speechd/ MAINTAINER= avilla@FreeBSD.org COMMENT= Common interface to speech synthesis LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LIB_DEPENDS= libdotconf.so:${PORTSDIR}/devel/dotconf \ libltdl.so:${PORTSDIR}/devel/libltdl \ libsndfile.so:${PORTSDIR}/audio/libsndfile USE_GNOME= glib20 intltool -USES= alias gettext gmake pathfix pkgconfig libtool +USES= alias gmake pathfix pkgconfig libtool GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes INSTALL_TARGET= install-strip -ETCFILES= clients/emacs.conf clients/gnome-speech.conf \ +ETCFILES= clients/emacs.conf modules/pico-generic.conf \ modules/cicero.conf modules/dtk-generic.conf \ modules/epos-generic.conf modules/espeak-generic.conf \ modules/espeak-mbrola-generic.conf modules/espeak.conf \ modules/festival.conf modules/flite.conf modules/ibmtts.conf \ modules/ivona.conf modules/llia_phon-generic.conf \ modules/swift-generic.conf speechd.conf -PLIST_SUB+= ETCFILES="${ETCFILES}" +PORTDOCS= ANNOUNCE AUTHORS ChangeLog FAQ NEWS README TODO -PORTDOCS= AUTHORS ChangeLog FAQ INSTALL NEWS README TODO - INFO= spd-say speech-dispatcher ssip -OPTIONS_DEFINE= ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS PULSEAUDIO #PYTHON +OPTIONS_DEFINE= ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS NLS \ + PULSEAUDIO PYTHON OPTIONS_DEFAULT=ESPEAK OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CONFIGURE_WITH= alsa AO_LIB_DEPENDS= libao.so:${PORTSDIR}/audio/libao AO_CONFIGURE_WITH= libao ESPEAK_DESC= eSpeak speech synthesizer support ESPEAK_LIB_DEPENDS= libespeak.so:${PORTSDIR}/audio/espeak ESPEAK_CONFIGURE_WITH= espeak FESTIVAL_DESC= Festival Speech Synthesis System support FESTIVAL_RUN_DEPENDS= festival:${PORTSDIR}/audio/festival \ ${LOCALBASE}/share/festival/lib/${PORTNAME}.scm:${PORTSDIR}/audio/festival-freebsoft-utils FLITE_DESC= Flite speech synthesis engine support FLITE_LIB_DEPENDS= libflite.so:${PORTSDIR}/audio/flite FLITE_CONFIGURE_WITH= flite NAS_LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas NAS_CONFIGURE_WITH= nas +NLS_USES= gettext + PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_WITH=pulse -# devel/py-xdg doesn't support Python 3. -CONFIGURE_ARGS+= --disable-python -PLIST_SUB+= PYTHON="@comment " -#PYTHON_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg -#PYTHON_USE= PYTHON=3 -#PYTHON_CONFIGURE_ENABLE=python +PYTHON_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg +PYTHON_USES= python:3 +PYTHON_USE= PYTHON=py3kplist +PYTHON_CONFIGURE_ENABLE=python +.include + +.if ${PORT_OPTIONS:MNLS} +INFO+= speech-dispatcher-cs +.endif + post-patch: @${REINPLACE_CMD} -e '/SUBDIRS/ s/tests//' \ ${WRKSRC}/src/Makefile.in +.if ! ${PORT_OPTIONS:MNLS} + @${REINPLACE_CMD} -e '/SUBDIRS/ s/po//' \ + ${WRKSRC}/Makefile.in +.endif post-install: .for f in ${ETCFILES} @${MV} ${STAGEDIR}${ETCDIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor + @${RM} -rf ${STAGEDIR}${DATADIR}/conf + @${RMDIR} ${STAGEDIR}${DATADIR} || ${TRUE} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} +.if ! ${PORT_OPTIONS:MNLS} + @${RM} -f ${STAGEDIR}${PREFIX}/${INFO_PATH}/speech-dispatcher-cs.info +.endif .include Index: head/accessibility/speech-dispatcher/distinfo =================================================================== --- head/accessibility/speech-dispatcher/distinfo (revision 390918) +++ head/accessibility/speech-dispatcher/distinfo (revision 390919) @@ -1,2 +1,2 @@ -SHA256 (speech-dispatcher-0.8.tar.gz) = 0a6ce544cfbac8592a8ea08e3ab24c389153904ea51c6fd68756cea52de9efa2 -SIZE (speech-dispatcher-0.8.tar.gz) = 1229312 +SHA256 (speech-dispatcher-0.8.3.tar.gz) = 96a293b2ba1e2498f1280c75a9607891a9990947a8d87e9855c2a642c93f1e4f +SIZE (speech-dispatcher-0.8.3.tar.gz) = 1292321 Index: head/accessibility/speech-dispatcher/files/patch-src__server__output.c =================================================================== --- head/accessibility/speech-dispatcher/files/patch-src__server__output.c (revision 390918) +++ head/accessibility/speech-dispatcher/files/patch-src__server__output.c (nonexistent) @@ -1,25 +0,0 @@ ---- ./src/server/output.c.orig 2012-07-11 11:05:06.000000000 +0200 -+++ ./src/server/output.c 2013-11-15 11:18:27.066817985 +0100 -@@ -30,22 +30,9 @@ - #include "output.h" - #include "parse.h" - --#ifdef TEMP_FAILURE_RETRY /* GNU libc */ --#define safe_write(fd, buf, count) TEMP_FAILURE_RETRY(write(fd, buf, count)) --#else /* TEMP_FAILURE_RETRY */ - #ifdef HAVE_UNISTD_H - #include - #endif --static inline ssize_t --safe_write(int fd, const void *buf, size_t count) { -- do { -- ssize_t w = write(fd, buf, count); -- -- if (w == -1 && errno == EINTR) continue; -- return w; -- } while (1); --} --#endif /* TEMP_FAILURE_RETRY */ - - #if !(defined(__GLIBC__) && defined(_GNU_SOURCE)) - /* Added by Willie Walker - strndup is a gcc-ism Property changes on: head/accessibility/speech-dispatcher/files/patch-src__server__output.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/accessibility/speech-dispatcher/files/patch-include__spd_utils.h =================================================================== --- head/accessibility/speech-dispatcher/files/patch-include__spd_utils.h (revision 390918) +++ head/accessibility/speech-dispatcher/files/patch-include__spd_utils.h (nonexistent) @@ -1,11 +0,0 @@ ---- ./include/spd_utils.h.orig 2012-07-11 11:05:05.000000000 +0200 -+++ ./include/spd_utils.h 2013-11-15 08:46:53.865350816 +0100 -@@ -27,4 +27,8 @@ - #include - - ssize_t spd_getline(char **lineptr, size_t * n, FILE * f); -+ -+ssize_t safe_read(int fd, void *buf, size_t count); -+ssize_t safe_write(int fd, const void *buf, size_t count); -+ - #endif /* SPD_UTILS_H */ Property changes on: head/accessibility/speech-dispatcher/files/patch-include__spd_utils.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/accessibility/speech-dispatcher/files/patch-src__modules__cicero.c =================================================================== --- head/accessibility/speech-dispatcher/files/patch-src__modules__cicero.c (revision 390918) +++ head/accessibility/speech-dispatcher/files/patch-src__modules__cicero.c (nonexistent) @@ -1,21 +0,0 @@ ---- ./src/modules/cicero.c.orig 2012-07-11 11:05:05.000000000 +0200 -+++ ./src/modules/cicero.c 2013-11-15 08:51:41.687674164 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include "module_utils.h" - -@@ -377,9 +378,7 @@ - break; - } - if (ret > 0) -- TEMP_FAILURE_RETRY(read -- (fd1[0], b, -- 2)); -+ safe_read(fd1[0], b, 2); - if (cicero_stop) { - cicero_speaking = 0; - module_report_event_stop(); Property changes on: head/accessibility/speech-dispatcher/files/patch-src__modules__cicero.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/accessibility/speech-dispatcher/files/patch-src__server__sem_functions.c =================================================================== --- head/accessibility/speech-dispatcher/files/patch-src__server__sem_functions.c (revision 390918) +++ head/accessibility/speech-dispatcher/files/patch-src__server__sem_functions.c (nonexistent) @@ -1,18 +0,0 @@ ---- ./src/server/sem_functions.c.orig 2012-07-11 11:05:06.000000000 +0200 -+++ ./src/server/sem_functions.c 2013-11-15 11:19:15.965146025 +0100 -@@ -28,13 +28,13 @@ - - #include "speechd.h" - #include "sem_functions.h" -+#include - - void speaking_semaphore_post(void) - { - char buf[1]; - buf[0] = 42; -- const ssize_t wr_bytes = -- TEMP_FAILURE_RETRY(write(speaking_pipe[1], buf, 1)); -+ const ssize_t wr_bytes = safe_write(speaking_pipe[1], buf, 1); - if (wr_bytes != 1) - FATAL("write to polled fd: could not write 1 byte"); - } Property changes on: head/accessibility/speech-dispatcher/files/patch-src__server__sem_functions.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/accessibility/speech-dispatcher/files/patch-src__server__speaking.c =================================================================== --- head/accessibility/speech-dispatcher/files/patch-src__server__speaking.c (revision 390918) +++ head/accessibility/speech-dispatcher/files/patch-src__server__speaking.c (nonexistent) @@ -1,22 +0,0 @@ ---- ./src/server/speaking.c.orig 2012-07-11 11:05:06.000000000 +0200 -+++ ./src/server/speaking.c 2013-11-15 11:20:31.405951238 +0100 -@@ -39,6 +39,7 @@ - #include "output.h" - #include "speaking.h" - #include "sem_functions.h" -+#include - - TSpeechDMessage *current_message = NULL; - static SPDPriority highest_priority = 0; -@@ -87,10 +88,7 @@ - char buf[1]; - MSG(5, - "wait_for_poll: activity in Speech Dispatcher"); -- const ssize_t rd_bytes = -- TEMP_FAILURE_RETRY(read -- (poll_fds[0].fd, buf, -- 1)); -+ const ssize_t rd_bytes = safe_read(poll_fds[0].fd, buf, 1); - if (rd_bytes != 1) - FATAL - ("read from polled fd: could not read 1 byte"); Property changes on: head/accessibility/speech-dispatcher/files/patch-src__server__speaking.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/accessibility/speech-dispatcher/files/patch-src__common__spd_getline.c =================================================================== --- head/accessibility/speech-dispatcher/files/patch-src__common__spd_getline.c (revision 390918) +++ head/accessibility/speech-dispatcher/files/patch-src__common__spd_getline.c (nonexistent) @@ -1,34 +0,0 @@ ---- ./src/common/spd_getline.c.orig 2012-07-11 11:05:05.000000000 +0200 -+++ ./src/common/spd_getline.c 2013-11-15 11:25:07.125139008 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -122,3 +123,23 @@ - } - return buf_pos; - } -+ -+ssize_t -+safe_read(int fd, void *buf, size_t count) -+{ -+ ssize_t r; -+ do { -+ r = read(fd, buf, count); -+ } while (r == -1 && errno == EINTR); -+ return r; -+} -+ -+ssize_t -+safe_write(int fd, const void *buf, size_t count) -+{ -+ ssize_t w; -+ do { -+ w = write(fd, buf, count); -+ } while (w == -1 && errno == EINTR); -+ return w; -+} Property changes on: head/accessibility/speech-dispatcher/files/patch-src__common__spd_getline.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/accessibility/speech-dispatcher/files/patch-src__server__speechd.h =================================================================== --- head/accessibility/speech-dispatcher/files/patch-src__server__speechd.h (revision 390918) +++ head/accessibility/speech-dispatcher/files/patch-src__server__speechd.h (revision 390919) @@ -1,11 +1,11 @@ ---- ./src/server/speechd.h.orig 2012-07-11 11:05:06.000000000 +0200 -+++ ./src/server/speechd.h 2013-11-15 08:44:05.115355454 +0100 +--- src/server/speechd.h.orig 2015-06-04 01:52:14 UTC ++++ src/server/speechd.h @@ -56,7 +56,7 @@ /* TODO: This fixes compilation for Mac OS X but might not be a correct solution for other platforms. A better check is needed, possibly including _POSIX_C_SOURCE and friends*/ -#if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__APPLE__) +#if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__APPLE__) || defined(__FreeBSD__) - /* union semun is defined by including */ + /* union semun is defined by including */ #else - /* according to X/OPEN we have to define it ourselves */ + /* according to X/OPEN we have to define it ourselves */ Index: head/accessibility/speech-dispatcher/pkg-plist =================================================================== --- head/accessibility/speech-dispatcher/pkg-plist (revision 390918) +++ head/accessibility/speech-dispatcher/pkg-plist (revision 390919) @@ -1,83 +1,70 @@ %%PYTHON%%bin/spd-conf bin/spd-say bin/spdsend bin/speech-dispatcher @sample %%ETCDIR%%/clients/emacs.conf.sample -@sample %%ETCDIR%%/clients/gnome-speech.conf.sample @sample %%ETCDIR%%/modules/cicero.conf.sample @sample %%ETCDIR%%/modules/dtk-generic.conf.sample @sample %%ETCDIR%%/modules/epos-generic.conf.sample @sample %%ETCDIR%%/modules/espeak-generic.conf.sample @sample %%ETCDIR%%/modules/espeak-mbrola-generic.conf.sample @sample %%ETCDIR%%/modules/espeak.conf.sample @sample %%ETCDIR%%/modules/festival.conf.sample @sample %%ETCDIR%%/modules/flite.conf.sample @sample %%ETCDIR%%/modules/ibmtts.conf.sample @sample %%ETCDIR%%/modules/ivona.conf.sample @sample %%ETCDIR%%/modules/llia_phon-generic.conf.sample +@sample %%ETCDIR%%/modules/pico-generic.conf.sample @sample %%ETCDIR%%/modules/swift-generic.conf.sample @sample %%ETCDIR%%/speechd.conf.sample include/speech-dispatcher/libspeechd.h +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 lib/libspeechd.a lib/libspeechd.so lib/libspeechd.so.2 -lib/libspeechd.so.2.4.0 +lib/libspeechd.so.2.6.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/__init__.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/_test.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/_test.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/_test.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/client.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/client.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/client.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/paths.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/paths.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/paths.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/__init__.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/config.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/config.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/config.pyo %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/paths.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/paths.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd_config/paths.pyo lib/speech-dispatcher-modules/sd_cicero lib/speech-dispatcher-modules/sd_dummy %%ESPEAK%%lib/speech-dispatcher-modules/sd_espeak lib/speech-dispatcher-modules/sd_festival %%FLITE%%lib/speech-dispatcher-modules/sd_flite lib/speech-dispatcher-modules/sd_generic %%ALSA%%lib/speech-dispatcher/spd_alsa.a %%ALSA%%lib/speech-dispatcher/spd_alsa.so %%AO%%lib/speech-dispatcher/spd_libao.a %%AO%%lib/speech-dispatcher/spd_libao.so %%NAS%%lib/speech-dispatcher/spd_nas.a %%NAS%%lib/speech-dispatcher/spd_nas.so lib/speech-dispatcher/spd_oss.a lib/speech-dispatcher/spd_oss.so %%PULSEAUDIO%%lib/speech-dispatcher/spd_pulse.a %%PULSEAUDIO%%lib/speech-dispatcher/spd_pulse.so libdata/pkgconfig/speech-dispatcher.pc -share/locale/cs/LC_MESSAGES/speech-dispatcher.mo -share/locale/hu/LC_MESSAGES/speech-dispatcher.mo +%%NLS%%share/locale/cs/LC_MESSAGES/speech-dispatcher.mo +%%NLS%%share/locale/hu/LC_MESSAGES/speech-dispatcher.mo share/sounds/speech-dispatcher/dummy-message.wav %%PYTHON%%share/sounds/speech-dispatcher/test.wav -%%DATADIR%%/conf/clients/emacs.conf -%%DATADIR%%/conf/clients/gnome-speech.conf -%%DATADIR%%/conf/modules/cicero.conf -%%DATADIR%%/conf/modules/dtk-generic.conf -%%DATADIR%%/conf/modules/epos-generic.conf -%%DATADIR%%/conf/modules/espeak-generic.conf -%%DATADIR%%/conf/modules/espeak-mbrola-generic.conf -%%DATADIR%%/conf/modules/espeak.conf -%%DATADIR%%/conf/modules/festival.conf -%%DATADIR%%/conf/modules/flite.conf -%%DATADIR%%/conf/modules/ibmtts.conf -%%DATADIR%%/conf/modules/ivona.conf -%%DATADIR%%/conf/modules/llia_phon-generic.conf -%%DATADIR%%/conf/modules/swift-generic.conf -%%DATADIR%%/conf/speechd.conf