aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2011-06-12 13:01:56 +0800
committermiwi <miwi@FreeBSD.org>2011-06-12 13:01:56 +0800
commit6aec488393ea4a8f9fd6a5f4871d9271e6b741bf (patch)
tree273b0e124a79497d401143a35456e783180e1e75 /devel
parent1bbe863ba5e9ab001ac2ada4757d78382a94c7ae (diff)
downloadfreebsd-ports-gnome-6aec488393ea4a8f9fd6a5f4871d9271e6b741bf.tar.gz
freebsd-ports-gnome-6aec488393ea4a8f9fd6a5f4871d9271e6b741bf.tar.zst
freebsd-ports-gnome-6aec488393ea4a8f9fd6a5f4871d9271e6b741bf.zip
- Unbreak && build fix for HEAD
PR: 156346 Submitted by: pluknet@
Diffstat (limited to 'devel')
-rw-r--r--devel/py-freebsd/Makefile7
-rw-r--r--devel/py-freebsd/files/freebsd9_patch-src-sysctl.c38
2 files changed, 41 insertions, 4 deletions
diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile
index b1e0dbcfd743..c7c9cc41a37e 100644
--- a/devel/py-freebsd/Makefile
+++ b/devel/py-freebsd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freebsd
PORTVERSION= 0.9.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://people.freebsd.org/~perky/distfiles/
@@ -37,9 +37,8 @@ EXTRA_PATCHES+= ${FILESDIR}/freebsd7_patch-src-netstat.c
(${OSVERSION} < 800000 && ${OSVERSION} >= 701103)
EXTRA_PATCHES+= ${FILESDIR}/freebsd8_patch-src-jail.c
.endif
-
-.if ${OSVERSION} >= 900000
-BROKEN= does not compile on 9.X
+.if ${OSVERSION} >= 900030
+EXTRA_PATCHES+= ${FILESDIR}/freebsd9_patch-src-sysctl.c
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-freebsd/files/freebsd9_patch-src-sysctl.c b/devel/py-freebsd/files/freebsd9_patch-src-sysctl.c
new file mode 100644
index 000000000000..112e2096607d
--- /dev/null
+++ b/devel/py-freebsd/files/freebsd9_patch-src-sysctl.c
@@ -0,0 +1,38 @@
+--- src/sysctl.c.orig 2011-04-12 12:30:50.000000000 +0400
++++ src/sysctl.c 2011-04-12 12:37:45.000000000 +0400
+@@ -121,7 +121,7 @@ const size_t sysctl_type_sizes[CTLTYPE]
+ 0, /* CTLTYPE_NODE */
+ sizeof(int), /* CTLTYPE_INT */
+ 0, /* CTLTYPE_STRING */
+- sizeof(quad_t), /* CTLTYPE_QUAD */
++ sizeof(quad_t), /* CTLTYPE_S64 */
+ 0, /* CTLTYPE_OPAQUE */
+ sizeof(unsigned int), /* CTLTYPE_UINT */
+ sizeof(long), /* CTLTYPE_LONG */
+@@ -329,7 +329,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar
+ case CTLTYPE_UINT:
+ case CTLTYPE_LONG:
+ case CTLTYPE_ULONG:
+- case CTLTYPE_QUAD:
++ case CTLTYPE_S64:
+ if (!PyInt_Check(newobj) && !PyLong_Check(newobj)) {
+ PyErr_SetString(PyExc_TypeError,
+ "argument 2 must be integer for this node");
+@@ -350,7 +350,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar
+ case CTLTYPE_ULONG:
+ val.m_ulong = PyLong_AsUnsignedLong(newobj);
+ break;
+- case CTLTYPE_QUAD:
++ case CTLTYPE_S64:
+ val.m_quad = (quad_t)PyLong_AsLongLong(newobj);
+ break;
+ }
+@@ -439,7 +439,7 @@ PyFB_sysctl(PyObject *self, PyObject *ar
+ case CTLTYPE_STRING:
+ ret = PyString_FromStringAndSize(oldp, oldlen - 1);
+ break;
+- case CTLTYPE_QUAD:
++ case CTLTYPE_S64:
+ assert(oldlen == sizeof(quad_t));
+ ret = PyLong_FromLongLong((long long)*(quad_t *)oldp);
+ break;