Update tin to 1.6.1

New / changed Features:
-----------------------

. Rebindable keys
. New pager
. Searched for strings are highlighted
. GPG support
. NLS support
. Charset conversion using iconv(3)
. Indicator for articles newer than n-days
. art_mark_read, art_mark_killed, art_mark_selected are now configurable
. Piping '|' now works on the thread menu
. configurable scrolling via scroll_lines
. configurable URL handler via url_handler
. '.' sorts the newsgroup list
. Lots of bug fixes
. xref filter rules are now matched against a the reformatted xref line
. some others

Retired Features
----------------

. INDEX_DAEMON is no longer supported
. -U indexing is no longer supported
. ~/.tin/headers file is no longer directly supported. Use:
. filter rules xref_num and xref_score have been removed
. some others

6 files changed, 35 insertions, 67 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index c23a5a1c949..9e585e3c34d 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 22:52:10 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/12/16 00:11:48 dillo Exp $
 #
 
-DISTNAME=	tin-1.4.6
+DISTNAME=	tin-1.6.1
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/current/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/current/ \
@@ -21,6 +21,7 @@ RESTRICTED=	"Profit from use, sale, trade, or reproduction disallowed"
 
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
+USE_PKGLOCALEDIR=yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -51,7 +52,6 @@ CONFIGURE_ARGS+= --with-inews-dir=${PREFIX}/inn/bin \
 CONFIGURE_ARGS+= --enable-nntp-only
 .endif
 
-MAKEFILE=	makefile
 ALL_TARGET=	build
 
 post-patch:
@@ -63,4 +63,8 @@ post-configure:
 	${ECHO} '#define NNTP_SERVER_FILE "${PREFIX}/etc/nntp/server"' >>${WRKSRC}/include/autoconf.h
 	${ECHO} '#define SMTP_SERVER_FILE "${PREFIX}/etc/smtpserver"' >>${WRKSRC}/include/autoconf.h
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tin
+	${INSTALL_DATA} ${WRKSRC}/doc/WHATSNEW ${PREFIX}/share/doc/tin
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/tin/PLIST b/news/tin/PLIST
index 5037aa24048..c30041c9a20 100644
--- a/news/tin/PLIST
+++ b/news/tin/PLIST
@@ -1,4 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:03:52 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/12/16 00:11:48 dillo Exp $
+bin/opt-case.pl
 bin/rtin
 bin/tin
+bin/w2r.pl
+man/man1/opt-case.pl.1
+man/man1/rtin.1
 man/man1/tin.1
+man/man1/w2r.pl.1
+man/man5/mmdf.5
+man/man5/tin.5
+share/doc/tin/WHATSNEW
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tin.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/tin.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/tin.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tin.mo
+@dirrm share/doc/tin
diff --git a/news/tin/distinfo b/news/tin/distinfo
index 68d5fdaead4..189f9a7b374 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/11/06 10:38:33 wiz Exp $
+$NetBSD: distinfo,v 1.7 2003/12/16 00:11:48 dillo Exp $
 
-SHA1 (tin-1.4.6.tar.bz2) = 5292b4f1c6ffb796ae0b0416b6f7e32a42ff8601
-Size (tin-1.4.6.tar.bz2) = 695190 bytes
-SHA1 (patch-aa) = da46ab8dee8c3319a5e8fd18580cd573b611cbca
-SHA1 (patch-ab) = 35eb5a696c34ad9fda1eb808c68f804100da0ea2
-SHA1 (patch-ac) = 57d127ed9e78e51b0f1b1e1f2efbe13c6a1f3e1d
+SHA1 (tin-1.6.1.tar.bz2) = 66cb006b30ed3e62901b2b29734769c8ca9e9d2f
+Size (tin-1.6.1.tar.bz2) = 1186082 bytes
+SHA1 (patch-aa) = 0551171473f2f7ba26ec703d4844f73ca20b2040
diff --git a/news/tin/patches/patch-aa b/news/tin/patches/patch-aa
index 6f24e704b01..325335007e1 100644
--- a/news/tin/patches/patch-aa
+++ b/news/tin/patches/patch-aa
@@ -1,20 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2000/02/06 02:34:27 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/16 00:11:48 dillo Exp $
 
---- ./src/auth.c.orig	Sun Jan 23 17:30:24 2000
-+++ ./src/auth.c	Sun Feb  6 03:06:53 2000
-@@ -13,12 +13,12 @@
-  *              right notice, and it must be included in any copy made
-  */
+--- src/Makefile.in.orig	Thu Jul 24 16:18:45 2003
++++ src/Makefile.in
+@@ -326,7 +326,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
  
--#ifndef NNTPLIB_H
--#	include "nntplib.h"
--#endif /* !NNTPLIB_H */
- #ifndef TIN_H
- #	include "tin.h"
- #endif /* !TIN_H */
-+#ifndef NNTPLIB_H
-+#	include "nntplib.h"
-+#endif /* !NNTPLIB_H */
- #ifndef TCURSES_H
- #	include "tcurses.h"
- #endif /* !TCURSES_H */
+ uninstall_manpage:
diff --git a/news/tin/patches/patch-ab b/news/tin/patches/patch-ab
deleted file mode 100644
index b13c14c77a8..00000000000
--- a/news/tin/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/11/06 10:38:34 wiz Exp $
-
---- src/active.c.orig	Wed May 23 11:02:53 2001
-+++ src/active.c	Mon Nov  4 13:37:37 2002
-@@ -110,6 +110,9 @@
- 
- 	vWriteNewsrc ();
- 	read_news_active_file ();
-+#if !defined(INDEX_DAEMON) && defined(HAVE_MH_MAIL_HANDLING)
-+        read_mail_active_file ();
-+#endif /* !INDEX_DAEMON && HAVE_MH_MAIL_HANDLING */
- 
- #if !defined(INDEX_DAEMON) && defined(HAVE_MH_MAIL_HANDLING)
- 	read_mail_active_file ();
diff --git a/news/tin/patches/patch-ac b/news/tin/patches/patch-ac
deleted file mode 100644
index 4091c468201..00000000000
--- a/news/tin/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/11/06 10:38:34 wiz Exp $
-
---- src/mail.c.orig	Wed May 23 11:02:11 2001
-+++ src/mail.c	Mon Nov  4 13:38:33 2002
-@@ -75,6 +75,20 @@
- 		}
- 
- 		/*
-+		 * Update mailgroup info
-+		 */
-+		if ((ptr = psGrpFind (buf)) != NULL) {
-+			if (strcmp(ptr->spooldir, my_spooldir) != 0) {
-+				free(ptr->spooldir);
-+				ptr->spooldir = my_strdup(my_spooldir);
-+			}
-+			ptr->xmax = max;
-+			ptr->xmin = min;
-+
-+			continue;
-+		}
-+
-+		/*
- 		 * Load mailgroup into group hash table
- 		 */
- 		if ((ptr = psGrpAdd (buf)) == NULL)