On Sun, Jun 07, 2009 at 09:08:06PM -0400, Brad wrote:
> Here is an update to Bochs 2.4.1. Please test if you use Bochs.
oops. missed adding a patch before creating the diff.
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/bochs/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile 16 Jul 2008 20:31:33 -0000 1.43
+++ Makefile 8 Jun 2009 00:52:54 -0000
@@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.43 2008/07/16 20:31:33 brad Exp $
-# $NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp $
COMMENT= x86 machine simulator
-DISTNAME= bochs-2.3.7
+DISTNAME= bochs-2.4.1
CATEGORIES= emulators
-
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
HOMEPAGE= http://bochs.sourceforge.net/
@@ -15,7 +13,6 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-
WANTLIB= c m stdc++ termlib
USE_LIBTOOL= Yes
@@ -27,16 +24,17 @@ CONFIGURE_ARGS+= --enable-acpi \
--enable-pci \
--enable-smp \
--enable-x86-64 \
+ --enable-usb \
+ --enable-usb-ohci \
--with-term
FLAVORS= debug no_x11
FLAVOR?=
.if ${FLAVOR:L:Mdebug}
-CONFIGURE_ARGS+= --enable-debugger \
- --enable-disasm \
+CONFIGURE_ARGS+= --disable-debugger-gui \
+ --enable-debugger \
--enable-x86-debugger \
- --enable-port-e9-hack \
--enable-readline
WANTLIB+= curses readline
.endif
@@ -51,21 +49,9 @@ WANTLIB+= ICE SM X11 Xau Xdmcp
NO_REGRESS= Yes
-BIOS += BIOS-bochs-latest
-BIOS += VGABIOS-elpin-2.40 VGABIOS-elpin-LICENSE
-BIOS += VGABIOS-lgpl-latest VGABIOS-lgpl-README
-BIOS += VGABIOS-lgpl-latest-cirrus VGABIOS-lgpl-latest-cirrus-debug
-
-BINS+= bochs bxcommit bximage
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/bochs
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bochs
- cd ${WRKBUILD}; ${INSTALL_PROGRAM} ${BINS} ${PREFIX}/bin
- cd ${WRKSRC}/bios; ${INSTALL_DATA} ${BIOS} ${PREFIX}/share/bochs
- ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${PREFIX}/man/man5
+post-install:
${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${PREFIX}/share/doc/bochs
- ${INSTALL_DATA} ${WRKSRC}/.bochsrc ${PREFIX}/share/bochs/bochsrc
+ @mv ${PREFIX}/share/doc/bochs/bochsrc-sample.txt \
+ ${PREFIX}/share/bochs/bochsrc
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/bochs/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 16 Jul 2008 20:31:33 -0000 1.11
+++ distinfo 8 Jun 2009 00:31:33 -0000
@@ -1,5 +1,5 @@
-MD5 (bochs-2.3.7.tar.gz) = ouX5IlBb8Wyr02u51XGixA==
-RMD160 (bochs-2.3.7.tar.gz) = tMnLjnd8TkhPZTCFeDvOlkWAT+A=
-SHA1 (bochs-2.3.7.tar.gz) = 5ofGl6i+g5audRBtDNYUm9Uspn0=
-SHA256 (bochs-2.3.7.tar.gz) = d/J/7a3GQx3woG7iJiWagEQ1JK6dIhyXxZhuP3knuwQ=
-SIZE (bochs-2.3.7.tar.gz) = 3989982
+MD5 (bochs-2.4.1.tar.gz) = yar0uZyGjafJNivYzSmleA==
+RMD160 (bochs-2.4.1.tar.gz) = wbcbpPbO+HEKpmpeaGLHzK8T1+s=
+SHA1 (bochs-2.4.1.tar.gz) = gKhbt7hZgphhXbEhbEqMNZdmYwk=
+SHA256 (bochs-2.4.1.tar.gz) = 1P1j4yiHDYqUUtg5fIOilbCT1dFYOG0e+bmPFh9SCrM=
+SIZE (bochs-2.4.1.tar.gz) = 4046505
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 17 May 2009 21:42:56 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- Makefile.in.orig Sun May 17 17:37:48 2009
++++ Makefile.in Sun May 17 17:42:46 2009
+@@ -391,8 +391,8 @@ install_docbook: build_docbook
+ install_man::
+ -mkdir -p $(DESTDIR)$(man1dir)
+ -mkdir -p $(DESTDIR)$(man5dir)
+- for i in $(MAN_PAGE_1_LIST); do cat $(srcdir)/doc/man/$$i.1 | $(SED)
's/@version@/$(VERSION)/g' | $(GZIP_BIN) -c > $(DESTDIR)$(man1dir)/$$i.1.gz;
chmod 644 $(DESTDIR)$(man1dir)/$$i.1.gz; done
+- for i in $(MAN_PAGE_5_LIST); do cat $(srcdir)/doc/man/$$i.5 |
$(GZIP_BIN) -c > $(DESTDIR)$(man5dir)/$$i.5.gz; chmod 644
$(DESTDIR)$(man5dir)/$$i.5.gz; done
++ for i in $(MAN_PAGE_1_LIST); do cat $(srcdir)/doc/man/$$i.1 | $(SED)
's/@version@/$(VERSION)/g' > $(DESTDIR)$(man1dir)/$$i.1; chmod 644
$(DESTDIR)$(man1dir)/$$i.1; done
++ for i in $(MAN_PAGE_5_LIST); do cat $(srcdir)/doc/man/$$i.5 >
$(DESTDIR)$(man5dir)/$$i.5; chmod 644 $(DESTDIR)$(man5dir)/$$i.5; done
+
+ download_dlx: $(DLXLINUX_TAR)
+
Index: patches/patch-_bochsrc
===================================================================
RCS file: /cvs/ports/emulators/bochs/patches/patch-_bochsrc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-_bochsrc
--- patches/patch-_bochsrc 16 Jul 2008 20:31:33 -0000 1.3
+++ patches/patch-_bochsrc 17 May 2009 18:24:33 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-_bochsrc,v 1.3 2008/07/16 20:31:33 brad Exp $
---- .bochsrc.orig Fri May 30 17:00:05 2008
-+++ .bochsrc Wed Jul 16 15:01:44 2008
-@@ -197,13 +197,13 @@ vga: extension=vbe
- # such as a: or b: as the path. The parameter 'image' works with image files
- # only. In that case the size must match one of the supported types.
+--- .bochsrc.orig Thu Apr 30 15:04:42 2009
++++ .bochsrc Sun May 17 14:24:26 2009
+@@ -220,13 +220,13 @@ vga: extension=vbe
+ # The parameter 'type' can be used to enable the floppy drive without media
+ # and status specified. Usually the drive type is set up based on the media
type.
#=======================================================================
-floppya: 1_44=/dev/fd0, status=inserted
+#floppya: 1_44=/dev/fd0, status=inserted
@@ -17,7 +17,7 @@ $OpenBSD: patch-_bochsrc,v 1.3 2008/07/1
#=======================================================================
# FLOPPYB:
-@@ -334,7 +334,7 @@ boot: disk
+@@ -364,7 +364,7 @@ boot: disk
#
# Default value are sync=none, time0=local
#=======================================================================
@@ -26,7 +26,7 @@ $OpenBSD: patch-_bochsrc,v 1.3 2008/07/1
#=======================================================================
-@@ -358,8 +358,8 @@ floppy_bootsig_check: disabled=0
+@@ -388,8 +388,8 @@ floppy_bootsig_check: disabled=0
# log: ./bochs.out
# log: /dev/tty
#=======================================================================
Index: patches/patch-cpu_access_cc
===================================================================
RCS file: patches/patch-cpu_access_cc
diff -N patches/patch-cpu_access_cc
--- patches/patch-cpu_access_cc 22 Jul 2008 13:08:05 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-cpu_access_cc,v 1.4 2008/07/22 13:08:05 brad Exp $
---- cpu/access.cc.orig Tue Jul 22 09:03:51 2008
-+++ cpu/access.cc Tue Jul 22 09:04:09 2008
-@@ -1212,7 +1212,7 @@ BX_CPU_C::write_RMW_virtual_qword(Bit64u val64)
- BX_DBG_PHY_MEMORY_ACCESS(BX_CPU_ID,
- BX_CPU_THIS_PTR address_xlation.paddress1,
- BX_CPU_THIS_PTR address_xlation.len1, BX_WRITE,
-- ((Bit8u *) &val32) + (8 - BX_CPU_THIS_PTR address_xlation.len1));
-+ ((Bit8u *) &val64) + (8 - BX_CPU_THIS_PTR address_xlation.len1));
- BX_MEM(0)->writePhysicalPage(BX_CPU_THIS,
- BX_CPU_THIS_PTR address_xlation.paddress2,
- BX_CPU_THIS_PTR address_xlation.len2,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/bochs/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST 16 Jul 2008 20:31:33 -0000 1.18
+++ pkg/PLIST 17 May 2009 21:53:01 -0000
@@ -9,14 +9,32 @@
@man man/man5/bochsrc.5
share/bochs/
share/bochs/BIOS-bochs-latest
+share/bochs/BIOS-bochs-legacy
share/bochs/VGABIOS-elpin-2.40
share/bochs/VGABIOS-elpin-LICENSE
share/bochs/VGABIOS-lgpl-README
share/bochs/VGABIOS-lgpl-latest
share/bochs/VGABIOS-lgpl-latest-cirrus
share/bochs/VGABIOS-lgpl-latest-cirrus-debug
+share/bochs/VGABIOS-lgpl-latest-debug
share/bochs/bochsrc
+share/bochs/keymaps/
+share/bochs/keymaps/sdl-pc-de.map
+share/bochs/keymaps/sdl-pc-us.map
+share/bochs/keymaps/x11-pc-be.map
+share/bochs/keymaps/x11-pc-da.map
+share/bochs/keymaps/x11-pc-de.map
+share/bochs/keymaps/x11-pc-es.map
+share/bochs/keymaps/x11-pc-fr.map
+share/bochs/keymaps/x11-pc-it.map
+share/bochs/keymaps/x11-pc-ru.map
+share/bochs/keymaps/x11-pc-se.map
+share/bochs/keymaps/x11-pc-si.map
+share/bochs/keymaps/x11-pc-uk.map
+share/bochs/keymaps/x11-pc-us.map
share/doc/bochs/
-share/doc/bochs/Linux.html
+...@comment share/doc/bochs/CHANGES
+...@comment share/doc/bochs/COPYING
+share/doc/bochs/README
+...@comment share/doc/bochs/TODO
share/doc/bochs/cosimulation.html
-share/doc/bochs/index.html
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
