6 files changed, 5 insertions, 63 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 2e6e0abb55cd..fdc0bc3aef76 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -7,16 +7,12 @@
 #
 
 PORTNAME=	bochs
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 PORTEPOCH=	1
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:bochs/} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTNAME}/:bochs \
-			anholt/:local
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:bochs \
-		BIOS-bochs-1.4.1.gz:local
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	anholt@FreeBSD.org
 
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index cb0c269a176b..6d44095091c9 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,2 +1 @@
-MD5 (bochs-2.0.1.tar.gz) = 8af4a88a2f58b86f3764b4375371be29
-MD5 (BIOS-bochs-1.4.1.gz) = b2d89ca9d3eb0f3bbb81e7202bd42076
+MD5 (bochs-2.0.2.tar.gz) = 11bb4e7804f9fef3cda3822f03641b55
diff --git a/emulators/bochs/files/patch-cdrom.cc b/emulators/bochs/files/patch-cdrom.cc
deleted file mode 100644
index 808753a0db78..000000000000
--- a/emulators/bochs/files/patch-cdrom.cc
+++ /dev/null
@@ -1,41 +0,0 @@
---- iodev/cdrom.cc	Sat Dec 14 21:29:42 2002
-+++ iodev/cdrom.cc	Fri Jan  3 13:21:31 2003
-@@ -101,6 +101,8 @@
- #include <sys/cdio.h>
- #include <sys/ioctl.h>
- #include <sys/disklabel.h>
-+// ntohl(x) et al have been moved out of sys/param.h in FreeBSD 5
-+#include <netinet/in.h>
- 
- // XXX
- #define BX_CD_FRAMESIZE 2048
-@@ -881,7 +883,7 @@
-     t.data_len = sizeof(tocentry);
-     t.data = &tocentry;
- 
--    if (ioctl (fd, CDIOREADTOCENTRYS, &tocentry) < 0)
-+    if (ioctl (fd, CDIOREADTOCENTRYS, &t) < 0)
-       BX_PANIC(("cdrom: read_toc: READTOCENTRY failed."));
- 
-     buf[len++] = 0; // Reserved
-@@ -910,7 +912,7 @@
-   t.data_len = sizeof(tocentry);
-   t.data = &tocentry;
- 
--  if (ioctl (fd, CDIOREADTOCENTRYS, &tocentry) < 0)
-+  if (ioctl (fd, CDIOREADTOCENTRYS, &t) < 0)
-     BX_PANIC(("cdrom: read_toc: READTOCENTRY lead-out failed."));
- 
-   buf[len++] = 0; // Reserved
-@@ -1123,9 +1125,8 @@
-   }
- #elif defined(__FreeBSD__)
-   {
--  // Read the TOC to get the data size, since disklabel doesn't appear
--  // to work, sadly.
--  // Keith Jones, 16 January 2000
-+  // Read the TOC to get the size of the data track.
-+  // Keith Jones <freebsd.dev@blueyonder.co.uk>, 16 January 2000
- 
- #define MAX_TRACKS 100
- 
diff --git a/emulators/bochs/files/patch-font::fonts.dir b/emulators/bochs/files/patch-font::fonts.dir
deleted file mode 100644
index 5c5409b8a2ee..000000000000
--- a/emulators/bochs/files/patch-font::fonts.dir
+++ /dev/null
@@ -1,8 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null	Wed May 30 02:21:05 2001
-+++ font/fonts.dir	Wed May 30 02:24:10 2001
-@@ -0,0 +1,2 @@
-+1
-+vga.pcf.gz vga
diff --git a/emulators/bochs/pkg-message b/emulators/bochs/pkg-message
index d6bd1a84e6a3..068f82c78341 100644
--- a/emulators/bochs/pkg-message
+++ b/emulators/bochs/pkg-message
@@ -1,6 +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.
-
-If you have problems with the default BIOS, you may want to try the BIOS
-from 1.4.1 at %%DATADIR%%/bios/BIOS-bochs-1.4.1
diff --git a/emulators/bochs/pkg-plist b/emulators/bochs/pkg-plist
index 03cbe8b6e404..5573f8ac9bc0 100644
--- a/emulators/bochs/pkg-plist
+++ b/emulators/bochs/pkg-plist
@@ -2,7 +2,6 @@
 bin/bochs
 bin/bximage
 libexec/bochs.bin
-share/bochs/bios/BIOS-bochs-1.4.1
 share/bochs/bios/BIOS-bochs-2-processors
 share/bochs/bios/BIOS-bochs-4-processors
 share/bochs/bios/BIOS-bochs-8-processors