<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6b32f3c1fff724db6baaf4bba9e764c11a0ffb2">https://github.com/macports/macports-ports/commit/b6b32f3c1fff724db6baaf4bba9e764c11a0ffb2</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 b6b32f3c1ff basiliskii(-gui): update to 20220412, replace *-devel ports, add arm64 support.
</span>b6b32f3c1ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b6b32f3c1fff724db6baaf4bba9e764c11a0ffb2
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Mon May 16 14:10:44 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> basiliskii(-gui): update to 20220412, replace *-devel ports, add arm64 support.
</span>---
emulators/basiliskii-devel/Portfile | 138 +--------------------
emulators/basiliskii/Portfile | 102 +++++----------
.../basiliskii/files/BasiliskII_idiosyncracies.txt | 21 ----
...patch-001-Basilisk-makefile-in-ditto-patch.diff | 4 +-
...configure-ac-delete-stdlib-addition-darwin.diff | 4 +-
...i-fix-missing-keycodes-macosxgui-selection.diff | 4 +-
.../files/patch-004-arm64-mach-exceptions.diff | 28 +++++
.../basiliskii/files/patch-005-arm64-32bpp.diff | 11 ++
8 files changed, 85 insertions(+), 227 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii-devel/Portfile b/emulators/basiliskii-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a61d52ec014..34d8f97bbb7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/basiliskii-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/basiliskii-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,141 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup cebix macemu 2e302d60a337daa252c6992335e6365a9beac83f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20180225
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b7240735e8ca7ad7a263a4bb69935ad68b34a878 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dc4be91e7357b9f22343dba0de7d0d724d12031798fe7947a74074526a55b9e4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2196035
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# we need a name here as the github-supplied name is not correct for this port
</span> name basiliskii-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# at present basiliskii is best built as 32bit, so we we build the gtk2 gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# separately as a subport to avoid expensively rebuilding all of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gtk2 and all the dependencies as +universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport basiliskii-gui-devel {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20180225
</span> categories emulators
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://basilisk.cebix.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${distname}/BasiliskII/src/Unix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.optflags -O3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-001-Basilisk-makefile-in-ditto-patch.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-002-configure-ac-delete-stdlib-addition-darwin.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-003-basiliskii-fix-missing-keycodes-macosxgui-selection.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to fix an errant header owned by arpack that also provides debug.h (not a great name, arpack!)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# force finding our includes first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-prepend -I${worksrcpath}/../include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set basiliskii_dir /BasiliskII
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "basiliskii-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts basiliskii
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Opensource 68k Mac emulator.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Longstanding 68K Macintosh emulator. Requires an appropriate Macintosh ROM image and a copy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of Mac OS (0.x thru 7.5 for Classic emulation, 7.x or 8.0/8.1 for Mac II emulation), and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- these are not supplied with this port. The emulator will be installed into your \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MacPorts Applications folder.
</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;'>- variant SixtyFour description "Build 64 bit. No JIT, no networking" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # no need for gui to be same architecture as the emulator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basiliskii-gui-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:basiliskii-gui-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --disable-vosf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-esd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-sdl-video \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-sdl-audio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-jit-compiler \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-standalone-gui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gtk=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wl,-no_pie
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset SixtyFour]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-jit-compiler
</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;'>- platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # on 10.4 ppc you don't need this. On 10.5 ppc the SDL version segfaulted, so offer this version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --disable-vosf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-esd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-macosx-sound \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-macosx-gui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gtk
</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;'>- build.target BasiliskII BasiliskII_app
</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;'>- file mkdir ${destroot}${applications_dir}${basiliskii_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/BasiliskII_idiosyncracies.txt ${destroot}${applications_dir}${basiliskii_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/BasiliskII.app ${destroot}${applications_dir}${basiliskii_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/bin/BasiliskIIGUI
</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;'>-} elseif {${subport} eq "basiliskii-gui-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name basiliskii-gui-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts basiliskii-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Graphical user interface to configure basiliskii.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --disable-vosf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-esd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-standalone-gui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gtk=gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target BasiliskIIGUI_app
</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;'>- file mkdir ${destroot}${applications_dir}${basiliskii_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/BasiliskIIGUI.app ${destroot}${applications_dir}${basiliskii_dir}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # gui target insists on installing some of the basiliskii files, which conflicts with basiliskii subport
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so we manually delete these to avoid a conflict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Delete after May 16, 2023
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by basiliskii-devel
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/bin/BasiliskII
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/share/BasiliskII/fbdevices
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/share/BasiliskII/keycodes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/share/BasiliskII/tunconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/share/man/man1/BasiliskII.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/share/man/man1/BasiliskII.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport basiliskii-gui-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by basiliskii-gui
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii/Portfile b/emulators/basiliskii/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a14e40943c..ebab7c8f122 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/basiliskii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/basiliskii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,33 +3,44 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup cebix macemu 1c9b21f580501c5d5833935375945479c5651964
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20171215
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 297cd3d06818cec3e567adb0b19b3fc3d7334afb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 54064cde03e8b5b2d18f2d4bda1dae45502dfb3c94297fd1dc606ff15ef20321
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# we need a name here as the github-supplied name is not correct for this port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup cebix macemu 6393d14abf31b302d578d05da7e5ddbddd07ae45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20220412
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 86371e3fb7ee297a516d2f194348b06c98857b6f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9d37ea63ada5e28963d51b7bce6355ee28eb9263864581e75d8301a27aaff90b
</span> name basiliskii
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# at present basiliskii is best built as 32bit, so we we build the gtk2 gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# separately as a subport to avoid expensively rebuilding all of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gtk2 and all the dependencies as +universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport basiliskii-gui {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> categories emulators
license GPL-2+
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+description Opensource 68k Mac emulator.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Longstanding 68K Macintosh emulator.
</span> homepage http://basilisk.cebix.net/
worksrcdir ${distname}/BasiliskII/src/Unix
configure.cmd ./autogen.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.optflags -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-vosf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-esd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-mon \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-sdl-video \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-sdl-audio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-standalone-gui \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sdl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gtk=no
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.dir ${worksrcpath}/..
</span> patchfiles-append patch-001-Basilisk-makefile-in-ditto-patch.diff \
patch-002-configure-ac-delete-stdlib-addition-darwin.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-003-basiliskii-fix-missing-keycodes-macosxgui-selection.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-003-basiliskii-fix-missing-keycodes-macosxgui-selection.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-004-arm64-mach-exceptions.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-005-arm64-32bpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid C++20 <version> header collision on case-insensitive file systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/../slirp/VERSION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/../slirp/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_build port:autoconf \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,78 +51,33 @@ depends_build port:autoconf \
</span> configure.cppflags-prepend -I${worksrcpath}/../include
set basiliskii_dir /BasiliskII
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "basiliskii"} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts basiliskii-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Opensource 68k Mac emulator.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Longstanding 68K Macintosh emulator. Requires an appropriate Macintosh ROM image and a copy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of Mac OS (0.x thru 7.5 for Classic emulation, 7.x or 8.0/8.1 for Mac II emulation), and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- these are not supplied with this port. The emulator will be installed into your \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MacPorts Applications folder.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # no need for gui to be same architecture as the emulator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basiliskii-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:basiliskii-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --disable-vosf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-esd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-sdl-video \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-sdl-audio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-jit-compiler \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-standalone-gui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gtk=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wl,-no_pie
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}"} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # on 10.4 ppc you don't need this. On 10.5 ppc the SDL version segfaulted, so offer this version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --disable-vosf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-esd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-macosx-sound \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-macosx-gui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:libsdl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:basiliskii-gui
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target BasiliskII BasiliskII_app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target BasiliskII BasiliskII_app
</span>
post-destroot {
file mkdir ${destroot}${applications_dir}${basiliskii_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/BasiliskII_idiosyncracies.txt ${destroot}${applications_dir}${basiliskii_dir}
</span> copy ${worksrcpath}/BasiliskII.app ${destroot}${applications_dir}${basiliskii_dir}
file delete ${destroot}${prefix}/bin/BasiliskIIGUI
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${subport} eq "basiliskii-gui"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport basiliskii-gui {
</span> name basiliskii-gui
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts basiliskii-gui-devel
</span>
description Graphical user interface to configure basiliskii.
long_description ${description}
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --disable-vosf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-esd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-standalone-gui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gtk=gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gtk=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gtk=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.target BasiliskIIGUI_app
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii/files/BasiliskII_idiosyncracies.txt b/emulators/basiliskii/files/BasiliskII_idiosyncracies.txt
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1623bd022aa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/basiliskii/files/BasiliskII_idiosyncracies.txt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-BasiliskII idiosyncracies:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-BasiliskII is an older program that has been brought along through the years. There are a few idiosyncracies. It remains under active development. See <http://basilisk.cebix.net/> for more details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-There is considerable available information regarding how to set up BasiliskII, for example <http://www.emaculation.com/doku.php/basiliskii_osx_setup>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To use BasiliskII, you first configure the emulator options with the BasiliskIIGUI application. Once you have it configured the way you want, you can launch BasiliskII directly from the BasiliskIIGUI application. For future uses however, you don't need to open the BasiliskIIGUI application; you can launch the emulator directly with the BasiliskII application.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Full screen mode appears to work very well. To toggle between full screen mode and windowed mode, use control-return in the emulator. You can change screen dimensions and colour depth while in full screen mode to suit your needs, although some of the video modes and colour depths have obvious artifacts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-At present there is a bug when option-clicking in the emulator, for example when trying to move the control strip. A workaround is to option-right click with a mouse or similar device, which for the moment works as a standard option-click.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Sound appears to work in most programs, but not all. I presume some older programs directly accessed the hardware of Apple Sound chip, and these would likely be the ones that have no sound output. There is no workaround that I know of.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Sometimes, when restarting MacOS within the emulator, the emulator will crash inelegantly. It seems to depend on the screen color depth, but in an irregular and not fully predictable fashion.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The JIT (Just-In-Time) compiler is written in 32bit i386 code, so at the moment the only way to have the JIT is to compile the emulator that way. The slirp networking code also appears to be 32bit only. The default installation option is 32 bit with the current MacPorts version of BasiliskII.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It is possible to build the emulator in an x86_64 (64bit) configuration on suitable hardware. On a 64bit build, the BasiliskIIGUI might lead you to believe the JIT compiler is set, but it really isn't enabled. The JIT is not presently compatible with 64 bit mode. If you want confirmation of this, you can see details in the MacOSX Console application, or if you run the application from the command line, you will see the details there. If you have slirp networking selected and launch a 64b [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-On a 64 bit build of BasiliskII, I have noted some idiosyncracies using the mouse in the menu bar region when in full screen mode. I don't know of a workaround for this, other than to switch to a windowed mode (control-return). The 32bit builds don't appear to have this issue, and are currently the default.
</span>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii/files/patch-001-Basilisk-makefile-in-ditto-patch.diff b/emulators/basiliskii/files/patch-001-Basilisk-makefile-in-ditto-patch.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ba0e4876b8..22df9fa5c8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/basiliskii/files/patch-001-Basilisk-makefile-in-ditto-patch.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/basiliskii/files/patch-001-Basilisk-makefile-in-ditto-patch.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./Makefile.in.orig 2016-09-03 10:08:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Makefile.in 2016-09-03 10:09:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Unix/Makefile.in.orig 2016-09-03 10:08:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Unix/Makefile.in 2016-09-03 10:09:10.000000000 -0700
</span> @@ -137,7 +137,7 @@
./cpr.sh $(GUI_APP) $(GUI_APP_APP)/Contents/MacOS/
strip -x $(GUI_APP_APP)/Contents/MacOS/$(GUI_APP)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii/files/patch-002-configure-ac-delete-stdlib-addition-darwin.diff b/emulators/basiliskii/files/patch-002-configure-ac-delete-stdlib-addition-darwin.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 58bc5b1ff30..92e0416291c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/basiliskii/files/patch-002-configure-ac-delete-stdlib-addition-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/basiliskii/files/patch-002-configure-ac-delete-stdlib-addition-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-09-03 11:22:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-09-03 11:23:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Unix/configure.ac.orig 2016-09-03 11:22:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Unix/configure.ac 2016-09-03 11:23:05.000000000 -0700
</span> @@ -512,7 +512,6 @@
;;
*-*-darwin*)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii/files/patch-003-basiliskii-fix-missing-keycodes-macosxgui-selection.diff b/emulators/basiliskii/files/patch-003-basiliskii-fix-missing-keycodes-macosxgui-selection.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c20b755e658..9a248ee0a8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/basiliskii/files/patch-003-basiliskii-fix-missing-keycodes-macosxgui-selection.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/basiliskii/files/patch-003-basiliskii-fix-missing-keycodes-macosxgui-selection.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-08-19 06:18:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-09-05 10:20:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Unix/configure.ac.orig 2016-08-19 06:18:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Unix/configure.ac 2016-09-05 10:20:10.000000000 -0700
</span> @@ -713,6 +713,7 @@
if [[ "x$WANT_MACOSX_GUI" = "xyes" ]]; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii/files/patch-004-arm64-mach-exceptions.diff b/emulators/basiliskii/files/patch-004-arm64-mach-exceptions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..68b058c6770
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/basiliskii/files/patch-004-arm64-mach-exceptions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CrossPlatform/sigsegv.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CrossPlatform/sigsegv.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,24 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SIGSEGV_REGISTER_FILE ((SIGSEGV_REGISTER_TYPE *)&SIP->thr_state.MACH_FIELD_NAME(rax)) /* RAX is the first GPR we consider */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __arm64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __DARWIN_UNIX03 && defined _STRUCT_ARM_THREAD_STATE64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MACH_FIELD_NAME(X) __CONCAT(__,X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SIGSEGV_EXCEPTION_STATE_TYPE arm_exception_state64_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SIGSEGV_EXCEPTION_STATE_FLAVOR ARM_EXCEPTION_STATE64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SIGSEGV_EXCEPTION_STATE_COUNT ARM_EXCEPTION_STATE64_COUNT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SIGSEGV_FAULT_ADDRESS SIP->exc_state.MACH_FIELD_NAME(far)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SIGSEGV_THREAD_STATE_TYPE arm_thread_state64_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SIGSEGV_THREAD_STATE_FLAVOR ARM_THREAD_STATE64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SIGSEGV_THREAD_STATE_COUNT ARM_THREAD_STATE64_COUNT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SIGSEGV_FAULT_INSTRUCTION SIP->thr_state.MACH_FIELD_NAME(pc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// #define SIGSEGV_SKIP_INSTRUCTION aarch64_skip_instruction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SIGSEGV_REGISTER_FILE (SIGSEGV_REGISTER_TYPE *)&SIP->thr_state.MACH_FIELD_NAME(pc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__x86_64__) || defined(__arm64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SIGSEGV_FAULT_ADDRESS_FAST (((uint64_t)code[1])|0x100000000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SIGSEGV_FAULT_ADDRESS_FAST code[1]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii/files/patch-005-arm64-32bpp.diff b/emulators/basiliskii/files/patch-005-arm64-32bpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3d4fc51853c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/basiliskii/files/patch-005-arm64-32bpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SDL/video_sdl2.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SDL/video_sdl2.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -494,7 +494,7 @@ static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool nati
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (depth == VIDEO_DEPTH_16BIT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ layout = (screen_depth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (depth == VIDEO_DEPTH_32BIT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- layout = (screen_depth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ layout = (screen_depth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_HOST_888;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (native_byte_order)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MacFrameLayout = layout;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span></pre><pre style='margin:0'>
</pre>