Upgrade to build 90473

4 files changed, 6 insertions, 117 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 8a110889b650..84849084acca 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -15,11 +15,12 @@ MASTER_SITES=		SF
 MAINTAINER=		mbr@freebsd.org
 COMMENT?=		Open VMware tools for FreeBSD VMware guests
 
-RELEASE_DATE=		2008.03.19
-BUILD_VER=		82724
+RELEASE_DATE=		2008.05.02
+BUILD_VER=		90473
 
 GNU_CONFIGURE=		yes
 
+CONFIGURE_ARGS+=	--without-procps
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--without-x
 .else
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index 04a871e82127..7c8bf492de1a 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,2 +1,3 @@
-MD5 (open-vm-tools-2008.03.19-82724.tar.gz) = 708bdbfd55cbda9ec57e1cd4b7a98579
-SHA256 (open-vm-tools-2008.03.19-82724.tar.gz) = ee725d5908a78dc2f2ab4dd5759281b56d5b500105315fce08e64c5d5ddb9b3c
+MD5 (open-vm-tools-2008.05.02-90473.tar.gz) = 7403eda03ec6822645669bd56936af34
+SHA256 (open-vm-tools-2008.05.02-90473.tar.gz) = 420ec120ecc8aee84a9ff49b175ae28dd87c0a2c809d028a00ad4d2ccd297940
+SIZE (open-vm-tools-2008.05.02-90473.tar.gz) = 2069209
diff --git a/emulators/open-vm-tools/files/patch-asm b/emulators/open-vm-tools/files/patch-asm
index e13f86e15674..39cea8c36d0e 100644
--- a/emulators/open-vm-tools/files/patch-asm
+++ b/emulators/open-vm-tools/files/patch-asm
@@ -1,31 +1,5 @@
 --- modules/freebsd/vmhgfs/vm_basic_asm_x86.h.orig	2008-03-19 08:49:45.000000000 +0100
 +++ modules/freebsd/vmhgfs/vm_basic_asm_x86.h	2008-03-27 17:40:38.000000000 +0100
-@@ -100,14 +100,14 @@
- static INLINE void 
- FXSAVE_ES1(uint8 *save)
- {
--   asm ("fxsave %0       \n"
-+   __asm ("fxsave %0       \n"
-         : "=m" (*save));
- }
- 
- static INLINE void 
- FXRSTOR_ES1(const uint8 *load)
- {
--   asm ("fxrstor %0      \n"
-+   __asm ("fxrstor %0      \n"
-         :
-         : "m" (*load));
- }
-@@ -117,7 +117,7 @@
- {
-    uint64 dummy = 0;
-       
--   asm ("fnstsw  %%ax    \n"     // Grab x87 ES bit
-+   __asm ("fnstsw  %%ax    \n"     // Grab x87 ES bit
-         "bt      $7,%%ax \n"     // Test ES bit
-         "jnc     1f      \n"     // Jump if ES=0
-         "fnclex          \n"     // ES=1. Clear it so fild doesn't trap
 @@ -306,7 +306,7 @@
      * smart enough, at least in the version we are currently using.
      */
@@ -53,66 +27,3 @@
         "mov   %%edx, %%eax\n\t"   // Get hi(multiplicand)
         "test  %%eax, %%eax\n\t"   // Check sign of multiplicand
         "jl    0f\n\t"             // Go if negative
---- modules/freebsd/vmhgfs/vm_basic_asm_x86_64.h.orig	2008-04-02 18:13:33.000000000 +0200
-+++ modules/freebsd/vmhgfs/vm_basic_asm_x86_64.h	2008-04-02 18:14:21.000000000 +0200
-@@ -84,21 +84,21 @@
- static INLINE void 
- FXSAVE_ES1(uint8 *save)
- {
--   asm ("fxsaveq %0  \n"
-+   __asm ("fxsaveq %0  \n"
-         : "=m" (*save));
- }
- 
- static INLINE void 
- FXSAVE_COMPAT_ES1(uint8 *save)
- {
--   asm ("fxsave %0  \n"
-+   __asm ("fxsave %0  \n"
-         : "=m" (*save));
- }
- 
- static INLINE void 
- FXRSTOR_ES1(const uint8 *load)
- {
--   asm ("fxrstorq %0 \n"
-+   __asm ("fxrstorq %0 \n"
-         :
-         : "m" (*load));
- }
-@@ -106,7 +106,7 @@
- static INLINE void 
- FXRSTOR_COMPAT_ES1(const uint8 *load)
- {
--   asm ("fxrstor %0 \n"
-+   __asm ("fxrstor %0 \n"
-         :
-         : "m" (*load));
- }
-@@ -116,7 +116,7 @@
- {
-    uint64 dummy = 0;
-       
--   asm ("fnstsw  %%ax    \n"     // Grab x87 ES bit
-+   __asm ("fnstsw  %%ax    \n"     // Grab x87 ES bit
-         "bt      $7,%%ax \n"     // Test ES bit
-         "jnc     1f      \n"     // Jump if ES=0
-         "fnclex          \n"     // ES=1. Clear it so fild doesn't trap
-@@ -167,7 +167,7 @@
-    uint64 result, dummy;
-    const uint64 multiplier64 = multiplier;
- 
--   asm("mulq    %3      \n\t"
-+   __asm("mulq    %3      \n\t"
-        "shrdq   %1, %0  \n\t"
-        : "=a" (result),
-          "=d" (dummy)
-@@ -226,7 +226,7 @@
-    int64 result, dummy;
-    const int64 multiplier64 = multiplier;
- 
--   asm("imulq   %3      \n\t"
-+   __asm("imulq   %3      \n\t"
-        "shrdq   %1, %0  \n\t"
-        : "=a" (result),
-          "=d" (dummy)
diff --git a/emulators/open-vm-tools/files/patch-freebsd7 b/emulators/open-vm-tools/files/patch-freebsd7
index e256614919dc..bbb6b630533f 100644
--- a/emulators/open-vm-tools/files/patch-freebsd7
+++ b/emulators/open-vm-tools/files/patch-freebsd7
@@ -36,32 +36,8 @@
        } else if (strcmp(key, "noexec") == 0) { // allow program execution?
           *flags |= MS_NOEXEC;
           LOG("Setting mount option for program execution off\n");
---- modules/freebsd/vmxnet/net_compat.h.orig	2008-03-19 08:49:47.000000000 +0100
-+++ modules/freebsd/vmxnet/net_compat.h	2008-03-27 18:30:45.000000000 +0100
-@@ -132,7 +132,11 @@
-    #define VXN_IF_FREE(softc)   if_free((softc)->arpcom.ac_ifp)
- 
-    #define VXN_SC2IFP(softc)    ((softc)->arpcom.ac_ifp)
-+#if __FreeBSD_version >= 700000
-+   #define VXN_SC2ENADDR(softc) ((softc)->vxn_enaddr)
-+#else
-    #define VXN_SC2ENADDR(softc) ((softc)->arpcom._ac_enaddr)
-+#endif
- 
-    #define VXN_PCIR_MAPS        PCIR_BARS
- 
 --- modules/freebsd/vmxnet/if_vxn.c.orig	2008-03-19 08:49:47.000000000 +0100
 +++ modules/freebsd/vmxnet/if_vxn.c	2008-03-27 18:33:12.000000000 +0100
-@@ -108,6 +108,9 @@
-    Vmxnet2_TxRingEntry     *vxn_tx_ring;
-    int                      vxn_tx_pending;
-    int                      vxn_rings_allocated;
-+#if __FreeBSD_version >= 700000
-+   u_char                   vxn_enaddr[ETHER_ADDR_LEN];
-+#endif
-    uint32                   vxn_max_tx_frags;
- 
-    struct mbuf             *vxn_tx_buffptr[VMXNET2_MAX_NUM_TX_BUFFERS];
 @@ -299,11 +302,20 @@
     }
  #ifdef VXN_MPSAFE