svn commit: r406563 - in head/accessibility: . py3-speech-dispatcher py3-speech-dispatcher/files speech-dispatcher
Koop Mast
kwm at FreeBSD.org
Mon Jan 18 11:54:03 UTC 2016
Author: kwm
Date: Mon Jan 18 11:54:01 2016
New Revision: 406563
URL: https://svnweb.freebsd.org/changeset/ports/406563
Log:
Split off the python bindings into it own slave port. They where not build
by default and orca requires the bindings. Bump port revision just to be
sure there will be no conflicts.
PR: 205486
Approved by: maintainer (timeout 27 days)
Added:
head/accessibility/py3-speech-dispatcher/
- copied from r406562, head/accessibility/speech-dispatcher/
Deleted:
head/accessibility/py3-speech-dispatcher/distinfo
head/accessibility/py3-speech-dispatcher/files/
head/accessibility/py3-speech-dispatcher/pkg-descr
Modified:
head/accessibility/Makefile
head/accessibility/py3-speech-dispatcher/Makefile
head/accessibility/py3-speech-dispatcher/pkg-plist
head/accessibility/speech-dispatcher/Makefile
head/accessibility/speech-dispatcher/pkg-plist
Modified: head/accessibility/Makefile
==============================================================================
--- head/accessibility/Makefile Mon Jan 18 11:37:39 2016 (r406562)
+++ head/accessibility/Makefile Mon Jan 18 11:54:01 2016 (r406563)
@@ -32,6 +32,7 @@
SUBDIR += py-atspi
SUBDIR += py-papi
SUBDIR += py3-atspi
+ SUBDIR += py3-speech-dispatcher
SUBDIR += qt4-accessible
SUBDIR += redshift
SUBDIR += rubygem-atk
Modified: head/accessibility/py3-speech-dispatcher/Makefile
==============================================================================
--- head/accessibility/speech-dispatcher/Makefile Mon Jan 18 11:37:39 2016 (r406562)
+++ head/accessibility/py3-speech-dispatcher/Makefile Mon Jan 18 11:54:01 2016 (r406563)
@@ -1,85 +1,16 @@
# $FreeBSD$
-PORTNAME= speech-dispatcher
-PORTVERSION= 0.8.3
-CATEGORIES= accessibility audio
-MASTER_SITES= http://devel.freebsoft.org/pub/projects/speechd/
-
-MAINTAINER= avilla at 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
-GNU_CONFIGURE= yes
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-USE_LDCONFIG= yes
-INSTALL_TARGET= install-strip
-
-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
-
-PORTDOCS= ANNOUNCE AUTHORS ChangeLog 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_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
-
-PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/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
-
-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}
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-.include <bsd.port.mk>
+COMMENT= Common interface to speech synthesis python bindings
+
+SPEECH_SLAVE= yes
+
+MASTERDIR= ${.CURDIR}/../../accessibility/speech-dispatcher
+
+BUILD_WRKSRC= ${WRKSRC}/src/api/python
+INSTALL_WRKSRC= ${WRKSRC}/src/api/python
+
+PLIST= ${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
Modified: head/accessibility/py3-speech-dispatcher/pkg-plist
==============================================================================
--- head/accessibility/speech-dispatcher/pkg-plist Mon Jan 18 11:37:39 2016 (r406562)
+++ head/accessibility/py3-speech-dispatcher/pkg-plist Mon Jan 18 11:54:01 2016 (r406563)
@@ -1,70 +1,24 @@
-%%PYTHON%%bin/spd-conf
-bin/spd-say
-bin/spdsend
-bin/speech-dispatcher
- at sample %%ETCDIR%%/clients/emacs.conf.sample
- at sample %%ETCDIR%%/modules/cicero.conf.sample
- at sample %%ETCDIR%%/modules/dtk-generic.conf.sample
- at sample %%ETCDIR%%/modules/epos-generic.conf.sample
- at sample %%ETCDIR%%/modules/espeak-generic.conf.sample
- at sample %%ETCDIR%%/modules/espeak-mbrola-generic.conf.sample
- at sample %%ETCDIR%%/modules/espeak.conf.sample
- at sample %%ETCDIR%%/modules/festival.conf.sample
- at sample %%ETCDIR%%/modules/flite.conf.sample
- at sample %%ETCDIR%%/modules/ibmtts.conf.sample
- at sample %%ETCDIR%%/modules/ivona.conf.sample
- at sample %%ETCDIR%%/modules/llia_phon-generic.conf.sample
- at sample %%ETCDIR%%/modules/pico-generic.conf.sample
- at sample %%ETCDIR%%/modules/swift-generic.conf.sample
- at 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.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
-share/sounds/speech-dispatcher/dummy-message.wav
-%%PYTHON%%share/sounds/speech-dispatcher/test.wav
+bin/spd-conf
+%%PYTHON_SITELIBDIR%%/speechd/__init__.py
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd/_test.py
+%%PYTHON_SITELIBDIR%%/speechd/client.py
+%%PYTHON_SITELIBDIR%%/speechd/paths.py
+%%PYTHON_SITELIBDIR%%/speechd_config/__init__.py
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.pyo
+%%PYTHON_SITELIBDIR%%/speechd_config/config.py
+%%PYTHON_SITELIBDIR%%/speechd_config/paths.py
+share/sounds/speech-dispatcher/test.wav
+%%DATADIR%%/conf/desktop/speechd.desktop
Modified: head/accessibility/speech-dispatcher/Makefile
==============================================================================
--- head/accessibility/speech-dispatcher/Makefile Mon Jan 18 11:37:39 2016 (r406562)
+++ head/accessibility/speech-dispatcher/Makefile Mon Jan 18 11:54:01 2016 (r406563)
@@ -2,6 +2,7 @@
PORTNAME= speech-dispatcher
PORTVERSION= 0.8.3
+PORTREVISION= 1
CATEGORIES= accessibility audio
MASTER_SITES= http://devel.freebsoft.org/pub/projects/speechd/
@@ -23,6 +24,10 @@ 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 \
@@ -35,8 +40,7 @@ PORTDOCS= ANNOUNCE AUTHORS ChangeLog FAQ
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
@@ -64,11 +68,6 @@ NAS_CONFIGURE_WITH= nas
PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/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
@@ -82,4 +81,16 @@ post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+.else
+
+USES+= python:3
+LIB_DEPENDS+= libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg
+
+USE_PYTHON= py3kplist
+PLIST_SUB= PYVER=${PYTHON_VER:S|.||}
+
+.endif
+
.include <bsd.port.mk>
Modified: head/accessibility/speech-dispatcher/pkg-plist
==============================================================================
--- head/accessibility/speech-dispatcher/pkg-plist Mon Jan 18 11:37:39 2016 (r406562)
+++ head/accessibility/speech-dispatcher/pkg-plist Mon Jan 18 11:54:01 2016 (r406563)
@@ -1,4 +1,3 @@
-%%PYTHON%%bin/spd-conf
bin/spd-say
bin/spdsend
bin/speech-dispatcher
@@ -26,27 +25,6 @@ lib/libspeechd.a
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 +45,3 @@ libdata/pkgconfig/speech-dispatcher.pc
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 svn-ports-head
mailing list