 @@ -1,36 +1,35 @@
-# $NetBSD: Makefile,v 1.33 2019/10/11 20:01:50 kamil Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/06 15:48:23 adam Exp $
-DISTNAME=	psutil-5.6.3
+DISTNAME=	psutil-5.6.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/psutil/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/giampaolo/psutil
 COMMENT=	Cross-platform process and system utilities module for Python
 LICENSE=	modified-bsd
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 TEST_DEPENDS+=	${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
 TEST_DEPENDS+=	${PYPKGPREFIX}-ipaddress-[0-9]*:../../net/py-ipaddress
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 .endif
 REPLACE_PYTHON=	psutil/*py
 .include "../../mk/bsd.prefs.mk"
 # facilitate PLIST processing
 .if ${OPSYS} == "Darwin"
 PLIST_SUBST+=	SYSTEM=osx
 .elif !empty(OPSYS:M*BSD)
 PLIST_SUBST+=	SYSTEM=bsd
 .else
 PLIST_SUBST+=	SYSTEM=${OPSYS:tl}
 .endif
-.include "../../lang/python/application.mk"
+do-test:
 	cd ${WRKSRC} && ${PYTHONBIN} psutil/tests/__main__.py
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.33 2019/10/11 20:01:50 kamil Exp $
+$NetBSD: distinfo,v 1.34 2019/11/06 15:48:23 adam Exp $
-SHA1 (psutil-5.6.3.tar.gz) = dc596577226eba6f5382a3ed9816d6d340837068
+SHA1 (psutil-5.6.5.tar.gz) = d44d010c03d4adf9db04fe0e44a77e7ece41934e
-RMD160 (psutil-5.6.3.tar.gz) = bf7bdc047d8ca5e912602152bb3bd890869789b2
+RMD160 (psutil-5.6.5.tar.gz) = f09719d6a824153a3460afe449a4bdca9d0e21ef
-SHA512 (psutil-5.6.3.tar.gz) = 62cf120c9391705bd393d6554afa32d672470b61ebb3c0e7458bad26134b784175ba64d3eff119ace6def2aebc97df73cd0c9d213776176ce39c3d47da3f3d9c
+SHA512 (psutil-5.6.5.tar.gz) = 037b1501b686b7101be4180c8698b09d20d4260962a88f0c437ff558d91c405f56eae186c9d55c1893c612c4534093ab26e6943f0ed56db69e343c5c0317be1b
-Size (psutil-5.6.3.tar.gz) = 435374 bytes
+Size (psutil-5.6.5.tar.gz) = 447489 bytes
-SHA1 (patch-psutil___psbsd.py) = 204349da5b07d817e546184757b058fa4dff5d3e
+SHA1 (patch-psutil___psbsd.py) = da61606aee2366181935c10873d0627d0cb80f3f
-SHA1 (patch-psutil___psutil__bsd.c) = cb98d2c4a734e4ccaa82d9d741167540f5708afc
+SHA1 (patch-psutil___psutil__bsd.c) = a94b2c5a11338f3fffcbdde4339391c9519cf6d6
 SHA1 (patch-psutil_arch_netbsd_specific.c) = b44e3aca5a221cd38482a16b013edb170818905a
 SHA1 (patch-psutil_arch_netbsd_specific.h) = 4d6b3c96eefeec4908e1006b96ab175d64714dd2

 @@ -1,34 +1,15 @@
-$NetBSD: patch-psutil___psbsd.py,v 1.4 2019/10/11 20:01:51 kamil Exp $
+$NetBSD: patch-psutil___psbsd.py,v 1.5 2019/11/06 15:48:23 adam Exp $
 Use proc_cwd on NetBSD >= 8.99.42.
 Stop using SDEAD as it is no longer available.
---- psutil/_psbsd.py.orig	2019-04-11 21:10:12.000000000 +0000
+--- psutil/_psbsd.py.orig	2019-06-28 13:13:13.000000000 +0000
 +++ psutil/_psbsd.py
-@@ -57,7 +57,7 @@ elif OPENBSD or NETBSD:
+@@ -58,7 +58,7 @@ elif OPENBSD or NETBSD:
          # equivalent. Also it appears there's no equivalent of
          # psutil.STATUS_DEAD. SDEAD really means STATUS_ZOMBIE.
          # cext.SZOMB: _common.STATUS_ZOMBIE,
 -        cext.SDEAD: _common.STATUS_ZOMBIE,
 +        # cext.SDEAD: _common.STATUS_ZOMBIE,
          cext.SZOMB: _common.STATUS_ZOMBIE,
          # From http://www.eecs.harvard.edu/~margo/cs161/videos/proc.h.txt
          # OpenBSD has SRUN and SONPROC: SRUN indicates that a process
@@ -105,6 +105,7 @@ HAS_PER_CPU_TIMES = hasattr(cext, "per_c
  HAS_PROC_NUM_THREADS = hasattr(cext, "proc_num_threads")
  HAS_PROC_OPEN_FILES = hasattr(cext, 'proc_open_files')
  HAS_PROC_NUM_FDS = hasattr(cext, 'proc_num_fds')
 +HAS_PROC_CWD = hasattr(cext, 'proc_cwd')
  kinfo_proc_map = dict(
      ppid=0,
@@ -845,6 +846,8 @@ class Process(object):
          if OPENBSD and self.pid == 0:
              return None  # ...else it would raise EINVAL
          elif NETBSD:
 +            if HAS_PROC_CWD:
 +                return cext.proc_cwd(self.pid) or None
              with wrap_exceptions_procfs(self):
                  return os.readlink("/proc/%s/cwd" % self.pid)
          elif HAS_PROC_OPEN_FILES:

 @@ -1,25 +1,16 @@
-$NetBSD: patch-psutil___psutil__bsd.c,v 1.11 2019/06/29 18:00:49 wiz Exp $
+$NetBSD: patch-psutil___psutil__bsd.c,v 1.12 2019/11/06 15:48:23 adam Exp $
-Define proc_cwd on NetBSD >= 8.99.42.
+Optionally use SDEAD.
---- psutil/_psutil_bsd.c.orig	2019-06-11 04:04:44.000000000 +0000
+--- psutil/_psutil_bsd.c.orig	2019-10-21 06:43:32.000000000 +0000
 +++ psutil/_psutil_bsd.c
-@@ -921,6 +921,8 @@ PsutilMethods[] = {
+@@ -1049,7 +1051,9 @@ static PyMethodDef mod_methods[] = {
- #if defined(PSUTIL_FREEBSD) || defined(PSUTIL_OPENBSD)
+     if (PyModule_AddIntConstant(mod, "SSLEEP", LSSLEEP)) INITERR;
-     {"proc_connections", psutil_proc_connections, METH_VARARGS,
+     if (PyModule_AddIntConstant(mod, "SSTOP", LSSTOP)) INITERR;
-      "Return connections opened by process"},
+     if (PyModule_AddIntConstant(mod, "SZOMB", LSZOMB)) INITERR;
 +#endif
 +#if defined(PSUTIL_FREEBSD) || defined(PSUTIL_OPENBSD) || (defined(PSUTIL_NETBSD) && __NetBSD_Version__ >= 899004200)
      {"proc_cwd", psutil_proc_cwd, METH_VARARGS,
       "Return process current working directory."},
  #endif
@@ -1071,7 +1073,9 @@ void init_psutil_bsd(void)
      PyModule_AddIntConstant(module, "SSLEEP", LSSLEEP);
      PyModule_AddIntConstant(module, "SSTOP", LSSTOP);
      PyModule_AddIntConstant(module, "SZOMB", LSZOMB);
 +#if defined(LSDEAD)
-     PyModule_AddIntConstant(module, "SDEAD", LSDEAD);
+     if (PyModule_AddIntConstant(mod, "SDEAD", LSDEAD)) INITERR;
 +#endif
-     PyModule_AddIntConstant(module, "SONPROC", LSONPROC);
+     if (PyModule_AddIntConstant(mod, "SONPROC", LSONPROC)) INITERR;
      // unique to NetBSD
-     PyModule_AddIntConstant(module, "SSUSPENDED", LSSUSPENDED);
+     if (PyModule_AddIntConstant(mod, "SSUSPENDED", LSSUSPENDED)) INITERR;