Update to 2.5.1.

* Remove deprecated CONFIGURE_ARGS.
* For fixing build, --enable-instrumentation is commented out.

Changelog:
* All CPU options are defined in bochsrc, not in build stage.
* Many improvements.

3 files changed, 13 insertions, 21 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index bed9dece195..f424f58e01e 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2011/11/01 06:01:09 sbd Exp $
+# $NetBSD: Makefile,v 1.63 2012/01/09 06:38:44 ryoon Exp $
 
-DISTNAME=		bochs-2.4.6
-PKGREVISION=		2
+DISTNAME=		bochs-2.5.1
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bochs/}
 
@@ -12,9 +11,10 @@ LICENSE=		gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+MAKE_JOBS_SAFE=		no
+
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-USE_TOOLS+=		gunzip gzip
+USE_TOOLS+=		gmake gunzip gzip
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
@@ -37,7 +37,7 @@ PKG_SUGGESTED_OPTIONS+=	x11
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
-# Debugging features for the client operating systems.  These options are
+# Debugging features for the client operating systems. These options are
 # not enabled by default because they can adversely impact performance.
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--disable-plugins
@@ -56,27 +56,20 @@ CONFIGURE_ARGS+=	--enable-x86-64
 CONFIGURE_ARGS+=	--enable-smp
 CONFIGURE_ARGS+=	--enable-long-phy-address
 CONFIGURE_ARGS+=	--enable-cpu-level=6
-CONFIGURE_ARGS+=	--enable-ne2000
-CONFIGURE_ARGS+=	--enable-acpi
 CONFIGURE_ARGS+=	--enable-pci
 CONFIGURE_ARGS+=	--enable-usb
 CONFIGURE_ARGS+=	--enable-usb-ohci
 CONFIGURE_ARGS+=	--enable-pnic
-CONFIGURE_ARGS+=	--enable-x2apic
 CONFIGURE_ARGS+=	--enable-repeat-speedups
-CONFIGURE_ARGS+=	--enable-trace-cache
-CONFIGURE_ARGS+=	--enable-host-specific-asms
 CONFIGURE_ARGS+=	--enable-configurable-msrs
 CONFIGURE_ARGS+=	--enable-all-optimizations
-CONFIGURE_ARGS+=	--enable-instrumentation
-CONFIGURE_ARGS+=	--enable-vbe
+#CONFIGURE_ARGS+=	--enable-instrumentation
 CONFIGURE_ARGS+=	--enable-clgd54xx
 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-cdrom
 #CONFIGURE_ARGS+=	--enable-gdb-stub
 CONFIGURE_ARGS+=	--enable-gameport
 
diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST
index e60dd973ef6..285c6c1a794 100644
--- a/emulators/bochs/PLIST
+++ b/emulators/bochs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2011/03/02 15:43:12 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.16 2012/01/09 06:38:44 ryoon Exp $
 bin/bochs
 bin/bxcommit
 bin/bximage
@@ -15,6 +15,7 @@ ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_hdimage.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_ioapic.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_keyboard.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_ne2k.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_netmod.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_parallel.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci2isa.la
@@ -23,7 +24,6 @@ ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pcipnic.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pcivga.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pic.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pit.la
-${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_sb16.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_serial.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_soundmod.la
 ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_speaker.la
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index efad303c797..828ed03c141 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.25 2011/03/02 15:43:12 ryoon Exp $
+$NetBSD: distinfo,v 1.26 2012/01/09 06:38:44 ryoon Exp $
 
-SHA1 (bochs-2.4.6.tar.gz) = eb6dc887ce0f56861301eeb61328782a8275ec8e
-RMD160 (bochs-2.4.6.tar.gz) = d99a751e665e3364092e05d6853c0b95760e5d7e
-Size (bochs-2.4.6.tar.gz) = 4067147 bytes
+SHA1 (bochs-2.5.1.tar.gz) = e1052e943ebb8e3b84f407e0e3f17607268253b6
+RMD160 (bochs-2.5.1.tar.gz) = 25b515d46032626921a8cf995183116e28eba9e2
+Size (bochs-2.5.1.tar.gz) = 4126651 bytes
 SHA1 (patch-.bochsrc) = df5b8879ec005fe44bca8bee42c549095012013d
 SHA1 (patch-Makefile.in) = ca8d485a9f4901df15eb3e521105de2ae833cfcb
-SHA1 (patch-configure) = c641bc34e49b5856fc0150861e83c9c7a79c8d65
 SHA1 (patch-iodev_soundosx.cc) = e53434c1796133b1275a167bcec606bb185e283d
 SHA1 (patch-main.cc) = 77296af5e8101c7c9ded37ec77571dbc61f98e4b