Fix build on FreeBSD 6 and above.

PR:			ports/89056
Submitted by:		"Andrei V. Shetuhin" <shetuhin@corp.mail.ru>
Also reported by:	kris via pointyhat

4 files changed, 150 insertions, 4 deletions

diff --git a/devel/valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c b/devel/valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c
index 21354e263c44..26164824e953 100644
--- a/devel/valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c
+++ b/devel/valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c
@@ -1,5 +1,5 @@
---- coregrind/vg_proxylwp.c.orig	Thu Dec  9 20:02:58 2004
-+++ coregrind/vg_proxylwp.c	Thu Dec  9 20:03:16 2004
+--- coregrind/vg_proxylwp.c.orig	Sat Jul 17 13:46:01 2004
++++ coregrind/vg_proxylwp.c	Mon Nov  7 19:33:19 2005
 @@ -30,6 +30,7 @@
  
  
@@ -8,3 +8,47 @@
  
  #ifndef UMTX_CONTESTED
  # if __FreeBSD_version < 502120
+@@ -595,7 +596,7 @@
+    Int ret = 1000;
+    static const vki_kstack_t ss = { .ss_flags = VKI_SS_DISABLE };
+ 
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+    VG_(do_syscall)(__NR__umtx_lock, &px->mutex);
+    px->mutex.u_owner |= UMTX_CONTESTED;
+    VG_(do_syscall)(__NR_thr_self, &px->lwp);
+@@ -943,7 +944,7 @@
+ 
+    px->exitcode = ret;
+ 
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+    ret = VG_(do_syscall)(__NR__umtx_unlock, &px->mutex);
+    if (use_rfork)
+       VG_(do_syscall)(__NR_exit, 0);
+@@ -1098,14 +1099,14 @@
+       extern Int VG_(rfork_thread)(Int, void*, void*, void*);
+       ret = VG_(rfork_thread)(VKI_RFPROC | VKI_RFMEM | VKI_RFSIGSHARE
+ 			      | VKI_RFTHREAD
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+ 			      | VKI_RFNOWAIT
+ #endif
+ 			      ,
+ 			      LWP_stack(proxy), proxylwp, proxy);
+       VG_(do_signal_routing) = True;
+    } else {
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+       vki_ucontext_t ctx;
+       extern void makecontext(vki_ucontext_t*, ...);
+ 
+@@ -1169,7 +1170,7 @@
+       }
+    }
+ #endif
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+    if (block) {
+        if(proxy->lwp != 0)
+ 	   VG_(do_syscall)(__NR__umtx_lock, &proxy->mutex);
diff --git a/devel/valgrind-snapshot/files/patch-coregrind_vg_unistd.h b/devel/valgrind-snapshot/files/patch-coregrind_vg_unistd.h
new file mode 100644
index 000000000000..84c965d1c99a
--- /dev/null
+++ b/devel/valgrind-snapshot/files/patch-coregrind_vg_unistd.h
@@ -0,0 +1,29 @@
+--- coregrind/vg_unistd.h.orig	Mon Nov  7 19:31:31 2005
++++ coregrind/vg_unistd.h	Mon Nov  7 19:32:05 2005
+@@ -630,7 +630,7 @@
+ #define	__NR_uuidgen	392
+ #define	__NR_sendfile	393
+ #define	__NR_mac_syscall	394
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+ #define	__NR_getfsstat	395
+ #define	__NR_statfs	396
+ #define	__NR_fstatfs	397
+@@ -652,7 +652,7 @@
+ #define	__NR_extattr_get_link	413
+ #define	__NR_extattr_delete_link	414
+ #define	__NR___mac_execve	415
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+ #define	__NR_sigaction	416
+ #define	__NR_sigreturn	417
+ #endif
+@@ -665,7 +665,7 @@
+ #define	__NR___acl_delete_link	427
+ #define	__NR___acl_aclcheck_link	428
+ #define	__NR_sigwait	429
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+ #define	__NR_thr_create	430
+ #define	__NR_thr_exit	431
+ #define	__NR_thr_self	432
diff --git a/devel/valgrind/files/patch-coregrind-vg_proxylwp.c b/devel/valgrind/files/patch-coregrind-vg_proxylwp.c
index 21354e263c44..18d6a8695aff 100644
--- a/devel/valgrind/files/patch-coregrind-vg_proxylwp.c
+++ b/devel/valgrind/files/patch-coregrind-vg_proxylwp.c
@@ -1,5 +1,5 @@
---- coregrind/vg_proxylwp.c.orig	Thu Dec  9 20:02:58 2004
-+++ coregrind/vg_proxylwp.c	Thu Dec  9 20:03:16 2004
+--- coregrind/vg_proxylwp.c.orig	Sat Jul 17 13:48:25 2004
++++ coregrind/vg_proxylwp.c	Mon Nov  7 20:06:46 2005
 @@ -30,6 +30,7 @@
  
  
@@ -8,3 +8,47 @@
  
  #ifndef UMTX_CONTESTED
  # if __FreeBSD_version < 502120
+@@ -595,7 +596,7 @@
+    Int ret = 1000;
+    static const vki_kstack_t ss = { .ss_flags = VKI_SS_DISABLE };
+ 
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+    VG_(do_syscall)(__NR__umtx_lock, &px->mutex);
+    px->mutex.u_owner |= UMTX_CONTESTED;
+    VG_(do_syscall)(__NR_thr_self, &px->lwp);
+@@ -942,7 +943,7 @@
+ 
+    px->exitcode = ret;
+ 
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+    ret = VG_(do_syscall)(__NR__umtx_unlock, &px->mutex);
+    if (use_rfork)
+       VG_(do_syscall)(__NR_exit, 0);
+@@ -1097,14 +1098,14 @@
+       extern Int VG_(rfork_thread)(Int, void*, void*, void*);
+       ret = VG_(rfork_thread)(VKI_RFPROC | VKI_RFMEM | VKI_RFSIGSHARE
+ 			      | VKI_RFTHREAD
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+ 			      | VKI_RFNOWAIT
+ #endif
+ 			      ,
+ 			      LWP_stack(proxy), proxylwp, proxy);
+       VG_(do_signal_routing) = True;
+    } else {
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+       vki_ucontext_t ctx;
+       extern void makecontext(vki_ucontext_t*, ...);
+ 
+@@ -1168,7 +1169,7 @@
+       }
+    }
+ #endif
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+    if (block) {
+        if(proxy->lwp != 0)
+ 	   VG_(do_syscall)(__NR__umtx_lock, &proxy->mutex);
diff --git a/devel/valgrind/files/patch-coregrind_vg_unistd.h b/devel/valgrind/files/patch-coregrind_vg_unistd.h
new file mode 100644
index 000000000000..bbf36959de23
--- /dev/null
+++ b/devel/valgrind/files/patch-coregrind_vg_unistd.h
@@ -0,0 +1,29 @@
+--- coregrind/vg_unistd.h.orig	Mon Nov  7 20:07:03 2005
++++ coregrind/vg_unistd.h	Mon Nov  7 20:07:28 2005
+@@ -630,7 +630,7 @@
+ #define	__NR_uuidgen	392
+ #define	__NR_sendfile	393
+ #define	__NR_mac_syscall	394
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+ #define	__NR_getfsstat	395
+ #define	__NR_statfs	396
+ #define	__NR_fstatfs	397
+@@ -652,7 +652,7 @@
+ #define	__NR_extattr_get_link	413
+ #define	__NR_extattr_delete_link	414
+ #define	__NR___mac_execve	415
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+ #define	__NR_sigaction	416
+ #define	__NR_sigreturn	417
+ #endif
+@@ -665,7 +665,7 @@
+ #define	__NR___acl_delete_link	427
+ #define	__NR___acl_aclcheck_link	428
+ #define	__NR_sigwait	429
+-#if __FreeBSD__ == 5
++#if __FreeBSD__ >= 5
+ #define	__NR_thr_create	430
+ #define	__NR_thr_exit	431
+ #define	__NR_thr_self	432