7 files changed, 111 insertions, 236 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 10d8ed6b7114..477dfaa902e1 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -7,12 +7,11 @@
 #
 
 PORTNAME=	bochs
-PORTVERSION=	2.0.2
+PORTVERSION=	2.1
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	An IA-32 (x86) PC emulator that runs DOS, Win 95, and more
@@ -29,11 +28,15 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-split-hd \
 		--enable-all-optimizations \
 		--with-x11 \
-		--enable-pci
+		--enable-pci \
+		--enable-sb16=freebsd \
+		--enable-ne2000 \
+		--enable-vbe
 
 CFLAGS+=	-fno-rtti -fno-exceptions -fomit-frame-pointer
 
-MAN1=		bochs.1 bximage.1
+MANCOMPRESSED=	yes
+MAN1=		bochs.1 bxcommit.1 bximage.1
 MAN5=		bochsrc.5
 
 .include <bsd.port.pre.mk>
@@ -65,10 +68,6 @@ CONFIGURE_ARGS+=	--disable-mmx
 CONFIGURE_ARGS+=	--with-term
 .endif
 
-.if defined(WITH_BOCHS_VESA)
-CONFIGURE_ARGS+=	--enable-vbe
-.endif
-
 .if defined(WITH_BOCHS_AMD64)
 CONFIGURE_ARGS+=	--enable-x86-64
 .endif
@@ -81,29 +80,10 @@ CONFIGURE_ARGS+=	--enable-debugger --enable-disasm
 CONFIGURE_ARGS+=	--enable-x86-debugger
 .endif
 
-.if defined(WITH_NE2000)
-CONFIGURE_ARGS+=	--enable-ne2000
-.endif
-
-.if defined(WITH_SOUND)
-CONFIGURE_ARGS+=	--enable-sb16=freebsd
-.endif
-
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-# Local variables
-#
-
-BIOS_DIR=	${DATADIR}/bios
-FONT_DIR=	${DATADIR}/font
-
-MKFONTDIR?=	mkfontdir
-
-# Pre-everything
-#
-
-pre-everything::
+pre-patch::
 	@${ECHO_MSG}
 .if !defined(WITH_BOCHS_CPU_LEVEL)
 	@${ECHO_MSG} "If you want to change the processor level to emulate (default is 5, aka Pentium)"
@@ -144,99 +124,28 @@ pre-everything::
 	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_AMD64=yes\""
 	@${ECHO_MSG}
 .endif
-.if !defined(WITH_NE2000)
-	@${ECHO_MSG} "If you want to compile with networking (ne2000) support."
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_NE2000=yes\""
-	@${ECHO_MSG}
-.endif
-.if !defined(WITH_SOUND)
-	@${ECHO_MSG} "If you want to compile with sound (blaster 16) support."
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SOUND=yes\""
-.endif
 	@${ECHO_MSG}
 
-# Post-configure
-#
-
-post-patch: patch-bochsrc patch-mans patch-wrapper patch-pkgmessage
-
-patch-bochsrc:
+post-patch:
 	@${REINPLACE_CMD} -E ' \
-		s|^vgaromimage: bios/|vgaromimage: ${BIOS_DIR}/|; \
-		s|^romimage: file=bios/|romimage: file=${BIOS_DIR}/|; \
+		s|file=bios/|file=${DATADIR}/|; \
+		s|bios/VGABIOS|file=${DATADIR}/VGABIOS|; \
 		' ${WRKSRC}/.bochsrc
-
-patch-mans:
 	@${REINPLACE_CMD} -e ' \
 		s|/usr/local/share/doc/bochs|${DOCSDIR}|; \
 		' ${WRKSRC}/doc/man/*.1 ${WRKSRC}/doc/man/*.5
+	@${SED} 's|%%DOCSDIR%%|${DOCSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
 
-patch-wrapper:
-	@${SED} 's|%%PREFIX%%|${PREFIX}|;s|%%X11BASE%%|${X11BASE}|; \
-		 s|%%FONT_DIR%%|${FONT_DIR}| \
-		' ${FILESDIR}/bochs.sh > ${WRKDIR}/bochs.sh
-
-patch-pkgmessage:
-	@${SED} 's|%%DATADIR%%|${DATADIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
-
-# Post-build
-#
-
-post-build: compress-font-file
-
-compress-font-file:
-	@${GZIP_CMD} < ${WRKSRC}/font/vga.pcf > ${WRKSRC}/font/vga.pcf.gz
-
-# Install
+# Post-install
 #
 
-do-install: install-bins install-mans install-bochsrc \
-	    install-bios install-fonts install-docs
-
-install-bins:
-	@${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/libexec/bochs.bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin
-
-install-mans:
-.for mansect in 1 5
-.for man in ${MAN${mansect}}
-	@${INSTALL_MAN} ${WRKSRC}/doc/man/${man} \
-		${MAN${mansect}PREFIX}/man/man${mansect}
-.endfor
-.endfor
-
-install-bochsrc:
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/.bochsrc ${DATADIR}/bochsrc.sample
-
-install-bios:
-	@${MKDIR} ${BIOS_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-* ${BIOS_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/bios/BIOS-* ${BIOS_DIR}
-
-install-fonts:
-	@${MKDIR} ${FONT_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/font/vga.pcf.gz ${FONT_DIR}
-	@${MKFONTDIR} ${FONT_DIR}
-
-install-docs:
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/html
 	@${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${DOCSDIR}/html
-	@${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${DOCSDIR}/html
 .endif
-
-# Post-install
-#
-
-post-install: install-script display-message
-
-install-script:
-	@${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
-
-display-message:
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 6d44095091c9..0f56a6f251f2 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1 +1 @@
-MD5 (bochs-2.0.2.tar.gz) = 11bb4e7804f9fef3cda3822f03641b55
+MD5 (bochs-2.1.tar.gz) = 30bdb17e11fb416f9d3c6243e02f6e73
diff --git a/emulators/bochs/files/patch-aa b/emulators/bochs/files/patch-aa
index 5de74feaf15d..48a34727ce4c 100644
--- a/emulators/bochs/files/patch-aa
+++ b/emulators/bochs/files/patch-aa
@@ -1,9 +1,36 @@
-
-$FreeBSD$
-
---- .bochsrc.orig	Thu May 31 22:55:33 2001
-+++ .bochsrc	Mon Jun  4 10:24:44 2001
-@@ -116,8 +116,8 @@
+--- .bochsrc.orig	Sat Jan 17 15:04:24 2004
++++ .bochsrc	Sat Jan 17 15:13:21 2004
+@@ -66,7 +66,7 @@
+ # You can also use the environment variable $BXSHARE to specify the
+ # location of the BIOS.
+ #=======================================================================
+-romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
++romimage: file=bios/BIOS-bochs-latest, address=0xf0000
+ #romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000
+ #romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000
+ #romimage: file=bios/rombios.bin, address=0xf0000
+@@ -105,9 +105,9 @@
+ # VGAROMIMAGE
+ # You now need to load a VGA ROM BIOS into C0000.
+ #=======================================================================
+-#vgaromimage: bios/VGABIOS-lgpl-latest
++vgaromimage: bios/VGABIOS-lgpl-latest
++#vgaromimage: bios/VGABIOS-elpin-2.40
+ #vgaromimage: bios/VGABIOS-elpin-2.40
+-vgaromimage: $BXSHARE/VGABIOS-elpin-2.40
+ 
+ #=======================================================================
+ # FLOPPYA:
+@@ -286,7 +286,7 @@
+ # 
+ # Default value are sync=none, time0=local
+ #=======================================================================
+-#clock: sync=none, time0=local
++clock: sync=realtime, time0=local
+ 
+ 
+ #=======================================================================
+@@ -309,8 +309,8 @@
  #   log: ./bochs.out
  #   log: /dev/tty
  #=======================================================================
@@ -13,4 +40,22 @@ $FreeBSD$
 +#log: bochsout.txt
  
  #=======================================================================
- # LOG CONTROLS
+ # LOGPREFIX:
+@@ -350,7 +350,7 @@
+ # cause bochs to become unstable.  The panic is a "graceful exit," so
+ # if you disable it you may get a spectacular disaster instead.
+ #=======================================================================
+-panic: action=ask
++panic: action=fatal
+ error: action=report
+ info: action=report
+ debug: action=ignore
+@@ -395,7 +395,7 @@
+ #   parport1: enabled=1, file="/dev/lp0"
+ #   parport1: enabled=0
+ #=======================================================================
+-parport1: enabled=1, file="parport.out"
++#parport1: enabled=1, file="parport.out"
+ 
+ #=======================================================================
+ # SB16:
diff --git a/emulators/bochs/files/patch-ae b/emulators/bochs/files/patch-ae
index 6536a244e345..22535f97d782 100644
--- a/emulators/bochs/files/patch-ae
+++ b/emulators/bochs/files/patch-ae
@@ -1,6 +1,6 @@
 $FreeBSD$
---- debug/lexer.l.orig	Tue Apr 10 03:57:02 2001
-+++ debug/lexer.l	Sun May 20 13:25:29 2001
+--- bx_debug/lexer.l.orig	Tue Apr 10 03:57:02 2001
++++ bx_debug/lexer.l	Sun May 20 13:25:29 2001
 @@ -105,7 +105,7 @@
  \/[0-9]+                           { bxlval.sval = strdup(bxtext); return(BX_TOKEN_XFORMAT); }
  0x[0-9a-fA-F]+  { bxlval.uval = strtoul(bxtext+2, NULL, 16); return(BX_TOKEN_NUMERIC); }
diff --git a/emulators/bochs/files/patch-cpu::fetchdecode.cc b/emulators/bochs/files/patch-cpu::fetchdecode.cc
deleted file mode 100644
index 3b4f3b55c4f9..000000000000
--- a/emulators/bochs/files/patch-cpu::fetchdecode.cc
+++ /dev/null
@@ -1,76 +0,0 @@
---- cpu/fetchdecode.cc.orig	Wed Jan 22 07:18:30 2003
-+++ cpu/fetchdecode.cc	Sun Jul 13 10:09:27 2003
-@@ -160,53 +160,53 @@
- } BxOpcodeInfo_t;
- 
- static BxOpcodeInfo_t opcodesADD_EwIw[2] = {
--  { 0,  { &BX_CPU_C::ADD_EEwIw } },
--  { 0,  { &BX_CPU_C::ADD_EGwIw } }
-+  { 0, &BX_CPU_C::ADD_EEwIw },
-+  { 0, &BX_CPU_C::ADD_EGwIw }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_EdId[2] = {
--  { 0,  { &BX_CPU_C::ADD_EEdId } },
--  { 0,  { &BX_CPU_C::ADD_EGdId } }
-+  { 0, &BX_CPU_C::ADD_EEdId },
-+  { 0, &BX_CPU_C::ADD_EGdId }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_GwEw[2] = {
--  { 0,  { &BX_CPU_C::ADD_GwEEw } },
--  { 0,  { &BX_CPU_C::ADD_GwEGw } }
-+  { 0, &BX_CPU_C::ADD_GwEEw },
-+  { 0, &BX_CPU_C::ADD_GwEGw }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_GdEd[2] = {
--  { 0,  { &BX_CPU_C::ADD_GdEEd } },
--  { 0,  { &BX_CPU_C::ADD_GdEGd } }
-+  { 0, &BX_CPU_C::ADD_GdEEd },
-+  { 0, &BX_CPU_C::ADD_GdEGd }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GbEb[2] = {
--  { 0,  { &BX_CPU_C::MOV_GbEEb } },
--  { 0,  { &BX_CPU_C::MOV_GbEGb } }
-+  { 0, &BX_CPU_C::MOV_GbEEb },
-+  { 0, &BX_CPU_C::MOV_GbEGb }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GwEw[2] = {
--  { 0,  { &BX_CPU_C::MOV_GwEEw } },
--  { 0,  { &BX_CPU_C::MOV_GwEGw } }
-+  { 0, &BX_CPU_C::MOV_GwEEw },
-+  { 0, &BX_CPU_C::MOV_GwEGw }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GdEd[2] = {
--  { 0,  { &BX_CPU_C::MOV_GdEEd } },
--  { 0,  { &BX_CPU_C::MOV_GdEGd } }
-+  { 0, &BX_CPU_C::MOV_GdEEd },
-+  { 0, &BX_CPU_C::MOV_GdEGd }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EbGb[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEbGb } },
--  { 0,  { &BX_CPU_C::MOV_EGbGb } }
-+  { 0, &BX_CPU_C::MOV_EEbGb },
-+  { 0, &BX_CPU_C::MOV_EGbGb }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EwGw[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEwGw } },
--  { 0,  { &BX_CPU_C::MOV_EGwGw } }
-+  { 0, &BX_CPU_C::MOV_EEwGw },
-+  { 0, &BX_CPU_C::MOV_EGwGw }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EdGd[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEdGd } },
--  { 0,  { &BX_CPU_C::MOV_EGdGd } }
-+  { 0, &BX_CPU_C::MOV_EEdGd },
-+  { 0, &BX_CPU_C::MOV_EGdGd }
-   };
- 
- /* ********** */
diff --git a/emulators/bochs/pkg-message b/emulators/bochs/pkg-message
index 068f82c78341..ca1bd4bd6ee1 100644
--- a/emulators/bochs/pkg-message
+++ b/emulators/bochs/pkg-message
@@ -1,3 +1,3 @@
 ****  Bochs requires a .bochsrc file to be present in either your current
       directory or your home directory before starting.  A sample of the
-      .bochsrc file can be found in %%DATADIR%%/bochsrc.sample.
+      .bochsrc file can be found in %%DOCSDIR%%/bochsrc-sample.txt
diff --git a/emulators/bochs/pkg-plist b/emulators/bochs/pkg-plist
index 5573f8ac9bc0..022859b168f4 100644
--- a/emulators/bochs/pkg-plist
+++ b/emulators/bochs/pkg-plist
@@ -1,49 +1,46 @@
 @comment $FreeBSD$
 bin/bochs
+bin/bxcommit
 bin/bximage
-libexec/bochs.bin
-share/bochs/bios/BIOS-bochs-2-processors
-share/bochs/bios/BIOS-bochs-4-processors
-share/bochs/bios/BIOS-bochs-8-processors
-share/bochs/bios/BIOS-bochs-latest
-share/bochs/bios/VGABIOS-elpin-2.40
-share/bochs/bios/VGABIOS-elpin-LICENSE
-share/bochs/bios/VGABIOS-lgpl-latest
-share/bochs/bios/VGABIOS-lgpl-README
-share/bochs/bochsrc.sample
-share/bochs/font/fonts.dir
-share/bochs/font/vga.pcf.gz
-%%PORTDOCS%%share/doc/bochs/cvs-structure.txt
-%%PORTDOCS%%share/doc/bochs/html/3rdparty.license.html
-%%PORTDOCS%%share/doc/bochs/html/Linux.html
-%%PORTDOCS%%share/doc/bochs/html/Minix.html
-%%PORTDOCS%%share/doc/bochs/html/OldWindows95.html
-%%PORTDOCS%%share/doc/bochs/html/Windows95.html
-%%PORTDOCS%%share/doc/bochs/html/changelog.html
-%%PORTDOCS%%share/doc/bochs/html/codingguidelines.html
-%%PORTDOCS%%share/doc/bochs/html/configure.html
-%%PORTDOCS%%share/doc/bochs/html/construction.html
-%%PORTDOCS%%share/doc/bochs/html/cosimulation.html
-%%PORTDOCS%%share/doc/bochs/html/cvs-status.html
-%%PORTDOCS%%share/doc/bochs/html/developers.html
-%%PORTDOCS%%share/doc/bochs/html/faq.html
-%%PORTDOCS%%share/doc/bochs/html/features.html
-%%PORTDOCS%%share/doc/bochs/html/fpu.html
-%%PORTDOCS%%share/doc/bochs/html/guestNT.html
-%%PORTDOCS%%share/doc/bochs/html/index.html
-%%PORTDOCS%%share/doc/bochs/html/install.html
-%%PORTDOCS%%share/doc/bochs/html/instrumentation.html
-%%PORTDOCS%%share/doc/bochs/html/iodebug.html
-%%PORTDOCS%%share/doc/bochs/html/mtools.html
-%%PORTDOCS%%share/doc/bochs/html/smp-simulation.html
-%%PORTDOCS%%share/doc/bochs/html/sound.html
-%%PORTDOCS%%share/doc/bochs/html/undercon.gif
-%%PORTDOCS%%share/doc/bochs/html/whatisbochs.html
-%%PORTDOCS%%share/doc/bochs/html/win32.html
-%%PORTDOCS%%share/doc/bochs/random.txt
-%%PORTDOCS%%share/doc/bochs/release-prep.txt
+share/bochs/BIOS-bochs-2-processors
+share/bochs/BIOS-bochs-4-processors
+share/bochs/BIOS-bochs-8-processors
+share/bochs/BIOS-bochs-latest
+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-debug
+share/bochs/keymaps/convertmap.pl
+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-se.map
+share/bochs/keymaps/x11-pc-uk.map
+share/bochs/keymaps/x11-pc-us.map
+%%DOCSDIR%%/CHANGES
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/README
+%%DOCSDIR%%/biossums.txt
+%%DOCSDIR%%/bochsrc-sample.txt
+%%PORTDOCS%%%%DOCSDIR%%/cvs-structure.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/3rdparty.license.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Linux.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Minix.html
+%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/codingguidelines.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cosimulation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guestNT.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/iodebug.html
+%%PORTDOCS%%%%DOCSDIR%%/random.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-prep.txt
 %%PORTDOCS%%@dirrm share/doc/bochs/html
-%%PORTDOCS%%@dirrm share/doc/bochs
-@dirrm share/bochs/font
-@dirrm share/bochs/bios
+@dirrm share/bochs/keymaps
 @dirrm share/bochs
+@dirrm %%DOCSDIR%%