radare2-git: Sync patch with upstream (partly merged)

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jul 31 21:59:05 2016 +0200
Changeset:	8d5011f4d8657876c7522492dc4abd908bd2a946

Modified Files:
	radare2-git/distinfo
	radare2-git/patches/patch-libr_debug_p_debug__native.c

Log Message:
radare2-git: Sync patch with upstream (partly merged)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8d5011f4d8657876c7522492dc4abd908bd2a946

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 radare2-git/distinfo                               |  2 +-
 .../patches/patch-libr_debug_p_debug__native.c     | 45 ++--------------------
 2 files changed, 4 insertions(+), 43 deletions(-)

diffs:
diff --git a/radare2-git/distinfo b/radare2-git/distinfo
index 7a8bd18..e9de6c3 100644
--- a/radare2-git/distinfo
+++ b/radare2-git/distinfo
@@ -3,4 +3,4 @@ $NetBSD: distinfo,v 1.1 2014/12/05 00:50:56 krytarowski Exp $
 SHA1 (radare2-0.9.8.tar.xz) = 7fce08c3d08749e91a0ce3bee177ba389ae145f4
 RMD160 (radare2-0.9.8.tar.xz) = 8a8ab14d14e61117f48b59c8c8aadb81baf2da5e
 Size (radare2-0.9.8.tar.xz) = 4614588 bytes
-SHA1 (patch-libr_debug_p_debug__native.c) = ec4325532f8d482e7ef4d8962d4d63735ce1a814
+SHA1 (patch-libr_debug_p_debug__native.c) = bf2cf575db12f2488cfd25870fd27531050b04f3
diff --git a/radare2-git/patches/patch-libr_debug_p_debug__native.c b/radare2-git/patches/patch-libr_debug_p_debug__native.c
index 5e443a9..5bfb5d1 100644
--- a/radare2-git/patches/patch-libr_debug_p_debug__native.c
+++ b/radare2-git/patches/patch-libr_debug_p_debug__native.c
@@ -1,47 +1,8 @@
 $NetBSD$
 
---- libr/debug/p/debug_native.c.orig	2016-07-18 23:01:08.000000000 +0000
+--- libr/debug/p/debug_native.c.orig	2016-07-22 19:52:09.000000000 +0000
 +++ libr/debug/p/debug_native.c
-@@ -508,13 +508,22 @@ static RList *r_debug_native_pids (int p
- 		}
- 	}
- #else /* rest is BSD */
--#ifdef __OpenBSD__
-+#ifdef __NetBSD__
-+# define KVM_OPEN_FLAG KVM_NO_FILES
-+# define KVM_GETPROCS(kd, opt, arg, cntptr) \
-+	kvm_getproc2 (kd, opt, arg, sizeof(struct kinfo_proc2), cntptr)
-+# define KP_COMM(x) (x)->p_comm
-+# define KP_PID(x) (x)->p_pid
-+# define KP_PPID(x) (x)->p_ppid
-+# define KINFO_PROC kinfo_proc2
-+#elif defined(__OpenBSD__)
- # define KVM_OPEN_FLAG KVM_NO_FILES
- # define KVM_GETPROCS(kd, opt, arg, cntptr) \
- 	kvm_getprocs (kd, opt, arg, sizeof(struct kinfo_proc), cntptr)
- # define KP_COMM(x) (x)->p_comm
- # define KP_PID(x) (x)->p_pid
- # define KP_PPID(x) (x)->p_ppid
-+# define KINFO_PROC kinfo_proc
- #else
- # define KVM_OPEN_FLAG O_RDONLY
- # define KVM_GETPROCS(kd, opt, arg, cntptr) \
-@@ -522,11 +531,12 @@ static RList *r_debug_native_pids (int p
- # define KP_COMM(x) (x)->ki_comm
- # define KP_PID(x) (x)->ki_pid
- # define KP_PPID(x) (x)->ki_ppid
-+# define KINFO_PROC kinfo_proc
- #endif
- 	char errbuf[_POSIX2_LINE_MAX];
--	struct kinfo_proc* kp;
-+	struct KINFO_PROC* kp;
- 	int cnt = 0;
--	kvm_t* kd = kvm_openfiles (NULL, NULL, NULL, KVM_OPEN_FLAG, &errbuf);
-+	kvm_t* kd = kvm_openfiles (NULL, NULL, NULL, KVM_OPEN_FLAG, errbuf);
- 	if (!kd) {
- 		eprintf ("kvm_openfiles says %s\n", errbuf);
- 		return NULL;
-@@ -819,6 +829,50 @@ static RList *r_debug_native_sysctl_map 
+@@ -829,6 +829,50 @@ static RList *r_debug_native_sysctl_map 
  	free (buf);
  	return list;
  }
@@ -92,7 +53,7 @@ $NetBSD$
  #elif __OpenBSD__
  static RList *r_debug_native_sysctl_map (RDebug *dbg) {
  	int mib[3];
-@@ -956,7 +1010,8 @@ static RList *r_debug_native_map_get (RD
+@@ -966,7 +1010,8 @@ static RList *r_debug_native_map_get (RD
  	region[0] = region2[0] = '0';
  	region[1] = region2[1] = 'x';