New port inn2.2-stable after repository copy.

Thanks to the ports meister ;-)
The new features are really cool (cnfs,...).
BTW, why can't we use raw partitions for cnfs ???

Please read the file INSTALL carefully in the top level
dir of sources ... it explains installation step by step.

You still might have to watch for console messages,
complaining about missing file or directories (news.times
for example).

All in all. inn22 is really fun !

6 files changed, 265 insertions, 126 deletions

diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index f63459507adb..1e5f96083957 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -3,46 +3,56 @@
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.29 1998/11/07 08:49:32 hoek Exp $
+# $Id: Makefile,v 1.28 1998/08/16 18:56:31 hoek Exp $
 #
 
-DISTNAME=	inn-1.7.2
+DISTNAME=	inn-STABLE_2_2-1999-02-14_03-02
+PKGNAME=	inn-stable-v22
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
+MASTER_SITES=	ftp://ftp.isc.org/isc/inn/snapshots/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.ORG
 
-Y2K=		http://www.isc.org/y2k.html
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=--prefix=${PREFIX}/news
+CONFIGURE_ARGS+=--infodir=${PREFIX}/info
+CONFIGURE_ARGS+=--mandir=${PREFIX}/man
+CONFIGURE_ARGS+=--with-spool-dir=/var/spool/news
+CONFIGURE_ARGS+=--with-log-dir=/var/log/news
+CONFIGURE_ARGS+=--with-tmp-path=/tmp
 
-# If you want PGP verification of control messages set PGPVERIFY to "DO"
-PGPVERIFY?=	DONT
+# Highly recommended, because many of the really good spam filters
+# are written in Perl
+CONFIGURE_ARGS+=--with-perl
+# if server has less than 256 MB RAM
+CONFIGURE_ARGS+=--enable-tagged-hash
+# Do not create static libraries
+CONFIGURE_ARGS+=--disable-static
 
-# TCL and/or PERL support is needed for writing filters
-# if you want to enable tcl support, set USE_TCL to "DO"
-# if you want to enable perl5 support, set USE_PERL5 to "DO"
-#USE_TCL?=	DO
-#USE_PERL5?=	DO
+# Most available filters seem to be written in Perl these days,
+# so you can safely leave out TCL support.
+#CONFIGURE_ARGS+=--with-tcl
+# Do not create shared libraries
+#CONFIGURE_ARGS+=--disable-shared
 
-SCRIPTS_ENV=	PGPVERIFY=${PGPVERIFY} USE_TCL=${USE_TCL} \
-		USE_PERL5=${USE_PERL5} PERL_VERSION=${PERL_VERSION}
-
-
-NO_PACKAGE=	"Too many compile-time options"
-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 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
+MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 innfeed.1 \
+	installit.1 nntpget.1 rnews.1 shlock.1 shrinkfile.1 startinnfeed.1 \
+	subst.1
+MAN3=	clientlib.3 dbz.3 inndcomm.3 libinn.3 libstorage.3 parsedate.3 qio.3 \
+	wildmat.3
+MAN5=	active.5 control.ctl.5 cycbuff.conf.5 distrib.pats.5 expire.ctl.5 \
+	history.5 incoming.conf.5 inn.conf.5 innfeed.conf.5 innwatch.ctl.5 \
+	moderators.5 motd.news.5 newsfeeds.5 newslog.5 nnrp.access.5 \
+	nnrpd.track.5 nntpsend.ctl.5 overview.ctl.5 overview.fmt.5 \
+	passwd.nntp.5 storage.conf.5 storage.ctl.5
+MAN8=	actived.8 actsync.8 actsyncd.8 archive.8 batcher.8 buffchan.8 \
+	cnfsstat.8 controlchan.8 crosspost.8 ctlinnd.8 cvtbatch.8 expire.8 \
+	expireindex.8 expireover.8 expirerm.8 fastrm.8 filechan.8 inncheck.8 \
+	innd.8 inndf.8 innreport.8 innstat.8 innwatch.8 innxbatch.8 innxmit.8 \
+	mailpost.8 makeactive.8 makehistory.8 news-recovery.8 news.daily.8 \
+	news2mail.8 newslog.8 newsrequeue.8 nnrpd.8 nntpsend.8 overchan.8 \
+	pgpverify.8 prunehistory.8 pullnews.8 scanlogs.8 send-uucp.8 sm.8 \
+	tally.control.8 tally.unwanted.8 writelog.8
 
 pre-install:
 	${MKDIR} ${PREFIX}/news
@@ -54,24 +64,22 @@ update: build
 	@${MAKE} ${.MAKEFLAGS} post-install
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/libinn.a ${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/include/inndcomm.h ${PREFIX}/include/
-	${INSTALL_DATA} ${WRKSRC}/include/libinn.h ${PREFIX}/include/
-	${INSTALL_DATA} ${WRKSRC}/include/qio.h ${PREFIX}/include/
-	if [ -d /var/spool/news ] && [ ! -d /var/news ]; then \
-		${MKDIR} -m 0775 /var/spool/news/over.view; \
-		chown news.news /var/spool/news/over.view; \
+	if [ ! -d /var/spool/news ]; then \
+		${MKDIR} -m 0775 /var/spool/news/articles; \
+		chown news.news /var/spool/news/articles; \
+		${MKDIR} -m 0775 /var/spool/news/cycbuffs; \
+		chown news.news /var/spool/news/cycbuffs; \
+		${MKDIR} -m 0775 /var/spool/news/innfeed; \
+		chown news.news /var/spool/news/innfeed; \
+		${MKDIR} -m 0775 /var/spool/news/outgoing; \
+		chown news.news /var/spool/news/outgoing; \
+		${MKDIR} -m 0775 /var/spool/news/overview; \
+		chown news.news /var/spool/news/overview; \
 		${MKDIR} -m 0775 /var/spool/news/tmp; \
 		chown news.news /var/spool/news/tmp; \
-	else \
-		${MKDIR} -m 0775 /var/news/over.view; \
-		chown news.news /var/news/over.view; \
-		${MKDIR} -m 0775 /var/news/tmp; \
-		chown news.news /var/news/tmp; \
+		${MKDIR} -m 0775 /var/spool/news/uniover; \
+		chown news.news /var/spool/news/uniover; \
 	fi
-	${MKDIR} ${PREFIX}/news/locks
-	chown news.news ${PREFIX}/news/locks
-	chmod 0755 ${PREFIX}/news/locks
 	${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
 		s+!!PREFIX!!+${PREFIX}+g && chmod +x ${PREFIX}/etc/rc.d/innd.sh
 
diff --git a/news/inn-stable/distinfo b/news/inn-stable/distinfo
index af3e7e0ff049..cba673c0daed 100644
--- a/news/inn-stable/distinfo
+++ b/news/inn-stable/distinfo
@@ -1 +1 @@
-MD5 (inn-1.7.2.tar.gz) = 91bd5fedf0111e0476229e13932c5cf4
+MD5 (inn-STABLE_2_2-1999-02-14_03-02.tar.gz) = b8fdc29a35551f1dd4c31e46026755aa
diff --git a/news/inn-stable/files/innd.sh b/news/inn-stable/files/innd.sh
index 61c1d6601c18..20e819b0ad24 100644
--- a/news/inn-stable/files/innd.sh
+++ b/news/inn-stable/files/innd.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ $# -eq 0 -o x$1 = xstart ]; then
-   if [ -x !!PREFIX!!/etc/rc.news -a -f !!PREFIX!!/news/lib/history.pag ]; then
-      limits -C news !!PREFIX!!/etc/rc.news && echo ' inn'
+   if [ -x !!PREFIX!!/news/bin/rc.news -a -f !!PREFIX!!/news/db/history.pag ]; then
+      limits -C news !!PREFIX!!/bin/rc.news && echo ' inn'
    fi
 fi
 if [ x$1 = xstop ]; then
diff --git a/news/inn-stable/pkg-comment b/news/inn-stable/pkg-comment
index 3990129e8d95..ca8391923c42 100644
--- a/news/inn-stable/pkg-comment
+++ b/news/inn-stable/pkg-comment
@@ -1 +1 @@
-InterNetNews -- the Internet meets Netnews.
+InterNetNews Version 2 -- the Internet meets Netnews.
diff --git a/news/inn-stable/pkg-descr b/news/inn-stable/pkg-descr
index 826deb638f44..2ee5673e5a66 100644
--- a/news/inn-stable/pkg-descr
+++ b/news/inn-stable/pkg-descr
@@ -2,3 +2,12 @@ InterNetNews is a complete Usenet system.  The cornerstone of the package
 is innd, an NNTP server that multiplexes all I/O. Newsreading is handled
 by a separate server, nnrpd, that is spawned for each client.  Both innd
 and nnrpd have some slight variances from the NNTP protocol.
+
+This is the new version 2.x, maintained by the ISC
+
+Installation is relatively complex but nicely explained in the
+file INSTALL, see the inn2 sources under the work directory.
+
+More infos:
+
+	http://www.isc.org/
diff --git a/news/inn-stable/pkg-plist b/news/inn-stable/pkg-plist
index 0d4f61280d61..4efabd778548 100644
--- a/news/inn-stable/pkg-plist
+++ b/news/inn-stable/pkg-plist
@@ -1,96 +1,218 @@
-bin/inews
-bin/rnews
-etc/rc.news
-etc/rc.d/innd.sh
-include/inndcomm.h
-include/libinn.h
-include/qio.h
-lib/libinn.a
-sbin/innd
-sbin/inndstart
-sbin/in.nnrpd
-news/lib/overview.fmt
-news/lib/parsecontrol
-news/lib/send-ihave
-news/lib/send-nntp
-news/lib/send-uucp
-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
-news/lib/moderators
-news/lib/control.ctl
-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/bin/actived
+news/bin/actmerge
+news/bin/actsync
+news/bin/actsyncd
+news/bin/archive
+news/bin/batcher
+news/bin/buffchan
+news/bin/cnfsstat
 news/bin/control/checkgroups
+news/bin/control/checkgroups.pl
 news/bin/control/default
 news/bin/control/ihave
+news/bin/control/ihave.pl
 news/bin/control/newgroup
+news/bin/control/newgroup.pl
 news/bin/control/rmgroup
+news/bin/control/rmgroup.pl
 news/bin/control/sendme
+news/bin/control/sendme.pl
 news/bin/control/sendsys
+news/bin/control/sendsys.pl
 news/bin/control/senduuname
+news/bin/control/senduuname.pl
 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
+news/bin/control/version.pl
+news/bin/controlbatch
+news/bin/controlchan
+news/bin/convdate
+news/bin/crosspost
 news/bin/ctlinnd
-news/bin/getlist
-news/bin/innconfval
-news/bin/archive
-news/bin/batcher
-news/bin/buffchan
 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/expireindex
 news/bin/expireover
+news/bin/expirerm
 news/bin/fastrm
+news/bin/filechan
+news/bin/filter/filter.tcl
+news/bin/filter/filter_innd.pl
+news/bin/filter/filter_nnrpd.pl
+news/bin/filter/nnrpd_auth.pl
+news/bin/filter/startup.tcl
+news/bin/filter/startup_innd.pl
+news/bin/getlist
 news/bin/grephistory
+news/bin/inews
+news/bin/inncheck
+news/bin/innconfval
+news/bin/innd
+news/bin/inndf
+news/bin/inndstart
+news/bin/innfeed
+news/bin/innfeed-convcfg
+news/bin/innmail
+news/bin/innreport
+news/bin/innstat
+news/bin/innwatch
+news/bin/innxbatch
+news/bin/innxmit
+news/bin/mailpost
 news/bin/makeactive
 news/bin/makehistory
-news/bin/newsrequeue
-news/bin/prunehistory
-news/bin/writelog
-news/bin/innmail
+news/bin/mod-active
 news/bin/news.daily
-news/bin/scanlogs
-news/bin/expirerm
-news/bin/tally.control
-news/bin/tally.unwanted
+news/bin/news2mail
+news/bin/newsrequeue
+news/bin/nnrpd
+news/bin/nntpget
 news/bin/nntpsend
-news/bin/sendbatch
-news/bin/inncheck
-news/bin/innstat
+news/bin/overchan
+news/bin/parsecontrol
 news/bin/pgpverify
-news/bin/innwatch
+news/bin/procbatch
+news/bin/prunehistory
+news/bin/pullnews
+news/bin/rc.news
+news/bin/rnews
+news/bin/rnews.libexec/c7unbatch
+news/bin/rnews.libexec/decode
+news/bin/rnews.libexec/encode
+news/bin/rnews.libexec/gunbatch
+news/bin/scanlogs
 news/bin/scanspool
+news/bin/send-ihave
+news/bin/send-nntp
+news/bin/send-uucp
+news/bin/sendbatch
+news/bin/sendxbatches
+news/bin/shlock
+news/bin/shrinkfile
+news/bin/simpleftp
+news/bin/sm
+news/bin/startinnfeed
+news/bin/tally.control
+news/bin/writelog
+news/etc/actsync.cfg
+news/etc/actsync.ign
+news/etc/control.ctl
+news/etc/cycbuff.conf
+news/etc/distrib.pats
+news/etc/expire.ctl
+news/etc/incoming.conf
+news/etc/inn.conf
+news/etc/innfeed.conf
+news/etc/innreport.conf
+news/etc/innwatch.ctl
+news/etc/moderators
+news/etc/motd.news
+news/etc/news2mail.cf
+news/etc/newsfeeds
+news/etc/nnrp.access
+news/etc/nnrpd.track
+news/etc/nntpsend.ctl
+news/etc/overview.ctl
+news/etc/overview.fmt
+news/etc/passwd.nntp
+news/etc/storage.conf
+news/lib/docheckgroups
+news/lib/innreport_inn.pm
+news/lib/innshellvars
+news/lib/innshellvars.pl
+news/lib/innshellvars.tcl
+news/lib/libinn.a
+news/lib/libstorage.a
+man/man1/convdate.1.gz
+man/man1/getlist.1.gz
+man/man1/grephistory.1.gz
+man/man1/inews.1.gz
+man/man1/innconfval.1.gz
+man/man1/innfeed.1.gz
+man/man1/installit.1.gz
+man/man1/nntpget.1.gz
+man/man1/rnews.1.gz
+man/man1/shlock.1.gz
+man/man1/shrinkfile.1.gz
+man/man1/startinnfeed.1.gz
+man/man1/subst.1.gz
+man/man3/clientlib.3.gz
+man/man3/dbz.3.gz
+man/man3/inndcomm.3.gz
+man/man3/libinn.3.gz
+man/man3/libstorage.3.gz
+man/man3/parsedate.3.gz
+man/man3/qio.3.gz
+man/man3/wildmat.3.gz
+man/man5/active.5.gz
+man/man5/control.ctl.5.gz
+man/man5/cycbuff.conf.5.gz
+man/man5/distrib.pats.5.gz
+man/man5/expire.ctl.5.gz
+man/man5/history.5.gz
+man/man5/incoming.conf.5.gz
+man/man5/inn.conf.5.gz
+man/man5/innfeed.conf.5.gz
+man/man5/innwatch.ctl.5.gz
+man/man5/moderators.5.gz
+man/man5/motd.news.5.gz
+man/man5/newsfeeds.5.gz
+man/man5/newslog.5.gz
+man/man5/nnrp.access.5.gz
+man/man5/nnrpd.track.5.gz
+man/man5/nntpsend.ctl.5.gz
+man/man5/overview.ctl.5.gz
+man/man5/overview.fmt.5.gz
+man/man5/passwd.nntp.5.gz
+man/man5/storage.conf.5.gz
+man/man5/storage.ctl.5.gz
+man/man8/actived.8.gz
+man/man8/actsync.8.gz
+man/man8/actsyncd.8.gz
+man/man8/archive.8.gz
+man/man8/batcher.8.gz
+man/man8/buffchan.8.gz
+man/man8/cnfsstat.8.gz
+man/man8/controlchan.8.gz
+man/man8/crosspost.8.gz
+man/man8/ctlinnd.8.gz
+man/man8/cvtbatch.8.gz
+man/man8/expire.8.gz
+man/man8/expireindex.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/inndf.8.gz
+man/man8/innreport.8.gz
+man/man8/innstat.8.gz
+man/man8/innwatch.8.gz
+man/man8/innxbatch.8.gz
+man/man8/innxmit.8.gz
+man/man8/mailpost.8.gz
+man/man8/makeactive.8.gz
+man/man8/makehistory.8.gz
+man/man8/news-recovery.8.gz
+man/man8/news.daily.8.gz
+man/man8/news2mail.8.gz
+man/man8/newslog.8.gz
+man/man8/newsrequeue.8.gz
+man/man8/nnrpd.8.gz
+man/man8/nntpsend.8.gz
+man/man8/overchan.8.gz
+man/man8/pgpverify.8.gz
+man/man8/prunehistory.8.gz
+man/man8/pullnews.8.gz
+man/man8/scanlogs.8.gz
+man/man8/send-uucp.8.gz
+man/man8/sm.8.gz
+man/man8/tally.control.8.gz
+man/man8/tally.unwanted.8.gz
+man/man8/writelog.8.gz
+@dirrm news/bin/control
+@dirrm news/bin/filter
+@dirrm news/bin/rnews.libexec
+@dirrm news/bin
+@dirrm news/etc
+@dirrm news/lib