3 files changed, 20 insertions, 33 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 2e879f4be0ac..994c00b84897 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	bochs
-PORTVERSION=	1.4
+PORTVERSION=	1.4.1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
@@ -16,30 +16,30 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS+=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS+=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 # Global variables
 #
 
 USE_XLIB=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
-USE_AUTOCONF=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-cdrom \
-		--disable-split-hd
+USE_AUTOCONF_VER=	213
+CONFIGURE_ARGS=	--disable-split-hd
 
-CFLAGS+=	-fno-rtti -fno-exceptions -fomit-frame-pointer \
-		-I${X11BASE}/include
+CFLAGS+=	-fno-rtti -fno-exceptions -fomit-frame-pointer
 
 # PREFIX isn't honored. force it w/ prefix.
 MAKE_ARGS=	prefix=${PREFIX}
 
+MAN1=		bochs.1 bochsrc.1 bximage.1
+
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS+=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS+=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 .if defined(WITH_BOCHS_PROCESSORS)
 .if ${WITH_BOCHS_CPU_LEVEL} < 1 || ${WITH_BOCHS_CPU_LEVEL} > 15
 .error "WITH_BOCHS_CPU_LEVEL must be an integer value between 1 and 15."
@@ -71,8 +71,6 @@ CONFIGURE_ARGS+=	--enable-ne2000
 CONFIGURE_ARGS+=	--enable-sb16=linux
 .endif
 
-MAN1=		bochs.1 bochsrc.1 bximage.1
-
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -131,13 +129,13 @@ pre-everything::
 post-patch: patch-bochsrc patch-mans patch-wrapper patch-message
 
 patch-bochsrc:
-	@${PERL} -pi.fbsd -e ' \
+	@${REINPLACE_CMD} -E ' \
 		s|^vgaromimage:\sbios/|vgaromimage: ${BIOS_DIR}/|; \
 		s|^romimage:\sfile=bios/|romimage: file=${BIOS_DIR}/|; \
 		' ${WRKSRC}/.bochsrc
 
 patch-mans:
-	@${PERL} -pi.fbsd -e ' \
+	@${REINPLACE_CMD} -e ' \
 		s|/usr/local/bochs|${DATADIR}|; \
 		s|\@VERSION\@|${PORTVERSION}|; \
 		' ${WRKSRC}/doc/man/*.1
@@ -192,11 +190,11 @@ install-fonts:
 
 install-docs:
 .if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/html
-	@${INSTALL_MAN} ${WRKSRC}/docs-html/*.html ${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${DOCSDIR}/html
 	@${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${DOCSDIR}/html
-	@${INSTALL_MAN} ${WRKSRC}/docs-html/*.txt ${DOCSDIR}/html
-	@${MV} ${DOCSDIR}/html/*.txt ${DOCSDIR}
 .endif
 
 # Post-install
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 3713470e14c9..3ef55aa48791 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1 +1 @@
-MD5 (bochs-1.4.tar.gz) = e8a6ad67f78c63423545806886f8c66a
+MD5 (bochs-1.4.1.tar.gz) = 12e591b5cec2e0051e18605483f64678
diff --git a/emulators/bochs/files/patch-main.cc b/emulators/bochs/files/patch-main.cc
deleted file mode 100644
index f0f413099655..000000000000
--- a/emulators/bochs/files/patch-main.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.cc.orig	Thu May 16 04:26:43 2002
-+++ main.cc	Thu May 16 04:26:55 2002
-@@ -1174,7 +1174,7 @@
-   BX_MEM(0)->load_ROM(bx_options.vgarom.Opath->getptr (), 0xc0000);
-   BX_CPU(0)->init (BX_MEM(0));
- #if BX_SUPPORT_APIC
--  BX_CPU(0)->local_apic.set_id (i);
-+  BX_CPU(0)->local_apic.set_id (0);
- #endif
-   BX_CPU(0)->reset(BX_RESET_HARDWARE);
- #else