head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.50 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.48 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.46 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.44 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.42 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.40 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.38 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.36 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.34 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.32 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.30 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.28 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.26 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.24 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.22 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.20 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.18 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.16 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.14 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.12 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.10 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.8 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.6 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.4 date 2004.04.02.10.56.22; author darcy; state dead; branches; next 1.3; 1.3 date 2004.03.28.11.51.15; author darcy; state Exp; branches; next 1.2; 1.2 date 2000.10.22.20.01.53; author tsarna; state dead; branches; next 1.1; 1.1 date 98.08.12.01.50.02; author tsarna; state Exp; branches; next ; desc @@ 1.4 log @Move patch to Python directory as that is where the file being patched is. @ text @$NetBSD: patch-aa,v 1.3 2004/03/28 11:51:15 darcy Exp $ --- Python-2.3.3/Modules/_cursesmodule.c.orig 2002-11-21 09:17:51.000000000 -0500 +++ Python-2.3.3/Modules/_cursesmodule.c @@@@ -313,17 +313,9 @@@@ Window_OneArgNoReturnFunction(wattroff, Window_OneArgNoReturnFunction(wattrset, attr_t, "l;attr") Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)") Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)") -#if defined(__NetBSD__) -Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)") -#else Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)") -#endif Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)") -#if defined(__NetBSD__) -Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)") -#else Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)") -#endif Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)") Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)") Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines") @@@@ -784,11 +776,7 @@@@ PyCursesWindow_GetKey(PyCursesWindowObje } else if (rtn<=255) return Py_BuildValue("c", rtn); else -#if defined(__NetBSD__) - return PyString_FromString(unctrl(rtn)); -#else return PyString_FromString((char *)keyname(rtn)); -#endif } static PyObject * @@@@ -1946,7 +1934,6 @@@@ PyCurses_IntrFlush(PyObject *self, PyObj return PyCursesCheckERR(intrflush(NULL,ch), "intrflush"); } -#if !defined(__NetBSD__) static PyObject * PyCurses_KeyName(PyObject *self, PyObject *args) { @@@@ -1965,7 +1952,6 @@@@ PyCurses_KeyName(PyObject *self, PyObjec return PyString_FromString((knp == NULL) ? "" : (char *)knp); } -#endif static PyObject * PyCurses_KillChar(PyObject *self) @@@@ -2392,9 +2378,7 @@@@ static PyMethodDef PyCurses_methods[] = {"initscr", (PyCFunction)PyCurses_InitScr, METH_NOARGS}, {"intrflush", (PyCFunction)PyCurses_IntrFlush, METH_VARARGS}, {"isendwin", (PyCFunction)PyCurses_isendwin, METH_NOARGS}, -#if !defined(__NetBSD__) {"keyname", (PyCFunction)PyCurses_KeyName, METH_VARARGS}, -#endif {"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS}, {"longname", (PyCFunction)PyCurses_longname, METH_NOARGS}, {"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS}, @@@@ -2490,9 +2474,7 @@@@ init_curses(void) SetDictInt("A_DIM", A_DIM); SetDictInt("A_BOLD", A_BOLD); SetDictInt("A_ALTCHARSET", A_ALTCHARSET); -#if !defined(__NetBSD__) SetDictInt("A_INVIS", A_INVIS); -#endif SetDictInt("A_PROTECT", A_PROTECT); SetDictInt("A_CHARTEXT", A_CHARTEXT); SetDictInt("A_COLOR", A_COLOR); @@@@ -2564,7 +2546,6 @@@@ init_curses(void) int key; char *key_n; char *key_n2; -#if !defined(__NetBSD__) for (key=KEY_MIN;key < KEY_MAX; key++) { key_n = (char *)keyname(key); if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0) @@@@ -2588,7 +2569,6 @@@@ init_curses(void) if (key_n2 != key_n) free(key_n2); } -#endif SetDictInt("KEY_MIN", KEY_MIN); SetDictInt("KEY_MAX", KEY_MAX); } @ 1.3 log @Remove "#ifdef NetBSD" from code so that it correctly uses ncurses. Closes PR pkg/23026 Changes approved by jlam as well. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @First batch of upgrades for Python 2.0: lang/python upgraded to 2.0 lang/py-html-docs upgraded to 2.0 misc/py-readline upgraded to 2.0 databases/py-gdbm upgraded to 2.0 x11/py-Tk upgraded to 2.0 devel/py-curses upgraded to 2.0 lang/py-extclass upgraded to 2.2.2 and for Python 2.0 textproc/py-dtml upgraded to 2.2.2 and for Python 2.0 www/py-zpublisher upgraded to 2.2.2 and for Python 2.0 print/py-reportlab upgraded to 1.01 and for Python 2.0 More coming... @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 1998/08/12 01:50:02 tsarna Exp $ d3 41 a43 6 Remove this patch when/if ncurses becomes standard --- cursesmodule.c.orig Tue Aug 11 19:47:48 1998 +++ cursesmodule.c Tue Aug 11 19:48:01 1998 @@@@ -40,7 +40,7 @@@@ /* Includes */ d45 3 a47 3 #include "Python.h" -#include +#include d49 38 a86 2 #ifdef __sgi__ /* No attr_t type is available */ @ 1.1 log @py-curses, an enchanced curses module for Python. @ text @d1 1 a1 1 $NetBSD$ @