From 47fca6f14e05e25838db26ae9c0d636b056560f3 Mon Sep 17 00:00:00 2001 From: maya Date: Thu, 16 Feb 2017 13:31:44 +0000 Subject: Remove patch for netbsd curses differences, it was adjusted to change behaviour to match ncurses, and the functions only exist for netbsd-current bump pkgrevision --- audio/moc/Makefile | 4 +-- audio/moc/distinfo | 3 +-- audio/moc/patches/patch-interface__elements.c | 37 --------------------------- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 audio/moc/patches/patch-interface__elements.c diff --git a/audio/moc/Makefile b/audio/moc/Makefile index 2a46b6dba60..fdd1844ce7e 100644 --- a/audio/moc/Makefile +++ b/audio/moc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2017/01/30 04:19:22 maya Exp $ +# $NetBSD: Makefile,v 1.32 2017/02/16 13:31:44 maya Exp $ DISTNAME= moc-2.5.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= audio MASTER_SITES= http://ftp.daper.net/pub/soft/moc/stable/ EXTRACT_SUFX= .tar.bz2 diff --git a/audio/moc/distinfo b/audio/moc/distinfo index 0043302b9a9..38bf44f0f6d 100644 --- a/audio/moc/distinfo +++ b/audio/moc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2017/01/30 04:19:22 maya Exp $ +$NetBSD: distinfo,v 1.13 2017/02/16 13:31:44 maya Exp $ SHA1 (moc-2.5.0.tar.bz2) = a02c10075541995771dbdccb7f2d0ecd19d70b81 RMD160 (moc-2.5.0.tar.bz2) = 0c5d927b7c8ef54338ff6970f9e5d4f71dcb6168 @@ -7,5 +7,4 @@ Size (moc-2.5.0.tar.bz2) = 594532 bytes 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 --git a/audio/moc/patches/patch-interface__elements.c b/audio/moc/patches/patch-interface__elements.c deleted file mode 100644 index 99b5b0c582e..00000000000 --- a/audio/moc/patches/patch-interface__elements.c +++ /dev/null @@ -1,37 +0,0 @@ -$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; - } - -- cgit v1.2.3