<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8cccded9dadcfeb9a9d2b16dd949b19b52d664e5">https://github.com/macports/macports-ports/commit/8cccded9dadcfeb9a9d2b16dd949b19b52d664e5</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 8cccded minivmac, minivmac-devel: Use get_canonical_archs
</span>8cccded is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8cccded9dadcfeb9a9d2b16dd949b19b52d664e5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 15 00:17:46 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac, minivmac-devel: Use get_canonical_archs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> rather than implementing it manually.
</span>---
emulators/minivmac-devel/Portfile | 13 ++++---------
emulators/minivmac/Portfile | 13 ++++---------
2 files changed, 8 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/Portfile b/emulators/minivmac-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96a0a28..20ad9ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,6 @@ set my_rom_dir "~/Library/Preferences/Gryphel/mnvm_rom"
</span> set my_bootstrap_app "Mini vMac Bootstrap.app"
set my_rom_file vMac.ROM
set my_base_options "-ef 1 -maintainer MacPorts -homepage https://www.macports.org -cl -eol unx -sony-sum 1 -sony-tag 1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_archs {}
</span>
options my_variations
my_variations {128K} {-m 128K} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,12 +119,8 @@ if {[tbool bootstrap]} {
</span> variant universal {
configure.universal_args
configure.universal_archs ppc i386
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_archs ${configure.universal_archs}
</span> }
supported_archs i386 ppc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_archs ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
pre-extract {
if {[my_real_rom_file] eq ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,7 +210,7 @@ pre-configure {
</span>
# Build up the combined configure args for all variations.
set i 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_arch ${my_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch [get_canonical_archs] {
</span> set my_target [my_arch_to_target ${my_arch}]
foreach {my_machine my_variation_options} ${my_variations} {
if {${i} > 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,7 +267,7 @@ post-configure {
</span>
file mkdir ${build.dir}
set my_variation_dirs {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_arch ${my_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch [get_canonical_archs] {
</span> file mkdir ${build.dir}/${my_arch}
set my_target [my_arch_to_target ${my_arch}]
foreach {my_machine unused} ${my_variations} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -317,7 +312,7 @@ set my_share_dir ${prefix}/share/${my_name}
</span>
post-build {
set i 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_arch ${my_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch [get_canonical_archs] {
</span> set my_target [my_arch_to_target ${my_arch}]
foreach {my_machine unused} ${my_variations} {
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,7 +348,7 @@ destroot {
</span> }
# Install the programs.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_arch ${my_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch [get_canonical_archs] {
</span> if {[variant_isset universal]} {
set my_dest ${workpath}/pre-dest/${my_arch}
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/Portfile b/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ade1dc9..8fcd350 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +87,6 @@ set my_rom_dir "~/Library/Preferences/Gryphel/mnvm_rom"
</span> set my_bootstrap_app "Mini vMac Bootstrap.app"
set my_rom_file vMac.ROM
set my_base_options "-maintainer MacPorts -homepage https://www.macports.org -cl -eol unx -sony-sum 1 -sony-tag 1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_archs {}
</span>
options my_variations
my_variations {128K} {-m 128K} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,12 +115,8 @@ if {[tbool bootstrap]} {
</span> variant universal {
configure.universal_args
configure.universal_archs ppc i386
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_archs ${configure.universal_archs}
</span> }
supported_archs i386 ppc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_archs ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
pre-extract {
if {[my_real_rom_file] eq ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,7 +206,7 @@ pre-configure {
</span>
# Build up the combined configure args for all variations.
set i 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_arch ${my_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch [get_canonical_archs] {
</span> set my_target [my_arch_to_target ${my_arch}]
foreach {my_machine my_variation_options} ${my_variations} {
if {${i} > 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,7 +243,7 @@ configure {
</span> post-configure {
file mkdir ${build.dir}
set my_variation_dirs {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_arch ${my_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch [get_canonical_archs] {
</span> file mkdir ${build.dir}/${my_arch}
set my_target [my_arch_to_target ${my_arch}]
foreach {my_machine unused} ${my_variations} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,7 +288,7 @@ set my_share_dir ${prefix}/share/${my_name}
</span>
post-build {
set i 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_arch ${my_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch [get_canonical_archs] {
</span> set my_target [my_arch_to_target ${my_arch}]
foreach {my_machine unused} ${my_variations} {
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,7 +324,7 @@ destroot {
</span> }
# Install the programs.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my_arch ${my_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch [get_canonical_archs] {
</span> if {[variant_isset universal]} {
set my_dest ${workpath}/pre-dest/${my_arch}
} else {
</pre><pre style='margin:0'>
</pre>