From 7c8b8f7044d34067955f31546f1b301ba37281b3 Mon Sep 17 00:00:00 2001 From: brad Date: Tue, 18 Jul 2000 05:16:58 +0000 Subject: [PATCH] upgrade to Bochs 2000_0325a --- emulators/bochs/Makefile | 46 +++++++++---------- emulators/bochs/files/md5 | 6 +-- .../bochs/patches/{patch-aa => patch-bochsrc} | 33 +++++-------- emulators/bochs/patches/patch-debug_lexer.l | 11 +++++ emulators/bochs/pkg/MESSAGE | 20 ++++++-- emulators/bochs/pkg/PLIST | 11 ++--- 6 files changed, 67 insertions(+), 60 deletions(-) rename emulators/bochs/patches/{patch-aa => patch-bochsrc} (58%) create mode 100644 emulators/bochs/patches/patch-debug_lexer.l diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index b8e84e6076e..91b4d880682 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,50 +1,50 @@ -# $OpenBSD: Makefile,v 1.14 2000/05/31 15:15:44 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2000/07/18 05:16:58 brad Exp $ # $NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp $ -DISTNAME= bochs-991023a +DISTNAME= bochs-2000_0325a CATEGORIES= emulators -NEED_VERSION= 1.191 -FAKE= Yes +NEED_VERSION= 1.310 MASTER_SITES= ftp://ftp.bochs.com/pub/ HOMEPAGE= http://www.bochs.com/ MAINTAINER= ports@openbsd.org -PERMIT_PACKAGE_CDROM= "trial period only" -PERMIT_PACKAGE_FTP= "trial period only" -PERMIT_DISTFILES_CDROM= "trial period only" +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -USE_GMAKE= yes -USE_X11= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-x11 --enable-vga +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= --with-x11 --enable-vga --enable-cpu-level="4" \ + --enable-fpu --enable-cdrom -WRKDIST= ${WRKDIR}/bochs-991023a +FLAVORS= debugger +FLAVOR?= + +.if ${FLAVOR:L} == "debugger" +CONFIGURE_ARGS+= --enable-debugger --enable-disasm +.endif + +post-extract: + @rm -f ${WRKSRC}/debug/lexer.c post-configure: - @sed -e 's@XXXPREFIXXXX@${PREFIX}@' \ + @sed -e 's@!!PREFIX!!@${PREFIX}@' \ < ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc do-install: - @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_DIR} ${PREFIX}/share/bochs/bios + ${INSTALL_DATA_DIR} ${PREFIX}/share/bochs/fonts + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bochs + ${INSTALL_PROGRAM} ${WRKBUILD}/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 - ${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_DATA} ${WRKSRC}/bochsrc ${PREFIX}/share/bochs - @${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 diff --git a/emulators/bochs/files/md5 b/emulators/bochs/files/md5 index 3b41f14fe50..215f092a4bb 100644 --- a/emulators/bochs/files/md5 +++ b/emulators/bochs/files/md5 @@ -1,3 +1,3 @@ -MD5 (bochs-991023a.tar.gz) = 1f693993033bca6620f7f68d004ff113 -RMD160 (bochs-991023a.tar.gz) = 87626c88fbaa61798ba1ee65a8bd9c7944437354 -SHA1 (bochs-991023a.tar.gz) = f6322fb87223fae6618348daa25b1d6b986974a5 +MD5 (bochs-2000_0325a.tar.gz) = 6a6fc6794b81c88d71037f17c918a880 +RMD160 (bochs-2000_0325a.tar.gz) = b06b352868f8d668513a28b1f4f227134a8accd7 +SHA1 (bochs-2000_0325a.tar.gz) = 9543b12ad448dfcf9804aa0f2d0d5d1440bf90ca diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-bochsrc similarity index 58% rename from emulators/bochs/patches/patch-aa rename to emulators/bochs/patches/patch-bochsrc index 1623186659c..53cdc8a8b01 100644 --- a/emulators/bochs/patches/patch-aa +++ b/emulators/bochs/patches/patch-bochsrc @@ -1,5 +1,5 @@ ---- .bochsrc.orig Sat Oct 23 02:23:24 1999 -+++ .bochsrc Sun Oct 31 15:15:59 1999 +--- .bochsrc.orig Mon Nov 1 20:17:08 1999 ++++ .bochsrc Sun Jul 9 01:36:35 2000 @@ -2,8 +2,8 @@ megs: 32 #megs: 16 @@ -7,29 +7,20 @@ -boot: c -vgaromimage: bios/VGABIOS-elpin-2.20 +boot: a -+vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.20 ++vgaromimage: !!PREFIX!!/share/bochs/bios/VGABIOS-elpin-2.20 # You many now use double quotes around pathnames, in case # your pathname includes spaces. -@@ -32,7 +32,7 @@ - #diskc: file=../585M, cyl=1162, heads=16, spt=63 +@@ -33,7 +33,7 @@ #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=../62M.980115, cyl=940, heads=8, spt=17 +-diskc: file="../10M.vga", cyl=306, heads=4, 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 @@ + #diskc: file=../126M.freeBSD_2.2.8, cyl=256, heads=16, spt=63 +@@ -58,7 +58,7 @@ #floppya: 1_44=../1.44.freebsd, status=inserted #floppya: 720k=../720k.dos33, status=inserted @@ -38,16 +29,16 @@ #floppyb: 1_44=../1.44b, status=inserted #floppya: 1_44=/dev/fd0, status=inserted #floppyb: 1_44=../1.44b, status=inserted -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ #floppya: 1_2=../1.2 #floppyb: 1_44=../1.680 -romimage: file=bios/BIOS-bochs-990925a, address=0xf0000 -+romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-990925a, address=0xf0000 ++romimage: file=!!PREFIX!!/share/bochs/bios/BIOS-bochs-990925a, address=0xf0000 #romimage: file=bios/rombios.bin, address=0xf0000 #romimage: file=../cbios961203 -@@ -81,8 +81,8 @@ +@@ -82,8 +82,8 @@ #vgaromimage: ../vgacbios961111 #romimage: ../cbios961203 diff --git a/emulators/bochs/patches/patch-debug_lexer.l b/emulators/bochs/patches/patch-debug_lexer.l new file mode 100644 index 00000000000..71caebc1bd6 --- /dev/null +++ b/emulators/bochs/patches/patch-debug_lexer.l @@ -0,0 +1,11 @@ +--- debug/lexer.l.orig Tue Jul 18 00:05:31 2000 ++++ debug/lexer.l Tue Jul 18 00:05:42 2000 +@@ -105,7 +105,7 @@ + \/[0-9]+ { bxlval.sval = strdup(bxtext); return(BX_TOKEN_XFORMAT); } + 0x[0-9a-fA-F]+ { bxlval.uval = strtoul(bxtext+2, NULL, 16); return(BX_TOKEN_NUMERIC); } + 0[0-7]+ { bxlval.uval = strtoul(bxtext+1, NULL, 8); return(BX_TOKEN_NUMERIC); } +-[0-9]+L { bxlval.ulval = strtoull(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); } ++[0-9]+L { bxlval.ulval = strtoul(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); } + [0-9]+ { bxlval.uval = strtoul(bxtext, NULL, 10); return(BX_TOKEN_NUMERIC); } + $[a-zA-Z_][a-zA-Z0-9_]* { bxlval.sval = strdup(bxtext); return(BX_TOKEN_SYMBOLNAME); } + \n { return('\n'); } diff --git a/emulators/bochs/pkg/MESSAGE b/emulators/bochs/pkg/MESSAGE index 4e7b54c2206..b9d9a29d2ba 100644 --- a/emulators/bochs/pkg/MESSAGE +++ b/emulators/bochs/pkg/MESSAGE @@ -1,6 +1,16 @@ -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 /usr/X11R6/share/bochs/bochsrc +You must add the ${PREFIX}/share/bochs/fonts directory to your X server's +font path. For XFree86, add the line: -*** BOCHS is commercial software *** -Please read /usr/X11R6/share/doc/bochs/LICENSE for details. +FontPath "${PREFIX}/share/bochs/fonts" + +in the "Files" section of your /etc/XF86Config file. +If you use a different X server, please see its documentation on how to do +this. + +Then re-start your X server. + ++--------------- +| 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 ${PREFIX}/share/bochs/bochsrc ++--------------- diff --git a/emulators/bochs/pkg/PLIST b/emulators/bochs/pkg/PLIST index 9cb9b3eeef5..e6782515c27 100644 --- a/emulators/bochs/pkg/PLIST +++ b/emulators/bochs/pkg/PLIST @@ -5,10 +5,8 @@ share/bochs/bios/VGABIOS-elpin-2.20 share/bochs/fonts/hercules.bdf share/bochs/fonts/vga.bdf share/bochs/fonts/vga.pcf -share/bochs/fonts/fonts.dir share/doc/bochs/3rdparty.license.html share/doc/bochs/DOS.html -share/doc/bochs/LICENSE share/doc/bochs/Linux.html share/doc/bochs/Minix.html share/doc/bochs/OldWindows95.html @@ -24,11 +22,12 @@ share/doc/bochs/developers.html share/doc/bochs/faq.html share/doc/bochs/features.html share/doc/bochs/fpu.html +share/doc/bochs/guestNT.html share/doc/bochs/index.html share/doc/bochs/install.html -share/doc/bochs/mtools.html share/doc/bochs/instrumentation.html -share/doc/bochs/licensing.html +share/doc/bochs/mtools.html +share/doc/bochs/sound.html share/doc/bochs/undercon.gif share/doc/bochs/whatisbochs.html share/doc/bochs/win32.html @@ -39,7 +38,3 @@ share/doc/bochs/win32.html @dirrm share/bochs/bios @dirrm share/bochs @dirrm share/doc/bochs -@exec echo "***" -@exec echo "*** Don't forget to add ${PREFIX}/share/bochs/fonts" -@exec echo "*** to FontPath in /etc/XF86Config." -@exec echo "***"