<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/deb95e46a71da037f11c088a4f5a458ebc56a5fc">https://github.com/macports/macports-ports/commit/deb95e46a71da037f11c088a4f5a458ebc56a5fc</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 deb95e4 bochs: update to 2.6.8 maintainer
</span>deb95e4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit deb95e46a71da037f11c088a4f5a458ebc56a5fc
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Wed Mar 1 22:49:52 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> bochs: update to 2.6.8 maintainer
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add variants for smp, the internal debugger, avx, and relevant GUIs.
</span><span style='display:block; white-space:pre;color:#404040;'> Also change the default configure flags to loosely match those
</span><span style='display:block; white-space:pre;color:#404040;'> used for the binary version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/53671
</span>---
emulators/bochs/Portfile | 70 ++++++++++++++++++++++++-------
emulators/bochs/files/patch-.bochsrc.diff | 38 ++++++++---------
2 files changed, 73 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/bochs/Portfile b/emulators/bochs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea3cab6..10c48c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/bochs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/bochs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,15 @@
</span> PortSystem 1.0
name bochs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.8
</span> categories emulators
license LGPL-2.1+
platforms darwin
maintainers @Nax
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description cross platform ia-32 emulator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description cross platform x86 and x86_64 emulator
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Bochs is a highly portable open source IA-32 (x86) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Bochs is a highly portable open source x86 and x86_64 \
</span> PC emulator written in C++, that runs on most popular \
platforms. It emulates the Intel x86 CPU, common I/O \
devices, and a custom BIOS.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,36 +17,75 @@ long_description Bochs is a highly portable open source IA-32 (x86) \
</span> homepage http://bochs.sourceforge.net/
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 fda7eadcd9590934d2901f8439631463 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 e334d31efd79c80454018c9cdafaa0eb75cb018a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a5a52d8f58b8ad7b1d544d4f89043244d99fa242
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 79700ef0914a0973f62d9908ff700ef7def62d4a28ed5de418ef61f3576585ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cf6f9a427559c79e18c208a89e7146b6e9798ea5
</span>
patchfiles patch-.bochsrc.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xpm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline
</span>
configure.args --exec-prefix=${prefix} \
--bindir=${prefix}/bin \
--mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-cpu-level=6 \
</span> --enable-all-optimizations \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-x86-64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-pci \
</span> --enable-vbe \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-clgd54xx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-voodoo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-ne2000 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-e1000 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-usb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-usb-ohci \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-usb-xhci \
</span> --enable-cdrom \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-logging \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-plugins \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-nogui
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Disable sound support, see ticket #23938
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#configure.args-append --enable-sb16=osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant debugger description {Enable bochs internal debugger} conflicts gdbstub {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-debugger --enable-disasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant smp description {Enable symmetric multi-processor support} conflicts gdbstub {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-smp --enable-cpu-level=6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-smp
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gdbstub description {Enable GDB stub debugging} conflicts smp {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gdbstub description {Enable GDB stub debugging} conflicts smp debugger {
</span> configure.args-append --enable-gdb-stub
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant avx description {Enable AVX support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-avx --enable-evex
</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;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xpm
</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;'>+variant sdl description {Enable SDL GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libsdl
</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;'>+variant sdl2 description {Enable SDL2 GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libsdl2
</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;'>+variant term description {Enable text-mode GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-term
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ncurses
</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;'>+default_variants +smp +avx +sdl2 +term
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
reinplace "s|\$BXSHARE/|${prefix}/share/bochs/|g" \
${destroot}${prefix}/share/doc/bochs/bochsrc-sample.txt
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/bochs/files/patch-.bochsrc.diff b/emulators/bochs/files/patch-.bochsrc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d3531f..2bbaa9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/bochs/files/patch-.bochsrc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/bochs/files/patch-.bochsrc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +1,29 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .bochsrc.orig 2010-04-24 04:36:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .bochsrc 2010-04-27 23:47:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -276,7 +276,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The parameter 'type' can be used to enable the floppy drive without media
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and status specified. Usually the drive type is set up based on the media type.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .bochsrc.orig 2017-03-01 14:04:04.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .bochsrc 2017-03-01 14:06:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -623,7 +623,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The optional parameter 'write_protected' can be used to control the media
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # write protect switch. By default it is turned off.
</span> #=======================================================================
-floppya: 1_44=/dev/fd0, status=inserted
+#floppya: 1_44=/dev/fd0, status=inserted
#floppya: image=../1.44, status=inserted
#floppya: 1_44=/dev/fd0H1440, status=inserted
#floppya: 1_2=../1_2, status=inserted
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -553,7 +553,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # parport2: enabled=1, file="/dev/lp0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # parport1: enabled=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -711,7 +711,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, heads=15, spt=63
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ata3-slave: type=cdrom, path=iso.sample, status=inserted
</span> #=======================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>--parport1: enabled=1, file="parport.out"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#parport1: enabled=1, file="parport.out"
</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;'>- # SB16:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -591,7 +591,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # sb16: midimode=1, midi="", wavemode=1, wave="" # win32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # sb16: midimode=1, midi=alsa:128:0, wavemode=1, wave=alsa # Linux with ALSA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ata0-master: type=disk, mode=flat, path="30M.sample"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ata0-master: type=disk, mode=flat, path="30M.sample"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ata0-master: type=disk, mode=flat, path="c.img", cylinders=0 # autodetect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ata0-slave: type=disk, mode=vvfat, path=/bochs/images/vvfat, journal=vvfat.redolog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -904,7 +904,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Example for different drivers:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sound: waveoutdrv=sdl, waveindrv=alsa, midioutdrv=dummy
</span> #=======================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#sb16: midimode=1, midi=/dev/midi00, wavemode=1, wave=/dev/dsp, loglevel=2, log=sb16.log, dmatimer=600000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sb16: midimode=1, midi=/dev/midi00, wavemode=1, wave=/dev/dsp, loglevel=2, log=sb16.log, dmatimer=600000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-sound: driver=default, waveout=/dev/dsp. wavein=, midiout=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#sound: driver=default, waveout=/dev/dsp. wavein=, midiout=
</span>
#=======================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # VGA_UPDATE_INTERVAL:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SPEAKER:
</span></pre><pre style='margin:0'>
</pre>