Hi,
this is the diff to update py-psutil to latest release.
Ok?
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/py-psutil/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile 13 Jan 2017 12:44:28 -0000 1.8
+++ Makefile 4 Dec 2017 08:38:15 -0000
@@ -2,14 +2,13 @@
COMMENT = library to retrieve system information and utilisation
-MODPY_EGG_VERSION = 4.4.2
+MODPY_EGG_VERSION = 5.4.1
GH_ACCOUNT = giampaolo
GH_PROJECT = psutil
GH_TAGNAME = release-${MODPY_EGG_VERSION}
DISTNAME = psutil-${MODPY_EGG_VERSION}
PKGNAME = py-psutil-${MODPY_EGG_VERSION}
CATEGORIES = sysutils
-REVISION = 0
HOMEPAGE = https://github.com/giampaolo/psutil
@@ -29,8 +28,5 @@ FLAVOR ?=
.if ! ${FLAVOR:Mpython3}
TEST_DEPENDS += net/py-ipaddress${MODPY_FLAVOR}
.endif
-
-do-test:
- cd ${WRKSRC}; ${MODPY_BIN} psutil/tests/runner.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/py-psutil/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 1 Nov 2016 16:38:27 -0000 1.4
+++ distinfo 4 Dec 2017 08:38:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (psutil-4.4.2.tar.gz) = VpsGHjiS4gcGSr6wD6Dd/vfHKmYbPlOWSVyW0PYvbAI=
-SIZE (psutil-4.4.2.tar.gz) = 1825011
+SHA256 (psutil-5.4.1.tar.gz) = ykGIXYa7p9ZauM4c2qX1zMr3v05b60taLuno3rg227o=
+SIZE (psutil-5.4.1.tar.gz) = 1910111
Index: patches/patch-psutil_tests___init___py
===================================================================
RCS file: /cvs/ports/sysutils/py-psutil/patches/patch-psutil_tests___init___py,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-psutil_tests___init___py
--- patches/patch-psutil_tests___init___py 1 Nov 2016 16:38:27 -0000 1.2
+++ patches/patch-psutil_tests___init___py 4 Dec 2017 08:38:15 -0000
@@ -1,13 +1,14 @@
$OpenBSD: patch-psutil_tests___init___py,v 1.2 2016/11/01 16:38:27 landry Exp $
the scripts/ subdir is only present in the tarball, not on the system
---- psutil/tests/__init__.py.orig Wed Oct 5 14:16:05 2016
-+++ psutil/tests/__init__.py Tue Nov 1 16:51:06 2016
-@@ -118,7 +118,7 @@ PYPY = '__pypy__' in sys.builtin_module_names
+Index: psutil/tests/__init__.py
+--- psutil/tests/__init__.py.orig
++++ psutil/tests/__init__.py
+@@ -143,7 +143,7 @@ ASCII_FS = sys.getfilesystemencoding().lower() in ('as
+ # --- paths
- ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
- '..', '..'))
+ ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
-SCRIPTS_DIR = os.path.join(ROOT_DIR, 'scripts')
+SCRIPTS_DIR = 'scripts'
+ HERE = os.path.abspath(os.path.dirname(__file__))
- WIN_VISTA = (6, 0, 0) if WINDOWS else None
- VALID_PROC_STATUSES = [getattr(psutil, x) for x in dir(psutil)
+ # --- support
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/py-psutil/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 31 Aug 2016 12:44:52 -0000 1.3
+++ pkg/PLIST 4 Dec 2017 08:38:15 -0000
@@ -4,12 +4,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/psutil-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/psutil/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_psaix.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_psbsd.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_pslinux.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_psosx.${MODPY_PYC_MAGIC_TAG}pyc
@@ -18,6 +20,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/psutil/${MODPY_PYCACHE}_pswindows.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/_common.py
lib/python${MODPY_VERSION}/site-packages/psutil/_compat.py
+lib/python${MODPY_VERSION}/site-packages/psutil/_psaix.py
lib/python${MODPY_VERSION}/site-packages/psutil/_psbsd.py
lib/python${MODPY_VERSION}/site-packages/psutil/_pslinux.py
lib/python${MODPY_VERSION}/site-packages/psutil/_psosx.py
@@ -28,10 +31,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/psutil/_pswindows.py
lib/python${MODPY_VERSION}/site-packages/psutil/tests/
lib/python${MODPY_VERSION}/site-packages/psutil/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_aix.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_bsd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_connections.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_contracts.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_linux.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_memory_leaks.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_misc.${MODPY_PYC_MAGIC_TAG}pyc
@@ -40,9 +47,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_process.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_sunos.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_unicode.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/psutil/tests/${MODPY_PYCACHE}test_windows.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/psutil/tests/runner.py
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_aix.py
lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_bsd.py
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_connections.py
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_contracts.py
lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_linux.py
lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_memory_leaks.py
lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_misc.py
@@ -51,4 +61,5 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_process.py
lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_sunos.py
lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_system.py
+lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_unicode.py
lib/python${MODPY_VERSION}/site-packages/psutil/tests/test_windows.py
