Update to 2.6.2

* Remove obsolete patch.
* Remove deprecated CONFIGURE_ARGS.

Changelog:

Changes in 2.6.2 (May 26, 2013):

- CPU
  - VMX: implemented VMENTER to non-active guest state (HLT, SHUTDOWN, WAIT-FOR-SIPI)
  - VMX: fixed write of guest segment access rights VMCS fields (32-bit field
    was truncated to 16-bit)
  - CPUID: Don't report Architectural Performance Monitoring in CPUID.
    Reporting true capabilities without actually supporting them breaks Win7 x64 installation.
  - CPUID: Fixed bx_generic CPUID std leafs (all std leafs > 2 were corrupted)
  - CPUID: Enable all supported VMX capabilities for bx_generic CPUID configuration.
  - CPUID: Enable X2APIC support for Ivy Bridge CPUDB configuration.

- Configure and compile
  - Enabled VMX compilation by default in shortcut scripts.
  - Allow CPU_LEVEL=5 configurations (pentium_mmx and amd_k2_chomper) even when Bochs was
    compiled with CPU_LEVEL > 5.

- Misc
  - Fixes for Bochs port on MorphOS (based on a patch by Thore Sittly):
    missing functions, byte-swapping and cdrom support.

-------------------------------------------------------------------------
Changes in 2.6.1 (April 7, 2013):

- CPU / CPUDB
  - Bochs is fully aligned with rev45 of the of Intel(R) Architecture Manual.
    - Implemented Supervisor Mode Access Prevention (SMAP) support
    - Implemented VMX APIC Registers Virtualization and VMX Virtual Interrupt Delivery
    - Implemented VMCS Shadowing and #VE exception secondary VMEXIT controls emulation
    - Implemented RDRAND and RDSEED instructions
  ! CPUDB: Added AMD FX-4100 (Zambezi) configuration to CPUDB
  - Bugfixes for CPU emulation correctness (critical fixes for SVM and AVX2 emulation)

- Bochs Debugger and Instrumentation
  - Use Enhanced GUI Debugger instead of old-style wx debugger with wx gui.
    The old-style wx debugger support was deprecated and removed from the source code.

- I/O Devices
  - Implemented 3dfx Voodoo Graphics card emulation based on DOSBox patch, to enable
    configure with --enable-voodoo option.
  - Hard drive / HD image
    - Added full save restore support for most of the disk image formats
    - undoable / volatile mode: added support of other types of r/o base images
    - DLL HD support rewritten and enabled for WIN32 host
  - PCI chipset
    - Implemented i430FX chipset emulation
    - USB UHCI always enabled in the i440FX case

- Config interface
  - Configure option --enable-misaligned-sse moved to runtime option in .bochsrc. The old
    option is deprecated and should not be used anymore.
  - moved 'user_shortcut' bochsrc option to the 'keyboard' option
  - save log options per device to bochsrc
  - win32: implemented scrollable dialog items for large parameter lists

- GUI and display libraries
  - Graphics snapshot feature rewritten to support all kinds of graphics modes
  - wx: starting a second simulation without closing Bochs now almost possible

- Tools
  - bxcommit: added support for converting flat to growing mode images

3 files changed, 6 insertions, 24 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index e5a6e04a880..fe25d52dc93 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2013/06/06 12:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2013/06/09 06:03:33 ryoon Exp $
 
-DISTNAME=		bochs-2.6
-PKGREVISION=		6
+DISTNAME=		bochs-2.6.2
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bochs/}
 
@@ -68,7 +67,6 @@ CONFIGURE_ARGS+=	--enable-fpu
 CONFIGURE_ARGS+=	--enable-vmx=2
 #CONFIGURE_ARGS+=	--enable-3dnow
 CONFIGURE_ARGS+=	--enable-alignment-check
-CONFIGURE_ARGS+=	--enable-misaligned-sse
 #CONFIGURE_ARGS+=	--enable-gdb-stub
 CONFIGURE_ARGS+=	--enable-gameport
 
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 6508eb9ad78..b2544a34045 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.28 2012/10/01 13:40:48 ryoon Exp $
+$NetBSD: distinfo,v 1.29 2013/06/09 06:03:33 ryoon Exp $
 
-SHA1 (bochs-2.6.tar.gz) = 327e7a6b5163a2795adae4a617554de4925b5cfe
-RMD160 (bochs-2.6.tar.gz) = 5a0f771b15023b40b291277235ac0ca8ada3c75c
-Size (bochs-2.6.tar.gz) = 4212828 bytes
+SHA1 (bochs-2.6.2.tar.gz) = f82ee01a52367d2a6daffa2774a1297b978f6821
+RMD160 (bochs-2.6.2.tar.gz) = 159c5495ecfb3f1cb5156591d71d924d8361b572
+Size (bochs-2.6.2.tar.gz) = 4314061 bytes
 SHA1 (patch-.bochsrc) = df5b8879ec005fe44bca8bee42c549095012013d
 SHA1 (patch-Makefile.in) = ca8d485a9f4901df15eb3e521105de2ae833cfcb
-SHA1 (patch-configure) = 66438d48e5e99bfcf778a37570b76b9fc2732ce5
 SHA1 (patch-iodev_sound_soundosx.cc) = 60ba51ac619b8149710d5ae7940ed6e4a68b36c2
 SHA1 (patch-main.cc) = 77296af5e8101c7c9ded37ec77571dbc61f98e4b
diff --git a/emulators/bochs/patches/patch-configure b/emulators/bochs/patches/patch-configure
deleted file mode 100644
index 0d9315074c1..00000000000
--- a/emulators/bochs/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.4 2012/10/01 13:40:48 ryoon Exp $
-
---- configure.orig	2012-09-02 11:30:15.000000000 +0000
-+++ configure
-@@ -22084,6 +22084,10 @@ $as_echo "$as_me: Linux detected as host
- 	  		PCIDEV_MODULE_MAKE_ALL="all-kernel26"
- 			KERNEL_MODULE_SUFFIX="ko"
- 		;;
-+		3*)
-+	  		PCIDEV_MODULE_MAKE_ALL="all-kernel26"
-+			KERNEL_MODULE_SUFFIX="ko"
-+		;;
- 		*)
- 			as_fn_error $? "Linux kernel 2.4, 2.6 or 3.x is required for PCI host device mapping" "$LINENO" 5
- 		;;