Mon Oct 18 11:15:09 2021 UTC ()
weechat: update to 3.3

pkgsrc changes:
- re-enable man page generation
- remove patch that upstream fixed in a different way

== Version 3.3 (2021-09-19)

New features::

  * core: change key kbd:[Alt+h] to kbd:[Alt+h], kbd:[Alt+c] (clear hotlist)
  * core: add options "hotlist_remove_buffer", "hotlist_restore_buffer" and "hotlist_restore_all" in command /input, add default keys kbd:[Alt+h], kbd:[Alt+m] (remove buffer), kbd:[Alt+h], kbd:[Alt+r] (restore hotlist in current buffer) and kbd:[Alt+h], kbd:[Alt+Shift+R] (restore hotlist in all buffers)
  * core: add option "certs" in command /debug
  * core: add options "-o", "-ol", "-i" and "-il" in command "/plugin list"
  * api: add split of string and shell arguments in evaluation of expressions with "split:number,seps,flags,xxx" and "split_shell:number,xxx"
  * api: add `${re:repl_index}` to get the index of replacement in function string_eval_expression (issue #1689)
  * api: add random integer number in evaluation of expressions with "random:min,max"
  * api: add function string_cut
  * api: add function file_copy (issue #1667)
  * api: remember insertion order in hashtables
  * api: add keys/values with tags in output of irc_message_parse_to_hashtable (issue #1654)
  * irc: add option "-parted" in command /allchan (issue #1685)
  * irc: allow signals "irc_raw_in" and "irc_in" to eat messages (issue #1657)
  * irc: implement IRCv3.2 SASL authentication, add command /auth, reconnect by default to the server in case of SASL authentication failure (issue #413)
  * irc: add support of capability "message-tags" and TAGMSG messages (issue #1654)
  * irc: enable all capabilities by default (if supported by server and WeeChat), change default value of option irc.server_default.capabilities to "*" (issue #320)
  * irc: add options irc.look.display_account_message and irc.look.display_extended_join (issue #320)
  * irc: add command /setname, add support of message and capability "setname" (issue #1653)
  * irc: always set realname in nicks even when extended-join capability is not enabled (issue #1653)
  * irc: add support of FAIL/WARN/NOTE messages (issue #1653)
  * irc: drop support of DH-BLOWFISH and DH-AES SASL mechanisms (issue #175)
  * typing: new plugin "typing": display users currently writing messages on IRC channel/private buffers

Bug fixes::

  * core: fix decoding of attributes in basic ANSI colors (issue #1678)
  * api: fix function string_match with joker in the string if multiple words matched in input string
  * irc: fix send of empty JOIN when connecting to a server with only parted channels (issue #1638)
  * irc: fix SASL authentication when AUTHENTICATE message is received with a server name (issue #1679)
  * irc: remove unneeded message about Diffie-Hellman shared secret exchange during SSL connection to server (issue #857)
  * irc: escape/unescape IRC message tags values (issue #1654)
  * irc: set notify level to "private" for received WALLOPS
  * script: fix move of installed script on another filesystem (issue #1667)

Documentation::

  * add Spanish FAQ (issue #1656)
  * add Serbian translations (issue #1655)

Tests::

  * core: switch to PHP 8.0 in CI
  * core: add build on macOS in CI

Build::

  * core: fix build on macOS (issue #1662)
  * lua: add detection of Lua 5.4
  * php: add support of PHP 8.0 and 8.1 (issue #1599, issue #1668)


(nia)
diff -r1.127 -r1.128 pkgsrc/chat/weechat/Makefile
diff -r1.29 -r1.30 pkgsrc/chat/weechat/PLIST
diff -r1.69 -r1.70 pkgsrc/chat/weechat/distinfo
diff -r1.27 -r1.28 pkgsrc/chat/weechat/options.mk
diff -r1.2 -r0 pkgsrc/chat/weechat/patches/patch-src_core_weechat.c

cvs diff -r1.127 -r1.128 pkgsrc/chat/weechat/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/weechat/Makefile 2021/09/29 19:00:24 1.127
+++ pkgsrc/chat/weechat/Makefile 2021/10/18 11:15:09 1.128
@@ -1,42 +1,46 @@ @@ -1,42 +1,46 @@
1# $NetBSD: Makefile,v 1.127 2021/09/29 19:00:24 adam Exp $ 1# $NetBSD: Makefile,v 1.128 2021/10/18 11:15:09 nia Exp $
2 2
3DISTNAME= weechat-3.2.1 3DISTNAME= weechat-3.3
4PKGREVISION= 1 
5CATEGORIES= chat 4CATEGORIES= chat
6MASTER_SITES= https://www.weechat.org/files/src/ 5MASTER_SITES= https://www.weechat.org/files/src/
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= tonio@NetBSD.org 8MAINTAINER= tonio@NetBSD.org
10HOMEPAGE= https://www.weechat.org/ 9HOMEPAGE= https://www.weechat.org/
11COMMENT= Lightweight and user friendly curses based IRC client 10COMMENT= Lightweight and user friendly curses based IRC client
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc 13.include "../../lang/ruby/rubyversion.mk"
 14
 15TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
15 16
16USE_TOOLS+= msgfmt pkg-config 17USE_TOOLS+= msgfmt pkg-config
17USE_LANGUAGES= c99 18USE_LANGUAGES= c99
18USE_CMAKE= yes 19USE_CMAKE= yes
19FAKE_NCURSES= yes 20FAKE_NCURSES= yes
20 21
 22CMAKE_ARGS+= -DASCIIDOCTOR_FOUND=ON
 23CMAKE_ARGS+= -DASCIIDOCTOR_EXECUTABLE=${PREFIX}/bin/asciidoctor${RUBY_VER}
21CMAKE_ARGS+= -DCA_FILE=${PREFIX}/share/mozilla-rootcerts/cacert.pem 24CMAKE_ARGS+= -DCA_FILE=${PREFIX}/share/mozilla-rootcerts/cacert.pem
22CMAKE_ARGS+= -DENABLE_GUILE=OFF 25CMAKE_ARGS+= -DENABLE_GUILE=OFF
23CMAKE_ARGS+= -DENABLE_TCL=OFF 26CMAKE_ARGS+= -DENABLE_TCL=OFF
24CMAKE_ARGS+= -DENABLE_MAN=OFF # Requires ascii-doctor 
25CMAKE_ARGS+= -DENABLE_JAVASCRIPT=OFF 27CMAKE_ARGS+= -DENABLE_JAVASCRIPT=OFF
26CMAKE_ARGS+= -DENABLE_PHP=OFF 28CMAKE_ARGS+= -DENABLE_PHP=OFF
27CMAKE_ARGS+= -DENABLE_SPELL=OFF 29CMAKE_ARGS+= -DENABLE_SPELL=OFF
28CMAKE_ARGS+= -DLOCALEDIR=${PKGLOCALEDIR}/locale 
29CMAKE_ARGS+= -DENABLE_CHARSET=ON 30CMAKE_ARGS+= -DENABLE_CHARSET=ON
 31CMAKE_ARGS+= -DENABLE_MAN=ON
 32CMAKE_ARGS+= -DLOCALEDIR=${PKGLOCALEDIR}/locale
 33CMAKE_ARGS+= -DMANDIR=${PREFIX}/${PKGMANDIR}
30 34
31USE_PKGLOCALEDIR= yes 35USE_PKGLOCALEDIR= yes
32 36
33LDFLAGS+= ${BUILDLINK_LDADD.gettext} 37LDFLAGS+= ${BUILDLINK_LDADD.gettext}
34LDFLAGS.Darwin+= -lresolv 38LDFLAGS.Darwin+= -lresolv
35LDFLAGS.SunOS+= -lresolv 39LDFLAGS.SunOS+= -lresolv
36 40
37BUILDLINK_TRANSFORM+= rm:-Werror-implicit-function-declaration 41BUILDLINK_TRANSFORM+= rm:-Werror-implicit-function-declaration
38 42
39.include "options.mk" 43.include "options.mk"
40 44
41.if !empty(PKG_OPTIONS:Mpython) 45.if !empty(PKG_OPTIONS:Mpython)
42SUBST_CLASSES+= python 46SUBST_CLASSES+= python

cvs diff -r1.29 -r1.30 pkgsrc/chat/weechat/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/weechat/PLIST 2019/12/10 13:04:05 1.29
+++ pkgsrc/chat/weechat/PLIST 2021/10/18 11:15:09 1.30
@@ -1,41 +1,61 @@ @@ -1,41 +1,61 @@
1@comment $NetBSD: PLIST,v 1.29 2019/12/10 13:04:05 nia Exp $ 1@comment $NetBSD: PLIST,v 1.30 2021/10/18 11:15:09 nia Exp $
2bin/weechat 2bin/weechat
3bin/weechat-curses 3bin/weechat-curses
4bin/weechat-headless 4bin/weechat-headless
5include/weechat/weechat-plugin.h 5include/weechat/weechat-plugin.h
6lib/pkgconfig/weechat.pc 6lib/pkgconfig/weechat.pc
7lib/weechat/plugins/alias.so 7lib/weechat/plugins/alias.so
8lib/weechat/plugins/buflist.so 8lib/weechat/plugins/buflist.so
9lib/weechat/plugins/charset.so 9lib/weechat/plugins/charset.so
10lib/weechat/plugins/exec.so 10lib/weechat/plugins/exec.so
11lib/weechat/plugins/fifo.so 11lib/weechat/plugins/fifo.so
12lib/weechat/plugins/fset.so 12lib/weechat/plugins/fset.so
13lib/weechat/plugins/irc.so 13lib/weechat/plugins/irc.so
14lib/weechat/plugins/logger.so 14lib/weechat/plugins/logger.so
15${PLIST.lua}lib/weechat/plugins/lua.so 15${PLIST.lua}lib/weechat/plugins/lua.so
16${PLIST.perl}lib/weechat/plugins/perl.so 16${PLIST.perl}lib/weechat/plugins/perl.so
17${PLIST.python}lib/weechat/plugins/python.so 17${PLIST.python}lib/weechat/plugins/python.so
18lib/weechat/plugins/relay.so 18lib/weechat/plugins/relay.so
19${PLIST.ruby}lib/weechat/plugins/ruby.so 19${PLIST.ruby}lib/weechat/plugins/ruby.so
20lib/weechat/plugins/script.so 20lib/weechat/plugins/script.so
21lib/weechat/plugins/trigger.so 21lib/weechat/plugins/trigger.so
 22lib/weechat/plugins/typing.so
22lib/weechat/plugins/xfer.so 23lib/weechat/plugins/xfer.so
 24man/cs/man1/weechat-headless.1
 25man/cs/man1/weechat.1
 26man/de/man1/weechat-headless.1
 27man/de/man1/weechat.1
 28man/fr/man1/weechat-headless.1
 29man/fr/man1/weechat.1
 30man/it/man1/weechat-headless.1
 31man/it/man1/weechat.1
 32man/ja/man1/weechat-headless.1
 33man/ja/man1/weechat.1
 34man/man1/weechat-headless.1
 35man/man1/weechat.1
 36man/pl/man1/weechat-headless.1
 37man/pl/man1/weechat.1
 38man/ru/man1/weechat-headless.1
 39man/ru/man1/weechat.1
 40man/sr/man1/weechat-headless.1
 41man/sr/man1/weechat.1
23share/applications/weechat.desktop 42share/applications/weechat.desktop
24share/icons/hicolor/128x128/apps/weechat.png 43share/icons/hicolor/128x128/apps/weechat.png
25share/icons/hicolor/16x16/apps/weechat.png 44share/icons/hicolor/16x16/apps/weechat.png
26share/icons/hicolor/256x256/apps/weechat.png 45share/icons/hicolor/256x256/apps/weechat.png
27share/icons/hicolor/32x32/apps/weechat.png 46share/icons/hicolor/32x32/apps/weechat.png
28share/icons/hicolor/512x512/apps/weechat.png 47share/icons/hicolor/512x512/apps/weechat.png
29share/icons/hicolor/64x64/apps/weechat.png 48share/icons/hicolor/64x64/apps/weechat.png
30share/locale/cs/LC_MESSAGES/weechat.mo 49share/locale/cs/LC_MESSAGES/weechat.mo
31share/locale/de/LC_MESSAGES/weechat.mo 50share/locale/de/LC_MESSAGES/weechat.mo
32share/locale/es/LC_MESSAGES/weechat.mo 51share/locale/es/LC_MESSAGES/weechat.mo
33share/locale/fr/LC_MESSAGES/weechat.mo 52share/locale/fr/LC_MESSAGES/weechat.mo
34share/locale/hu/LC_MESSAGES/weechat.mo 53share/locale/hu/LC_MESSAGES/weechat.mo
35share/locale/it/LC_MESSAGES/weechat.mo 54share/locale/it/LC_MESSAGES/weechat.mo
36share/locale/ja/LC_MESSAGES/weechat.mo 55share/locale/ja/LC_MESSAGES/weechat.mo
37share/locale/pl/LC_MESSAGES/weechat.mo 56share/locale/pl/LC_MESSAGES/weechat.mo
38share/locale/pt/LC_MESSAGES/weechat.mo 57share/locale/pt/LC_MESSAGES/weechat.mo
39share/locale/pt_BR/LC_MESSAGES/weechat.mo 58share/locale/pt_BR/LC_MESSAGES/weechat.mo
40share/locale/ru/LC_MESSAGES/weechat.mo 59share/locale/ru/LC_MESSAGES/weechat.mo
 60share/locale/sr/LC_MESSAGES/weechat.mo
41share/locale/tr/LC_MESSAGES/weechat.mo 61share/locale/tr/LC_MESSAGES/weechat.mo

cvs diff -r1.69 -r1.70 pkgsrc/chat/weechat/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/weechat/distinfo 2021/10/07 13:23:35 1.69
+++ pkgsrc/chat/weechat/distinfo 2021/10/18 11:15:09 1.70
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.69 2021/10/07 13:23:35 nia Exp $ 1$NetBSD: distinfo,v 1.70 2021/10/18 11:15:09 nia Exp $
2 2
3RMD160 (weechat-3.2.1.tar.xz) = 175b2df833250dbc1e1709c6776dd586460746da 3RMD160 (weechat-3.3.tar.xz) = f2c74ea964c1d6b09d5123ac8a9577ee3354188f
4SHA512 (weechat-3.2.1.tar.xz) = 3cd30ef555ae84c88485cae3a05cd65fbb2d1279e7feb2ff15c0a036e4e8454ee994e37d119b0e5cb0611a87552d5fde2698683abfbd6069e1ff2f1f538a9862 4SHA512 (weechat-3.3.tar.xz) = 18bbaa93620185ead64f64833e4c5df6a1cbc49dc6f60362614e955947221b78baaa93a2748f153bbb6f7867c7760f7a8fa8d6d9ed30040ad5e12af127526e13
5Size (weechat-3.2.1.tar.xz) = 2261348 bytes 5Size (weechat-3.3.tar.xz) = 2564280 bytes
6SHA1 (patch-cmake_FindNcurses.cmake) = 73d4bc9551c79ee967abe06eba09cfe1b10129d4 6SHA1 (patch-cmake_FindNcurses.cmake) = 73d4bc9551c79ee967abe06eba09cfe1b10129d4
7SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068 7SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068
8SHA1 (patch-src_core_weechat.c) = aeb3cb052976e6b4603d3515ffc40bed98434a9f 
9SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 307dcba1a072411ec2b59c4e680a930e31d6d541 8SHA1 (patch-src_plugins_lua_CMakeLists.txt) = 307dcba1a072411ec2b59c4e680a930e31d6d541
10SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341 9SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341

cvs diff -r1.27 -r1.28 pkgsrc/chat/weechat/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/weechat/options.mk 2020/07/26 23:10:21 1.27
+++ pkgsrc/chat/weechat/options.mk 2021/10/18 11:15:09 1.28
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: options.mk,v 1.27 2020/07/26 23:10:21 nia Exp $ 1# $NetBSD: options.mk,v 1.28 2021/10/18 11:15:09 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.weechat 3PKG_OPTIONS_VAR= PKG_OPTIONS.weechat
4# mk/curses will handle wide-curses 4# mk/curses will handle wide-curses
5PKG_SUPPORTED_OPTIONS= python lua wide-curses perl ruby 5PKG_SUPPORTED_OPTIONS= python lua wide-curses perl ruby
6PKG_SUGGESTED_OPTIONS= python lua wide-curses perl ruby 6PKG_SUGGESTED_OPTIONS= python lua wide-curses perl ruby
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9.include "../../mk/bsd.fast.prefs.mk" 9.include "../../mk/bsd.fast.prefs.mk"
10 10
11PLIST_VARS+= lua plugin python perl ruby 11PLIST_VARS+= lua python perl ruby
12 12
13.if !empty(PKG_OPTIONS:Mpython) 13.if !empty(PKG_OPTIONS:Mpython)
14PYTHON_VERSIONS_INCOMPATIBLE= 27 14PYTHON_VERSIONS_INCOMPATIBLE= 27
15.include "../../lang/python/extension.mk" 15.include "../../lang/python/extension.mk"
16CMAKE_ARGS+= -DENABLE_PYTHON=ON 16CMAKE_ARGS+= -DENABLE_PYTHON=ON
17PLIST.python= yes 17PLIST.python= yes
18.else 18.else
19CMAKE_ARGS+= -DENABLE_PYTHON=OFF 19CMAKE_ARGS+= -DENABLE_PYTHON=OFF
20.endif 20.endif
21 21
22.if !empty(PKG_OPTIONS:Mlua) 22.if !empty(PKG_OPTIONS:Mlua)
23#LUA_VERSIONS_ACCEPTED= 53 52 51 23#LUA_VERSIONS_ACCEPTED= 53 52 51
24.include "../../lang/lua/buildlink3.mk" 24.include "../../lang/lua/buildlink3.mk"
@@ -38,18 +38,13 @@ CMAKE_ARGS+= -DENABLE_PERL=OFF @@ -38,18 +38,13 @@ CMAKE_ARGS+= -DENABLE_PERL=OFF
38.endif 38.endif
39 39
40.if !empty(PKG_OPTIONS:Mruby) 40.if !empty(PKG_OPTIONS:Mruby)
41.include "../../lang/ruby/buildlink3.mk" 41.include "../../lang/ruby/buildlink3.mk"
42CMAKE_ARGS+= -DENABLE_RUBY=ON 42CMAKE_ARGS+= -DENABLE_RUBY=ON
43CMAKE_ARGS+= -DRUBY_INCLUDE_DIRS=${PREFIX}/${RUBY_INC} 43CMAKE_ARGS+= -DRUBY_INCLUDE_DIRS=${PREFIX}/${RUBY_INC}
44CMAKE_ARGS+= -DRUBY_LIB=${PREFIX}/lib/libruby${RUBY_SHLIB} 44CMAKE_ARGS+= -DRUBY_LIB=${PREFIX}/lib/libruby${RUBY_SHLIB}
45PLIST.ruby= yes 45PLIST.ruby= yes
46#BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_INC} 46#BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_INC}
47#BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_ARCHINC} 47#BUILDLINK_INCDIRS.${RUBY_BASE}+= ${RUBY_ARCHINC}
48.else 48.else
49CMAKE_ARGS+= -DENABLE_RUBY:BOOL=OFF 49CMAKE_ARGS+= -DENABLE_RUBY:BOOL=OFF
50.endif 50.endif
51 
52.if !empty(PKG_OPTIONS:Mpython) || \ 
53 !empty(PKG_OPTIONS:Mlua) 
54PLIST.plugin= yes 
55.endif 

File Deleted: pkgsrc/chat/weechat/patches/Attic/patch-src_core_weechat.c