4 files changed, 51 insertions, 15 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index 25315e62e3c6..472e7144728c 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	tin
-PORTVERSION=	1.6.2
-PORTREVISION=	2
+PORTVERSION=	1.7.7
 CATEGORIES+=	news ipv6
-MASTER_SITES=	http://mirrors.rcn.net/pub/news/tin/v1.6/ \
-		ftp://mirrors.rcn.net/pub/news/tin/v1.6/ \
-		ftp://ftp.tin.org/pub/news/clients/tin/v1.6/ \
-		ftp://ftp.sunet.se/pub/news/readers/tin/v1.6/
+MASTER_SITES=	http://mirrors.rcn.net/pub/news/tin/v1.7/ \
+		ftp://mirrors.rcn.net/pub/news/tin/v1.7/ \
+		ftp://ftp.tin.org/pub/news/clients/tin/v1.7/ \
+		ftp://ftp.sunet.se/pub/news/readers/tin/v1.7/
 
 MAINTAINER?=	ache@FreeBSD.org
 COMMENT=	Easy-to-use threaded newsreader with NOV/NNTP support
@@ -44,7 +43,7 @@ CONFIGURE_ENV=	CFLAGS='${CFLAGS} -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\
 		CPPFLAGS='${CPPFLAGS} -I${LOCALBASE}/include' \
 		LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
 ALL_TARGET=	build
-MAN1=		tin.1 w2r.pl.1 opt-case.pl.1
+MAN1=		tin.1 w2r.pl.1 opt-case.pl.1 tinews.pl.1
 MAN5=		tin.5 mbox.5 mmdf.5
 MLINKS=		tin.1 rtin.1
 
diff --git a/news/tin/distinfo b/news/tin/distinfo
index a7310843ba44..25430889032e 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,2 +1,2 @@
-MD5 (tin-1.6.2.tar.bz2) = 3ab61ba7c7d3b7a3596ba199c570c4e4
-SIZE (tin-1.6.2.tar.bz2) = 1186877
+MD5 (tin-1.7.7.tar.bz2) = 40e107e71c9a7312b41cae6c9b7c2885
+SIZE (tin-1.7.7.tar.bz2) = 1258730
diff --git a/news/tin/files/patch-ab b/news/tin/files/patch-ab
index 4399c482e562..affeb90017d9 100644
--- a/news/tin/files/patch-ab
+++ b/news/tin/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Sat Nov 17 21:47:38 2001
-+++ configure	Tue Dec 25 02:39:17 2001
-@@ -4637,7 +4637,7 @@
+--- configure.orig	Wed Dec 15 18:56:37 2004
++++ configure	Fri Mar 11 18:11:35 2005
+@@ -5463,7 +5463,7 @@
  
  
  case $host_os in #(vi
@@ -9,7 +9,25 @@
  	# This is only necessary if you are linking against an obsolete
  	# version of ncurses (but it should do no harm, since it's static).
  	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-@@ -5269,7 +5269,7 @@
+@@ -5799,7 +5799,7 @@
+       mbstowcs(wcb, icb, 5);
+       iswprint((wint_t) wcb[0]);
+       wcslen(wcb);
+-      wcsnlen(wcb, 4);
++      //wcsnlen(wcb, 4);
+       wcwidth((wint_t) wcb[0]);
+       wcswidth(wcb, 5);
+       wcstombs(ocb, wcb, 5);
+@@ -5835,7 +5835,7 @@
+         mbstowcs(wcb, icb, 5);
+         iswprint((wint_t) wcb[0]);
+         wcslen(wcb);
+-        wcsnlen(wcb, 4);
++	//wcsnlen(wcb, 4);
+         wcwidth((wint_t) wcb[0]);
+         wcswidth(wcb, 5);
+         wcstombs(ocb, wcb, 5);
+@@ -6386,7 +6386,7 @@
  
  
  case $host_os in #(vi
@@ -18,12 +36,30 @@
  	# This is only necessary if you are linking against an obsolete
  	# version of ncurses (but it should do no harm, since it's static).
  	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-@@ -5787,7 +5787,7 @@
+@@ -6924,7 +6924,7 @@
  
  if test "$cf_result" = no ; then
  case $host_os in #(vi
 -freebsd*) #(vi
 +XXXfreebsd*) #(vi
  	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
- echo "configure:5793: checking for tgoto in -lmytinfo" >&5
+ echo "configure:6930: checking for tgoto in -lmytinfo" >&5
  ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
+@@ -11904,7 +11904,7 @@
+       mbstowcs(wcb, icb, 5);
+       iswprint((wint_t) wcb[0]);
+       wcslen(wcb);
+-      wcsnlen(wcb, 4);
++      //wcsnlen(wcb, 4);
+       wcwidth((wint_t) wcb[0]);
+       wcswidth(wcb, 5);
+       wcstombs(ocb, wcb, 5);
+@@ -11940,7 +11940,7 @@
+         mbstowcs(wcb, icb, 5);
+         iswprint((wint_t) wcb[0]);
+         wcslen(wcb);
+-        wcsnlen(wcb, 4);
++	//wcsnlen(wcb, 4);
+         wcwidth((wint_t) wcb[0]);
+         wcswidth(wcb, 5);
+         wcstombs(ocb, wcb, 5);
diff --git a/news/tin/pkg-plist b/news/tin/pkg-plist
index 3bd020d5fe79..d0c1232121ab 100644
--- a/news/tin/pkg-plist
+++ b/news/tin/pkg-plist
@@ -3,6 +3,7 @@ bin/opt-case.pl
 bin/tin
 @exec ln -fs %f %B/rtin
 @unexec rm -f %B/rtin
+bin/tinews.pl
 bin/url_handler.sh
 bin/w2r.pl
 @unexec if cmp -s %D/etc/tin.defaults %D/etc/tin.defaults.dist; then rm -f %D/etc/tin.defaults; fi