Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 May 2019 10:00:20 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r503133 - in head: Mk/Uses databases/mongodb36 databases/mongodb40 devel/py-astroid devel/py-curtsies devel/py-fs2 devel/py-importlib-resources devel/py-molecule devel/py-mypy devel/py-...
Message-ID:  <201905311000.x4VA0KYm015211@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Fri May 31 10:00:20 2019
New Revision: 503133
URL: https://svnweb.freebsd.org/changeset/ports/503133

Log:
  Introduce PY_TYPING and simplify Makefile
  
  Since devel/py-promise requires 3.6.4+, the minimal version is set to 3.6.4.
  
  With hat:	python

Modified:
  head/Mk/Uses/python.mk
  head/databases/mongodb36/Makefile
  head/databases/mongodb40/Makefile
  head/devel/py-astroid/Makefile
  head/devel/py-curtsies/Makefile
  head/devel/py-fs2/Makefile
  head/devel/py-importlib-resources/Makefile
  head/devel/py-molecule/Makefile
  head/devel/py-mypy/Makefile
  head/devel/py-mypy_extensions/Makefile
  head/devel/py-pipenv/Makefile
  head/devel/py-promise/Makefile
  head/devel/py-typing-extensions/Makefile
  head/graphics/py-geomdl/Makefile
  head/net-mgmt/py-msrest/Makefile
  head/print/py-fonttools/Makefile
  head/security/py-m2crypto/Makefile
  head/textproc/py-orange3-text/Makefile
  head/textproc/py-sphinx/Makefile
  head/textproc/scancode-toolkit/Makefile
  head/www/py-django-extensions/Makefile
  head/www/py-python-dotenv/Makefile

Modified: head/Mk/Uses/python.mk
==============================================================================
--- head/Mk/Uses/python.mk	Fri May 31 10:00:04 2019	(r503132)
+++ head/Mk/Uses/python.mk	Fri May 31 10:00:20 2019	(r503133)
@@ -659,6 +659,12 @@ PYGAME=		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@$
 PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
 
 # Common Python modules that can be needed but only for some versions of Python.
+.if ${PYTHON_REL} < 3500
+PY_TYPING=	${PYTHON_PKGNAMEPREFIX}typing>=3.6.4:devel/py-typing@${PY_FLAVOR}
+.else
+PY_TYPING=
+.endif
+
 .if ${PYTHON_REL} < 3400
 PY_ENUM34=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${PY_FLAVOR}
 PY_ENUM_COMPAT=	${PYTHON_PKGNAMEPREFIX}enum-compat>0:devel/py-enum-compat@${PY_FLAVOR}

Modified: head/databases/mongodb36/Makefile
==============================================================================
--- head/databases/mongodb36/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/databases/mongodb36/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=	amd64 aarch64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 and aarch64 (i386 deprecated in v3)"
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}typing>=3.6.2:devel/py-typing@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libpcre.so:devel/pcre \

Modified: head/databases/mongodb40/Makefile
==============================================================================
--- head/databases/mongodb40/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/databases/mongodb40/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 and aarch64 (i386 deprecated in v3)"
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}typing>=3.6.2:devel/py-typing@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
 		${LOCALBASE}/bin/ar:devel/binutils
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \

Modified: head/devel/py-astroid/Makefile
==============================================================================
--- head/devel/py-astroid/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-astroid/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -16,6 +16,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=0:devel/py-lazy-object-proxy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typed-ast>=1.3.0:devel/py-typed-ast@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>=0:devel/py-wrapt@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
@@ -24,13 +25,7 @@ USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
-.endif
-
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/py-curtsies/Makefile
==============================================================================
--- head/devel/py-curtsies/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-curtsies/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -15,16 +15,11 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blessings>=1.5:devel/py-blessings@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
 USES=		python
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/py-fs2/Makefile
==============================================================================
--- head/devel/py-fs2/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-fs2/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -16,6 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.3:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${PY_ENUM34}
 
 USES=		python
@@ -32,10 +33,6 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.os>=0.1
 
 .if ${PYTHON_REL} < 3500
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}scandir>=1.5:sysutils/py-scandir@${PY_FLAVOR}
-.endif
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=3.6:devel/py-typing@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/devel/py-importlib-resources/Makefile
==============================================================================
--- head/devel/py-importlib-resources/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-importlib-resources/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -14,6 +14,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_TYPING}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -22,10 +23,6 @@ USE_PYTHON=	distutils autoplist
 
 .if ${PYTHON_REL} < 3500
 RUN_DEPENDS+=   ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR}
-.endif
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=   ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/devel/py-molecule/Makefile
==============================================================================
--- head/devel/py-molecule/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-molecule/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -29,6 +29,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible-lint>=4.0.
 		${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.2:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}testinfra>=1.19.0:devel/py-testinfra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tree-format>=0.1.2:devel/py-tree-format@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}yamllint>=1.11.1:devel/py-yamllint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>=4.6.0:misc/py-pexpect@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.0.7:devel/py-pytest@${PY_FLAVOR} \
@@ -52,8 +53,7 @@ TEST_ENV=	LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}functools32>=0:devel/py-functools32@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}functools32>=0:devel/py-functools32@${PY_FLAVOR}
 .endif
 
 do-test:

Modified: head/devel/py-mypy/Makefile
==============================================================================
--- head/devel/py-mypy/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-mypy/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -16,7 +16,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}typed-ast>=1.3.1:devel/py-typed-ast@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.4.0:sysutils/py-psutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0:devel/py-mypy_extensions@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0:devel/py-mypy_extensions@${PY_FLAVOR} \
+		${PY_TYPING}
 
 USES=		python:3.4+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
@@ -24,13 +25,7 @@ USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 SHEBANG_FILES=	mypy/typeshed/tests/*.py
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VER} < 3.5
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing@${PY_FLAVOR}
-.endif
-
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/py-mypy_extensions/Makefile
==============================================================================
--- head/devel/py-mypy_extensions/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-mypy_extensions/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -12,15 +12,11 @@ COMMENT=	Experimental type system extensions for progr
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+RUN_DEPENDS=	${PY_TYPING}
+
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VER} < 3.5
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/py-pipenv/Makefile
==============================================================================
--- head/devel/py-pipenv/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-pipenv/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}invoke>=0:devel/
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
 		${PY_ENUM34} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv-clone>=0.2.5:devel/py-virtualenv-clone@${PY_FLAVOR}
 
@@ -27,10 +28,4 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/py-promise/Makefile
==============================================================================
--- head/devel/py-promise/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-promise/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -13,17 +13,12 @@ COMMENT=	Promises/A+ implementation for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+		${PY_TYPING}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=3.6.4:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/py-typing-extensions/Makefile
==============================================================================
--- head/devel/py-typing-extensions/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/devel/py-typing-extensions/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -14,15 +14,11 @@ COMMENT=	Backported and Experimental Type Hints for Py
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+RUN_DEPENDS=	${PY_TYPING}
+
 USES=		python:-3.6
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=3.6.2:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/py-geomdl/Makefile
==============================================================================
--- head/graphics/py-geomdl/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/graphics/py-geomdl/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -15,9 +15,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.15.4:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.3:math/py-matplotlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR}
-py27_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=1.5:devel/py-backports.functools_lru_cache@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} \
+		${PY_TYPING}
+py27_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=1.5:devel/py-backports.functools_lru_cache@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python

Modified: head/net-mgmt/py-msrest/Makefile
==============================================================================
--- head/net-mgmt/py-msrest/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/net-mgmt/py-msrest/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -16,17 +16,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17
 		${PY_ENUM34} \
 		${PYTHON_PKGNAMEPREFIX}isodate>=0.6.0:devel/py-isodate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.16:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.5.0:www/py-requests-oauthlib@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.5.0:www/py-requests-oauthlib@${PY_FLAVOR} \
+		${PY_TYPING}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/print/py-fonttools/Makefile
==============================================================================
--- head/print/py-fonttools/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/print/py-fonttools/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -31,7 +31,8 @@ WOFF_DESC=	Compress/uncompress WOFF webfonts
 
 GRAPHITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lz4>=1.7.4.2:archivers/py-lz4@${PY_FLAVOR}
 INTERPOLATABLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR}
-LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.0<5:devel/py-lxml@${PY_FLAVOR}
+LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.0<5:devel/py-lxml@${PY_FLAVOR} \
+			${PY_TYPING}
 PLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}
 SYMFONT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=0:math/py-sympy@${PY_FLAVOR}
 UFO_RUN_DEPENDS=	${PY_ENUM34} \
@@ -44,9 +45,6 @@ WOFF_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}brotli>=1.0.1
 .if ${PORT_OPTIONS:MLXML}
 .if ${PYTHON_REL} < 3400
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}singledispatch>=3.4.0.3:devel/py-singledispatch@${PY_FLAVOR}
-.endif
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
 .endif
 .endif
 

Modified: head/security/py-m2crypto/Makefile
==============================================================================
--- head/security/py-m2crypto/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/security/py-m2crypto/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -15,6 +15,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 BUILD_DEPENDS=	swig3.0:devel/swig30
+RUN_DEPENDS=	${PY_TYPING}
 
 USES=		python ssl
 USE_PYTHON=	autoplist concurrent distutils
@@ -27,10 +28,4 @@ post-patch:
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/M2Crypto/_m2crypto.so
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/py-orange3-text/Makefile
==============================================================================
--- head/textproc/py-orange3-text/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/textproc/py-orange3-text/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -27,10 +27,10 @@ RUN_DEPENDS=	orange3>0:misc/orange3 \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simhash>0:math/py-simhash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tweepy>0:net/py-tweepy@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}ufal.udpipe>0:textproc/py-ufal.udpipe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}validate_email>0:mail/py-validate_email@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wikipedia>0:www/py-wikipedia@${PY_FLAVOR}
-py34_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}typing>0:devel/py-typing@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_GITHUB=	yes

Modified: head/textproc/py-sphinx/Makefile
==============================================================================
--- head/textproc/py-sphinx/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/textproc/py-sphinx/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -34,6 +34,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/p
 		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18.1:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
@@ -44,10 +45,4 @@ USES=		python
 USE_PYTHON=	autoplist distutils concurrent
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/textproc/scancode-toolkit/Makefile
==============================================================================
--- head/textproc/scancode-toolkit/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/textproc/scancode-toolkit/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -48,7 +48,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nltk>=3.2:textproc
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluggy>=0.4.0:devel/py-pluggy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}attrs>=17.4:devel/py-attrs@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}typing>=3.6:devel/py-typing@${PY_FLAVOR} \
+		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} \

Modified: head/www/py-django-extensions/Makefile
==============================================================================
--- head/www/py-django-extensions/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/www/py-django-extensions/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -14,7 +14,8 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${PY_FLAVOR} \
+		${PY_TYPING}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -23,10 +24,4 @@ NO_ARCH=	yes
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj21-django-extensions
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=   ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/py-python-dotenv/Makefile
==============================================================================
--- head/www/py-python-dotenv/Makefile	Fri May 31 10:00:04 2019	(r503132)
+++ head/www/py-python-dotenv/Makefile	Fri May 31 10:00:20 2019	(r503133)
@@ -13,17 +13,12 @@ COMMENT=	Add .env support to your django/flask apps
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} \
+		${PY_TYPING}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VER} < 3.5
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905311000.x4VA0KYm015211>