aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorsunpoet <sunpoet@FreeBSD.org>2013-04-18 23:46:25 +0800
committersunpoet <sunpoet@FreeBSD.org>2013-04-18 23:46:25 +0800
commit832b900f1d9d86c914b70be6cd4ec6561a956d5d (patch)
treeae52e1432a3be6134d6c1368e5d4641ff736cb42 /sysutils
parentb74f8c95df100905effeaf70d73fcc453d4b593b (diff)
downloadfreebsd-ports-gnome-832b900f1d9d86c914b70be6cd4ec6561a956d5d.tar.gz
freebsd-ports-gnome-832b900f1d9d86c914b70be6cd4ec6561a956d5d.tar.zst
freebsd-ports-gnome-832b900f1d9d86c914b70be6cd4ec6561a956d5d.zip
- Update to 0.7.0
- Sort PLIST Changes: https://code.google.com/p/psutil/source/browse/HISTORY Feature safe: yes
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/py-psutil/Makefile3
-rw-r--r--sysutils/py-psutil/distinfo4
-rw-r--r--sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c43
-rw-r--r--sysutils/py-psutil/pkg-plist15
4 files changed, 12 insertions, 53 deletions
diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile
index 8939a729f31e..2780848615d1 100644
--- a/sysutils/py-psutil/Makefile
+++ b/sysutils/py-psutil/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= psutil
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.7.0
CATEGORIES= sysutils python
MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-psutil/distinfo b/sysutils/py-psutil/distinfo
index eea2118aa638..b6f6be251374 100644
--- a/sysutils/py-psutil/distinfo
+++ b/sysutils/py-psutil/distinfo
@@ -1,2 +1,2 @@
-SHA256 (psutil-0.6.1.tar.gz) = d665a4cc58c9a5d207fb0dc9869fc0ee10f4f66ad885e84886ef6339ccce0a6f
-SIZE (psutil-0.6.1.tar.gz) = 138456
+SHA256 (psutil-0.7.0.tar.gz) = eb5acb18d50df65034d9c9b12885d9bb95928abb58a011bdc698c4980fb1320f
+SIZE (psutil-0.7.0.tar.gz) = 140478
diff --git a/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c b/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c
deleted file mode 100644
index 11b01ee3bfc2..000000000000
--- a/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- psutil/_psutil_bsd.c.orig 2012-08-16 23:07:37.000000000 +0800
-+++ psutil/_psutil_bsd.c 2012-09-27 14:50:20.843763756 +0800
-@@ -576,12 +576,19 @@ get_process_memory_info(PyObject* self,
- static PyObject*
- get_virtual_mem(PyObject* self, PyObject* args)
- {
-- unsigned int total, active, inactive, wired, cached, free, buffers;
-+ unsigned int total, active, inactive, wired, cached, free;
- size_t size = sizeof(total);
- struct vmtotal vm;
- int mib[] = {CTL_VM, VM_METER};
- long pagesize = getpagesize();
-
-+#if __FreeBSD_version > 702101
-+ long buffers;
-+#else
-+ int buffers;
-+#endif
-+ size_t buffers_size = sizeof(buffers);
-+
- if (sysctlbyname("vm.stats.vm.v_page_count", &total, &size, NULL, 0))
- goto error;
- if (sysctlbyname("vm.stats.vm.v_active_count", &active, &size, NULL, 0))
-@@ -594,7 +601,7 @@ get_virtual_mem(PyObject* self, PyObject
- goto error;
- if (sysctlbyname("vm.stats.vm.v_free_count", &free, &size, NULL, 0))
- goto error;
-- if (sysctlbyname("vfs.bufspace", &buffers, &size, NULL, 0))
-+ if (sysctlbyname("vfs.bufspace", &buffers, &buffers_size, NULL, 0))
- goto error;
-
- size = sizeof(vm);
-@@ -1376,8 +1376,10 @@
- strlcat(opts, ",noclusterr", sizeof(opts));
- if (flags & MNT_NOCLUSTERW)
- strlcat(opts, ",noclusterw", sizeof(opts));
-+#if __FreeBSD_version >= 800000
- if (flags & MNT_NFS4ACLS)
- strlcat(opts, ",nfs4acls", sizeof(opts));
-+#endif
-
- py_tuple = Py_BuildValue("(ssss)", fs[i].f_mntfromname, // device
- fs[i].f_mntonname, // mount point
diff --git a/sysutils/py-psutil/pkg-plist b/sysutils/py-psutil/pkg-plist
index 9e1c9f4e0c1e..136ab50533e9 100644
--- a/sysutils/py-psutil/pkg-plist
+++ b/sysutils/py-psutil/pkg-plist
@@ -3,6 +3,15 @@
%%PYTHON_SITELIBDIR%%/psutil/__init__.py
%%PYTHON_SITELIBDIR%%/psutil/__init__.pyc
%%PYTHON_SITELIBDIR%%/psutil/__init__.pyo
+%%PYTHON_SITELIBDIR%%/psutil/_common.py
+%%PYTHON_SITELIBDIR%%/psutil/_common.pyc
+%%PYTHON_SITELIBDIR%%/psutil/_common.pyo
+%%PYTHON_SITELIBDIR%%/psutil/_compat.py
+%%PYTHON_SITELIBDIR%%/psutil/_compat.pyc
+%%PYTHON_SITELIBDIR%%/psutil/_compat.pyo
+%%PYTHON_SITELIBDIR%%/psutil/_error.py
+%%PYTHON_SITELIBDIR%%/psutil/_error.pyc
+%%PYTHON_SITELIBDIR%%/psutil/_error.pyo
%%PYTHON_SITELIBDIR%%/psutil/_psbsd.py
%%PYTHON_SITELIBDIR%%/psutil/_psbsd.pyc
%%PYTHON_SITELIBDIR%%/psutil/_psbsd.pyo
@@ -18,12 +27,6 @@
%%PYTHON_SITELIBDIR%%/psutil/_psposix.py
%%PYTHON_SITELIBDIR%%/psutil/_psposix.pyc
%%PYTHON_SITELIBDIR%%/psutil/_psposix.pyo
-%%PYTHON_SITELIBDIR%%/psutil/_common.py
-%%PYTHON_SITELIBDIR%%/psutil/_common.pyc
-%%PYTHON_SITELIBDIR%%/psutil/_common.pyo
-%%PYTHON_SITELIBDIR%%/psutil/_compat.py
-%%PYTHON_SITELIBDIR%%/psutil/_compat.pyc
-%%PYTHON_SITELIBDIR%%/psutil/_compat.pyo
%%PYTHON_SITELIBDIR%%/psutil/error.py
%%PYTHON_SITELIBDIR%%/psutil/error.pyc
%%PYTHON_SITELIBDIR%%/psutil/error.pyo