weechat: update to 2.6

== Version 2.6 (2019-09-08)

New features::

  * core: add support of 32767 color pairs (issue #1343, issue #1345)
  * core: add option "close" in command /window (issue #853)
  * api: add infos "term_colors" and "term_color_pairs"
  * api: add function list_user_data (issue #666)
  * api: add argument "strip_items" in function string_split
  * buflist: add infolist "buflist" with list of buffer pointers (issue #1375)
  * exec: evaluate option exec.command.shell, change default value to "${env:SHELL}" (issue #1356)
  * fset: add filters "h=xxx" and "he=xxx" to filter options by description (translated or in English)
  * irc: make command char optional in server option "command" (issue #615)
  * irc: add variables "user_max_length" and "host_max_length" in server structure (issue #1387)

Bug fixes::

  * core: use fixed-width integer for computing nick and hashtable DJB2 key hashes, add values "djb2_32" and "sum_32" for option weechat.look.nick_color_hash (issue #1394)
  * core: create or update option weechat.notify.xxx when function buffer_set is called with "notify" property (issue #1390)
  * core: fix memory leak in case of error when building content of bar item for display (issue #1384)
  * core: send command line parameter to plugins only if the name starts with the plugin name followed by a colon
  * core: auto disable upgrade process (command line option "--upgrade") if the file weechat.upgrade is not found
  * core: replace newlines by spaces in argument "completion" of function hook_command (issue #538)
  * core: replace char "," by "~" in color codes to separate foreground from background (issue #1264)
  * alias: remove default aliases /AME and /AMSG (issue #1355)
  * buflist: use extra variables in option buflist.look.display_conditions (issue #1393)
  * irc: fix parsing of messages 346 (invite list), 348 (exception list), 367 (ban list) and 728 (quiet list) when there is a colon before the timestamp (issue #1396)
  * irc: fix memory leak when removing a server
  * irc: fix length of user/nick/host in split of messages (issue #1387)
  * irc: quote NICK command argument sent to the server only if there's a ":" in the nick (issue #1376, issue #1319)
  * irc: return all arguments in the PONG response to a PING (issue #1369)
  * irc: disable server reconnection when the server buffer is closed (issue #236)
  * irc: strip spaces at beginning/end of addresses in server option "addresses" (issue #195)
  * irc: fix display of enabled/disabled client capabilities received in command CAP ACK (issue #151)
  * ruby: fix conversion of big integers on 32bit architecture (issue #1395)

Tests::

  * unit: add tests on IRC ignore, message and nick functions

Build::

  * core: fix compilation with autotools on FreeBSD 12.0
  * debian: disable Javascript plugin on Debian Buster/Bullseye (issue #1374)
  * python: compile with Python 3 by default
  * python: use pkg-config to detect Python (issue #1382)

chat/weechat/Makefile

@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.102 2019/08/22 12:22:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.103 2019/09/17 11:30:27 nia Exp $
 
-DISTNAME=	weechat-2.5
-PKGREVISION=	6
+DISTNAME=	weechat-2.6
 CATEGORIES=	chat
 MASTER_SITES=	https://www.weechat.org/files/src/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	https://www.weechat.org/
@@ -13,35 +12,36 @@ LICENSE=	gnu-gpl-v3
 
 BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		msgfmt pkg-config
-USE_LANGUAGES=		c99
-USE_LIBTOOL=		yes
-USE_CMAKE=		yes
-FAKE_NCURSES=		yes
-
-CMAKE_ARGS+=		-DCA_FILE:STRING=${PREFIX}/share/mozilla-rootcerts/cacert.pem
-CMAKE_ARGS+=		-DENABLE_GUILE:BOOL=OFF
-CMAKE_ARGS+=		-DENABLE_TCL:BOOL=OFF
-CMAKE_ARGS+=		-DENABLE_MAN:BOOL=OFF # Requires ascii-doctor
-CMAKE_ARGS+=		-DENABLE_JAVASCRIPT:BOOL=OFF
-CMAKE_ARGS+=		-DENABLE_PHP:BOOL=OFF
-CMAKE_ARGS+=		-DENABLE_SPELL:BOOL=OFF
-CMAKE_ARGS+=		-DMANDIR:STRING=${PKGMANDIR}
-CMAKE_ARGS+=		-DLOCALEDIR:STRING=${PKGLOCALEDIR}/locale
-CMAKE_ARGS+=		-DENABLE_CHARSET:BOOL=ON
+USE_TOOLS+=	msgfmt pkg-config
+USE_LANGUAGES=	c99
+USE_LIBTOOL=	yes
+USE_CMAKE=	yes
+FAKE_NCURSES=	yes
+
+CMAKE_ARGS+=	-DCA_FILE=${PREFIX}/share/mozilla-rootcerts/cacert.pem
+CMAKE_ARGS+=	-DENABLE_GUILE=OFF
+CMAKE_ARGS+=	-DENABLE_TCL=OFF
+CMAKE_ARGS+=	-DENABLE_MAN=OFF # Requires ascii-doctor
+CMAKE_ARGS+=	-DENABLE_JAVASCRIPT=OFF
+CMAKE_ARGS+=	-DENABLE_PHP=OFF
+CMAKE_ARGS+=	-DENABLE_SPELL=OFF
+CMAKE_ARGS+=	-DLOCALEDIR=${PKGLOCALEDIR}/locale
+CMAKE_ARGS+=	-DENABLE_CHARSET=ON
 
 LDFLAGS+=		${BUILDLINK_LDADD.gettext}
 LDFLAGS.Darwin+=	-lresolv
 LDFLAGS.SunOS+=		-lresolv
 
 BUILDLINK_TRANSFORM+=	rm:-Werror-implicit-function-declaration
 
-.include "options.mk"
+# use standard cmake mechanisms for detecting python
+# works better with pkgsrc.
+pre-configure:
+	${RM} -f ${WRKSRC}/cmake/FindPython.cmake
 
+.include "options.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-#.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"

chat/weechat/distinfo

@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.56 2019/07/31 10:33:08 nia Exp $
+$NetBSD: distinfo,v 1.57 2019/09/17 11:30:27 nia Exp $
 
-SHA1 (weechat-2.5.tar.bz2) = 86f4263645266060d1a2d80cc4ab4f3cd99b2f45
-RMD160 (weechat-2.5.tar.bz2) = d71265cdfb4df485f8fa7902a459c76168c95870
-SHA512 (weechat-2.5.tar.bz2) = 1bd11a695c11a44ff8a0e8f9ae61ca3b8b182ec84b472da9924a52526cd5d1c0360c0851aeb16d6e8906390f73440178b0729471ee892600ed7a40a748fa5400
-Size (weechat-2.5.tar.bz2) = 2968058 bytes
+SHA1 (weechat-2.6.tar.xz) = 8796cdd3216aeb1c8adda536ed6549008f4b459c
+RMD160 (weechat-2.6.tar.xz) = 627ca56162a62051f012c311639de59cbe723217
+SHA512 (weechat-2.6.tar.xz) = cf56692e12b2e034675d4c15a8822836b2fcf93d584948e338d263f5a7207edf4599cc72bfb940427146f5f75e7239207cf54f5ed07dd5b6119f68c445725a2d
+Size (weechat-2.6.tar.xz) = 2080092 bytes
 SHA1 (patch-CMakeLists.txt) = 493e49c0c698ff7b2685ba489d693fc1d388318d
-SHA1 (patch-cmake_FindNcurses.cmake) = 0262cc58469e53c26dcc17ac862de12118fadc44
+SHA1 (patch-cmake_FindNcurses.cmake) = 93969b86538f1b707903dce4691af99a67ede6ce
 SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e
 SHA1 (patch-src_core_weechat.c) = 062cd7443a756edbdf60289a7847b4278d520105
 SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4

chat/weechat/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2019/07/09 16:23:04 nia Exp $
+# $NetBSD: options.mk,v 1.19 2019/09/17 11:30:27 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.weechat
 PKG_SUPPORTED_OPTIONS=	gnutls python lua wide-curses perl ruby
@@ -14,39 +14,39 @@ PLIST_VARS+=		lua plugin python perl ruby
 .endif
 
 .if !empty(PKG_OPTIONS:Mpython)
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 .include "../../lang/python/extension.mk"
-CMAKE_ARGS+=		-DENABLE_PYTHON:BOOL=ON
-CMAKE_ARGS.Darwin+=	-DPYTHON_LIBRARY:FILEPATH=${PREFIX}/lib/libpython${PYVERSSUFFIX}.dylib
-CMAKE_ARGS.*+=		-DPYTHON_LIBRARY:FILEPATH=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so
-PLIST.python=		yes
+CMAKE_ARGS+=	-DENABLE_PYTHON=ON
+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHONBIN}
+PLIST.python=	yes
 .else
-CMAKE_ARGS+=		-DENABLE_PYTHON:BOOL=OFF
+CMAKE_ARGS+=	-DENABLE_PYTHON=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
 LUA_VERSIONS_INCOMPATIBLE=	52
 .include "../../lang/lua/buildlink3.mk"
-CMAKE_ARGS+=		-DENABLE_LUA:BOOL=ON
-PLIST.lua=		yes
+CMAKE_ARGS+=	-DENABLE_LUA=ON
+PLIST.lua=	yes
 .else
-CMAKE_ARGS+=		-DENABLE_LUA:BOOL=OFF
+CMAKE_ARGS+=	-DENABLE_LUA=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mperl)
 .include "../../lang/perl5/buildlink3.mk"
-CMAKE_ARGS+=		-DENABLE_PERL:BOOL=ON
-USE_TOOLS+=		perl
-PLIST.perl=		yes
+CMAKE_ARGS+=	-DENABLE_PERL=ON
+USE_TOOLS+=	perl
+PLIST.perl=	yes
 .else
-CMAKE_ARGS+=		-DENABLE_PERL:BOOL=OFF
+CMAKE_ARGS+=	-DENABLE_PERL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mruby)
 .include "../../lang/ruby/buildlink3.mk"
-CMAKE_ARGS+=		-DENABLE_RUBY:BOOL=ON
-CMAKE_ARGS+=		-DRUBY_INCLUDE_DIRS:PATH=${PREFIX}/${RUBY_INC}
-CMAKE_ARGS+=		-DRUBY_LIB:FILEPATH=${PREFIX}/lib/libruby${RUBY_SHLIB}
-PLIST.ruby=		yes
+CMAKE_ARGS+=	-DENABLE_RUBY=ON
+CMAKE_ARGS+=	-DRUBY_INCLUDE_DIRS=${PREFIX}/${RUBY_INC}
+CMAKE_ARGS+=	-DRUBY_LIB=${PREFIX}/lib/libruby${RUBY_SHLIB}
+PLIST.ruby=	yes
 #BUILDLINK_INCDIRS.${RUBY_BASE}+=	${RUBY_INC}
 #BUILDLINK_INCDIRS.${RUBY_BASE}+=	${RUBY_ARCHINC}
 .else

chat/weechat/patches/patch-cmake_FindNcurses.cmake

@@ -1,19 +1,19 @@
-$NetBSD: patch-cmake_FindNcurses.cmake,v 1.3 2019/03/23 14:54:13 nia Exp $
+$NetBSD: patch-cmake_FindNcurses.cmake,v 1.4 2019/09/17 11:30:27 nia Exp $
 
 Don't try to look for ncurses.h, so FAKE_NCURSES works for netbsd curses.
 
---- cmake/FindNcurses.cmake.orig	2019-02-17 07:20:07.000000000 +0000
+--- cmake/FindNcurses.cmake.orig	2019-09-08 06:13:58.000000000 +0000
 +++ cmake/FindNcurses.cmake
 @@ -22,7 +22,7 @@ if(NCURSES_FOUND)
  endif()
 
  find_path(NCURSES_INCLUDE_PATH
 -  NAMES ncurses.h curses.h
-+  NAMES curses.h
-   PATHS /usr/include/ncursesw /usr/include/ncurses /usr/include
-   /usr/local/include/ncursesw /usr/local/include/ncurses /usr/local/include
-   /usr/pkg/include/ncursesw /usr/pkg/include/ncurses /usr/pkg/include
-@@ -42,7 +42,7 @@ if(NCURSESW_LIBRARY)
++  NAMES curses.h ncurses.h
+   PATH_SUFFIXES ncursesw ncurses
+   PATHS /usr/include /usr/local/include /usr/pkg/include
+ )
+@@ -41,7 +41,7 @@ if(NCURSESW_LIBRARY)
    set(NCURSES_LIBRARY ${NCURSESW_LIBRARY})
  else()
    find_library(NCURSES_LIBRARY