weechat: update to 2.1

Note that if the perl option is used, weechat segfaults at exit.
Not sure the wide-curses option does anything.
Remove conflicting patches that don't seem necessary.

Highlights:
Option to check license of scripts loaded
Completion for /set and /help commands

5 files changed, 10 insertions, 62 deletions

diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 194df2d4188..8a82d45fd2a 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2018/05/20 10:56:23 zafer Exp $
+# $NetBSD: Makefile,v 1.85 2018/05/25 10:16:03 maya Exp $
 
-DISTNAME=	weechat-2.0.1
-PKGREVISION=	2
+DISTNAME=	weechat-2.1
 CATEGORIES=	chat
 MASTER_SITES=	https://www.weechat.org/files/src/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/weechat/PLIST b/chat/weechat/PLIST
index 0522c3bb266..ce6f8b36242 100644
--- a/chat/weechat/PLIST
+++ b/chat/weechat/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.27 2018/01/20 17:20:15 tonio Exp $
+@comment $NetBSD: PLIST,v 1.28 2018/05/25 10:16:03 maya Exp $
 bin/weechat
+bin/weechat-curses
+bin/weechat-headless
 include/weechat/weechat-plugin.h
 lib/pkgconfig/weechat.pc
 lib/weechat/plugins/alias.so
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index 93070594365..cc4805de2a3 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.47 2018/01/20 17:20:15 tonio Exp $
+$NetBSD: distinfo,v 1.48 2018/05/25 10:16:03 maya Exp $
 
-SHA1 (weechat-2.0.1.tar.bz2) = 8eb0095af54270b4fee0c43ac4df7720984cf003
-RMD160 (weechat-2.0.1.tar.bz2) = f4131199b86944d310fc1c92e339fc7d034bb145
-SHA512 (weechat-2.0.1.tar.bz2) = a2ab2ccd05a8f020a036c67b8a979216be5442568b97b0503a88ec171502ba971deab62834926c894e76fc7a9c7bded0bfaae09ed63b8e722cd9af5b93fa4335
-Size (weechat-2.0.1.tar.bz2) = 2808212 bytes
+SHA1 (weechat-2.1.tar.bz2) = a537358336beef9391d668a6149bea1953c7b1d0
+RMD160 (weechat-2.1.tar.bz2) = 63c4e9f7ffb772ea81076454f0d653126750e987
+SHA512 (weechat-2.1.tar.bz2) = f49eb7d7a05edc8ada71a48e6dc190227daaec971d2386bee86fdd6151216a9e035bd2c682666f3a57582f8d63614bb92e69f3db5410c01cc5ff508483e6df1d
+Size (weechat-2.1.tar.bz2) = 2865960 bytes
 SHA1 (patch-CMakeLists.txt) = 493e49c0c698ff7b2685ba489d693fc1d388318d
-SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207
 SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e
-SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b
 SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
diff --git a/chat/weechat/patches/patch-ab b/chat/weechat/patches/patch-ab
deleted file mode 100644
index 9eb74e518dc..00000000000
--- a/chat/weechat/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2015/08/01 19:10:15 tonio Exp $
-
-Prefer ncursesw/curses.h over ncursesw/ncurses.h.
-
---- src/gui/curses/gui-curses.h.orig	2012-01-08 09:13:53.000000000 +0000
-+++ src/gui/curses/gui-curses.h
-@@ -23,6 +23,8 @@
- #include <time.h>
- 
- #ifdef HAVE_NCURSESW_CURSES_H
-+#include <ncursesw/curses.h>
-+#elif HAVE_NCURSESW_NCURSES_H
- #include <ncursesw/ncurses.h>
- #elif HAVE_NCURSES_H
- #include <ncurses.h>
diff --git a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
deleted file mode 100644
index faf6672c201..00000000000
--- a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.5 2015/08/01 19:10:15 tonio Exp $
-
-Test for ncursesw
-
---- src/gui/curses/CMakeLists.txt.orig	2015-05-10 07:24:50.000000000 +0000
-+++ src/gui/curses/CMakeLists.txt
-@@ -37,9 +37,11 @@ set(EXECUTABLE weechat)
- 
- find_package(Ncurses)
- if(NCURSES_FOUND)
-+  check_include_files(ncursesw/term.h HAVE_NCURSES_TERM_H)
-+  check_include_files(ncursesw/curses.h HAVE_NCURSESW_CURSES_H)
-   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
-   if(NCURSESW_HEADERS)
--    add_definitions(-DHAVE_NCURSESW_CURSES_H)
-+    add_definitions(-DHAVE_NCURSESW_NCURSES_H)
-   else()
-     check_include_files(ncurses.h NCURSES_HEADERS)
-     if(NCURSES_HEADERS)
-@@ -59,6 +61,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS"
-   list(APPEND EXTRA_LIBS "socket" "nsl")
- endif()
- 
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
-+  list(APPEND EXTRA_LIBS "curses")
-+endif()
-+
- list(APPEND EXTRA_LIBS "pthread")
- 
- if(ICONV_LIBRARY)
-@@ -103,4 +109,4 @@ list(APPEND CMAKE_INSTALL_MANIFEST_FILES
- 
- # Install executable and symbolic link
- install(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
-+