tin: update to 2.4.2.

From Michael Bäuerle via pkgsrc-wip.

New features and changes since tin-2.2.0

New features
------------
- simplified Chinese translation
- handle RFC 2231 parameter value continuation
- skip over RFC 2231 language parameters
- RFC 2231 decoding of non us-ascii MIME-parameter values
- options to color external quotes (extquote_handling, extquote_regex,
  col_extquote)
- LookupMessage ('L') in select level if reading via NNTP


Changes
-------
The gTLD list is no longer actively maintained (too many new gTLD recently),
disable_gnksa_domain_check=OFF might result in false positives.

--enable-heapsort is now default during configure (sort_function in tinrc
still needs to be set accordingly if you like to use heapsort instead of
qsort)

--enable-ipv6 is now default during configure

--enable-break-long-lines is now default during configure

sigfile=!/path/to/command no longer passes the name of the current
newsgroup to command. One can specify %G which will be replaced by
the name of the current newsgroup.
To match the old behaviour: 'sigfile=!/path/to/command %G'.

--enable-cancel-locks requires libcanlock-3 (which is included, but
some distros (e.g. debian) are linking against a shared lib which may
be too old).

Retired Features
----------------
. groupname_max_length, can now be set via user defined screen layout at
  select level

10 files changed, 108 insertions, 72 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index 40383cfaab8..3f9aca2c952 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,26 +1,23 @@
-# $NetBSD: Makefile,v 1.80 2018/08/22 09:46:09 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2018/09/03 09:39:27 wiz Exp $
 
-DISTNAME=	tin-2.2.1
-PKGREVISION=	18
+DISTNAME=	tin-2.4.2
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/stable/
 MASTER_SITES+=	ftp://ftp.funet.fi/pub/unix/news/tin-unoff/
 MASTER_SITES+=	ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/
-MASTER_SITES+=	ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/stable/
-MASTER_SITES+=	ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/stable/
 MASTER_SITES+=	ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/
 MASTER_SITES+=	ftp://sunsite.icm.edu.pl/pub/unix/news/tin/stable/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tin.org/
-COMMENT=	TIN newsreader (termcap based)
+COMMENT=	USENET newsreader (termcap based)
 # See src/nntplib.c, vms/vms.c
 LICENSE=	tin-license
 
 RESTRICTED=		Profit from use, sale, trade, or reproduction disallowed
-NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
 
 GNU_CONFIGURE=	yes
 USE_PKGLOCALEDIR=yes
@@ -62,7 +59,6 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../converters/uulib/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/tin/PLIST b/news/tin/PLIST
index f9bde205357..3b13f54a9e8 100644
--- a/news/tin/PLIST
+++ b/news/tin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2017/03/05 12:05:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/09/03 09:39:27 wiz Exp $
 bin/metamutt
 bin/opt-case.pl
 bin/rtin
@@ -12,15 +12,17 @@ man/man1/tin.1
 man/man1/tinews.pl.1
 man/man1/url_handler.pl.1
 man/man1/w2r.pl.1
+man/man5/rtin.5
 man/man5/tin-mmdf.5
 man/man5/tin.5
 share/doc/tin/WHATSNEW
-share/locale/da/LC_MESSAGES/tin.mo
-share/locale/de/LC_MESSAGES/tin.mo
-share/locale/en_GB/LC_MESSAGES/tin.mo
-share/locale/et/LC_MESSAGES/tin.mo
-share/locale/fr/LC_MESSAGES/tin.mo
-share/locale/ru/LC_MESSAGES/tin.mo
-share/locale/sv/LC_MESSAGES/tin.mo
-share/locale/tr/LC_MESSAGES/tin.mo
-share/locale/zh_TW/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/en_GB/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/et/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/tin.mo
diff --git a/news/tin/distinfo b/news/tin/distinfo
index 3c1c3af6459..c7e05f3c50a 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.22 2015/11/02 23:49:48 agc Exp $
+$NetBSD: distinfo,v 1.23 2018/09/03 09:39:27 wiz Exp $
 
-SHA1 (tin-2.2.1.tar.bz2) = aed9f2d4fc17c08c0f9d8d4b6ed38e5b070763a2
-RMD160 (tin-2.2.1.tar.bz2) = c19d85ea2a4bcfd0453b17130a1465d163303c98
-SHA512 (tin-2.2.1.tar.bz2) = fa1a7cf5db91add3de6d502efbc68d33d9b9c8514980c682808480b6b0fc5aed9903d3d9ccda6e63798e54bdf16403ab0685190de613365400222561f482bd30
-Size (tin-2.2.1.tar.bz2) = 1834572 bytes
-SHA1 (patch-aa) = a3d40ff4e38230bcf8a3814c92ec2a75f85bf44e
-SHA1 (patch-ab) = 34794d259ae4fb81888184ded9876ab5874d8731
-SHA1 (patch-am) = 958f7c158e599f17525bc6ada366e25276571b9b
+SHA1 (tin-2.4.2.tar.xz) = 675004c453548e926a261a071e0715e23a05c609
+RMD160 (tin-2.4.2.tar.xz) = e691275597cb1886ae9e66343493cf96acbd2bfe
+SHA512 (tin-2.4.2.tar.xz) = 70a9957d5bf5af1bb182a3f4e62795cd5862b7282b7fc0c231c3bd02d83950cdbdd502d8a2cc5eae20b29af584e4f794f03378742b47ed93fc5c61ac5bbb01b6
+Size (tin-2.4.2.tar.xz) = 1491388 bytes
+SHA1 (patch-Makefile) = 5dfed6b037755fd632d71fd5c58b5982b24a598e
+SHA1 (patch-configure) = dd738e58ffe3b39396928ebb881b7b269bf21315
+SHA1 (patch-include_tin.h) = 557a75eeff1114018dca247e15eceddf70af8b91
+SHA1 (patch-src_Makefile.in) = f65cfcc6da2be21edf80317b94a98e1512e086a0
diff --git a/news/tin/options.mk b/news/tin/options.mk
index 14df13ab656..9cfcfdfa2a0 100644
--- a/news/tin/options.mk
+++ b/news/tin/options.mk
@@ -1,15 +1,20 @@
-# $NetBSD: options.mk,v 1.17 2017/01/11 02:15:56 roy Exp $
+# $NetBSD: options.mk,v 1.18 2018/09/03 09:39:27 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.tin
 PKG_OPTIONS_REQUIRED_GROUPS=	display
 PKG_OPTIONS_GROUP.display=	curses wide-curses termcap
-PKG_SUPPORTED_OPTIONS=		icu inet6 tin-use-inn-spool
-PKG_SUGGESTED_OPTIONS=		inet6 termcap # see PR #51819
+PKG_SUPPORTED_OPTIONS=		canlock icu inet6 nls tin-use-inn-spool
+PKG_SUGGESTED_OPTIONS=		canlock inet6 nls termcap # see PR #51819
 # untested
 #PKG_SUPPORTED_OPTIONS+=	socks
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mcanlock)
+.include "../../news/libcanlock/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-cancel-locks
+.endif
+
 .if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
 .include "../../mk/curses.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-screen=${CURSES_TYPE}
@@ -22,8 +27,17 @@ CONFIGURE_ARGS+=	--with-curses-dir=${BUILDLINK_PREFIX.curses}
 .include "../../textproc/icu/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
+.if empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+PLIST_VARS+=	nls
+.if !empty(PKG_OPTIONS:Mnls)
+PLIST.nls=	yes
+.include "../../devel/gettext-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-nls
+.else
+CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 .if !empty(PKG_OPTIONS:Mtin-use-inn-spool)
@@ -37,7 +51,7 @@ CONFIGURE_ARGS+=	--with-inews-dir=${PREFIX}/inn/bin \
 CONFIGURE_ARGS+=	--enable-nntp-only
 .endif
 
-.if !empty(PKG_OPTIONS:Msocks)
-.include "../../net/dante/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-socks=${BUILDLINK_PREFIX.dante}
-.endif
+#.if !empty(PKG_OPTIONS:Msocks)
+#.include "../../net/dante/buildlink3.mk"
+#CONFIGURE_ARGS+=	--with-socks=${BUILDLINK_PREFIX.dante}
+#.endif
diff --git a/news/tin/patches/patch-ab b/news/tin/patches/patch-Makefile
index 9c5f071581e..6ed394e3a40 100644
--- a/news/tin/patches/patch-ab
+++ b/news/tin/patches/patch-Makefile
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2007/09/05 21:59:22 wiz Exp $
+$NetBSD: patch-Makefile,v 1.1 2018/09/03 09:39:27 wiz Exp $
+
+Do not ignore error for missing src/Makefile.
 
 --- Makefile.orig	2007-02-01 13:11:14.000000000 +0000
 +++ Makefile
-@@ -407,7 +407,7 @@ all:
+@@ -400,7 +400,7 @@ all:
  	@$(ECHO) " "
  
  build:
diff --git a/news/tin/patches/patch-aa b/news/tin/patches/patch-aa
deleted file mode 100644
index 847bbacb7b7..00000000000
--- a/news/tin/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/01/01 16:10:29 wiz Exp $
-
---- src/Makefile.in.orig	2005-07-16 21:49:36.000000000 +0200
-+++ src/Makefile.in
-@@ -336,7 +336,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
- 	@$(INSTALL) -m 444 $(DOCDIR)/tin.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/$(PROJECT).$(INS_MANUAL_EXT)
- 	@( $(CD) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) && $(RM) -f r$(PROJECT).$(INS_MANUAL_EXT) && $(LN) $(PROJECT).$(INS_MANUAL_EXT) r$(PROJECT).$(INS_MANUAL_EXT) )
- 	@$(INSTALL) -m 444 $(DOCDIR)/tin.5 $(DESTDIR)$(INS_MANUAL_DIR)5/$(PROJECT).5
--	@-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) "  ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi
- 	@-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) "  ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi
- 
- uninstall_manpage :
diff --git a/news/tin/patches/patch-am b/news/tin/patches/patch-am
deleted file mode 100644
index a187e6693a1..00000000000
--- a/news/tin/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.2 2011/11/30 21:22:41 wiz Exp $
-
---- configure.orig	2011-08-22 22:03:55.000000000 +0000
-+++ configure
-@@ -7706,6 +7706,9 @@ echo "$ac_t""$cf_cv_ncurses_h2" 1>&6
- if test -n "$cf_1st_incdir" ; then
-   for cf_add_incdir in $cf_1st_incdir
-   do
-+    if ! [ -d $cf_add_incdir ]; then
-+      continue;
-+    fi
- 	while test $cf_add_incdir != /usr/include
- 	do
- 	  if test -d $cf_add_incdir
-@@ -8803,7 +8806,6 @@ printf("%s\n", NCURSES_VERSION);
- #ifdef __NCURSES_H
- printf("old\n");
- #else
--	make an error
- #endif
- #endif
- 	
diff --git a/news/tin/patches/patch-configure b/news/tin/patches/patch-configure
new file mode 100644
index 00000000000..c07a4c1f866
--- /dev/null
+++ b/news/tin/patches/patch-configure
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.1 2018/09/03 09:39:27 wiz Exp $
+
+Skip missing include directories.
+
+--- configure.orig	2017-12-24 11:52:06.000000000 +0000
++++ configure
+@@ -9202,6 +9202,9 @@ echo "$ac_t""$cf_cv_ncurses_h2" 1>&6
+ if test -n "$cf_1st_incdir" ; then
+   for cf_add_incdir in $cf_1st_incdir
+   do
++    if ! [ -d $cf_add_incdir ]; then
++      continue;
++    fi
+ 	while test $cf_add_incdir != /usr/include
+ 	do
+ 	  if test -d $cf_add_incdir
diff --git a/news/tin/patches/patch-include_tin.h b/news/tin/patches/patch-include_tin.h
new file mode 100644
index 00000000000..fa07d4f6dac
--- /dev/null
+++ b/news/tin/patches/patch-include_tin.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_tin.h,v 1.1 2018/09/03 09:39:27 wiz Exp $
+
+Use system libcanlock.
+
+--- include/tin.h.orig	2017-12-08 07:52:23.000000000 +0000
++++ include/tin.h
+@@ -2366,7 +2366,7 @@ extern struct tm *localtime(time_t *);
+ 
+ /* libcanlock */
+ #ifdef USE_CANLOCK
+-#	include "../libcanlock/include/canlock.h"
++#	include <libcanlock-3/canlock.h>
+ #endif /* USE_CANLOCK */
+ 
+ /* gsasl */
diff --git a/news/tin/patches/patch-src_Makefile.in b/news/tin/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..89c696d47a4
--- /dev/null
+++ b/news/tin/patches/patch-src_Makefile.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2018/09/03 09:39:27 wiz Exp $
+
+Do not link internal static libcanlock.
+Do not install mbox manpage.
+
+--- src/Makefile.in.orig	2017-12-08 07:55:34.000000000 +0000
++++ src/Makefile.in
+@@ -209,7 +209,7 @@ EXTRAOBJS = @EXTRAOBJS@
+ EXTRA_INTLLIBS = @INTLDIR_MAKE@ @INTLLIBS@
+ EXTRA_PCREHDRS = @PCREDIR_MAKE@ ../pcre/pcre.h
+ EXTRA_PCRELIBS = @PCREDIR_MAKE@ ../pcre/$(PRELIB)pcre.a
+-EXTRA_CANLIBS = @CANDIR_MAKE@ ../libcanlock/$(PRELIB)canlock.a
++#EXTRA_CANLIBS = @CANDIR_MAKE@ ../libcanlock/$(PRELIB)canlock.a
+ EXTRALIBS = $(EXTRA_INTLLIBS) $(EXTRA_PCRELIBS) $(EXTRA_CANLIBS)
+ 
+ OFILES	= @ALLOCA@ $(EXTRAOBJS) \
+@@ -341,7 +341,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
+-	@-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) "  ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi
+ 	@-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) "  ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi
+ 
+ uninstall_manpage :