Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sysutils/py-psutil/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:22 wiz Exp $
# $NetBSD: Makefile,v 1.11 2015/01/24 23:23:48 adam Exp $
DISTNAME= psutil-1.2.1
DISTNAME= psutil-2.1.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= sysutils
MASTER_SITES= https://pypi.python.org/packages/source/p/psutil/
@@ -11,13 +11,14 @@ COMMENT= Cross-platform process and system utilities module for Python
LICENSE= modified-bsd
REPLACE_PYTHON= psutil/*py
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.2.1
.include "../../mk/bsd.prefs.mk"
# facilitate PLIST processing
.if ${OPSYS} == "SunOS"
LOWER_OPSYS= ${OPSYS:tl}
.if ${OPSYS} == "Darwin"
PLIST_SUBST+= SYSTEM=osx
.else
PLIST_SUBST+= SYSTEM=${OPSYS:tl}
.endif
.include "../../lang/python/application.mk"

16
sysutils/py-psutil/PLIST
View File

@@ -1,5 +1,5 @@
@comment $NetBSD: PLIST,v 1.2 2013/12/07 21:25:23 richard Exp $
${PYSITELIB}/_psutil_${LOWER_OPSYS}.so
@comment $NetBSD: PLIST,v 1.5 2015/01/24 23:23:48 adam Exp $
${PYSITELIB}/_psutil_${SYSTEM}.so
${PYSITELIB}/_psutil_posix.so
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -14,18 +14,12 @@ ${PYSITELIB}/psutil/_common.pyo
${PYSITELIB}/psutil/_compat.py
${PYSITELIB}/psutil/_compat.pyc
${PYSITELIB}/psutil/_compat.pyo
${PYSITELIB}/psutil/_error.py
${PYSITELIB}/psutil/_error.pyc
${PYSITELIB}/psutil/_error.pyo
${PYSITELIB}/psutil/_psbsd.py
${PYSITELIB}/psutil/_psbsd.pyc
${PYSITELIB}/psutil/_psbsd.pyo
${PYSITELIB}/psutil/_pslinux.py
${PYSITELIB}/psutil/_pslinux.pyc
${PYSITELIB}/psutil/_pslinux.pyo
${PYSITELIB}/psutil/_psmswindows.py
${PYSITELIB}/psutil/_psmswindows.pyc
${PYSITELIB}/psutil/_psmswindows.pyo
${PYSITELIB}/psutil/_psnetbsd.py
${PYSITELIB}/psutil/_psnetbsd.pyc
${PYSITELIB}/psutil/_psnetbsd.pyo
@@ -38,6 +32,6 @@ ${PYSITELIB}/psutil/_psposix.pyo
${PYSITELIB}/psutil/_pssunos.py
${PYSITELIB}/psutil/_pssunos.pyc
${PYSITELIB}/psutil/_pssunos.pyo
${PYSITELIB}/psutil/error.py
${PYSITELIB}/psutil/error.pyc
${PYSITELIB}/psutil/error.pyo
${PYSITELIB}/psutil/_pswindows.py
${PYSITELIB}/psutil/_pswindows.pyc
${PYSITELIB}/psutil/_pswindows.pyo

17
sysutils/py-psutil/distinfo
View File

@@ -1,14 +1,13 @@
$NetBSD: distinfo,v 1.3 2013/12/07 21:25:23 richard Exp $
$NetBSD: distinfo,v 1.8 2015/01/24 23:01:29 adam Exp $
SHA1 (psutil-1.2.1.tar.gz) = c8c1842bf1c63b9068ac25a37f7aae11fcecd57f
RMD160 (psutil-1.2.1.tar.gz) = 5b014f73dce4035527886637ebd1b653e5a7faba
Size (psutil-1.2.1.tar.gz) = 167397 bytes
SHA1 (patch-psutil_____init____.py) = aa75a84992250e28db01d5fe13a68ed0cdcea883
SHA1 (patch-psutil___psnetbsd.py) = 20089b57640a5eb30aeb1f5460624a570f1d3236
SHA1 (patch-psutil___psutil__netbsd.c) = c251e097ce5c919537176f16406ad6892db955fc
SHA1 (psutil-2.1.3.tar.gz) = aae4725eb33cf56d4480bc60f50c147870d607ba
RMD160 (psutil-2.1.3.tar.gz) = 4d5d0971c7acbd81cd883eceb237b688a60d3b80
Size (psutil-2.1.3.tar.gz) = 224008 bytes
SHA1 (patch-psutil_____init____.py) = 4036989d048542eb2b5649c6398146369d2793a5
SHA1 (patch-psutil___psnetbsd.py) = 1a017104b6ac800de1a47ccb810d5a56b2bde66a
SHA1 (patch-psutil___psutil__netbsd.c) = 00480e009800bb1970592c8bcfbef17d7ac79240
SHA1 (patch-psutil___psutil__netbsd.h) = 33e3c857f764d8391db747068ade7ea333698ec0
SHA1 (patch-psutil___psutil__sunos.c) = 78bdb8103a10022785202873c7e60886a885340f
SHA1 (patch-psutil_arch_netbsd_process__info.c) = c384d12cc47514d6396d779d59c586ef2b42a89a
SHA1 (patch-psutil_arch_netbsd_process__info.h) = b23075df15749e4e5274ccb9e21d67ac55fdd199
SHA1 (patch-setup.py) = 3e87561b6dfd7e851e232342dab3b2e8ade28cfd
SHA1 (patch-test_test__psutil.py) = fa3ba09430f8ad307cf6674dee3e7cbfa9144e3b
SHA1 (patch-test_test__psutil.py) = c521f4fa30b24cb86115370e52979c2c7f7af4a3

8
sysutils/py-psutil/patches/patch-psutil_____init____.py
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-psutil_____init____.py,v 1.1 2013/10/12 13:32:36 wiz Exp $
$NetBSD: patch-psutil_____init____.py,v 1.2 2014/10/01 11:53:33 wiz Exp $
Port to NetBSD.
--- psutil/__init__.py.orig 2013-07-12 15:34:08.000000000 +0000
--- psutil/__init__.py.orig 2014-07-15 15:23:11.000000000 +0000
+++ psutil/__init__.py
@@ -97,6 +97,9 @@ elif sys.platform.startswith("darwin"):
@@ -150,6 +150,9 @@ elif sys.platform.startswith("darwin"):
elif sys.platform.startswith("freebsd"):
import psutil._psbsd as _psplatform
@@ -13,4 +13,4 @@ Port to NetBSD.
+
elif sys.platform.startswith("sunos"):
import psutil._pssunos as _psplatform
from psutil._pssunos import (CONN_IDLE,
from psutil._pssunos import (CONN_IDLE, # NOQA

19
sysutils/py-psutil/patches/patch-psutil___psnetbsd.py
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-psutil___psnetbsd.py,v 1.1 2013/10/12 13:32:36 wiz Exp $
$NetBSD: patch-psutil___psnetbsd.py,v 1.2 2015/01/24 23:01:29 adam Exp $
Port to NetBSD.
--- psutil/_psnetbsd.py.orig 2013-10-12 13:19:29.000000000 +0000
+++ psutil/_psnetbsd.py
@@ -0,0 +1,367 @@
@@ -0,0 +1,366 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
@@ -21,7 +21,6 @@ Port to NetBSD.
+import _psutil_netbsd
+import _psutil_posix
+from psutil import _psposix
+from psutil._error import AccessDenied, NoSuchProcess, TimeoutExpired
+from psutil._compat import namedtuple, wraps
+from psutil._common import *
+
@@ -83,12 +82,12 @@ Port to NetBSD.
+ percent = usage_percent(used, total, _round=1)
+ return nt_swapmeminfo(total, used, free, percent, sin, sout)
+
+def get_system_cpu_times():
+def cpu_times():
+ """Return system per-CPU times as a named tuple"""
+ user, nice, system, idle, irq = _psutil_netbsd.get_system_cpu_times()
+ return _cputimes_ntuple(user, nice, system, idle, irq)
+
+def get_system_per_cpu_times():
+def per_cpu_times():
+ """Return system CPU times as a named tuple"""
+ ret = []
+ for cpu_t in _psutil_netbsd.get_system_per_cpu_times():
@@ -106,14 +105,14 @@ Port to NetBSD.
+# crash at psutil import time.
+# Next calls will fail with NotImplementedError
+if not hasattr(_psutil_netbsd, "get_system_per_cpu_times"):
+ def get_system_per_cpu_times():
+ def per_cpu_times():
+ if NUM_CPUS == 1:
+ return [get_system_cpu_times]
+ if get_system_per_cpu_times.__called__:
+ if per_cpu_times.__called__:
+ raise NotImplementedError("supported only starting from FreeBSD 8")
+ get_system_per_cpu_times.__called__ = True
+ per_cpu_times.__called__ = True
+ return [get_system_cpu_times]
+get_system_per_cpu_times.__called__ = False
+per_cpu_times.__called__ = False
+
+def disk_partitions(all=False):
+ retlist = []
@@ -143,7 +142,7 @@ Port to NetBSD.
+
+get_pid_list = _psutil_netbsd.get_pid_list
+pid_exists = _psposix.pid_exists
+get_disk_usage = _psposix.get_disk_usage
+disk_usage = _psposix.disk_usage
+net_io_counters = _psutil_netbsd.get_net_io_counters
+disk_io_counters = _psutil_netbsd.get_disk_io_counters
+

4
sysutils/py-psutil/patches/patch-psutil___psutil__netbsd.c
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-psutil___psutil__netbsd.c,v 1.1 2013/10/12 13:32:36 wiz Exp $
$NetBSD: patch-psutil___psutil__netbsd.c,v 1.2 2015/01/24 23:01:29 adam Exp $
Port to NetBSD.
@@ -1251,7 +1251,7 @@ Port to NetBSD.
+}
+
+static int
+psutil_netbsd_clear(PyObject *m) {5A
+psutil_netbsd_clear(PyObject *m) {
+ Py_CLEAR(GETSTATE(m)->error);
+ return 0;
+}

33
sysutils/py-psutil/patches/patch-psutil___psutil__sunos.c
View File

@@ -1,33 +0,0 @@
$NetBSD: patch-psutil___psutil__sunos.c,v 1.1 2013/12/07 21:25:24 richard Exp $
--- psutil/_psutil_sunos.c.orig 2013-11-20 19:29:05.000000000 +0000
+++ psutil/_psutil_sunos.c
@@ -772,8 +772,9 @@ error:
return NULL;
}
-
+#ifndef EXPER_IP_AND_ALL_IRES
#define EXPER_IP_AND_ALL_IRES (1024+4)
+#endif
// a signaler for connections without an actual status
static int PSUTIL_CONN_NONE = 128;
@@ -790,7 +791,7 @@ static PyObject*
get_process_connections(PyObject* self, PyObject* args)
{
long pid;
- int sd = NULL;
+ int sd = 0;
mib2_tcpConnEntry_t *tp = NULL;
mib2_udpEntry_t *ude;
#if defined(AF_INET6)
@@ -1059,7 +1060,7 @@ error:
Py_XDECREF(py_raddr);
Py_DECREF(py_retlist);
// TODO : free databuf
- if (sd != NULL)
+ if (sd > 0)
close(sd);
return NULL;
}

8
sysutils/py-psutil/patches/patch-test_test__psutil.py
View File

@@ -1,12 +1,12 @@
$NetBSD: patch-test_test__psutil.py,v 1.2 2013/12/07 21:25:24 richard Exp $
$NetBSD: patch-test_test__psutil.py,v 1.3 2014/04/18 19:58:46 wiz Exp $
Port to NetBSD.
--- test/test_psutil.py.orig 2013-11-22 21:26:42.000000000 +0000
--- test/test_psutil.py.orig 2014-04-08 00:03:00.000000000 +0000
+++ test/test_psutil.py
@@ -77,7 +77,7 @@ POSIX = os.name == 'posix'
@@ -87,7 +87,7 @@ if WINDOWS:
WIN_VISTA = (6, 0, 0)
LINUX = sys.platform.startswith("linux")
WINDOWS = sys.platform.startswith("win32")
OSX = sys.platform.startswith("darwin")
-BSD = sys.platform.startswith("freebsd")
+BSD = sys.platform.startswith("freebsd") or sys.platform.startswith("netbsd")