CVS commit: pkgsrc/sysutils/py-psutil

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Thu Jun 22 22:01:47 UTC 2017

Modified Files:
        pkgsrc/sysutils/py-psutil: distinfo
Added Files:
        pkgsrc/sysutils/py-psutil/patches: patch-psutil___psutil__bsd.c
            patch-psutil_arch_bsd_netbsd.c

Log Message:
Correct build of py-psutil on NetBSD 8.99.1.

Address <sys/user.h> removal fallout on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/py-psutil/distinfo
cvs rdiff -u -r0 -r1.8 \
    pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c
cvs rdiff -u -r0 -r1.6 \
    pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_bsd_netbsd.c

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

Modified files:

Index: pkgsrc/sysutils/py-psutil/distinfo
diff -u pkgsrc/sysutils/py-psutil/distinfo:1.18 pkgsrc/sysutils/py-psutil/distinfo:1.19
--- pkgsrc/sysutils/py-psutil/distinfo:1.18     Mon May 29 16:02:40 2017
+++ pkgsrc/sysutils/py-psutil/distinfo  Thu Jun 22 22:01:47 2017
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.18 2017/05/29 16:02:40 adam Exp $
+$NetBSD: distinfo,v 1.19 2017/06/22 22:01:47 kamil Exp $
 
 SHA1 (psutil-5.2.2.tar.gz) = e22e2f6abdff051d438626f9a59a8782ace1a63e
 RMD160 (psutil-5.2.2.tar.gz) = bdf3d28e5072b936b86056d8da28524b43de734d
 SHA512 (psutil-5.2.2.tar.gz) = df4878d03a6ff98beb611969edd5a4d704ac269d38dc286d84def3ca271936e03367241470f2a192e0d71d0f64fe1f252223b0d67e964918146334a807d1a997
 Size (psutil-5.2.2.tar.gz) = 348413 bytes
+SHA1 (patch-psutil___psutil__bsd.c) = 3d1166abdd74e3f3b4bec3098b03e7d05a67df04
+SHA1 (patch-psutil_arch_bsd_netbsd.c) = be6d5a5cc1db77cd513eab8717af3194f9c5270b

Added files:

Index: pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c
diff -u /dev/null pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c:1.8
--- /dev/null   Thu Jun 22 22:01:47 2017
+++ pkgsrc/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c      Thu Jun 22 22:01:47 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-psutil___psutil__bsd.c,v 1.8 2017/06/22 22:01:47 kamil Exp $
+
+Don't include <sys/user.h> on every BSD.
+It's absent on NetBSD and unused on OpenBSD.
+
+--- psutil/_psutil_bsd.c.orig  2017-03-26 08:09:27.000000000 +0000
++++ psutil/_psutil_bsd.c
+@@ -30,7 +30,9 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/user.h>
++#endif
+ #include <sys/proc.h>
+ #include <sys/file.h>
+ #include <sys/socket.h>

Index: pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_bsd_netbsd.c
diff -u /dev/null pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_bsd_netbsd.c:1.6
--- /dev/null   Thu Jun 22 22:01:47 2017
+++ pkgsrc/sysutils/py-psutil/patches/patch-psutil_arch_bsd_netbsd.c    Thu Jun 22 22:01:47 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-psutil_arch_bsd_netbsd.c,v 1.6 2017/06/22 22:01:47 kamil Exp $
+
+Don't include <sys/user.h> on NetBSD.
+
+--- psutil/arch/bsd/netbsd.c.orig      2017-03-26 08:09:27.000000000 +0000
++++ psutil/arch/bsd/netbsd.c
+@@ -22,7 +22,6 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+-#include <sys/user.h>
+ #include <sys/proc.h>
+ #include <sys/swap.h>  // for swap_mem
+ #include <signal.h>