From nobody Thu Dec 15 15:15:16 2022 X-Original-To: dev-commits-ports-main@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 4NXwlS6682z4kgsK; Thu, 15 Dec 2022 15:15:16 +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 4NXwlS5fbcz3PVB; Thu, 15 Dec 2022 15:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671117316; 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=RplsDQHLYqD+YPjjByb61ASRyKnVgvHoe8UfScJi0JE=; b=MkM7++sHVgnUSYwY5X7j8z7UzE49M5z+MRryXhkTMq8upwWitc4DBCVFtnv4u4ISbu34lB q0TdLnUneKQ4JoZbwVuko7wlx2rcmRt3K9lQu8EbN8lAAtnbE1USKQ9+xZg0vuL7EM1xuR T/DGaRXXfxc2oZxVGbV2RTmjABLNtnE6oGqZpIWcKdTeelfVtxQPc6AXzlgC+E3MHEj98f 2QeApzmkVvqzmMCBwrAvc5xFeU0eYa5yPdgC3CR1n66TpjBNs4287iQK9Siqak69fjECWX 6/XwloWeIupaYpkCmj+E1RRjkFmqsewyBDTG8LpFJFLQaFZWohYFl7ppdYD9iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671117316; 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=RplsDQHLYqD+YPjjByb61ASRyKnVgvHoe8UfScJi0JE=; b=GSPqhAXU32246gd8JblMHfsI8d0VEWN9fMG2kzfS7GA6/WTiZUZx375eYPpOGrdz3VekHo Xa/Qnzz6CulqXwak8h+q1Sv2fwHcUE6paVg4RkHtEuZzqqja0WCNBZ2zGMHBqTOaGwnYAB hqkB0hxcSJhAArXWNXiKEJbr4a+/onXuqQsWCuldUsBUEXVvgJ8qT7af/Ql+Xb0/nRezJl 1ELOzl9aebHQrDRGL3Uz73eIA8bcI+y1652OmvBNeLb5Cs+qwF8mCIu2i8pYKhnTNiVzJE SfDzOgMDeIvUR6skmSLlEQkL5v6l0qS9NIS7iKIIWszNxN1eOWqyf6JKgfOwZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671117316; a=rsa-sha256; cv=none; b=wfAL8tnFBQk1MOwhbSGjN/58cvbvzow7DzpMK+Rjd30LCHfSogK8LEn+V21dIo0YgMHzeE rKDe6B/O9BAm5qGabp6C6hqez3qr0qXR1W8xOBkI0AtKItggCFgi82+iKd2HefEWeamW5n 8x0fNexxlWl3fZgqxH3DUKpcPCIqG0G6gcbrSIqAGxZZrFgOzhsmHmtGMiB3eMdgJM8Xwk Uev7gvszUgmI8g8fD0u1Tjk1hoPEKbNLLExC+RDcvf6JmjWyabixEhQDMs7j+nm/bl7zIf n6ZEZjFj5YWxF/TwxEFuqKFYIqRX1Ow/8wINyxx9K0RtmJwgVOqH6qoU4xeP6g== 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 4NXwlS4kf0zdXp; Thu, 15 Dec 2022 15:15:16 +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 2BFFFGIu010711; Thu, 15 Dec 2022 15:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BFFFGAx010710; Thu, 15 Dec 2022 15:15:16 GMT (envelope-from git) Date: Thu, 15 Dec 2022 15:15:16 GMT Message-Id: <202212151515.2BFFFGAx010710@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 7446740638e7 - main - */py-{gdbm,sqlite3,tkinter}: switch from distutils to setuptools List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7446740638e7d833fde0962e71ef440a6af3c749 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=7446740638e7d833fde0962e71ef440a6af3c749 commit 7446740638e7d833fde0962e71ef440a6af3c749 Author: Dmitry Marakasov AuthorDate: 2022-12-15 15:07:26 +0000 Commit: Dmitry Marakasov CommitDate: 2022-12-15 15:14:33 +0000 */py-{gdbm,sqlite3,tkinter}: switch from distutils to setuptools For python modules which come from python itself, switch from distutils (no longer present in python 3.12) to setuptools, fixing these mudules for python 3.12. PR: 268283 Approved by: vishwin (python@) --- databases/py-gdbm/files/setup3.py | 12 +++++++----- databases/py-sqlite3/files/setup3.py | 13 +++++++------ x11-toolkits/py-tkinter/files/setup3.py | 12 ++++++------ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/databases/py-gdbm/files/setup3.py b/databases/py-gdbm/files/setup3.py index 0a947466d03e..26df5565cfd3 100644 --- a/databases/py-gdbm/files/setup3.py +++ b/databases/py-gdbm/files/setup3.py @@ -3,17 +3,19 @@ # python setup.py install # +import os +import sys + try: - import distutils - from distutils import sysconfig - from distutils.command.install import install - from distutils.core import setup, Extension + import setuptools + from setuptools.command.install import install + from setuptools import setup, Extension except: raise SystemExit("Distutils problem") install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]] -prefix = sysconfig.PREFIX +prefix = os.path.normpath(sys.prefix) inc_dirs = [prefix + "/include"] lib_dirs = [prefix + "/lib"] libs = ["gdbm"] diff --git a/databases/py-sqlite3/files/setup3.py b/databases/py-sqlite3/files/setup3.py index 944c89920852..1a763dd8cb71 100644 --- a/databases/py-sqlite3/files/setup3.py +++ b/databases/py-sqlite3/files/setup3.py @@ -3,19 +3,20 @@ # python setup.py install # +import os import platform +import sys try: - import distutils - from distutils import sysconfig - from distutils.command.install import install - from distutils.core import setup, Extension + import setuptools + from setuptools.command.install import install + from setuptools import setup, Extension except: - raise SystemExit("Distutils problem") + raise SystemExit("Setuptools problem") install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]] -prefix = sysconfig.PREFIX +prefix = os.path.normpath(sys.prefix) inc_dirs = [prefix + "/include", "Modules/_sqlite"] lib_dirs = [prefix + "/lib"] libs = ["sqlite3"] diff --git a/x11-toolkits/py-tkinter/files/setup3.py b/x11-toolkits/py-tkinter/files/setup3.py index bcf53d093857..d0a7fc30c0bf 100644 --- a/x11-toolkits/py-tkinter/files/setup3.py +++ b/x11-toolkits/py-tkinter/files/setup3.py @@ -3,20 +3,20 @@ # python setup.py install # -import os, string +import os +import sys try: - import distutils - from distutils import sysconfig - from distutils.command.install import install - from distutils.core import setup, Extension + import setuptools + from setuptools.command.install import install + from setuptools 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 +prefix = os.path.normpath(sys.prefix) # Python 1.5 doesn't have os.getenv()? x11base = os.environ['LOCALBASE'] or '/usr/X11R6' inc_dirs = [prefix + "/include",