Updates chat/weechat to 1.0

New major features in this release:
- plugin "trigger": Swiss Army knife for WeeChat (replaces "rmodifier" plugin)
- plugin "exec": execute external commands (replaces script "shell.py")
- bare display: easy click on long URLs and text selection with mouse
- support of environment variables in /set command
- hidden buffers
- negated tags in filters
- toggle of filters in specific buffers
- flexible conditions for adding/removing buffers in hotlist
- text search in buffers with free content
- support of wildcard "*" inside masks
- support of nested variables in evaluated expressions
- tag with host in IRC messages displayed
- support of "away-notify" IRC capability
- IRC commands: /allpv, /remove, /unquiet
- bar items: buffer_short_name, irc_nick_modes

10 files changed, 48 insertions, 110 deletions

diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index f4f16f896e2..27de4263307 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2014/05/29 23:35:19 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2014/08/24 12:45:35 tonio Exp $
 
-DISTNAME=	weechat-0.4.3
-PKGREVISION=	2
+DISTNAME=	weechat-1.0
 CATEGORIES=	chat
 MASTER_SITES=	http://www.weechat.org/files/src/
 
diff --git a/chat/weechat/PLIST b/chat/weechat/PLIST
index 6205b7b97cb..82fbe046907 100644
--- a/chat/weechat/PLIST
+++ b/chat/weechat/PLIST
@@ -1,16 +1,17 @@
-@comment $NetBSD: PLIST,v 1.18 2014/02/24 23:06:12 tonio Exp $
+@comment $NetBSD: PLIST,v 1.19 2014/08/24 12:45:35 tonio Exp $
 bin/weechat
 bin/weechat-curses
 include/weechat/weechat-plugin.h
 lib/pkgconfig/weechat.pc
 lib/weechat/plugins/alias.so
 lib/weechat/plugins/charset.so
+lib/weechat/plugins/exec.so
 lib/weechat/plugins/fifo.so
 lib/weechat/plugins/irc.so
 lib/weechat/plugins/logger.so
 lib/weechat/plugins/relay.so
-lib/weechat/plugins/rmodifier.so
 lib/weechat/plugins/script.so
+lib/weechat/plugins/trigger.so
 lib/weechat/plugins/xfer.so
 man/de/man1/weechat.1
 man/fr/man1/weechat.1
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index d384ac329c8..2cfd88ea07e 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.29 2014/07/09 10:30:11 jperkin Exp $
+$NetBSD: distinfo,v 1.30 2014/08/24 12:45:35 tonio Exp $
 
-SHA1 (weechat-0.4.3.tar.bz2) = c9043ae4df8057c1410eeaf4c5c8818e97963e16
-RMD160 (weechat-0.4.3.tar.bz2) = b9625a977d36757a4b8dfa560946f1604ba5f68a
-Size (weechat-0.4.3.tar.bz2) = 2089701 bytes
+SHA1 (weechat-1.0.tar.bz2) = d3070ffde05cb706d615144e71f933153871894d
+RMD160 (weechat-1.0.tar.bz2) = d36e7144884a0779b8242ac5e35f4e3c6379af65
+Size (weechat-1.0.tar.bz2) = 2275868 bytes
 SHA1 (patch-ab) = d0fac0994602dfa0afde9fe14487f44f8cce25d6
-SHA1 (patch-po_CMakeLists.txt) = 6d3ded106fc94b1b0ea96dff938480667f9c2d7d
-SHA1 (patch-src_core_wee-command.c) = 539292be63410c1ceab0e58552c6cbccd0c65d5a
-SHA1 (patch-src_gui_curses_CMakeLists_txt) = 06f18d1efd21e9aeab6931e8d2018885e709c745
-SHA1 (patch-src_gui_curses_gui-curses-term_c) = ba9e6a8bbb17356fbd9421aba4f3225bb7d6b9da
+SHA1 (patch-po_CMakeLists.txt) = d6b1fad4ec4026f319f19fb581af93a196f6e78b
+SHA1 (patch-src_gui_curses_CMakeLists_txt) = 3844df73b69fecadf42855ecc394b2e4f4e49dfd
+SHA1 (patch-src_gui_curses_gui-curses-term_c) = d1a2d4f08c6df0007e2d6cb1771c889c7b2441c6
 SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
-SHA1 (patch-src_plugins_irc_irc-protocol.c) = 263a0cf3e77618d67bc521af1469585d21f2d3cf
-SHA1 (patch-src_plugins_logger_logger.c) = 36d465728191f61d0a7d76b888f437b056817922
-SHA1 (patch-src_plugins_script_script-repo.c) = c9eed9b991fa24c5fc41ae5596cb0b2cf3edbe62
diff --git a/chat/weechat/patches/patch-po_CMakeLists.txt b/chat/weechat/patches/patch-po_CMakeLists.txt
index 18183a12c06..1bab61a2dcf 100644
--- a/chat/weechat/patches/patch-po_CMakeLists.txt
+++ b/chat/weechat/patches/patch-po_CMakeLists.txt
@@ -1,9 +1,9 @@
-$NetBSD: patch-po_CMakeLists.txt,v 1.2 2014/02/24 23:06:12 tonio Exp $
+$NetBSD: patch-po_CMakeLists.txt,v 1.3 2014/08/24 12:45:35 tonio Exp $
 
---- po/CMakeLists.txt.orig	2014-02-09 08:52:53.000000000 +0000
+--- po/CMakeLists.txt.orig	2014-08-15 08:09:01.000000000 +0000
 +++ po/CMakeLists.txt
-@@ -56,7 +56,7 @@ IF(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC
-   ADD_CUSTOM_COMMAND(
+@@ -56,7 +56,7 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC
+   add_custom_command(
      OUTPUT ${POT_FILE_PATH}
      COMMAND ${XGETTEXT_EXECUTABLE}
 -    ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory=${CMAKE_SOURCE_DIR} --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
diff --git a/chat/weechat/patches/patch-src_core_wee-command.c b/chat/weechat/patches/patch-src_core_wee-command.c
deleted file mode 100644
index 142f5a9af79..00000000000
--- a/chat/weechat/patches/patch-src_core_wee-command.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_core_wee-command.c,v 1.1 2014/07/09 10:30:11 jperkin Exp $
-
-Don't define _XOPEN_SOURCE past 600 on SunOS.
-
---- src/core/wee-command.c.orig	2014-02-09 08:52:53.000000000 +0000
-+++ src/core/wee-command.c
-@@ -21,7 +21,7 @@
-  */
- 
- /* this define is needed for strptime() (not on OpenBSD) */
--#if !defined(__OpenBSD__)
-+#if !defined(__OpenBSD__) && !defined(__sun)
- #define _XOPEN_SOURCE 700
- #endif
- 
diff --git a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
index 897849e57a8..c59db9386e4 100644
--- a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
+++ b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
@@ -1,30 +1,30 @@
-$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.2 2013/08/30 16:56:56 joerg Exp $
+$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.3 2014/08/24 12:45:35 tonio Exp $
 
 Test for ncursesw
 
---- src/gui/curses/CMakeLists.txt.orig	2013-05-20 08:06:14.000000000 +0000
+--- src/gui/curses/CMakeLists.txt.orig	2014-08-15 08:09:01.000000000 +0000
 +++ src/gui/curses/CMakeLists.txt
-@@ -34,9 +34,11 @@ SET(EXECUTABLE weechat-curses)
+@@ -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(NCURSESW_HEADERS)
-     CHECK_INCLUDE_FILES(ncurses.h NCURSES_HEADERS)
-     IF(NCURSES_HEADERS)
-@@ -57,6 +59,10 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBS
-   LIST(APPEND EXTRA_LIBS "pthread")
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+ 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(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
++if(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
++  list(APPEND EXTRA_LIBS "curses")
++endif()
 +
- IF(ICONV_LIBRARY)
-   LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
- ENDIF(ICONV_LIBRARY)
+ list(APPEND EXTRA_LIBS "pthread")
+ 
+ if(ICONV_LIBRARY)
diff --git a/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c b/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c
index ce88f282cc7..78a9b3cd703 100644
--- a/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c
+++ b/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.3 2013/08/30 16:56:56 joerg Exp $
+$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.4 2014/08/24 12:45:35 tonio Exp $
 
 Include <ncurses/term.h>, not <ncursesw/term.h>.
 Check for HAVE_NCURSES_TERM_H, not for HAVE_NCURSES_CURSES_H.
@@ -6,25 +6,27 @@ Check for HAVE_NCURSES_TERM_H, not for HAVE_NCURSES_CURSES_H.
 Workaround for build failure on early NetBSD 6.99.* and prerelease 6.0
 (PR 46492)
 
---- src/gui/curses/gui-curses-term.c.orig	2013-05-20 08:06:14.000000000 +0000
+--- src/gui/curses/gui-curses-term.c.orig	2014-08-15 08:09:01.000000000 +0000
 +++ src/gui/curses/gui-curses-term.c
-@@ -23,9 +23,13 @@
+@@ -23,13 +23,13 @@
  #include "config.h"
  #endif
  
 -#ifdef HAVE_NCURSESW_CURSES_H
--#include <ncursesw/term.h>
+-#ifdef __sun
 +#ifdef HAVE_NCURSES_TERM_H
-+#include <ncurses/term.h>
+ #include <ncurses/term.h>
  #else
+-#include <ncursesw/term.h>
 +#ifdef __NetBSD__
 +/* workaround for build failure on early 6.99.* and prerelease 6.0 */
 +#include <sys/cdefs.h>
-+#endif
+ #endif
+-#else
  #include <term.h>
  #endif
  
-@@ -41,7 +45,7 @@
+@@ -45,7 +45,7 @@
  void
  gui_term_set_eat_newline_glitch (int value)
  {
diff --git a/chat/weechat/patches/patch-src_plugins_irc_irc-protocol.c b/chat/weechat/patches/patch-src_plugins_irc_irc-protocol.c
deleted file mode 100644
index 8d9d45624f2..00000000000
--- a/chat/weechat/patches/patch-src_plugins_irc_irc-protocol.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_irc_irc-protocol.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
-
-Don't define _XOPEN_SOURCE past 600 on SunOS.
-
---- src/plugins/irc/irc-protocol.c.orig	2013-05-20 08:06:14.000000000 +0000
-+++ src/plugins/irc/irc-protocol.c
-@@ -21,7 +21,7 @@
-  */
- 
- /* this define is needed for strptime() (not on OpenBSD) */
--#if !defined(__OpenBSD__)
-+#if !defined(__OpenBSD__) && !defined(__sun)
- #define _XOPEN_SOURCE 700
- #endif
- 
diff --git a/chat/weechat/patches/patch-src_plugins_logger_logger.c b/chat/weechat/patches/patch-src_plugins_logger_logger.c
deleted file mode 100644
index ecf1a074be2..00000000000
--- a/chat/weechat/patches/patch-src_plugins_logger_logger.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_logger_logger.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
-
-Don't define _XOPEN_SOURCE past 600 on SunOS.
-
---- src/plugins/logger/logger.c.orig	2013-05-20 08:06:14.000000000 +0000
-+++ src/plugins/logger/logger.c
-@@ -20,7 +20,7 @@
-  */
- 
- /* this define is needed for strptime() (not on OpenBSD) */
--#if !defined(__OpenBSD__)
-+#if !defined(__OpenBSD__) && !defined(__sun)
- #define _XOPEN_SOURCE 700
- #endif
- 
diff --git a/chat/weechat/patches/patch-src_plugins_script_script-repo.c b/chat/weechat/patches/patch-src_plugins_script_script-repo.c
deleted file mode 100644
index 14edb2e55eb..00000000000
--- a/chat/weechat/patches/patch-src_plugins_script_script-repo.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_script_script-repo.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
-
-Don't define _XOPEN_SOURCE past 600 on SunOS.
-
---- src/plugins/script/script-repo.c.orig	2013-05-20 08:06:14.000000000 +0000
-+++ src/plugins/script/script-repo.c
-@@ -23,7 +23,7 @@
-  * this define is needed for strptime()
-  * but is not used for OpenBSD, it causes bug with gcrypt (see bug #37373)
-  */
--#if !defined(__OpenBSD__)
-+#if !defined(__OpenBSD__) && !defined(__sun)
- #define _XOPEN_SOURCE 700
- #endif
-