<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/be57c42abbc8fe31f493552278c318c0daedae02">https://github.com/macports/macports-ports/commit/be57c42abbc8fe31f493552278c318c0daedae02</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 be57c42abbc minivmac-devel: Update to 37.00alpha-20200517
</span>be57c42abbc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit be57c42abbc8fe31f493552278c318c0daedae02
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Sep 5 22:36:29 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac-devel: Update to 37.00alpha-20200517
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build system options that we have had to patch into CONFIGUR.i ever
</span><span style='display:block; white-space:pre;color:#404040;'> since version 36 have gone back to being selectable as flags as they
</span><span style='display:block; white-space:pre;color:#404040;'> were in version 3.5.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://www.gryphel.com/c/news/nva9.html#n200517
</span>---
emulators/minivmac-devel/Portfile | 35 +++++++++++-----------
emulators/minivmac-devel/files/configuration.patch | 12 --------
2 files changed, 18 insertions(+), 29 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 da6dd4b329c..9e1746b281d 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;'>@@ -10,7 +10,7 @@ name ${my_name}${my_suffix}
</span> set my_subport [regsub -- {-devel$} ${subport} {}]
conflicts [lsearch -all -inline -not -exact [list ${my_subport} ${my_subport}-devel] ${subport}]
epoch 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 37.00alpha-20200509
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 37.00alpha-20200517
</span> set my_version [strsed ${version} {g/^.*-20//}]
categories emulators aqua
maintainers {ryandesign @ryandesign}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,9 +78,9 @@ if {${my_subport} eq ${my_name}} {
</span> extract.only ${my_src_distfile}
checksums ${my_src_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 885868cf4a5a0c3718ab7ee58c6ec09a070483a7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4e58cc9fa625a55f99f3f65d8bb045413fa668bf605d51be1bcfb9d915b8785a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 510130 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f36e5bde8640ce486469222e62895e356973f4fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 690ed11439b7f51d2f8826b0919fc1429167c42a092102ddc5305eec5551e9fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 510976 \
</span> ${my_icons_distfile} \
rmd160 cef6d7d7578464538d0042b0d98379ae7f18fab7 \
sha256 968a0bad51903c9cd3b08476ec5a6572856dc44eedf9ff9b174eb9c59b7b7117 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,17 +90,29 @@ if {${my_subport} eq ${my_name}} {
</span>
depends_skip_archcheck unzip
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles configuration.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set my_app_dir "${applications_dir}/Mini vMac"
set mnvm_target(i386) imch
set mnvm_target(ppc) mach
set mnvm_target(x86_64) mc64
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tell the build system what the Xcode version is; theoretically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this lets it use flags better suited to that Xcode version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists xcodeversion]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xcodeversion_split [concat [split ${xcodeversion} .] {0 0 0}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ide_vers [lindex ${xcodeversion_split} 0][string range [join [lrange ${xcodeversion_split} 1 end] {}] 0 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ide_vers 9410
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Options that are the same for every variation.
configure.pre_args -api cco \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -cl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -e xcd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ev ${ide_vers} \
</span> -gse 1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -homepage https://ports.macports.org/port/${subport} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -maintainer MacPorts \
</span> -sony-sum 1 \
-sony-tag 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,17 +134,6 @@ if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tell the build system what the Xcode version is; theoretically
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this lets it use flags better suited to that Xcode version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists xcodeversion]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set xcodeversion_split [concat [split ${xcodeversion} {.}] {0 0 0}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ide_vers [lindex ${xcodeversion_split} 0][string range [join [lrange ${xcodeversion_split} 1 end] {}] 0 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ide_vers 9410
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@IDE_VERS@|${ide_vers}|g" ${worksrcpath}/setup/CONFIGUR.i
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@SUBPORT@|${subport}|g" ${worksrcpath}/setup/CONFIGUR.i
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Use prettier icons.
foreach icon {App Dsk Rom} {
move -force ${workpath}/${my_icons}/icons/${icon}Icon.icns \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/files/configuration.patch b/emulators/minivmac-devel/files/configuration.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2e68c3dbe2e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/files/configuration.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup/CONFIGUR.i.orig 2020-02-24 17:30:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup/CONFIGUR.i 2020-04-14 21:11:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,3 +10,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (i.e., for gcc, using -D)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- see CNFGDLFT.i for things that can go here.
</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;'>-+#define UseCmndLine 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define kMaintainerName "MacPorts"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define kStrHomePage "https://ports.macports.org/port/@SUBPORT@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define cur_ide_xcd 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define ide_vers @IDE_VERS@
</span></pre><pre style='margin:0'>
</pre>