Update tin to 1.9.6

Although 1.9.x is still called unstable, it is quite stable these days
and used more than the old 1.8.3 version.

4 files changed, 27 insertions, 27 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index ac2d2095f948..22a97cd6675a 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	tin
-PORTVERSION=	1.8.3
-PORTREVISION=	9
+PORTVERSION=	1.9.6
 CATEGORIES+=	news ipv6
-MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
-		ftp://ftp.sunet.se/pub/news/readers/tin/stable/ \
-		ftp://sunsite.icm.edu.pl/pub/unix/news/tin/stable/ \
-		ftp://ftp.ka.nu/pub/news/clients/tin/stable/ \
-		ftp://ftp.tau.ac.il/pub/unix/news/tin/stable/ \
-		ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/ \
+MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \
+		ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \
+		ftp://sunsite.icm.edu.pl/pub/unix/news/tin/v${PORTVERSION:R}/ \
+		ftp://ftp.ka.nu/pub/news/clients/tin/v${PORTVERSION:R}/ \
+		ftp://ftp.tau.ac.il/pub/unix/news/tin/v${PORTVERSION:R}/ \
+		ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/v${PORTVERSION:R}/ \
 		ftp://ftp.funet.fi/pub/unix/news/tin-unoff/ \
 		ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/ \
-		ftp://ftp.karlsruhe.org/pub/news/clients/tin/stable/ \
-		ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/stable/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/stable/ \
-		ftp://ftp.informatik.uni-hamburg.de/pub/soft/news/tin/stable/
+		ftp://ftp.karlsruhe.org/pub/news/clients/tin/v${PORTVERSION:R}/ \
+		ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/v${PORTVERSION:R}/ \
+		ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/v${PORTVERSION:R}/ \
+		ftp://ftp.informatik.uni-hamburg.de/pub/soft/news/tin/v${PORTVERSION:R}/
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Easy-to-use threaded newsreader with NOV/NNTP support
@@ -67,7 +66,7 @@ CFLAGS+=	-DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\"
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
 ALL_TARGET=	build
-MAN1=		tin.1 w2r.pl.1 opt-case.pl.1 tinews.pl.1
+MAN1=		tin.1 w2r.pl.1 opt-case.pl.1 tinews.pl.1 tinurl_handler.pl.1
 MAN5=		tin.5 tin_mbox.5 tin_mmdf.5
 MLINKS=		tin.1 rtin.1
 
@@ -113,16 +112,16 @@ post-patch:
 		-e 's:/etc/nntpserver:${PREFIX}/etc/nntpserver:g' \
 		-e 's:/usr/lib/news:${PREFIX}/news/lib:g' \
 		-e 's:/etc/mime\.types:${PREFIX}/etc/mime.types:g' \
-		-e 's:url_handler\.sh:tinurl_handler.sh:g' \
+		-e 's:url_handler\.pl:tinurl_handler.pl:g' \
 		${WRKSRC}/doc/tin.1 ${WRKSRC}/doc/tin.5
 	${REINPLACE_CMD} \
 		-e 's:/etc/mime\.types:${PREFIX}/etc/mime.types:g' \
 		${WRKSRC}/src/mimetypes.c
 	${REINPLACE_CMD} \
-		-e 's:url_handler\.sh:tinurl_handler.sh:g' \
+		-e 's:url_handler\.pl:tinurl_handler.pl:g' \
 		${WRKSRC}/src/Makefile.in ${WRKSRC}/include/tin.h
-	${MV}   ${WRKSRC}/tools/url_handler.sh \
-		${WRKSRC}/tools/tinurl_handler.sh
+	${MV}   ${WRKSRC}/tools/url_handler.pl \
+		${WRKSRC}/tools/tinurl_handler.pl
 
 .ifdef	WITH_CANLOCK
 MAKE_ARGS+=	CANLIB='-L../libcanlock -lcanlock' \
diff --git a/news/tin/distinfo b/news/tin/distinfo
index 348457f55b40..2b9ed1dcc35d 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tin-1.8.3.tar.bz2) = 5ed70aff723181b6c8e26923a96054f7e2376204bf62b9a49fdf2b677f283f9f
-SIZE (tin-1.8.3.tar.bz2) = 1437604
+SHA256 (tin-1.9.6.tar.bz2) = b4475d67e28752bc03e1a20c4040b5161cb2708d79f1f849d4dd5f1ed166a11d
+SIZE (tin-1.9.6.tar.bz2) = 1752467
diff --git a/news/tin/files/patch-ab b/news/tin/files/patch-ab
index f3d756b7c2de..ff6f68b9e840 100644
--- a/news/tin/files/patch-ab
+++ b/news/tin/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Tue Apr 25 16:23:36 2006
-+++ configure	Sat May 27 05:10:52 2006
-@@ -6189,7 +6189,7 @@
+--- configure.orig	2010-11-26 16:07:59.000000000 +0100
++++ configure	2011-07-09 14:33:08.000000000 +0200
+@@ -7738,7 +7738,7 @@ fi
  
  
  case $host_os in #(vi
@@ -9,7 +9,7 @@
  	# This is only necessary if you are linking against an obsolete
  	# version of ncurses (but it should do no harm, since it's static).
  	if test "$cf_nculib_root" = ncurses ; then
-@@ -7114,7 +7114,7 @@
+@@ -8985,7 +8985,7 @@ fi
  
  
  case $host_os in #(vi
@@ -18,12 +18,12 @@
  	# This is only necessary if you are linking against an obsolete
  	# version of ncurses (but it should do no harm, since it's static).
  	if test "$cf_nculib_root" = ncurses ; then
-@@ -7654,7 +7654,7 @@
+@@ -9666,7 +9666,7 @@ echo "$ac_t""$cf_result" 1>&6
  
  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:7660: checking for tgoto in -lmytinfo" >&5
+     echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
+ echo "configure:9672: checking for tgoto in -lmytinfo" >&5
  ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
diff --git a/news/tin/pkg-plist b/news/tin/pkg-plist
index 8dca56eda8c4..4980710316c6 100644
--- a/news/tin/pkg-plist
+++ b/news/tin/pkg-plist
@@ -4,11 +4,12 @@ bin/tin
 @exec ln -fs %f %B/rtin
 @unexec rm -f %B/rtin
 bin/tinews.pl
-bin/tinurl_handler.sh
+bin/tinurl_handler.pl
 bin/w2r.pl
 @unexec if cmp -s %D/etc/tin.defaults %D/etc/tin.defaults.dist; then rm -f %D/etc/tin.defaults; fi
 etc/tin.defaults.dist
 @exec [ -f %B/tin.defaults ] || cp %B/%f %B/tin.defaults
+%%NLS%%share/locale/da/LC_MESSAGES/tin.mo
 %%NLS%%share/locale/de/LC_MESSAGES/tin.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/tin.mo
 %%NLS%%share/locale/et/LC_MESSAGES/tin.mo