[Midnightbsd-cvs] mports [24877] trunk/accessibility/speech-dispatcher: update speech-dispatcher

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Feb 2 15:45:14 EST 2019 

Revision: 24877
          http://svnweb.midnightbsd.org/mports/?rev=24877
Author:   laffer1
Date:     2019-02-02 15:45:06 -0500 (Sat, 02 Feb 2019)
Log Message:
-----------
update speech-dispatcher

Modified Paths:
--------------
    trunk/accessibility/speech-dispatcher/Makefile
    trunk/accessibility/speech-dispatcher/distinfo
    trunk/accessibility/speech-dispatcher/pkg-plist

Modified: trunk/accessibility/speech-dispatcher/Makefile
===================================================================
--- trunk/accessibility/speech-dispatcher/Makefile	2019-02-02 20:43:31 UTC (rev 24876)
+++ trunk/accessibility/speech-dispatcher/Makefile	2019-02-02 20:45:06 UTC (rev 24877)
@@ -2,7 +2,7 @@
 # $FreeBSD: head/accessibility/speech-dispatcher/Makefile 371241 2014-10-20 08:12:20Z marino $
 
 PORTNAME=	speech-dispatcher
-PORTVERSION=	0.8.3
+PORTVERSION=	0.8.6
 CATEGORIES=	accessibility audio
 MASTER_SITES=	http://devel.freebsoft.org/pub/projects/speechd/
 
@@ -12,18 +12,23 @@
 LICENSE=	gpl2 lgpl2.1
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libdotconf.so:${PORTSDIR}/devel/dotconf \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libdotconf.so:devel/dotconf \
+		libltdl.so:devel/libltdl \
+		libsndfile.so:audio/libsndfile
 
 USE_GNOME=	glib20 intltool
-USES=		gettext gmake pathfix pkgconfig libtool
+USES=		alias gettext gmake pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-espeak-ng
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
+.if !defined(SPEECH_SLAVE)
+
+CONFIGURE_ARGS+=--disable-python
+
 ETCFILES=	clients/emacs.conf modules/pico-generic.conf \
 		modules/cicero.conf modules/dtk-generic.conf \
 		modules/epos-generic.conf modules/espeak-generic.conf \
@@ -30,57 +35,68 @@
 		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
+		modules/swift-generic.conf speechd.conf \
+		modules/espeak-ng.conf
 
-PORTDOCS=	ANNOUNCE AUTHORS ChangeLog FAQ NEWS README TODO
+PORTDOCS=	ANNOUNCE AUTHORS FAQ NEWS README TODO
 
 INFO=		spd-say speech-dispatcher speech-dispatcher-cs ssip
 
-OPTIONS_DEFINE=	ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS \
-		PULSEAUDIO PYTHON
+OPTIONS_DEFINE=	ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS PULSEAUDIO
 OPTIONS_DEFAULT=ESPEAK
 OPTIONS_SUB=	yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_WITH=	alsa
 
-AO_LIB_DEPENDS=		libao.so:${PORTSDIR}/audio/libao
+AO_LIB_DEPENDS=		libao.so:audio/libao
 AO_CONFIGURE_WITH=	libao
 
 ESPEAK_DESC=		eSpeak speech synthesizer support
-ESPEAK_LIB_DEPENDS=	libespeak.so:${PORTSDIR}/audio/espeak
+ESPEAK_LIB_DEPENDS=	libespeak.so: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
+FESTIVAL_RUN_DEPENDS=	festival:audio/festival \
+			${LOCALBASE}/share/festival/lib/${PORTNAME}.scm:audio/festival-freebsoft-utils
 
 FLITE_DESC=		Flite speech synthesis engine support
-FLITE_LIB_DEPENDS=	libflite.so:${PORTSDIR}/audio/flite
+FLITE_LIB_DEPENDS=	libflite.so:audio/flite
 FLITE_CONFIGURE_WITH=	flite
 
-NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
+NAS_LIB_DEPENDS=	libaudio.so:audio/nas
 NAS_CONFIGURE_WITH=	nas
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=pulse
 
-PYTHON_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg
-PYTHON_USES=		python:3
-PYTHON_USE=		PYTHON=py3kplist
-PYTHON_CONFIGURE_ENABLE=python
-
 post-patch:
 	@${REINPLACE_CMD} -e '/SUBDIRS/ s/tests//' \
 		${WRKSRC}/src/Makefile.in
+	${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \
+		${WRKSRC}/src/modules/*.c \
+		${WRKSRC}/config/modules/*.conf
 
 post-install:
 .for f in ${ETCFILES}
-	@${MV} ${ETCDIR}/${f} ${ETCDIR}/${f}.sample
+	@${MV} ${STAGEDIR}${ETCDIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
-	@${RM} -rf ${STAGEDIR}${DATADIR}/conf
+	@${RM} -r ${STAGEDIR}${DATADIR}/conf
 	@${RMDIR} ${STAGEDIR}${DATADIR} || ${TRUE}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
+.else
+
+PORTSCOUT=	ignore:1
+
+NO_ARCH=	yes
+USES+=		python:3.3+ shebangfix
+SHEBANG_FILES=	src/api/python/speechd_config/spd-conf
+USE_PYTHON=	flavors
+LIB_DEPENDS+=	libspeechd.so:accessibility/speech-dispatcher
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg
+
+.endif
+
 .include <bsd.port.mk>

Modified: trunk/accessibility/speech-dispatcher/distinfo
===================================================================
--- trunk/accessibility/speech-dispatcher/distinfo	2019-02-02 20:43:31 UTC (rev 24876)
+++ trunk/accessibility/speech-dispatcher/distinfo	2019-02-02 20:45:06 UTC (rev 24877)
@@ -1,2 +1,3 @@
-SHA256 (speech-dispatcher-0.8.3.tar.gz) = 96a293b2ba1e2498f1280c75a9607891a9990947a8d87e9855c2a642c93f1e4f
-SIZE (speech-dispatcher-0.8.3.tar.gz) = 1292321
+TIMESTAMP = 1482416560
+SHA256 (speech-dispatcher-0.8.6.tar.gz) = c233dc3757c1f0d3676480d1052d42d88d18d29ab0cb0c8b5ce8edc3e7386ff8
+SIZE (speech-dispatcher-0.8.6.tar.gz) = 1327500

Modified: trunk/accessibility/speech-dispatcher/pkg-plist
===================================================================
--- trunk/accessibility/speech-dispatcher/pkg-plist	2019-02-02 20:43:31 UTC (rev 24876)
+++ trunk/accessibility/speech-dispatcher/pkg-plist	2019-02-02 20:45:06 UTC (rev 24877)
@@ -1,4 +1,3 @@
-%%PYTHON%%bin/spd-conf
 bin/spd-say
 bin/spdsend
 bin/speech-dispatcher
@@ -8,6 +7,7 @@
 @sample %%ETCDIR%%/modules/epos-generic.conf.sample
 @sample %%ETCDIR%%/modules/espeak-generic.conf.sample
 @sample %%ETCDIR%%/modules/espeak-mbrola-generic.conf.sample
+ at sample %%ETCDIR%%/modules/espeak-ng.conf.sample
 @sample %%ETCDIR%%/modules/espeak.conf.sample
 @sample %%ETCDIR%%/modules/festival.conf.sample
 @sample %%ETCDIR%%/modules/flite.conf.sample
@@ -26,27 +26,6 @@
 lib/libspeechd.so
 lib/libspeechd.so.2
 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
@@ -67,4 +46,3 @@
 share/locale/cs/LC_MESSAGES/speech-dispatcher.mo
 share/locale/hu/LC_MESSAGES/speech-dispatcher.mo
 share/sounds/speech-dispatcher/dummy-message.wav
-%%PYTHON%%share/sounds/speech-dispatcher/test.wav

More information about the Midnightbsd-cvs mailing list