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)

2 files changed, 18 insertions, 30 deletions

diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index bd623ec8d34c..ef904afd37aa 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -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 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
 
@@ -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>
diff --git a/accessibility/speech-dispatcher/pkg-plist b/accessibility/speech-dispatcher/pkg-plist
index e6ed617cb43f..c93eec8e7b12 100644
--- a/accessibility/speech-dispatcher/pkg-plist
+++ b/accessibility/speech-dispatcher/pkg-plist
@@ -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