From nobody Thu Mar 09 17:37:29 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PXbwn3nKLz3x9xm; Thu, 9 Mar 2023 17:37:29 +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 4PXbwn3GBpz4HKn; Thu, 9 Mar 2023 17:37:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678383449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aWVoKDEqCOAVv2qAVEy+JqYqUAnK5FpxgaGYc00TcW8=; b=c52Ddv32Fv+Z7/Q7sxPbedkdvzZyFuOFMEa8CbEklLF6/FPnH4kGU4m1/joWIMQ5CQThij iCRaRl4RICeDLjZJkDS5Iy0ASX5kgRCT1on1vN7D+FdLmLOF9S5qAhtOPkR3w1zMJZXBdo JRgxQAhyeeoBS1CvCFNSIv3FEsxwOJdQsYsYQuBNeMcYx3v4lUMYPW3/qIDYb09sTOBxnK FknS61lLseJOGU6z8auDY07G0YboQ++zIDQ7O2NsIViAdqmk4knMPiJrq53WufQFdwlWee Hu8OraZY5OyDKUyyqzjkUL02BxooGssYvU2glYEXamyS7+Sq2XrhXtk3M48/DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678383449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aWVoKDEqCOAVv2qAVEy+JqYqUAnK5FpxgaGYc00TcW8=; b=oQPpkUvc1uevjfnIL3ISpQCQI5TURSOHQoeOYEZ6uRPQBL2Q7jOrCz/vVBqTLOEpilhuz4 3GVnuqsil8teyFz7HDqcOml+7SNSR3th/lJ2rHS+SKfOldkfXYoB0b9+onc1d2I6RuR/Se soIzAFoX/tqzgQWKxqhG30K8n0HZ4PJdYLfeQJbj8Jsh9amIAh2LkEP7wLdekZtmINL/WO L/hhuexhAHVNgZ2mUf2Paf+U80VJ4qnXU7kBHu/2yu3DUjOqD64of7Dcy0U2f9UBbyNUyB WGHBno6nMgwTcEadoPD/+2xRuJtI5eBaU9jAUkqjrHWW5uH+U0EA1LXklHlzQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678383449; a=rsa-sha256; cv=none; b=FnPL3IFPY6+Fu1jsHXTjFmrxY7cXeOpPwgmbT4mJcBNrNQwOMbW0iZz3K+R9sVGurEsg5h fCThrMs/lTey4yAGES1YBGZOdczXIX4472dg3yavhm5RIg3OTECm0jqXgiEhHeJMB1z2hl jpSOOJFveBRqex8RM3tL1+dLOsZ3tTMkQ/+be1loqBMKaFIZt14TB7IrjgYgp16POJEqln 58EkjtERfcpllJkWbbeH977+lvOAjgxcHaVANwSzPyC8B2H1qkvGHFeADoH4vI1i9p8kdJ N0eF0pCOHMEvOWP9Zc4aZcKifXHzgxSmXOD8Wqgu3U9Sc+AatJ9gZzhVZSpY5g== 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 4PXbwn2JfczH82; Thu, 9 Mar 2023 17:37:29 +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 329HbTdf029813; Thu, 9 Mar 2023 17:37:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 329HbTN7029812; Thu, 9 Mar 2023 17:37:29 GMT (envelope-from git) Date: Thu, 9 Mar 2023 17:37:29 GMT Message-Id: <202303091737.329HbTN7029812@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 46a71ea3bf00 - main - python.mk: introduce PY_SETUPTOOLS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46a71ea3bf0004075ed438ebf49af255fe942b89 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=46a71ea3bf0004075ed438ebf49af255fe942b89 commit 46a71ea3bf0004075ed438ebf49af255fe942b89 Author: Charlie Li AuthorDate: 2023-03-09 17:33:37 +0000 Commit: Charlie Li CommitDate: 2023-03-09 17:35:49 +0000 python.mk: introduce PY_SETUPTOOLS Selects the correct setuptools port based on USE_PYTHON=distutils or not. devel/py-setuptools58 case currently commented out. --- Mk/Uses/python.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 5e3e2e1add4c..edf56e387102 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -286,6 +286,7 @@ # # Dependency lines of selected Python modules: # +# PY_SETUPTOOLS - setuptools port based on USE_PYTHON=distutils # PYGAME - pygame port # PYNUMPY - NumPy port # PY_MERCURIAL - mercurial port, PKGNAME varies based on default @@ -778,6 +779,17 @@ CMAKE_ARGS+= -DPython_ADDITIONAL_VERSIONS=${PYTHON_VER} PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.25,1:math/py-numpy@${PY_FLAVOR} +. if defined(_PYTHON_FEATURE_DISTUTILS) +. if ${PYTHON_MAJOR_VER} < 3 +PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR} +. else +#PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools58>0:devel/py-setuptools58@${PY_FLAVOR} +PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} +. endif +. else +PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} +. endif + # Common Python modules that can be needed but only for some versions of Python. . if ${PYTHON_REL} < 30500 . else