5 files changed, 49 insertions, 33 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index deab4fe3778d..d6553415a150 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	bochs
-PORTVERSION=	2.1
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -119,11 +118,17 @@ pre-patch::
 post-patch:
 	@${REINPLACE_CMD} -E ' \
 		s|file=bios/|file=${DATADIR}/|; \
-		s|bios/VGABIOS|file=${DATADIR}/VGABIOS|; \
+		s|bios/VGABIOS|${DATADIR}/VGABIOS|; \
 		' ${WRKSRC}/.bochsrc
+	@${REINPLACE_CMD} -E ' \
+		s|(^sharedir.+=).+|\1 ${DATADIR}|; \
+		s|(^docdir.+=).+|\1 ${DOCSDIR}|; \
+		' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e ' \
+		s|/usr/local/share/bochs|${DATADIR}|; \
 		s|/usr/local/share/doc/bochs|${DOCSDIR}|; \
-		' ${WRKSRC}/doc/man/*.1 ${WRKSRC}/doc/man/*.5
+		' ${WRKSRC}/doc/docbook/user/user.dbk ${WRKSRC}/doc/man/*.1 \
+		${WRKSRC}/doc/man/*.5
 	@${SED} 's|%%DOCSDIR%%|${DOCSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
 
 # Post-install
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 14fe4de360f4..5585e5a4fa82 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,2 +1,2 @@
-MD5 (bochs-2.1.tar.gz) = 30bdb17e11fb416f9d3c6243e02f6e73
-SIZE (bochs-2.1.tar.gz) = 3650627
+MD5 (bochs-2.1.1.tar.gz) = 7b21efbe2b56cc15d110993234259b33
+SIZE (bochs-2.1.1.tar.gz) = 3653487
diff --git a/emulators/bochs/pkg-descr b/emulators/bochs/pkg-descr
index fcf811a834c0..c025bbb90db0 100644
--- a/emulators/bochs/pkg-descr
+++ b/emulators/bochs/pkg-descr
@@ -1,12 +1,23 @@
 Bochs is a highly portable open source IA-32 (x86) PC emulator written in
 C++, that runs on most popular platforms.  It includes emulation of the
 Intel x86 CPU, common I/O devices, and a custom BIOS.  Currently, bochs can
-be compiled to emulate a 386, 486 or Pentium CPU.
+be compiled to emulate a 386, 486, Pentium, Pentium Pro or AMD64 CPU,
+including optional MMX, SSE, SSE2 and 3DNow instructions.
 
-Bochs is capable of running many Operating Systems inside the emulation
+Bochs is capable of running most Operating Systems inside the emulation
 including Linux, Windows 95, DOS, and Windows NT 4.
 
 Bochs was written by Kevin Lawton and is currently maintained by the Bochs
 project.
 
+Bochs can be compiled and used in a variety of modes, some which are still
+in development. The 'typical' use of bochs is to provide complete x86 PC
+emulation, including the x86 processor, hardware devices, and memory. This
+allows you to run OS's and software within the emulator on your workstation,
+much like you have a machine inside of a machine. For instance, let's say
+your workstation is a Unix/X11 workstation, but you want to run Win'95
+applications. Bochs will allow you to run Win 95 and associated software
+on your Unix/X11 workstation, displaying a window on your workstation,
+simulating a monitor on a PC. 
+
 WWW: http://bochs.sourceforge.net/
diff --git a/emulators/bochs/pkg-message b/emulators/bochs/pkg-message
index ca1bd4bd6ee1..7aab81ff55ec 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 %%DOCSDIR%%/bochsrc-sample.txt
+      directory or your home directory before starting.  A sample .bochsrc
+      file can be found in %%DOCSDIR%%/bochsrc-sample.txt
diff --git a/emulators/bochs/pkg-plist b/emulators/bochs/pkg-plist
index 022859b168f4..1d4e65599b31 100644
--- a/emulators/bochs/pkg-plist
+++ b/emulators/bochs/pkg-plist
@@ -2,27 +2,27 @@
 bin/bochs
 bin/bxcommit
 bin/bximage
-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
+%%DATADIR%%/BIOS-bochs-2-processors
+%%DATADIR%%/BIOS-bochs-4-processors
+%%DATADIR%%/BIOS-bochs-8-processors
+%%DATADIR%%/BIOS-bochs-latest
+%%DATADIR%%/VGABIOS-elpin-2.40
+%%DATADIR%%/VGABIOS-elpin-LICENSE
+%%DATADIR%%/VGABIOS-lgpl-README
+%%DATADIR%%/VGABIOS-lgpl-latest
+%%DATADIR%%/VGABIOS-lgpl-latest-debug
+%%DATADIR%%/keymaps/convertmap.pl
+%%DATADIR%%/keymaps/sdl-pc-de.map
+%%DATADIR%%/keymaps/sdl-pc-us.map
+%%DATADIR%%/keymaps/x11-pc-be.map
+%%DATADIR%%/keymaps/x11-pc-da.map
+%%DATADIR%%/keymaps/x11-pc-de.map
+%%DATADIR%%/keymaps/x11-pc-es.map
+%%DATADIR%%/keymaps/x11-pc-fr.map
+%%DATADIR%%/keymaps/x11-pc-it.map
+%%DATADIR%%/keymaps/x11-pc-se.map
+%%DATADIR%%/keymaps/x11-pc-uk.map
+%%DATADIR%%/keymaps/x11-pc-us.map
 %%DOCSDIR%%/CHANGES
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/README
@@ -41,6 +41,6 @@ share/bochs/keymaps/x11-pc-us.map
 %%PORTDOCS%%%%DOCSDIR%%/random.txt
 %%PORTDOCS%%%%DOCSDIR%%/release-prep.txt
 %%PORTDOCS%%@dirrm share/doc/bochs/html
-@dirrm share/bochs/keymaps
-@dirrm share/bochs
+@dirrm %%DATADIR%%/keymaps
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%