Update of news/trn to trn4-test72. Package provided by David Rankin

<drankin@bohemians.lexington.ky.us> in pkg/9221.

Changes from trn 3.6 to trn 4.0:

   o	Added a newsgroup selector to make choosing news groups easier
	(use the ++ option to turn it off).
   o	In the selector '\' now is used to execute a command, so if
	you had 'c' in your SELECTCHARS, you could still catch-up a
	group via \c.  It also lets you enter the normal newsgroup
	commands from the newsgroup selector, such as unsubscribe
	(\u) and goto group (\g).  If the command letter is both a
	selector command and a newsgroup command, use '\\' to get
	the newsgroup command (such as \\O or \\h).  Use ':' to apply
	a (limited set) of commands to more than one group, such as
	":u" (unsubscribe) or ":c" (catchup).
   o	Use "\v" from any selector to see the current trn version.
   o	Use the backtick (`) command to switch back and forth between
	the newsgroup selector and the rn-style newsgroup browser.
	You can also type backtick from inside a newsgroup to exit
	back to the newsgroup selection level.
   o	Use the '=' command in the newsgroup selector to refresh the
	article counts (possibly refetching the active file).
   o	Use the Ctrl-G command in the selector to go to a letter
	without affecting it (e.g. "Ctrl-G b" would go to letter 'b').
   o	Added an addgroup selector to ease the arrival of new groups.
   o	Strn's article scan/scoring is now present in trn.
   o	** Describe the universal selector once it settles down **
   o	Enabled trn to use both nntp and local news sources, either
	separately or at the same time.  Create a .trn/access file to
	customize this (start with a copy of <trnlib>/access.def).
   o	Changed the format of trn's option files.  Trn will create a
	.trn/trnrc file for you using your old trn options as soon as
	you edit and save them using the on-line option editor.  Once
	this happens, the old TRNINIT variable is ignored.
   o	When you specify a news source in the active file, you can
	tell trn to keep a local copy of the server's active and
	newsgroups files, and either re-grab them at regular intervals
	(however often you like), update them with new information
	we glean while running, or leave them alone (which is useful
	for an NFS mounted active file).
   o	Added a newsrc selector to choose among the news sources and
	newsrc options in your .trn/access file.
   o	Alternately, use Ctrl-N and Ctrl-P in the newsgroup selector
	or newsgroup browser to change from news source to news source.
   o	Added an on-line option editor (type '&' <RETURN>).  Use the
	search command (/erase) to find the option you're looking for.
   o	Much improved xterm mouse handling now lets you define a
	"mouse bar" of buttons to press, as well as allowing you to
	click on the tree nodes in the article tree display.  Use
	the option selector to turn it on and customize it.  See
	the <trnlib>/INIT file for an example of how to make the
	mouse code conditional on your terminal type.  You can
	even double-click in the selector to start reading and
	select a range with click-drag-release.
   o	Enhanced the mime code so that trn now knows how to handle
	basic mime types, and farm out the ones it doesn't understand.
	!!Not finished yet!!
   o	Use the 'a' (attachments) command to view an article's
	attachments, including a uuencoded picture in a picture
	group.  Even works with multi-part pieces if you use 'a'
	on all the parts (in any order).  Use ":a" to view a
	group of selected articles (handy from the selector).  Of
	course, "::a" affects all unselected articles.
   o	The header hiding code now hides more headers by default,
	and can un-hide any header (prior trns could only hide
	known header names plus all unknown headers in a group).
   o	You can now specify a custom IP port for an NNTP connection
	in your .trn/access file or the NNTPSERVER variable.
   o	A bargraph (for percent done) pops up on slow tasks (such
	as fetching the active file over a slow link).
   o	Changed the default "auto arrows" (-A) to be more web-
	browser-like in the selectors.  Set option "Auto Arrow
	Macros" to "old-style" if you like the old style better.
   o	A client ("mini") inews is now included with trn that is
	compatible with other news readers and a bit more functional.
   o	Macro writers: each selector has a different mode letter (see
	the %m discussion in the man page for a list), but there's
	now an easy way to write a macro that affects all selectors
	test the "general mode": %g=s.  See the man page for the other
	general modes.
   o	Fixed the type-ahead eating to never eat just part of a macro
	sequence (such as a keypad key or a mouse click).
   o	Trn now use X-Newsgroups instead of Newsgroups in mailed replies.
	It also uses X-Also-Posted-To when Cc'ing people while posting.

8 files changed, 128 insertions, 286 deletions

diff --git a/news/trn/Makefile b/news/trn/Makefile
index d4324eedc92..b2dbde60e50 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,31 +1,115 @@
-# $NetBSD: Makefile,v 1.3 1999/08/18 09:08:10 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/02/16 18:47:15 wiz Exp $
 #
 
-DISTNAME=		trn-3.6
+DISTNAME=		trn4-test72
+PKGNAME=		trn-4.test72
 CATEGORIES=		news
-MASTER_SITES=		ftp://ftp.wustl.edu/packages/news/readers/trn/
+MASTER_SITES=		http://www.clari.net/~wayne/
 
-MAINTAINER=     	packages@netbsd.org
-
-BUILD_DEFS+=		USE_INN
+MAINTAINER=     	drankin@bohemians.lexington.ky.us
+HOMEPAGE=		http://www.clari.net/~wayne/
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_INN) && ${USE_INN} == YES
-DEPENDS=		inn-2.2:../inn
-.else
-DEPENDS=		nntpclnt-1.6.1:../nntpclnt
+# Normally, one or more of the following variables will be set inside 
+# of /etc/mk.conf before build time.  Names of local hierarchies, e.g.
+# at, aus, or de,  or even smaller areas. Only changes a warning in
+# inews.
+TRN_LOCAL_ORG_DISTRIBUTION?=	none
+TRN_ORG_DISTRIBUTION?=		none
+TRN_CITY_DISTRIBUTION?=		none
+TRN_COUNTRY_DISTRIBUTION?=	none
+TRN_REGION_DISTRIBUTION?=	none
+TRN_CONTINENT_DISTRIBUTION?=	none
+
+# TRN_HOSTBITS determines the number of "name segments" (x.y.z.com), counting
+# from right to left, that TRN will match to allow cancels, with 0 requiring
+# a perfect match.  For example, with TRN_HOSTBITS=3, x.y.z.com will match
+# foo.y.z.com for the purposes of allowing cancels.
+TRN_HOSTBITS?=			0
+
+#TRN_ORGANIZATION defines the value for the "Organization" header in inews.
+TRN_ORGANIZATION?=		none
+
+# The following variables must be set for proper function, but TRN does
+# not set sane default values due to the inherant dangers involved.
+.if !defined(TRN_DOMAINNAME)
+    || !defined(TRN_NNTPSERVER)
+IS_INTERACTIVE=		yes
 .endif
 
+USE_PERL5=		yes
+
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ENV=		PREFIX=${PREFIX}
-CONFIGURE_ARGS=		-S
+CONFIGURE_ARGS=		-d -e -D bin=${PREFIX}/bin \
+		-D binexp=${PREFIX}/bin \
+		-D phost="`${CAT} ${WRKDIR}/.trn_domainname`" \
+		-D citydist=${TRN_CITY_DISTRIBUTION} \
+		-D cntrydist=${TRN_COUNTRY_DISTRIBUTION} \
+		-D contdist=${TRN_CONTINENT_DISTRIBUTION} \
+		-D filexp=${PREFIX}'/libdata/trn/filexp' \
+		-D hostbits=${TRN_HOSTBITS} \
+		-D installbin=${PREFIX}'/bin' \
+		-D installinews=${PREFIX}'/libexec/trn/inews' \
+		-D installmansrc=${PREFIX}'/man/man1' \
+		-D installprivlib=${PREFIX}'/libdata/trn' \
+		-D libpth=${PREFIX}'/lib /usr/lib' \
+		-D locdist=${TRN_LOCAL_ORG_DISTRIBUTION} \
+		-D mansrc=${PREFIX}'/man/man1' \
+		-D mansrcexp=${PREFIX}'/man/man1' \
+		-D mimecap=${PREFIX}'/etc/mimecap' \
+		-D multistatedist=${TRN_REGION_DISTRIBUTION} \
+		-D orgdist=${TRN_ORG_DISTRIBUTION} \
+		-D orgname=${PREFIX}'/libdata/trn/organization' \
+		-D perl=${PREFIX}'/bin/perl' \
+		-D perlpath=${PREFIX}'/bin/perl' \
+		-D prefix=${PREFIX} \
+		-D prefixexp=${PREFIX} \
+		-D privlib=${PREFIX}'/libdata/trn' \
+		-D privlibexp=${PREFIX}'/libdata/trn' \
+		-D servername=${PREFIX}'/libdata/trn/nntpserver' \
+		-D d_nntp -U d_local -D libs=' ' -D usevfork=false
+#		-D inews=${PREFIX}'/libexec/trn/inews' \
+#		-D useinews=${PREFIX}'/libexec/trn/inews' \
 
 pre-configure:
-	@${CP} ${FILESDIR}/config.sh ${WRKSRC}
+	if [ "${TRN_DOMAINNAME}" = "" ]; then \
+		${ECHO} "TRN_DOMAINNAME must be set. This variable tells trn what hostname to" ;\
+		${ECHO} "place on the From: line during postings. You can:" ;\
+		${ECHO} "1.  Choose a static hostname, such as your domain (which will match" ;\
+		${ECHO} "    your sub-domain machines as well) and enter it here." ;\
+		${ECHO} "2.  Specify just the domain portion (by starting the name with a '.')" ;\
+		${ECHO} "    and your machine name will be computed at runtime and this domain" ;\
+		${ECHO} "    appended to the end." ;\
+		${ECHO} "3.  Enter just a '.' to have the machine AND domain computed at runtime." ;\
+		${ECHO} ;\
+		${ECHO} -n "Domainname: " ; \
+		read TRN_DOMAINNAME ;\
+		${ECHO} ;\
+	else \
+		TRN_DOMAINNAME=${TRN_DOMAINNAME} ; \
+	fi; \
+	${ECHO} -n $$TRN_DOMAINNAME > ${WRKDIR}/.trn_domainname
+
+pre-install:
+	@${MKDIR} ${PREFIX}/libexec/trn
 
 post-install:
+	@if [ "${TRN_NNTPSERVER}" = "" ]; then \
+		${ECHO} "TRN_NNTPSERVER must be set. This variable tells trn what hostname to" ;\
+		${ECHO} "use as the initial default NNTP server. After installation, this" ;\
+		${ECHO} "value can be changed by editing ${PREFIX}/libdata/trn/nntpserver" ;\
+		${ECHO} ;\
+		${ECHO} -n "NNTP server: " ; \
+		read TRN_NNTPSERVER ; \
+		${ECHO} ;\
+	else \
+		TRN_NNTPSERVER=${TRN_NNTPSERVER} ; \
+	fi; \
+	${ECHO} $$TRN_NNTPSERVER > ${PREFIX}/libdata/trn/nntpserver
+	@${ECHO} ${TRN_ORGANIZATION} > ${PREFIX}/libdata/trn/organization
 	@${RM} -f ${PREFIX}/bin/rn ${PREFIX}/man/man1/rn.1 ${PREFIX}/man/man1/rn.1.gz
 	@${LN} -s trn ${PREFIX}/bin/rn
 	@${LN} -s trn.1 ${PREFIX}/man/man1/rn.1
diff --git a/news/trn/files/config.sh b/news/trn/files/config.sh
deleted file mode 100644
index 98d5d8f741a..00000000000
--- a/news/trn/files/config.sh
+++ /dev/null
@@ -1,218 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Configuration time: Mon Feb 22 10:01:25 EST 1999
-
-d_bsd='define'
-d_eunice='undef'
-d_xenix='undef'
-eunicefix=':'
-Mcc='Mcc'
-awk='awk'
-basename='basename'
-bash='bash'
-cat='cat'
-cp='cp'
-cpp='cpp'
-csh='csh'
-date='date'
-diff='diff'
-echo='echo'
-ed='ed'
-egrep='egrep'
-expr='expr'
-grep='grep'
-inews='inews'
-ispell='ispell'
-ksh='ksh'
-less='less'
-lint=''
-mail='mail'
-metamail='metamail'
-mhn='mhn'
-mkdir='mkdir'
-more='more'
-munpack='munpack'
-mv='mv'
-nroff='nroff'
-pg='pg'
-rm='rm'
-rmail='rmail'
-sed='sed'
-sendmail='sendmail'
-smail='smail'
-sort='sort'
-spell='spell'
-tail='tail'
-test='test'
-tr='tr'
-uname='uname'
-uniq='uniq'
-uuname='uuname'
-vi='vi'
-vspell=''
-who=''
-hint='recommended'
-myuname='netbsd duhnet.net 1.3i netbsd 1.3i (duh) #0: wed nov 25 14:19:32 est 1998 tv@alpha.home.duh.org:/usr/src/netbsd/src/sys/arch/alpha/compile/duh alpha '
-srcdir='.'
-vincludes=''
-vpath='.'
-Id='$Id'
-Log='$Log'
-active='none'
-acttimes='nntp'
-d_acttimes='define'
-myactive='.falseactive'
-bin=$PREFIX'/bin'
-binexp=$PREFIX'/bin'
-installbin=$PREFIX'/bin'
-cc='cc'
-ccflags=''
-cppflags=''
-ldflags=''
-lkflags=''
-optimize="$CFLAGS"
-cf_by='tv'
-cf_time='Mon Feb 22 10:01:25 EST 1999'
-contains='grep'
-cpplast='-'
-cppminus='-'
-cpprun='cc -E'
-cppstdin='cc -E'
-d_ftime='undef'
-aphostcmd=''
-d_gethname='undef'
-d_phostcmd='undef'
-d_uname='undef'
-d_getpwent='define'
-d_getcwd='undef'
-d_getwd='define'
-d_havetlib='define'
-termlib='-lcurses'
-d_ignoreorg='undef'
-d_internet='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memset='define'
-d_mimeshow='define'
-d_mimestore='define'
-mimeshow="metamail %A"
-mimestore="munpack"
-d_newsadm='define'
-newsadmin='news'
-d_nntp='define'
-d_xdata='define'
-d_genauth='define'
-servername=$PREFIX'/etc/nntp/server'
-d_nolnbuf='undef'
-d_normsig='define'
-jobslib=''
-d_novoid='undef'
-void=''
-d_portable='define'
-d_rdchk='undef'
-d_rename='define'
-d_sigblock='define'
-d_sighold='undef'
-d_sizet='undef'
-d_strccmp='define'
-d_strchr='define'
-d_strftime='define'
-strftimec=''
-strftimeo=''
-d_libndir='undef'
-d_usendir='undef'
-libndir=''
-ndirc=''
-ndiro=''
-d_vfork='define'
-d_voidsig='define'
-signal_t='void'
-defeditor='/usr/bin/vi'
-filexp=$PREFIX'/libdata/trn/filexp'
-d_dirnamlen=''
-i_dirent='define'
-i_ptem='undef'
-i_stdlib='define'
-i_string='define'
-strings='/usr/include/string.h'
-i_sysdir='define'
-d_voidtty=''
-i_bsdioctl=''
-i_sysfilio='define'
-i_sysioctl='define'
-i_syssockio=''
-i_sysndir='undef'
-i_sgtty='undef'
-i_termio='undef'
-i_termios='define'
-i_systime='define'
-i_time='undef'
-i_unistd='define'
-i_vfork='undef'
-ispell_options=''
-ispell_prg='none'
-libc='/usr/lib/libc.so'
-plibpth='/usr/ccs/lib /usr/lib /usr/ucblib /usr/local/lib'
-xlibpth='/usr/lib/386 /lib/386'
-libs=' '
-citydist='none'
-cntrydist='none'
-contdist='none'
-locdist='none'
-multistatedist='none'
-orgdist='none'
-statedist='none'
-mailer='/usr/sbin/sendmail'
-mailfile='/var/mail/%L'
-installmansrc=$PREFIX'/man/man1'
-manext='1'
-mansrc=$PREFIX'/man/man1'
-mansrcexp=$PREFIX'/man/man1'
-mboxchar='F'
-c=''
-n='-n'
-d_berknames='define'
-d_passnames='define'
-d_usgnames='undef'
-nametype='bsd'
-inewsloc='inews'
-newslib='/tmp'
-newslibexp='/tmp'
-newsspool='/tmp'
-orgname=$PREFIX'/etc/nntp/organization'
-package='trn'
-spackage='Trn'
-pager='/usr/bin/less'
-phost=$PREFIX'/etc/nntp/domainname'
-phostcmd=''
-prefshell='/bin/sh'
-installprivlib=$PREFIX'/libdata/trn'
-privlib=$PREFIX'/libdata/trn'
-privlibexp=$PREFIX'/libdata/trn'
-rootid='0'
-sharpbang='#!'
-shsharp='true'
-spitshell='cat'
-startsh='#!/bin/sh'
-sysman='/usr/share/man/man1'
-d_usemt='define'
-d_useov='define'
-overviewdir='/tmp'
-threaddir='/tmp'
-trn_init='FALSE'
-trn_select='TRUE'
-nm_opt=''
-runnm='true'
-usenm='true'
-incpath=''
-mips=''
-mips_type=''
-usrinc='/usr/include'
-PATCHLEVEL="3.6 (20 Nov 1994)"
-CONFIG=true
diff --git a/news/trn/files/md5 b/news/trn/files/md5
index 6f41aad9433..6a6ac21ee27 100644
--- a/news/trn/files/md5
+++ b/news/trn/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/02/22 16:12:07 tv Exp $
+$NetBSD: md5,v 1.2 2000/02/16 18:47:16 wiz Exp $
 
-MD5 (trn-3.6.tar.gz) = 0337ebc89f64825bc4ce2fb12e5b96a7
+MD5 (trn4-test72.tar.gz) = 7736c9a30bd6ae4dd1f1e2a633dde992
diff --git a/news/trn/files/patch-sum b/news/trn/files/patch-sum
index e1dad313c23..2d3d6545765 100644
--- a/news/trn/files/patch-sum
+++ b/news/trn/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:35 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/02/16 18:47:16 wiz Exp $
 
-MD5 (patch-aa) = 42c53e45937cb9f9686aefb55798cbbd
-MD5 (patch-ab) = ff283d75f56c2d4be0f566b8d84ad7f5
+MD5 (patch-ac) = 29ca1953a8a6f84ee00035c8508bd4af
diff --git a/news/trn/patches/patch-aa b/news/trn/patches/patch-aa
deleted file mode 100644
index e3841c709d8..00000000000
--- a/news/trn/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/02/22 21:38:56 tv Exp $
-
---- nntpinit.c.orig	Mon Feb 22 10:22:45 1999
-+++ nntpinit.c	Mon Feb 22 10:33:48 1999
-@@ -25,6 +25,7 @@
- 
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #ifdef NONETDB
- # define IPPORT_NNTP	((unsigned short) 119)
- #else
-@@ -44,7 +45,9 @@
- #include <netdnet/dnetdb.h>
- #endif /* DECNET */
- 
-+#ifndef __NetBSD__
- unsigned long inet_addr _((char *x));
-+#endif
- int get_tcp_socket _((char *machine));
- 
- int
diff --git a/news/trn/patches/patch-ab b/news/trn/patches/patch-ab
deleted file mode 100644
index 277ac512c85..00000000000
--- a/news/trn/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/06/02 18:21:23 christos Exp $
-
---- rcstuff.c.orig	Sat Aug 20 16:47:59 1994
-+++ rcstuff.c	Mon May  3 14:09:15 1999
-@@ -704,7 +704,7 @@
- 	    set_toread(i);
- 	*(rcline[i] + rcnums[i] - 1) = RCCHAR(rcchar[i]);
- 	if (toread[i] > 0)
--	    sprintf(tmpbuf,"%3d %6ld   ",i,(long)toread[i]);
-+	    sprintf(tmpbuf,"%3d %8ld ",i,(long)toread[i]);
- 	else
- 	    sprintf(tmpbuf,"%3d %7s  ",i,status[-toread[i]]);
- 	safecpy(tmpbuf+13,rcline[i],2034);
---- ngstuff.c.orig	Sat Nov 19 01:01:21 1994
-+++ ngstuff.c	Mon May  3 14:08:30 1999
-@@ -353,7 +353,7 @@
-     bool saveit = FALSE;
-     
-     if (toplevel) {
--	printf("%-6ld ",art);
-+	printf("%-8ld ",art);
- 	fflush(stdout);
-     }
-     perform_cnt++;
diff --git a/news/trn/patches/patch-ac b/news/trn/patches/patch-ac
new file mode 100644
index 00000000000..c2cb1798bed
--- /dev/null
+++ b/news/trn/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2000/02/16 18:47:17 wiz Exp $
+
+--- Configure.orig	Mon Sep 21 00:50:59 1998
++++ Configure	Sun Jan 16 06:50:36 2000
+@@ -2411,7 +2411,7 @@
+     esac
+     ;;
+ *)  case "$d_inews" in
+-    '') dflt="$prefix/bin";;
++    '') dflt="$prefix/libexec/trn";;
+     "$define")
+ 	set dflt installinews bin
+ 	eval $prefixit
diff --git a/news/trn/pkg/PLIST b/news/trn/pkg/PLIST
index cfaee37652f..4a436e07742 100644
--- a/news/trn/pkg/PLIST
+++ b/news/trn/pkg/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/02/22 16:12:07 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/02/16 18:47:17 wiz Exp $
 bin/Pnews
 bin/Rnmail
-bin/newsetup
-bin/newsgroups
 bin/nntplist
 bin/rn
 bin/trn
@@ -15,10 +13,22 @@ libdata/trn/makedir
 libdata/trn/mbox.saver
 libdata/trn/newsnews
 libdata/trn/norm.saver
+libdata/trn/nntpserver
+libdata/trn/organization
+libdata/trn/access.def
+libdata/trn/HelpFiles/changelog
+libdata/trn/HelpFiles/hints
+libdata/trn/HelpFiles/quickstart
+libdata/trn/HelpFiles/top
+libdata/trn/HelpFiles/samples/access
+libdata/trn/HelpFiles/samples/index
+libdata/trn/HelpFiles/samples/trnrc
+@dirrm libdata/trn/HelpFiles/samples
+@dirrm libdata/trn/HelpFiles
 @dirrm libdata/trn
+libexec/trn/inews
+@dirrm libexec/trn
 man/man1/Pnews.1
 man/man1/Rnmail.1
-man/man1/newsetup.1
-man/man1/newsgroups.1
 man/man1/rn.1
 man/man1/trn.1