From 11d71124d3261f2507b7958fa8bec4c1f57ed8f4 Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Mon, 24 Sep 2007 04:11:23 +0000
Subject: Fix py-kqueue for python 2.5.x.

PR:		ports/115781
Sponsored by:	SINA Corporation
Approved by:	maintainer timeout
---
 devel/py-kqueue/Makefile                      |  2 +-
 devel/py-kqueue/files/patch-kqsyscallmodule.c | 61 +++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 devel/py-kqueue/files/patch-kqsyscallmodule.c

diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile
index 690cab471171..6f5789174ad6 100644
--- a/devel/py-kqueue/Makefile
+++ b/devel/py-kqueue/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kqueue
 PORTVERSION=		1.4
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		devel python
 MASTER_SITES=		http://ox.eicat.ca/~dgilbert/files/
 PKGNAMEPREFIX=		py-
diff --git a/devel/py-kqueue/files/patch-kqsyscallmodule.c b/devel/py-kqueue/files/patch-kqsyscallmodule.c
new file mode 100644
index 000000000000..2d458217df00
--- /dev/null
+++ b/devel/py-kqueue/files/patch-kqsyscallmodule.c
@@ -0,0 +1,61 @@
+--- ./kqsyscallmodule.c.orig	2001-01-29 10:59:50.000000000 +0800
++++ ./kqsyscallmodule.c	2007-08-24 18:27:42.250897722 +0800
+@@ -42,6 +42,12 @@
+ 
+ #define MAX_KEVENTS 512
+ 
++#if PYTHON_API_VERSION <= 1007
++    /* 1.5 compatibility */
++#define PyObject_New PyObject_NEW
++#define PyObject_Del PyMem_DEL
++#endif
++
+ // ----------------------------------------------------------------------
+ //			    KQEventObject
+ // ----------------------------------------------------------------------
+@@ -58,8 +64,7 @@
+ static KQEventObject *
+ newKQEventObject (PyObject *arg)
+ {
+-  // return PyObject_New (KQEventObject, &KQEvent_Type);
+-  return PyObject_NEW (KQEventObject, &KQEvent_Type);
++  return PyObject_New (KQEventObject, &KQEvent_Type);
+ }
+ 
+ /* KQEvent methods */
+@@ -67,8 +72,7 @@
+ static void
+ KQEvent_dealloc(KQEventObject *self)
+ {
+-  // PyObject_Del(self);
+-  PyMem_DEL (self);
++  PyObject_Del(self);
+ }
+ 
+ // --------------------------------------------------------------------------------
+@@ -201,14 +205,14 @@
+ static KQueueObject *
+ newKQueueObject (PyObject *arg)
+ {
+-  KQueueObject * self = PyObject_NEW (KQueueObject, &KQueue_Type);
++  KQueueObject * self = PyObject_New(KQueueObject, &KQueue_Type);
+   if (!self) {
+     PyErr_SetFromErrno (PyExc_MemoryError);
+     return NULL;
+   } else {
+     int kqfd = kqueue();
+     if (kqfd < 0) {
+-      PyMem_DEL (self);
++      PyObject_Del(self);
+       PyErr_SetFromErrno (PyExc_OSError);
+       return NULL;
+     } else {
+@@ -234,7 +238,7 @@
+ KQueue_dealloc(KQueueObject *self)
+ {
+   close (self->fd);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ /* Call kevent(2) and do appropriate digestion of lists. */
-- 
cgit