6 files changed, 220 insertions, 183 deletions

diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index 939948aca412..48334e2c6257 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -1,24 +1,29 @@
 # New ports collection makefile for:	trn
-# Version required:	3.6
+# Version required:	4.0-test64
 # Date created:		21 October 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.13 1997/04/27 00:24:32 asami Exp $
+# $Id: Makefile,v 1.14 1998/05/01 07:52:00 asami Exp $
 #
 
-DISTNAME=	trn-3.6
+DISTNAME=	trn4-test64
+PKGNAME=	trn-4.0b64
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
+MASTER_SITES=	ftp://ftp.clari.net/private/trn/ \
+		ftp://ftp.uu.net/private/trn/
 
-RUN_DEPENDS=  munpack:${PORTSDIR}/converters/mpack
+MAINTAINER=	mph@freebsd.org
 
-BROKEN=		awaiting upgrade to trn4 after repository copy
+NO_LATEST_LINK=	yes
 NO_PACKAGE=	"Too many questions"
 IS_INTERACTIVE=	yes
-MAN1=		trn.1 Pnews.1 Rnmail.1 newsetup.1 newsgroups.1
+MAN1=		trn.1 Pnews.1 Rnmail.1
 
 pre-configure:
-	@echo "===> Running pre-configure target for ${DISTNAME}"
-	@sh ${SCRIPTDIR}/preconf ${PORTSDIR} ${.CURDIR} ${WRKSRC}
+	@echo "===>  Running pre-configure target for ${DISTNAME}"
+	@${SED} -e "s:__CC__:$(CC):" -e "s:__CFLAGS__:$(CFLAGS):" \
+		-e "s:/PREFIX:$(PREFIX):"  ${SCRIPTDIR}/preconf > \
+		${WRKDIR}/preconf.new
+	@sh ${WRKDIR}/preconf.new ${PORTSDIR} ${.CURDIR} ${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/news/trn4/distinfo b/news/trn4/distinfo
index 45b2ee058477..df7096a4b8b0 100644
--- a/news/trn4/distinfo
+++ b/news/trn4/distinfo
@@ -1 +1 @@
-MD5 (trn-3.6.tar.gz) = 0337ebc89f64825bc4ce2fb12e5b96a7
+MD5 (trn4-test64.tar.gz) = b5282a7775d0881bee0364c0c43b1639
diff --git a/news/trn4/pkg-comment b/news/trn4/pkg-comment
index cb282d317162..ff240d3626da 100644
--- a/news/trn4/pkg-comment
+++ b/news/trn4/pkg-comment
@@ -1 +1 @@
-Threaded Read News newsreader.
+Version 4.0 of the threaded readnews newsreader.
diff --git a/news/trn4/pkg-descr b/news/trn4/pkg-descr
index 845ca05bc44f..3814ec866ec7 100644
--- a/news/trn4/pkg-descr
+++ b/news/trn4/pkg-descr
@@ -1,17 +1,5 @@
-Trn is Threaded RN -- a newsreader that uses an article's references to
-order the discussions in a very natural, reply-ordered sequence called
-threads.  Having the replies associated with their parent articles not
-only makes following the discussion easier, but also makes it easy to back-
-track and (re-)read a specific discussion from the beginning.  Trn also
-has a visual representation of the current thread in the upper right corner
-of the header, which will give you a feel for how the discussion is going
-and how the current article is related to the last one you read.
-
-In addition, a thread selector makes it easy to browse through a large
-group looking for interesting articles.  You can even browse through the
-articles you've already read and select the one(s) you wish to read again.
-Other nice features include the extract commands for the source and binary
-groups, thread-oriented kill directives, a better newgroup finding strategy,
-and lots more.  See the file NEW for a list of the things that are new to
-trn 3.0 from previous versions.
+This is version 4.0 of trn, the threaded news reader.  This version
+has improved online help, mouse support in xterms, article scoring,
+and other new features.
 
+The trn web page:  http://www.clari.net/~wayne/
diff --git a/news/trn4/pkg-plist b/news/trn4/pkg-plist
index 8779bd949556..a2942f4bc094 100644
--- a/news/trn4/pkg-plist
+++ b/news/trn4/pkg-plist
@@ -1,21 +1,27 @@
-@exec echo "Be sure to edit %D/bin/Pnews and %D/bin/newsetup to set the Distribution codes"
+@exec echo "Be sure to edit %D/bin/Pnews to set the Distribution codes"
 bin/Pnews
 bin/Rnmail
-bin/newsetup
-bin/newsgroups
 bin/nntplist
 bin/trn
 bin/trn-artchk
+lib/trn/HelpFiles/changelog
+lib/trn/HelpFiles/hints
+lib/trn/HelpFiles/quickstart
+lib/trn/HelpFiles/samples/access
+lib/trn/HelpFiles/samples/index
+lib/trn/HelpFiles/samples/trnrc
+lib/trn/HelpFiles/top
 lib/trn/INIT
 lib/trn/Pnews.header
 lib/trn/Speller
+lib/trn/access.def
 lib/trn/filexp
 lib/trn/makedir
 lib/trn/mbox.saver
 lib/trn/newsnews
 lib/trn/norm.saver
-man/man1/trn.1.gz
 man/man1/Pnews.1.gz
 man/man1/Rnmail.1.gz
-man/man1/newsetup.1.gz
-man/man1/newsgroups.1.gz
+man/man1/trn.1.gz
+@dirrm lib/trn/HelpFiles
+@dirrm lib/trn
diff --git a/news/trn4/scripts/preconf b/news/trn4/scripts/preconf
index ec3d3e290137..7365a791d5a9 100644
--- a/news/trn4/scripts/preconf
+++ b/news/trn4/scripts/preconf
@@ -1,7 +1,7 @@
-#!/bin/sh -
+#!/bin/sh
 #
-#	pre-configure script for Trn port to FreeBSD 2.0
-#	$Id: preconf,v 1.2 1995/05/06 11:51:57 ache Exp $
+#	pre-configure script for Trn 4.0 port to FreeBSD
+#	$Id$
 
 PortsDir=$1
   CurDir=$2
@@ -12,8 +12,8 @@ echo "Trn comes with a nice Configure script to help you get things setup."
 echo "Some of the things this script asks you may be a little misleading."
 echo "I (the porter) configured Trn to be as generic as possible."
 echo "It assumes a few things."
-echo "1. You are accessing news via NNTP, you must set the NNTPSERVER"
-echo "   environment variable"
+echo "1. You are accessing news via NNTP, and you set the NNTPSERVER"
+echo "   environment variable to the name of your news server"
 echo "2. You have access to the threads databases (either xover or xthread)"
 echo "3. You have a inews program, otherwise you cannot post."
 echo "   The inews program can be obtained from the inn port."
@@ -41,9 +41,9 @@ if [ ! ${foo} ] ; then
 fi
 
 if [ ${foo} -eq 1 ] ; then
+	ConfigArgs='-f config.sh'
 	#DON'T ALTER INDENTATION
 	cat > ${WrkSrc}/config.sh << 'EOF'
-#!/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,
@@ -51,224 +51,262 @@ if [ ${foo} -eq 1 ] ; then
 # instead choose to run each of the .SH files by yourself, or "Configure -S".
 #
 
-# Configuration time: Sat Oct 22 02:47:18 MDT 1994
-# Configured by: smace
-# Target system: freebsd metal.neosoft.com 2.0.1-development freebsd 2.0.1-development #0: fri oct 21 16:48:01 mdt 1994 root@metal.neosoft.com:/usr/src/sys/compile/metal i386 
+# Package name      : trn
+# Source directory  : .
+# Configuration time: Fri May  1 13:32:29 EDT 1998
+# Configured by     : mph
+# Target system     : freebsd mph124.rh.psu.edu 2.2.6-stable freebsd 2.2.6-stable #3: thu apr 9 10:28:54 edt 1998 mph@mph124.rh.psu.edu:usrsrcsyscompilewopr i386 
 
-d_bsd='define'
-d_eunice='undef'
-d_xenix='undef'
-eunicefix=':'
+Id=''
+Log=''
 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='previous'
-myuname='freebsd metal.neosoft.com 2.0.1-development freebsd 2.0.1-development #0: fri oct 21 16:48:01 mdt 1994 root@metal.neosoft.com:/usr/src/sys/compile/metal i386 '
-srcdir='.'
-vincludes=''
-vpath='.'
-Id='$Id'
-Log='$Log'
-active='none'
-acttimes='nntp'
-d_acttimes='define'
-myactive='.falseactive'
-bin='/usr/local/bin'
-binexp='/usr/local/bin'
-installbin='/usr/local/bin'
-cc='cc'
-ccflags=''
-cppflags=''
-ldflags=''
-lkflags=''
-optimize='-O'
-cf_by='smace'
-cf_time='Sat Oct 22 02:47:18 MDT 1994'
+active='remote'
+acttimes='remote'
+aphostcmd='/bin/hostname'
+archobjs=''
+awk='/usr/bin/awk'
+basename='/usr/bin/basename'
+bash=''
+bin='/PREFIX/bin'
+binexp='/PREFIX/bin'
+byacc=''
+c=''
+cat='/bin/cat'
+cc='__CC__'
+ccflags='__CFLAGS__ -I/PREFIX/include'
+cf_by='mph'
+cf_time='Fri May  1 13:32:29 EDT 1998'
+citydist='none'
+cntrydist='none'
+comm='/usr/bin/comm'
 contains='grep'
+contdist='none'
+cp='/bin/cp'
+cpp='/usr/bin/cpp'
+cppflags='-I/PREFIX/include'
 cpplast='-'
 cppminus='-'
-cpprun='cc -E'
-cppstdin='cc -E'
+cpprun='__CC__ -E'
+cppstdin='__CC__ -E'
+csh='/bin/csh'
+d_acttimes='define'
+d_attribut='define'
+d_berknames='define'
+d_bsd='define'
+d_dirnamlen=''
+d_eunice='undef'
 d_ftime='undef'
-aphostcmd='/bin/hostname'
+d_genauth='define'
+d_getcwd='undef'
+d_getdname='undef'
 d_gethname='define'
-d_phostcmd='define'
-d_uname='undef'
 d_getpwent='define'
-d_getcwd='undef'
+d_gettimeod='define'
 d_getwd='define'
-d_havetlib='define'
-termlib='-ltermlib'
+d_gnulibc='undef'
+d_havetlib='undef'
 d_ignoreorg='undef'
+d_inews='define'
 d_internet='define'
+d_libndir='undef'
+d_local='undef'
 d_memcmp='define'
 d_memcpy='define'
 d_memset='define'
-d_mimeshow='undef'
-d_mimestore='define'
-mimeshow="none"
-mimestore="/usr/local/bin/munpack"
-d_newsadm='undef'
-newsadmin='root'
+d_mkdir='define'
+d_msdos='undef'
+d_newsadm='define'
 d_nntp='define'
-d_xdata='define'
-d_genauth='undef'
-servername='no default'
 d_nolnbuf='undef'
 d_normsig='define'
-jobslib=''
 d_novoid='undef'
-void=''
-d_portable='define'
+d_passnames='define'
+d_phostcmd='define'
+d_portable='undef'
 d_rdchk='undef'
 d_rename='define'
+d_resinit='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_strstr='define'
+d_uname='undef'
 d_usendir='undef'
-libndir=''
-ndirc=''
-ndiro=''
+d_usgnames='undef'
+d_uwait3=''
+d_uwait='define'
 d_vfork='define'
 d_voidsig='define'
-signal_t='void'
+d_voidtty=''
+d_wifstat='define'
+d_xenix='undef'
+d_xthread='define'
+date='/bin/date'
 defeditor='/usr/bin/vi'
-filexp='/usr/local/lib/trn/filexp'
-d_dirnamlen=''
+diff='/usr/bin/diff'
+direntrytype='struct dirent'
+echo='/bin/echo'
+ed='/bin/ed'
+egrep='/usr/bin/egrep'
+eunicefix=':'
+expr='/bin/expr'
+extrainews=''
+filexp='/PREFIX/lib/trn/filexp'
+find=''
+firstmakefile=''
+gccversion='2.7.2.1'
+glibpth='/shlib /usr/shlib /lib/pa1.1 /usr/lib/large /lib /usr/lib /usr/lib/386 /lib/386 /lib/large /usr/lib/small /lib/small /usr/ccs/lib /usr/ucblib /usr/local/lib'
+grep='/usr/bin/grep'
+groupdesc=''
+hint='recommended'
+hostbits='2'
+i_bsdioctl=''
 i_dirent='define'
 i_ptem='undef'
+i_sgtty='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_syssockio=''
+i_systime='define'
+i_syswait='define'
 i_termio='undef'
 i_termios='define'
-i_systime='define'
 i_time='undef'
 i_unistd='define'
+i_utime='define'
 i_vfork='undef'
+incpath=''
+inews='/PREFIX/inews'
+installbin='/PREFIX/bin'
+installinews='/PREFIX/bin'
+installmansrc='/PREFIX/man/man1'
+installprivlib='/PREFIX/lib/trn'
+ispell=''
 ispell_options=''
-ispell_prg='none'
-libc='/usr/lib/libc.so.2.1'
-plibpth='/usr/ccs/lib /usr/lib /usr/ucblib /usr/local/lib'
-xlibpth='/usr/lib/386 /lib/386'
+ispell_prg=''
+jobslib=''
+ksh=''
+ldflags=''
+less=''
+libc='/usr/lib/libc.so.3.1'
+libndir=''
+libpth='/usr/lib /PREFIX/lib'
 libs=' '
-citydist='none'
-cntrydist='none'
-contdist='none'
+lint=''
+lns='/bin/ln -s'
 locdist='none'
-multistatedist='none'
-orgdist='none'
-statedist='none'
+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+mail='/usr/bin/mail'
 mailer='/usr/sbin/sendmail'
 mailfile='/var/mail/%L'
-installmansrc='/usr/local/man/man1'
 manext='1'
-mansrc='/usr/local/man/man1'
-mansrcexp='/usr/local/man/man1'
+mansrc='/PREFIX/man/man1'
+mansrcexp='/PREFIX/man/man1'
 mboxchar='F'
-c=''
+mimecap='/PREFIX/etc/mimecap'
+mips=''
+mips_type=''
+mkdir='/bin/mkdir'
+more='/usr/bin/more'
+multistatedist='none'
+mv='/bin/mv'
+myactive='.falseactive'
+myuname='freebsd mph124.rh.psu.edu 2.2.6-stable freebsd 2.2.6-stable #3: thu apr 9 10:28:54 edt 1998 mph@mph124.rh.psu.edu:usrsrcsyscompilewopr i386 '
 n='-n'
-d_berknames='define'
-d_passnames='define'
-d_usgnames='undef'
 nametype='bsd'
-inewsloc='/usr/local/news/lib/inews'
+ndirc=''
+ndiro=''
+newsadmin='news'
 newslib='/tmp'
 newslibexp='/tmp'
-newsspool='/tmp'
-orgname='none'
+newsspool='none'
+nm_opt=''
+nm_so_opt=''
+nroff='/usr/bin/nroff'
+optimize='none'
+orgdist='none'
+orgname='/etc/organization'
+osname='freebsd'
+osvers='2.2.6-stable'
+overviewdir='remote'
+overviewfmt='none'
 package='trn'
-spackage='Trn'
 pager='/usr/bin/more'
+perl='/usr/bin/perl'
+perlpath='/usr/bin/perl'
+pg='pg'
+pgp=''
 phost='.'
 phostcmd='hostname'
+plibpth=''
+prefix='/PREFIX'
+prefixexp='/PREFIX'
 prefshell='/bin/csh'
-installprivlib='/usr/local/lib/trn'
-privlib='/usr/local/lib/trn'
-privlibexp='/usr/local/lib/trn'
+privlib='/PREFIX/lib/trn'
+privlibexp='/PREFIX/lib/trn'
+rm='/bin/rm'
+rmail='/bin/rmail'
 rootid='0'
+runnm='true'
+sed='/usr/bin/sed'
+sendmail='/usr/sbin/sendmail'
+servername='no default'
 sharpbang='#!'
 shsharp='true'
+signal_t='void'
+smail='smail'
+so='so'
+sort='/usr/bin/sort'
+spackage='Trn'
+spell='spell'
 spitshell='cat'
+src='.'
 startsh='#!/bin/sh'
+statedist='none'
+strftimec=''
+strftimeo=''
+strings='/usr/include/string.h'
+strn='define'
+subscriptions=''
 sysman='/usr/share/man/man1'
-d_usemt='define'
-d_useov='define'
-overviewdir='/tmp'
-threaddir='/tmp'
-trn_init='TRUE'
+tail='/usr/bin/tail'
+termlib='-ltermlib'
+test='/bin/test'
+threaddir='remote'
+tk='undef'
+tkinc=''
+tklibs=''
+tr='/usr/bin/tr'
+trn_init='FALSE'
 trn_select='TRUE'
-nm_opt=''
-runnm='true'
+uname='/usr/bin/uname'
+uniq='/usr/bin/uniq'
+useinews='/PREFIX/bin/inews'
 usenm='true'
-incpath=''
-mips=''
-mips_type=''
+usevfork='true'
 usrinc='/usr/include'
-PATCHLEVEL="3.6 (20 Nov 1994)"
+uuname='/usr/bin/uuname'
+vi='/usr/bin/vi'
+void=''
+vspell=''
+who='/usr/bin/who'
+xlibpth='/usr/lib/386 /lib/386'
+PATCHLEVEL="4.0-test64 (30 April 1998)"
 CONFIG=true
 EOF
 
 fi	# choice = 1
 
 cd ${WrkSrc}
-sh Configure 
+sh Configure ${ConfigArgs}
 cd ${CurDir}
 
 exit 0