<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/6e4158aad5a1d61f924e7d99fd6565a48b2f0d44">https://github.com/macports/macports-ports/commit/6e4158aad5a1d61f924e7d99fd6565a48b2f0d44</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6e4158aad5a swig: update to 4.3.1
</span>6e4158aad5a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6e4158aad5a1d61f924e7d99fd6565a48b2f0d44
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Apr 16 17:39:09 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> swig: update to 4.3.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream dropped support for PHP 7, so the swig-php subport now depends
</span><span style='display:block; white-space:pre;color:#404040;'> on php8*.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also remove chicken, clisp and pike subports. Upstream dropped support
</span><span style='display:block; white-space:pre;color:#404040;'> for these languages in version 4.0.0.
</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/66322
</span>---
devel/swig/Portfile | 64 ++++++++++++++++-------------------
devel/swig/files/patch-configure.diff | 9 ++---
2 files changed, 32 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/swig/Portfile b/devel/swig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 97b58c60d5d..9035a53d320 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,12 @@
</span> PortSystem 1.0
name swig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.3.1
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ff2415693369f0e8cfb8c9c6bf32ab3d6fd9465e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2af08aced8fcd65cdb5cc62426768914bedc735b1c250325203716f78e39ac9b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8600805
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 a111f4433c2348a3186698e1b750b4944bc34c7b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a7a24420731ee469e557b9761063bec602f17db6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 44fc829f70f1e17d635a2b4d69acab38896699ecc24aa023e516e0eabbec61b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8620774
</span>
categories devel
maintainers {michaelld @michaelld} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +48,6 @@ test.target check
</span> configure.args-append --without-javascript
array set bindings {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- chicken {port:chicken chicken}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clisp {port:clisp clisp}
</span> csharp {port:mono csharp}
gcj {port:gcc47 "gcj=${prefix}/bin/gcj-mp-4.7 --with-gcjh=${prefix}/bin/gcjh-mp-4.7"}
d {port:phobos d}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,16 +58,15 @@ array set bindings {
</span> ocaml {port:ocaml ocaml}
octave {path:bin/octave:octave octave}
perl {path:bin/perl:perl5 perl5=${prefix}/bin/perl}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- php {port:php73 "php=${prefix}/bin/php73"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pike {port:pike pike}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php {{} php}
</span> python {port:python_select python}
r {port:R r}
ruby {port:ruby23 "ruby=${prefix}/bin/ruby2.3"}
tcl {port:tcl tcl}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-array set prettynames {chicken Chicken clisp CLISP csharp "C#"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+array set prettynames {csharp "C#"
</span> d D gcj GCJ go Go guile Guile java Java lua Lua
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ocaml "Objective Caml" octave Octave perl5 Perl php "PHP 7" pike Pike
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocaml "Objective Caml" octave Octave perl5 Perl php "PHP 8"
</span> python Python r R ruby Ruby tcl Tcl}
options swig.lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,33 +101,29 @@ subport swig-php {
</span> # patch to fix finding of "php-configXY"
patchfiles-append patch-configure.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant php70 conflicts php71 php72 php73 description {build using PHP 7.0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:php73 port:php70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-php=${prefix}/bin/php73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-php=${prefix}/bin/php70
</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 php71 conflicts php70 php72 php73 description {build using PHP 7.1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:php73 port:php71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-php=${prefix}/bin/php73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-php=${prefix}/bin/php71
</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 php72 conflicts php70 php71 php73 description {build using PHP 7.2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:php73 port:php72
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-php=${prefix}/bin/php73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-php=${prefix}/bin/php72
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set php_vers {80 81 82 83 84}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set php_portnames [lmap ver $php_vers {string cat php${ver}}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set php_default_ver 83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach php_ver $php_vers {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant php${php_ver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts {*}[ldelete $php_portnames php${php_ver}] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "build using PHP 8.[string index $php_ver 1]" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:php${php_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --with-php \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-php=${prefix}/bin/php${php_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$php_ver ne $php_default_ver && [variant_isset php${php_ver}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any_php_variant_set 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant php73 conflicts php70 php71 php72 description {build using PHP 7.3} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset php70] && ![variant_isset php71] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset php72] && ![variant_isset php73]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +php73
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists any_php_variant_set]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +php${php_default_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset php${php_default_ver}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any_php_variant_set 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset php70] && ![variant_isset php71] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset php72] && ![variant_isset php73]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nA +phpXY variant must be selected; the variant '-php72' cannot be used alone.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists any_php_variant_set]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nA +phpXY variant must be selected; the variant '-php${php_default_ver}' cannot be used alone.\n"
</span> return -code error "Invalid variant selection"
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/swig/files/patch-configure.diff b/devel/swig/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cbe45dc9ff2..2fa8e298162 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/swig/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/swig/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13392,9 +13392,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2025-04-16 07:10:39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2025-04-16 18:17:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13157,7 +13157,7 @@
</span> printf %s "checking for PHP header files... " >&6; }
case $PHP in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *7.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PHPCONFIG=`echo "$PHP"|sed 's/7\...*$/-config&/'` ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PHPCONFIG=`echo "$PHP"|sed 's/\(7.*\)$/-config\1/'` ;;
</span> *8.*)
- PHPCONFIG=`echo "$PHP"|sed 's/8\...*$/-config&/'` ;;
+ PHPCONFIG=`echo "$PHP"|sed 's/\(8.*\)$/-config\1/'` ;;
</pre><pre style='margin:0'>
</pre>