mcabber: Update to 1.1.2

mcabber (1.1.2)

 * Fix display when sending message to a full JID (Frank Zschockelt)

 -- Mikael, 2020-09-19

mcabber (1.1.1)

 * Fix compilation with GCC 10 or -fno-common in CFLAGS (Andrey Utkin)
 * Link against tinfo _or_ tinfow (Frank Zschockelt)
 * Fix otr disconnected message for otrv4, remove support for libotr 3.x
   (Frank Zschockelt)
 * Fix exiting from verbatim multiline mode (Michał Kępień)
 * Add support for displaying the number of unread messages for each roster
   entry (Michał Kępień)
 * Fix roster colors (Frank Zschockelt)
 * Add colorcli theme (Jonas Jared Jacek)
 * Hide the log window when log_win_height <= 0 (Frank Zschockelt)
 * Refactor carbon message handling
 * Other misc. bugfixes and cleanups

 -- Mikael, 2020-09-06

3 files changed, 12 insertions, 35 deletions

diff --git a/chat/mcabber/Makefile b/chat/mcabber/Makefile
index 790692f70d9..244ae313694 100644
--- a/chat/mcabber/Makefile
+++ b/chat/mcabber/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2020/03/08 16:48:58 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2021/01/24 16:54:15 nia Exp $
 
-DISTNAME=	mcabber-1.1.0
-PKGREVISION=	3
+DISTNAME=	mcabber-1.1.2
 CATEGORIES=	chat
-MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/
+MASTER_SITES=	https://www.lilotux.net/~mikael/mcabber/files/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	degroote@NetBSD.org
 HOMEPAGE=	https://www.lilotux.net/~mikael/mcabber/
-COMMENT=	Jabber console client
+COMMENT=	Small XMPP (Jabber) console client
 LICENSE=	gnu-gpl-v2
 
 CHECK_PORTABILITY_SKIP+=	contrib/events/eventcmd.pastebin
@@ -16,7 +15,8 @@ CHECK_PORTABILITY_SKIP+=	contrib/events/eventcmd.pastebin
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake xgettext pkg-config
-USE_NCURSES=	yes
+FAKE_NCURSES=	yes
+USE_CURSES=	wide
 
 INSTALLATION_DIRS+=	share/examples/mcabber
 CONFIGURE_ARGS+=	--disable-hgcset
@@ -29,6 +29,6 @@ post-install:
 .include "../../chat/loudmouth/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/mcabber/distinfo b/chat/mcabber/distinfo
index f29566cf149..ce6fa89ecc9 100644
--- a/chat/mcabber/distinfo
+++ b/chat/mcabber/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2018/11/18 12:06:23 bsiegert Exp $
+$NetBSD: distinfo,v 1.7 2021/01/24 16:54:15 nia Exp $
 
-SHA1 (mcabber-1.1.0.tar.bz2) = 3530831e99007356142325e0e5cdffe4d4885c15
-RMD160 (mcabber-1.1.0.tar.bz2) = ba23cf7541b62f4d8b913416c2a7fabf3406a0b8
-SHA512 (mcabber-1.1.0.tar.bz2) = d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f
-Size (mcabber-1.1.0.tar.bz2) = 608975 bytes
-SHA1 (patch-aa) = 2abb198ee8433d2e7552236242f8fdc92e72979d
+SHA1 (mcabber-1.1.2.tar.bz2) = dfed775c40ff845abcbebb3a4b8399eff054d6bb
+RMD160 (mcabber-1.1.2.tar.bz2) = e5992f9415249b4dc7082cd024c5d1d041657c6f
+SHA512 (mcabber-1.1.2.tar.bz2) = bf53d593e84a4b4b2cf0230a4d94ea75f55008e3c2a839af5839519151209a61cce1685f9db14b65f5c4fa438bfabfeb25eb8e78e666b092c5c66af249788106
+Size (mcabber-1.1.2.tar.bz2) = 651528 bytes
 SHA1 (patch-configure) = 7c328a067243e881aeb8eea445a8400c479349a5
diff --git a/chat/mcabber/patches/patch-aa b/chat/mcabber/patches/patch-aa
deleted file mode 100644
index 8979770fa92..00000000000
--- a/chat/mcabber/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2017/09/09 14:19:26 leot Exp $
-
-Handle correctly panel on NetBSD, not sure it is correct in general
-
---- mcabber/screen.h.orig	2017-06-04 21:13:16.000000000 +0000
-+++ mcabber/screen.h
-@@ -7,14 +7,12 @@
- 
- #if HAVE_NCURSESW_NCURSES_H
- # include <ncursesw/ncurses.h>
--# include <ncursesw/panel.h>
- #elif HAVE_NCURSES_NCURSES_H
- # include <ncurses/ncurses.h>
--# include <ncurses/panel.h>
- #else
- # include <ncurses.h>
--# include <panel.h>
- #endif
-+# include <panel.h>
- 
- gboolean vi_mode;
-