upgrading package: bochs 2.1.1 -> 2.2

bochs/bochs.patch

@@ -4,23 +4,11 @@
  #include <sys/socket.h>
  #include <sys/uio.h>
  #include <sys/wait.h>
--#if defined(__FreeBSD__) || defined(__APPLE__)  // Should be fixed for other *BSD
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)  // Should be fixed for other *BSD
 +#if !defined(__LINUX__)  // Should be more carefully written
  #include <net/if.h>
  #else
  #include <asm/types.h>
-Index: reg_ld_str.c
---- fpu/reg_ld_str.c.orig	2004-06-03 14:34:47.000000000 +0200
-+++ fpu/reg_ld_str.c	2004-06-03 14:34:53.000000000 +0200
-@@ -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;
 Index: Makefile.in
 --- Makefile.in.orig	2004-06-09 15:52:12.955255102 +0200
 +++ Makefile.in	2004-06-09 15:52:37.847987737 +0200

bochs/bochs.spec

@@ -32,8 +32,8 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        Misc
 License:      LGPL
-Version:      2.1.1
-Release:      20041011
+Version:      2.2
+Release:      20050613
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz