Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Sep 2012 16:43:04 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305000 - in head/sysutils/py-psutil: . files
Message-ID:  <201209281643.q8SGh4Ce073036@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Fri Sep 28 16:43:04 2012
New Revision: 305000
URL: http://svn.freebsd.org/changeset/ports/305000

Log:
  - Unbreak sysutils/py-psutil on 7.x

Added:
  head/sysutils/py-psutil/files/
  head/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c   (contents, props changed)
Modified:
  head/sysutils/py-psutil/Makefile

Modified: head/sysutils/py-psutil/Makefile
==============================================================================
--- head/sysutils/py-psutil/Makefile	Fri Sep 28 16:37:44 2012	(r304999)
+++ head/sysutils/py-psutil/Makefile	Fri Sep 28 16:43:04 2012	(r305000)
@@ -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>

Added: head/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-psutil/files/patch-psutil-_psutil_bsd.c	Fri Sep 28 16:43:04 2012	(r305000)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209281643.q8SGh4Ce073036>