diff options
95 files changed, 286 insertions, 1008 deletions
diff --git a/archivers/py-lz4/Makefile b/archivers/py-lz4/Makefile index 06b8746c98a8..703ae12f7dcf 100644 --- a/archivers/py-lz4/Makefile +++ b/archivers/py-lz4/Makefile @@ -30,10 +30,4 @@ post-install: do-test: cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/py-speechrecognition/Makefile b/audio/py-speechrecognition/Makefile index b4c161f2da53..ea59ca39ea0b 100644 --- a/audio/py-speechrecognition/Makefile +++ b/audio/py-speechrecognition/Makefile @@ -25,10 +25,4 @@ USE_PYTHON= distutils autoplist post-extract: @cd ${WRKSRC}/speech_recognition && ${RM} flac-* -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile index 9d27de5ec02d..1873d61b18e6 100644 --- a/databases/py-gdbm/Makefile +++ b/databases/py-gdbm/Makefile @@ -27,13 +27,7 @@ DIST_SUBDIR= python DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${WRKDIR}/Python-${PORTVERSION}/Modules -.include <bsd.port.pre.mk> - post-extract: -.if ${PYTHON_REL} < 3000 - @${CP} ${FILESDIR}/setup.py ${WRKSRC} -.else @${CP} ${FILESDIR}/setup3.py ${WRKSRC}/setup.py -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/py-pickleshare/Makefile b/databases/py-pickleshare/Makefile index 41bfcb2d5a2b..86e428d2c248 100644 --- a/databases/py-pickleshare/Makefile +++ b/databases/py-pickleshare/Makefile @@ -17,10 +17,4 @@ USES= python:3.6+ USE_PYTHON= distutils autoplist NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/py-sqlalchemy10/Makefile b/databases/py-sqlalchemy10/Makefile index 59c7829ae0af..dc68da7a7d2f 100644 --- a/databases/py-sqlalchemy10/Makefile +++ b/databases/py-sqlalchemy10/Makefile @@ -40,14 +40,10 @@ SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_F PORTDOCS= * PORTEXAMPLES= * -.include <bsd.port.pre.mk> - pre-build: -.if ${PYTHON_REL} >= 3000 @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/lib @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples -.endif # C extensions are not supported with all versions of Python, so ignore # errors here if there are no .so files to strip. @@ -63,9 +59,7 @@ post-install-EXAMPLES-on: cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} do-test: -.if ${PYTHON_REL} >= 3000 ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/test -.endif @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile index 254216d2ed74..f5fe3b0d5e1a 100644 --- a/devel/py-apscheduler/Makefile +++ b/devel/py-apscheduler/Makefile @@ -17,23 +17,15 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@$ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2:devel/py-tzlocal@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado@${PY_FLAVOR} NO_ARCH= yes USES= python:3.6+ USE_PYTHON= autoplist distutils TEST_ENV= ${MAKE_ENV} TZ=UTC -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${PY_FLAVOR} -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -.else -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado@${PY_FLAVOR} -.endif - post-patch: @${REINPLACE_CMD} -e 's/ --cov//' ${WRKSRC}/${PYSETUP:R}.cfg @${REINPLACE_CMD} -e 's/set_level/setLevel/' \ @@ -45,4 +37,4 @@ post-patch: do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-azure-datalake-store/Makefile b/devel/py-azure-datalake-store/Makefile index 62ff20d3b17a..0b3e2e18a79f 100644 --- a/devel/py-azure-datalake-store/Makefile +++ b/devel/py-azure-datalake-store/Makefile @@ -20,10 +20,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-castellan1/Makefile b/devel/py-castellan1/Makefile index 9972e24474bb..47be3fe1736f 100644 --- a/devel/py-castellan1/Makefile +++ b/devel/py-castellan1/Makefile @@ -21,7 +21,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.5.2:net/py-python-barbicanclient@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=6.4.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ shebangfix USE_PYTHON= autoplist concurrent distutils @@ -33,22 +39,4 @@ PORTSCOUT= limit:^1\. SHEBANG_GLOB= *.sh -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=3.4.0:devel/py-keystoneauth13@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config7>=6.4.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context2>=2.19.2:devel/py-oslo.context2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=3.36.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=6.4.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-cliff2/Makefile b/devel/py-cliff2/Makefile index 9918ae9f5bb5..012e2ec4784e 100644 --- a/devel/py-cliff2/Makefile +++ b/devel/py-cliff2/Makefile @@ -21,7 +21,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.0:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cmd2>=0.8.0:devel/py-cmd2@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -31,16 +32,4 @@ NO_ARCH= yes # cliff 3.0.0+ requires Python 3.6+ PORTSCOUT= limit:^2\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.8.0:devel/py-unicodecsv@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cmd208>=0.8.0:devel/py-cmd208@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cmd2>=0.8.0:devel/py-cmd2@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-cmd208/Makefile b/devel/py-cmd208/Makefile index 5ccd1ed3147d..80d5778dc18e 100644 --- a/devel/py-cmd208/Makefile +++ b/devel/py-cmd208/Makefile @@ -26,14 +26,4 @@ NO_ARCH= yes # cmd2 0.9.0.1+ requires Python 3.4+ PORTSCOUT= limit:^0\.8 -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}subprocess32>=0:devel/py-subprocess32@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-csv23/Makefile b/devel/py-csv23/Makefile index aa1353aacb41..c42de6a98476 100644 --- a/devel/py-csv23/Makefile +++ b/devel/py-csv23/Makefile @@ -18,10 +18,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-cursive/Makefile b/devel/py-cursive/Makefile index fefabbfe97d3..b6b87717929b 100644 --- a/devel/py-cursive/Makefile +++ b/devel/py-cursive/Makefile @@ -16,27 +16,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}castellan1>=0.4.0:devel/py-castellan1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=2.1.0:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=1.14.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=1.10.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.16.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-entrypoints/Makefile b/devel/py-entrypoints/Makefile index 425ee296f823..a85db5b322f1 100644 --- a/devel/py-entrypoints/Makefile +++ b/devel/py-entrypoints/Makefile @@ -18,13 +18,7 @@ USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>=3.5:devel/py-configparser@${PY_FLAVOR} -.endif - do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYTHON_VER}) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-fasteners/Makefile b/devel/py-fasteners/Makefile index 302526dda119..6ec377d25fd2 100644 --- a/devel/py-fasteners/Makefile +++ b/devel/py-fasteners/Makefile @@ -20,10 +20,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=0.1:devel/py-monotonic@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-filedepot/Makefile b/devel/py-filedepot/Makefile index 5b84115810fc..d374191a05aa 100644 --- a/devel/py-filedepot/Makefile +++ b/devel/py-filedepot/Makefile @@ -12,15 +12,11 @@ COMMENT= Toolkit for storing files and attachments in web applications LICENSE= MIT +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}anyascii>=0:textproc/py-anyascii@${PY_FLAVOR} + USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} >= 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}anyascii>=0:textproc/py-anyascii@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-fs2/Makefile b/devel/py-fs2/Makefile index 6df9a783c58e..38a8f111158c 100644 --- a/devel/py-fs2/Makefile +++ b/devel/py-fs2/Makefile @@ -23,14 +23,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes PORTSCOUT= limit:^2\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.os>=0.1:devel/py-backports.os@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}scandir>=1.5:sysutils/py-scandir@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-futurist1/Makefile b/devel/py-futurist1/Makefile index 101d7c162fb2..ca2d2e50ca6f 100644 --- a/devel/py-futurist1/Makefile +++ b/devel/py-futurist1/Makefile @@ -27,11 +27,4 @@ NO_ARCH= yes # futurist 2.0.0+ requires Python 3.6+ PORTSCOUT= limit:^1\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-gevent/Makefile b/devel/py-gevent/Makefile index f057db9da6d0..62a2a6c48618 100644 --- a/devel/py-gevent/Makefile +++ b/devel/py-gevent/Makefile @@ -30,12 +30,8 @@ USE_PYTHON= autoplist concurrent distutils MAKE_ENV= GEVENTSETUP_EMBED_CARES=0 GEVENTSETUP_EMBED_LIBEV=0 GEVENTSETUP_EMBED_LIBUV=0 -.include <bsd.port.pre.mk> - post-patch: -.if ${PYTHON_REL} >= 3000 @${RM} ${WRKSRC}/src/gevent/_util_py2.py -.endif # Clean up bundled libraries @${RM} -fr ${WRKSRC}/deps/ @@ -45,4 +41,4 @@ post-install: do-test: cd ${WRKSRC} && ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${PYTHON_CMD} -m gevent.tests --config known_failures.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-jaraco.context2/Makefile b/devel/py-jaraco.context2/Makefile index 59f6e64f7b2f..fcb8e26f18df 100644 --- a/devel/py-jaraco.context2/Makefile +++ b/devel/py-jaraco.context2/Makefile @@ -27,12 +27,6 @@ POST_PLIST= trim-jaraco-namespace # jaraco.context 3.0.0+ requires Python 3.6+ PORTSCOUT= limit:^2\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLAVOR} -.endif - post-patch: @${REINPLACE_CMD} -e '/jaraco.apt/d; /yg.lockfile/d' ${WRKSRC}/setup.cfg @@ -44,4 +38,4 @@ post-install: trim-jaraco-namespace: @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-jaraco.timing/Makefile b/devel/py-jaraco.timing/Makefile index 886b3d8f9817..132be6cbe9df 100644 --- a/devel/py-jaraco.timing/Makefile +++ b/devel/py-jaraco.timing/Makefile @@ -14,7 +14,8 @@ COMMENT= Routines pertinent to the fourth dimension LICENSE= MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tempora>=1.5:devel/py-tempora@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} @@ -25,14 +26,6 @@ NO_ARCH= yes POST_PLIST= trim-jaraco-namespace -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tempora1>=1.5:devel/py-tempora1@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tempora>=1.5:devel/py-tempora@${PY_FLAVOR} -.endif - post-install: @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* -@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.* @@ -44,4 +37,4 @@ trim-jaraco-namespace: do-test: cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-jaraco.util13/Makefile b/devel/py-jaraco.util13/Makefile index 804d266830ba..538a39ffedc9 100644 --- a/devel/py-jaraco.util13/Makefile +++ b/devel/py-jaraco.util13/Makefile @@ -16,7 +16,8 @@ LICENSE= MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}contextlib2>=0:devel/py-contextlib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jaraco.context>=0:devel/py-jaraco.context@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -28,14 +29,6 @@ PORTSCOUT= limit:^13\. POST_PLIST= trim-jaraco-namespace -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.context2>=0:devel/py-jaraco.context2@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.context>=0:devel/py-jaraco.context@${PY_FLAVOR} -.endif - post-install: @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* -@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__pycache__/__init__.* @@ -44,4 +37,4 @@ post-install: trim-jaraco-namespace: @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-keystonemiddleware8/Makefile b/devel/py-keystonemiddleware8/Makefile index 9dcd6d6d7bac..fae65d1c366e 100644 --- a/devel/py-keystonemiddleware8/Makefile +++ b/devel/py-keystonemiddleware8/Makefile @@ -19,31 +19,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR} - -USES= python:3.6+ -USE_PYTHON= autoplist concurrent distutils - -NO_ARCH= yes - -# keystonemiddleware 9.0.0+ requires Python 3.6+ -PORTSCOUT= limit:^8\. - -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=3.12.0:devel/py-keystoneauth13@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.cache1>=1.26.0:devel/py-oslo.cache1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context2>=2.19.2:devel/py-oslo.context2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=3.36.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pycadf2>=1.1.0:devel/py-pycadf2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient3>=3.20.0:net/py-python-keystoneclient3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.12.0:devel/py-keystoneauth1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.12.0:devel/py-keystoneauth1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.26.0:devel/py-oslo.cache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ @@ -53,6 +30,13 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.12.0:devel/py-keystoneauth ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycadf>=1.1.0:devel/py-pycadf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.20.0:net/py-python-keystoneclient@${PY_FLAVOR} -.endif -.include <bsd.port.post.mk> +USES= python:3.6+ +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +# keystonemiddleware 9.0.0+ requires Python 3.6+ +PORTSCOUT= limit:^8\. + +.include <bsd.port.mk> diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile index 48682105ce65..0652ea1cb95e 100644 --- a/devel/py-msgpack/Makefile +++ b/devel/py-msgpack/Makefile @@ -16,13 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= python:3.6+ USE_PYTHON= autoplist concurrent cython distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} >= 3000 post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/msgpack/_cmsgpack*.so -.else -NO_ARCH= yes -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile index 98efc7105c8b..e0cbfbcb6439 100644 --- a/devel/py-nose/Makefile +++ b/devel/py-nose/Makefile @@ -17,13 +17,9 @@ LICENSE_FILE= ${WRKSRC}/lgpl.txt USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils -.include <bsd.port.pre.mk> - do-test: # Extra tests for python 3, added in by setup3lib.py -.if ${PYTHON_REL} >= 3000 @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} build_tests -.endif @cd ${WRKSRC} && ${PYTHON_CMD} selftest.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-nose2/Makefile b/devel/py-nose2/Makefile index 43dd0be91620..747af188bb9b 100644 --- a/devel/py-nose2/Makefile +++ b/devel/py-nose2/Makefile @@ -20,15 +20,9 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} -.endif - TEST_ENV= PYTHONPATH=${WRKSRC} do-test: @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m nose2.__main__ -v --pretty-assert -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-openstacksdk043/Makefile b/devel/py-openstacksdk043/Makefile index 2701ddae9c7c..e527157a9dcb 100644 --- a/devel/py-openstacksdk043/Makefile +++ b/devel/py-openstacksdk043/Makefile @@ -28,7 +28,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requestsexceptions>=1.2.0:devel/py-requestsexceptions@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.18.0:devel/py-keystoneauth1@${PY_FLAVOR} USES= python:3.6+ shebangfix USE_PYTHON= autoplist concurrent distutils @@ -40,12 +41,4 @@ PORTSCOUT= limit:^0\.43\. SHEBANG_GLOB= *.sh -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=3.18.0:devel/py-keystoneauth13@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.18.0:devel/py-keystoneauth1@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-os-brick2/Makefile b/devel/py-os-brick2/Makefile index e9e600f0e48d..735c38ef52da 100644 --- a/devel/py-os-brick2/Makefile +++ b/devel/py-os-brick2/Makefile @@ -21,7 +21,14 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}retrying>=1.2.3:devel/py-retrying@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-win>=3.0.0:devel/py-os-win@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.32.0:devel/py-oslo.privsep@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -32,26 +39,6 @@ REINPLACE_ARGS= -i '' # os-brick 3.0.0+ requires Python 3.6+ PORTSCOUT= limit:^2\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}os-win4>=3.0.0:devel/py-os-win4@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency3>=3.26.0:devel/py-oslo.concurrency3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=3.36.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep1>=1.32.0:devel/py-oslo.privsep1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.service1>=1.24.0:devel/py-oslo.service1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}os-win>=3.0.0:devel/py-os-win@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.32.0:devel/py-oslo.privsep@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - post-patch: @${REINPLACE_CMD} -e '/etc\//d' ${WRKSRC}/setup.cfg @${GREP} -lr '/etc/' ${WRKSRC}/etc ${WRKSRC}/os_brick | ${XARGS} -J % ${REINPLACE_CMD} -e 's|/etc/|${PREFIX}&|g' % @@ -60,4 +47,4 @@ post-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/rootwrap.d ${INSTALL_DATA} ${WRKSRC}/etc/os-brick/rootwrap.d/os-brick.filters ${STAGEDIR}${ETCDIR}/rootwrap.d/os-brick.filters.sample -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-os-client-config1/Makefile b/devel/py-os-client-config1/Makefile index 4d62558d7dcd..8067a04a26aa 100644 --- a/devel/py-os-client-config1/Makefile +++ b/devel/py-os-client-config1/Makefile @@ -16,7 +16,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.13.0:devel/py-openstacksdk@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -26,12 +27,4 @@ NO_ARCH= yes # os-client-config 2.0.0+ requires Python 3.6+ PORTSCOUT= limit:^1\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openstacksdk043>=0.13.0:devel/py-openstacksdk043@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.13.0:devel/py-openstacksdk@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-os-win4/Makefile b/devel/py-os-win4/Makefile index d356c0d447d4..04ef3e3ebf41 100644 --- a/devel/py-os-win4/Makefile +++ b/devel/py-os-win4/Makefile @@ -17,7 +17,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -27,20 +32,4 @@ NO_ARCH= yes # os-win 5.0.0+ requires Python 3.6+ PORTSCOUT= limit:^4\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.concurrency3>=3.26.0:devel/py-oslo.concurrency3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=3.36.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-osc-lib1/Makefile b/devel/py-osc-lib1/Makefile index 94f207b59007..c84c46edd777 100644 --- a/devel/py-osc-lib1/Makefile +++ b/devel/py-osc-lib1/Makefile @@ -20,7 +20,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.7.0:devel/py-keystoneauth1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.15.0:devel/py-openstacksdk@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -30,20 +35,4 @@ NO_ARCH= yes # osc-lib 2.0.0+ requires Python 3.6+ PORTSCOUT= limit:^1\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cliff2>=2.8.0:devel/py-cliff2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=3.7.0:devel/py-keystoneauth13@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}openstacksdk043>=0.15.0:devel/py-openstacksdk043@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.7.0:devel/py-keystoneauth1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.15.0:devel/py-openstacksdk@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.cache1/Makefile b/devel/py-oslo.cache1/Makefile index 2231b34c5236..673070c59b6a 100644 --- a/devel/py-oslo.cache1/Makefile +++ b/devel/py-oslo.cache1/Makefile @@ -17,7 +17,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -27,18 +31,4 @@ NO_ARCH= yes # oslo.cache 2.0.0+ requires Python 3.6+ PORTSCOUT= limit:^1\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=3.36.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.concurrency3/Makefile b/devel/py-oslo.concurrency3/Makefile index aa6d5d43ad6e..8869879e3d38 100644 --- a/devel/py-oslo.concurrency3/Makefile +++ b/devel/py-oslo.concurrency3/Makefile @@ -17,7 +17,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7.0:devel/py-fasteners@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -27,16 +30,4 @@ NO_ARCH= yes # oslo.concurrency 4.0.0+ requires Python 3.6+ PORTSCOUT= limit:^3\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.config7/Makefile b/devel/py-oslo.config7/Makefile index 8ab8a7af2e12..82b3b6e5d112 100644 --- a/devel/py-oslo.config7/Makefile +++ b/devel/py-oslo.config7/Makefile @@ -21,7 +21,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@ ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rfc3986>=1.2.0:www/py-rfc3986@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -31,15 +32,7 @@ NO_ARCH= yes # oslo.config 8.0.0+ requires Python 3.6+ PORTSCOUT= limit:^7\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} -.endif - post-patch: @${GREP} -lr /etc ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.db6/Makefile b/devel/py-oslo.db6/Makefile index 5e7b0aa3f000..13377b859036 100644 --- a/devel/py-oslo.db6/Makefile +++ b/devel/py-oslo.db6/Makefile @@ -23,9 +23,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}alembic>=0.9.6:databases/py-alembic@${PY_FLA ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.0.10:databases/py-sqlalchemy12@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}testresources>=0:devel/py-testresources@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}testscenarios>=0:devel/py-testscenarios@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}testscenarios>=0:devel/py-testscenarios@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes @@ -33,16 +36,4 @@ NO_ARCH= yes # oslo.db 7.0.0+ requires Python 3.6+ PORTSCOUT= limit:^6\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.log3/Makefile b/devel/py-oslo.log3/Makefile index ac34ec4cf70d..f21334f1c50b 100644 --- a/devel/py-oslo.log3/Makefile +++ b/devel/py-oslo.log3/Makefile @@ -19,7 +19,12 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.19.0:devel/py-debtcollector@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinotify>=0.9.6:devel/py-pyinotify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.0:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.20.0:devel/py-oslo.context@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.20.0:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.25.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.36.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -29,24 +34,4 @@ NO_ARCH= yes # oslo.log 4.0.0+ requires Python 3.6+ PORTSCOUT= limit:^3\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=1.4:devel/py-monotonic@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context2>=2.20.0:devel/py-oslo.context2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.20.0:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.25.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.36.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.20.0:devel/py-oslo.context@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.20.0:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.25.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.36.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.middleware3/Makefile b/devel/py-oslo.middleware3/Makefile index 1d0484cd7132..901cd3965a62 100644 --- a/devel/py-oslo.middleware3/Makefile +++ b/devel/py-oslo.middleware3/Makefile @@ -21,7 +21,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}statsd>=3.2.1:devel/py-statsd@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.8.0:www/py-webob@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}webob>=1.8.0:www/py-webob@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -31,18 +35,4 @@ NO_ARCH= yes # oslo.middleware 4.0.0+ requires Python 3.6+ PORTSCOUT= limit:^3\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context2>=2.19.2:devel/py-oslo.context2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.policy2/Makefile b/devel/py-oslo.policy2/Makefile index 4b3f4c667620..fdf3585cb54a 100644 --- a/devel/py-oslo.policy2/Makefile +++ b/devel/py-oslo.policy2/Makefile @@ -19,7 +19,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.22.0:devel/py-oslo.context@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -29,18 +33,4 @@ NO_ARCH= yes # oslo.policy 3.0.0+ requires Python 3.6+ PORTSCOUT= limit:^2\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context2>=2.22.0:devel/py-oslo.context2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.22.0:devel/py-oslo.context@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.privsep1/Makefile b/devel/py-oslo.privsep1/Makefile index 50befb71b406..096c2c6f30bc 100644 --- a/devel/py-oslo.privsep1/Makefile +++ b/devel/py-oslo.privsep1/Makefile @@ -19,7 +19,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.0:devel/py-msgpack@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.0:devel/py-msgpack@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -29,18 +33,4 @@ NO_ARCH= yes # oslo.privsep 2.0.0+ requires Python 3.6+ PORTSCOUT= limit:^1\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=3.36.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.reports1/Makefile b/devel/py-oslo.reports1/Makefile index 3d8af6ab3df5..ed4a8f450ebc 100644 --- a/devel/py-oslo.reports1/Makefile +++ b/devel/py-oslo.reports1/Makefile @@ -18,7 +18,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=3.2.2:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -28,16 +31,4 @@ NO_ARCH= yes # oslo.reports 2.0.0+ requires Python 3.6+ PORTSCOUT= limit:^1\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.serialization2/Makefile b/devel/py-oslo.serialization2/Makefile index 7cbd036e2751..3458ee2a20b0 100644 --- a/devel/py-oslo.serialization2/Makefile +++ b/devel/py-oslo.serialization2/Makefile @@ -19,7 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6,1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -29,12 +30,4 @@ NO_ARCH= yes # oslo.serialization 3.0.0+ requires Python 3.6+ PORTSCOUT= limit:^2\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.service1/Makefile b/devel/py-oslo.service1/Makefile index d52bf5fd69f4..3c9c2d7d29f0 100644 --- a/devel/py-oslo.service1/Makefile +++ b/devel/py-oslo.service1/Makefile @@ -25,7 +25,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@ ${PYTHON_PKGNAMEPREFIX}routes>=2.3.1:www/py-routes@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yappi>=1.0:devel/py-yappi@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}yappi>=1.0:devel/py-yappi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.40.2:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -35,24 +40,4 @@ NO_ARCH= yes # oslo.service 2.0.0+ requires Python 3.6+ PORTSCOUT= limit:^1\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.concurrency3>=3.25.0:devel/py-oslo.concurrency3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.1.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log3>=3.36.0:devel/py-oslo.log3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.40.2:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.40.2:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.utils3/Makefile b/devel/py-oslo.utils3/Makefile index 0db9aeec8c30..508c4d6a9867 100644 --- a/devel/py-oslo.utils3/Makefile +++ b/devel/py-oslo.utils3/Makefile @@ -20,7 +20,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.0:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6,1:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -30,17 +31,4 @@ NO_ARCH= yes # oslo.utils 4.0.0+ requires Python 3.6+ PORTSCOUT= limit:^3\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.0:devel/py-funcsigs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-oslo.vmware2/Makefile b/devel/py-oslo.vmware2/Makefile index 2b302035f769..60c566d3cacc 100644 --- a/devel/py-oslo.vmware2/Makefile +++ b/devel/py-oslo.vmware2/Makefile @@ -24,7 +24,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.6:net/py-suds-jurko@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}urllib3>=.1.21.1:net/py-urllib3@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}urllib3>=.1.21.1:net/py-urllib3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -34,18 +38,4 @@ NO_ARCH= yes # oslo.vmware 3.0.0+ requires Python 3.6+ PORTSCOUT= limit:^2\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.concurrency3>=3.26.0:devel/py-oslo.concurrency3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context2>=2.19.2:devel/py-oslo.context2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-pycadf/Makefile b/devel/py-pycadf/Makefile index cbd831336a2a..5608b31d488b 100644 --- a/devel/py-pycadf/Makefile +++ b/devel/py-pycadf/Makefile @@ -18,7 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6,1:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -34,12 +35,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/etc/pycadf/${service}_api_audit_map.conf ${STAGEDIR}${ETCDIR}/${service}_api_audit_map.conf.sample .endfor -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-pycadf2/Makefile b/devel/py-pycadf2/Makefile index 02d6712507dd..ddf0581af2ff 100644 --- a/devel/py-pycadf2/Makefile +++ b/devel/py-pycadf2/Makefile @@ -19,7 +19,9 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6,1:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -29,16 +31,6 @@ NO_ARCH= yes # pycadf 3.0.0+ requires Python 3.6+ PORTSCOUT= limit:^2\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} -.endif - post-patch: @${REINPLACE_CMD} -e 's|^data_files|no_&|' ${WRKSRC}/setup.cfg @@ -48,4 +40,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/etc/pycadf/${service}_api_audit_map.conf ${STAGEDIR}${ETCDIR}/${service}_api_audit_map.conf.sample .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-pytest-black-multipy/Makefile b/devel/py-pytest-black-multipy/Makefile index 949a666473e9..a6d39a8abfda 100644 --- a/devel/py-pytest-black-multipy/Makefile +++ b/devel/py-pytest-black-multipy/Makefile @@ -14,6 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-black>=0:devel/py-pytest-black@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} @@ -22,13 +23,7 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} >= 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest-black>=0:devel/py-pytest-black@${PY_FLAVOR} -.endif - do-test: cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-ratelimiter/Makefile b/devel/py-ratelimiter/Makefile index 27ae050a8b5a..cb89511f3427 100644 --- a/devel/py-ratelimiter/Makefile +++ b/devel/py-ratelimiter/Makefile @@ -15,7 +15,8 @@ COMMENT= Simple python rate limiting object LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0:devel/py-pytest@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -23,10 +24,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes USE_LOCALE= en_US.UTF-8 -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} >= 3500 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-raven/Makefile b/devel/py-raven/Makefile index 4163dc5f1993..10cd4cebcc86 100644 --- a/devel/py-raven/Makefile +++ b/devel/py-raven/Makefile @@ -21,10 +21,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-represent/Makefile b/devel/py-represent/Makefile index 8de90b6a85df..d28bec53399d 100644 --- a/devel/py-represent/Makefile +++ b/devel/py-represent/Makefile @@ -24,10 +24,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-responses/Makefile b/devel/py-responses/Makefile index 3b883e13513d..4b727e126c0f 100644 --- a/devel/py-responses/Makefile +++ b/devel/py-responses/Makefile @@ -27,11 +27,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cookies>=0:www/py-cookies@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-tempora1/Makefile b/devel/py-tempora1/Makefile index fc2bd5aede87..93c2f2f9a03d 100644 --- a/devel/py-tempora1/Makefile +++ b/devel/py-tempora1/Makefile @@ -16,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0,1:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jaraco.functools>=1.20:devel/py-jaraco.functools@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ @@ -27,12 +28,4 @@ NO_ARCH= yes # tempora 2.0.0+ requires Python 3.6+ PORTSCOUT= limit:^1\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.functools2>=1.20:devel/py-jaraco.functools2@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.functools>=1.20:devel/py-jaraco.functools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-tooz1/Makefile b/devel/py-tooz1/Makefile index f8d5e0e8d78d..666ec19209cf 100644 --- a/devel/py-tooz1/Makefile +++ b/devel/py-tooz1/Makefile @@ -22,7 +22,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -32,16 +35,4 @@ NO_ARCH= yes # tooz 2.0.0+ requires Python 3.6+ PORTSCOUT= limit:^1\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futurist1>=1.2.0:devel/py-futurist1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=1.10.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.15.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-trollius/Makefile b/devel/py-trollius/Makefile index 065a7070bdf3..a3fd735b1cdd 100644 --- a/devel/py-trollius/Makefile +++ b/devel/py-trollius/Makefile @@ -17,14 +17,8 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -.endif - do-test: @cd ${WRKSRC} && \ ${PYTHON_CMD} runtests.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-txaio/Makefile b/devel/py-txaio/Makefile index 6fa49913cb3a..d58445f931a7 100644 --- a/devel/py-txaio/Makefile +++ b/devel/py-txaio/Makefile @@ -26,13 +26,7 @@ PATCHFILES= 9217f054b7eccc120f84e01995479125e07de59a.patch:-p1 NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}trollius>=2.0:devel/py-trollius@${PY_FLAVOR} -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-yg.lockfile/Makefile b/devel/py-yg.lockfile/Makefile index 78e39b3d3d73..d9498ac2c818 100644 --- a/devel/py-yg.lockfile/Makefile +++ b/devel/py-yg.lockfile/Makefile @@ -14,21 +14,13 @@ LICENSE= MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zclockfile>=0:devel/py-zclockfile@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.5:devel/py-contextlib2@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.5:devel/py-contextlib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jaraco.functools>=1.16:devel/py-jaraco.functools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tempora>=0:devel/py-tempora@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.functools2>=1.16:devel/py-jaraco.functools2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tempora1>=0:devel/py-tempora1@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.functools>=1.16:devel/py-jaraco.functools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tempora>=0:devel/py-tempora@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/irc/py-irc/Makefile b/irc/py-irc/Makefile index 9c24c7fd1864..0fbfea24c00e 100644 --- a/irc/py-irc/Makefile +++ b/irc/py-irc/Makefile @@ -17,7 +17,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jaraco.util>0:devel/py-jaraco.util@${PY_FLAVOR} USES= python:3.6+ shebangfix USE_PYTHON= distutils autoplist @@ -37,12 +38,4 @@ post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${PORTEXAMPLES:S,^,${WRKSRC}/scripts/,} ${STAGEDIR}${EXAMPLESDIR}/ -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.util13>0:devel/py-jaraco.util13@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.util>0:devel/py-jaraco.util@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/python-tools/Makefile b/lang/python-tools/Makefile index 6b82c665390c..1d72170e95b4 100644 --- a/lang/python-tools/Makefile +++ b/lang/python-tools/Makefile @@ -31,12 +31,6 @@ PLIST_FILES= ${SCRIPT_FILES:C|^|bin/|} ${PYLIB_FILES:C|^|bin/|} SHEBANG_FILES= ${SCRIPT_FILES:C|$|.py|} \ ${PYLIB_FILES:C|.*|../../Lib/&.py|} -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3200 -SCRIPT_FILES+= logmerge -.endif - do-install: .for fname in ${SCRIPT_FILES} ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${fname}.py \ @@ -47,4 +41,4 @@ do-install: ${STAGEDIR}${PREFIX}/bin/${fname} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/py-MutatorMath/Makefile b/math/py-MutatorMath/Makefile index 548a4fa4249a..add89938bf43 100644 --- a/math/py-MutatorMath/Makefile +++ b/math/py-MutatorMath/Makefile @@ -14,19 +14,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.3.5:x11-fonts/py-defcon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fontMath>=0.4.8:x11-fonts/py-fontMath@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}fontMath>=0.4.8:x11-fonts/py-fontMath@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/py-periscope/Makefile b/multimedia/py-periscope/Makefile index 29b7299971e1..49d4a697ef09 100644 --- a/multimedia/py-periscope/Makefile +++ b/multimedia/py-periscope/Makefile @@ -31,7 +31,6 @@ NO_WRKSUBDIR= yes PLIST_FILES= share/applications/periscope.desktop NO_ARCH= yes -.include <bsd.port.pre.mk> post-patch: ${REINPLACE_CMD} -e 's|from BeautifulSoup import|from bs4 import|' \ ${WRKSRC}/periscope/plugins/Podnapisi.py \ @@ -43,13 +42,11 @@ post-patch: ${WRKSRC}/periscope/plugins/TvSubtitles.py pre-build: -.if ${PYTHON_REL} >= 3000 @${LOCALBASE}/bin/2to3-${PYTHON_VER} --no-diffs --nobackups --verbose --write \ ${WRKSRC}/ -.endif post-install: ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/periscope.desktop \ ${STAGEDIR}${DESKTOPDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/py-python-telegram-bot/Makefile b/net-im/py-python-telegram-bot/Makefile index 0afea2dc52d1..b52366c62b2e 100644 --- a/net-im/py-python-telegram-bot/Makefile +++ b/net-im/py-python-telegram-bot/Makefile @@ -22,11 +22,4 @@ USES= python:3.6+ USE_PYTHON= autoplist distutils PYDISTUTILS_BUILDARGS= --with-upstream-urllib3 -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3400 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/py-arouteserver/Makefile b/net-mgmt/py-arouteserver/Makefile index 42755b93da75..897b847e5aa8 100644 --- a/net-mgmt/py-arouteserver/Makefile +++ b/net-mgmt/py-arouteserver/Makefile @@ -29,12 +29,6 @@ USE_PYTHON= autoplist concurrent distutils SHEBANG_FILES= pierky/arouteserver/config.d/rtt_getter.sh NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>=2.1.11:devel/py-ipaddr@${PY_FLAVOR} -.endif - post-patch: ${REINPLACE_CMD} -e 's|#bgpq3_path: "bgpq3"|bgpq3_path: "bgpq4"|' \ ${WRKSRC}/pierky/arouteserver/config.d/arouteserver.yml @@ -42,4 +36,4 @@ post-patch: do-test: @(cd ${WRKSRC} && ${SETENV} nosetests -vs --tests=tests/external_resources/) -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/py-snmp_passpersist/Makefile b/net-mgmt/py-snmp_passpersist/Makefile index 21787fb3d226..decf21b856e6 100644 --- a/net-mgmt/py-snmp_passpersist/Makefile +++ b/net-mgmt/py-snmp_passpersist/Makefile @@ -21,10 +21,4 @@ GH_TAGNAME= fb0af0d USE_PYTHON= autoplist distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-portend/Makefile b/net/py-portend/Makefile index a4165c8eb048..686f9339eb9d 100644 --- a/net/py-portend/Makefile +++ b/net/py-portend/Makefile @@ -14,6 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tempora>=1.8:devel/py-tempora@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.5:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ @@ -25,12 +26,4 @@ NO_ARCH= yes do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v -o addopts='' -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tempora1>=1.8:devel/py-tempora1@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tempora>=1.8:devel/py-tempora@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-python-barbicanclient/Makefile b/net/py-python-barbicanclient/Makefile index 7b855e5da037..6d15f7846bb9 100644 --- a/net/py-python-barbicanclient/Makefile +++ b/net/py-python-barbicanclient/Makefile @@ -17,27 +17,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cliff2>=2.8.0:devel/py-cliff2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=3.4.0:devel/py-keystoneauth13@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-python-ceilometerclient/Makefile b/net/py-python-ceilometerclient/Makefile index bee067c6d467..fcd2f9951749 100644 --- a/net/py-python-ceilometerclient/Makefile +++ b/net/py-python-ceilometerclient/Makefile @@ -20,7 +20,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}prettytable0>=0.7<0.8:devel/py-prettytable0@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.8.1:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.10.0:devel/py-stevedore@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.10.0:devel/py-stevedore@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.17.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ shebangfix USE_PYTHON= autoplist concurrent distutils @@ -29,18 +33,4 @@ NO_ARCH= yes SHEBANG_GLOB= *.sh -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=2.1.0:devel/py-keystoneauth13@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=2.1.0:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=1.10.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.17.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.17.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-python-cinderclient5/Makefile b/net/py-python-cinderclient5/Makefile index 3567501783e2..cdc4cb071743 100644 --- a/net/py-python-cinderclient5/Makefile +++ b/net/py-python-cinderclient5/Makefile @@ -21,7 +21,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prettytable0>=0.7.1<0.8:devel/py-prettytable0@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ shebangfix USE_PYTHON= autoplist concurrent distutils @@ -33,16 +36,4 @@ PORTSCOUT= limit:^5\. SHEBANG_GLOB= *.sh -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=3.4.0:devel/py-keystoneauth13@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-python-keystoneclient3/Makefile b/net/py-python-keystoneclient3/Makefile index fc223c84e7ef..b3286dd15565 100644 --- a/net/py-python-keystoneclient3/Makefile +++ b/net/py-python-keystoneclient3/Makefile @@ -20,7 +20,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@ ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ shebangfix USE_PYTHON= autoplist concurrent distutils @@ -32,20 +37,4 @@ SHEBANG_GLOB= *.sh # python-keystoneclient 4.0.0+ requires Python 3.6+ PORTSCOUT= limit:^3\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=3.4.0:devel/py-keystoneauth13@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config7>=5.2.0:devel/py-oslo.config7@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-python-novaclient16/Makefile b/net/py-python-novaclient16/Makefile index e1f3139c8010..eb9624b8c2f9 100644 --- a/net/py-python-novaclient16/Makefile +++ b/net/py-python-novaclient16/Makefile @@ -21,7 +21,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prettytable0>=0.7.2<0.8:devel/py-prettytable0@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.5.0:devel/py-keystoneauth1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} USES= python:3.6+ shebangfix USE_PYTHON= autoplist concurrent distutils @@ -33,18 +37,4 @@ SHEBANG_GLOB= *.sh # python-novaclient 17.0.0+ requires Python 3.6+ PORTSCOUT= limit:^16\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth13>=3.5.0:devel/py-keystoneauth13@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n3>=3.15.3:devel/py-oslo.i18n3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization2>=2.18.0:devel/py-oslo.serialization2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils3>=3.33.0:devel/py-oslo.utils3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.5.0:devel/py-keystoneauth1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-s3transfer/Makefile b/net/py-s3transfer/Makefile index c3ee2c09f731..53e0147ae2a3 100644 --- a/net/py-s3transfer/Makefile +++ b/net/py-s3transfer/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.12.36:devel/py-botocore@${PY_FLA TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.3:devel/py-nose@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} -#Actually -2.7,3.3-3.5 USES= python:3.6+ USE_PYTHON= autoplist distutils diff --git a/net/py-zeep/Makefile b/net/py-zeep/Makefile index b07b16f42b4e..3dddce132ec9 100644 --- a/net/py-zeep/Makefile +++ b/net/py-zeep/Makefile @@ -27,17 +27,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.7.1:www/py-requests-toolbelt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado4>=4.0.2<5:www/py-tornado4@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}xmlsec>=0.6.1:security/py-xmlsec@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}xmlsec>=0.6.1:security/py-xmlsec@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}aiohttp>=2.3.5:www/py-aiohttp@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} > 3402 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}aiohttp>=2.3.5:www/py-aiohttp@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/ryu/Makefile b/net/ryu/Makefile index 0fd6cc7f5a7e..640317357bcb 100644 --- a/net/ryu/Makefile +++ b/net/ryu/Makefile @@ -23,7 +23,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>0:net/py-eventlet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3.0:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ovs>0:devel/py-ovs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tinyrpc>0:devel/py-tinyrpc@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=1.15.0:devel/py-oslo.config@${PY_FLAVOR} #RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>0:net/py-eventlet@${PY_FLAVOR} \ # ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \ @@ -36,18 +38,4 @@ USE_PYTHON= autoplist distutils USE_GITHUB= yes GH_ACCOUNT= osrg -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tinyrpc0>0:devel/py-tinyrpc0@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tinyrpc>0:devel/py-tinyrpc@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config7>=1.15.0:devel/py-oslo.config7@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oslo.config>=1.15.0:devel/py-oslo.config@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/py-mixbox/Makefile b/security/py-mixbox/Makefile index d1a41c740fb2..f83ba58a015b 100644 --- a/security/py-mixbox/Makefile +++ b/security/py-mixbox/Makefile @@ -20,10 +20,4 @@ NO_ARCH= yes USES= python:3.6+ USE_PYTHON= distutils autoplist -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}weakrefmethod>=1.0.3:devel/py-weakrefmethod@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile index 0f7e31df8e3e..54f11074d7b7 100644 --- a/security/py-oauthlib/Makefile +++ b/security/py-oauthlib/Makefile @@ -35,13 +35,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/py-xmlsec/Makefile b/security/py-xmlsec/Makefile index d6f7ac4b1666..229db20c0275 100644 --- a/security/py-xmlsec/Makefile +++ b/security/py-xmlsec/Makefile @@ -27,16 +27,10 @@ USE_PYTHON= autoplist distutils flavors INSTALL_TARGET= install-strip -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3400 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR} -.endif - post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/xmlsec*.so do-test: @cd ${WRKSRC} && ${LOCALBASE}/bin/pytest-${PYTHON_VER} tests -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fusefs-gitfs/Makefile b/sysutils/fusefs-gitfs/Makefile index f4894b9ca325..e29cf49d6a6e 100644 --- a/sysutils/fusefs-gitfs/Makefile +++ b/sysutils/fusefs-gitfs/Makefile @@ -35,15 +35,9 @@ post-patch: do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest) -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} -.else post-patch: patch-py3k-mock patch-py3k-mock: @${GREP} -Flr 'mock import' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -i .bak.mock -e 's/mock import/unittest.&/' -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/py-humanfriendly/Makefile b/textproc/py-humanfriendly/Makefile index 8789846f3041..bb645eb7f608 100644 --- a/textproc/py-humanfriendly/Makefile +++ b/textproc/py-humanfriendly/Makefile @@ -17,10 +17,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile index 704c07421d49..40cc279e7e75 100644 --- a/textproc/py-m2r/Makefile +++ b/textproc/py-m2r/Makefile @@ -18,19 +18,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ ${PY_SPHINX} -# Officially 2.7, 3.4, 3.5, and 3.6 +# Officially 3.6 USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -.endif - do-test: @cd ${TEST_WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-beaker/Makefile b/www/py-beaker/Makefile index e20ffb185c17..ae69c51738ab 100644 --- a/www/py-beaker/Makefile +++ b/www/py-beaker/Makefile @@ -18,10 +18,4 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} <= 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile index 1697313f1a1d..744f53039e3f 100644 --- a/www/py-cherrypy/Makefile +++ b/www/py-cherrypy/Makefile @@ -16,13 +16,15 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} -EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${PY_FLAVOR} +EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cheroot>=6.2.4:www/py-cheroot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}portend>=2.1.1:net/py-portend@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zclockfile>0:devel/py-zclockfile@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}zclockfile>0:devel/py-zclockfile@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} OPTIONS_DEFINE= EXAMPLES @@ -49,12 +51,4 @@ post-install: RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools5>0:devel/py-more-itertools5@${PY_FLAVOR} -EXAMPLES_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} -EXAMPLES_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} -.endif - .include <bsd.port.post.mk> diff --git a/www/py-django-allauth/Makefile b/www/py-django-allauth/Makefile index b902b50e038d..04099104b31b 100644 --- a/www/py-django-allauth/Makefile +++ b/www/py-django-allauth/Makefile @@ -14,19 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=0:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.0:www/py-requests-oauthlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.8:security/py-python3-openid@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:security/py-python-openid@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.8:security/py-python3-openid@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-gandi.cli/Makefile b/www/py-gandi.cli/Makefile index 6700f8883387..df7f29b326e2 100644 --- a/www/py-gandi.cli/Makefile +++ b/www/py-gandi.cli/Makefile @@ -19,19 +19,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -# Actually 2.6-3.6(+) USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-gunicorn/Makefile b/www/py-gunicorn/Makefile index a20316663f77..ae73ce691e28 100644 --- a/www/py-gunicorn/Makefile +++ b/www/py-gunicorn/Makefile @@ -18,17 +18,15 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} OPTIONS_DEFINE= PROCTITLE OPTIONS_DEFAULT= PROCTITLE OPTIONS_GROUP= WORKERS -OPTIONS_GROUP_WORKERS= EVENTLET GAIOHTTP GEVENT TORNADO +OPTIONS_GROUP_WORKERS= EVENTLET GAIOHTTP TORNADO EVENTLET_DESC= Eventlet async worker -GAIOHTTP_DESC= gaiohttp async worker (Requires Python 3.3+) -GEVENT_DESC= Gevent async worker (Requires Python < 3.x) +GAIOHTTP_DESC= gaiohttp async worker PROCTITLE_DESC= Custom process titles with setproctitle(3) TORNADO_DESC= Tornado async worker EVENTLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.7:net/py-eventlet@${PY_FLAVOR} GAIOHTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} -GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.12.2:devel/py-gevent@${PY_FLAVOR} PROCTITLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=2.2:www/py-tornado@${PY_FLAVOR} @@ -40,22 +38,7 @@ GH_ACCOUNT= benoitc NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3300 -.if ${PORT_OPTIONS:MGAIOHTTP} -BROKEN= GAIOHTTP requires Python 3.3+ but this port is building with Python ${PYTHON_VER}. \ - Disable the GAIOHTTP option or change the version of Python to build with, using DEFAULT_VERSIONS -.endif -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} > 3000 && ${PORT_OPTIONS:MGEVENT} -BROKEN= GEVENT requires Python < 3.x but this port is building with Python ${PYTHON_VER}. \ - Disable the GEVENT option of change the version of Python to build with, using DEFAULT_VERSIONS -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-pywikibot/Makefile b/www/py-pywikibot/Makefile index 76edc13de91b..f4d17fe3a998 100644 --- a/www/py-pywikibot/Makefile +++ b/www/py-pywikibot/Makefile @@ -41,10 +41,4 @@ PILLOW_RUN_DEPENDS= ${PY_PILLOW} MWOAUTH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR} HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-slimit/Makefile b/www/py-slimit/Makefile index 6ab53f686fe3..e075a012cfbc 100644 --- a/www/py-slimit/Makefile +++ b/www/py-slimit/Makefile @@ -12,6 +12,7 @@ COMMENT= JavaScript minifier written in Python LICENSE= MIT +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${PY_FLAVOR} @@ -20,15 +21,11 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes # Maintainer: Reminder to keep testing python 3.x compatibility. -.include <bsd.port.pre.mk> -.if ${PYTHON_REL} >= 3000 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} pre-build: @cd ${WRKSRC} && 2to3-${PYTHON_VER} -w src -.endif do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-websocket-client/Makefile b/www/py-websocket-client/Makefile index 607cb55298e5..a324396d49c0 100644 --- a/www/py-websocket-client/Makefile +++ b/www/py-websocket-client/Makefile @@ -25,13 +25,7 @@ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${PY_FLAVOR} -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/rtv/Makefile b/www/rtv/Makefile index d20c26e05c96..fdeda29e5bb0 100644 --- a/www/rtv/Makefile +++ b/www/rtv/Makefile @@ -25,10 +25,4 @@ GH_ACCOUNT= michael-lazar NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-booleanOperations/Makefile b/x11-fonts/py-booleanOperations/Makefile index 2b01b0f6563b..e17da9f24f51 100644 --- a/x11-fonts/py-booleanOperations/Makefile +++ b/x11-fonts/py-booleanOperations/Makefile @@ -14,19 +14,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.11:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyclipper>=1.0.5:math/py-pyclipper@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyclipper>=1.0.5:math/py-pyclipper@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-compreffor/Makefile b/x11-fonts/py-compreffor/Makefile index 6cfad668a53b..6851554053db 100644 --- a/x11-fonts/py-compreffor/Makefile +++ b/x11-fonts/py-compreffor/Makefile @@ -13,15 +13,9 @@ COMMENT= CFF subroutinizer for fontTools LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.1:print/py-fonttools@${PY_FLAVOR} + USES= compiler:c++11-lang python:3.6+ zip USE_PYTHON= autoplist concurrent distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.1:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.1:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-cu2qu/Makefile b/x11-fonts/py-cu2qu/Makefile index fe72b28b376a..c30a8c1c34ff 100644 --- a/x11-fonts/py-cu2qu/Makefile +++ b/x11-fonts/py-cu2qu/Makefile @@ -14,17 +14,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.6.0:x11-fonts/py-defcon@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.6.0:x11-fonts/py-defcon@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist concurrent distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-defcon/Makefile b/x11-fonts/py-defcon/Makefile index 810483143b9e..96b11f61c0ed 100644 --- a/x11-fonts/py-defcon/Makefile +++ b/x11-fonts/py-defcon/Makefile @@ -13,18 +13,12 @@ COMMENT= Set of flexible objects for representing UFO data LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License.txt +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.31.0:print/py-fonttools@${PY_FLAVOR} + USES= python:3.6+ zip USE_PYTHON= autoplist distutils USE_LOCALE= en_US.UTF-8 NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.31.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.31.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-fontMath/Makefile b/x11-fonts/py-fontMath/Makefile index 5cc448eee62b..613a3c5d17a8 100644 --- a/x11-fonts/py-fontMath/Makefile +++ b/x11-fonts/py-fontMath/Makefile @@ -13,17 +13,11 @@ COMMENT= Set of objects for performing math operations on font data LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License.txt +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} + USES= python:3.6+ zip USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-fontmake/Makefile b/x11-fonts/py-fontmake/Makefile index 5973271eeb81..664140cf4375 100644 --- a/x11-fonts/py-fontmake/Makefile +++ b/x11-fonts/py-fontmake/Makefile @@ -19,19 +19,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cu2qu>=1.6.5:x11-fonts/py-cu2qu@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.5.0:x11-fonts/py-ufo2ft@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MutatorMath>=2.1.2:math/py-MutatorMath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defcon>=0.6.0:x11-fonts/py-defcon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}booleanOperations>=0.8.1:x11-fonts/py-booleanOperations@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}booleanOperations>=0.8.1:x11-fonts/py-booleanOperations@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-glyphsLib/Makefile b/x11-fonts/py-glyphsLib/Makefile index 109baa5823be..65fda2dcba32 100644 --- a/x11-fonts/py-glyphsLib/Makefile +++ b/x11-fonts/py-glyphsLib/Makefile @@ -14,19 +14,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.3.0:x11-fonts/py-defcon@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.3.0:x11-fonts/py-defcon@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.24.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.24.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.24.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-ufo2ft/Makefile b/x11-fonts/py-ufo2ft/Makefile index 456bc7353be6..0270dbe9910d 100644 --- a/x11-fonts/py-ufo2ft/Makefile +++ b/x11-fonts/py-ufo2ft/Makefile @@ -17,19 +17,12 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@$ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.6.0:x11-fonts/py-defcon@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cu2qu>=1.6.4:x11-fonts/py-cu2qu@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}compreffor>=0.4.5:x11-fonts/py-compreffor@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}booleanOperations>=0.8.0:x11-fonts/py-booleanOperations@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}booleanOperations>=0.8.0:x11-fonts/py-booleanOperations@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile index 3f6e9943498a..e57e707a99b1 100644 --- a/x11-toolkits/py-Pmw/Makefile +++ b/x11-toolkits/py-Pmw/Makefile @@ -23,13 +23,7 @@ PLIST_SUB= PMWVERSION=${PMWVERSION} OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3000 -PMWVERSION= Pmw_1_3_3 -.else PMWVERSION= Pmw_2_0_1 -.endif post-install: @${MKDIR} ${STAGEDIR}${DATADIR} @@ -44,4 +38,4 @@ post-install-EXAMPLES-on: (cd ${WRKSRC}/Pmw/${PMWVERSION} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${EXAMPLESDIR}) (cd ${WRKSRC}/Pmw/${PMWVERSION} && ${COPYTREE_SHARE} demos ${STAGEDIR}${EXAMPLESDIR}) -.include <bsd.port.post.mk> +.include <bsd.port.mk> |