<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/cd43f48727eaac8ae912dc7add55f6c167f862c0">https://github.com/macports/macports-ports/commit/cd43f48727eaac8ae912dc7add55f6c167f862c0</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 cd43f48 minivmac: Update to 36.04
</span>cd43f48 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd43f48727eaac8ae912dc7add55f6c167f862c0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jun 23 04:32:27 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac: Update to 36.04
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The configuration system has changed from a 68K Macintosh application
</span><span style='display:block; white-space:pre;color:#404040;'> that must be run within Mini vMac to a C program that can be compiled
</span><span style='display:block; white-space:pre;color:#404040;'> and run on macOS. This lets us throw out all the code for running a
</span><span style='display:block; white-space:pre;color:#404040;'> bootstrap copy of Mini vMac and shuttling data between the build machine
</span><span style='display:block; white-space:pre;color:#404040;'> and the emulator, which makes the build much faster. It also means the
</span><span style='display:block; white-space:pre;color:#404040;'> port can now be built without needing the Macintosh Plus ROM file.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This change was originally made in minivmac-devel 11 months ago; for
</span><span style='display:block; white-space:pre;color:#404040;'> that change, see 6410c31b87a9ecb924a4f023065057d88ea03086.
</span>---
emulators/minivmac/Portfile | 342 ++++-----------------
.../files/AutomaticGraphicsSwitching.patch | 37 ---
.../minivmac/files/README-binary-patchfiles.md | 53 ----
emulators/minivmac/files/README-custom.md | 4 -
emulators/minivmac/files/Retina.patch | 11 -
emulators/minivmac/files/SaveDialogDisable.patch | 113 -------
emulators/minivmac/files/configuration.patch | 14 +
emulators/minivmac/files/configure | 13 +
.../minivmac/files/patch-Disk Tools.image.bsdiff | Bin 1174 -> 0 bytes
.../minivmac/files/patch-autquit7-1.3.1.dsk.bsdiff | Bin 1624 -> 0 bytes
emulators/minivmac/files/readalias.applescript | 12 -
11 files changed, 93 insertions(+), 506 deletions(-)
<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 711d2f0..5851bee 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;'>@@ -9,7 +9,7 @@ set my_suffix {}
</span> name ${my_name}${my_suffix}
set my_subport [regsub -- {-devel$} ${subport} {}]
conflicts [lsearch -all -inline -not -exact [list ${my_subport} ${my_subport}-devel] ${subport}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 36.04
</span> set my_version [strsed ${version} {g/^.*-20//}]
categories emulators aqua
maintainers {ryandesign @ryandesign}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ if {${my_subport} eq ${my_name}} {
</span> 128K, 512K, 512Ke, SE, SE FDHD, Classic, or \
Macintosh II.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> supported_archs noarch
depends_run port:${my_name}-plus${my_suffix}
distfiles
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,275 +58,133 @@ if {${my_subport} eq ${my_name}} {
</span> } else {
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> supported_archs i386 ppc x86_64
distname ${my_name}-${my_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_zip yes
</span>
master_sites http://www.gryphel.org/d/minivmac/minivmac-${my_version}/:minivmacsource \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceforge:project/minivmac/minivmac-extras/extras6:minivmacextras6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceforge:project/minivmac/minivmac-extras/extras11:minivmacextras11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.ryandesign.com/macports/distfiles/minivmac:bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Macintosh/System/Older_System/System_7.0.x/:apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_src ${distname}.src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_src_distfile ${my_src}.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_bootstrap_distfile ${my_name}-bootstrap-3.5.8_4.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_icons icnsosx-1.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_icons_distfile ${my_icons}.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_autoquit autquit7-1.3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_autoquit_distfile ${my_autoquit}.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_system_disk_container System_7.0.1.smi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_system_disk_container_distfile ${my_system_disk_container}.bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sourceforge:project/minivmac/minivmac-extras/extras6:minivmacextras6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_src ${distname}.src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_src_distfile ${my_src}.tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_icons icnsosx-1.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_icons_distfile ${my_icons}.zip
</span>
distfiles ${my_src_distfile}:minivmacsource \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_bootstrap_distfile}:bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_icons_distfile}:minivmacextras6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_autoquit_distfile}:minivmacextras11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_system_disk_container_distfile}:apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${my_icons_distfile}:minivmacextras6
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.only ${my_src_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_bootstrap_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_icons_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_autoquit_distfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.only ${my_src_distfile}
</span>
checksums ${my_src_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 818b45d1ee993c28ab36be3370f059b32ba8f1f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9cf58688772d1cd0b4c061148b01f3c6ee32567b07773cc2ed63246d2fb3af61 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 677097 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_bootstrap_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a15361b4b0d765e55ed84525593639b38e4a71fd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ad08da6cfdf616d67664520eb2dd787632c502c43ff6355ac6e3a7fc8d53e811 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 148787 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 613534f9aa4fd779d245f5511731617df4da3bb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9b7343cec87723177a203e69ad3baf20f49b4e8f03619e366c4bf2705167dfa4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 500742 \
</span> ${my_icons_distfile} \
rmd160 cef6d7d7578464538d0042b0d98379ae7f18fab7 \
sha256 968a0bad51903c9cd3b08476ec5a6572856dc44eedf9ff9b174eb9c59b7b7117 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 60373 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_autoquit_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 949ce06752fbcfa9a92787497dace45e7299eb41 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a9aad37cfd2d6dbd4db5e307b8598348ba25aa5504aac968b8d570d5927e576a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 52341 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${my_system_disk_container_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 89fc3780c9c5d575a8da4068dc810c1f56c70211 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d78e1c52a6f16ba14907cbe816a22a43f8aa8e1a9c4f664d3b7d5d982a9baab2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5147648
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 60373
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_extract port:bsdiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract-append bin:unzip:unzip
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:timeout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck unzip
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck bsdiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timeout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles configuration.patch
</span>
set my_app_dir "${applications_dir}/Mini vMac"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_rom_dir "~/Library/Preferences/Gryphel/mnvm_rom"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_bootstrap_app "Mini vMac Bootstrap.app"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_rom_file vMac.ROM
</span>
set mnvm_target(i386) imch
set mnvm_target(ppc) mach
set mnvm_target(x86_64) mc64
# Options that are the same for every variation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args -maintainer MacPorts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -homepage https://www.macports.org \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -cl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -eol unx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -api cco \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args -api cco \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -gse 1 \
</span> -sony-sum 1 \
-sony-tag 1
<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;'>- configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -e xcd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -ev [lindex ${xcodeversion_split} 0][string range [join [lrange ${xcodeversion_split} 1 end] {}] 0 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Options set by variations.
configure.args
# Options set by variants.
configure.post_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The number of seconds to wait before killing the bootstrap process, in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # case it gets stuck.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_bootstrap_timeout 30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[my_real_rom_file] eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "****************************************************************"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "To build Mini vMac, you will need a ROM file from a Macintosh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Plus or 512Ke. And to run it, you need a ROM file from the type"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "of Mac you want to emulate. ROM files are not included with this"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "package because they are copyrighted Apple software."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "To create a ROM file, download the CopyRoms program from"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "http://www.gryphel.org/c/minivmac/extras/copyroms/index.html"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "and transfer it to a real physical early Macintosh that you own."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Run the CopyRoms program there, then transfer the ROM file back"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "to this Mac and put it in ${my_rom_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "(which can be an alias or symlink if desired) or"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "${my_app_dir}."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "****************************************************************"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "${my_rom_file} not found"
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${my_name}
</span> build.dir ${workpath}/build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.mkdir yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mnvm_data_dir ${worksrcpath}/${my_bootstrap_app}/Contents/mnvm_dat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mnvm_output_dir ${mnvm_data_dir}/out
</span>
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Decompress the system disk container image.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Decompressing ${my_system_disk_container_distfile}."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_system_disk_container_decompressed "[file rootname ${my_system_disk_container}].dmg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "hdiutil convert '${distpath}/${my_system_disk_container_distfile}' -format UDRO -o '${my_system_disk_container_decompressed}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The images on the container image. Images we don't need are commented out for future reference.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_images {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {Disk Tools.image} 58368 eb1979132c843560ebab490faeb7520d9a94757ecef3121a21abace8d3ae63ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# {Fonts.image} 427264 8b06f086a96b75bd23b16ae018bd334696239cb56e65bfa20166ea00d14cdef0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# {Install 1.image} 796160 8c3ea898eeb88b795041108cd8a09bf4ebdf920d7d4763e4419df14713dbd952
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# {Install 2.image} 1165056 0fc558475df55f3aed217d2eceebfa29e4a465a795807cd627b258740a9ec55b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# {Printing.image} 1533952 246cbf69ad1c2e588ee482fddec781135a67fbfe02734bb0f732eb055faa15fa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# {Tidbits.image} 1902848 3e3600bed1b5c7c595bc176b5eaadcc8c1517032489efc548b9b781c0ee1f062
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extract the disk images from the system disk container image. `hdiutil` on OS X 10.8 Mountain Lion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # does not mount this disk image correctly, so extract the files manually using `dd`.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {my_image_filename my_image_offset my_image_sha256} ${my_images} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Extracting ${my_image_filename} from ${my_system_disk_container_decompressed}."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "dd if='${my_system_disk_container_decompressed}' bs=4 count=368661 skip=${my_image_offset} of='${my_image_filename}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${my_image_sha256} ne [sha256 file ${worksrcpath}/${my_image_filename}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "extract failed"
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Delete temporary files we no longer need.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${worksrcpath}/${my_system_disk_container_decompressed}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Symlink the ROM file into the data directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s [my_real_rom_file] ${mnvm_data_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use the prettier icon on the bootstrap app.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${worksrcpath}/${my_icons}/icons/AppIcon.icns ${worksrcpath}/${my_bootstrap_app}/Contents/Resources/ICONAPPO.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "unzip -q '${distpath}/${my_icons_distfile}'"
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # See README-binary-patchfiles.md in the files directory for instructions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # on recreating these binary patchfiles.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Modify the AutQuit7 disk to have an alias "app" pointing to the MnvM_b35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # application and an 8192-byte TeachText file called "doc" (containing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "@START@", 8180 periods and spaces, and "@END@").
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/${my_autoquit} "${prefix}/bin/bspatch '${my_autoquit}.dsk' '${my_autoquit}.dsk.tmp' '${filespath}/patch-${my_autoquit}.dsk.bsdiff'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force "${worksrcpath}/${my_autoquit}/${my_autoquit}.dsk.tmp" "${worksrcpath}/${my_autoquit}/${my_autoquit}.dsk"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Modify the Disk Tools disk to have an alias of AutQuit7 in the Startup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Items folder.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${prefix}/bin/bspatch 'Disk Tools.image' 'Disk Tools.image.tmp' '${filespath}/patch-Disk Tools.image.bsdiff'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move -force "${worksrcpath}/Disk Tools.image.tmp" "${worksrcpath}/Disk Tools.image"
</span><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;'>+ reinplace "s|@IDE_VERS@|${ide_vers}|g" ${worksrcpath}/setup/CONFIGUR.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use prettier icons.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach icon {App Dsk Rom} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${workpath}/${my_icons}/icons/${icon}Icon.icns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/ICON[string toupper ${icon}]O.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${workpath}/${my_icons}
</span> }
configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -W ${filespath} configure ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set my_variation_dirs {}
# Delete remnants from possible previous run.
delete ${build.dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copy the disk images into the data directory with sequentially-numbered
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # names so Mini vMac will find them and automatically mount them.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force "${worksrcpath}/Disk Tools.image" ${mnvm_data_dir}/disk1.dsk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${worksrcpath}/${my_src}/${my_src}.dsk ${mnvm_data_dir}/disk3.dsk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Configure all variations.
foreach my_arch [get_canonical_archs] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${build.dir}/${my_arch}
</span> foreach {my_machine my_variation_options} ${my_variations} {
set my_variation ${my_version}_${revision}-[strsed [string tolower ${my_machine}] {g/[^a-z0-9_-]//}]-$mnvm_target(${my_arch})
ui_debug "Configuring ${my_variation}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_variation_dir ${my_arch}/${my_machine}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${build.dir}/${my_variation_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args -t $mnvm_target(${my_arch}) \
-n ${my_variation} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ \
</span> {*}${my_variation_options}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set max_configure_args_length 8192
</span> set all_configure_args [concat ${configure.pre_args} ${configure.args} ${configure.post_args}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set padded_configure_args [format "%-${max_configure_args_length}s" ${all_configure_args}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string length ${padded_configure_args}] > ${max_configure_args_length}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "configure args too long"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Run the configure script.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${build.dir}/${my_variation_dir} "CC='${configure.cc}' CFLAGS='${configure.optflags}' ${worksrcpath}/configure ${all_configure_args}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the right compiler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|gcc|${configure.cc}|g" ${build.dir}/${my_variation_dir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the right deployment target.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s|-mmacosx-version-min=[0-9.]+||g} ${build.dir}/${my_variation_dir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the right SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} eq {}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdkflags {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdkflags "-isysroot${configure.sdkroot}"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|-isysroot *\[^ \]+|${sdkflags}|g" ${build.dir}/${my_variation_dir}/Makefile
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Write the configure args into the "doc" file on the AutQuit7 disk image.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${worksrcpath}/${my_autoquit}/${my_autoquit}.dsk ${mnvm_data_dir}/disk2.dsk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|@START@\[ .\]*@END@|${padded_configure_args}|" ${mnvm_data_dir}/disk2.dsk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Launch the bootstrap Mini vMac to run the configuration. When it's done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it should automatically quit, but if not, we time out after awhile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec -ignorestderr ${prefix}/bin/timeout ${my_bootstrap_timeout} "${worksrcpath}/${my_bootstrap_app}/Contents/MacOS/minivmac" 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_src_tarball ${mnvm_output_dir}/${my_variation}.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file isfile ${my_src_tarball}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_variation_dir ${my_arch}/${my_machine}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Untar the configured source code.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir} "tar xf '${my_src_tarball}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${build.dir}/${my_variation} ${build.dir}/${my_variation_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${my_subport} eq "${my_name}-bootstrap"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Change the "export" function so that exported files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # are written to the "out" directory instead of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # prompting for a location.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/SaveDialogDisable.patch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't require the discrete GPU.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/AutomaticGraphicsSwitching.patch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Truncate icon to save space.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close [open ${build.dir}/${my_variation_dir}/src/ICONAPPO.icns w]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use prettier icons.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach icon {App Dsk Rom} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${worksrcpath}/${my_icons}/icons/${icon}Icon.icns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/${my_variation_dir}/src/ICON[string toupper ${icon}]O.icns
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use the right compiler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|gcc|${configure.cc}|g" ${build.dir}/${my_variation_dir}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use the right deployment target.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|-mmacosx-version-min=[0-9.]+||g} ${build.dir}/${my_variation_dir}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use the right SDK.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} eq {}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdkflags {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdkflags "-isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|-isysroot *\[^ \]+|${sdkflags}|g" ${build.dir}/${my_variation_dir}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable Retina display support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/Retina.patch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Prevent merge error.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|$mnvm_target(${my_arch})|umch|" ${build.dir}/${my_variation_dir}/src/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Prevent merge error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|$mnvm_target(${my_arch})|umch|" ${build.dir}/${my_variation_dir}/cfg/Info.plist
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If no variation directories were produced by configuration, something went
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # horribly wrong.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${my_variation_dirs} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "configuration failed!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Set up the global Makefile.
xinstall ${filespath}/Makefile.in ${build.dir}/Makefile
reinplace "s|@SUBDIRS@|[join ${my_variation_dirs}]|" ${build.dir}/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -350,7 +208,6 @@ if {${my_subport} eq ${my_name}} {
</span> }
foreach {my_machine unused} ${my_variations} {
set my_dest_mnvm_dat "${destroot}${my_app_dir}/Mini vMac ${my_machine}.app/Contents/mnvm_dat"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${my_dest_mnvm_dat}
</span> destroot.keepdirs-append ${my_dest_mnvm_dat}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -493,54 +350,7 @@ subport ${my_name}-custom${my_suffix} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# To build the bootstrap application, use:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sudo port destroot minivmac bootstrap=yes subport=minivmac-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The subport is hidden because it is useful only to the port maintainer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[tbool bootstrap]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport ${my_name}-bootstrap${my_suffix} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my_variations {Bootstrap} {-m Plus -as 0 -bg 1 -mf 1 -sound 0 -speed a -var-fullscreen 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Mini vMac Bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description A copy of Mini vMac specially configured to be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- used to build other copies of Mini vMac.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:p7zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p7zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}${supported_archs}
</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;'>- macosx_deployment_target 10.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set output_archive ${workpath}/${my_name}-bootstrap-${version}_${revision}.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec 7za a ${output_archive} ${destroot}${my_app_dir}/${my_bootstrap_app}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "The distribution zip file has been created:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "${output_archive}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal] && [lsort ${configure.universal_archs}] eq [lsort ${supported_archs}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "This file contains all the necessary architectures and"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "can be distributed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "DON'T DISTRIBUTE THIS FILE! It doesn't contain all the"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "necessary architectures. To build a distributable"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "bootstrap app, use the universal variant and build on"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Mac OS X Leopard or Snow Leopard."
</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;'>- }
</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;'>-if {${my_subport} ni [list "${my_name}" "${my_name}-bootstrap" "${my_name}-custom"]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${my_subport} ni [list "${my_name}" "${my_name}-custom"]} {
</span> description a Macintosh [lindex ${my_variations} 0] emulator
long_description-append This subport emulates a Macintosh \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -631,23 +441,3 @@ if {${my_subport} ni [list "${my_name}" "${my_name}-bootstrap" "${my_name}-custo
</span> default_variants +speed_${default_speed}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Returns the full path to the ROM file, wherever the user has it,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# or the empty string if the user doesn't have it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc my_real_rom_file {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global my_app_dir my_rom_dir my_rom_file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${my_app_dir}/${my_rom_file}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${my_app_dir}/${my_rom_file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_real_rom_dir [my_read_alias ${my_rom_dir}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${my_real_rom_dir}/${my_rom_file}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${my_real_rom_dir}/${my_rom_file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ""
</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;'>-# Resolves a Mac OS X alias.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc my_read_alias {file} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global filespath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [exec osascript ${filespath}/readalias.applescript [file normalize ${file}]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/AutomaticGraphicsSwitching.patch b/emulators/minivmac/files/AutomaticGraphicsSwitching.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 20be305..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/AutomaticGraphicsSwitching.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.gryphel.com/c/mail/v8.html#m0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://developer.apple.com/library/archive/qa/qa1734/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://developer.apple.com/library/archive/technotes/tn2229/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Info.plist.orig 2018-06-22 05:58:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Info.plist 2018-06-22 06:01:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,4 +3,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <plist version="1.0">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>NSSupportsAutomaticGraphicsSwitching</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleDevelopmentRegion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>English</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/OSGLUCCO.m.orig 2018-06-09 03:53:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/OSGLUCCO.m 2018-06-22 06:33:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,6 +51,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct __CFError * CFErrorRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NSOpenGLPFAAllowOfflineRenderers (NSOpenGLPixelFormatAttribute)96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if MAC_OS_X_VERSION_10_6 > MAC_OS_X_VERSION_MAX_ALLOWED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3160,2 +3162,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSOpenGLPixelFormatAttribute attr[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSOpenGLPFAAllowOfflineRenderers,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3164,2 +3167,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_10_5 > MAC_OS_X_VERSION_MIN_REQUIRED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (nil == fmt) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* NSOpenGLPFAAllowOfflineRenderers is not supported; remove it */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attr[0] = (NSOpenGLPixelFormatAttribute)0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (nil == fmt) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/README-binary-patchfiles.md b/emulators/minivmac/files/README-binary-patchfiles.md
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9803961..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/README-binary-patchfiles.md
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Creating binary patches
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## Prerequisites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* A copy of Mini vMac with support for writing to Disk Copy 4.2 images: either a version earlier than 3.2.2, or version 3.2.2 or later compiled with the build options `-sony-sum 1 -sony-tag 1`. The default Gryphel builds do not use these options but the default MacPorts builds do.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Disk Tools.image and Tidbits.image disk images from the System 7.0.1.smi disk image from Apple's legacy download area.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* autquit7-1.3.1.dsk (or other version) and the latest minivmac*.src.dsk disk images from the Mini vMac web site.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* A disk image with a copy of ResEdit 2.1.3 (optional).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## Create patch-autquit7-1.3.1.dsk.bsdiff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Boot Mini vMac with Disk Tools.image
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Get a fresh copy of autquit7-1.3.1.dsk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Make a copy called autquit7-1.3.1.dsk.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Mount autquit7-1.3.1.dsk in Mini vMac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Make the "app" alias:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Get the latest minivmac*.src.dsk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Mount minivmac*.src.dsk in Mini vMac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Select the MnvM_b35 application on the MnvM_b35 volume
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Choose Make Alias from the File menu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Rename the alias to "app"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copy the alias to the AutQuit7 volume
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Make the "doc" file:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Mount Tidbits.image in Mini vMac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Open TeachText on the Tidbits volume
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Type "@START@", 8180 spaces and/or periods, "@END@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Save as "doc" on the AutQuit7 volume
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Use "Get Info" in the Finder to verify the file is exactly 8192 bytes long
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Close all windows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Choose Shut Down from the Special menu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Run `bsdiff autquit7-1.3.1.dsk.orig autquit7-1.3.1.dsk patch-autquit7-1.3.1.dsk.bsdiff`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## Create patch-Disk Tools.image.bsdiff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Get a fresh copy of Disk Tools.image
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Make a copy called Disk Tools.image.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Boot Mini vMac with Disk Tools.image
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Make the AutQuit7 alias:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Mount autquit7-1.3.1.dsk in Mini vMac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Select the AutQuit7 application on the AutQuit7 volume
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Choose Make Alias from the File menu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Open the System Folder on the Disk Tools volume
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Copy the alias into the Startup Items folder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* [Disable Finder zoom rects](http://tidbits.com/static/html/TidBITS-099.html#lnk5) (optional, now that the build script no longer depends on precise timing):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Mount an image containing ResEdit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Open the Finder in ResEdit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Open CODE resource 4, decompressing it when prompted
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Find hex 4E56 FFE0 48E7 1F38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Change to 205F 700A DEC0 4ED0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Save and quit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Close all windows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Choose Shut Down from the Special menu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Run `bsdiff 'Disk Tools.image.orig' 'Disk Tools.image' 'patch-Disk Tools.image.bsdiff'`
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/README-custom.md b/emulators/minivmac/files/README-custom.md
</span><span style='display:block; white-space:pre;color:#808080;'>index f749f83..b46f102 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/README-custom.md
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/files/README-custom.md
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,10 +23,6 @@ reflect those changes immediately:
</span> You should not specify the target (the `-t` option); MacPorts sets it for
you.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-If an error occurs during configuration, the Mini vMac 3.5.x build system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-won't tell you what went wrong. This problem is fixed in Mini vMac 36.x,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-which is available in the minivmac-custom-devel port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ## Example Configuration File
For example, to compile a Macintosh Plus variation designed to be used in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/Retina.patch b/emulators/minivmac/files/Retina.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63faa15..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/Retina.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.gryphel.com/c/mail/v8.html#m86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.gryphel.com/c/mail/v8.html#m88
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Info.plist.orig 2018-06-13 13:24:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Info.plist 2018-06-13 18:33:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,4 +70,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>LSRequiresCarbon</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>1</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>NSHighResolutionCapable</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/SaveDialogDisable.patch b/emulators/minivmac/files/SaveDialogDisable.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 55cafe3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/SaveDialogDisable.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,113 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Backport the effects of the "-svd 0" configuration flag introduced in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-36.00alpha20180520 and fix a bug that prevented it from being able to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-create the "out" directory on 10.6 and earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gist.github.com/ryandesign/a7fdea794e1b84a01f15536fabe7f9ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CNFGRAPI.h.orig 2018-06-18 10:41:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CNFGRAPI.h 2018-06-18 15:48:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RomFileName "vMac.ROM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define EnableDragDrop 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SaveDialogEnable 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define EnableAltKeysMode 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SwapCommandControl 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define VarFullScreen 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/OSGLUCCO.m.orig 2017-07-06 21:15:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/OSGLUCCO.m 2018-06-18 15:45:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3960,6 +3960,67 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>-+#if IncludeSonyNew && ! SaveDialogEnable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LOCALFUNC blnr FindOrMakeNamedChildDirPath(NSString *parentPath,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *ChildName, NSString **childPath)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSString *r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BOOL isDir;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Boolean isDirectory;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSFileManager *fm = [NSFileManager defaultManager];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ blnr v = falseblnr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (FindNamedChildPath(parentPath, ChildName, &r)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([fm fileExistsAtPath:r isDirectory: &isDir])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (isDir) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *childPath = r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ v = trueblnr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSString *RslvPath = MyResolveAlias(r, &isDirectory);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (nil != RslvPath) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (isDirectory) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *childPath = RslvPath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ v = trueblnr;
</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;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([fm respondsToSelector:@selector(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+createDirectoryAtPath:withIntermediateDirectories:attributes:error:
</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;'>-+ if ([fm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ createDirectoryAtPath:r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ withIntermediateDirectories:NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attributes:nil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error:nil])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *childPath = r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ v = trueblnr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([fm respondsToSelector:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @selector(createDirectoryAtPath:attributes:)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([fm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ createDirectoryAtPath:r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ attributes:nil])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *childPath = r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ v = trueblnr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* fail */
</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;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface MyNSSavePanel : NSObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (NSInteger)runModalForDirectory:(NSString *)path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file:(NSString *)filename;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3969,6 +4030,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if IncludeSonyNew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOCALPROC MakeNewDisk(ui5b L, NSString *drivename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if SaveDialogEnable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSInteger result = NSCancelButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSSavePanel *panel = [NSSavePanel savePanel];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4026,12 +4088,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSString* filePath = [[panel URL] path];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MakeNewDisk0(L, filePath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* SaveDialogEnable */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSString *sPath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSString *sPath =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [myAppDir stringByAppendingPathComponent: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MakeNewDisk0(L, sPath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (FindOrMakeNamedChildDirPath(MyDataPath, "out", &sPath)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSString *filePath =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [sPath stringByAppendingPathComponent: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MakeNewDisk0(L, filePath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* SaveDialogEnable */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/configuration.patch b/emulators/minivmac/files/configuration.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5d7b398
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/files/configuration.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Some configuration options have (temporarily?) disappeared, so patch in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the right values manually.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup/CONFIGUR.i.orig 2018-07-14 11:35:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup/CONFIGUR.i 2018-09-03 10:06:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,3 +8,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ see CNFGDLFT.i and CNFGOPTS.i for things
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that can go here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define UseCmndLine 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define kMaintainerName "MacPorts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define kStrHomePage "https://www.macports.org"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define cur_ide gbk_ide_xcd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ide_vers @IDE_VERS@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/configure b/emulators/minivmac/files/configure
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8510e2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/minivmac/files/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set -eu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SCRIPT_DIR=$(dirname "$0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [ ! -f "$SCRIPT_DIR"/setup_t ] || [ -n "$(find "$SCRIPT_DIR"/setup -type f -newer "$SCRIPT_DIR"/setup_t)" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Compiling setup script generator"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CC:-cc} ${CFLAGS:--Os} "$SCRIPT_DIR"/setup/tool.c -o "$SCRIPT_DIR"/setup_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "Generating setup script"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"$SCRIPT_DIR"/setup_t "$@" > setup.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+chmod a+x setup.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+echo "Running setup script"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./setup.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[ -e src ] || ln -s "$SCRIPT_DIR"/src .
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/patch-Disk Tools.image.bsdiff b/emulators/minivmac/files/patch-Disk Tools.image.bsdiff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f9ac35f..0000000
</span>Binary files a/emulators/minivmac/files/patch-Disk Tools.image.bsdiff and /dev/null differ
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/patch-autquit7-1.3.1.dsk.bsdiff b/emulators/minivmac/files/patch-autquit7-1.3.1.dsk.bsdiff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb4ef21..0000000
</span>Binary files a/emulators/minivmac/files/patch-autquit7-1.3.1.dsk.bsdiff and /dev/null differ
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac/files/readalias.applescript b/emulators/minivmac/files/readalias.applescript
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6c77a2d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac/files/readalias.applescript
</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;'>-on run argv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tell application "Finder"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set the_path to item 1 of argv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- Will throw an error if the_path does not exist.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set the_item to POSIX file the_path as alias
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- Will throw an error if the_item is not an alias.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return POSIX path of (original item of the_item as text)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return the_path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end tell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-end run
</span></pre><pre style='margin:0'>
</pre>