Attachment #63372 for bug #94533

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




#

PORTNAME=	bochs
PORTVERSION=	2.2.6
PORTEPOCH=	2
CATEGORIES=	emulators
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}

RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}

USE_XLIB=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes

GNU_CONFIGURE=	yes

MAN1=		bochs.1 bochs-dlx.1 bxcommit.1 bximage.1
MAN5=		bochsrc.5

.if defined(WITH_BOCHS_SMP)
CONFIGURE_ARGS+=	--enable-smp
IGNORE=	Cannot install: WITH_BOCHS_PROCESSORS must be an integer value between 1 and 15
.endif
CONFIGURE_ARGS+=	--enable-processors=${WITH_BOCHS_PROCESSORS}
WITH_BOCHS_CPU_LEVEL=	6
.endif

.if defined(WITH_BOCHS_CPU_LEVEL)
.if ${WITH_BOCHS_CPU_LEVEL} < 3 || ${WITH_BOCHS_CPU_LEVEL} > 6
IGNORE=	cannot install: WITH_BOCHS_CPU_LEVEL must be an integer value between 3 and 6
.endif
CONFIGURE_ARGS+=	--enable-cpu-level=${WITH_BOCHS_CPU_LEVEL}
.if ${WITH_BOCHS_CPU_LEVEL} < 5

	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_GUI_NOGUI=yes\""
	@${ECHO_MSG}
.endif
.if !defined(WITH_BOCHS_SMP)
	@${ECHO_MSG} "If you want to compile with SMP support (implies WITH_BOCHS_CPU_LEVEL=6),"
	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_SMP\""
	@${ECHO_MSG}
.endif
.if !defined(WITH_BOCHS_DEBUGGER)

Lines 1-3 Link Here

(-)/usr/ports/emulators/bochs/distinfo (-3 / +3 lines)
1	MD5 (bochs-2.2.1.tar.gz) = 50484c75d8175fcd97a81432ac18fb71	1	MD5 (bochs-2.2.6.tar.gz) = 961482eb78b55fe3e0e0639e34b4c2c1
2	SHA256 (bochs-2.2.1.tar.gz) = e04f054164ea489c9f52794c7e0b214d72238212362db8382fdffe7df1fbd52c	2	SHA256 (bochs-2.2.6.tar.gz) = 25447ca196794bb2e00d314038f75ad8aeead87dcf34e9501598b900dea639ee
3	SIZE (bochs-2.2.1.tar.gz) = 3785329	3	SIZE (bochs-2.2.6.tar.gz) = 3765867

Lines 1-24 Link Here

(-)/usr/ports/emulators/bochs/files/patch-aa (-17 / +21 lines)
1	--- .bochsrc.orig Fri May 13 20:10:58 2005	1	--- .bochsrc.orig Sun Jan 29 07:56:01 2006
2	+++ .bochsrc Sat Jun 18 06:06:15 2005	2	+++ .bochsrc Mon Feb 20 21:10:38 2006
3	@@ -70,7 +70,7 @@	3	@@ -74,7 +74,7 @@
4	# You can also use the environment variable $BXSHARE to specify the	4	# now supported, but we still recommend to use the BIOS distributed with
5	# location of the BIOS.	5	# Bochs. Now the start address can be calculated from image size.
6	#=======================================================================	6	#=======================================================================
7	-romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000	7	-romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
8	+romimage: file=bios/BIOS-bochs-latest, address=0xf0000	8	+romimage: file=/usr/local/share/bochs/BIOS-bochs-latest, address=0xf0000
9	#romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000	9	#romimage: file=mybios.bin, address=0xfff80000 # 512k at memory top
10	#romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000	10	#romimage: file=mybios.bin # calculate start address from image size
11	#romimage: file=bios/rombios.bin, address=0xf0000	11
12	@@ -109,7 +109,7 @@	12	@@ -147,9 +147,9 @@
		13	# VGAROMIMAGE
13	# You now need to load a VGA ROM BIOS into C0000.	14	# You now need to load a VGA ROM BIOS into C0000.
14	#=======================================================================	15	#=======================================================================
15	#vgaromimage: file=bios/VGABIOS-elpin-2.40	16	-#vgaromimage: file=bios/VGABIOS-elpin-2.40
16	-vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest	17	-vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
17	+vgaromimage: file=bios/VGABIOS-lgpl-latest	18	-#vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus
18	#vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus	19	+#vgaromimage: file=/usr/local/share/bochs/VGABIOS-elpin-2.40
		20	+vgaromimage: file=/usr/local/share/bochs/VGABIOS-lgpl-latest
		21	+#vgaromimage: file=/usr/local/share/bochs/VGABIOS-lgpl-latest-cirrus
19		22
20	#=======================================================================	23	#=======================================================================
21	@@ -301,7 +301,7 @@	24	# VGA:
		25	@@ -319,7 +319,7 @@
22	#	26	#
23	# Default value are sync=none, time0=local	27	# Default value are sync=none, time0=local
24	#=======================================================================	28	#=======================================================================
Lines 27-33 Link Here
27		31
28		32
29	#=======================================================================	33	#=======================================================================
30	@@ -326,8 +326,8 @@	34	@@ -344,8 +344,8 @@
31	# log: ./bochs.out	35	# log: ./bochs.out
32	# log: /dev/tty	36	# log: /dev/tty
33	#=======================================================================	37	#=======================================================================
Lines 38-44 Link Here
38		42
39	#=======================================================================	43	#=======================================================================
40	# LOGPREFIX:	44	# LOGPREFIX:
41	@@ -367,7 +367,7 @@	45	@@ -385,7 +385,7 @@
42	# cause bochs to become unstable. The panic is a "graceful exit," so	46	# cause bochs to become unstable. The panic is a "graceful exit," so
43	# if you disable it you may get a spectacular disaster instead.	47	# if you disable it you may get a spectacular disaster instead.
44	#=======================================================================	48	#=======================================================================
Lines 47-53 Link Here
47	error: action=report	51	error: action=report
48	info: action=report	52	info: action=report
49	debug: action=ignore	53	debug: action=ignore
50	@@ -422,7 +422,7 @@	54	@@ -442,7 +442,7 @@
51	# parport2: enabled=1, file="/dev/lp0"	55	# parport2: enabled=1, file="/dev/lp0"
52	# parport1: enabled=0	56	# parport1: enabled=0
53	#=======================================================================	57	#=======================================================================

Lines 1-5 Link Here

(-)/usr/ports/emulators/bochs/files/patch-iodev::eth_vde.cc (-1 / +1 lines)
1	--- iodev/eth_vde.cc.orig Sat Dec 10 12:37:35 2005	1	--- iodev/eth_vde.cc.orig Sat Dec 10 12:37:35 2005
2	+++ iodev/eth_vde.cc Mon Feb 20 11:39:02 2006	2	+++ iodev/eth_vde.cc Mon Feb 20 21:39:02 2006
3	@@ -41,13 +41,17 @@	3	@@ -41,13 +41,17 @@
4	#include <sys/poll.h>	4	#include <sys/poll.h>
5	#include <sys/time.h>	5	#include <sys/time.h>




bin/bochs
bin/bxcommit
bin/bximage
%%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%%/keymaps/x11-pc-it.map
%%DATADIR%%/keymaps/x11-pc-ru.map
%%DATADIR%%/keymaps/x11-pc-se.map
%%DATADIR%%/keymaps/x11-pc-si.map
%%DATADIR%%/keymaps/x11-pc-uk.map
%%DATADIR%%/keymaps/x11-pc-us.map
%%DOCSDIR%%/CHANGES

%%PORTDOCS%%%%DOCSDIR%%/biossums.txt
%%PORTDOCS%%%%DOCSDIR%%/cvs-structure.txt
%%PORTDOCS%%%%DOCSDIR%%/html/Linux.html
%%PORTDOCS%%%%DOCSDIR%%/html/codingguidelines.html
%%PORTDOCS%%%%DOCSDIR%%/html/cosimulation.html
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/iodebug.html

Return to bug 94533

Lines 7-13 Link Here

(-)/usr/ports/emulators/bochs/Makefile (-10 / +6 lines)
7	#	7	#
8		8
9	PORTNAME= bochs	9	PORTNAME= bochs
10	PORTVERSION= 2.2.1	10	PORTVERSION= 2.2.6
11	PORTEPOCH= 2	11	PORTEPOCH= 2
12	CATEGORIES= emulators	12	CATEGORIES= emulators
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 20-26 Link Here
20	RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}	20	RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
21		21
22	USE_XLIB= yes	22	USE_XLIB= yes
23	USE_REINPLACE= yes
24	USE_GMAKE= yes	23	USE_GMAKE= yes
25		24
26	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
Lines 39-55 Link Here
39	MAN1= bochs.1 bochs-dlx.1 bxcommit.1 bximage.1	38	MAN1= bochs.1 bochs-dlx.1 bxcommit.1 bximage.1
40	MAN5= bochsrc.5	39	MAN5= bochsrc.5
41		40
42	.if defined(WITH_BOCHS_PROCESSORS)	41	.if defined(WITH_BOCHS_SMP)
43	.if ${WITH_BOCHS_PROCESSORS} < 1 \|\| ${WITH_BOCHS_PROCESSORS} > 15	42	CONFIGURE_ARGS+= --enable-smp
44	IGNORE= Cannot install: WITH_BOCHS_PROCESSORS must be an integer value between 1 and 15
45	.endif
46	CONFIGURE_ARGS+= --enable-processors=${WITH_BOCHS_PROCESSORS}
47	WITH_BOCHS_CPU_LEVEL= 6	43	WITH_BOCHS_CPU_LEVEL= 6
48	.endif	44	.endif
49		45
50	.if defined(WITH_BOCHS_CPU_LEVEL)	46	.if defined(WITH_BOCHS_CPU_LEVEL)
51	.if ${WITH_BOCHS_CPU_LEVEL} < 3 \|\| ${WITH_BOCHS_CPU_LEVEL} > 6	47	.if ${WITH_BOCHS_CPU_LEVEL} < 3 \|\| ${WITH_BOCHS_CPU_LEVEL} > 6
52	IGNORE= Cannot install: WITH_BOCHS_CPU_LEVEL must be an integer value between 3 and 6	48	IGNORE= cannot install: WITH_BOCHS_CPU_LEVEL must be an integer value between 3 and 6
53	.endif	49	.endif
54	CONFIGURE_ARGS+= --enable-cpu-level=${WITH_BOCHS_CPU_LEVEL}	50	CONFIGURE_ARGS+= --enable-cpu-level=${WITH_BOCHS_CPU_LEVEL}
55	.if ${WITH_BOCHS_CPU_LEVEL} < 5	51	.if ${WITH_BOCHS_CPU_LEVEL} < 5
Lines 98-106 Link Here
98	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_GUI_NOGUI=yes\""	94	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_GUI_NOGUI=yes\""
99	@${ECHO_MSG}	95	@${ECHO_MSG}
100	.endif	96	.endif
101	.if !defined(WITH_BOCHS_PROCESSORS)	97	.if !defined(WITH_BOCHS_SMP)
102	@${ECHO_MSG} "If you want to compile with SMP support (implies WITH_BOCHS_CPU_LEVEL=6),"	98	@${ECHO_MSG} "If you want to compile with SMP support (implies WITH_BOCHS_CPU_LEVEL=6),"
103	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_PROCESSORS=<number of processors>\""	99	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_SMP\""
104	@${ECHO_MSG}	100	@${ECHO_MSG}
105	.endif	101	.endif
106	.if !defined(WITH_BOCHS_DEBUGGER)	102	.if !defined(WITH_BOCHS_DEBUGGER)

Lines 2-10 Link Here

(-)/usr/ports/emulators/bochs/pkg-plist (-4 / +1 lines)
2	bin/bochs	2	bin/bochs
3	bin/bxcommit	3	bin/bxcommit
4	bin/bximage	4	bin/bximage
5	%%DATADIR%%/BIOS-bochs-2-processors
6	%%DATADIR%%/BIOS-bochs-4-processors
7	%%DATADIR%%/BIOS-bochs-8-processors
8	%%DATADIR%%/BIOS-bochs-latest	5	%%DATADIR%%/BIOS-bochs-latest
9	%%DATADIR%%/VGABIOS-elpin-2.40	6	%%DATADIR%%/VGABIOS-elpin-2.40
10	%%DATADIR%%/VGABIOS-elpin-LICENSE	7	%%DATADIR%%/VGABIOS-elpin-LICENSE
Lines 23-28 Link Here
23	%%DATADIR%%/keymaps/x11-pc-it.map	20	%%DATADIR%%/keymaps/x11-pc-it.map
24	%%DATADIR%%/keymaps/x11-pc-ru.map	21	%%DATADIR%%/keymaps/x11-pc-ru.map
25	%%DATADIR%%/keymaps/x11-pc-se.map	22	%%DATADIR%%/keymaps/x11-pc-se.map
		23	%%DATADIR%%/keymaps/x11-pc-si.map
26	%%DATADIR%%/keymaps/x11-pc-uk.map	24	%%DATADIR%%/keymaps/x11-pc-uk.map
27	%%DATADIR%%/keymaps/x11-pc-us.map	25	%%DATADIR%%/keymaps/x11-pc-us.map
28	%%DOCSDIR%%/CHANGES	26	%%DOCSDIR%%/CHANGES
Lines 33-39 Link Here
33	%%PORTDOCS%%%%DOCSDIR%%/biossums.txt	31	%%PORTDOCS%%%%DOCSDIR%%/biossums.txt
34	%%PORTDOCS%%%%DOCSDIR%%/cvs-structure.txt	32	%%PORTDOCS%%%%DOCSDIR%%/cvs-structure.txt
35	%%PORTDOCS%%%%DOCSDIR%%/html/Linux.html	33	%%PORTDOCS%%%%DOCSDIR%%/html/Linux.html
36	%%PORTDOCS%%%%DOCSDIR%%/html/codingguidelines.html
37	%%PORTDOCS%%%%DOCSDIR%%/html/cosimulation.html	34	%%PORTDOCS%%%%DOCSDIR%%/html/cosimulation.html
38	%%PORTDOCS%%%%DOCSDIR%%/html/index.html	35	%%PORTDOCS%%%%DOCSDIR%%/html/index.html
39	%%PORTDOCS%%%%DOCSDIR%%/html/iodebug.html	36	%%PORTDOCS%%%%DOCSDIR%%/html/iodebug.html