3 files changed, 73 insertions, 36 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 5863858f07af..dcc95ae74ffd 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,34 +1,40 @@
 # New ports collection makefile for:	inn
-# Version required:	1.4
-# Date created:		20 Oct 1994
+# Version required:	1.5.1
+# Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.20 1996/12/08 05:08:58 max Exp $
+# $Id: Makefile,v 1.21 1996/12/08 05:13:24 max Exp $
 #
 
-DISTNAME=	inn1.4sec
-PKGNAME=	inn-1.4
+DISTNAME=	inn-1.5.1
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
-PATCH_SITES=	ftp://ftp.math.psu.edu/pub/INN/patches/OLD/
-PATCHFILES=	select-loop-bug.patch innxmit-long-lines.patch
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
+# If you want PGP verification of control messages set PGPVERIFY to "DO"
+PGPVERIFY?=	DONT
+
+# FreeBSD 2.2 comes with tcl in the base system, so it's enabled by default
+# if you want to disable tcl support, set USE_TCL to "DONT"
+# if you want to enable perl5 support, set USE_PERL5 to "DO"
+USE_TCL?=	DO
+USE_PERL5?=	DONT
+
 NO_PACKAGE=	"Too many compile-time options"
-NO_WRKSUBDIR=	yes
 MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 installit.1 \
-	nntpget.1 rnews.1 shlock.1 shrinkfile.1 subst.1 
-MAN3=	clientlib.3 ddbz.3 inndcomm.3 libinn.3 parsedate.3 qio.3 wildmat.3 
-MAN5=	active.5 control.ctl.5 expire.ctl.5 history.5 hosts.nntp.5 \
-	inn.conf.5 innwatch.ctl.5 moderators.5 newsfeeds.5 newslog.5 \
-	nnrp.access.5 nntpsend.ctl.5 overview.fmt.5 distrib.pats.5 \
-	passwd.nntp.5 
-MAN8=	archive.8 batcher.8 buffchan.8 ctlinnd.8 cvtbatch.8 expire.8  \
-	expireover.8 fastrm.8 filechan.8 innd.8 innxmit.8 news-recovery.8 \
-	news.daily.8 newslog.8 nnrpd.8 nntpsend.8 overchan.8 prunehistory.8
+	nntpget.1 rnews.1 shlock.1 shrinkfile.1 subst.1
+MAN3=	clientlib.3 dbz.3 inndcomm.3 libinn.3 parsedate.3 qio.3 wildmat.3
+MAN5=	active.5 control.ctl.5 distrib.pats.5 expire.ctl.5 history.5 \
+	hosts.nntp.5 inn.conf.5 innwatch.ctl.5 moderators.5 newsfeeds.5 \
+	newslog.5 nnrp.access.5 nntpsend.ctl.5 overview.fmt.5 passwd.nntp.5
+MAN8=	actsync.8 archive.8 batcher.8 buffchan.8 crosspost.8 ctlinnd.8 \
+	cvtbatch.8 expire.8 expireover.8 expirerm.8 fastrm.8 filechan.8 \
+	inncheck.8 innd.8 innlog.pl.8 innstat.8 innwatch.8 innxbatch.8 \
+	innxmit.8 makeactive.8 makehistory.8 news-recovery.8 nnrpd.8 \
+	news.daily.8 newslog.8 newsrequeue.8 nntpsend.8 overchan.8 \
+	prunehistory.8 scanlogs.8 tally.control.8 tally.unwanted.8 writelog.8
 
 pre-configure:
 	echo "${CFLAGS}" >/tmp/build-ports-news-inn-cflags
diff --git a/news/inn/distinfo b/news/inn/distinfo
index 159c506a457a..096a250524e7 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,3 +1 @@
-MD5 (inn1.4sec.tar.Z) = 6c916baf2b7029b13caf2701f2406e50
-MD5 (select-loop-bug.patch) = 85b0ac32f130ab9cfb5c640ebf99d864
-MD5 (innxmit-long-lines.patch) = 3b0ee87ae6d9e5e39470df777f515397
+MD5 (inn-1.5.1.tar.gz) = 555d50c42ba08ece16c6cdfa392e0ca4
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index 87c179ac37b7..a0ab2e0a4ecc 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -1,13 +1,13 @@
 bin/inews
 bin/rnews
-lib/libinn.a
-include/inndcomm.h
-include/libinn.h
-include/qio.h
 etc/innd
 etc/inndstart
 etc/in.nnrpd
 etc/rc.news
+include/inndcomm.h
+include/libinn.h
+include/qio.h
+lib/libinn.a
 man/man1/getlist.1.gz
 man/man1/grephistory.1.gz
 man/man1/inews.1.gz
@@ -41,33 +41,51 @@ man/man5/overview.fmt.5.gz
 man/man5/passwd.nntp.5.gz
 man/man5/control.ctl.5.gz
 man/man5/nnrp.access.5.gz
+man/man8/archive.8.gz
 man/man8/batcher.8.gz
 man/man8/buffchan.8.gz
+man/man8/crosspost.8.gz
 man/man8/ctlinnd.8.gz
-man/man8/cvtbatch.8.gz
 man/man8/expire.8.gz
 man/man8/expireover.8.gz
+man/man8/expirerm.8.gz
 man/man8/fastrm.8.gz
 man/man8/filechan.8.gz
+man/man8/inncheck.8.gz
 man/man8/innd.8.gz
-man/man8/news-recovery.8.gz
+man/man8/innlog.pl.8.gz
+man/man8/innwatch.8.gz
+man/man8/innxbatch.8.gz
+man/man8/innxmit.8.gz
+man/man8/makeactive.8.gz
+man/man8/makehistory.8.gz
+man/man8/nnrpd.8.gz
 man/man8/news.daily.8.gz
 man/man8/newslog.8.gz
-man/man8/nnrpd.8.gz
 man/man8/nntpsend.8.gz
-man/man8/prunehistory.8.gz
-man/man8/archive.8.gz
-man/man8/innxmit.8.gz
 man/man8/overchan.8.gz
-news/lib/overview.fmt
+man/man8/prunehistory.8.gz
+man/man8/scanlogs.8.gz
+man/man8/tally.control.8.gz
+man/man8/writelog.8.gz
+man/man8/cvtbatch.8.gz
+man/man8/actsync.8.gz
+man/man8/innstat.8.gz
+man/man8/news-recovery.8.gz
+man/man8/newsrequeue.8.gz
+man/man8/tally.unwanted.8.gz
 news/lib/parsecontrol
 news/lib/send-ihave
 news/lib/send-nntp
 news/lib/send-uucp
-news/lib/innlog.awk
+news/lib/innlog.pl
 news/lib/innshellvars
+news/lib/innshellvars.pl
+news/lib/innshellvars.tcl
+news/lib/innshellvars.csh
 news/lib/newsfeeds
 news/lib/hosts.nntp
+news/lib/hosts.nntp.nolimit
 news/lib/nnrp.access
 news/lib/passwd.nntp
 news/lib/inn.conf
@@ -77,6 +95,9 @@ news/lib/expire.ctl
 news/lib/nntpsend.ctl
 news/lib/innwatch.ctl
 news/lib/distrib.pats
+news/lib/actsync.cfg
+news/lib/actsync.ign
+news/lib/overview.fmt
 news/bin/control/checkgroups
 news/bin/control/default
 news/bin/control/ihave
@@ -87,6 +108,12 @@ news/bin/control/sendsys
 news/bin/control/senduuname
 news/bin/control/version
 news/bin/control/docheckgroups
+news/bin/control/startup_innd.pl
+news/bin/control/filter_innd.pl
+news/bin/control/filter_nnrpd.pl
+news/bin/control/startup.tcl
+news/bin/control/filter.tcl
+news/bin/control/sample.control
 news/bin/rnews/c7unbatch
 news/bin/rnews/decode
 news/bin/rnews/encode
@@ -100,9 +127,15 @@ news/bin/cvtbatch
 news/bin/filechan
 news/bin/nntpget
 news/bin/innxmit
+news/bin/innxbatch
 news/bin/overchan
 news/bin/shlock
 news/bin/shrinkfile
+news/bin/crosspost
+news/bin/sendxbatches
+news/bin/actsync
+news/bin/actsyncd
+news/bin/actmerge
 news/bin/convdate
 news/bin/expire
 news/bin/expireover
@@ -112,7 +145,6 @@ news/bin/makeactive
 news/bin/makehistory
 news/bin/newsrequeue
 news/bin/prunehistory
-news/bin/makegroup
 news/bin/writelog
 news/bin/news.daily
 news/bin/scanlogs
@@ -121,7 +153,8 @@ news/bin/tally.control
 news/bin/tally.unwanted
 news/bin/nntpsend
 news/bin/sendbatch
-news/bin/ctlrun
 news/bin/inncheck
 news/bin/innstat
+news/bin/pgpverify
 news/bin/innwatch
+news/bin/scanspool