diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2012-09-29 00:43:04 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2012-09-29 00:43:04 +0800 |
| commit | 4b2db061cd6b9ccad1bfe3aae956f0e9c4ce2c46 (patch) | |
| tree | 29b7c5cf0a968fd5b3777dabdab71454d73ea44b | |
| parent | 768037a3cbe07a78a2bf5717f518538deefe8e70 (diff) | |
| download | freebsd-ports-gnome-4b2db061cd6b9ccad1bfe3aae956f0e9c4ce2c46.tar.gz freebsd-ports-gnome-4b2db061cd6b9ccad1bfe3aae956f0e9c4ce2c46.tar.zst freebsd-ports-gnome-4b2db061cd6b9ccad1bfe3aae956f0e9c4ce2c46.zip | |
- Unbreak sysutils/py-psutil on 7.x
| -rw-r--r-- | sysutils/py-psutil/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile index 3a6bf2717297..43d990bee5c4 100644 --- a/sysutils/py-psutil/Makefile +++ b/sysutils/py-psutil/Makefile @@ -18,13 +18,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= ${PORTNAME} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800000 -BROKEN= does not compile on FreeBSD 7.x -.endif - post-patch: @${REINPLACE_CMD} -e 's|setuptools|distutils.core|' ${WRKSRC}/${PYSETUP} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c b/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c new file mode 100644 index 000000000000..bb6cee507339 --- /dev/null +++ b/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c @@ -0,0 +1,13 @@ +--- 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 +@@ -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 |