diff -urN /usr/ports/emulators/bochs/Makefile emulators/bochs/Makefile
--- /usr/ports/emulators/bochs/Makefile	Sun May 20 13:23:42 2007
+++ emulators/bochs/Makefile	Thu Nov  1 18:09:35 2007
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bochs
-PORTVERSION=	2.3
-PORTREVISION=	2
+PORTVERSION=	2.3.5
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
@@ -15,8 +14,8 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An IA-32 (x86) PC emulator that runs DOS, Win 95, and more
 
-BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -179,7 +178,7 @@
 .endif
 
 .if defined(WITH_X11)
-USE_XLIB=	yes
+USE_XORG=	xext xt
 CONFIGURE_ARGS+=--with-x11
 .endif
 
@@ -229,7 +228,8 @@
 		 s|^parport1: .+|#&|' \
 		 ${WRKSRC}/.bochsrc
 	@${REINPLACE_CMD} -Ee \
-		's|(^sharedir.+=).+|\1 ${DATADIR}|; \
+		's|install_share install_doc|install_share|; \
+		 s|(^sharedir.+=).+|\1 ${DATADIR}|; \
 		 s|(^docdir.+=).+|\1 ${DOCSDIR}|' \
 		 ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
diff -urN /usr/ports/emulators/bochs/distinfo emulators/bochs/distinfo
--- /usr/ports/emulators/bochs/distinfo	Wed Sep 27 02:28:22 2006
+++ emulators/bochs/distinfo	Thu Nov  1 02:56:19 2007
@@ -1,3 +1,3 @@
-MD5 (bochs-2.3.tar.gz) = 100c02fbcd402c2b4862d0251be539fd
-SHA256 (bochs-2.3.tar.gz) = fd926f3915d0619ddde8dedd02dac661f3233d77f3fc2ec7f94e1e028398497a
-SIZE (bochs-2.3.tar.gz) = 3812273
+MD5 (bochs-2.3.5.tar.gz) = 2d9b2c1e17b4eba2d46b208be09df4a9
+SHA256 (bochs-2.3.5.tar.gz) = ff6b7d7eb950d05ade2f5fee00b3bd50542d5d22dc5c7ea564a0d02001e0fb16
+SIZE (bochs-2.3.5.tar.gz) = 3916867
diff -urN /usr/ports/emulators/bochs/pkg-plist emulators/bochs/pkg-plist
--- /usr/ports/emulators/bochs/pkg-plist	Wed Nov  1 13:11:42 2006
+++ emulators/bochs/pkg-plist	Thu Nov  1 17:59:56 2007
@@ -3,6 +3,7 @@
 bin/bxcommit
 bin/bximage
 %%DATADIR%%/BIOS-bochs-latest
+%%DATADIR%%/BIOS-bochs-legacy
 %%DATADIR%%/VGABIOS-elpin-2.40
 %%DATADIR%%/VGABIOS-elpin-LICENSE
 %%DATADIR%%/VGABIOS-lgpl-README
@@ -23,7 +24,6 @@
 %%DATADIR%%/keymaps/x11-pc-si.map
 %%DATADIR%%/keymaps/x11-pc-uk.map
 %%DATADIR%%/keymaps/x11-pc-us.map
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -33,7 +33,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/Linux.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cosimulation.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/iodebug.html
 %%PORTDOCS%%%%DOCSDIR%%/memory.txt
 %%PORTDOCS%%%%DOCSDIR%%/random.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html