<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/686cd48221ade85f3555f0f5bbc36c8a4ca6a3c3">https://github.com/macports/macports-ports/commit/686cd48221ade85f3555f0f5bbc36c8a4ca6a3c3</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 686cd48 bochs: update to version 2.6.11
</span>686cd48 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 686cd48221ade85f3555f0f5bbc36c8a4ca6a3c3
</span>Author: Yasser Rathore <yasser.rathore@gmail.com>
AuthorDate: Sun Feb 16 19:20:53 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> bochs: update to version 2.6.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 2.6.11
</span><span style='display:block; white-space:pre;color:#404040;'> * add patch files for build fixes
</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/57289
</span>---
emulators/bochs/Portfile | 15 +++++++++------
emulators/bochs/files/patch-.bochsrc.diff | 10 +++++-----
emulators/bochs/files/patch-bxhub.cc.diff | 11 +++++++++++
emulators/bochs/files/patch-cdrom_osx.cc.diff | 12 ------------
emulators/bochs/files/patch-dbg_main.cc.diff | 16 ++++++++++++++++
emulators/bochs/files/patch-eth_socket.cc.diff | 19 +++++++++++++++++++
6 files changed, 60 insertions(+), 23 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 5e611d7..7d88e1d 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,8 +1,8 @@
</span> PortSystem 1.0
name bochs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories emulators
license LGPL-2.1+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,11 +18,14 @@ long_description Bochs is a highly portable open source x86 and x86_64 \
</span> homepage http://bochs.sourceforge.net/
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 79700ef0914a0973f62d9908ff700ef7def62d4a28ed5de418ef61f3576585ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 cf6f9a427559c79e18c208a89e7146b6e9798ea5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 63897b41fbbbdfb1c492d3c4dee1edb4224282a07bbdf442a4a68c19bcc18862 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ed4711d7caf66055842dd4fe360a27d7544d9564 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5339730
</span>
patchfiles patch-.bochsrc.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cdrom_osx.cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bxhub.cc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-dbg_main.cc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-eth_socket.cc.diff
</span>
depends_lib port:gettext \
port:readline
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +37,13 @@ configure.args --exec-prefix=${prefix} \
</span> --enable-all-optimizations \
--enable-x86-64 \
--enable-pci \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-vbe \
</span> --enable-clgd54xx \
--enable-voodoo \
--enable-ne2000 \
--enable-e1000 \
--enable-usb \
--enable-usb-ohci \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-usb-ehci \
</span> --enable-usb-xhci \
--enable-cdrom \
--enable-logging \
<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 2bbaa9b..eaa51be 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .bochsrc.orig 2017-03-01 14:04:04.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .bochsrc 2017-03-01 14:06:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -623,7 +623,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .bochsrc.orig 2020-02-16 18:52:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .bochsrc 2020-02-16 18:54:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -639,7 +639,7 @@
</span> # The optional parameter 'write_protected' can be used to control the media
# write protect switch. By default it is turned off.
#=======================================================================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> #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;'>-@@ -711,7 +711,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -727,7 +727,7 @@
</span> # ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, heads=15, spt=63
# ata3-slave: type=cdrom, path=iso.sample, status=inserted
#=======================================================================
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> #ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
#ata0-master: type=disk, mode=flat, path="c.img", cylinders=0 # autodetect
#ata0-slave: type=disk, mode=vvfat, path=/bochs/images/vvfat, journal=vvfat.redolog
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -904,7 +904,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -923,7 +923,7 @@
</span> # Example for different drivers:
# sound: waveoutdrv=sdl, waveindrv=alsa, midioutdrv=dummy
#=======================================================================
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/bochs/files/patch-bxhub.cc.diff b/emulators/bochs/files/patch-bxhub.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..088f7a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/bochs/files/patch-bxhub.cc.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;'>+--- misc/bxhub.cc.orig 2020-02-16 16:03:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/bxhub.cc 2020-02-16 16:02:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +55,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BXHUB
</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;'>++#define MSG_NOSIGNAL 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MSG_NOSIGNAL 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MSG_DONTWAIT 0
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/bochs/files/patch-cdrom_osx.cc.diff b/emulators/bochs/files/patch-cdrom_osx.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fb20e74..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/bochs/files/patch-cdrom_osx.cc.diff
</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;'>-Upstream-Status: Submitted [https://sourceforge.net/p/bochs/patches/537/]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- iodev/hdimage/cdrom_osx.cc.orig 2019-06-28 17:01:30.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ iodev/hdimage/cdrom_osx.cc 2019-06-28 17:06:39.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,7 +191,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_port_t port = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *devname;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((devname = strrchr(devpath, '/')) != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((devname = (char *) strrchr(devpath, '/')) != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ++devname;
</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;color:#808080;'>diff --git a/emulators/bochs/files/patch-dbg_main.cc.diff b/emulators/bochs/files/patch-dbg_main.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6714e8d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/bochs/files/patch-dbg_main.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bx_debug/dbg_main.cc.orig 2020-02-16 15:33:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bx_debug/dbg_main.cc 2020-02-16 15:40:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1494,11 +1494,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char cpu_param_name[16];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Bit32u index = BX_ITLB_INDEX_OF(laddr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(cpu_param_name, "ITLB.entry%d", index);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bx_dbg_show_param_command(cpu_param_name, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- index = BX_DTLB_INDEX_OF(laddr, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(cpu_param_name, "DTLB.entry%d", index);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bx_dbg_show_param_command(cpu_param_name, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/bochs/files/patch-eth_socket.cc.diff b/emulators/bochs/files/patch-eth_socket.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ab5a17b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/bochs/files/patch-eth_socket.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- iodev/network/eth_socket.cc.orig 2020-02-16 15:46:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ iodev/network/eth_socket.cc 2020-02-16 16:05:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,7 +95,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <net/ethernet.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <net/if.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <linux/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define closesocket(s) close(s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef int SOCKET;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,6 +104,8 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MSG_NOSIGNAL 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MSG_NOSIGNAL 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MSG_DONTWAIT 0
</span></pre><pre style='margin:0'>
</pre>