CVS commit: pkgsrc/chat/weechat

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct 18 11:15:09 UTC 2021

Modified Files:
        pkgsrc/chat/weechat: Makefile PLIST distinfo options.mk
Removed Files:
        pkgsrc/chat/weechat/patches: patch-src_core_weechat.c

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/chat/weechat/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/chat/weechat/PLIST
cvs rdiff -u -r1.69 -r1.70 pkgsrc/chat/weechat/distinfo
cvs rdiff -u -r1.27 -r1.28 pkgsrc/chat/weechat/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/chat/weechat/patches/patch-src_core_weechat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/weechat/Makefile
diff -u pkgsrc/chat/weechat/Makefile:1.127 pkgsrc/chat/weechat/Makefile:1.128
--- pkgsrc/chat/weechat/Makefile:1.127  Wed Sep 29 19:00:24 2021
+++ pkgsrc/chat/weechat/Makefile        Mon Oct 18 11:15:09 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.127 2021/09/29 19:00:24 adam Exp $
+# $NetBSD: Makefile,v 1.128 2021/10/18 11:15:09 nia Exp $
 
-DISTNAME=      weechat-3.2.1
-PKGREVISION=   1
+DISTNAME=      weechat-3.3
 CATEGORIES=    chat
 MASTER_SITES=  https://www.weechat.org/files/src/
 EXTRACT_SUFX=  .tar.xz
@@ -11,22 +10,27 @@ HOMEPAGE=   https://www.weechat.org/
 COMMENT=       Lightweight and user friendly curses based IRC client
 LICENSE=       gnu-gpl-v3
 
-TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+.include "../../lang/ruby/rubyversion.mk"
+
+TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
 
 USE_TOOLS+=    msgfmt pkg-config
 USE_LANGUAGES= c99
 USE_CMAKE=     yes
 FAKE_NCURSES=  yes
 
+CMAKE_ARGS+=   -DASCIIDOCTOR_FOUND=ON
+CMAKE_ARGS+=   -DASCIIDOCTOR_EXECUTABLE=${PREFIX}/bin/asciidoctor${RUBY_VER}
 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
+CMAKE_ARGS+=   -DENABLE_MAN=ON
+CMAKE_ARGS+=   -DLOCALEDIR=${PKGLOCALEDIR}/locale
+CMAKE_ARGS+=   -DMANDIR=${PREFIX}/${PKGMANDIR}
 
 USE_PKGLOCALEDIR=      yes
 

Index: pkgsrc/chat/weechat/PLIST
diff -u pkgsrc/chat/weechat/PLIST:1.29 pkgsrc/chat/weechat/PLIST:1.30
--- pkgsrc/chat/weechat/PLIST:1.29      Tue Dec 10 13:04:05 2019
+++ pkgsrc/chat/weechat/PLIST   Mon Oct 18 11:15:09 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2019/12/10 13:04:05 nia Exp $
+@comment $NetBSD: PLIST,v 1.30 2021/10/18 11:15:09 nia Exp $
 bin/weechat
 bin/weechat-curses
 bin/weechat-headless
@@ -19,7 +19,26 @@ lib/weechat/plugins/relay.so
 ${PLIST.ruby}lib/weechat/plugins/ruby.so
 lib/weechat/plugins/script.so
 lib/weechat/plugins/trigger.so
+lib/weechat/plugins/typing.so
 lib/weechat/plugins/xfer.so
+man/cs/man1/weechat-headless.1
+man/cs/man1/weechat.1
+man/de/man1/weechat-headless.1
+man/de/man1/weechat.1
+man/fr/man1/weechat-headless.1
+man/fr/man1/weechat.1
+man/it/man1/weechat-headless.1
+man/it/man1/weechat.1
+man/ja/man1/weechat-headless.1
+man/ja/man1/weechat.1
+man/man1/weechat-headless.1
+man/man1/weechat.1
+man/pl/man1/weechat-headless.1
+man/pl/man1/weechat.1
+man/ru/man1/weechat-headless.1
+man/ru/man1/weechat.1
+man/sr/man1/weechat-headless.1
+man/sr/man1/weechat.1
 share/applications/weechat.desktop
 share/icons/hicolor/128x128/apps/weechat.png
 share/icons/hicolor/16x16/apps/weechat.png
@@ -38,4 +57,5 @@ share/locale/pl/LC_MESSAGES/weechat.mo
 share/locale/pt/LC_MESSAGES/weechat.mo
 share/locale/pt_BR/LC_MESSAGES/weechat.mo
 share/locale/ru/LC_MESSAGES/weechat.mo
+share/locale/sr/LC_MESSAGES/weechat.mo
 share/locale/tr/LC_MESSAGES/weechat.mo

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

Index: pkgsrc/chat/weechat/options.mk
diff -u pkgsrc/chat/weechat/options.mk:1.27 pkgsrc/chat/weechat/options.mk:1.28
--- pkgsrc/chat/weechat/options.mk:1.27 Sun Jul 26 23:10:21 2020
+++ pkgsrc/chat/weechat/options.mk      Mon Oct 18 11:15:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2020/07/26 23:10:21 nia Exp $
+# $NetBSD: options.mk,v 1.28 2021/10/18 11:15:09 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.weechat
 # mk/curses will handle wide-curses
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=  python lua wide-c
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.fast.prefs.mk"
 
-PLIST_VARS+=           lua plugin python perl ruby
+PLIST_VARS+=           lua python perl ruby
 
 .if !empty(PKG_OPTIONS:Mpython)
 PYTHON_VERSIONS_INCOMPATIBLE=  27
@@ -48,8 +48,3 @@ PLIST.ruby=   yes
 .else
 CMAKE_ARGS+=           -DENABLE_RUBY:BOOL=OFF
 .endif
-
-.if !empty(PKG_OPTIONS:Mpython) || \
-    !empty(PKG_OPTIONS:Mlua)
-PLIST.plugin=          yes
-.endif