- upgrade to Bochs 991023a

- add misssing NO_CDROM and RESTRICTED tags
This commit is contained in:
brad 1999-10-31 20:22:37 +00:00
parent 511c1a1cfa
commit 42fc49b4ad
4 changed files with 72 additions and 61 deletions

View File

@ -1,40 +1,46 @@
# $OpenBSD: Makefile,v 1.8 1999/04/01 06:20:12 brad Exp $
# $OpenBSD: Makefile,v 1.9 1999/10/31 20:22:37 brad Exp $
# $NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp $
DISTNAME= bochs-990219a
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.bochs.com/pub/
DISTNAME= bochs-991023a
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.bochs.com/pub/
MAINTAINER= brad@openbsd.org
HOMEPAGE= http://www.bochs.com/
NO_CDROM= "Commercial software"
RESTRICTED= "Commercial software"
LICENSE= shareware
WRKSRC= ${WRKDIR}/bochs-990219
USE_GMAKE= yes
CONFIGURE_ARGS+= --enable-vga #--with-x11
GNU_CONFIGURE= yes
USE_X11= yes
HOMEPAGE= http://www.bochs.com/
MAINTAINER= ports@openbsd.org
USE_GMAKE= yes
USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-x11 --enable-vga
WRKSRC= ${WRKDIR}/bochs-991023a
post-configure:
${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' < ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc
@sed -e 's@XXXPREFIXXXX@${PREFIX}@' \
< ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc
do-install:
${MKDIR} ${PREFIX}/share/bochs/bios
${MKDIR} ${PREFIX}/share/bochs/fonts
${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-990218a ${PREFIX}/share/bochs/bios
@mkdir -p ${PREFIX}/share/bochs/bios
@mkdir -p ${PREFIX}/share/bochs/fonts
@mkdir -p ${PREFIX}/share/doc/bochs
${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-990925a ${PREFIX}/share/bochs/bios
${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.20 ${PREFIX}/share/bochs/bios
${MKDIR} ${PREFIX}/share/doc/bochs
${INSTALL_DATA} ${WRKSRC}/docs-html/* ${PREFIX}/share/doc/bochs
${INSTALL_DATA} ${WRKSRC}/docs-html/LICENSE ${PREFIX}/share/doc/bochs
${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${PREFIX}/share/doc/bochs
${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${PREFIX}/share/doc/bochs
${INSTALL_DATA} ${WRKSRC}/font/hercules.bdf ${PREFIX}/share/bochs/fonts
${INSTALL_DATA} ${WRKSRC}/font/vga.bdf ${PREFIX}/share/bochs/fonts
${INSTALL_DATA} ${WRKSRC}/font/vga.pcf ${PREFIX}/share/bochs/fonts
${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/bochsrc ${PREFIX}/share/bochs
[ -x ${X11BASE}/bin/mkfontdir ] && \
${X11BASE}/bin/mkfontdir ${PREFIX}/share/bochs/fonts
@${ECHO} "***"
@${ECHO} "*** Don't forget to add ${PREFIX}/share/bochs/fonts"
@${ECHO} "*** to FontPath in /etc/XF86Config."
@${ECHO} "***"
@${X11BASE}/bin/mkfontdir ${PREFIX}/share/bochs/fonts
@echo "***"
@echo "*** Don't forget to add ${PREFIX}/share/bochs/fonts"
@echo "*** to FontPath in /etc/XF86Config."
@echo "***"
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (bochs-990219a.tar.gz) = d03a10913bf3171bdcaca80c0fedb7d2
RMD160 (bochs-990219a.tar.gz) = 41c4273a5abe38eb6c865f986bf4611172312271
SHA1 (bochs-990219a.tar.gz) = 4f2676827dad4f2f8537830b6bf7b0ac4e90ef09
MD5 (bochs-991023a.tar.gz) = 1f693993033bca6620f7f68d004ff113
RMD160 (bochs-991023a.tar.gz) = 87626c88fbaa61798ba1ee65a8bd9c7944437354
SHA1 (bochs-991023a.tar.gz) = f6322fb87223fae6618348daa25b1d6b986974a5

View File

@ -1,38 +1,60 @@
--- .bochsrc.orig Sat Feb 20 00:48:03 1999
+++ .bochsrc Sat Feb 20 00:56:25 1999
@@ -3,7 +3,7 @@
megs: 16
--- .bochsrc.orig Sat Oct 23 02:23:24 1999
+++ .bochsrc Sun Oct 31 15:15:59 1999
@@ -2,8 +2,8 @@
megs: 32
#megs: 16
#megs: 8
boot: c
-boot: c
-vgaromimage: bios/VGABIOS-elpin-2.20
+boot: a
+vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.20
# You many now use double quotes around pathnames, in case
# your pathname includes spaces.
@@ -48,7 +48,8 @@
@@ -32,7 +32,7 @@
#diskc: file=../585M, cyl=1162, heads=16, spt=63
#diskc: file=../528M, cyl=1024, heads=16, spt=63
-diskc: file=../62M.980115, cyl=940, heads=8, spt=17
+#diskc: file=../62M.980115, cyl=940, heads=8, spt=17
#diskc: file="../10M.vga", cyl=306, heads=4, spt=17
#diskc: file=../10M.dos622, cyl=306, heads=4, spt=17
#diskc: file=../30M.freebsd, cyl=615, heads=6, spt=17
@@ -47,7 +47,7 @@
#diskc: file=../10M.win31, cyl=306, heads=4, spt=17
#diskc: file=../rrrr, cyl=1, heads=2, spt=18
-cdromd: dev=/dev/cdrom, status=inserted
+#cdromd: dev=/dev/cdrom, status=inserted
#cdromd: dev=/dev/cdrom, status=ejected
@@ -57,7 +57,7 @@
#floppya: 1_44=../1.44.freebsd, status=inserted
#floppya: 720k=../720k.dos33, status=inserted
-floppya: 1_44=../1.44a, status=inserted
+floppya: 1_44=/dev/rfd0a, status=inserted
+#floppya: 1_44=../1.44a, status=inserted
#floppyb: 1_44=../1.44b, status=inserted
#floppya: 1_44=/dev/fd0, status=inserted
#floppyb: 1_44=../1.44b, status=inserted
@@ -62,14 +63,14 @@
#romimage: file=../r980820.rom, address=0xe0000
#romimage: file=bios/BIOS-bochs-990104a, address=0xf0000
#romimage: file=bios/BIOS-bochs-990127a, address=0xf0000
-romimage: file=bios/BIOS-bochs-990218a, address=0xf0000
+romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-990218a, address=0xf0000
@@ -67,7 +67,7 @@
#floppya: 1_2=../1.2
#floppyb: 1_44=../1.680
#romimage: ../cbios961112
-romimage: file=bios/BIOS-bochs-990925a, address=0xf0000
+romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-990925a, address=0xf0000
#romimage: file=bios/rombios.bin, address=0xf0000
#romimage: file=../cbios961203
@@ -81,8 +81,8 @@
#vgaromimage: ../vgacbios961111
#romimage: ../cbios961203
#log: /dev/null
-#log: /dev/null
-log: ./bochs.out
+log: XXXPREFIXXXX/share/bochs/bochs.out
+log: /dev/null
+#log: ./bochs.out
keyboard_serial_delay: 200
floppy_command_delay: 500
#ips: 1500000

View File

@ -1,17 +0,0 @@
--- Makefile.in.orig Thu Feb 4 22:33:09 1999
+++ Makefile.in Thu Feb 4 22:34:58 1999
@@ -27,11 +27,11 @@
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = -Wl,-R${X11BASE}/lib @LDFLAGS@
LIBS = @LIBS@
-X_LIBS = @X_LIBS@
+X_LIBS = -L${X11BASE}/lib
X_PRE_LIBS = @X_PRE_LIBS@
-GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11
+GUI_LINK_OPTS_X = $(LDFLAGS) $(X_LIBS) $(X_PRE_LIBS) -lX11
GUI_LINK_OPTS_BEOS = -lbe
GUI_LINK_OPTS_WIN32 = -luser32 -lgdi32 -lwinmm -lcomdlg32 -lcomctl32
GUI_LINK_OPTS_WIN32_VCPP = user32.lib gdi32.lib winmm.lib \