Upgrade to 1.5.4

5 files changed, 33 insertions, 20 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index 86e3b724ed34..a81861135a6b 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -7,38 +7,38 @@
 #
 
 PORTNAME=	tin
-PORTVERSION=	1.4.2
+PORTVERSION=    1.5.4
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/v1.4/ \
-		ftp://nuxi.ucdavis.edu/pub/tin/v1.4/ \
-		ftp://ftp.nuxi.com/pub/tin/v1.4/
+MASTER_SITES=   ftp://ftp.tin.org/pub/news/clients/tin/v1.5/ \
+		ftp://nuxi.ucdavis.edu/pub/tin/v1.5/ \
+		ftp://ftp.nuxi.com/pub/tin/v1.5/
 
 MAINTAINER=	ache@FreeBSD.org
 
-LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib
+LIB_DEPENDS=    uu.1:${PORTSDIR}/converters/uulib \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:S/pre-1.4//}
+USE_GMAKE=      yes
 GNU_CONFIGURE=	yes
 
-# Curses support too buggy to activate
-#                 --enable-curses \
-#                 --with-ncurses \
-#
 CONFIGURE_ARGS=	--with-nntp-default-server=news \
 		--with-spooldir=/var/news \
 		--with-libdir=${PREFIX}/news/lib \
 		--with-defaults-dir=${PREFIX}/etc \
 		--with-editor=/usr/bin/ee \
+		--enable-nls \
+		--enable-curses \
+		--with-ncurses \
 		--with-mime-default-charset=ISO-8859-1 \
 		--enable-forgery \
 		--enable-break-long-lines \
 		--with-pgp=${PREFIX}/bin/pgp \
 		--with-ispell=${PREFIX}/bin/ispell \
 		--with-metamail=${PREFIX}/bin/metamail
-CONFIGURE_ENV=	CFLAGS='${CFLAGS} -I${PREFIX}/include -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
-		CPPFLAGS='${CPPFLAGS} -I${PREFIX}/include' \
-		LDFLAGS='${LDFLAGS} -L${PREFIX}/lib'
+CONFIGURE_ENV=  CFLAGS='${CFLAGS} -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
+		CPPFLAGS='${CPPFLAGS} -I${LOCALBASE}/include' \
+		LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
 MAKEFILE=	makefile
 ALL_TARGET=	build
 MAN1=		tin.1
diff --git a/news/tin/distinfo b/news/tin/distinfo
index 40814047aefd..08790198e2c8 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1 +1 @@
-MD5 (tin-1.4.2.tar.bz2) = 420a3e5a8fc7164184d6d67f233f275a
+MD5 (tin-1.5.4.tar.bz2) = 356a1cc89d3a0656f9b6f5153de911db
diff --git a/news/tin/files/patch-aa b/news/tin/files/patch-aa
index f3952cafac80..e024c029b1c4 100644
--- a/news/tin/files/patch-aa
+++ b/news/tin/files/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Thu Sep 16 07:25:22 1999
-+++ src/Makefile.in	Tue Sep 28 08:05:51 1999
-@@ -28,7 +28,7 @@
+--- src/Makefile.in.orig	Tue May 16 19:45:39 2000
++++ src/Makefile.in	Tue May 23 23:52:52 2000
+@@ -58,7 +58,7 @@
  YACC	= @YACC@
  
  CANLIB	= # -L../libcanlock -lcanlock
--LIBS	= -L../pcre -lpcre $(CANLIB) @LIBS@ @INN_NNTPLIB@
-+LIBS	= ../pcre/libpcre.a $(CANLIB) @LIBS@ @INN_NNTPLIB@ ../pcre/libpcre.a
+-LIBS	= -L../pcre -lpcre $(CANLIB) @LIBS@ @INN_NNTPLIB@ @INTLDIR_MAKE@ @INTLLIBS@
++LIBS    = ../pcre/libpcre.a $(CANLIB) @LIBS@ @INN_NNTPLIB@ @INTLDIR_MAKE@ @INTLLIBS@
  
  # Where do you want the binary & manual page installed?
- INSTALL_PREFIX	= @INSTALL_PREFIX@
+ DESTDIR	= @DESTDIR@
diff --git a/news/tin/files/patch-ac b/news/tin/files/patch-ac
new file mode 100644
index 000000000000..25283658677e
--- /dev/null
+++ b/news/tin/files/patch-ac
@@ -0,0 +1,11 @@
+--- configure.bak	Wed May 24 00:41:52 2000
++++ configure	Wed May 24 00:43:14 2000
+@@ -782,7 +782,7 @@
+ esac
+ 
+ ### Native Language Support
+-ALL_LINGUAS="de et en_GB"
++ALL_LINGUAS="de et"
+ 
+ ### Checks for programs
+ save_CFLAGS="$CFLAGS"
diff --git a/news/tin/pkg-plist b/news/tin/pkg-plist
index 6039e07fdb2d..80b7a2927f1c 100644
--- a/news/tin/pkg-plist
+++ b/news/tin/pkg-plist
@@ -2,3 +2,5 @@ bin/tin
 @exec ln -fs %f %B/rtin
 @unexec rm -f %B/rtin
 etc/tin.defaults.dist
+share/locale/de/LC_MESSAGES/tin.mo
+share/locale/et/LC_MESSAGES/tin.mo