Remove "#ifdef NetBSD" from code so that it correctly uses ncurses.

Closes PR pkg/23026
Changes approved by jlam as well.

1 files changed, 86 insertions, 0 deletions

diff --git a/devel/py-curses/patches/patch-aa b/devel/py-curses/patches/patch-aa
new file mode 100644
index 00000000000..1d25cb8d4f4
--- /dev/null
+++ b/devel/py-curses/patches/patch-aa
@@ -0,0 +1,86 @@
+$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);
+ 	}