news/tin: Update to 2.6.1

-- 2.6.1 release 20211226 "Convalmore" --

 004) Michael Baeuerle <michael.baeuerle@stz-e.de>
      BUG. wrong pkg-config file name for libcanlock3
      FIX. aclocal.m4

 003) Urs Janssen <urs@tin.org>
      ADD. config.guess, config.sub update
      ADD. don't count comment and empty lines in newsrc-file
      ADD. fixed mixed declarations and code
      ADD. const qualification for free_if_not_default() and strfpath_cp()
      ADD. allow to cancel wait_message() via key press
      BUG. missing bounds checking in *highlight_string()
      BUG. use of wint_t in !MULTIBYTE_ABLE code
      FIX. curses.c, help.c, memory.c, misc.c, newsrc.c, page.c, prompt.c
           rfc2046.c, screen.c, select.c, tcurses.c, extern.h, tin.5
           config.guess, config.sub

 002) Thomas E. Dickey <dickey@invisible-island.net>
      BUG. missing configure check for get_wch and wget_wch
      ADD. workaround for possible redefinition of bool type when using
           pdcurses
      FIX. autoconf.hin, tcurses.h, tin.h, Makefile.in, aclocal.m4
           configure[.in]

 001) Matt Anton <tin@lv223.org>
      ADD. updated French translation
      FIX. fr.po

7 files changed, 9 insertions, 93 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index 13671e88f5b..13f861da25d 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.97 2021/12/08 16:06:10 adam Exp $
+# $NetBSD: Makefile,v 1.98 2022/01/12 11:41:41 micha Exp $
 
-DISTNAME=	tin-2.6.0
-PKGREVISION=	1
+DISTNAME=	tin-2.6.1
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/stable/
 MASTER_SITES+=	http://ftp.funet.fi/pub/unix/news/tin-unoff/
diff --git a/news/tin/distinfo b/news/tin/distinfo
index 76628d5f17d..cafae5d7344 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.32 2021/10/26 11:09:37 nia Exp $
+$NetBSD: distinfo,v 1.33 2022/01/12 11:41:41 micha Exp $
 
-BLAKE2s (tin-2.6.0.tar.xz) = 01d560c51c68666962783b2979ba251cea5d84876fd5f1dbda3117fa351891a9
-SHA512 (tin-2.6.0.tar.xz) = d843bd313fd144fbb5f4c40e3f0f776cab3a974494adc7004ee265235ab538dde520bc72c956d5a8517225fdb50e754b444f25bd3b661ddf51ff9e4135904862
-Size (tin-2.6.0.tar.xz) = 1575564 bytes
+BLAKE2s (tin-2.6.1.tar.xz) = 489c1802956e8fa0e3728c1fbcf4976164e9d04745f147b3975f956a84c62df2
+SHA512 (tin-2.6.1.tar.xz) = dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
+Size (tin-2.6.1.tar.xz) = 1570500 bytes
 SHA1 (patch-Makefile) = 7f9048d31e70d9630ba6511d834db5d0c60a7de1
-SHA1 (patch-configure) = 124a69bda73e55fbde04076f6f1b4ec9293a1b31
-SHA1 (patch-configure.in) = 9a43c69dc722b3613324afca34ae79b9f369f7ae
-SHA1 (patch-include_autoconf.hin) = e35e4cbf9ed74b8bd50542f4b9bb03be6343187d
-SHA1 (patch-include_tcurses.h) = 71c2d0ca8432c427e6015a7ddda98991674186ff
-SHA1 (patch-src_Makefile.in) = f6fbe7aee324cd844ed6e1870d3c871c247e06ce
+SHA1 (patch-src_Makefile.in) = aecb7ce01c60d232214c9499d761a7da33cb7fb8
diff --git a/news/tin/patches/patch-configure b/news/tin/patches/patch-configure
deleted file mode 100644
index 0cfbe3d2283..00000000000
--- a/news/tin/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.4 2021/08/27 17:45:26 micha Exp $
-
-Skip missing include directories.
-
---- configure.orig	2021-08-27 08:01:40.268475849 +0000
-+++ configure
-@@ -35720,7 +35720,7 @@ EOF
- 	;;
- esac
- 
--for cf_func in vw_printw
-+for cf_func in vw_printw get_wch
- do
- 
- cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
diff --git a/news/tin/patches/patch-configure.in b/news/tin/patches/patch-configure.in
deleted file mode 100644
index e5d62c0a90a..00000000000
--- a/news/tin/patches/patch-configure.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2021/08/27 17:45:26 micha Exp $
-
-Backported upstream patch for ncurses (without w).
-
---- configure.in.orig	2021-08-23 05:13:12.000000000 +0000
-+++ configure.in
-@@ -1577,7 +1577,7 @@ esac
- if test "$cf_cv_termlib" = pdcurses ; then
- 	CF_PDCURSES_X11
- fi
--CF_CURSES_FUNCS(vw_printw)
-+CF_CURSES_FUNCS(vw_printw get_wch)
- 
- ### sum up warnings
- if test "$cf_cv_termlib" = none ; then
diff --git a/news/tin/patches/patch-include_autoconf.hin b/news/tin/patches/patch-include_autoconf.hin
deleted file mode 100644
index 8eaf23bf4fb..00000000000
--- a/news/tin/patches/patch-include_autoconf.hin
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-include_autoconf.hin,v 1.1 2021/08/27 17:45:26 micha Exp $
-
-Backported upstream patch for ncurses (without w).
-
---- include/autoconf.hin.orig	2020-12-01 10:52:11.000000000 +0000
-+++ include/autoconf.hin
-@@ -3,7 +3,7 @@
-  *  Module    : autoconf.hin
-  *  Author    : Thomas Dickey
-  *  Created   : 1995-08-24
-- *  Updated   : 2020-04-23
-+ *  Updated   : 2021-08-25
-  *  Notes     : #include files, #defines & struct's
-  *
-  * Copyright (c) 1995-2021 Thomas Dickey <dickey@invisible-island.net>
-@@ -256,6 +256,7 @@
- #	undef HAVE_GETSERVBYNAME
- #	undef HAVE_GETTIMEOFDAY
- #	undef HAVE_GETWD
-+#	undef HAVE_GET_WCH
- #	undef HAVE_HEAPSORT
- #	undef HAVE_ICONV
- #	undef HAVE_INET_ADDR
diff --git a/news/tin/patches/patch-include_tcurses.h b/news/tin/patches/patch-include_tcurses.h
deleted file mode 100644
index 1295db1e53e..00000000000
--- a/news/tin/patches/patch-include_tcurses.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-include_tcurses.h,v 1.2 2021/09/01 16:43:59 micha Exp $
-
-Backported upstream patch for ncurses (without w) and pdcurses.
-
---- include/tcurses.h.orig	2021-07-13 05:56:52.000000000 +0000
-+++ include/tcurses.h
-@@ -44,7 +44,10 @@
- 
- #	if defined(USE_CURSES) || defined(NEED_CURSES_H)
- #		ifdef HAVE_XCURSES
-+#			undef bool
-+#			define bool XCursesBool
- #			include <xcurses.h>
-+#			undef bool
- #			define getattrs(w) (w)->_attrs
- #		else
- #			if defined(HAVE_NCURSESW_NCURSES_H)
-@@ -75,7 +78,7 @@
- #					endif /* HAVE_NCURSES_NCURSES_H */
- #				endif /* HAVE_NCURSES_H */
- #			endif /* HAVE_NCURSESW_NCURSES_H */
--#			if defined(NCURSES_WIDECHAR)
-+#			if defined(NCURSES_WIDECHAR) && defined(HAVE_GET_WCH)
- #				define HAVE_NCURSESW 1
- #			endif
- #		endif /* HAVE_NCURSES_H */
diff --git a/news/tin/patches/patch-src_Makefile.in b/news/tin/patches/patch-src_Makefile.in
index 9f24743fcf9..ae543fc0a50 100644
--- a/news/tin/patches/patch-src_Makefile.in
+++ b/news/tin/patches/patch-src_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_Makefile.in,v 1.3 2021/01/04 15:30:46 micha Exp $
+$NetBSD: patch-src_Makefile.in,v 1.4 2022/01/12 11:41:41 micha Exp $
 
 Do not install mbox manpage.
 
 --- src/Makefile.in.orig	2020-12-01 10:52:35.000000000 +0000
 +++ src/Makefile.in
-@@ -345,7 +345,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
+@@ -348,7 +348,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
  	@-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
  	@$(ECHO) ".so $(INS_MANUAL_DIR)5/$(PROJECT).5" > $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
  	@$(CHMOD) 444 $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5