py-psutil: fix build on -current, which does not define LSDEAD any lo…

…nger. Bump PKGREVISION.
TritonDataCenter · Jun 29, 2019 · 71f710c · 71f710c
1 parent b0a03ad
commit 71f710c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2019/06/11 22:55:04 leot Exp $
+# $NetBSD: Makefile,v 1.32 2019/06/29 18:00:49 wiz Exp $
 
 DISTNAME=	psutil-5.6.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/psutil/}
 

diff --git a/sysutils/py-psutil/distinfo b/sysutils/py-psutil/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.31 2019/06/11 22:55:04 leot Exp $
+$NetBSD: distinfo,v 1.32 2019/06/29 18:00:49 wiz Exp $
 
 SHA1 (psutil-5.6.3.tar.gz) = dc596577226eba6f5382a3ed9816d6d340837068
 RMD160 (psutil-5.6.3.tar.gz) = bf7bdc047d8ca5e912602152bb3bd890869789b2
 SHA512 (psutil-5.6.3.tar.gz) = 62cf120c9391705bd393d6554afa32d672470b61ebb3c0e7458bad26134b784175ba64d3eff119ace6def2aebc97df73cd0c9d213776176ce39c3d47da3f3d9c
 Size (psutil-5.6.3.tar.gz) = 435374 bytes
 SHA1 (patch-psutil___psbsd.py) = f8888b8f386a1928446c7d588a7a46f2674c69f6
-SHA1 (patch-psutil___psutil__bsd.c) = 6251074874ac1f5a763df0448d3d60b7f955056e
+SHA1 (patch-psutil___psutil__bsd.c) = cb98d2c4a734e4ccaa82d9d741167540f5708afc
 SHA1 (patch-psutil_arch_netbsd_specific.c) = b44e3aca5a221cd38482a16b013edb170818905a
 SHA1 (patch-psutil_arch_netbsd_specific.h) = 4d6b3c96eefeec4908e1006b96ab175d64714dd2
diff --git a/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c b/sysutils/py-psutil/patches/patch-psutil___psutil__bsd.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-psutil___psutil__bsd.c,v 1.10 2019/06/11 22:55:04 leot Exp $
+$NetBSD: patch-psutil___psutil__bsd.c,v 1.11 2019/06/29 18:00:49 wiz Exp $
 
 Define proc_cwd on NetBSD >= 8.99.42.
 
---- psutil/_psutil_bsd.c.orig	2019-04-11 21:10:12.000000000 +0000
+--- psutil/_psutil_bsd.c.orig	2019-06-11 04:04:44.000000000 +0000
 +++ psutil/_psutil_bsd.c
-@@ -919,6 +921,8 @@ PsutilMethods[] = {
+@@ -921,6 +921,8 @@ PsutilMethods[] = {
  #if defined(PSUTIL_FREEBSD) || defined(PSUTIL_OPENBSD)
      {"proc_connections", psutil_proc_connections, METH_VARARGS,
       "Return connections opened by process"},
@@ -13,3 +13,13 @@ Define proc_cwd on NetBSD >= 8.99.42.
      {"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);
++#endif
+     PyModule_AddIntConstant(module, "SONPROC", LSONPROC);
+     // unique to NetBSD
+     PyModule_AddIntConstant(module, "SSUSPENDED", LSSUSPENDED);