From 275a6b7cca39c1bdd8d706778b1d8fd80b2a29fb Mon Sep 17 00:00:00 2001
From: Armin Gruner <ag@muc.de>
Date: Sat, 1 Aug 2020 14:06:52 +0200
Subject: [PATCH] While being there, fix build for NetBSD >= 5

---
 psutil/_psbsd.py     | 9 ++++-----
 psutil/_psutil_bsd.c | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py
index d53eb0427..c81ef2aaf 100644
--- a/psutil/_psbsd.py
+++ b/psutil/_psbsd.py
@@ -51,7 +51,7 @@
         cext.SWAIT: _common.STATUS_WAITING,
         cext.SLOCK: _common.STATUS_LOCKED,
     }
-elif OPENBSD or NETBSD:
+elif OPENBSD:
     PROC_STATUSES = {
         cext.SIDL: _common.STATUS_IDLE,
         cext.SSLEEP: _common.STATUS_SLEEPING,
@@ -76,12 +76,11 @@
 elif NETBSD:
     PROC_STATUSES = {
         cext.SIDL: _common.STATUS_IDLE,
-        cext.SACTIVE: _common.STATUS_RUNNING,
-        cext.SDYING: _common.STATUS_ZOMBIE,
+        cext.SSLEEP: _common.STATUS_SLEEPING,
         cext.SSTOP: _common.STATUS_STOPPED,
         cext.SZOMB: _common.STATUS_ZOMBIE,
-        cext.SDEAD: _common.STATUS_DEAD,
-        cext.SSUSPENDED: _common.STATUS_SUSPENDED,  # unique to NetBSD
+        cext.SRUN: _common.STATUS_WAKING,
+        cext.SONPROC: _common.STATUS_RUNNING,
     }
 
 TCP_STATUSES = {
diff --git a/psutil/_psutil_bsd.c b/psutil/_psutil_bsd.c
index 52f60eeb0..44fff7be0 100644
--- a/psutil/_psutil_bsd.c
+++ b/psutil/_psutil_bsd.c
@@ -1060,7 +1060,9 @@ static PyMethodDef mod_methods[] = {
     if (PyModule_AddIntConstant(mod, "SSLEEP", LSSLEEP)) INITERR;
     if (PyModule_AddIntConstant(mod, "SSTOP", LSSTOP)) INITERR;
     if (PyModule_AddIntConstant(mod, "SZOMB", LSZOMB)) INITERR;
+#if __NetBSD_Version__ < 500000000
     if (PyModule_AddIntConstant(mod, "SDEAD", LSDEAD)) INITERR;
+#endif
     if (PyModule_AddIntConstant(mod, "SONPROC", LSONPROC)) INITERR;
     // unique to NetBSD
     if (PyModule_AddIntConstant(mod, "SSUSPENDED", LSSUSPENDED)) INITERR;