hexchat: update to 2.16.0

2.16.0 (2021-10-01)

     * add support for IRCv3 SETNAME, invite-notify, account-tag, standard
       replies, and UTF8ONLY
     * add support for strikethrough formatting
     * update network list (including Libera.Chat as the default)
     * update OpenSSL on Windows
     * fix text clipping issues by respecting font line height
     * fix URLs not being escaped when opened
     * fix misc IRC message parsing issues
     * remove libnotify dependency on Linux, fixing hangs when notifications
       are shown
     * remove libproxy dependency on Linux
     * print ChanServ notices in the front tab by default
     * fishlim: add support for CBC mode
     * python: rewrite plugin in python with CFFI This lowers memory usage
       and fixed conflicts with many C Python modules including pygobject

4 files changed, 32 insertions, 50 deletions

diff --git a/chat/hexchat/Makefile b/chat/hexchat/Makefile
index 1b215883bec..c1cc947bb91 100644
--- a/chat/hexchat/Makefile
+++ b/chat/hexchat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2021/05/24 19:49:13 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2021/10/19 08:17:06 nia Exp $
 
-DISTNAME=	hexchat-2.14.3
-PKGREVISION=	9
+DISTNAME=	hexchat-2.16.0
 CATEGORIES=	chat
 MASTER_SITES=	https://dl.hexchat.net/hexchat/
 EXTRACT_SUFX=	.tar.xz
@@ -15,11 +14,8 @@ USE_TOOLS+=	pkg-config msgfmt xgettext
 
 USE_LANGUAGES=	c c++
 
-# XXX fails without GNU msgfmt
-_TOOLS_USE_PKGSRC.msgfmt=	yes
-
-MESON_ARGS+=		-Dwith-text=true
-MESON_ARGS+=		-Dwith-appdata=false
+MESON_ARGS+=		-Dtext-frontend=true
+MESON_ARGS+=		-Dinstall-appdata=false
 
 REPLACE_PYTHON+=	plugins/perl/generate_header.py
 REPLACE_PYTHON+=	src/common/make-te.py
@@ -31,6 +27,12 @@ PLIST_SUBST+=		SOEXT=${SOEXT}
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD"
+# msgfmt: unknown option -- xml
+TOOLS_PLATFORM.msgfmt=
+.endif
+
 PKGCONFIG_OVERRIDE+=	data/pkgconfig/hexchat-plugin.pc.in
 
 .include "options.mk"
diff --git a/chat/hexchat/distinfo b/chat/hexchat/distinfo
index 0c44e01870d..3b1331accdd 100644
--- a/chat/hexchat/distinfo
+++ b/chat/hexchat/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2021/10/07 13:23:22 nia Exp $
+$NetBSD: distinfo,v 1.13 2021/10/19 08:17:06 nia Exp $
 
-RMD160 (hexchat-2.14.3.tar.xz) = ee9549bea0f8d221c39c3c6974d14415db358458
-SHA512 (hexchat-2.14.3.tar.xz) = c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
-Size (hexchat-2.14.3.tar.xz) = 1292072 bytes
+RMD160 (hexchat-2.16.0.tar.xz) = 1c5ce6776138c1143afe7537172526ada1bc5afc
+SHA512 (hexchat-2.16.0.tar.xz) = 4802f6efe0883f48d3d56ee949be1fc224b76a3c76956dcba3f913679e91424ba53c5c0d68bb4e0e790b16a08689111098958ead4c83c35cddf39855fe07c207
+Size (hexchat-2.16.0.tar.xz) = 1348320 bytes
 SHA1 (patch-osx_launcher.sh) = 7493430921809182898aca2ebb8fd1f493dbd9d3
-SHA1 (patch-plugins_sysinfo_meson.build) = 277a131cde115d910696c69905fc4ed309a28466
+SHA1 (patch-plugins_sysinfo_meson.build) = 8052ddfb5a79c9c4d5c84fbe6ff6c2ae42cbc4d2
 SHA1 (patch-plugins_sysinfo_unix_parse.c) = 92b882b7573cfcfc280351353a7bdcb0a7940c06
 SHA1 (patch-plugins_sysinfo_unix_pci.c) = db2d20261419bed6d6c4b716b4416d73b3386053
 SHA1 (patch-plugins_sysinfo_unix_pci.h) = 018b74796143b26d6a1f9ad821f3889b74b09cc8
diff --git a/chat/hexchat/options.mk b/chat/hexchat/options.mk
index 5f10265517c..35e62d8c6a7 100644
--- a/chat/hexchat/options.mk
+++ b/chat/hexchat/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.9 2019/12/04 11:57:05 nia Exp $
+# $NetBSD: options.mk,v 1.10 2021/10/19 08:17:06 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.hexchat
-PKG_SUPPORTED_OPTIONS=	dbus gtk2 libcanberra libnotify libpci libproxy
+PKG_SUPPORTED_OPTIONS=	dbus gtk2 libcanberra libpci
 PKG_SUPPORTED_OPTIONS+=	lua openssl perl python
-PKG_SUGGESTED_OPTIONS+=	gtk2 libproxy openssl
+
+PKG_SUGGESTED_OPTIONS+=	gtk2 openssl
 
 PLIST_VARS+=		dbus gtk2 libpci lua perl python fishlim
 
@@ -13,9 +14,9 @@ PLIST_VARS+=		dbus gtk2 libpci lua perl python fishlim
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 PLIST.dbus=		yes
-MESON_ARGS+=		-Dwith-dbus=true
+MESON_ARGS+=		-Ddbus=enabled
 .else
-MESON_ARGS+=		-Dwith-dbus=false
+MESON_ARGS+=		-Ddbus=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk2)
@@ -24,23 +25,16 @@ MESON_ARGS+=		-Dwith-dbus=false
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 PLIST.gtk2=		yes
-MESON_ARGS+=		-Dwith-gtk=true
+MESON_ARGS+=		-Dgtk-frontend=true
 .else
-MESON_ARGS+=		-Dwith-gtk=false
+MESON_ARGS+=		-Dgtk-frontend=false
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibcanberra)
 .include "../../audio/libcanberra/buildlink3.mk"
-MESON_ARGS+=		-Dwith-libcanberra=true
-.else
-MESON_ARGS+=		-Dwith-libcanberra=false
-.endif
-
-.if !empty(PKG_OPTIONS:Mlibnotify)
-.include "../../sysutils/libnotify/buildlink3.mk"
-MESON_ARGS+=		-Dwith-libnotify=true
+MESON_ARGS+=		-Dlibcanberra=enabled
 .else
-MESON_ARGS+=		-Dwith-libnotify=false
+MESON_ARGS+=		-Dlibcanberra=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibpci)
@@ -56,13 +50,6 @@ MESON_ARGS+=		-Dwith-sysinfo=true
 MESON_ARGS+=		-Dwith-sysinfo=false
 .endif
 
-.if !empty(PKG_OPTIONS:Mlibproxy)
-.include "../../www/libproxy/buildlink3.mk"
-MESON_ARGS+=		-Dwith-libproxy=true
-.else
-MESON_ARGS+=		-Dwith-libproxy=false
-.endif
-
 .if !empty(PKG_OPTIONS:Mlua)
 .include "../../lang/lua/buildlink3.mk"
 MESON_ARGS+=		-Dwith-lua=lua
@@ -73,11 +60,11 @@ MESON_ARGS+=		-Dwith-lua=false
 
 .if !empty(PKG_OPTIONS:Mopenssl)
 .include "../../security/openssl/buildlink3.mk"
-MESON_ARGS+=		-Dwith-ssl=true
+MESON_ARGS+=		-Dtls=enabled
 MESON_ARGS+=		-Dwith-fishlim=true
 PLIST.fishlim=		yes
 .else
-MESON_ARGS+=		-Dwith-ssl=false
+MESON_ARGS+=		-Dtls=disabled
 MESON_ARGS+=		-Dwith-fishlim=false
 .endif
 
diff --git a/chat/hexchat/patches/patch-plugins_sysinfo_meson.build b/chat/hexchat/patches/patch-plugins_sysinfo_meson.build
index 92eac331b99..40958424d9a 100644
--- a/chat/hexchat/patches/patch-plugins_sysinfo_meson.build
+++ b/chat/hexchat/patches/patch-plugins_sysinfo_meson.build
@@ -1,22 +1,15 @@
-$NetBSD: patch-plugins_sysinfo_meson.build,v 1.2 2019/12/21 14:41:32 nia Exp $
+$NetBSD: patch-plugins_sysinfo_meson.build,v 1.3 2021/10/19 08:17:06 nia Exp $
 
 XXX this is incomplete
 
---- plugins/sysinfo/meson.build.orig	2019-12-21 06:43:47.652401700 +0000
+--- plugins/sysinfo/meson.build.orig	2021-10-01 20:09:11.468550200 +0000
 +++ plugins/sysinfo/meson.build
-@@ -13,13 +13,13 @@ sysinfo_includes = []
+@@ -13,7 +13,7 @@ sysinfo_includes = []
  sysinfo_cargs = []
  
  system = host_machine.system()
--if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin'
-+if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'netbsd':
+-if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'freebsd'
++if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'freebsd' or system == "netbsd"
    sysinfo_includes += 'shared'
    sysinfo_sources += [
      'shared/df.c'
-   ]
- 
--  if system == 'linux' or system == 'gnu' or system.startswith('gnu/')
-+  if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'netbsd':
-     libpci = dependency('libpci', required: false, method: 'pkg-config')
-     if libpci.found()
-       sysinfo_deps += libpci