[61503] trunk/dports/emulators/minivmac
ryandesign at macports.org
ryandesign at macports.org
Sun Dec 13 05:03:54 PST 2009
Revision: 61503
http://trac.macports.org/changeset/61503
Author: ryandesign at macports.org
Date: 2009-12-13 05:03:51 -0800 (Sun, 13 Dec 2009)
Log Message:
-----------
minivmac: update to 3.1.3, making this port the same as minivmac-devel was at r59049
Revision Links:
--------------
http://trac.macports.org/changeset/59049
Modified Paths:
--------------
trunk/dports/emulators/minivmac/Portfile
trunk/dports/emulators/minivmac/files/configure.applescript.in
Added Paths:
-----------
trunk/dports/emulators/minivmac/files/Disk Tools.dsk.bsdiff
Modified: trunk/dports/emulators/minivmac/Portfile
===================================================================
--- trunk/dports/emulators/minivmac/Portfile 2009-12-13 12:54:25 UTC (rev 61502)
+++ trunk/dports/emulators/minivmac/Portfile 2009-12-13 13:03:51 UTC (rev 61503)
@@ -5,8 +5,7 @@
name minivmac
conflicts minivmac-devel
set my_name minivmac
-version 3.0.4
-revision 3
+version 3.1.3
categories emulators aqua
maintainers ryandesign
license GPLv2
@@ -35,6 +34,8 @@
set my_src ${distname}.src
set my_src_distfile ${my_src}.zip
set my_bootstrap_distfile ${my_name}-bootstrap-3.1.2_1.zip
+set my_blanks blanks
+set my_blanks_distfile ${my_blanks}-0.2.0.zip
set my_clipin clipin-1.1.0
set my_clipin_distfile ${my_clipin}.zip
set my_icons icnsosx-1.0.0
@@ -47,19 +48,21 @@
${my_bootstrap_distfile}:macports \
${my_icons_distfile}:minivmac \
${my_clipin_distfile}:minivmac \
+ ${my_blanks_distfile}:minivmac \
${my_system_disk_container_distfile}:apple
extract.only \
${my_src_distfile} \
${my_bootstrap_distfile} \
${my_icons_distfile} \
+ ${my_blanks_distfile} \
${my_clipin_distfile}
checksums \
${my_src_distfile} \
- md5 ab308459e98bd5103ad8bbb7dd158eb6 \
- sha1 ff99aa72da0868a5306631f0d06ae190cbd2a03a \
- rmd160 b8f1f5269d21835ff3e9e428da12a7b6c224e60e \
+ md5 5243ae167cc00920e03b4abca2b40af5 \
+ sha1 b9967ac258baf1a15785e884c306bf0d42097d45 \
+ rmd160 2af69ebf5420f8f8d0baece03664dc7326e13e38 \
${my_bootstrap_distfile} \
md5 65fa9b7fb19a24dc6c9e711387c1bc30 \
sha1 4ad44559e75894d45e91ae62cc7ddb420062f968 \
@@ -72,6 +75,10 @@
md5 e094de97d1c6c214a80fb74895124c3e \
sha1 725f622ad6681c77e7f9f4a64d05ac1d6a103beb \
rmd160 5699b56c8db62b2568c8de88b6d419180b1fb73d \
+ ${my_blanks_distfile} \
+ md5 b16321d0d78048d5ec9b635f4f86b19c \
+ sha1 9b8d7e77bd05633709907f8806d976279d7a20b7 \
+ rmd160 a0784c17c5a5ca2e159762fb836c1c800762b213 \
${my_system_disk_container_distfile} \
md5 8a4776350b15b5a516cdf7dd18e27290 \
sha1 d4c8b8653de9c7a9b2594dd6126ec7120e3e2e9e \
@@ -79,20 +86,32 @@
depends_extract \
port:macutil \
+ port:bsdiff \
bin:expect:expect
set my_app_dir "${applications_dir}/Mini vMac"
set my_rom_dir "~/Library/Preferences/Gryphel/mnvm_rom"
set my_bootstrap_app "Mini vMac Bootstrap.app"
set my_rom_file vMac.ROM
-set my_base_options "-maintainer MacPorts -homepage http://www.macports.org/ -cl -eol unx -nex -im 1"
+set my_base_options "-maintainer MacPorts -homepage http://www.macports.org/ -cl -eol unx -nex"
set my_archs {}
options my_variations
-default my_variations {}
+my_variations {128K} {-m 128K} \
+ {512K} {-m 128K -mem 512K} \
+ {512Ke} {-m 512Ke} \
+ {Plus} {-m Plus -im 1} \
+ {SE} {-m SE} \
+ {SE FDHD} {-m SEFDHD} \
+ {Classic} {-m Classic}
-# The universal variant is disabled until MacPorts 1.8.2 is released
-# and this port is upgraded to version 3.1.x final.
+variant unsupported description {Also build unfinished Macintosh II and IIx emulators} {
+ my_variations-append \
+ {II} {-m II -mem 8M -hres 800 -vres 600 -depth 3} \
+ {IIx} {-m IIx -mem 8M -hres 800 -vres 600 -depth 3}
+}
+
+# The universal variant is disabled until MacPorts 1.8.2 is released.
if {0} {
# To build the bootstrap, use "sudo port install bootstrap=yes".
# The variant is hidden because it is useful only to the port maintainer.
@@ -152,11 +171,15 @@
# Decode the system disk container image.
my_system "sh ${filespath}/demacbinary.sh ${distpath}/${my_system_disk_container_distfile} ${worksrcpath}"
- # Copy the Disk Tools image from the container image.
+ # Copy the Disk Tools image from the container image. The binary patchfile applied with bspatch
+ # places an alias of the output disk at System Folder:Preferences:Gryphel:Build:output.
set my_system_disk_container_mount [my_attach_disk_image ${worksrcpath}/${my_system_disk_container}]
- file copy "${my_system_disk_container_mount}/Disk Tools.image" "${worksrcpath}/Disk Tools.dsk"
+ my_system "bspatch '${my_system_disk_container_mount}/Disk Tools.image' '${worksrcpath}/Disk Tools.dsk' '${filespath}/Disk Tools.dsk.bsdiff'"
my_detach_disk_image ${my_system_disk_container_mount}
+ # Get a large empty disk image to store the output.
+ my_system "unzip -q ${worksrcpath}/${my_blanks}/hfs24M.zip -d ${worksrcpath}"
+
# Make the data directory, where Mini vMac looks for the files it needs.
set my_mnvm_dat "${worksrcpath}/${my_bootstrap_app}/Contents/mnvm_dat"
file mkdir ${my_mnvm_dat}
@@ -167,8 +190,9 @@
# Symlink the disk images into the data directory with sequentially-numbered
# names so Mini vMac will find them and automatically mount them.
ln -s "${worksrcpath}/Disk Tools.dsk" "${my_mnvm_dat}/disk1.dsk"
- ln -s ${worksrcpath}/${my_src}/${my_src}.img "${my_mnvm_dat}/disk2.dsk"
- ln -s ${worksrcpath}/${my_clipin}/${my_clipin}.dsk "${my_mnvm_dat}/disk3.dsk"
+ ln -s ${worksrcpath}/output.img "${my_mnvm_dat}/disk2.dsk"
+ ln -s ${worksrcpath}/${my_src}/${my_src}.dsk "${my_mnvm_dat}/disk3.dsk"
+ ln -s ${worksrcpath}/${my_clipin}/${my_clipin}.dsk "${my_mnvm_dat}/disk4.dsk"
}
pre-configure {
@@ -176,13 +200,13 @@
xinstall -m 755 ${filespath}/configure.applescript.in ${worksrcpath}/configure.applescript
reinplace "s|@BOOTSTRAP_APP@|${my_bootstrap_app}|g" ${worksrcpath}/configure.applescript
- # Copy the source disk image to store the output.
+ # Copy the large blank disk image to store the output.
# Use the .img extension so that we can mount it on Mac OS X later.
- copy -force ${worksrcpath}/${my_src}/${my_src}.dsk ${worksrcpath}/${my_src}/${my_src}.img
+ copy -force ${worksrcpath}/hfs24M.DSK ${worksrcpath}/output.img
- # Unrestrict the permissions on the source disk image so the Build program
+ # Unrestrict the permissions on the output disk image so the Build program
# can write its output to it.
- file attributes ${worksrcpath}/${my_src}/${my_src}.img -permissions 0777
+ file attributes ${worksrcpath}/output.img -permissions 0777
# Build up the combined configure args for all variations.
set i 0
@@ -213,12 +237,12 @@
post-configure {
file mkdir ${build.dir}
set my_variation_dirs {}
- set my_src_disk_mount [my_attach_disk_image ${worksrcpath}/${my_src}/${my_src}.img]
+ set my_output_disk_mount [my_attach_disk_image ${worksrcpath}/output.img]
foreach my_arch ${my_archs} {
file mkdir ${build.dir}/${my_arch}
set my_target [my_arch_to_target ${my_arch}]
foreach {my_machine unused} ${my_variations} {
- set my_src_dir ${my_src_disk_mount}/output/${version}_${revision}-[strsed [string tolower ${my_machine}] {g/[^a-z0-9_-]//}]-${my_target}
+ set my_src_dir ${my_output_disk_mount}/${version}_${revision}-[strsed [string tolower ${my_machine}] {g/[^a-z0-9_-]//}]-${my_target}
if {[file isdirectory ${my_src_dir}]} {
set my_variation_dir ${my_arch}/${my_machine}
lappend my_variation_dirs [strsed ${my_variation_dir} {g/ /\\\\ /}]
@@ -235,7 +259,7 @@
}
}
}
- my_detach_disk_image ${my_src_disk_mount}
+ my_detach_disk_image ${my_output_disk_mount}
# Set up the global Makefile.
xinstall ${filespath}/Makefile.in ${build.dir}/Makefile
@@ -304,30 +328,6 @@
}
}
-if { ![variant_isset mac128k] && ![variant_isset mac512k] && ![variant_isset mac512ke] && ![variant_isset macse] } {
- default_variants +macplus
-}
-
-variant mac128k conflicts mac512k mac512ke macplus macse description {Emulate a Macintosh with 128K RAM and 2 drives} {
- my_variations-append {128K} {-m 128K}
-}
-
-variant mac512k conflicts mac128k mac512ke macplus macse description {Emulate a Macintosh 512K with 512K RAM and 2 drives} {
- my_variations-append {512K} {-m 512K}
-}
-
-variant mac512ke conflicts mac128k mac512k macplus macse description {Emulate a Macintosh 512Ke with 512K RAM and 6 drives} {
- my_variations-append {512Ke} {-m 512Ke}
-}
-
-variant macplus conflicts mac128k mac512k mac512ke macse description {Emulate a Macintosh Plus with 4 MB RAM and 6 drives} {
- my_variations-append {Plus} {-m Plus}
-}
-
-variant macse conflicts mac128k mac512k mac512ke macplus description {Emulate a Macintosh SE with 4 MB RAM and 6 drives} {
- my_variations-append {SE} {-m SE}
-}
-
# Converts normal arch names into Mini vMac target names.
proc my_arch_to_target {arch} {
switch ${arch} {
Copied: trunk/dports/emulators/minivmac/files/Disk Tools.dsk.bsdiff (from rev 61501, trunk/dports/emulators/minivmac-devel/files/Disk Tools.dsk.bsdiff)
===================================================================
(Binary files differ)
Modified: trunk/dports/emulators/minivmac/files/configure.applescript.in
===================================================================
--- trunk/dports/emulators/minivmac/files/configure.applescript.in 2009-12-13 12:54:25 UTC (rev 61502)
+++ trunk/dports/emulators/minivmac/files/configure.applescript.in 2009-12-13 13:03:51 UTC (rev 61503)
@@ -16,7 +16,7 @@
set cpu_mhz to (system attribute "pclk") / 1000000
set configuration_delay to 1400 * number_of_variations / cpu_mhz
- delay 3 -- wait 1 second for each disk image Mini vMac needs to mount
+ delay 4 -- wait 1 second for each disk image Mini vMac needs to mount
my key_code(22) -- "6" -- select the 6-ClipIn program
set the clipboard to configure_args -- copy the configure args to the clipboard
@@ -29,8 +29,10 @@
my menu_file_go() -- do the build
my menu_file_quit() -- quit
my menu_file_close() -- close Finder window
- my menu_file_put_away() -- eject the minivmac disk
+ my key_code(32) -- "U" -- select the untitled output disk
+ my menu_file_put_away() -- eject the output disk
+
activate application "@BOOTSTRAP_APP@"
tell application "System Events"
tell process "Mini vMac"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091213/cdc10eba/attachment.html>
More information about the macports-changes
mailing list