- update to 2.2

5 files changed, 20 insertions, 35 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index c76123efe061..7e25f6c2450b 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	bochs
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 PORTEPOCH=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 5585e5a4fa82..b1b89afa064a 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,2 +1,2 @@
-MD5 (bochs-2.1.1.tar.gz) = 7b21efbe2b56cc15d110993234259b33
-SIZE (bochs-2.1.1.tar.gz) = 3653487
+MD5 (bochs-2.2.tar.gz) = 2f0d82bda2193242a2d7ece1917016c1
+SIZE (bochs-2.2.tar.gz) = 3800420
diff --git a/emulators/bochs/files/patch-aa b/emulators/bochs/files/patch-aa
index 48a34727ce4c..a30a51758d2b 100644
--- a/emulators/bochs/files/patch-aa
+++ b/emulators/bochs/files/patch-aa
@@ -1,6 +1,6 @@
---- .bochsrc.orig	Sat Jan 17 15:04:24 2004
-+++ .bochsrc	Sat Jan 17 15:13:21 2004
-@@ -66,7 +66,7 @@
+--- .bochsrc.orig	Fri May 13 20:10:58 2005
++++ .bochsrc	Sat Jun 18 06:06:15 2005
+@@ -70,7 +70,7 @@
  # You can also use the environment variable $BXSHARE to specify the
  # location of the BIOS.
  #=======================================================================
@@ -9,19 +9,16 @@
  #romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000
  #romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000
  #romimage: file=bios/rombios.bin, address=0xf0000
-@@ -105,9 +105,9 @@
- # VGAROMIMAGE
+@@ -109,7 +109,7 @@
  # You now need to load a VGA ROM BIOS into C0000.
  #=======================================================================
--#vgaromimage: bios/VGABIOS-lgpl-latest
-+vgaromimage: bios/VGABIOS-lgpl-latest
-+#vgaromimage: bios/VGABIOS-elpin-2.40
- #vgaromimage: bios/VGABIOS-elpin-2.40
--vgaromimage: $BXSHARE/VGABIOS-elpin-2.40
+ #vgaromimage: file=bios/VGABIOS-elpin-2.40
+-vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
++vgaromimage: file=bios/VGABIOS-lgpl-latest
+ #vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus
  
  #=======================================================================
- # FLOPPYA:
-@@ -286,7 +286,7 @@
+@@ -301,7 +301,7 @@
  # 
  # Default value are sync=none, time0=local
  #=======================================================================
@@ -30,7 +27,7 @@
  
  
  #=======================================================================
-@@ -309,8 +309,8 @@
+@@ -326,8 +326,8 @@
  #   log: ./bochs.out
  #   log: /dev/tty
  #=======================================================================
@@ -41,7 +38,7 @@
  
  #=======================================================================
  # LOGPREFIX:
-@@ -350,7 +350,7 @@
+@@ -367,7 +367,7 @@
  # cause bochs to become unstable.  The panic is a "graceful exit," so
  # if you disable it you may get a spectacular disaster instead.
  #=======================================================================
@@ -50,8 +47,8 @@
  error: action=report
  info: action=report
  debug: action=ignore
-@@ -395,7 +395,7 @@
- #   parport1: enabled=1, file="/dev/lp0"
+@@ -422,7 +422,7 @@
+ #   parport2: enabled=1, file="/dev/lp0"
  #   parport1: enabled=0
  #=======================================================================
 -parport1: enabled=1, file="parport.out"
diff --git a/emulators/bochs/files/patch-fpu::reg_ld_str.c b/emulators/bochs/files/patch-fpu::reg_ld_str.c
deleted file mode 100644
index 6d6a3b2a8c60..000000000000
--- a/emulators/bochs/files/patch-fpu::reg_ld_str.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- fpu/reg_ld_str.c.orig	Thu Feb 12 07:28:52 2004
-+++ fpu/reg_ld_str.c	Fri Aug 27 02:42:12 2004
-@@ -315,7 +315,7 @@
- 
- 
- /* Get a short from user memory */
--int  BX_CPP_AttrRegparmN(1)
-+int  BX_CPP_AttrRegparmN(2)
- FPU_load_int16(bx_address _s, FPU_REG *loaded_data)
- {
-   s16 s, negative;
diff --git a/emulators/bochs/pkg-plist b/emulators/bochs/pkg-plist
index 1d4e65599b31..7e5dd6bd4c0f 100644
--- a/emulators/bochs/pkg-plist
+++ b/emulators/bochs/pkg-plist
@@ -11,7 +11,8 @@ bin/bximage
 %%DATADIR%%/VGABIOS-lgpl-README
 %%DATADIR%%/VGABIOS-lgpl-latest
 %%DATADIR%%/VGABIOS-lgpl-latest-debug
-%%DATADIR%%/keymaps/convertmap.pl
+%%DATADIR%%/VGABIOS-lgpl-latest-cirrus
+%%DATADIR%%/VGABIOS-lgpl-latest-cirrus-debug
 %%DATADIR%%/keymaps/sdl-pc-de.map
 %%DATADIR%%/keymaps/sdl-pc-us.map
 %%DATADIR%%/keymaps/x11-pc-be.map
@@ -20,26 +21,24 @@ bin/bximage
 %%DATADIR%%/keymaps/x11-pc-es.map
 %%DATADIR%%/keymaps/x11-pc-fr.map
 %%DATADIR%%/keymaps/x11-pc-it.map
+%%DATADIR%%/keymaps/x11-pc-ru.map
 %%DATADIR%%/keymaps/x11-pc-se.map
 %%DATADIR%%/keymaps/x11-pc-uk.map
 %%DATADIR%%/keymaps/x11-pc-us.map
 %%DOCSDIR%%/CHANGES
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/README
+%%DOCSDIR%%/TODO
 %%DOCSDIR%%/biossums.txt
 %%DOCSDIR%%/bochsrc-sample.txt
 %%PORTDOCS%%%%DOCSDIR%%/cvs-structure.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/3rdparty.license.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Linux.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Minix.html
 %%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/codingguidelines.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cosimulation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/guestNT.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/iodebug.html
 %%PORTDOCS%%%%DOCSDIR%%/random.txt
-%%PORTDOCS%%%%DOCSDIR%%/release-prep.txt
 %%PORTDOCS%%@dirrm share/doc/bochs/html
 @dirrm %%DATADIR%%/keymaps
 @dirrm %%DATADIR%%