cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Bochs 2.6.7.

Browse Source 
ok ratchov@
This commit is contained in:
brad 2014-11-04 06:01:41 +00:00
parent 42ae0282c1
commit c1802170c0
6 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emulators/bochs/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.60 2013/06/15 22:59:58 brad Exp $
# $OpenBSD: Makefile,v 1.61 2014/11/04 06:01:41 brad Exp $
COMMENT= x86 machine simulator
DISTNAME= bochs-2.6.2
DISTNAME= bochs-2.6.7
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}

4
emulators/bochs/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bochs-2.6.2.tar.gz) = 2XO3K3ml3pbr6TN7hCHxnc13Xc4W7SWgIy+m1UOlSxA=
SIZE (bochs-2.6.2.tar.gz) = 4314061
SHA256 (bochs-2.6.7.tar.gz) = pDVO62mWYtqGmwOOIlFg7HJriD8bT0JaBs9Wy/+7goI=
SIZE (bochs-2.6.7.tar.gz) = 5045466

11
emulators/bochs/patches/patch-Makefile_in
View File

@ -1,7 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.7 2013/04/26 17:32:26 brad Exp $
--- Makefile.in.orig Wed Sep 12 17:08:40 2012
+++ Makefile.in Tue Apr 9 19:54:24 2013
@@ -441,8 +441,8 @@ clean_docbook::
$OpenBSD: patch-Makefile_in,v 1.8 2014/11/04 06:01:41 brad Exp $
Don't gzip the man pages.
--- Makefile.in.orig Sat Jul 26 02:54:34 2014
+++ Makefile.in Tue Nov 4 00:08:55 2014
@@ -466,8 +466,8 @@ clean_docbook::
install_man::
-mkdir -p $(DESTDIR)$(man1dir)
-mkdir -p $(DESTDIR)$(man5dir)

28
emulators/bochs/patches/patch-_bochsrc
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-_bochsrc,v 1.11 2013/06/15 22:59:59 brad Exp $
--- .bochsrc.orig Wed Apr 17 15:46:11 2013
+++ .bochsrc Thu May 30 18:26:03 2013
@@ -432,13 +432,13 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
$OpenBSD: patch-_bochsrc,v 1.12 2014/11/04 06:01:41 brad Exp $
--- .bochsrc.orig Sun Oct 19 04:54:16 2014
+++ .bochsrc Tue Nov 4 00:08:55 2014
@@ -559,7 +559,7 @@ pci: enabled=1, chipset=i440fx
#
# Default value are sync=none, rtc_sync=0, time0=local
#=======================================================================
-#clock: sync=none, time0=local
+clock: sync=realtime, time0=local
#=======================================================================
# CMOSIMAGE:
@@ -614,13 +614,13 @@ private_colormap: enabled=0
# The optional parameter 'write_protected' can be used to control the media
# write protect switch. By default it is turned off.
#=======================================================================
@ -17,16 +26,7 @@ $OpenBSD: patch-_bochsrc,v 1.11 2013/06/15 22:59:59 brad Exp $
#=======================================================================
# FLOPPYB:
@@ -581,7 +581,7 @@ boot: disk
#
# Default value are sync=none, time0=local
#=======================================================================
-#clock: sync=none, time0=local
+clock: sync=realtime, time0=local
#=======================================================================
@@ -605,8 +605,8 @@ floppy_bootsig_check: disabled=0
@@ -745,8 +745,8 @@ floppy_bootsig_check: disabled=0
# log: ./bochs.out
# log: /dev/tty
#=======================================================================

18
emulators/bochs/patches/patch-iodev_network_slirp_slirp_h Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-iodev_network_slirp_slirp_h,v 1.1 2014/11/04 06:01:41 brad Exp $
slirp/cksum.cc:83: error: 'uintptr_t' was not declared in this scope
slirp/compat.cc:141: error: 'WIFEXITED' was not declared in this scope
slirp/compat.cc:144: error: 'WEXITSTATUS' was not declared in this scope
--- iodev/network/slirp/slirp.h.orig Tue Nov 4 00:14:00 2014
+++ iodev/network/slirp/slirp.h Tue Nov 4 00:19:24 2014
@@ -33,6 +33,8 @@ typedef char *caddr_t;
#endif
#include <sys/types.h>
+#include <stdint.h>
+#include <sys/wait.h>
#ifdef HAVE_SYS_BITYPES_H
# include <sys/bitypes.h>
#endif

9
emulators/bochs/pkg/PLIST
View File

@ -1,15 +1,14 @@
@comment $OpenBSD: PLIST,v 1.22 2013/04/26 17:32:26 brad Exp $
@comment $OpenBSD: PLIST,v 1.23 2014/11/04 06:01:41 brad Exp $
@bin bin/bochs
@bin bin/bxcommit
@bin bin/bximage
@man man/man1/bochs-dlx.1
@man man/man1/bochs.1
@man man/man1/bxcommit.1
@man man/man1/bximage.1
@man man/man5/bochsrc.5
share/bochs/
share/bochs/BIOS-bochs-latest
share/bochs/BIOS-bochs-legacy
share/bochs/SeaBIOS-README
share/bochs/VGABIOS-elpin-2.40
share/bochs/VGABIOS-elpin-LICENSE
share/bochs/VGABIOS-lgpl-README
@ -17,10 +16,13 @@ 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/bios.bin-1.7.5
share/bochs/bochsrc
share/bochs/keymaps/
share/bochs/keymaps/sdl-pc-de.map
share/bochs/keymaps/sdl-pc-us.map
share/bochs/keymaps/sdl2-pc-de.map
share/bochs/keymaps/sdl2-pc-us.map
share/bochs/keymaps/x11-pc-be.map
share/bochs/keymaps/x11-pc-da.map
share/bochs/keymaps/x11-pc-de.map
@ -39,3 +41,4 @@ share/doc/bochs/LICENSE
share/doc/bochs/README
share/doc/bochs/TODO
share/doc/bochs/bxdebugger.html
share/doc/bochs/slirp.conf