Attachment 175639 Details for Bug 213393 – fix packaging with py35

[patch] fix packaging with py35

1.diff (text/plain), 3.82 KB, created by Ruslan Makhmatkhanov on 2016-10-11 21:03:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruslan Makhmatkhanov

Created: 2016-10-11 21:03:59 UTC

Size: 3.82 KB

patch

obsolete

>Index: py3-speech-dispatcher/Makefile
>===================================================================
>--- py3-speech-dispatcher/Makefile	(revision 423790)
>+++ py3-speech-dispatcher/Makefile	(working copy)
>@@ -1,16 +1,16 @@
> # $FreeBSD$
> 
>-PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> COMMENT=	Common interface to speech synthesis python bindings
> 
> SPEECH_SLAVE=	yes
> 
>-MASTERDIR=	${.CURDIR}/../../accessibility/speech-dispatcher
>+MASTERDIR=	${.CURDIR}/../speech-dispatcher
> 
> BUILD_WRKSRC=	${WRKSRC}/src/api/python
> INSTALL_WRKSRC=	${WRKSRC}/src/api/python
> 
>-PLIST=	${.CURDIR}/pkg-plist
>+PLIST=		${.CURDIR}/pkg-plist
> 
> .include "${MASTERDIR}/Makefile"
>Index: py3-speech-dispatcher/pkg-plist
>===================================================================
>--- py3-speech-dispatcher/pkg-plist	(revision 423790)
>+++ 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: speech-dispatcher/Makefile
>===================================================================
>--- speech-dispatcher/Makefile	(revision 423790)
>+++ speech-dispatcher/Makefile	(working copy)
>@@ -68,6 +68,7 @@
> PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
> PULSEAUDIO_CONFIGURE_WITH=pulse
> 
>+.include <bsd.port.pre.mk>
> post-patch:
> 	@${REINPLACE_CMD} -e '/SUBDIRS/ s/tests//' \
> 		${WRKSRC}/src/Makefile.in
>@@ -84,13 +85,22 @@
> 
> .else
> 
>-USES+=		python:3
>+NO_ARCH=	yes
>+USES+=		python:3.3+
> LIB_DEPENDS+=	libspeechd.so:accessibility/speech-dispatcher
> RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg
> 
>-USE_PYTHON=	py3kplist
>-PLIST_SUB=	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>
>+PLIST_SUB+=	PYOEXTENSION=${PYOEXTENSION} \
>+		PYVER=${PYTHON_VER:S/.//}
>+
>+.endif
>+
>+.include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 213393: 175639