summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/py-line_profiler/Makefile10
-rw-r--r--devel/py-line_profiler/PLIST6
-rw-r--r--textproc/py-sphinx-autodoc-typehints/Makefile7
-rw-r--r--textproc/py-sphinx/Makefile4
-rw-r--r--www/py-tornado/Makefile10
5 files changed, 12 insertions, 25 deletions
diff --git a/devel/py-line_profiler/Makefile b/devel/py-line_profiler/Makefile
index 6fb73200a2b..d521f22b290 100644
--- a/devel/py-line_profiler/Makefile
+++ b/devel/py-line_profiler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/08/07 16:45:10 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/02 09:27:09 adam Exp $
DISTNAME= line_profiler-2.1.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -19,13 +19,7 @@ post-install:
PYTHON_VERSIONED_DEPENDENCIES= ipython
.include "../../lang/python/pyversion.mk"
-
-PLIST_VARS+= py35
-.if "${PYPKGPREFIX}" != "py27" && "${PYPKGPREFIX}" != "py34"
-PLIST.py35= yes
-.endif
-
-.if "${PYPKGPREFIX}" == "py37"
+.if ${_PYTHON_VERSION} == 37
# Regenerate _line_profiler.c with recent cython
BUILDLINK_DEPMETHOD.py-cython= build
.include "../../devel/py-cython/buildlink3.mk"
diff --git a/devel/py-line_profiler/PLIST b/devel/py-line_profiler/PLIST
index 14487226e08..c99a179f4cb 100644
--- a/devel/py-line_profiler/PLIST
+++ b/devel/py-line_profiler/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/31 13:42:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/05/02 09:27:09 adam Exp $
bin/kernprof${PYVERSSUFFIX}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -14,5 +14,5 @@ ${PYSITELIB}/line_profiler.py
${PYSITELIB}/line_profiler.pyc
${PYSITELIB}/line_profiler.pyo
${PLIST.py3x}${PYSITELIB}/line_profiler_py35.py
-${PLIST.py35}${PYSITELIB}/line_profiler_py35.pyc
-${PLIST.py35}${PYSITELIB}/line_profiler_py35.pyo
+${PLIST.py3x}${PYSITELIB}/line_profiler_py35.pyc
+${PLIST.py3x}${PYSITELIB}/line_profiler_py35.pyo
diff --git a/textproc/py-sphinx-autodoc-typehints/Makefile b/textproc/py-sphinx-autodoc-typehints/Makefile
index edb8eac0228..cefcf0b951d 100644
--- a/textproc/py-sphinx-autodoc-typehints/Makefile
+++ b/textproc/py-sphinx-autodoc-typehints/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/09/27 22:38:59 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/02 09:27:09 adam Exp $
DISTNAME= sphinx-autodoc-typehints-1.3.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -18,10 +18,5 @@ USE_LANGUAGES= # none
PYTHON_VERSIONS_INCOMPATIBLE= 27
-.include "../../lang/python/pyversion.mk"
-.if "${PYPKGPREFIX}" == "py34"
-DEPENDS+= ${PYPKGPREFIX}-typing>=3.5:../../devel/py-typing
-.endif
-
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index a7aa31b654b..573cef62d67 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2019/03/10 13:36:02 adam Exp $
+# $NetBSD: Makefile,v 1.63 2019/05/02 09:27:09 adam Exp $
DISTNAME= Sphinx-1.8.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -24,7 +24,7 @@ DEPENDS+= ${PYPKGPREFIX}-sphinxcontrib-websupport-[0-9]*:../../textproc/py-sphin
DEPENDS+= ${PYPKGPREFIX}-six>=1.5:../../lang/py-six
.include "../../lang/python/pyversion.mk"
-.if "${PYPKGPREFIX}" == "py27" || "${PYPKGPREFIX}" == "py34"
+.if ${_PYTHON_VERSION} == 27
DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
.endif
diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index ae25c09f3b0..0c9e409cd9f 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/09/17 10:15:39 adam Exp $
+# $NetBSD: Makefile,v 1.28 2019/05/02 09:27:09 adam Exp $
DISTNAME= tornado-5.1.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -18,18 +18,16 @@ REPLACE_PYTHON+= tornado/platform/*.py
REPLACE_PYTHON+= tornado/test/*.py
do-test:
- ${RUN}cd ${WRKSRC}; ${PYTHONBIN} -m tornado.test.runtests
+ cd ${WRKSRC} && ${PYTHONBIN} -m tornado.test.runtests
.include "../../lang/python/pyversion.mk"
PLIST_VARS+= requires
-.if "${PYPKGPREFIX}" == "py27"
+.if ${_PYTHON_VERSION} == 27
+DEPENDS+= ${PYPKGPREFIX}-backports_abc>=0.4:../../devel/py-backports_abc
DEPENDS+= ${PYPKGPREFIX}-backports.ssl_match_hostname-[0-9]*:../../security/py-backports.ssl_match_hostname
DEPENDS+= ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
DEPENDS+= ${PYPKGPREFIX}-singledispatch>0:../../devel/py-singledispatch
-.endif
-.if "${PYPKGPREFIX}" == "py27" || "${PYPKGPREFIX}" == "py34"
-DEPENDS+= ${PYPKGPREFIX}-backports_abc>=0.4:../../devel/py-backports_abc
PLIST.requires= yes
.endif