Attachment 168841 Details for Bug 208435 – make accessibility/py3-speech-dispatcher buildable with python 3.5

[patch] make accessibility/py3-speech-dispatcher buildable with python 3.5

py3-speech-dispatcher-py35.diff (text/plain), 3.04 KB, created by Hajimu UMEMOTO on 2016-03-31 16:52:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hajimu UMEMOTO

Created: 2016-03-31 16:52:29 UTC

Size: 3.04 KB

patch

obsolete

>Index: accessibility/py3-speech-dispatcher/pkg-plist
>===================================================================
>--- accessibility/py3-speech-dispatcher/pkg-plist	(revision 412162)
>+++ accessibility/py3-speech-dispatcher/pkg-plist	(working copy)
>@@ -1,23 +1,23 @@
> 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__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
> %%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.pyc
>-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYVER%%.%%PYOEXTENSION%%
> %%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.pyc
>-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYVER%%.%%PYOEXTENSION%%
> %%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.pyc
>-%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYVER%%.%%PYOEXTENSION%%
> %%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__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
> %%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.pyc
>-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYVER%%.%%PYOEXTENSION%%
> %%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.pyc
>-%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.pyo
>+%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYVER%%.%%PYOEXTENSION%%
> %%PYTHON_SITELIBDIR%%/speechd_config/config.py
> %%PYTHON_SITELIBDIR%%/speechd_config/paths.py
> share/sounds/speech-dispatcher/test.wav
>Index: accessibility/speech-dispatcher/Makefile
>===================================================================
>--- accessibility/speech-dispatcher/Makefile	(revision 412162)
>+++ accessibility/speech-dispatcher/Makefile	(working copy)
>@@ -81,6 +81,7 @@
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
> 
>+.include <bsd.port.mk>
> 
> .else
> 
>@@ -89,8 +90,17 @@
> RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg
> 
> USE_PYTHON=	py3kplist
>-PLIST_SUB=	PYVER=${PYTHON_VER:S|.||}
>+PLIST_SUB=	PYOEXTENSION=${PYOEXTENSION} \
>+		PYVER=${PYTHON_VER:S|.||}
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${PYTHON_REL} < 3500
>+PYOEXTENSION=	pyo
>+.else
>+PYOEXTENSION=	opt-1.pyc
> .endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>+
>+.endif

Actions: View | Diff

Attachments on bug 208435: 168841