From nobody Sat Sep 30 00:56:49 2023 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 4Ry81Y75MTz4v17n; Sat, 30 Sep 2023 00:56:49 +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 4Ry81Y6MVsz3ZVx; Sat, 30 Sep 2023 00:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696035409; 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=RyF4bD+tbmDApYdVcTshaf0GajJfTwZscQ9N8By8nz0=; b=Wj1rGcCI1PZKNmhsmrv8oX4e7SdHiGYt7oqM34bpUxaH6KwyrMpmZDDHQmcA00BmAA8hK3 TXvUDs1ZDR+ry2p6IxcaVCnyDPrBFv5fZKePkR4xgyjry0EW5m/XbI9CU133tOcjcBPvKs dPowdUnkAGI4W6zvYqRle9b5iOZ6lGQLeq60CsH31ZqfDAxivj7iTivVk8WmhYOkFJ7ApS uTXG8/1Z5uh1PNUgcVvElfxETr3lqRi/7R8Pc8HpNVvEpb9xhAq1nEXxHVLrMSae1tKgj2 /Koq/7CqBquO9/moo32k4nJ3I4R19Phy59kEljK06/0fAPpMFatPeyDgo2XMrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696035409; a=rsa-sha256; cv=none; b=bKy83FKE2mpB1DsIR98x5XPWU8SpfVedMaFnG4JF9CsdYWQ93fz2aPu+gcRWX3SKvbcA2e y035cvfvPHmD0uySis6dhxCWYrNlqgW5NvdNMc8fZEFB/Klvwyoi9YHcjwU2ECbvimEcJf OjiMj4U/sUpMQpah/8vl2o69k6QjyufGj38koLij0BA+cFG5B6hTCrbUSDKn9fs1FIe3+t xMRJUfeM8sY4BAcutiOeHSsN+Ji2YkNyXFVNExXss4KXWnr1JZUnHvDTXpDttG8Os+Pxx4 tEwK2yqZNf7Juos4lfjhq+D4EPxLMKiXOBgcghr4PNQ1bfQljnN6veoUpKvYVA== 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=1696035409; 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=RyF4bD+tbmDApYdVcTshaf0GajJfTwZscQ9N8By8nz0=; b=i+oCMT/e+5Th0I/38aI0vY2gM38itd+q8BXspD2VOB441lT57IgIcXAWT+Wifby4MXk3CL 9fA5h2m38GlcgZ8ZlRZHm//GPjVjKpY2DSVkLmoWL+6pI3rO63MFgu2uc4lcWF74lEQWvF /5r4jGRECNi5CoUg6hC6JmGfQKCIWBUTDkHvxRzsPfiAHsCZT5GAztzRBuauh+o7RGjs61 Ud/6v9W8GDD3BHRvYR/2JaDS//UrfjZKGu6003XsgYLwehc0vHsk1rahz7UcTKpSTlqHc8 LEo58d/TVu0dHMgPjFraD8roL3x1wD0hgtJQDzj8T3ubZLjyI6CHrQGFVOnxRQ== 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 4Ry81Y5LNHzBdX; Sat, 30 Sep 2023 00:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38U0unHh040517; Sat, 30 Sep 2023 00:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38U0un2G040514; Sat, 30 Sep 2023 00:56:49 GMT (envelope-from git) Date: Sat, 30 Sep 2023 00:56:49 GMT Message-Id: <202309300056.38U0un2G040514@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 204d12db0162 - main - Mk/bsd.default-versions.mk: Remove PYTHON3_DEFAULT and use PYTHON_DEFAULT for Python 3.x 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 204d12db0162d8e28c3ff536da2be7b0dc35850e Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=204d12db0162d8e28c3ff536da2be7b0dc35850e commit 204d12db0162d8e28c3ff536da2be7b0dc35850e Author: Po-Chuan Hsieh AuthorDate: 2023-09-30 00:30:46 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-30 00:46:32 +0000 Mk/bsd.default-versions.mk: Remove PYTHON3_DEFAULT and use PYTHON_DEFAULT for Python 3.x - Remove unnecessary PYTHON3_DEFAULT - Use PYTHON_DEFAULT for Python 3.x and remove 2.7 from PYTHON_DEFAULT - Use PYTHON2_DEFAULT for Python 2.7 Regarding DEFAULT_VERSIONS, both python and python3 point to the same value which makes python3 a duplicate. And we do not really support python=2.7. Therefore, use python for Python 3.x and python2 for legacy Python 2.7. --- Mk/bsd.default-versions.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 5e7af95493f5..053ff5af9cea 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -20,7 +20,7 @@ LOCALBASE?= /usr/local . for lang in APACHE BDB COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \ GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \ LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \ - PYCRYPTOGRAPHY PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH + PYCRYPTOGRAPHY PYTHON PYTHON2 RUBY RUST SAMBA SSL TCLTK VARNISH . if defined(${lang}_DEFAULT) ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" . endif @@ -134,12 +134,10 @@ PYCRYPTOGRAPHY_DEFAULT?= rust . else PYCRYPTOGRAPHY_DEFAULT?= legacy . endif -# Possible values: 2.7, 3.8, 3.9, 3.10, 3.11 +# Possible values: 3.8, 3.9, 3.10, 3.11 PYTHON_DEFAULT?= 3.9 # Possible values: 2.7 PYTHON2_DEFAULT?= 2.7 -# Possible values: 3.8, 3.9, 3.10, 3.11 -PYTHON3_DEFAULT?= 3.9 # Possible values: 3.0, 3.1, 3.2, 3.3 RUBY_DEFAULT?= 3.1 # Possible values: rust, rust-nightly