From nobody Thu Dec 15 17:31:59 2022 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 4NXznC68BLz4kwmn; Thu, 15 Dec 2022 17:31:59 +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 4NXznC43JSz3t6V; Thu, 15 Dec 2022 17:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671125519; 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=+ge5yp3/Hcp8SssieNRV4d+CxZn/Sce1EgszNn56bos=; b=mHDKfu8Q/CfEncs7mvJTF56IoOesOCvBk9gdEKaMjeRtSBwKJbDSWUpI3MWtk1gEmlDPVJ 1JY3SQllVjIvG4Y1wMKEi01CqsoJKVKs5pK41siV7cB/af1SSVurXRR0CNf0vpv6Yb9wdm 21pXf3pLkH8cHh4eykn45cmHfapQNqW34DzZ56ehqkkgi2zHAiRg29kx5WQJeKOCqD9jzG 1Nia4wmdYQ2Z2MpyPpru6CI5dq8my8SyzTkhl0eRDaGG5KJIv1rDgYNV7+uGqumxhApfKM o4pu3Gce63sBRdH1q1o4z5SKP0srOb6UdxScuo9PNgh4NXcWH/v/cbV9/XYcrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671125519; 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=+ge5yp3/Hcp8SssieNRV4d+CxZn/Sce1EgszNn56bos=; b=pLHsC6rGsG3Q+Wyqi0OxVauueO2lnW2DEvU5QfRW1FOPA4GjFpZBXNte+l5lIW2CbwOVb2 lGrGcukPAH5clKyJYy2I1HH3+VT6xknjhEbd4qgF+LHGs2LU88tSKYplu2BY3rskfoXvL2 au2ym9MbwKmRDoOixTJo8waScDM5sRMVOVK0FNkQ8qg+JcmXycFBdZ0jEYuMmTy5EET9+A sb1KU/4YSHmj520QviPOXCyJKbjMOt2M4z1J4Tjy++Nrm2I66ZteXk7VR8FSc9ScCK8qrQ kG9UpF+GZzz2q96ySm8ZPwh6LtcUG7PFwcRFV+XkijT/VnDhYO+w2FlftZTQ9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671125519; a=rsa-sha256; cv=none; b=TVWKq5N1Fbn6id/uMLNRYrur3XKBYyOCBRUDLl4cbK8134zyeDWt/tDj56oxylpfJDcGU0 46/1SVgm5ejI80nE2iqjuLj8SVUTSy0yWwErpm/NB1chagfZJZIV8mqW3Y6qziq72vX2jn kxg06mZ8ikTch8r9CFTPV0DGm/xzILpcMXByElOK2FuVVBexMfP00MCDisxn0Y1S5jyb3l 0i50XjRwAVzDtXxGXNXQWS1MUeI7S/VAzaL/2FW+D2iuTO/DHR1KOlFW75uh57z4JEh6Qu VDmg2hTRElHXejxxR68ShAxE/RgvvqDXq1ISTPUBHB2nZMykX2gweKSIWXZ97g== 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 4NXznC37bPzhKk; Thu, 15 Dec 2022 17:31:59 +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 2BFHVxTR011924; Thu, 15 Dec 2022 17:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BFHVxIu011923; Thu, 15 Dec 2022 17:31:59 GMT (envelope-from git) Date: Thu, 15 Dec 2022 17:31:59 GMT Message-Id: <202212151731.2BFHVxIu011923@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: 62723bbe6070 - main - Revert "*/py-{gdbm,sqlite3,tkinter}: switch from distutils to 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62723bbe60705c70cf2dceb23a22a73bdd4d4ae3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=62723bbe60705c70cf2dceb23a22a73bdd4d4ae3 commit 62723bbe60705c70cf2dceb23a22a73bdd4d4ae3 Author: Dmitry Marakasov AuthorDate: 2022-12-15 17:29:27 +0000 Commit: Dmitry Marakasov CommitDate: 2022-12-15 17:31:40 +0000 Revert "*/py-{gdbm,sqlite3,tkinter}: switch from distutils to setuptools" This reverts commit 7446740638e7d833fde0962e71ef440a6af3c749. The change is not valid as setuptools have deprecated setup.py, while distutils will be supported in existing point releases. Python 3.12 support will require different solution. PR: 268283 --- 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, 17 insertions(+), 20 deletions(-) diff --git a/databases/py-gdbm/files/setup3.py b/databases/py-gdbm/files/setup3.py index 26df5565cfd3..0a947466d03e 100644 --- a/databases/py-gdbm/files/setup3.py +++ b/databases/py-gdbm/files/setup3.py @@ -3,19 +3,17 @@ # python setup.py install # -import os -import sys - try: - import setuptools - from setuptools.command.install import install - from setuptools import setup, Extension + 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]] -prefix = os.path.normpath(sys.prefix) +prefix = sysconfig.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 1a763dd8cb71..944c89920852 100644 --- a/databases/py-sqlite3/files/setup3.py +++ b/databases/py-sqlite3/files/setup3.py @@ -3,20 +3,19 @@ # python setup.py install # -import os import platform -import sys try: - import setuptools - from setuptools.command.install import install - from setuptools import setup, Extension + import distutils + from distutils import sysconfig + from distutils.command.install import install + from distutils.core import setup, Extension except: - raise SystemExit("Setuptools problem") + raise SystemExit("Distutils problem") install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]] -prefix = os.path.normpath(sys.prefix) +prefix = sysconfig.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 d0a7fc30c0bf..bcf53d093857 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 -import sys +import os, string try: - import setuptools - from setuptools.command.install import install - from setuptools import setup, Extension + 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 = os.path.normpath(sys.prefix) +prefix = sysconfig.PREFIX # Python 1.5 doesn't have os.getenv()? x11base = os.environ['LOCALBASE'] or '/usr/X11R6' inc_dirs = [prefix + "/include",