<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/eead3a92c121d9770a85b4dfb642349eb0412180">https://github.com/macports/macports-ports/commit/eead3a92c121d9770a85b4dfb642349eb0412180</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit eead3a92c121d9770a85b4dfb642349eb0412180
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 12 18:25:53 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> minivmac-devel: Update to 36.00alpha-20180610
</span>---
emulators/minivmac-devel/Portfile | 18 ++----
.../minivmac-devel/files/patch-src-MYOSGLUE.c.diff | 67 --------------------
.../minivmac-devel/files/patch-src-MYOSGLUE.m.diff | 74 ----------------------
3 files changed, 6 insertions(+), 153 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 ecb2de6..47833c3 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 36.00alpha-20180506
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 36.00alpha-20180610
</span> set branch [join [lrange [split ${version} .] 0 1] .]
set my_version [strsed ${version} {g/^.*-20//}]
categories emulators aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ if {${subport} eq ${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;'>@@ -96,9 +96,9 @@ if {${subport} eq ${name}} {
</span> ${my_autoquit_distfile}
checksums ${my_src_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1b214640257d2df4e4448ff9f1fb479633542829 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 74d67aed4fbd5bdfb32d1b4d6417b588f736b56731150f214652a44b8757ea49 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 702294 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 04009240683beb042a25f446daea8177d19743af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0e4e9862a20bf39103999b749409db40907eef4ca575bc6c5e65590e816d0640 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 703188 \
</span> ${my_bootstrap_distfile} \
rmd160 32e803a75d4f9ab6b7dfa5a7b1ec2ef9d3a057c2 \
sha256 e6fe692683ab54e08b0350fe9901e872f7bf3c3a62f69b45773254fce45a4fae \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,12 +296,6 @@ if {${subport} eq ${name}} {
</span> system -W ${build.dir} "tar xf '${my_src_tarball}'"
move ${build.dir}/${my_variation} ${build.dir}/${my_variation_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "${my_name}-bootstrap${my_suffix}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Change the "export" function so that exported files are written to the same
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directory as Mini vMac, instead of prompting for a location.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build.dir}/${my_variation_dir} "patch -p0 < ${filespath}/patch-src-MYOSGLUE.c.diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Use the right compiler.
reinplace "s|gcc|${configure.cc}|g" ${build.dir}/${my_variation_dir}/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -421,7 +415,7 @@ subport ${my_name}-ii${my_suffix} {
</span> # The subport is hidden because it is useful only to the port maintainer.
if {[tbool bootstrap]} {
subport ${my_name}-bootstrap${my_suffix} {
<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:#e0ffe0;'>+ my_variations {Bootstrap} {-m Plus -as 0 -bg 1 -mf 1 -sound 0 -speed a -svd 0 -var-fullscreen 0}
</span>
description Mini vMac Bootstrap
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/minivmac-devel/files/patch-src-MYOSGLUE.c.diff b/emulators/minivmac-devel/files/patch-src-MYOSGLUE.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f0e3418..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/files/patch-src-MYOSGLUE.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,67 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MYOSGLUE.c.orig 2012-05-27 04:47:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MYOSGLUE.c 2013-05-21 06:49:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3436,55 +3436,19 @@
</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, CFStringRef NewDiskName)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavDialogRef theSaveDialog;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavDialogCreationOptions dialogOptions;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavReplyRecord theReply;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavEventUPP gEventProc = NewNavEventUPP(NavigationEventProc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == NavGetDefaultDialogCreationOptions(&dialogOptions)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dialogOptions.modality = kWindowModalityAppModal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dialogOptions.saveFileName = NewDiskName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == NavCreatePutFileDialog(&dialogOptions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'TEXT', 'MPS ',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gEventProc, NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &theSaveDialog))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MyBeginDialog();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void) NavDialogRun(theSaveDialog);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MyEndDialog();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == NavDialogGetReply(theSaveDialog,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &theReply))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (theReply.validRecord) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- long itemsInList;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AEKeyword keyword;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DescType typeCode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FSRef theRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Size actualSize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == AECountItems(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &theReply.selection, &itemsInList))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (itemsInList == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (noErr == AEGetNthPtr(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &theReply.selection, 1, typeFSRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &keyword, &typeCode, (Ptr)&theRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sizeof(FSRef), &actualSize))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ProcessSerialNumber currentProcess = {0, kCurrentProcess};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef fsRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef theRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (noErr == GetProcessBundleLocation(¤tProcess,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &fsRef))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (noErr == FSGetCatalogInfo(&fsRef, kFSCatInfoNone,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NULL, NULL, NULL, &theRef))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ReportStandardOpenDiskError(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MakeNewDisk0(&theRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- theReply.saveFileName, L));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NewDiskName, L));
</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;'>-- (void) NavDisposeReply(&theReply);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NavDialogDispose(theSaveDialog);
</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;'>-- DisposeNavEventUPP(gEventProc);
</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-devel/files/patch-src-MYOSGLUE.m.diff b/emulators/minivmac-devel/files/patch-src-MYOSGLUE.m.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 86686d6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/minivmac-devel/files/patch-src-MYOSGLUE.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,74 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MYOSGLUE.m.orig 2014-03-03 04:22:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MYOSGLUE.m 2014-05-22 06:54:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3506,70 +3506,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;'>-- 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;'>-- DisconnectKeyCodes3();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ForceShowCursor();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ([panel respondsToSelector:@selector(setNameFieldStringValue:)])
</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;'>-- [panel setNameFieldStringValue: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* available as of OS X 10.6 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [panel performSelector:@selector(setNameFieldStringValue:)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- withObject: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [((MyNSSavePanel *)panel)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- setNameFieldStringValue: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- result = [panel runModal];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ([panel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- respondsToSelector: @selector(runModalForDirectory:file:)])
</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;'>-- result = [panel runModalForDirectory: nil file: drivename];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- compiler warns deprecated. To avoid warning, and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- to still work if removed from SDK, use NSInvocation.
</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 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSString *sDirName = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SEL sel = @selector(runModalForDirectory:file:);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSInvocation* invoc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [NSInvocation invocationWithMethodSignature:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [panel methodSignatureForSelector: sel]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc setTarget:panel];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc setSelector:sel];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc setArgument:&sDirName atIndex:2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc setArgument:&drivename atIndex:3];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc invoke];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [invoc getReturnValue: &result];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* an easier way ? seems to work */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- result = [((MyNSSavePanel *)panel)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- runModalForDirectory: nil file: drivename];
</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;'>-- [MyWindow makeKeyWindow];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (NSOKButton == result) {
</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;'>--
</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;'>-+ MakeNewDisk0(L, [[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:drivename]);
</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></pre><pre style='margin:0'>
</pre>