<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d23d870e40338b3d2798ae11ebb551c74ad7db91">https://github.com/macports/macports-ports/commit/d23d870e40338b3d2798ae11ebb551c74ad7db91</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d23d870e40338b3d2798ae11ebb551c74ad7db91
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri May 23 16:00:36 2025 -0400
<span style='display:block; white-space:pre;color:#404040;'> itstool: update/simplify Python variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60776
</span>---
textproc/itstool/Portfile | 78 ++++++++--------------
...ygte-312.patch => invalid-sequence-pygte.patch} | 0
2 files changed, 28 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/itstool/Portfile b/textproc/itstool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2e6a11177fa..98784d7f6c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/itstool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/itstool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,60 +34,38 @@ depends_build port:gawk
</span> # per its manpage, itstool uses msgfmt provided by gettext to create MO files
depends_lib port:gettext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python38 python39 python310 python311 python312 description {Use Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-libxml2
</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;background:#ffe0e0;'>-variant python38 conflicts python27 python39 python310 python311 python312 description {Use Python 3.8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-libxml2
</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;background:#ffe0e0;'>-variant python39 conflicts python27 python38 python310 python311 python312 description {Use Python 3.9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ invalid-sequence-pygte.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {39 310 311 312 313}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set plugin_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend python_variants python${pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend plugin_variants plugin_support${pyver}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python27 python38 python39 python311 python312 description {Use Python 3.10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-libxml2
</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;background:#ffe0e0;'>-variant python311 conflicts python27 python38 python39 python310 python312 description {Use Python 3.11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/bin/python3.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py311-libxml2
</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;background:#ffe0e0;'>-variant python312 conflicts python27 python38 python39 python310 python311 description {Use Python 3.12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/bin/python3.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py312-libxml2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- invalid-sequence-pygte-312.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vrt python${pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyversion [string index ${pyver} 0].[string range ${pyver} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${python_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${python_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${vrt} description "Use Python ${pyversion} bindings" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${frameworks_dir}/Python.framework/Versions/${pyversion}/bin/python${pyversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${pyver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python38] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python39] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python310] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python311] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python312]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_default "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_default "${python_default}!\[variant_isset python${pyver}\] && "
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_default [string range ${python_default} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_default "${python_default}} { default_variants +python313}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${python_default}
</span>
livecheck.type regex
livecheck.url http://itstool.org/download/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/itstool/files/invalid-sequence-pygte-312.patch b/textproc/itstool/files/invalid-sequence-pygte.patch
</span>similarity index 100%
rename from textproc/itstool/files/invalid-sequence-pygte-312.patch
rename to textproc/itstool/files/invalid-sequence-pygte.patch
</pre><pre style='margin:0'>
</pre>