Update chat/weechat to 0.4.1

Use cmake for build

Version 0.4.1 (May 20, 2013)
- multiple layouts support
- nick prefix/suffix are now dynamic (and managed by core instead of irc plugin)
- unmask irc join if nick speaks some minutes after the join
- new option irc.look.display_join_message to disable some messages after joining a channel
- new option irc.look.pv_buffer to automatically merge private buffers
- add support of UHNAMES
- add DH-AES encryption method for SASL
- multiple irc servers allowed on same port for irc protocol in relay plugin
- add WebSocket server support (RFC 6455) in relay plugin (for irc and weechat protocols)
- send nicklist difference in relay plugin (weechat protocol)
- add control of autoload for scripts
- optimizations in aspell plugin
- many bugs fixed.

Version 0.4.0 (Jan 20, 2013)
- add option "diff" for command /set, display default values in output of /set
- add color support in prefix options
- add command /eval, use expression in conditions for bars
- connect by default with IPv6 to servers with fallback to IPv4
- add aspell suggestions
- add support of tags in irc messages and "server-time" capability
- add irc command /quiet
- add support of IPv6 in relay plugin
- add backlog for irc protocol in relay plugin
- display remote IP address for DCC chat/file in xfer plugin
- add git version in build
- many bugs fixed.

9 files changed, 60 insertions, 102 deletions

diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 09dcca6427f..2d7696c931f 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2013/05/31 12:39:42 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2013/06/09 21:19:02 tonio Exp $
 
-DISTNAME=	weechat-0.3.9.2
-PKGREVISION=	3
+DISTNAME=	weechat-0.4.1
 CATEGORIES=	chat
 MASTER_SITES=	http://www.weechat.org/files/src/
 
@@ -16,12 +15,14 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt pkg-config
 USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-tcl --disable-guile --disable-aspell
-MAKE_ENV+=		INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
-MAKE_ENV+=		PREFIX=${DESTDIR:Q}${PREFIX:Q}
+USE_CMAKE=		yes
 LIBS.SunOS+=		-lnsl
 
+CMAKE_ARGS+=		-DENABLE_ASPELL:BOOL=OFF
+CMAKE_ARGS+=		-DENABLE_GUILE:BOOL=OFF
+CMAKE_ARGS+=		-DENABLE_TCL:BOOL=OFF
+CMAKE_ARGS+=		-DMANDIR:STRING=${PKGMANDIR}
+
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/chat/weechat/PLIST b/chat/weechat/PLIST
index d4c0d48d090..ac2ee0994ae 100644
--- a/chat/weechat/PLIST
+++ b/chat/weechat/PLIST
@@ -1,21 +1,23 @@
-@comment $NetBSD: PLIST,v 1.16 2012/11/24 11:16:06 tonio Exp $
+@comment $NetBSD: PLIST,v 1.17 2013/06/09 21:19:02 tonio Exp $
 bin/weechat-curses
 include/weechat/weechat-plugin.h
 lib/pkgconfig/weechat.pc
-${PLIST.lua}lib/weechat/plugins/lua.la
-${PLIST.perl}lib/weechat/plugins/perl.la
-${PLIST.python}lib/weechat/plugins/python.la
-${PLIST.ruby}lib/weechat/plugins/ruby.la
-${PLIST.charset}lib/weechat/plugins/charset.la
-lib/weechat/plugins/alias.la
-lib/weechat/plugins/charset.la
-lib/weechat/plugins/fifo.la
-lib/weechat/plugins/irc.la
-lib/weechat/plugins/logger.la
-lib/weechat/plugins/relay.la
-lib/weechat/plugins/rmodifier.la
-lib/weechat/plugins/script.la
-lib/weechat/plugins/xfer.la
+${PLIST.lua}lib/weechat/plugins/lua.so
+${PLIST.perl}lib/weechat/plugins/perl.so
+${PLIST.python}lib/weechat/plugins/python.so
+${PLIST.ruby}lib/weechat/plugins/ruby.so
+${PLIST.charset}lib/weechat/plugins/charset.so
+lib/weechat/plugins/alias.so
+lib/weechat/plugins/charset.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/xfer.so
+man/man1/weechat-curses.1
+share/icons/hicolor/32x32/apps/weechat.png
 share/locale/cs/LC_MESSAGES/weechat.mo
 share/locale/de/LC_MESSAGES/weechat.mo
 share/locale/es/LC_MESSAGES/weechat.mo
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index b46454985e9..df93aca3804 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.24 2013/05/11 18:31:11 riastradh Exp $
+$NetBSD: distinfo,v 1.25 2013/06/09 21:19:02 tonio Exp $
 
-SHA1 (weechat-0.3.9.2.tar.bz2) = 64147c88426c240d5d33c65755c729ed2c435aeb
-RMD160 (weechat-0.3.9.2.tar.bz2) = 9117e1d88b6e105cf3d5de189cdb7575f18ab980
-Size (weechat-0.3.9.2.tar.bz2) = 2721004 bytes
-SHA1 (patch-aa) = 86a3cfd780fb52d8dea92d5f9d72bb3ac2df91bf
+SHA1 (weechat-0.4.1.tar.bz2) = a5185d6b8a2b330713ea354f06601a205270e3a2
+RMD160 (weechat-0.4.1.tar.bz2) = 07cf6554b0238a2dd41da94483d62573789fe97b
+Size (weechat-0.4.1.tar.bz2) = 1772500 bytes
 SHA1 (patch-ab) = d0fac0994602dfa0afde9fe14487f44f8cce25d6
-SHA1 (patch-ac) = e9fa664f040bd6549ddd8e860ec4568931bcab6b
-SHA1 (patch-configure) = e7d8c886fd55f633ffd4a3419a445c031b561d2b
-SHA1 (patch-configure.in) = 9d341fe4d046333a5e5aafe48c2edf8f26448a8d
+SHA1 (patch-src_gui_curses_CMakeLists_txt) = 7233fd400c38e0ae65c1664f38a3534734141630
 SHA1 (patch-src_gui_curses_gui-curses-term_c) = db7a4223e728d9f30491eada9d1c41881ea2e066
-SHA1 (patch-src_plugins_script_script_repo_h) = 041b5e284a3b4cd6998c7e93e3f24f8ccb04980a
diff --git a/chat/weechat/options.mk b/chat/weechat/options.mk
index 8c6c449b565..8b6b1ae9575 100644
--- a/chat/weechat/options.mk
+++ b/chat/weechat/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2012/06/13 11:33:30 abs Exp $
+# $NetBSD: options.mk,v 1.10 2013/06/09 21:19:02 tonio Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.weechat
 PKG_SUPPORTED_OPTIONS=	charset gnutls python lua wide-curses perl ruby
@@ -9,10 +9,10 @@ PKG_SUGGESTED_OPTIONS=	charset gnutls
 PLIST_VARS+=		charset lua plugin python perl ruby
 
 .if !empty(PKG_OPTIONS:Mcharset)
-CONFIGURE_ARGS+=	--enable-charset
+CMAKE_ARGS+=		-DENABLE_CHARSET:BOOL=ON
 PLIST.charset=		yes
 .else
-CONFIGURE_ARGS+=	--disable-charset
+CMAKE_ARGS+=		-DENABLE_CHARSET:BOOL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnutls)
@@ -27,36 +27,36 @@ CONFIGURE_ARGS+=	--disable-charset
 
 .if !empty(PKG_OPTIONS:Mpython)
 .include "../../lang/python/extension.mk"
-CONFIGURE_ARGS+=	--enable-python
+CMAKE_ARGS+=		-DENABLE_PYTHON:BOOL=ON
 PLIST.python=		yes
 .else
-CONFIGURE_ARGS+=	--disable-python
+CMAKE_ARGS+=		-DENABLE_PYTHON:BOOL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
 .include "../../lang/lua/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-lua
+CMAKE_ARGS+=		-DENABLE_LUA:BOOL=ON
 PLIST.lua=		yes
 .else
-CONFIGURE_ARGS+=	--disable-lua
+CMAKE_ARGS+=		-DENABLE_LUA:BOOL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mperl)
 .include "../../lang/perl5/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-perl
+CMAKE_ARGS+=		-DENABLE_PERL:BOOL=ON
 USE_TOOLS+=		perl
 PLIST.perl=		yes
 .else
-CONFIGURE_ARGS+=	--disable-perl
+CMAKE_ARGS+=		-DENABLE_PERL:BOOL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mruby)
 .include "../../lang/ruby/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-ruby
+CMAKE_ARGS+=		-DENABLE_RUBY:BOOL=ON
 USE_TOOLS+=		ruby
 PLIST.ruby=		yes
 .else
-CONFIGURE_ARGS+=	--disable-ruby
+CMAKE_ARGS+=		-DENABLE_RUBY:BOOL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mpython) || \
diff --git a/chat/weechat/patches/patch-aa b/chat/weechat/patches/patch-aa
deleted file mode 100644
index 3efb2a24534..00000000000
--- a/chat/weechat/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2012/05/28 22:55:05 tonio Exp $
-
---- po/Makefile.in.in.orig	2011-10-10 15:42:58.000000000 +0000
-+++ po/Makefile.in.in
-@@ -30,7 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--mkinstalldirs = $(SHELL) @install_sh@ -d
-+mkinstalldirs = $(INSTALL_DATA_DIR)
- mkdir_p = @mkdir_p@
- 
- GMSGFMT_ = @GMSGFMT@
diff --git a/chat/weechat/patches/patch-ac b/chat/weechat/patches/patch-ac
deleted file mode 100644
index 31db21129f0..00000000000
--- a/chat/weechat/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2012/05/28 22:55:05 tonio Exp $
-
-Make sure to honor destdir
-
---- src/plugins/Makefile.in.orig	2012-02-26 07:12:48.000000000 +0000
-+++ src/plugins/Makefile.in
-@@ -778,8 +778,8 @@ uninstall-am:
- # install plugin header
- 
- install-data-hook:
--	$(INSTALL) -d $(includedir)/$(PACKAGE)
--	$(INSTALL_DATA) $(abs_top_srcdir)/src/plugins/weechat-plugin.h $(includedir)/$(PACKAGE)
-+	$(INSTALL_DATA_DIR) -d ${DESTDIR}$(includedir)/$(PACKAGE)
-+	$(INSTALL_DATA) $(abs_top_srcdir)/src/plugins/weechat-plugin.h ${DESTDIR}$(includedir)/$(PACKAGE)
- 
- # uninstall plugin header
- 
diff --git a/chat/weechat/patches/patch-configure b/chat/weechat/patches/patch-configure
deleted file mode 100644
index 62a8663da67..00000000000
--- a/chat/weechat/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/05/11 18:31:11 riastradh Exp $
-
-Check for <ncurses/term.h>.
-
---- configure.orig	2013-01-19 17:37:48.000000000 +0000
-+++ configure
-@@ -17137,7 +17137,7 @@ $as_echo "$as_me: WARNING:
-     else
-         NCURSES_LFLAGS="-lncursesw"
-     fi
--    for ac_header in ncurses.h ncursesw/curses.h
-+    for ac_header in ncurses.h ncurses/term.h ncursesw/curses.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/chat/weechat/patches/patch-configure.in b/chat/weechat/patches/patch-configure.in
deleted file mode 100644
index 4b435d3ae8f..00000000000
--- a/chat/weechat/patches/patch-configure.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2013/05/11 18:31:11 riastradh Exp $
-
-Check for <ncurses/term.h>.
-
---- configure.in.orig	2012-11-18 09:50:21.000000000 +0000
-+++ configure.in
-@@ -200,7 +200,7 @@ if test "x$enable_ncurses" = "xyes" ; th
-     else
-         NCURSES_LFLAGS="-lncursesw"
-     fi
--    AC_CHECK_HEADERS([ncurses.h ncursesw/curses.h])
-+    AC_CHECK_HEADERS([ncurses.h ncurses/term.h ncursesw/curses.h])
-     AC_SUBST(NCURSES_LFLAGS)
- else
-     not_asked="$not_asked ncurses"
diff --git a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
new file mode 100644
index 00000000000..79ce18aa432
--- /dev/null
+++ b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.1 2013/06/09 21:19:02 tonio Exp $
+
+Test for ncursesw
+
+--- src/gui/curses/CMakeLists.txt.orig	2013-06-09 20:57:43.000000000 +0000
++++ src/gui/curses/CMakeLists.txt
+@@ -34,9 +34,11 @@ SET(EXECUTABLE weechat-curses)
+ 
+ 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)