svn commit: r423881 - in head/accessibility: py3-speech-dispatcher speech-dispatcher
Ruslan Makhmatkhanov
rm at FreeBSD.org
Wed Oct 12 18:55:56 UTC 2016
Author: rm
Date: Wed Oct 12 18:55:54 2016
New Revision: 423881
URL: https://svnweb.freebsd.org/changeset/ports/423881
Log:
accessibility/py3-speech-dispatcher: fix packaging with python 3.5
While here add NO_ARCH and make couple of whitespace fixes.
PR: 213393
Approved by: portmgr (blanket approval)
Modified:
head/accessibility/py3-speech-dispatcher/Makefile
head/accessibility/py3-speech-dispatcher/pkg-plist
head/accessibility/speech-dispatcher/Makefile
Modified: head/accessibility/py3-speech-dispatcher/Makefile
==============================================================================
--- head/accessibility/py3-speech-dispatcher/Makefile Wed Oct 12 18:55:37 2016 (r423880)
+++ head/accessibility/py3-speech-dispatcher/Makefile Wed Oct 12 18:55:54 2016 (r423881)
@@ -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"
Modified: head/accessibility/py3-speech-dispatcher/pkg-plist
==============================================================================
--- head/accessibility/py3-speech-dispatcher/pkg-plist Wed Oct 12 18:55:37 2016 (r423880)
+++ head/accessibility/py3-speech-dispatcher/pkg-plist Wed Oct 12 18:55:54 2016 (r423881)
@@ -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
Modified: head/accessibility/speech-dispatcher/Makefile
==============================================================================
--- head/accessibility/speech-dispatcher/Makefile Wed Oct 12 18:55:37 2016 (r423880)
+++ head/accessibility/speech-dispatcher/Makefile Wed Oct 12 18:55:54 2016 (r423881)
@@ -68,6 +68,7 @@ NAS_CONFIGURE_WITH= nas
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 @@ post-install:
.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
+
+PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \
+ PYVER=${PYTHON_VER:S/.//}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list