- Try again

4 files changed, 56 insertions, 7 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 1bf8efdc3c39..d6b3dc395522 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
-PORTREVISION=	1
+PORTREVISION=		2
 PORTEPOCH=		1
 CATEGORIES=		emulators kld
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
diff --git a/emulators/open-vm-tools/files/patch-net_compat.h b/emulators/open-vm-tools/files/patch-net_compat.h
new file mode 100644
index 000000000000..5bd5f5d22cd6
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-net_compat.h
@@ -0,0 +1,17 @@
+--- modules/freebsd/vmxnet/net_compat.h.orig	2011-09-21 14:25:15.000000000 -0400
++++ modules/freebsd/vmxnet/net_compat.h	2012-06-28 17:05:44.638526644 -0400
+@@ -170,9 +170,12 @@
+ #if __FreeBSD_version < 505000
+ #   define VXN_IF_ADDR_LOCK(_ifp)
+ #   define VXN_IF_ADDR_UNLOCK(_ifp)
++#elif __FreeBSD_version < 1000000
++#  define VXN_IF_ADDR_LOCK(_ifp)           IF_ADDR_LOCK((_ifp))
++#  define VXN_IF_ADDR_UNLOCK(_ifp)         IF_ADDR_UNLOCK((_ifp))
+ #else
+-#   define VXN_IF_ADDR_LOCK(_ifp)       IF_ADDR_LOCK((_ifp))
+-#   define VXN_IF_ADDR_UNLOCK(_ifp)     IF_ADDR_UNLOCK((_ifp))
++#  define VXN_IF_ADDR_LOCK(_ifp)           IF_ADDR_WLOCK((_ifp))
++#  define VXN_IF_ADDR_UNLOCK(_ifp)         IF_ADDR_WUNLOCK((_ifp))
+ #endif
+ 
+ #endif /* _VXN_NET_COMPAT_H_ */
diff --git a/emulators/open-vm-tools/files/patch-vmblock-vnops.c b/emulators/open-vm-tools/files/patch-vmblock-vnops.c
new file mode 100644
index 000000000000..d90555dad868
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-vmblock-vnops.c
@@ -0,0 +1,24 @@
+--- modules/freebsd/vmblock/vnops.c.orig	2011-09-21 14:25:15.000000000 -0400
++++ modules/freebsd/vmblock/vnops.c	2012-06-28 20:51:22.897344202 -0400
+@@ -1362,7 +1362,9 @@
+ */
+ {
+    struct vnode *vp = ap->a_vp;
++#if __FreeBSD_version < 1000000
+    struct thread *td = ap->a_td;
++#endif
+ 
+    vp->v_object = NULL;
+ 
+@@ -1370,7 +1372,11 @@
+     * If this is the last reference, then free up the vnode so as not to
+     * tie up the lower vnode.
+     */
++#if __FreeBSD_version < 1000000
+    vrecycle(vp, td);
++#else
++   vrecycle(vp);
++#endif
+ 
+    return 0;
+ }
diff --git a/emulators/open-vm-tools/files/patch-vmmemctl-os.c b/emulators/open-vm-tools/files/patch-vmmemctl-os.c
index b3ed6a190c98..41757d1b84c8 100644
--- a/emulators/open-vm-tools/files/patch-vmmemctl-os.c
+++ b/emulators/open-vm-tools/files/patch-vmmemctl-os.c
@@ -1,6 +1,6 @@
---- modules/freebsd/vmmemctl/os.c.orig	2009-04-09 15:18:08.000000000 -0400
-+++ modules/freebsd/vmmemctl/os.c	2009-04-09 15:34:06.000000000 -0400
-@@ -413,12 +413,14 @@
+--- modules/freebsd/vmmemctl/os.c.orig	2011-09-21 14:25:15.000000000 -0400
++++ modules/freebsd/vmmemctl/os.c	2012-06-20 09:44:40.434083000 -0400
+@@ -344,12 +344,22 @@
     os_state *state = &global_state;
     os_pmap *pmap = &state->pmap;
  
@@ -9,9 +9,17 @@
 +   VM_OBJECT_LOCK(state->vmobject);
 +   if ( vm_page_lookup(state->vmobject, page->pindex) ) {
 +   	os_pmap_putindex(pmap, page->pindex);
++#if __FreeBSD_version >= 900000
++	vm_page_lock(page);
++#else
 +	vm_page_lock_queues();
++#endif
 +   	vm_page_free(page);
++#if __FreeBSD_version >= 900000
++	vm_page_unlock(page);
++#else
 +	vm_page_unlock_queues();
++#endif
     }
 -
 -   os_pmap_putindex(pmap, page->pindex);
@@ -19,8 +27,8 @@
 +   VM_OBJECT_UNLOCK(state->vmobject);
  }
  
- static vm_page_t os_kmem_alloc(int alloc_normal_failed)
-@@ -430,8 +432,11 @@
+ 
+@@ -361,8 +371,11 @@
     os_state *state = &global_state;
     os_pmap *pmap = &state->pmap;
  
@@ -32,7 +40,7 @@
        return NULL;
     }
  
-@@ -452,6 +457,7 @@
+@@ -383,6 +396,7 @@
     if (!page) {
        os_pmap_putindex(pmap, pindex);
     }