<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1b5182f01ac343804b7b052e1fafb46aeed78291">https://github.com/macports/macports-ports/commit/1b5182f01ac343804b7b052e1fafb46aeed78291</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 1b5182f01ac *: prefer configure.build_arch over build_arch
</span>1b5182f01ac is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1b5182f01ac343804b7b052e1fafb46aeed78291
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun May 28 10:30:06 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> *: prefer configure.build_arch over build_arch
</span>---
R/R-gdata/Portfile | 2 +-
aqua/McBopomofo/Portfile | 6 +++---
devel/boost169/Portfile | 12 ++++++------
devel/boost171/Portfile | 12 ++++++------
devel/boost173/Portfile | 12 ++++++------
devel/boost176/Portfile | 12 ++++++------
devel/boost177/Portfile | 12 ++++++------
devel/boost178/Portfile | 12 ++++++------
devel/boost179/Portfile | 12 ++++++------
devel/boost180/Portfile | 12 ++++++------
devel/npth/Portfile | 2 +-
graphics/gegl-devel/Portfile | 12 ++++++------
graphics/gegl/Portfile | 12 ++++++------
graphics/graphene/Portfile | 6 +++---
multimedia/libavif/Portfile | 2 +-
multimedia/libheif/Portfile | 2 +-
net/openssh/Portfile | 2 +-
17 files changed, 71 insertions(+), 71 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-gdata/Portfile b/R/R-gdata/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 09d738725a7..e623d8f2230 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-gdata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-gdata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ checksums rmd160 c6258ef24a745c9571a7873cc71c931e62fa94fd \
</span> supported_archs noarch
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> depends_run-append \
port:perl5
configure.perl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/McBopomofo/Portfile b/aqua/McBopomofo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 39c04c0411a..7e5edecea9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/McBopomofo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/McBopomofo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,12 +24,12 @@ if {${os.major} > 11} {
</span> checksums rmd160 04ecfcc546ca4e5cdf615d91a626cdef7ad7ebb1 \
sha256 23f37e1de13b2a14a770d1bdef16b7dc3e1cc953d2fc420f2436867ba6c20ac5 \
size 2866643
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${os.major} == 10 && ${build_arch} ne "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${os.major} == 10 && ${configure.build_arch} ne "ppc"} {
</span> github.setup openvanilla McBopomofo 0.9.9
checksums rmd160 66e855dd7dcf13aa785d037270f6a72953373ee5 \
sha256 ff4972a51a78134b6b8e036a345253656044f1538ef237f6a342b5ec5cd701f3 \
size 2871281
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${os.major} == 9 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${os.major} == 9 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> # https://github.com/openvanilla/McBopomofo/issues/349
github.setup openvanilla McBopomofo 4c239a2a5fe10610d63473727a71f9b30077667c
version 0.9.9.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ if {${os.major} > 11} {
</span>
patchfiles patch-includes.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} > 9 && ${build_arch} ne "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} > 9 && ${configure.build_arch} ne "ppc"} {
</span> # Not needed on leopard-support branch since already implemented with upstream:
patchfiles-append \
patch-no-werror.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost169/Portfile b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8573322088e..c0d7c897957 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +134,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> # makecontext/swapcontext introduced in 10.6
# In 10.6.x Rosetta they do not work: https://trac.macports.org/ticket/64978
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> configure.args-append --without-libraries=context \
--without-libraries=coroutine
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -364,22 +364,22 @@ if {[mpi_variant_isset]} {
</span> livecheck.type none
if {!${universal_possible} || ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Honour 'build_arch', if not universal as per #28327
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} ppc*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Honour 'configure.build_arch', if not universal as per #28327
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} ppc*] != -1} {
</span> build.args-append architecture=power
if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *86*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *86*] != -1} {
</span> build.args-append architecture=x86
} else {
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Current value of 'build_arch' is not supported."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Current value of 'configure.build_arch' is not supported."
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *64] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *64] != -1} {
</span> build.args-append address-model=64
} else {
build.args-append address-model=32
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost171/Portfile b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49eb8a8a13d..9db9a197a2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +140,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> # makecontext/swapcontext introduced in 10.6
# In 10.6.x Rosetta they do not work: https://trac.macports.org/ticket/64978
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> configure.args-append --without-libraries=context \
--without-libraries=coroutine
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -420,23 +420,23 @@ if {$subport eq $name} {
</span> }
if {!${universal_possible} || ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} arm*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} arm*] != -1} {
</span> build.args-append address-model=64 architecture=arm
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} ppc*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} ppc*] != -1} {
</span> build.args-append architecture=power
if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *86*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *86*] != -1} {
</span> build.args-append architecture=x86
} else {
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Current value of 'build_arch' (${build_arch}) is not supported."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Current value of 'configure.build_arch' (${configure.build_arch}) is not supported."
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *64] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *64] != -1} {
</span> build.args-append address-model=64
} else {
build.args-append address-model=32
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost173/Portfile b/devel/boost173/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c45b15fbc4c..d58dc0773c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost173/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost173/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +133,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> # makecontext/swapcontext introduced in 10.6
# In 10.6.x Rosetta they do not work: https://trac.macports.org/ticket/64978
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> configure.args-append --without-libraries=context \
--without-libraries=coroutine
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -408,23 +408,23 @@ if {$subport eq $name} {
</span> }
if {!${universal_possible} || ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} arm*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} arm*] != -1} {
</span> build.args-append address-model=64 architecture=arm
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} ppc*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} ppc*] != -1} {
</span> build.args-append architecture=power
if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *86*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *86*] != -1} {
</span> build.args-append architecture=x86
} else {
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Current value of 'build_arch' (${build_arch}) is not supported."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Current value of 'configure.build_arch' (${configure.build_arch}) is not supported."
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *64] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *64] != -1} {
</span> build.args-append address-model=64
} else {
build.args-append address-model=32
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost176/Portfile b/devel/boost176/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21b0e502352..b29fe544efb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost176/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost176/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,7 +172,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> # makecontext/swapcontext introduced in 10.6
# In 10.6.x Rosetta they do not work: https://trac.macports.org/ticket/64978
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> configure.args-append --without-libraries=context \
--without-libraries=coroutine
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,23 +450,23 @@ if {$subport eq $name} {
</span> }
if {!${universal_possible} || ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} arm*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} arm*] != -1} {
</span> build.args-append address-model=64 architecture=arm
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} ppc*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} ppc*] != -1} {
</span> build.args-append architecture=power
if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *86*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *86*] != -1} {
</span> build.args-append architecture=x86
} else {
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Current value of 'build_arch' (${build_arch}) is not supported."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Current value of 'configure.build_arch' (${configure.build_arch}) is not supported."
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *64] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *64] != -1} {
</span> build.args-append address-model=64
} else {
build.args-append address-model=32
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost177/Portfile b/devel/boost177/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d2319cb5d9..bd0811f5974 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost177/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost177/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +173,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> # makecontext/swapcontext introduced in 10.6
# In 10.6.x Rosetta they do not work: https://trac.macports.org/ticket/64978
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> configure.args-append --without-libraries=context \
--without-libraries=coroutine
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,23 +451,23 @@ if {$subport eq $name} {
</span> }
if {!${universal_possible} || ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} arm*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} arm*] != -1} {
</span> build.args-append address-model=64 architecture=arm
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} ppc*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} ppc*] != -1} {
</span> build.args-append architecture=power
if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *86*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *86*] != -1} {
</span> build.args-append architecture=x86
} else {
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Current value of 'build_arch' (${build_arch}) is not supported."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Current value of 'configure.build_arch' (${configure.build_arch}) is not supported."
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *64] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *64] != -1} {
</span> build.args-append address-model=64
} else {
build.args-append address-model=32
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost178/Portfile b/devel/boost178/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 24be2369e33..3fc3c733f4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost178/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost178/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +173,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> # makecontext/swapcontext introduced in 10.6
# In 10.6.x Rosetta they do not work: https://trac.macports.org/ticket/64978
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> configure.args-append --without-libraries=context \
--without-libraries=coroutine
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,23 +451,23 @@ if {$subport eq $name} {
</span> }
if {!${universal_possible} || ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} arm*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} arm*] != -1} {
</span> build.args-append address-model=64 architecture=arm
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} ppc*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} ppc*] != -1} {
</span> build.args-append architecture=power
if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *86*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *86*] != -1} {
</span> build.args-append architecture=x86
} else {
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Current value of 'build_arch' (${build_arch}) is not supported."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Current value of 'configure.build_arch' (${configure.build_arch}) is not supported."
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *64] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *64] != -1} {
</span> build.args-append address-model=64
} else {
build.args-append address-model=32
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost179/Portfile b/devel/boost179/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b86ba01b511..2774ea7d542 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost179/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost179/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +173,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> # makecontext/swapcontext introduced in 10.6
# In 10.6.x Rosetta they do not work: https://trac.macports.org/ticket/64978
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> configure.args-append --without-libraries=context \
--without-libraries=coroutine
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,23 +451,23 @@ if {$subport eq $name} {
</span> }
if {!${universal_possible} || ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} arm*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} arm*] != -1} {
</span> build.args-append address-model=64 architecture=arm
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} ppc*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} ppc*] != -1} {
</span> build.args-append architecture=power
if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *86*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *86*] != -1} {
</span> build.args-append architecture=x86
} else {
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Current value of 'build_arch' (${build_arch}) is not supported."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Current value of 'configure.build_arch' (${configure.build_arch}) is not supported."
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *64] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *64] != -1} {
</span> build.args-append address-model=64
} else {
build.args-append address-model=32
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost180/Portfile b/devel/boost180/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6fa038c05f0..f077f1cdbbd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost180/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost180/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +173,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> # makecontext/swapcontext introduced in 10.6
# In 10.6.x Rosetta they do not work: https://trac.macports.org/ticket/64978
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> configure.args-append --without-libraries=context \
--without-libraries=coroutine
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,23 +451,23 @@ if {$subport eq $name} {
</span> }
if {!${universal_possible} || ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} arm*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} arm*] != -1} {
</span> build.args-append address-model=64 architecture=arm
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} ppc*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} ppc*] != -1} {
</span> build.args-append architecture=power
if {${os.arch} ne "powerpc"} {
build.args-append --disable-long-double
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *86*] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *86*] != -1} {
</span> build.args-append architecture=x86
} else {
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Current value of 'build_arch' (${build_arch}) is not supported."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Current value of 'configure.build_arch' (${configure.build_arch}) is not supported."
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch ${build_arch} *64] != -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lsearch ${configure.build_arch} *64] != -1} {
</span> build.args-append address-model=64
} else {
build.args-append address-model=32
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npth/Portfile b/devel/npth/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81adabf0ba5..28f45282fd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npth/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npth/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ checksums rmd160 25756e8cd7711a9e06b377f41b2f88cdcc76d441 \
</span> size 300486
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> post-extract {
copy ${filespath}/darwin_compat.h ${worksrcpath}/src/
copy ${filespath}/darwin_compat.c ${worksrcpath}/src/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl-devel/Portfile b/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cddd2fcc502..b02c5190d6b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ depends_lib-append \
</span>
# libsdl2 requires minimum Xcode 10.7 SDK to build successfully, but builds on 10.6 x86.
# On earlier systems and all PPC use libsdl1 instead.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && (${os.major} < 10 || ${build_arch} in [list ppc ppc64])} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && (${os.major} < 10 || ${configure.build_arch} in [list ppc ppc64])} {
</span> depends_lib-append port:libsdl
configure.args-append \
-Dsdl2=disabled \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> patchfiles-append patch-gegl-opencl-fix-Leopard-and-less-only.diff
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,14 +125,14 @@ platform darwin powerpc {
</span> #platform darwin {
# if {[variant_isset universal]} {
# # In order to build universal on Leopard, you need MacPorts 2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set merger_configure_args(x86_64) --build=${configure.build_arch}-apple-${os.platform}${os.version}
</span> # set merger_configure_cflags(ppc) -fno-altivec
# set merger_configure_cxxflags(ppc) -fno-altivec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# } elseif {${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# } elseif {${configure.build_arch} eq "ppc"} {
</span> # configure.cflags-append -fno-altivec
# configure.cxxflags-append -fno-altivec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# } elseif {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# } elseif {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append --build=${configure.build_arch}-apple-${os.platform}${os.version}
</span> # }
#}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/Portfile b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21baf82b495..7888c89f77a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ depends_lib-append \
</span>
# libsdl2 requires minimum Xcode 10.7 SDK to build successfully, but builds on 10.6 x86.
# On earlier systems and all PPC use libsdl1 instead.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && (${os.major} < 10 || ${build_arch} in [list ppc ppc64])} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && (${os.major} < 10 || ${configure.build_arch} in [list ppc ppc64])} {
</span> depends_lib-append port:libsdl
configure.args-append \
-Dsdl2=disabled \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@ if {[string match *gcc* ${configure.compiler}]} {
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> patchfiles-append patch-gegl-opencl-fix-Leopard-and-less-only.diff
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,14 +125,14 @@ platform darwin powerpc {
</span> #platform darwin {
# if {[variant_isset universal]} {
# # In order to build universal on Leopard, you need MacPorts 2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set merger_configure_args(x86_64) --build=${configure.build_arch}-apple-${os.platform}${os.version}
</span> # set merger_configure_cflags(ppc) -fno-altivec
# set merger_configure_cxxflags(ppc) -fno-altivec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# } elseif {${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# } elseif {${configure.build_arch} eq "ppc"} {
</span> # configure.cflags-append -fno-altivec
# configure.cxxflags-append -fno-altivec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# } elseif {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# } elseif {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append --build=${configure.build_arch}-apple-${os.platform}${os.version}
</span> # }
#}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphene/Portfile b/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58a52ddc1cb..6e14d47cd3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ post-patch {
</span> # as the fallthrough to malloc returns aligned memory. Passes all tests.
# Patch is needed for Rosetta as well.
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> patchfiles-append patch-graphene-leopard.diff
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,9 +66,9 @@ variant tests description "support running tests" {
</span> # the original motivation for this somewhat unusual pattern of supported_archs being set
# was here: https://github.com/macports/macports-ports/pull/2095#issuecomment-401559487
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} eq "arm64"} {
</span> supported_archs arm64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${configure.build_arch} eq "i386" || ${configure.build_arch} eq "x86_64"} {
</span> supported_archs i386 x86_64
} else {
supported_archs ppc ppc64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libavif/Portfile b/multimedia/libavif/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 112619516d3..d907f2ce398 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libavif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libavif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ configure.args-append -DAVIF_ENABLE_WERROR:BOOL=OFF \
</span> -DAVIF_CODEC_SVT:BOOL=ON
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> # TODO: Disable rav1e on <10.6, due to issues with cargo-c; enable if fixed.
# Do not enable on PPC until Rust is fixed or it becomes possible to build with gccrs.
# See: https://trac.macports.org/ticket/65434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libheif/Portfile b/multimedia/libheif/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06a67269db6..d067af0d378 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libheif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libheif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ platform darwin {
</span> -Wno-error=unknown-warning-option
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> # TODO: Disable rav1e on <10.6, due to issues with cargo-c; enable if fixed.
# Do not enable on PPC until Rust is fixed or it becomes possible to build with gccrs.
# See: https://trac.macports.org/ticket/65434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/Portfile b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cbcea8e9407..ae97c21c7b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +111,7 @@ if {${name} eq ${subport}} {
</span> use_parallel_build yes
platform macosx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10 || (${os.major} == 10 && ${build_arch} eq "ppc")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10 || (${os.major} == 10 && ${configure.build_arch} eq "ppc")} {
</span> # See: https://trac.macports.org/ticket/60385
# clang does not work for ppc on 10.6.8 Rosetta
# See also: https://trac.macports.org/ticket/65613
</pre><pre style='margin:0'>
</pre>