diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index c19016b3717..c39e22d4c7a 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.46 2010/03/29 07:37:12 giovanni Exp $ +# $OpenBSD: Makefile,v 1.47 2010/07/08 15:40:11 giovanni Exp $ COMMENT= x86 machine simulator -DISTNAME= bochs-2.4.2 +DISTNAME= bochs-2.4.5 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo index 78ab5c2152f..ebe1b6e1497 100644 --- a/emulators/bochs/distinfo +++ b/emulators/bochs/distinfo @@ -1,5 +1,5 @@ -MD5 (bochs-2.4.2.tar.gz) = /rB9qEsH7tR1NUlTMzC3Cw== -RMD160 (bochs-2.4.2.tar.gz) = Q8oUDrJUj7IoUP4E7FBm/qzOVJ0= -SHA1 (bochs-2.4.2.tar.gz) = PnyAOHKczisqm2oKpX35M8MSDdw= -SHA256 (bochs-2.4.2.tar.gz) = XdNQyMsdKtm22QlitIwGu+nsGJvhUqB6bhdeBQvwNAY= -SIZE (bochs-2.4.2.tar.gz) = 4035010 +MD5 (bochs-2.4.5.tar.gz) = /afq3NlZCTTSkB+EOWMUYw== +RMD160 (bochs-2.4.5.tar.gz) = paUtj1i4rXsdVE1PiQQyRNmfokI= +SHA1 (bochs-2.4.5.tar.gz) = 4zTTHv15yARUAYyc2vqg63XLAYo= +SHA256 (bochs-2.4.5.tar.gz) = uUhiKjZMLn2kIhpqRkC6LvpoQi4UEaw3fGnTf0b2dhY= +SIZE (bochs-2.4.5.tar.gz) = 4059598 diff --git a/emulators/bochs/patches/patch-Makefile_in b/emulators/bochs/patches/patch-Makefile_in index 00c6b8c209a..fa75f0d6129 100644 --- a/emulators/bochs/patches/patch-Makefile_in +++ b/emulators/bochs/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2009/06/23 16:03:58 pirofti Exp $ ---- 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 +$OpenBSD: patch-Makefile_in,v 1.4 2010/07/08 15:40:11 giovanni Exp $ +--- Makefile.in.orig Fri Feb 26 09:18:18 2010 ++++ Makefile.in Fri Jun 18 18:49:22 2010 +@@ -385,8 +385,8 @@ install_docbook: build_docbook install_man:: -mkdir -p $(DESTDIR)$(man1dir) -mkdir -p $(DESTDIR)$(man5dir) diff --git a/emulators/bochs/patches/patch-_bochsrc b/emulators/bochs/patches/patch-_bochsrc index 35869af19dc..fe567dc1752 100644 --- a/emulators/bochs/patches/patch-_bochsrc +++ b/emulators/bochs/patches/patch-_bochsrc @@ -1,7 +1,7 @@ -$OpenBSD: patch-_bochsrc,v 1.4 2009/06/23 16:03:58 pirofti Exp $ ---- .bochsrc.orig Thu Apr 30 15:04:42 2009 -+++ .bochsrc Sun May 17 14:24:26 2009 -@@ -220,13 +220,13 @@ vga: extension=vbe +$OpenBSD: patch-_bochsrc,v 1.5 2010/07/08 15:40:11 giovanni Exp $ +--- .bochsrc.orig Sat Apr 24 05:36:03 2010 ++++ .bochsrc Fri Jun 18 18:49:22 2010 +@@ -276,13 +276,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. #======================================================================= @@ -17,7 +17,7 @@ $OpenBSD: patch-_bochsrc,v 1.4 2009/06/23 16:03:58 pirofti Exp $ #======================================================================= # FLOPPYB: -@@ -364,7 +364,7 @@ boot: disk +@@ -420,7 +420,7 @@ boot: disk # # Default value are sync=none, time0=local #======================================================================= @@ -26,7 +26,7 @@ $OpenBSD: patch-_bochsrc,v 1.4 2009/06/23 16:03:58 pirofti Exp $ #======================================================================= -@@ -388,8 +388,8 @@ floppy_bootsig_check: disabled=0 +@@ -444,8 +444,8 @@ floppy_bootsig_check: disabled=0 # log: ./bochs.out # log: /dev/tty #======================================================================= diff --git a/emulators/bochs/patches/patch-iodev_cdrom_cc b/emulators/bochs/patches/patch-iodev_cdrom_cc index 4db2bc570a4..af8c63ae3e7 100644 --- a/emulators/bochs/patches/patch-iodev_cdrom_cc +++ b/emulators/bochs/patches/patch-iodev_cdrom_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-iodev_cdrom_cc,v 1.3 2010/05/20 15:30:05 naddy Exp $ ---- iodev/cdrom.cc.orig Thu May 20 09:25:50 2010 -+++ iodev/cdrom.cc Thu May 20 09:26:46 2010 -@@ -97,6 +97,9 @@ extern "C" { +$OpenBSD: patch-iodev_cdrom_cc,v 1.4 2010/07/08 15:40:11 giovanni Exp $ +--- iodev/cdrom.cc.orig Fri Dec 4 14:50:26 2009 ++++ iodev/cdrom.cc Fri Jun 18 18:49:22 2010 +@@ -91,6 +91,9 @@ extern "C" { #include #include #include