[pkgsrc/trunk]: pkgsrc/audio/moc moc: don't try to set escdelay before settin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6106c9364dba
branches:  trunk
changeset: 357847:6106c9364dba
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Jan 30 04:19:22 2017 +0000

description:
moc: don't try to set escdelay before setting up a window. this will
fail on ncurses (and this failure is ignored) and segfault on nbcurses.
reported by Chavdar Ivanov in current-users.

bump PKGREVISION.

diffstat:

 audio/moc/Makefile                            |   4 +-
 audio/moc/distinfo                            |   3 +-
 audio/moc/patches/patch-interface__elements.c |  37 +++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diffs (69 lines):

diff -r c5d62d7b7669 -r 6106c9364dba audio/moc/Makefile
--- a/audio/moc/Makefile        Mon Jan 30 03:05:37 2017 +0000
+++ b/audio/moc/Makefile        Mon Jan 30 04:19:22 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2017/01/01 16:06:03 adam Exp $
+# $NetBSD: Makefile,v 1.31 2017/01/30 04:19:22 maya Exp $
 
 DISTNAME=              moc-2.5.0
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            audio
 MASTER_SITES=          http://ftp.daper.net/pub/soft/moc/stable/
 EXTRACT_SUFX=          .tar.bz2
diff -r c5d62d7b7669 -r 6106c9364dba audio/moc/distinfo
--- a/audio/moc/distinfo        Mon Jan 30 03:05:37 2017 +0000
+++ b/audio/moc/distinfo        Mon Jan 30 04:19:22 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2016/02/16 08:46:01 leot Exp $
+$NetBSD: distinfo,v 1.12 2017/01/30 04:19:22 maya Exp $
 
 SHA1 (moc-2.5.0.tar.bz2) = a02c10075541995771dbdccb7f2d0ecd19d70b81
 RMD160 (moc-2.5.0.tar.bz2) = 0c5d927b7c8ef54338ff6970f9e5d4f71dcb6168
@@ -7,4 +7,5 @@
 SHA1 (patch-ab) = 37a3cc45df7b528613ce5c714c95895988f1570c
 SHA1 (patch-ad) = 4d4d73f819717698b37ca937477989b010adb5c8
 SHA1 (patch-decoder__plugins_vorbis_vorbis.m4) = 50f2967146be40a6d6b881cdffe5f25c4c226175
+SHA1 (patch-interface__elements.c) = ce04fadc67b823dcef48dfbcfcfcad25213dab51
 SHA1 (patch-playlist__file.c) = cc2d5280992d713c846bfe16e8869238df6dca5d
diff -r c5d62d7b7669 -r 6106c9364dba audio/moc/patches/patch-interface__elements.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/moc/patches/patch-interface__elements.c     Mon Jan 30 04:19:22 2017 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-interface__elements.c,v 1.1 2017/01/30 04:19:22 maya Exp $
+
+don't attempt to set esc delay before setting a window... fails
+silently for ncurses, segfaults for nbcurses.
+
+--- interface_elements.c.orig  2014-08-30 02:31:51.000000000 +0000
++++ interface_elements.c
+@@ -3622,13 +3622,6 @@ static void info_win_resize (struct info
+ 
+ void windows_init ()
+ {
+-      if (getenv ("ESCDELAY") == NULL) {
+-#ifdef HAVE_SET_ESCDELAY
+-              set_escdelay (25);
+-#else
+-              setenv ("ESCDELAY", "25", 0);
+-#endif
+-      }
+ 
+       utf8_init ();
+       if (!initscr ())
+@@ -3659,6 +3652,15 @@ void windows_init ()
+       wnoutrefresh (info_win.win);
+       doupdate ();
+ 
++      if (getenv ("ESCDELAY") == NULL) {
++#ifdef HAVE_SET_ESCDELAY
++              set_escdelay (25);
++#else
++              setenv ("ESCDELAY", "25", 0);
++#endif
++      }
++
++
+       iface_initialized = 1;
+ }
+