Wed Jan 4 14:14:28 2017 UTC ()
Fix typo in patch to address PR pkg/51778.


(roy)
diff -r1.60 -r1.61 pkgsrc/lang/python27/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/python27/patches/patch-ah
cvs diff -r1.60 -r1.61 pkgsrc/lang/python27/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python27/distinfo 2017/01/02 20:52:46 1.60
+++ pkgsrc/lang/python27/distinfo 2017/01/04 14:14:28 1.61
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: distinfo,v 1.60 2017/01/02 20:52:46 roy Exp $ 1$NetBSD: distinfo,v 1.61 2017/01/04 14:14:28 roy Exp $
2 2
3SHA1 (Python-2.7.13.tar.xz) = 18a8f30a0356c751b8d0ea6f76e764cab13ee046 3SHA1 (Python-2.7.13.tar.xz) = 18a8f30a0356c751b8d0ea6f76e764cab13ee046
4RMD160 (Python-2.7.13.tar.xz) = be09518cdc335314de1c5ebe181690082ce780d7 4RMD160 (Python-2.7.13.tar.xz) = be09518cdc335314de1c5ebe181690082ce780d7
5SHA512 (Python-2.7.13.tar.xz) = f37c9a28ce129d01e63c84d7db627a06402854578f62d17927334ea21ede318e04bbf66e890e3f47c85333e6b19f6e5581fb3f3e27efd24be27017d1b6529c4b 5SHA512 (Python-2.7.13.tar.xz) = f37c9a28ce129d01e63c84d7db627a06402854578f62d17927334ea21ede318e04bbf66e890e3f47c85333e6b19f6e5581fb3f3e27efd24be27017d1b6529c4b
6Size (Python-2.7.13.tar.xz) = 12495628 bytes 6Size (Python-2.7.13.tar.xz) = 12495628 bytes
7SHA1 (patch-Include_pyerrors.h) = 0d2cd52d18cc719b895fa32ed7e11c6cb15bae54 7SHA1 (patch-Include_pyerrors.h) = 0d2cd52d18cc719b895fa32ed7e11c6cb15bae54
8SHA1 (patch-Include_pyport.h) = f3e4ddbc954425a65301465410911222ca471320 8SHA1 (patch-Include_pyport.h) = f3e4ddbc954425a65301465410911222ca471320
9SHA1 (patch-Lib_distutils_unixccompiler.py) = db16c9aca2f29730945f28247b88b18828739bbb 9SHA1 (patch-Lib_distutils_unixccompiler.py) = db16c9aca2f29730945f28247b88b18828739bbb
10SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803 10SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803
11SHA1 (patch-Modules___multiprocessing_semaphore.c) = 03b9c33ef38da383d5f7c2c84c17fe38cdd2911e 11SHA1 (patch-Modules___multiprocessing_semaphore.c) = 03b9c33ef38da383d5f7c2c84c17fe38cdd2911e
12SHA1 (patch-Modules__ssl.c) = 6e68f88ad205106691900f091a897ffe0a4c363c 12SHA1 (patch-Modules__ssl.c) = 6e68f88ad205106691900f091a897ffe0a4c363c
13SHA1 (patch-Modules_getaddrinfo.c) = aa699d257f1bc98b9a3183a21324053e134409d1 13SHA1 (patch-Modules_getaddrinfo.c) = aa699d257f1bc98b9a3183a21324053e134409d1
14SHA1 (patch-Modules_getpath.c) = 9bb2c040895ad6bbe4d0b5807803723b5437d47b 14SHA1 (patch-Modules_getpath.c) = 9bb2c040895ad6bbe4d0b5807803723b5437d47b
15SHA1 (patch-Modules_posixmodule.c) = 5105d380cd49bf49b8adbd9aa5ffb245195728ed 15SHA1 (patch-Modules_posixmodule.c) = 5105d380cd49bf49b8adbd9aa5ffb245195728ed
16SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4 16SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4
17SHA1 (patch-aa) = d9626c1648d7ff2a7da7352665bcb05f4ab0412a 17SHA1 (patch-aa) = d9626c1648d7ff2a7da7352665bcb05f4ab0412a
18SHA1 (patch-ab) = ea4feba4e93dbcff07050c82a00d591bb650e934 18SHA1 (patch-ab) = ea4feba4e93dbcff07050c82a00d591bb650e934
19SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13 19SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
20SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6 20SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
21SHA1 (patch-ah) = f6e7ad94501bfee30dc7bb8336dbb4284e5ee84e 21SHA1 (patch-ah) = 98147908ab33274fa856c7aee98e49c9b7344967
22SHA1 (patch-al) = 541936b79f281db06761f4fa6a65a04e852b02b4 22SHA1 (patch-al) = 541936b79f281db06761f4fa6a65a04e852b02b4
23SHA1 (patch-am) = cf82bd1996aea8a8536bd37a74563bb85817c968 23SHA1 (patch-am) = cf82bd1996aea8a8536bd37a74563bb85817c968
24SHA1 (patch-an) = 9aad78714c4fe1a21cf66a6627d97d164ecea196 24SHA1 (patch-an) = 9aad78714c4fe1a21cf66a6627d97d164ecea196
25SHA1 (patch-ao) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa 25SHA1 (patch-ao) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa
26SHA1 (patch-au) = 0ecdb937cbd58e3dbfa6fb94d1af5838619c77fd 26SHA1 (patch-au) = 0ecdb937cbd58e3dbfa6fb94d1af5838619c77fd
27SHA1 (patch-av) = e6aef090b444b455fe351308d251e670329b7dc3 27SHA1 (patch-av) = e6aef090b444b455fe351308d251e670329b7dc3
28SHA1 (patch-aw) = d07129531ec1427669092c504c12247206408c2d 28SHA1 (patch-aw) = d07129531ec1427669092c504c12247206408c2d
29SHA1 (patch-ax) = 8a7a0e5cbfec279a05945dffafea1b1131a76f0e 29SHA1 (patch-ax) = 8a7a0e5cbfec279a05945dffafea1b1131a76f0e
30SHA1 (patch-az) = 01e113b0bd251978b555caaaa60b79c372edebce 30SHA1 (patch-az) = 01e113b0bd251978b555caaaa60b79c372edebce
31SHA1 (patch-pyconfig.h.in) = a0143ecdc2a3fb10220d0e3ee94fb9779a45e9e1 31SHA1 (patch-pyconfig.h.in) = a0143ecdc2a3fb10220d0e3ee94fb9779a45e9e1
32SHA1 (patch-xa) = 517cfefc2f2e13631d22bad28c327513cdf17c10 32SHA1 (patch-xa) = 517cfefc2f2e13631d22bad28c327513cdf17c10
cvs diff -r1.5 -r1.6 pkgsrc/lang/python27/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/lang/python27/patches/Attic/patch-ah 2017/01/02 20:52:46 1.5
+++ pkgsrc/lang/python27/patches/Attic/patch-ah 2017/01/04 14:14:28 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ah,v 1.5 2017/01/02 20:52:46 roy Exp $ 1$NetBSD: patch-ah,v 1.6 2017/01/04 14:14:28 roy Exp $
2 2
3Allow py-curses to use NetBSD curses as well as ncurses 3Allow py-curses to use NetBSD curses as well as ncurses
4http://bugs.python.org/issue21457 4http://bugs.python.org/issue21457
5 5
6--- Modules/_cursesmodule.c.orig 2016-06-25 21:49:31.000000000 +0000 6--- Modules/_cursesmodule.c.orig 2016-06-25 21:49:31.000000000 +0000
7+++ Modules/_cursesmodule.c 7+++ Modules/_cursesmodule.c
8@@ -117,9 +117,10 @@ char *PyCursesVersion = "2.2"; 8@@ -117,9 +117,10 @@ char *PyCursesVersion = "2.2";
9 #defines many common symbols (such as "lines") which breaks the 9 #defines many common symbols (such as "lines") which breaks the
10 curses module in other ways. So the code will just specify 10 curses module in other ways. So the code will just specify
11 explicit prototypes here. */ 11 explicit prototypes here. */
12-extern int setupterm(char *,int,int *); 12-extern int setupterm(char *,int,int *);
13-#ifdef __sgi 13-#ifdef __sgi
14+#if defined(__NetBSD__) || defined(__sgi) 14+#if defined(__NetBSD__) || defined(__sgi)
@@ -113,27 +113,27 @@ http://bugs.python.org/issue21457 @@ -113,27 +113,27 @@ http://bugs.python.org/issue21457
113 static PyObject * 113 static PyObject *
114 PyCurses_Resize_Term(PyObject *self, PyObject *args) 114 PyCurses_Resize_Term(PyObject *self, PyObject *args)
115 { 115 {
116- int lines; 116- int lines;
117- int columns; 117- int columns;
118+ int nlines; 118+ int nlines;
119+ int ncolumns; 119+ int ncolumns;
120  120
121 PyObject *result; 121 PyObject *result;
122  122
123 PyCursesInitialised; 123 PyCursesInitialised;
124  124
125- if (!PyArg_ParseTuple(args,"ii:resize_term", &lines, &columns)) 125- if (!PyArg_ParseTuple(args,"ii:resize_term", &lines, &columns))
126+ if (!PyArg_ParseTuple(args,"ii:resize_term", &nline, &ncolumns)) 126+ if (!PyArg_ParseTuple(args,"ii:resize_term", &nlines, &ncolumns))
127 return NULL; 127 return NULL;
128  128
129- result = PyCursesCheckERR(resize_term(lines, columns), "resize_term"); 129- result = PyCursesCheckERR(resize_term(lines, columns), "resize_term");
130+ result = PyCursesCheckERR(resize_term(nlines, ncolumns), "resize_term"); 130+ result = PyCursesCheckERR(resize_term(nlines, ncolumns), "resize_term");
131 if (!result) 131 if (!result)
132 return NULL; 132 return NULL;
133 if (!update_lines_cols()) 133 if (!update_lines_cols())
134@@ -2674,9 +2665,7 @@ static PyMethodDef PyCurses_methods[] =  134@@ -2674,9 +2665,7 @@ static PyMethodDef PyCurses_methods[] =
135 #ifdef HAVE_CURSES_IS_TERM_RESIZED 135 #ifdef HAVE_CURSES_IS_TERM_RESIZED
136 {"is_term_resized", (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS}, 136 {"is_term_resized", (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
137 #endif 137 #endif
138-#if !defined(__NetBSD__) 138-#if !defined(__NetBSD__)
139 {"keyname", (PyCFunction)PyCurses_KeyName, METH_VARARGS}, 139 {"keyname", (PyCFunction)PyCurses_KeyName, METH_VARARGS},