From owner-dev-commits-ports-main@freebsd.org Mon Apr 12 18:28:54 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 04CCD5DA514; Mon, 12 Apr 2021 18:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJy1K6nhNz4lQw; Mon, 12 Apr 2021 18:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D279F1C67F; Mon, 12 Apr 2021 18:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13CISri1017543; Mon, 12 Apr 2021 18:28:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13CISrNk017542; Mon, 12 Apr 2021 18:28:53 GMT (envelope-from git) Date: Mon, 12 Apr 2021 18:28:53 GMT Message-Id: <202104121828.13CISrNk017542@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Antoine Brodin Subject: git: 979e06028d87 - main - Do not use PYTHON_VER in comparisons MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: antoine X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 979e06028d87425e22c0ba8d817dfcb346f3007d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 18:28:54 -0000 The branch main has been updated by antoine: URL: https://cgit.FreeBSD.org/ports/commit/?id=979e06028d87425e22c0ba8d817dfcb346f3007d commit 979e06028d87425e22c0ba8d817dfcb346f3007d Author: Antoine Brodin AuthorDate: 2021-04-12 18:28:04 +0000 Commit: Antoine Brodin CommitDate: 2021-04-12 18:28:30 +0000 Do not use PYTHON_VER in comparisons --- Mk/Uses/python.mk | 12 ++++++------ www/py-aiohttp/Makefile | 3 ++- www/py-uvicorn/Makefile | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 79201987e607..d8ac5c9909fb 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -445,12 +445,6 @@ PYTHON_REL= # empty PYTHON_ABIVER= # empty PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX} -.if ${PYTHON_VER} >= 3.8 -PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX} -.else -PYTHON_EXT_SUFFIX= # empty -.endif - # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env(). .if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR}) .include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version" @@ -472,6 +466,12 @@ PYTHON_ABIVER= m .endif .endif +.if ${PYTHON_REL} >= 3807 +PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX} +.else +PYTHON_EXT_SUFFIX= # empty +.endif + .if ${PYTHON_MAJOR_VER} == 2 DEPRECATED?= Uses Python 2.7 which is EOLed upstream EXPIRATION_DATE?= 2020-12-31 diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile index 844db37039d8..4dab563fdec7 100644 --- a/www/py-aiohttp/Makefile +++ b/www/py-aiohttp/Makefile @@ -2,6 +2,7 @@ PORTNAME= aiohttp PORTVERSION= 3.6.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -35,7 +36,7 @@ USE_PYTHON= autoplist distutils cython .include -.if ${PYTHON_VER} < 3.7 +.if ${PYTHON_REL} < 3700 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}idna_ssl>=1.0:dns/py-idna_ssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.5:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/www/py-uvicorn/Makefile b/www/py-uvicorn/Makefile index 0d60a3f95325..3d52f3dc9268 100644 --- a/www/py-uvicorn/Makefile +++ b/www/py-uvicorn/Makefile @@ -2,6 +2,7 @@ PORTNAME= uvicorn PORTVERSION= 0.13.4 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -32,7 +33,7 @@ WATCHGODRELOAD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}watchgod>=0.6:devel/py-watchg .include -.if ${PYTHON_VER} < 3800 +.if ${PYTHON_REL} < 3800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} .endif