From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 9 09:10:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54F681065672 for ; Tue, 9 Sep 2008 09:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 349568FC1E for ; Tue, 9 Sep 2008 09:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m899A44U043321 for ; Tue, 9 Sep 2008 09:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m899A4VC043320; Tue, 9 Sep 2008 09:10:04 GMT (envelope-from gnats) Resent-Date: Tue, 9 Sep 2008 09:10:04 GMT Resent-Message-Id: <200809090910.m899A4VC043320@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yi-Jheng Lin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47783106566C for ; Tue, 9 Sep 2008 09:08:33 +0000 (UTC) (envelope-from yzlin@cs.nctu.edu.tw) Received: from csmailgate.cs.nctu.edu.tw (csmailgate.cs.nctu.edu.tw [140.113.235.103]) by mx1.freebsd.org (Postfix) with ESMTP id DFC2D8FC0A for ; Tue, 9 Sep 2008 09:08:32 +0000 (UTC) (envelope-from yzlin@cs.nctu.edu.tw) Received: from stucgi.cs.nctu.edu.tw (stucgi [140.113.235.130]) by csmailgate.cs.nctu.edu.tw (Postfix) with ESMTP id C0289104993; Tue, 9 Sep 2008 17:08:31 +0800 (CST) Received: (from yzlin@localhost) by stucgi.cs.nctu.edu.tw (8.14.2/8.14.2/Submit) id m8998Ves051601; Tue, 9 Sep 2008 17:08:31 +0800 (CST) (envelope-from yzlin) Message-Id: <200809090908.m8998Ves051601@stucgi.cs.nctu.edu.tw> Date: Tue, 9 Sep 2008 17:08:31 +0800 (CST) From: Yi-Jheng Lin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: python@FreeBSD.org Subject: ports/127240: [PATCH] devel/py-rbtree: unbreak, fix build error X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Sep 2008 09:10:04 -0000 >Number: 127240 >Category: ports >Synopsis: [PATCH] devel/py-rbtree: unbreak, fix build error >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Sep 09 09:10:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Yi-Jheng Lin >Release: FreeBSD 7.0-RELEASE-p4 amd64 >Organization: NCTU CS >Environment: System: FreeBSD stucgi 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #0: Fri Sep 5 14:56:26 CST >Description: Unbreak & fix build error. Port maintainer (python@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- py25-rbtree-0.8.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/py-rbtree/Makefile /amd/account/gcs/96/9655630/dev/ports/devel/py-rbtree/Makefile --- /usr/ports/devel/py-rbtree/Makefile 2008-05-31 03:06:41.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/devel/py-rbtree/Makefile 2008-09-09 14:39:41.000000000 +0800 @@ -18,8 +18,6 @@ BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex -BROKEN= does not compile - USE_PYTHON= yes USE_PYDISTUTILS= easy_install PYEASYINSTALL_ARCHDEP= yes diff -ruN --exclude=CVS /usr/ports/devel/py-rbtree/files/patch-src__rbtree.pyx /amd/account/gcs/96/9655630/dev/ports/devel/py-rbtree/files/patch-src__rbtree.pyx --- /usr/ports/devel/py-rbtree/files/patch-src__rbtree.pyx 2007-04-05 10:17:16.000000000 +0800 +++ /amd/account/gcs/96/9655630/dev/ports/devel/py-rbtree/files/patch-src__rbtree.pyx 2008-09-09 16:57:39.000000000 +0800 @@ -1,11 +1,11 @@ ---- ./src/rbtree.pyx.orig Sat Feb 10 06:49:24 2007 -+++ ./src/rbtree.pyx Mon Mar 26 10:19:44 2007 +--- src/rbtree.pyx.orig 2007-02-10 06:49:24.000000000 +0800 ++++ src/rbtree.pyx 2008-09-09 16:52:56.000000000 +0800 @@ -83,7 +83,7 @@ cdef int _done cdef iter_direction _direction - def __new__(self, RBTree tree, int itype): -+ def __new__(self, RBTree tree, itype): ++ def __cinit__(self, RBTree tree, itype): self._T = tree self._iter = NULL self._type = itype @@ -18,3 +18,68 @@ self._direction = value cdef _position(self, iter_direction direction): +@@ -193,7 +193,7 @@ + cdef class RBTree: + cdef rbtree_t *_tree + +- def __new__(self, mapping=None, cmp=None): ++ def __cinit__(self, mapping=None, cmp=None): + self._tree = rbtree_alloc() + rbtree_init(self._tree) + +@@ -245,7 +245,7 @@ + def __setitem__(self, key, value): + # calling hash on the key verifies that its not + # mutilble, as far as a dict would anyway... +- if isinstance(key, slice): ++ if isinstance(key, key_slice): + raise ValueError, "setslice is unsupported" + + hash(key) +@@ -254,7 +254,7 @@ + def __getitem__(self, key): + cdef void * v + +- if isinstance(key, slice): ++ if isinstance(key, key_slice): + return self.__doslice__(key) + + v = rbtree_get(self._tree, key) +@@ -264,7 +264,7 @@ + def __delitem__(self, key): + cdef int rc + +- if isinstance(key, slice): ++ if isinstance(key, key_slice): + self.__dodeleteslice__(key) + return + +@@ -272,7 +272,7 @@ + if rc != 0: raise KeyError, key + + +- def __doslice__(self, slice): ++ def __doslice__(self, key_slice): + # This is our hacked up version that getattr will invoke with + # a slice object. We support key ordering so we could have + # interger offsets into the results, but really we want to +@@ -280,14 +280,14 @@ + # values between a->z. A new rbtree is returned + instance = self.__class__() + rbtree_do_slice(self._tree, +- slice.start, +- slice.stop, +- slice.step, ++ key_slice.start, ++ key_slice.stop, ++ key_slice.step, + (instance)._tree) + return instance + +- def __dodeleteslice__(self, slice): +- rbtree_do_del_slice(self._tree, slice.start, slice.stop, slice.step) ++ def __dodeleteslice__(self, key_slice): ++ rbtree_do_del_slice(self._tree, key_slice.start, key_slice.stop, key_slice.step) + + def get(self, key, default=None): + try: --- py25-rbtree-0.8.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: