Attachment #28688 for bug #48143

View | Details | Raw Unified | Return to bug 48143
Collapse All | Expand All

Lines 7-13 Link Here

(-)emulators/bochs/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= bochs	9	PORTNAME= bochs
10	PORTVERSION= 2.0.1	10	PORTVERSION= 2.0.2
11	PORTEPOCH= 1	11	PORTEPOCH= 1
12	CATEGORIES= emulators	12	CATEGORIES= emulators
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:bochs/} \	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:bochs/} \

Lines 1-2 Link Here

(-)emulators/bochs/distinfo (-1 / +1 lines)
1	MD5 (bochs-2.0.1.tar.gz) = 8af4a88a2f58b86f3764b4375371be29	1	MD5 (bochs-2.0.2.tar.gz) = 11bb4e7804f9fef3cda3822f03641b55
2	MD5 (BIOS-bochs-1.4.1.gz) = b2d89ca9d3eb0f3bbb81e7202bd42076	2	MD5 (BIOS-bochs-1.4.1.gz) = b2d89ca9d3eb0f3bbb81e7202bd42076




--- 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
 

Lines 1-8 Link Here

(-)emulators/bochs/files/patch-font::fonts.dir (-8 lines)
1
2	$FreeBSD: ports/emulators/bochs/files/patch-font::fonts.dir,v 1.1 2001/06/02 16:42:57 sobomax Exp $
3
4	--- /dev/null Wed May 30 02:21:05 2001
5	+++ font/fonts.dir Wed May 30 02:24:10 2001
6	@@ -0,0 +1,2 @@
7	+1
8	+vga.pcf.gz vga

Return to bug 48143

Lines 1-41 Link Here

(-)emulators/bochs/files/patch-cdrom.cc (-41 lines)
1	--- iodev/cdrom.cc Sat Dec 14 21:29:42 2002
2	+++ iodev/cdrom.cc Fri Jan 3 13:21:31 2003
3	@@ -101,6 +101,8 @@
4	#include <sys/cdio.h>
5	#include <sys/ioctl.h>
6	#include <sys/disklabel.h>
7	+// ntohl(x) et al have been moved out of sys/param.h in FreeBSD 5
8	+#include <netinet/in.h>
9
10	// XXX
11	#define BX_CD_FRAMESIZE 2048
12	@@ -881,7 +883,7 @@
13	t.data_len = sizeof(tocentry);
14	t.data = &tocentry;
15
16	- if (ioctl (fd, CDIOREADTOCENTRYS, &tocentry) < 0)
17	+ if (ioctl (fd, CDIOREADTOCENTRYS, &t) < 0)
18	BX_PANIC(("cdrom: read_toc: READTOCENTRY failed."));
19
20	buf[len++] = 0; // Reserved
21	@@ -910,7 +912,7 @@
22	t.data_len = sizeof(tocentry);
23	t.data = &tocentry;
24
25	- if (ioctl (fd, CDIOREADTOCENTRYS, &tocentry) < 0)
26	+ if (ioctl (fd, CDIOREADTOCENTRYS, &t) < 0)
27	BX_PANIC(("cdrom: read_toc: READTOCENTRY lead-out failed."));
28
29	buf[len++] = 0; // Reserved
30	@@ -1123,9 +1125,8 @@
31	}
32	#elif defined(__FreeBSD__)
33	{
34	- // Read the TOC to get the data size, since disklabel doesn't appear
35	- // to work, sadly.
36	- // Keith Jones, 16 January 2000
37	+ // Read the TOC to get the size of the data track.
38	+ // Keith Jones <freebsd.dev@blueyonder.co.uk>, 16 January 2000
39
40	#define MAX_TRACKS 100
41