<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/73ba3be619a5ab2b10a6929122652e499e94b65b">https://github.com/macports/macports-ports/commit/73ba3be619a5ab2b10a6929122652e499e94b65b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 73ba3be619a5ab2b10a6929122652e499e94b65b
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Dec 9 18:21:26 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> python312: update to 3.12.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also move select files to subports of python_select and python3_select.
</span>---
lang/python312/Portfile | 26 +++++++++-------------
lang/python312/files/configure-disable-libb2.patch | 14 ++++++------
.../files/configure-disable-libuuid.patch | 14 ++++++------
lang/python312/files/libedit-types.patch | 15 -------------
python/py-gdbm/Portfile | 8 +++----
python/py-tkinter/Portfile | 8 +++----
sysutils/python3_select/Portfile | 6 ++---
.../python3_select/files/python312 | 0
sysutils/python_select/Portfile | 6 ++---
.../python_select/files/python312 | 0
10 files changed, 39 insertions(+), 58 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python312/Portfile b/lang/python312/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6053a550f3..f294f3eed83 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python312/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python312/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup select 1.0
</span>
name python312
# Remember to keep py312-tkinter and py312-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.12.1
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +21,9 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 f6f4616584b23254d165f4db90c247d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4133d0750115a0d99d6ebbfcf9f7e26822ed6221 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 795c34f44df45a0e9b9710c8c71c15c671871524cd412ca14def212e8ccb155d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 50f827c800483776c8ef86e6a53831fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a2097b26a24c443cc35eabac280cee520631be8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8dfb8f426fcd226657f9e2bd5f1e96e53264965176fa17d32658e873591aeb21
</span>
patchfiles patch-Lib-cgi.py.diff \
patch-configure.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +31,7 @@ patchfiles patch-Lib-cgi.py.diff \
</span> sysconfig.py.patch \
configure-disable-libb2.patch \
configure-disable-libuuid.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure-disable-tkinter.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure-disable-tkinter.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,8 +50,10 @@ depends_lib port:bzip2 \
</span> port:sqlite3 \
port:xz \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:python_select \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python3_select
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythonVerNoDot [string map {. {}} $branch]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:python_select-${pythonVerNoDot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python3_select-${pythonVerNoDot}
</span>
compiler.c_standard 2011
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,10 +88,6 @@ test.target test
</span>
destroot.target frameworkinstall maninstall
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythonNoDot python[string map {. {}} $branch]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-select.entries [list python python-$pythonNoDot $pythonNoDot] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [list python3 python3-$pythonNoDot $pythonNoDot]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
set framewpath ${frameworks_dir}/Python.framework
set framewdir ${framewpath}/Versions/${branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,8 +160,8 @@ notes "
</span> To make this the default Python or Python 3 (i.e., the version run by\
the 'python' or 'python3' commands), run one or both of:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port select --set python $pythonNoDot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port select --set python3 $pythonNoDot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port select --set python python$pythonVerNoDot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port select --set python3 python$pythonVerNoDot
</span> "
variant universal {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python312/files/configure-disable-libb2.patch b/lang/python312/files/configure-disable-libb2.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a846f5e4fb8..590bc52c307 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python312/files/configure-disable-libb2.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python312/files/configure-disable-libb2.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-09-19 05:48:09
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-09-23 10:13:17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28384,89 +28384,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-12-08 07:45:44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-12-09 17:52:26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28417,89 +28417,9 @@
</span> esac
done
IFS=$as_save_IFS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,8 @@
</span> -
-
-pkg_failed=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBB2" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf %s "checking for LIBB2... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libb2" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf %s "checking for libb2... " >&6; }
</span>
-if test -n "$LIBB2_CFLAGS"; then
- pkg_cv_LIBB2_CFLAGS="$LIBB2_CFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@
</span> -
-
-if test $pkg_failed = yes; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> -printf "%s\n" "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@
</span> -
- have_libb2=no
-elif test $pkg_failed = untried; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> -printf "%s\n" "no" >&6; }
- have_libb2=no
-else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python312/files/configure-disable-libuuid.patch b/lang/python312/files/configure-disable-libuuid.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2db8d8c3306..3c01dc90702 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python312/files/configure-disable-libuuid.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python312/files/configure-disable-libuuid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-09-19 05:48:09
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-09-23 09:54:55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13149,361 +13149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-12-08 07:45:44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-12-09 17:57:50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13163,361 +13163,7 @@
</span>
have_uuid=missing
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,8 @@
</span> -
-
-pkg_failed=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBUUID" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf %s "checking for LIBUUID... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid >= 2.20" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf %s "checking for uuid >= 2.20... " >&6; }
</span> -
-if test -n "$LIBUUID_CFLAGS"; then
- pkg_cv_LIBUUID_CFLAGS="$LIBUUID_CFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +79,7 @@
</span> -
-
-if test $pkg_failed = yes; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> -printf "%s\n" "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,7 +219,7 @@
</span> -
-
-elif test $pkg_failed = untried; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> -printf "%s\n" "no" >&6; }
-
- save_CFLAGS=$CFLAGS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python312/files/libedit-types.patch b/lang/python312/files/libedit-types.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3ea7625570b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python312/files/libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/readline.c.orig 2023-09-06 07:57:19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/readline.c 2023-09-10 01:43:53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -442,12 +442,8 @@ readline_set_completion_display_matches_hook_impl(PyOb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default completion display. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rl_completion_display_matches_hook =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- readlinestate_global->completion_display_matches_hook ?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(_RL_FUNCTION_TYPEDEF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (VFunction *)on_completion_display_matches_hook : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gdbm/Portfile b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e00d9e15ab0..c072a9e22b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,12 +144,12 @@ subport py311-gdbm {
</span> }
subport py312-gdbm {
maintainers {jmr @jmroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.12.1
</span> revision 0
homepage https://docs.python.org/release/${version}/library/dbm.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 f6f4616584b23254d165f4db90c247d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4133d0750115a0d99d6ebbfcf9f7e26822ed6221 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 795c34f44df45a0e9b9710c8c71c15c671871524cd412ca14def212e8ccb155d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 50f827c800483776c8ef86e6a53831fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a2097b26a24c443cc35eabac280cee520631be8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8dfb8f426fcd226657f9e2bd5f1e96e53264965176fa17d32658e873591aeb21
</span> livecheck.regex {Python (3\.12\.[0-9]+)}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tkinter/Portfile b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f5ed581096..7083f06a00e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,12 +134,12 @@ subport py311-tkinter {
</span> }
subport py312-tkinter {
maintainers {jmr @jmroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.12.1
</span> revision 0
homepage https://docs.python.org/release/${version}/library/tkinter.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 f6f4616584b23254d165f4db90c247d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4133d0750115a0d99d6ebbfcf9f7e26822ed6221 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 795c34f44df45a0e9b9710c8c71c15c671871524cd412ca14def212e8ccb155d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 50f827c800483776c8ef86e6a53831fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a2097b26a24c443cc35eabac280cee520631be8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8dfb8f426fcd226657f9e2bd5f1e96e53264965176fa17d32658e873591aeb21
</span> compiler.c_standard 2011
set extra_cflags \"-std=c11\"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/python3_select/Portfile b/sysutils/python3_select/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fe57515b179..04dc9700c0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/python3_select/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/python3_select/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,16 +47,16 @@ if {$subport eq $name} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach p [list 311] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach p [list 311 312] {
</span> subport python3_select-${p} {
set pyver $p
}
}
if {$subport ne $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> platforms any
depends_run port:python3_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>- select.entries [list python3 python${pyver} ${pyver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.entries [list python3 python${pyver} python${pyver}]
</span> pre-activate {
if {[file exists ${prefix}/etc/select/python3/python${pyver}]
&& [registry_file_registered ${prefix}/etc/select/python3/python${pyver}] eq "python${pyver}"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python312/files/python3-python312 b/sysutils/python3_select/files/python312
</span>similarity index 100%
rename from lang/python312/files/python3-python312
rename to sysutils/python3_select/files/python312
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/python_select/Portfile b/sysutils/python_select/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index adfc0f4f577..6cbd433c338 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/python_select/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/python_select/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,16 +69,16 @@ if {$subport eq $name} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach p [list 311] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach p [list 311 312] {
</span> subport python_select-${p} {
set pyver $p
}
}
if {$subport ne $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> platforms any
depends_run port:python_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>- select.entries [list python python${pyver} ${pyver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.entries [list python python${pyver} python${pyver}]
</span> pre-activate {
if {[file exists ${prefix}/etc/select/python/python${pyver}]
&& [registry_file_registered ${prefix}/etc/select/python/python${pyver}] eq "python${pyver}"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python312/files/python-python312 b/sysutils/python_select/files/python312
</span>similarity index 100%
rename from lang/python312/files/python-python312
rename to sysutils/python_select/files/python312
</pre><pre style='margin:0'>
</pre>