head 1.3; access; symbols pkgsrc-2016Q2:1.2.0.10 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.8 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.6 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.4 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.2 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.1.0.20 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.18 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.16 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.14 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.12 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.10 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.8 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.6 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.4 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.2 pkgsrc-2012Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2016.07.09.13.04.40; author wiz; state dead; branches; next 1.2; commitid SyRfhtrpAsjObEdz; 1.2 date 2015.04.24.03.24.32; author rodent; state Exp; branches; next 1.1; commitid 9Gn5EBfBfVHvbNiy; 1.1 date 2012.12.10.03.15.49; author tsarna; state Exp; branches; next ; desc @@ 1.3 log @Remove python33. @ text @$NetBSD: patch-ah,v 1.2 2015/04/24 03:24:32 rodent Exp $ * Ncurses will be used by devel/py-curses and devel/py-cursespanel. --- Modules/_cursesmodule.c.orig 2014-10-12 07:03:53.000000000 +0000 +++ Modules/_cursesmodule.c @@@@ -482,17 +482,9 @@@@ Window_NoArg2TupleReturnFunction(getpary 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") @@@@ -1146,11 +1138,7 @@@@ PyCursesWindow_GetKey(PyCursesWindowObje return Py_BuildValue("C", rtn); } else { const char *knp; -#if defined(__NetBSD__) - knp = unctrl(rtn); -#else knp = keyname(rtn); -#endif return PyUnicode_FromString((knp == NULL) ? "" : knp); } } @@@@ -2580,7 +2568,6 @@@@ PyCurses_Is_Term_Resized(PyObject *self, } #endif /* HAVE_CURSES_IS_TERM_RESIZED */ -#if !defined(__NetBSD__) static PyObject * PyCurses_KeyName(PyObject *self, PyObject *args) { @@@@ -2599,7 +2586,6 @@@@ PyCurses_KeyName(PyObject *self, PyObjec return PyBytes_FromString((knp == NULL) ? "" : (char *)knp); } -#endif static PyObject * PyCurses_KillChar(PyObject *self) @@@@ -3206,9 +3192,7 @@@@ static PyMethodDef PyCurses_methods[] = #ifdef HAVE_CURSES_IS_TERM_RESIZED {"is_term_resized", (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS}, #endif -#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}, @@@@ -3334,9 +3318,7 @@@@ PyInit__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); @@@@ -3408,7 +3390,6 @@@@ PyInit__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) @@@@ -3436,7 +3417,6 @@@@ PyInit__curses(void) if (key_n2 != key_n) free(key_n2); } -#endif SetDictInt("KEY_MIN", KEY_MIN); SetDictInt("KEY_MAX", KEY_MAX); } @ 1.2 log @Fix build with LibreSSL. From: https://hg.python.org/cpython/rev/6f23bc5d480e and defuzz patches. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1 2012/12/10 03:15:49 tsarna Exp $ @ 1.1 log @Add Python 3.3.0 @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- Modules/_cursesmodule.c.orig 2012-02-23 20:22:47.000000000 +0000 d7 1 a7 1 @@@@ -332,17 +332,9 @@@@ Window_NoArg2TupleReturnFunction(getpary d25 1 a25 1 @@@@ -901,11 +893,7 @@@@ PyCursesWindow_GetKey(PyCursesWindowObje d37 1 a37 1 @@@@ -2187,7 +2175,6 @@@@ PyCurses_Is_Term_Resized(PyObject *self, d45 1 a45 1 @@@@ -2206,7 +2193,6 @@@@ PyCurses_KeyName(PyObject *self, PyObjec d53 1 a53 1 @@@@ -2744,9 +2730,7 @@@@ static PyMethodDef PyCurses_methods[] = d63 1 a63 1 @@@@ -2869,9 +2853,7 @@@@ PyInit__curses(void) d73 1 a73 1 @@@@ -2943,7 +2925,6 @@@@ PyInit__curses(void) d81 1 a81 1 @@@@ -2971,7 +2952,6 @@@@ PyInit__curses(void) @