Upgrade to tin1.3-unoff-BETA-961018

Based on: obrien@cs.ucdavis.edu port (David E. O'Brien)

5 files changed, 58 insertions, 127 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index 4a4ab9aee147..73d4d594bf46 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,18 +1,45 @@
+# ex:ts=8
 # New ports collection makefile for:	tin
-# Version required:	1.2pl2
-# Date created:		29 Jun 1995
-# Whom:			peter@haywire.dialix.oz.au
+# Version required:	tin1.3-unoff-BETA
+# Date created:		25 July 1996
+# Whom:			obrien@cs.ucdavis.edu
 #
-# $Id: Makefile,v 1.1.1.1 1995/07/01 10:07:17 asami Exp $
+# $Id$
 #
 
-DISTNAME=	tin-1.22
+DISTNAME=       tin1.3-unoff-BETA-961018
+PKGNAME=        tin-1.3.961018
 CATEGORIES+=	news
-MASTER_SITES=	ftp://ftp.germany.eu.net/pub/news/newsreader/unix/tin/
+MASTER_SITES=	ftp://ftp.akk.uni-karlsruhe.de/pub/tin/  \
+		ftp://nuxi.cs.ucdavis.edu/pub/tin/
 
-ALL_TARGET=     freebsd
+MAINTAINER=     ache@FreeBSD.org
+
+EXTRACT_SUFX=	.tgz
+WRKSRC=		${WRKDIR}/${DISTNAME:S/tin1.3-unoff-BETA-//}
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=  cf_cv_corefile=yes
+CONFIGURE_ARGS+= --with-nntp-default-server=news  \
+		 --with-spooldir=/var/news  \
+		 --with-libdir=${PREFIX}/lib/news \
+		 --with-pgp=/usr/local/bin/pgp \
+		 --with-ispell=/usr/local/bin/ispell \
+		 --with-metamail=/usr/local/bin/metamail
+MAKEFILE=	makefile
+ALL_TARGET=     build
+
+.if defined(NNTP_ONLY)
+CONFIGURE_ARGS+=	--enable-nntp-only
+.endif
+
+
+post-configure:
+	echo '#define NNTP_SERVER_FILE "${PREFIX}/etc/nntpserver"' >>${WRKSRC}/include/autoconf.h
+	echo '#define SMTP_SERVER_FILE "${PREFIX}/etc/smtpserver"' >>${WRKSRC}/include/autoconf.h
 
 post-install:
+.if !defined(NOMANCOMPRESS)
 	gzip -9nf ${PREFIX}/man/man1/tin.1
+.endif
 
 .include <bsd.port.mk>
diff --git a/news/tin/distinfo b/news/tin/distinfo
index 7bfd580a2e87..4c136098e75c 100644
--- a/news/tin/distinfo
+++ b/news/tin/distinfo
@@ -1 +1 @@
-MD5 (tin-1.22.tar.gz) = 31fbd05ab782f69a3a67499128a8c335
+MD5 (tin1.3-unoff-BETA-961018.tgz) = 2919120cc20b151bca6d94167ced4510
diff --git a/news/tin/files/patch-aa b/news/tin/files/patch-aa
index 6e69a013b93e..db2788e4318b 100644
--- a/news/tin/files/patch-aa
+++ b/news/tin/files/patch-aa
@@ -1,119 +1,24 @@
-*** Makefile.orig	Sat Sep 25 18:29:52 1993
---- Makefile	Sun Mar  3 16:53:56 1996
+*** src/main.c.bak	Tue Oct 15 00:50:08 1996
+--- src/main.c	Sun Oct 20 01:06:24 1996
 ***************
-*** 2,8 ****
-  #
-  # Options that may need changing. For advanced options read the INSTALL file.
-  # 
-- CC	= cc
-  COPTS	= -c -O
-  #CC	= gcc
-  #COPTS	= -c -g
---- 2,7 ----
+*** 612,617 ****
+--- 612,620 ----
+  					create_index_lock_file (lock_file);
+  					process_id = getpid ();
+  #ifdef BSD
++ #ifdef __FreeBSD__
++ 					setsid();
++ #else
+  #	ifdef __osf__
+  					setpgid (0, 0);
+  #	else
 ***************
-*** 12,27 ****
-  #YACC = bison -y
-  #DEBUG	=
-  DEBUG	= -g -DDEBUG
-  
-  # Where are your news libdir & spooldir?
-! LIBDIR	= /usr/lib/news
-! SPOOLDIR= /usr/spool/news
-! NOVROOTDIR= $(SPOOLDIR)
-  
-  # Where do you want the binary & manual page installed?
-! INS_BINARY_DIR	= /usr/local/bin
-  INS_DAEMON_DIR	= $(LIBDIR)
-! INS_MANUAL_DIR	= /usr/local/man/man
-  INS_MANUAL_EXT	= 1
-  
-  # From: address in posted articles (don't use both - read the INSTALL file)
---- 11,28 ----
-  #YACC = bison -y
-  #DEBUG	=
-  DEBUG	= -g -DDEBUG
-+ PREFIX  = /usr/local
-  
-  # Where are your news libdir & spooldir?
-! LIBDIR  = ${PREFIX}/lib/news
-! SPOOLDIR= /var/news
-! NOVROOTDIR= $(SPOOLDIR)/over.view
-! NNTP_SERVER_FILE=${PREFIX}/etc/nntpserver
-  
-  # Where do you want the binary & manual page installed?
-! INS_BINARY_DIR  = ${PREFIX}/bin
-  INS_DAEMON_DIR	= $(LIBDIR)
-! INS_MANUAL_DIR  = ${PREFIX}/man/man
-  INS_MANUAL_EXT	= 1
-  
-  # From: address in posted articles (don't use both - read the INSTALL file)
-***************
-*** 45,52 ****
-  SHELL	= /bin/sh
-  STRIP	= strip
-  STRIP2	= mcs -d
-! #ROFF	= nroff -man 
-! ROFF	= groff -Tascii -man 
-  #BASE_VER= 1.21/tin-1.21
-  BASE_VER= 170993
-  VER = 1.22
---- 46,53 ----
-  SHELL	= /bin/sh
-  STRIP	= strip
-  STRIP2	= mcs -d
-! ROFF   = nroff -man
-! #ROFF    = groff -Tascii -man
-  #BASE_VER= 1.21/tin-1.21
-  BASE_VER= 170993
-  VER = 1.22
-***************
-*** 100,115 ****
-  	@echo "  make qnx     [ QNX 4.1 ]                 make sco       [ SCO Unix ]"
-  	@echo "  make sinix   [ SNI Sinix ]               make tower     [ NCR Tower]"
-  	@echo "  make xenix   [ SCO Xenix 386 ]"
-  	@echo " "
-  	@echo "Note that targets marked with '(nntp)' have -DNNTP_ABLE defined automatically."
-  	@echo " "
-  
-! .c.o:
-! 	$(CC) $(CFLAGS) $*.c
-  
-  # Uncomment for COHERENT os
-  #.c.y:
-  #	$(YACC) $*.y
-  
-  # For IBM AIX
-  aix:
---- 101,132 ----
-  	@echo "  make qnx     [ QNX 4.1 ]                 make sco       [ SCO Unix ]"
-  	@echo "  make sinix   [ SNI Sinix ]               make tower     [ NCR Tower]"
-  	@echo "  make xenix   [ SCO Xenix 386 ]"
-+ 	@echo "  make freebsd [ FreeBSD ]"
-  	@echo " "
-  	@echo "Note that targets marked with '(nntp)' have -DNNTP_ABLE defined automatically."
-  	@echo " "
-  
-! #.c.o:
-! #        $(CC) $(CFLAGS) $*.c
-  
-  # Uncomment for COHERENT os
-  #.c.y:
-  #	$(YACC) $*.y
-+ 
-+ # For FreeBSD systems
-+ freebsd:
-+ 	@echo "Compiling $(EXE) v$(VER) for FreeBSD..."
-+ 	@$(MAKE) CFLAGS='$(CFLAGS) \
-+ 			-DHAVE_ISPELL \
-+ 			-DNNTP_INEWS_GATEWAY=\"$(NNTP_INEWS_GATEWAY)\" \
-+ 			-DNNTP_INEWS_DOMAIN=\"$(NNTP_INEWS_DOMAIN)\" \
-+ 			-DNNTP_DEFAULT_SERVER=\"$(NNTP_DEFAULT_SERVER)\" \
-+ 			-DLIBDIR=\"$(LIBDIR)\" \
-+ 			-DSPOOLDIR=\"$(SPOOLDIR)\" \
-+ 			-DNNTP_SERVER_FILE=\"$(NNTP_SERVER_FILE)\" \
-+ 			-DNOVROOTDIR=\"$(NOVROOTDIR)\"' \
-+ 			LIBS="-ltermcap $(INN_NNTPLIB)" \
-+ 			EXE=tin linkit
-  
-  # For IBM AIX
-  aix:
+*** 627,632 ****
+--- 630,636 ----
+  						}
+  					}
+  #	endif
++ #endif
+  #else
+  #	if HAVE_SETPGRP
+  					setpgrp ();
diff --git a/news/tin/pkg-comment b/news/tin/pkg-comment
index 537e768bdbf1..9e0bf4580f2e 100644
--- a/news/tin/pkg-comment
+++ b/news/tin/pkg-comment
@@ -1 +1 @@
-TIN newsreader
+TIN newsreader (termcap based)
diff --git a/news/tin/pkg-plist b/news/tin/pkg-plist
index 39d55d2ec4fc..d1c25dd92f66 100644
--- a/news/tin/pkg-plist
+++ b/news/tin/pkg-plist
@@ -1,4 +1,3 @@
-@cwd /usr/local
 bin/tin
 bin/rtin
 man/man1/tin.1.gz