[pkgsrc/trunk]: pkgsrc Fix prior patches to use is_pad(3) rather than is_keyp...

[roy <roy%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2f05c6edf54
branches:  trunk
changeset: 356865:b2f05c6edf54
user:      roy <roy%pkgsrc.org@localhost>
date:      Thu Jan 05 23:16:42 2017 +0000

description:
Fix prior patches to use is_pad(3) rather than is_keypad(3).
Bump py-curses.

diffstat:

 devel/py-curses/Makefile                             |   4 ++--
 lang/python27/distinfo                               |   4 ++--
 lang/python27/patches/patch-ah                       |  10 +++++-----
 lang/python34/distinfo                               |   4 ++--
 lang/python34/patches/patch-ah                       |  10 +++++-----
 lang/python35/distinfo                               |   4 ++--
 lang/python35/patches/patch-Modules___cursesmodule.c |  10 +++++-----
 lang/python36/distinfo                               |   4 ++--
 lang/python36/patches/patch-Modules___cursesmodule.c |  10 +++++-----
 9 files changed, 30 insertions(+), 30 deletions(-)

diffs (265 lines):

diff -r f07f7cae1c0e -r b2f05c6edf54 devel/py-curses/Makefile
--- a/devel/py-curses/Makefile  Thu Jan 05 22:34:25 2017 +0000
+++ b/devel/py-curses/Makefile  Thu Jan 05 23:16:42 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2017/01/02 20:52:47 roy Exp $
+# $NetBSD: Makefile,v 1.44 2017/01/05 23:16:43 roy Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-curses-${PY_DISTVERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r f07f7cae1c0e -r b2f05c6edf54 lang/python27/distinfo
--- a/lang/python27/distinfo    Thu Jan 05 22:34:25 2017 +0000
+++ b/lang/python27/distinfo    Thu Jan 05 23:16:42 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2017/01/04 14:14:28 roy Exp $
+$NetBSD: distinfo,v 1.62 2017/01/05 23:16:42 roy Exp $
 
 SHA1 (Python-2.7.13.tar.xz) = 18a8f30a0356c751b8d0ea6f76e764cab13ee046
 RMD160 (Python-2.7.13.tar.xz) = be09518cdc335314de1c5ebe181690082ce780d7
@@ -18,7 +18,7 @@
 SHA1 (patch-ab) = ea4feba4e93dbcff07050c82a00d591bb650e934
 SHA1 (patch-ad) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
 SHA1 (patch-ae) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
-SHA1 (patch-ah) = 98147908ab33274fa856c7aee98e49c9b7344967
+SHA1 (patch-ah) = 142634dab30923bb785e488af3561f09dda51549
 SHA1 (patch-al) = 541936b79f281db06761f4fa6a65a04e852b02b4
 SHA1 (patch-am) = cf82bd1996aea8a8536bd37a74563bb85817c968
 SHA1 (patch-an) = 9aad78714c4fe1a21cf66a6627d97d164ecea196
diff -r f07f7cae1c0e -r b2f05c6edf54 lang/python27/patches/patch-ah
--- a/lang/python27/patches/patch-ah    Thu Jan 05 22:34:25 2017 +0000
+++ b/lang/python27/patches/patch-ah    Thu Jan 05 23:16:42 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.6 2017/01/04 14:14:28 roy Exp $
+$NetBSD: patch-ah,v 1.7 2017/01/05 23:16:42 roy Exp $
 
 Allow py-curses to use NetBSD curses as well as ncurses
 http://bugs.python.org/issue21457
@@ -41,7 +41,7 @@
  
  #ifdef WINDOW_HAS_FLAGS
 -    if (self->win->_flags & _ISPAD)
-+    if (is_keypad(self->win))
++    if (is_pad(self->win))
          return PyCursesCheckERR(pechochar(self->win, ch | attr),
                                  "echochar");
      else
@@ -50,7 +50,7 @@
      if (0)
  #else
 -        if (self->win->_flags & _ISPAD)
-+        if (is_keypad(self->win))
++        if (is_pad(self->win))
  #endif
          {
              switch(PyTuple_Size(args)) {
@@ -59,7 +59,7 @@
      if (0)
  #else
 -        if (self->win->_flags & _ISPAD)
-+        if (is_keypad(self->win))
++        if (is_pad(self->win))
  #endif
          {
              switch(PyTuple_Size(args)) {
@@ -68,7 +68,7 @@
      /* printf("Subwin: %i %i %i %i   \n", nlines, ncols, begin_y, begin_x); */
  #ifdef WINDOW_HAS_FLAGS
 -    if (self->win->_flags & _ISPAD)
-+    if (is_keypad(self->win))
++    if (is_pad(self->win))
          win = subpad(self->win, nlines, ncols, begin_y, begin_x);
      else
  #endif
diff -r f07f7cae1c0e -r b2f05c6edf54 lang/python34/distinfo
--- a/lang/python34/distinfo    Thu Jan 05 22:34:25 2017 +0000
+++ b/lang/python34/distinfo    Thu Jan 05 23:16:42 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2017/01/02 20:52:46 roy Exp $
+$NetBSD: distinfo,v 1.23 2017/01/05 23:16:42 roy Exp $
 
 SHA1 (Python-3.4.5.tar.xz) = 882e83e0286b253ee651aa3f9a5d27ebc46e6632
 RMD160 (Python-3.4.5.tar.xz) = 47604be01f37671a16c17e27316af327a1048fd6
@@ -6,7 +6,7 @@
 Size (Python-3.4.5.tar.xz) = 14516820 bytes
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57
 SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d
-SHA1 (patch-ah) = f5e6ee512df69b6f0718c8d303e5b8ede39357ed
+SHA1 (patch-ah) = 0acdfcbf3ebcb96b18a1cf28f18b286aa507a62f
 SHA1 (patch-al) = 7239d10b67c739c3ee33dd2fc95bb770360d152f
 SHA1 (patch-am) = 1752a06fec7626af57e85b6cbd9b6cc38b99272f
 SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
diff -r f07f7cae1c0e -r b2f05c6edf54 lang/python34/patches/patch-ah
--- a/lang/python34/patches/patch-ah    Thu Jan 05 22:34:25 2017 +0000
+++ b/lang/python34/patches/patch-ah    Thu Jan 05 23:16:42 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2017/01/02 20:52:46 roy Exp $
+$NetBSD: patch-ah,v 1.5 2017/01/05 23:16:42 roy Exp $
 
 Allow py-curses to use NetBSD curses as well as ncurses
 http://bugs.python.org/issue21457
@@ -43,7 +43,7 @@
  
  #ifdef WINDOW_HAS_FLAGS
 -    if (self->win->_flags & _ISPAD)
-+    if (is_keypad(self->win))
++    if (is_pad(self->win))
          return PyCursesCheckERR(pechochar(self->win, ch | attr),
                                  "echochar");
      else
@@ -64,7 +64,7 @@
      if (0)
  #else
 -        if (self->win->_flags & _ISPAD)
-+        if (is_keypad(self->win))
++        if (is_pad(self->win))
  #endif
          {
              switch(PyTuple_Size(args)) {
@@ -73,7 +73,7 @@
      if (0)
  #else
 -        if (self->win->_flags & _ISPAD)
-+        if (is_keypad(self->win))
++        if (is_pad(self->win))
  #endif
          {
              switch(PyTuple_Size(args)) {
@@ -82,7 +82,7 @@
      /* printf("Subwin: %i %i %i %i   \n", nlines, ncols, begin_y, begin_x); */
  #ifdef WINDOW_HAS_FLAGS
 -    if (self->win->_flags & _ISPAD)
-+    if (is_keypad(self->win))
++    if (is_pad(self->win))
          win = subpad(self->win, nlines, ncols, begin_y, begin_x);
      else
  #endif
diff -r f07f7cae1c0e -r b2f05c6edf54 lang/python35/distinfo
--- a/lang/python35/distinfo    Thu Jan 05 22:34:25 2017 +0000
+++ b/lang/python35/distinfo    Thu Jan 05 23:16:42 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2017/01/02 20:52:46 roy Exp $
+$NetBSD: distinfo,v 1.8 2017/01/05 23:16:42 roy Exp $
 
 SHA1 (Python-3.5.2.tar.xz) = 4843aabacec5bc0cdd3e1f778faa926e532794d2
 RMD160 (Python-3.5.2.tar.xz) = 709be7df28045c4fc8ed40cadd299478439f9522
@@ -8,7 +8,7 @@
 SHA1 (patch-Lib_distutils_command_install.py) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d6df07921ad3357757d4681a964256b560b3f57
 SHA1 (patch-Makefile.pre.in) = 5a27e9bc405b515f10b972ba9fc9421e05e4b7f1
-SHA1 (patch-Modules___cursesmodule.c) = cb3960bc91a5f815c8c4755e60124484b8c68266
+SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
 SHA1 (patch-Modules_makesetup) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
 SHA1 (patch-Modules_nismodule.c) = bd290417c265846e238660180e60e76c0f5f696a
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
diff -r f07f7cae1c0e -r b2f05c6edf54 lang/python35/patches/patch-Modules___cursesmodule.c
--- a/lang/python35/patches/patch-Modules___cursesmodule.c      Thu Jan 05 22:34:25 2017 +0000
+++ b/lang/python35/patches/patch-Modules___cursesmodule.c      Thu Jan 05 23:16:42 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-Modules___cursesmodule.c,v 1.3 2017/01/02 20:52:46 roy Exp $
+$NetBSD: patch-Modules___cursesmodule.c,v 1.4 2017/01/05 23:16:42 roy Exp $
 
 Allow py-curses to use NetBSD curses as well as ncurses
 http://bugs.python.org/issue21457
@@ -42,7 +42,7 @@
  
  #ifdef WINDOW_HAS_FLAGS
 -    if (self->win->_flags & _ISPAD)
-+    if (is_keypad(self->win))
++    if (is_pad(self->win))
          return PyCursesCheckERR(pechochar(self->win, ch | attr),
                                  "echochar");
      else
@@ -63,7 +63,7 @@
      if (0)
  #else
 -        if (self->win->_flags & _ISPAD)
-+        if (is_keypad(self->win))
++        if (is_pad(self->win))
  #endif
          {
              switch(PyTuple_Size(args)) {
@@ -72,7 +72,7 @@
      if (0)
  #else
 -        if (self->win->_flags & _ISPAD)
-+        if (is_keypad(self->win))
++        if (is_pad(self->win))
  #endif
          {
              switch(PyTuple_Size(args)) {
@@ -81,7 +81,7 @@
      /* printf("Subwin: %i %i %i %i   \n", nlines, ncols, begin_y, begin_x); */
  #ifdef WINDOW_HAS_FLAGS
 -    if (self->win->_flags & _ISPAD)
-+    if (is_keypad(self->win))
++    if (is_pad(self->win))
          win = subpad(self->win, nlines, ncols, begin_y, begin_x);
      else
  #endif
diff -r f07f7cae1c0e -r b2f05c6edf54 lang/python36/distinfo
--- a/lang/python36/distinfo    Thu Jan 05 22:34:25 2017 +0000
+++ b/lang/python36/distinfo    Thu Jan 05 23:16:42 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2017/01/02 21:14:53 roy Exp $
+$NetBSD: distinfo,v 1.3 2017/01/05 23:16:42 roy Exp $
 
 SHA1 (Python-3.6.0.tar.xz) = 18ebf7d726782967d967dc00e3aa08b334fbdd5c
 RMD160 (Python-3.6.0.tar.xz) = 984a38d1eec379ac8921479a86259ca0161734af
@@ -10,7 +10,7 @@
 SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9
 SHA1 (patch-Lib_sysconfig.py) = 81df54149caba826062fb78e68fdd4328ea98b2a
 SHA1 (patch-Makefile.pre.in) = 99b33ba203eb2c9c626377f1bac03c723d467553
-SHA1 (patch-Modules___cursesmodule.c) = cb3960bc91a5f815c8c4755e60124484b8c68266
+SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
diff -r f07f7cae1c0e -r b2f05c6edf54 lang/python36/patches/patch-Modules___cursesmodule.c
--- a/lang/python36/patches/patch-Modules___cursesmodule.c      Thu Jan 05 22:34:25 2017 +0000
+++ b/lang/python36/patches/patch-Modules___cursesmodule.c      Thu Jan 05 23:16:42 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-Modules___cursesmodule.c,v 1.2 2017/01/02 21:14:53 roy Exp $
+$NetBSD: patch-Modules___cursesmodule.c,v 1.3 2017/01/05 23:16:42 roy Exp $
 
 Allow py-curses to use NetBSD curses as well as ncurses
 http://bugs.python.org/issue21457
@@ -42,7 +42,7 @@
  
  #ifdef WINDOW_HAS_FLAGS
 -    if (self->win->_flags & _ISPAD)
-+    if (is_keypad(self->win))
++    if (is_pad(self->win))
          return PyCursesCheckERR(pechochar(self->win, ch | attr),
                                  "echochar");
      else
@@ -63,7 +63,7 @@
      if (0)
  #else
 -        if (self->win->_flags & _ISPAD)
-+        if (is_keypad(self->win))
++        if (is_pad(self->win))
  #endif
          {
              switch(PyTuple_Size(args)) {
@@ -72,7 +72,7 @@
      if (0)
  #else
 -        if (self->win->_flags & _ISPAD)
-+        if (is_keypad(self->win))
++        if (is_pad(self->win))
  #endif
          {
              switch(PyTuple_Size(args)) {
@@ -81,7 +81,7 @@
      /* printf("Subwin: %i %i %i %i   \n", nlines, ncols, begin_y, begin_x); */
  #ifdef WINDOW_HAS_FLAGS
 -    if (self->win->_flags & _ISPAD)
-+    if (is_keypad(self->win))
++    if (is_pad(self->win))
          win = subpad(self->win, nlines, ncols, begin_y, begin_x);
      else
  #endif