From nobody Wed Mar 12 02:37:12 2025 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 4ZCFCD6bttz5q9q2; Wed, 12 Mar 2025 02:37:12 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCFCD3jdNz3mTt; Wed, 12 Mar 2025 02:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741747032; 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=Qg1yZ7KxadjcBNNAXPoboRVQMiAFg3liUD9GSj0bgIA=; b=bJHjWm6ysjqDrSnlTWSYe/QiHUVvJdBlh2j5pcHMmmov3UDAiGdIhfMDaoqjOhXwK2uy/1 1eOoQJcAdRULoAtA3yP9y0kUEoiD3uBzke4HVo8jJfLI+kojRYmKTM33kcoldKyS6SA/SE LcERMWEe/C/ySzpEMm1R601oyXKVwLkrzAjf7V8zYeOyLlpqzGzPoQj3s3W0r7AgwcsvWu zaMWtaRO+cGcNGoxR7E4n7Fj2NYm7/9gtn3g3jpMF6s3sUXIgawXOQYBla8TY2cBipl7/b 8jQb401Dnjev74niK3nqGXhW9wc9sYrmMihcUUyUvuezRZ4VOnD12XVubQ3x0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741747032; a=rsa-sha256; cv=none; b=bV3yd4g3w/yiSLk6oAHFAZw57aLrrJ46r78Yd3iwPV/9WMX5SscrEV0Qr0I0a9XA0jdkSx 88UFWK/4eSm0uPt025u8c1PNANJG1FotiU+ujJu9m88tyEiq3wSe6Mcf4oSv03spilU0Xj mkd0XsO28DAYDixoMnSOrdcn2qLEJhltFqmn3yye+C8DY+4T3rFvz1gr6GHi2aK05vXseB MOX609UkYalo/eNhnh5tgzgVifs7i0IqzTNdwNaN84W+qxr8MJPvDFjlaJSTSkM2qLQGJ2 jkIpMKlkob5aRjjxoHWaKCliO+TD32GIQnNqIhhvVx8qe3Enj7czM7GMwMpUVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741747032; 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=Qg1yZ7KxadjcBNNAXPoboRVQMiAFg3liUD9GSj0bgIA=; b=lidCY8dQUjqLqG5/jIDmtiU1NsZqr7rx+mRPJgd3lIAiZOmaFdF4FfliEMWappzHMFk+Ei 3qNyk0BPDYVmECaeKczQyiPpGtsHwe9HrBnhCWy4IQ/Y9NhbIyJpZLbDBmljQIIqiDUH7h 4WnX49WneID7YPzudxxLdOYtgKIL+RWeAruH/6RS8qJASORZ/Urv57y0vL8aJmZI2JpLM7 HUyRMMzTqfYTX9/p8vglvdmyNlcrlYcLgtt5RreJoWs4BJDqAYMD+3dhte3XPD9dplWVXG /ocRONRyCI/hogLrid3V6/CApLxBiNnnFSfYh3UkA0+QzMDmwpZuxU3MSecFYw== 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 4ZCFCD33F6zssG; Wed, 12 Mar 2025 02:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52C2bCA8032328; Wed, 12 Mar 2025 02:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52C2bC9p032325; Wed, 12 Mar 2025 02:37:12 GMT (envelope-from git) Date: Wed, 12 Mar 2025 02:37:12 GMT Message-Id: <202503120237.52C2bC9p032325@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: b4529dc74457 - main - x11-toolkits/py-tkinter: convert to USE_PYTHON=pep517 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: b4529dc74457f6c0db0692aee8976b89a52aae5d Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4529dc74457f6c0db0692aee8976b89a52aae5d commit b4529dc74457f6c0db0692aee8976b89a52aae5d Author: Charlie Li AuthorDate: 2025-03-12 02:34:18 +0000 Commit: Charlie Li CommitDate: 2025-03-12 02:35:51 +0000 x11-toolkits/py-tkinter: convert to USE_PYTHON=pep517 Note USES=tk limited to 8.6; 9.0 support is not expected until Python 3.14 PR: 268283 --- x11-toolkits/py-tkinter/Makefile | 36 ++++++++++++++-------- x11-toolkits/py-tkinter/files/pyproject.toml.in | 11 +++++++ x11-toolkits/py-tkinter/files/setup.py | 40 ------------------------- x11-toolkits/py-tkinter/files/setup.py.in | 24 +++++++++++++++ 4 files changed, 59 insertions(+), 52 deletions(-) diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile index ed3539dc384b..904493a8ddbb 100644 --- a/x11-toolkits/py-tkinter/Makefile +++ b/x11-toolkits/py-tkinter/Makefile @@ -1,34 +1,46 @@ PORTNAME= tkinter DISTVERSION= ${PYTHON_DISTVERSION} -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-toolkits python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Python-${DISTVERSION} +DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org COMMENT= Python bindings to the Tk widget set (Python ${PYTHON_VER}) LICENSE= PSFL +LICENSE_FILE= ${WRKDIR}/Python-${DISTVERSION}/LICENSE -PORTSCOUT= ignore:1 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -USES= compiler:c11 python tar:xz tk -USE_PYTHON= distutils autoplist allflavors +USES= compiler:c11 python tar:xz tk:86 +USE_PYTHON= allflavors autoplist pep517 -DIST_SUBDIR= python DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC_SUBDIR= Modules -PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload +SUB_LIST+= DISTVERSION=${DISTVERSION} \ + TK_VER=${TK_VER} +SUB_FILES= pyproject.toml \ + setup.py +PLIST_FILES= ${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}/lib-dynload/_tkinter${PYTHON_EXT_SUFFIX}.so -.include +PORTSCOUT= ignore:1 -post-extract: - @${SED} -e "s|%%TK_VER%%|${TK_VER}|" ${FILESDIR}/setup.py > ${WRKSRC}/setup.py +pre-configure: + @${MV} ${WRKDIR}/pyproject.toml ${WRKSRC} + @${MV} ${WRKDIR}/setup.py ${WRKSRC} post-install: -# ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/lib-dynload/_tkinter.cpython-${PYTHON_SUFFIX}.so - ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/lib-dynload/_tkinter*.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tkinter${PYTHON_EXT_SUFFIX}.so + # lib-dynload is the expected location + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/lib-dynload + @(cd ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/lib-dynload && ${LN} -s ../site-packages/_tkinter${PYTHON_EXT_SUFFIX}.so) + +do-test: + @${PYTHON_CMD} -c 'import tkinter' # minimal smoke test -.include +.include diff --git a/x11-toolkits/py-tkinter/files/pyproject.toml.in b/x11-toolkits/py-tkinter/files/pyproject.toml.in new file mode 100644 index 000000000000..80772b4b3ff2 --- /dev/null +++ b/x11-toolkits/py-tkinter/files/pyproject.toml.in @@ -0,0 +1,11 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "tkinter" +version = "%%DISTVERSION%%" +description = "Tk Extension to Python" + +[tool.setuptools] +packages = [] diff --git a/x11-toolkits/py-tkinter/files/setup.py b/x11-toolkits/py-tkinter/files/setup.py deleted file mode 100644 index bcf53d093857..000000000000 --- a/x11-toolkits/py-tkinter/files/setup.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python -# To use: -# python setup.py install -# - -import os, string - -try: - import distutils - from distutils import sysconfig - from distutils.command.install import install - from distutils.core import setup, Extension -except: - raise SystemExit("Distutils problem") - -install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]] - -tkversion = "%%TK_VER%%" -prefix = sysconfig.PREFIX -# Python 1.5 doesn't have os.getenv()? -x11base = os.environ['LOCALBASE'] or '/usr/X11R6' -inc_dirs = [prefix + "/include", - prefix + "/include/tcl" + tkversion, - prefix + "/include/tk" + tkversion, - x11base + "/include"] -lib_dirs = [prefix + "/lib", x11base + "/lib"] -# use string.replace() for the benefit of Python 1.5 users -libs = ["tcl" + tkversion.replace(".", ""), - "tk" + tkversion.replace(".", ""), - "X11"] - -setup(name = "Tkinter", - description = "Tk Extension to Python", - - ext_modules = [Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], - define_macros=[('WITH_APPINIT', 1)], - include_dirs = inc_dirs, - libraries = libs, - library_dirs = lib_dirs)] - ) diff --git a/x11-toolkits/py-tkinter/files/setup.py.in b/x11-toolkits/py-tkinter/files/setup.py.in new file mode 100644 index 000000000000..493bf949a682 --- /dev/null +++ b/x11-toolkits/py-tkinter/files/setup.py.in @@ -0,0 +1,24 @@ +#!/usr/bin/env python + +import sys +import sysconfig +from setuptools import setup, Extension + +tkversion = "%%TK_VER%%" +prefix = sysconfig.get_config_var('prefix') +x11base = sys.prefix or '/usr/X11R6' +inc_dirs = [prefix + "/include", + prefix + "/include/tcl" + tkversion, + prefix + "/include/tk" + tkversion, + x11base + "/include"] +lib_dirs = [prefix + "/lib", x11base + "/lib"] +libs = ["tcl" + tkversion.replace(".", ""), + "tk" + tkversion.replace(".", ""), + "X11"] + +setup(ext_modules = [Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)], + include_dirs = inc_dirs, + libraries = libs, + library_dirs = lib_dirs)] + )