Date: Mon, 11 Jan 2021 19:36:17 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561252 - in head: archivers/py-lz4 audio/py-speechrecognition databases/py-gdbm databases/py-pickleshare databases/py-sqlalchemy10 devel/py-apscheduler devel/py-azure-datalake-store de... Message-ID: <202101111936.10BJaHMY033721@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Mon Jan 11 19:36:17 2021 New Revision: 561252 URL: https://svnweb.freebsd.org/changeset/ports/561252 Log: Remove logic for Python < 3.6 for ports using Python 3.6+ Modified: head/archivers/py-lz4/Makefile head/audio/py-speechrecognition/Makefile head/databases/py-gdbm/Makefile head/databases/py-pickleshare/Makefile head/databases/py-sqlalchemy10/Makefile head/devel/py-apscheduler/Makefile head/devel/py-azure-datalake-store/Makefile head/devel/py-castellan1/Makefile head/devel/py-cliff2/Makefile head/devel/py-cmd208/Makefile head/devel/py-csv23/Makefile head/devel/py-cursive/Makefile head/devel/py-entrypoints/Makefile head/devel/py-fasteners/Makefile head/devel/py-filedepot/Makefile head/devel/py-fs2/Makefile head/devel/py-futurist1/Makefile head/devel/py-gevent/Makefile head/devel/py-jaraco.context2/Makefile head/devel/py-jaraco.timing/Makefile head/devel/py-jaraco.util13/Makefile head/devel/py-keystonemiddleware8/Makefile head/devel/py-msgpack/Makefile head/devel/py-nose/Makefile head/devel/py-nose2/Makefile head/devel/py-openstacksdk043/Makefile head/devel/py-os-brick2/Makefile head/devel/py-os-client-config1/Makefile head/devel/py-os-win4/Makefile head/devel/py-osc-lib1/Makefile head/devel/py-oslo.cache1/Makefile head/devel/py-oslo.concurrency3/Makefile head/devel/py-oslo.config7/Makefile head/devel/py-oslo.db6/Makefile head/devel/py-oslo.log3/Makefile head/devel/py-oslo.middleware3/Makefile head/devel/py-oslo.policy2/Makefile head/devel/py-oslo.privsep1/Makefile head/devel/py-oslo.reports1/Makefile head/devel/py-oslo.serialization2/Makefile head/devel/py-oslo.service1/Makefile head/devel/py-oslo.utils3/Makefile head/devel/py-oslo.vmware2/Makefile head/devel/py-pycadf/Makefile head/devel/py-pycadf2/Makefile head/devel/py-pytest-black-multipy/Makefile head/devel/py-ratelimiter/Makefile head/devel/py-raven/Makefile head/devel/py-represent/Makefile head/devel/py-responses/Makefile head/devel/py-tempora1/Makefile head/devel/py-tooz1/Makefile head/devel/py-trollius/Makefile head/devel/py-txaio/Makefile head/devel/py-yg.lockfile/Makefile head/irc/py-irc/Makefile head/lang/python-tools/Makefile head/math/py-MutatorMath/Makefile head/multimedia/py-periscope/Makefile head/net-im/py-python-telegram-bot/Makefile head/net-mgmt/py-arouteserver/Makefile head/net-mgmt/py-snmp_passpersist/Makefile head/net/py-portend/Makefile head/net/py-python-barbicanclient/Makefile head/net/py-python-ceilometerclient/Makefile head/net/py-python-cinderclient5/Makefile head/net/py-python-keystoneclient3/Makefile head/net/py-python-novaclient16/Makefile head/net/py-s3transfer/Makefile head/net/py-zeep/Makefile head/net/ryu/Makefile head/security/py-mixbox/Makefile head/security/py-oauthlib/Makefile head/security/py-xmlsec/Makefile head/sysutils/fusefs-gitfs/Makefile head/textproc/py-humanfriendly/Makefile head/textproc/py-m2r/Makefile head/www/py-beaker/Makefile head/www/py-cherrypy/Makefile head/www/py-django-allauth/Makefile head/www/py-gandi.cli/Makefile head/www/py-gunicorn/Makefile head/www/py-pywikibot/Makefile head/www/py-slimit/Makefile head/www/py-websocket-client/Makefile head/www/rtv/Makefile head/x11-fonts/py-booleanOperations/Makefile head/x11-fonts/py-compreffor/Makefile head/x11-fonts/py-cu2qu/Makefile head/x11-fonts/py-defcon/Makefile head/x11-fonts/py-fontMath/Makefile head/x11-fonts/py-fontmake/Makefile head/x11-fonts/py-glyphsLib/Makefile head/x11-fonts/py-ufo2ft/Makefile head/x11-toolkits/py-Pmw/Makefile Modified: head/archivers/py-lz4/Makefile ============================================================================== --- head/archivers/py-lz4/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/archivers/py-lz4/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/audio/py-speechrecognition/Makefile ============================================================================== --- head/audio/py-speechrecognition/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/audio/py-speechrecognition/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/databases/py-gdbm/Makefile ============================================================================== --- head/databases/py-gdbm/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/databases/py-gdbm/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/databases/py-pickleshare/Makefile ============================================================================== --- head/databases/py-pickleshare/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/databases/py-pickleshare/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/databases/py-sqlalchemy10/Makefile ============================================================================== --- head/databases/py-sqlalchemy10/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/databases/py-sqlalchemy10/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -40,14 +40,10 @@ SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:d 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> Modified: head/devel/py-apscheduler/Makefile ============================================================================== --- head/devel/py-apscheduler/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-apscheduler/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -17,23 +17,15 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0 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> Modified: head/devel/py-azure-datalake-store/Makefile ============================================================================== --- head/devel/py-azure-datalake-store/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-azure-datalake-store/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-castellan1/Makefile ============================================================================== --- head/devel/py-castellan1/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-castellan1/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -21,7 +21,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel ${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> Modified: head/devel/py-cliff2/Makefile ============================================================================== --- head/devel/py-cliff2/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-cliff2/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -21,7 +21,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/p ${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> Modified: head/devel/py-cmd208/Makefile ============================================================================== --- head/devel/py-cmd208/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-cmd208/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-csv23/Makefile ============================================================================== --- head/devel/py-csv23/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-csv23/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-cursive/Makefile ============================================================================== --- head/devel/py-cursive/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-cursive/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-entrypoints/Makefile ============================================================================== --- head/devel/py-entrypoints/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-entrypoints/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-fasteners/Makefile ============================================================================== --- head/devel/py-fasteners/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-fasteners/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-filedepot/Makefile ============================================================================== --- head/devel/py-filedepot/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-filedepot/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -12,15 +12,11 @@ COMMENT= Toolkit for storing files and attachments in 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> Modified: head/devel/py-fs2/Makefile ============================================================================== --- head/devel/py-fs2/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-fs2/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-futurist1/Makefile ============================================================================== --- head/devel/py-futurist1/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-futurist1/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-gevent/Makefile ============================================================================== --- head/devel/py-gevent/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-gevent/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-jaraco.context2/Makefile ============================================================================== --- head/devel/py-jaraco.context2/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-jaraco.context2/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-jaraco.timing/Makefile ============================================================================== --- head/devel/py-jaraco.timing/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-jaraco.timing/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-jaraco.util13/Makefile ============================================================================== --- head/devel/py-jaraco.util13/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-jaraco.util13/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-keystonemiddleware8/Makefile ============================================================================== --- head/devel/py-keystonemiddleware8/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-keystonemiddleware8/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -19,31 +19,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel 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. ${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> Modified: head/devel/py-msgpack/Makefile ============================================================================== --- head/devel/py-msgpack/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-msgpack/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-nose/Makefile ============================================================================== --- head/devel/py-nose/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-nose/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-nose2/Makefile ============================================================================== --- head/devel/py-nose2/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-nose2/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-openstacksdk043/Makefile ============================================================================== --- head/devel/py-openstacksdk043/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-openstacksdk043/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -28,7 +28,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:dev ${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> Modified: head/devel/py-os-brick2/Makefile ============================================================================== --- head/devel/py-os-brick2/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-os-brick2/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -21,7 +21,14 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel ${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> Modified: head/devel/py-os-client-config1/Makefile ============================================================================== --- head/devel/py-os-client-config1/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-os-client-config1/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-os-win4/Makefile ============================================================================== --- head/devel/py-os-win4/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-os-win4/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-osc-lib1/Makefile ============================================================================== --- head/devel/py-osc-lib1/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-osc-lib1/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -20,7 +20,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel ${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> Modified: head/devel/py-oslo.cache1/Makefile ============================================================================== --- head/devel/py-oslo.cache1/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-oslo.cache1/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-oslo.concurrency3/Makefile ============================================================================== --- head/devel/py-oslo.concurrency3/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-oslo.concurrency3/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -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> Modified: head/devel/py-oslo.config7/Makefile ============================================================================== --- head/devel/py-oslo.config7/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-oslo.config7/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -21,7 +21,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2 ${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> Modified: head/devel/py-oslo.db6/Makefile ============================================================================== --- head/devel/py-oslo.db6/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-oslo.db6/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -23,9 +23,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}alembic>=0.9.6:dat ${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> Modified: head/devel/py-oslo.log3/Makefile ============================================================================== --- head/devel/py-oslo.log3/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-oslo.log3/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -19,7 +19,12 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel 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> Modified: head/devel/py-oslo.middleware3/Makefile ============================================================================== --- head/devel/py-oslo.middleware3/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-oslo.middleware3/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -21,7 +21,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2 ${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> Modified: head/devel/py-oslo.policy2/Makefile ============================================================================== --- head/devel/py-oslo.policy2/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-oslo.policy2/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -19,7 +19,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel 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> Modified: head/devel/py-oslo.privsep1/Makefile ============================================================================== --- head/devel/py-oslo.privsep1/Makefile Mon Jan 11 19:36:10 2021 (r561251) +++ head/devel/py-oslo.privsep1/Makefile Mon Jan 11 19:36:17 2021 (r561252) @@ -19,7 +19,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7.0:devel/py-cffi@${PY_FLAVOR} \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101111936.10BJaHMY033721>