[pkgsrc/trunk]: pkgsrc Update bochs to 2.1. Changes:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Update bochs to 2.1. Changes:
From: hubertf <hubertf%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:31:37 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/bda22a340414
branches:  trunk
changeset: 468268:bda22a340414
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Thu Feb 12 00:10:30 2004 +0000

description:
Update bochs to 2.1. Changes:

- New disassembler
- 3DNow!/SSE/SSE2/PNI instruction support
- Vmware3/Sparse/Undoable/Growing harddisk images support
- many VGA emulation improvements (e.g. high/true color VBE modes added)
- No more X11 vga font required

diffstat:

 doc/CHANGES                      |   3 +-
 emulators/bochs/MESSAGE          |  17 ++----
 emulators/bochs/Makefile         |  62 ++++++++++++++-------------
 emulators/bochs/PLIST            |  77 +++++++++++++---------------------
 emulators/bochs/distinfo         |  16 ++----
 emulators/bochs/patches/patch-aa |  64 +++++++++++++++-------------
 emulators/bochs/patches/patch-ab |  89 +++++----------------------------------
 emulators/bochs/patches/patch-ad |  40 ++++++-----------
 emulators/bochs/patches/patch-ae |  13 -----
 emulators/bochs/patches/patch-af |  15 ------
 emulators/bochs/patches/patch-ag |  14 ------
 emulators/bochs/patches/patch-ah |  13 -----
 12 files changed, 137 insertions(+), 286 deletions(-)

diffs (truncated from 548 to 300 lines):

diff -r eccefb706fb5 -r bda22a340414 doc/CHANGES
--- a/doc/CHANGES       Wed Feb 11 23:42:11 2004 +0000
+++ b/doc/CHANGES       Thu Feb 12 00:10:30 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4794 2004/02/11 23:11:30 jmmv Exp $
+$NetBSD: CHANGES,v 1.4795 2004/02/12 00:10:30 hubertf Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -789,3 +789,4 @@
        Updated imlib2 to 1.1.0nb2 [xtraeme 2004-02-11]
        Removed linuxls [jmmv 2004-02-11]
        Added gnuls-5.0 [jmmv 2004-02-11]
+       Updated bochs to 2.1 [hubertf 2004-02-12]
diff -r eccefb706fb5 -r bda22a340414 emulators/bochs/MESSAGE
--- a/emulators/bochs/MESSAGE   Wed Feb 11 23:42:11 2004 +0000
+++ b/emulators/bochs/MESSAGE   Thu Feb 12 00:10:30 2004 +0000
@@ -1,18 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:29:58 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2004/02/12 00:10:30 hubertf Exp $
 
-You need to copy the ${BOCHS_MAINDIR}/bochsrc file to your home
-directory and name it .bochsrc.  Then edit it to your tastes
-defining the hard drives and floppies as needed.  You also need
-to ${BOCHS_FONTDIR} to your X font path and to enable it
-before running bochs, e.g.
-
-  $ xset fp+ ${BOCHS_FONTDIR}
-  $ xset fp rehash
+You need to copy the ${PREFIX}/share/doc/bochs/bochsrc-sample.txt
+file to your home directory and name it .bochsrc.  Then edit it to
+your tastes defining the hard drives and floppies as needed.  
 
 Documentation is available on the website, and a copy of that
 website is in ${BOCHS_DOCDIR}.  The file install.html
-will assist you in creating a HD "file". (A raw disk partition can
-be used as well.)
+will assist you in creating a HD "file" (a raw disk partition or
+ISO file can be used as well)
 
 ===========================================================================
diff -r eccefb706fb5 -r bda22a340414 emulators/bochs/Makefile
--- a/emulators/bochs/Makefile  Wed Feb 11 23:42:11 2004 +0000
+++ b/emulators/bochs/Makefile  Thu Feb 12 00:10:30 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2004/01/22 08:36:03 grant Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/12 00:10:31 hubertf Exp $
 
-DISTNAME=              bochs-2.0.2
+DISTNAME=              bochs-2.1
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=bochs/}
 
@@ -20,8 +20,37 @@
 CONFIGURE_ARGS+=       --enable-cdrom
 CONFIGURE_ARGS+=       --enable-ne2000
 CONFIGURE_ARGS+=       --enable-sb16=dummy
+.if !defined(BOCHS_TINY)
+CONFIGURE_ARGS+=       --enable-new-pit
+CONFIGURE_ARGS+=       --enable-pci
+CONFIGURE_ARGS+=       --enable-cpu-level=6
+CONFIGURE_ARGS+=       --enable-apic
+CONFIGURE_ARGS+=       --enable-usb
+CONFIGURE_ARGS+=       --enable-4meg-pages
+CONFIGURE_ARGS+=       --enable-pae
+CONFIGURE_ARGS+=       --enable-guest2host-tlb
+CONFIGURE_ARGS+=       --enable-repeat-speedups
+CONFIGURE_ARGS+=       --enable-icache
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:M*-*-i386)
+CONFIGURE_ARGS+=       --enable-fast-function-calls
+.endif
+CONFIGURE_ARGS+=       --enable-global-pages
+CONFIGURE_ARGS+=       --enable-host-specific-asms
+CONFIGURE_ARGS+=       --enable-all-optimizations
+CONFIGURE_ARGS+=       --enable-vbe
+CONFIGURE_ARGS+=       --enable-fpu
+CONFIGURE_ARGS+=       --enable-mmx
+CONFIGURE_ARGS+=       --enable-3dnow
+CONFIGURE_ARGS+=       --enable-sse=2
+CONFIGURE_ARGS+=       --enable-daz
+CONFIGURE_ARGS+=       --enable-sep
+.endif # !BOCHS_TINY
 CONFIGURE_ENV+=                CXXFLAGS="-I${X11BASE}/include ${CXXFLAGS}"
 USE_X11=               yes
+MANCOMPRESSED=         yes
+MAKE_ENV+=             GZIP_CMD=${GZIP_CMD:Q} \
+                       GUNZIP_CMD=${GUNZIP_CMD:Q}
 
 BOCHS_MAINDIR=         ${PREFIX}/share/bochs
 BOCHS_BIOSDIR=         ${BOCHS_MAINDIR}/bios
@@ -32,33 +61,8 @@
                        BOCHS_DOCDIR=${BOCHS_DOCDIR}
 
 post-configure:
+       ${MV} ${WRKSRC}/.bochsrc ${WRKSRC}/.bochsrc.BAK
        ${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' \
-               < ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc
-
-do-install:
-       ${INSTALL_DATA_DIR} ${BOCHS_BIOSDIR}
-       ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-2-processors ${BOCHS_BIOSDIR}
-       ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-4-processors ${BOCHS_BIOSDIR}
-       ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-8-processors ${BOCHS_BIOSDIR}
-       ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-latest ${BOCHS_BIOSDIR}
-       ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.40 ${BOCHS_BIOSDIR}
-       ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-LICENSE ${BOCHS_BIOSDIR}
-       ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-lgpl-latest ${BOCHS_BIOSDIR}
-       ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-lgpl-README ${BOCHS_BIOSDIR}
-       ${INSTALL_DATA_DIR} ${BOCHS_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/docs-html/00README ${BOCHS_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${BOCHS_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${BOCHS_DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${BOCHS_DOCDIR}
-       ${INSTALL_DATA_DIR} ${BOCHS_FONTDIR}
-       ${INSTALL_DATA} ${WRKSRC}/font/hercules.bdf ${BOCHS_FONTDIR}
-       ${INSTALL_DATA} ${WRKSRC}/font/vga.bdf ${BOCHS_FONTDIR}
-       ${INSTALL_DATA} ${WRKSRC}/font/vga.pcf ${BOCHS_FONTDIR}
-       ${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/bochsrc ${PREFIX}/share/bochs
-       ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1
-       ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${PREFIX}/man/man5
-       ${X11BASE}/bin/mkfontdir ${PREFIX}/share/bochs/xfonts
+               < ${WRKSRC}/.bochsrc.BAK > ${WRKSRC}/.bochsrc
 
 .include "../../mk/bsd.pkg.mk"
diff -r eccefb706fb5 -r bda22a340414 emulators/bochs/PLIST
--- a/emulators/bochs/PLIST     Wed Feb 11 23:42:11 2004 +0000
+++ b/emulators/bochs/PLIST     Thu Feb 12 00:10:30 2004 +0000
@@ -1,54 +1,37 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/25 01:12:37 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/02/12 00:10:31 hubertf Exp $
 bin/bochs
+bin/bxcommit
 bin/bximage
 man/man1/bochs-dlx.1
 man/man1/bochs.1
+man/man1/bxcommit.1
 man/man1/bximage.1
 man/man5/bochsrc.5
-share/bochs/bios/BIOS-bochs-2-processors
-share/bochs/bios/BIOS-bochs-4-processors
-share/bochs/bios/BIOS-bochs-8-processors
-share/bochs/bios/BIOS-bochs-latest
-share/bochs/bios/VGABIOS-elpin-2.40
-share/bochs/bios/VGABIOS-elpin-LICENSE
-share/bochs/bios/VGABIOS-lgpl-README
-share/bochs/bios/VGABIOS-lgpl-latest
-share/bochs/bochsrc
-share/bochs/xfonts/fonts.dir
-share/bochs/xfonts/hercules.bdf
-share/bochs/xfonts/vga.bdf
-share/bochs/xfonts/vga.pcf
-share/doc/html/bochs/00README
-share/doc/html/bochs/3rdparty.license.html
-share/doc/html/bochs/Linux.html
-share/doc/html/bochs/Minix.html
-share/doc/html/bochs/OldWindows95.html
-share/doc/html/bochs/Windows95.html
-share/doc/html/bochs/changelog.html
-share/doc/html/bochs/codingguidelines.html
-share/doc/html/bochs/configure.html
-share/doc/html/bochs/construction.html
-share/doc/html/bochs/cosimulation.html
-share/doc/html/bochs/cvs-status.html
-share/doc/html/bochs/cvs-structure.txt
-share/doc/html/bochs/developers.html
-share/doc/html/bochs/faq.html
-share/doc/html/bochs/features.html
-share/doc/html/bochs/fpu.html
-share/doc/html/bochs/guestNT.html
-share/doc/html/bochs/index.html
-share/doc/html/bochs/install.html
-share/doc/html/bochs/instrumentation.html
-share/doc/html/bochs/iodebug.html
-share/doc/html/bochs/mtools.html
-share/doc/html/bochs/random.txt
-share/doc/html/bochs/release-prep.txt
-share/doc/html/bochs/smp-simulation.html
-share/doc/html/bochs/sound.html
-share/doc/html/bochs/undercon.gif
-share/doc/html/bochs/whatisbochs.html
-share/doc/html/bochs/win32.html
-@dirrm share/doc/html/bochs
-@dirrm share/bochs/xfonts
-@dirrm share/bochs/bios
+share/bochs/BIOS-bochs-2-processors
+share/bochs/BIOS-bochs-4-processors
+share/bochs/BIOS-bochs-8-processors
+share/bochs/BIOS-bochs-latest
+share/bochs/VGABIOS-elpin-2.40
+share/bochs/VGABIOS-elpin-LICENSE
+share/bochs/VGABIOS-lgpl-README
+share/bochs/VGABIOS-lgpl-latest
+share/bochs/VGABIOS-lgpl-latest-debug
+share/bochs/keymaps/convertmap.pl
+share/bochs/keymaps/sdl-pc-de.map
+share/bochs/keymaps/sdl-pc-us.map
+share/bochs/keymaps/x11-pc-be.map
+share/bochs/keymaps/x11-pc-da.map
+share/bochs/keymaps/x11-pc-de.map
+share/bochs/keymaps/x11-pc-es.map
+share/bochs/keymaps/x11-pc-fr.map
+share/bochs/keymaps/x11-pc-it.map
+share/bochs/keymaps/x11-pc-se.map
+share/bochs/keymaps/x11-pc-uk.map
+share/bochs/keymaps/x11-pc-us.map
+share/doc/bochs/CHANGES
+share/doc/bochs/COPYING
+share/doc/bochs/README
+share/doc/bochs/bochsrc-sample.txt
+@dirrm share/doc/bochs
+@dirrm share/bochs/keymaps
 @dirrm share/bochs
diff -r eccefb706fb5 -r bda22a340414 emulators/bochs/distinfo
--- a/emulators/bochs/distinfo  Wed Feb 11 23:42:11 2004 +0000
+++ b/emulators/bochs/distinfo  Thu Feb 12 00:10:30 2004 +0000
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.14 2003/10/24 22:03:53 bouyer Exp $
+$NetBSD: distinfo,v 1.15 2004/02/12 00:10:31 hubertf Exp $
 
-SHA1 (bochs-2.0.2.tar.gz) = 94a133dbfa646eda19c27e060df1c1e098a75be3
-Size (bochs-2.0.2.tar.gz) = 3269299 bytes
-SHA1 (patch-aa) = bbe026a0487dee7ac00cf75500d38b600f473c8f
-SHA1 (patch-ab) = 1646ba658064a6fe449ba4d1e0a98afb9b114e13
-SHA1 (patch-ad) = 3ce76c962920677c383ce2f61fb20565ddbd8777
-SHA1 (patch-ae) = 510238ed28e8aa79f4dd8780d54ac66f317a9380
-SHA1 (patch-af) = 931805d3523baab6cc16bd1052f059309aab75a7
-SHA1 (patch-ag) = a22ca6f8abf0db67de714f53e3db94cb06e33db6
-SHA1 (patch-ah) = 2d91f2ebcf26d7c80381028c31c3e849e3668208
+SHA1 (bochs-2.1.tar.gz) = d7be064e627871ee45480717d12accedf07d2fe8
+Size (bochs-2.1.tar.gz) = 3650627 bytes
+SHA1 (patch-aa) = efa5e0be4b19b36032f4f15b60ecc13054852af9
+SHA1 (patch-ab) = 55f4c9d7de56ffe02673e627717648e80f9a1bd4
+SHA1 (patch-ad) = 8287d00e11892b6c78bc0c89590acd91e992ca69
diff -r eccefb706fb5 -r bda22a340414 emulators/bochs/patches/patch-aa
--- a/emulators/bochs/patches/patch-aa  Wed Feb 11 23:42:11 2004 +0000
+++ b/emulators/bochs/patches/patch-aa  Thu Feb 12 00:10:30 2004 +0000
@@ -1,32 +1,36 @@
-$NetBSD: patch-aa,v 1.8 2002/12/25 01:12:37 uebayasi Exp $
+$NetBSD: patch-aa,v 1.9 2004/02/12 00:10:31 hubertf Exp $
 
---- .bochsrc.orig      Sun Dec 22 04:30:48 2002
+--- .bochsrc.orig      Mon Dec 29 22:51:53 2003
 +++ .bochsrc
-@@ -66,9 +66,9 @@
- # directory, named BIOS-bochs-latest. 
+@@ -66,10 +66,10 @@
+ # You can also use the environment variable $BXSHARE to specify the
+ # location of the BIOS.
  #=======================================================================
- #romimage: bios/BIOS-bochs-970717a
--romimage: file=bios/BIOS-bochs-latest, address=0xf0000
+-romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
 -#romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000
 -#romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000
-+romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-latest, address=0xf0000
-+#romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-2-processors, address=0xf0000
-+#romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-4-processors, address=0xf0000
- #romimage: file=bios/rombios.bin, address=0xf0000
+-#romimage: file=bios/rombios.bin, address=0xf0000
++romimage: file=XXXPREFIXXXX/share/bochs/BIOS-bochs-latest, address=0xf0000
++#romimage: file=XXXPREFIXXXX/share/bochs/BIOS-bochs-2-processors, address=0xf0000
++#romimage: file=XXXPREFIXXXX/share/bochs/BIOS-bochs-4-processors, address=0xf0000
++#romimage: file=XXXPREFIXXXX/share/bochs/rombios.bin, address=0xf0000
  
  #=======================================================================
-@@ -105,8 +105,8 @@
+ # MEGS
+@@ -105,9 +105,9 @@ megs: 32
  # VGAROMIMAGE
  # You now need to load a VGA ROM BIOS into C0000.
  #=======================================================================
 -#vgaromimage: bios/VGABIOS-lgpl-latest
--vgaromimage: bios/VGABIOS-elpin-2.40
-+#vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-lgpl-latest
-+vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.40
+-#vgaromimage: bios/VGABIOS-elpin-2.40
+-vgaromimage: $BXSHARE/VGABIOS-elpin-2.40
++#vgaromimage: XXXPREFIXXXX/share/bochs/VGABIOS-lgpl-latest
++#vgaromimage: XXXPREFIXXXX/share/bochs/VGABIOS-elpin-2.40
++vgaromimage: XXXPREFIXXXX/share/bochs/VGABIOS-elpin-2.40
  
  #=======================================================================
  # FLOPPYA:
-@@ -126,7 +126,7 @@
+@@ -130,7 +130,7 @@ vgaromimage: $BXSHARE/VGABIOS-elpin-2.40
  # drive letters such as a: or b: as the path.  Raw floppy access is not
  # supported on Windows 95 and 98.
  #=======================================================================
@@ -35,25 +39,16 @@
  #floppya: file=../1.44, status=inserted
  #floppya: 1_44=/dev/fd0H1440, status=inserted
  #floppya: 1_2=../1_2, status=inserted
-@@ -206,7 +206,7 @@
- #   ata3-master: type=disk, path=483M.sample, cylinders=1024, heads=15, spt=63
+@@ -214,7 +214,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=
+ #   ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, heads=15, spt=63
Prev by Date: [pkgsrc/trunk]: pkgsrc/audio/gmodplay Set 'USE_LANGUAGES=c c++'
Next by Date: [pkgsrc/trunk]: pkgsrc Update bochs to 2.1.1 (doh). Changes:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/audio/gmodplay Set 'USE_LANGUAGES=c c++'
Next by Thread: [pkgsrc/trunk]: pkgsrc Update bochs to 2.1.1 (doh). Changes:
Indexes:
Home | Main Index | Thread Index | Old Index