Update to 1.8.0.

Convert to options framework.
Prefer package version to internal version of pcre.
Add curses and inet6 options.

New features and changes since tin-1.6.0

Changes
-------
. interactive mailer can now be fed with headers. The old use_mailreader_i
  config variable is obsolete and superseded by the new interactive_mailer
  variable that can have three values:
  0  no interactive mailreader (old use_mailreader_i=OFF)
  1  interactive mailreader with headers
  2  interactive mailreader without headers (old use_mailreader_i=ON)

New features
------------
. You can now specify a mailbox folder to save your sent mails (fcc=) so
  you possibly don't need auto_cc or auto_bcc anymore. See tin(5).

. x_headers can take a command which generates the header(s). See tin(5).

. mime_forward (message/rfc822) attributes option

. single line scrolling in all levels

. minimalistic BiDi support (render_bidi)

. minimalistic IDNA decoding support

. display non-printable characters as octals in raw-mode

. user defined date_format

. support non-ascii key-bindings

. 'percentage match' threading

Retired Features
----------------
. AmigaOS support

5 files changed, 76 insertions, 43 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index 01f3eafa00d..8c90e4eab7c 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:47:03 tv Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/01 16:10:29 wiz Exp $
 #
 
-DISTNAME=	tin-1.6.2
-PKGREVISION=	1
+DISTNAME=	tin-1.8.0
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/current/ \
 		ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/current/ \
@@ -22,38 +21,26 @@ RESTRICTED=	"Profit from use, sale, trade, or reproduction disallowed"
 
 GNU_CONFIGURE=	yes
 USE_PKGLOCALEDIR=yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(TIN_USE_INN_SPOOL) && ${TIN_USE_INN_SPOOL} == YES
-INN_DATA_DIR?=	/var/news
-.endif
-
-# Curses support too buggy to activate
-#                 --enable-curses \
-#                 --with-ncurses \
-#
-CONFIGURE_ARGS+= --with-nntp-default-server=news  \
-		--with-mime-default-charset=ISO-8859-1 \
-		--enable-forgery \
-		--enable-break-long-lines \
-		--with-ispell=${PREFIX}/bin/ispell \
-		--with-metamail=${PREFIX}/bin/metamail \
-		--disable-mime-strict-charset \
-		--with-defaults-dir=${PREFIX}/etc \
-		--enable-mh-mail-handling \
-		--with-coffee
-.if defined(TIN_USE_INN_SPOOL) && ${TIN_USE_INN_SPOOL} == YES
-CONFIGURE_ARGS+= --with-inews-dir=${PREFIX}/inn/bin \
-		--with-libdir=${INN_DATA_DIR}/db \
-		--with-spooldir=${INN_DATA_DIR}/spool/articles \
-		--with-nov-dir=${INN_DATA_DIR}/spool/overview
-.else
-CONFIGURE_ARGS+= --enable-nntp-only
-.endif
-
+# for tinews.pl
+USE_TOOLS+=	perl:run
+REPLACE_PERL=	tools/tinews.pl
 BUILD_TARGET=	build
 
+.include "options.mk"
+
+CONFIGURE_ARGS+=	--with-nntp-default-server=news
+CONFIGURE_ARGS+=	--with-mime-default-charset=ISO-8859-1
+CONFIGURE_ARGS+=	--enable-forgery
+CONFIGURE_ARGS+=	--enable-break-long-lines
+CONFIGURE_ARGS+=	--with-gpg=${PREFIX}/bin/gpg
+CONFIGURE_ARGS+=	--with-ispell=${PREFIX}/bin/ispell
+CONFIGURE_ARGS+=	--with-metamail=${PREFIX}/bin/metamail
+CONFIGURE_ARGS+=	--with-pcre=${BUILDLINK_PREFIX.pcre}
+CONFIGURE_ARGS+=	--disable-mime-strict-charset
+CONFIGURE_ARGS+=	--with-defaults-dir=${PREFIX}/etc
+CONFIGURE_ARGS+=	--enable-mh-mail-handling
+CONFIGURE_ARGS+=	--with-coffee
+
 post-patch:
 	@${MV} ${WRKSRC}/doc/tin.1 ${WRKSRC}/doc/tin.1.dist
 	@${SED} -e 's:/etc/nntpserver:${PREFIX}/etc/nntp/server:' \
@@ -67,4 +54,9 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tin
 	${INSTALL_DATA} ${WRKSRC}/doc/WHATSNEW ${PREFIX}/share/doc/tin
 
+.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 ee8ed5d13e1..8e96413b3ed 100644
--- a/news/tin/PLIST
+++ b/news/tin/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/16 11:52:42 dillo Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/01/01 16:10:29 wiz Exp $
 bin/metamutt
 bin/opt-case.pl
 bin/rtin
 bin/tin
+bin/tinews.pl
 bin/url_handler.sh
 bin/w2r.pl
 man/man1/opt-case.pl.1
 man/man1/rtin.1
 man/man1/tin.1
+man/man1/tinews.pl.1
 man/man1/w2r.pl.1
 man/man5/mmdf.5
 man/man5/tin.5
@@ -16,4 +18,7 @@ ${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
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/tin.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/tin.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/tin.mo
 @dirrm share/doc/tin
diff --git a/news/tin/distinfo b/news/tin/distinfo
index bc43034ff48..c6730c0f25d 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 12:19:56 agc Exp $
+$NetBSD: distinfo,v 1.10 2006/01/01 16:10:29 wiz Exp $
 
-SHA1 (tin-1.6.2.tar.bz2) = 9ab37d0b2712c074e60d99d0cf5bb3a774be75db
-RMD160 (tin-1.6.2.tar.bz2) = 28a91ebe0c6064f76e0d81494ee3b8a28c15a4ab
-Size (tin-1.6.2.tar.bz2) = 1186877 bytes
-SHA1 (patch-aa) = 0551171473f2f7ba26ec703d4844f73ca20b2040
+SHA1 (tin-1.8.0.tar.bz2) = ce3bee69f98ce66587124e7159c47443d6c102df
+RMD160 (tin-1.8.0.tar.bz2) = e7e04566c4d4a8fdce64b195e26329360053e2d9
+Size (tin-1.8.0.tar.bz2) = 1406674 bytes
+SHA1 (patch-aa) = a3d40ff4e38230bcf8a3814c92ec2a75f85bf44e
diff --git a/news/tin/options.mk b/news/tin/options.mk
new file mode 100644
index 00000000000..ae745f6f969
--- /dev/null
+++ b/news/tin/options.mk
@@ -0,0 +1,36 @@
+# $NetBSD: options.mk,v 1.1 2006/01/01 16:10:29 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.tin
+PKG_SUPPORTED_OPTIONS=	curses inet6 tin-use-inn-spool
+# untested
+#PKG_SUPPORTED_OPTIONS+=	icu socks
+PKG_OPTIONS_LEGACY_VARS=	TIN_USE_INN_SPOOL:tin-use-inn-spool
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcurses)
+CONFIGURE_ARGS+=	--with-screen=curses
+.endif
+
+.if !empty(PKG_OPTIONS:Micu)
+.include "../../textproc/icu/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mtin-use-inn-spool)
+INN_DATA_DIR?=  /var/news
+CONFIGURE_ARGS+=	--with-inews-dir=${PREFIX}/inn/bin \
+			--with-libdir=${INN_DATA_DIR}/db \
+			--with-spooldir=${INN_DATA_DIR}/spool/articles \
+			--with-nov-dir=${INN_DATA_DIR}/spool/overview
+.else
+CONFIGURE_ARGS+=	--enable-nntp-only
+.endif
+
+.if !empty(PKG_OPTIONS:Msocks)
+.include "../../net/socks5/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-socks5=${BUILDLINK_PREFIX.socks5}
+.endif
diff --git a/news/tin/patches/patch-aa b/news/tin/patches/patch-aa
index 325335007e1..847bbacb7b7 100644
--- a/news/tin/patches/patch-aa
+++ b/news/tin/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2003/12/16 00:11:48 dillo Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/01 16:10:29 wiz Exp $
 
---- src/Makefile.in.orig	Thu Jul 24 16:18:45 2003
+--- src/Makefile.in.orig	2005-07-16 21:49:36.000000000 +0200
 +++ src/Makefile.in
-@@ -326,7 +326,6 @@ install_manpage: $(DESTDIR)$(INS_MANUAL_
+@@ -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:
+ uninstall_manpage :