Upgrade to inn 2.2-release

4 files changed, 154 insertions, 140 deletions

diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index f63459507adb..74d1e076b1e8 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -1,77 +1,62 @@
 # New ports collection makefile for:	inn
-# Version required:	1.7.2
-# Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
+# Version required:	2.2
+# Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1), 14 Feb 1999 (2.2)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.29 1998/11/07 08:49:32 hoek Exp $
+# $Id: Makefile,v 1.30 1999/01/13 04:17:38 scrappy Exp $
 #
 
-DISTNAME=	inn-1.7.2
+DISTNAME=	inn-2.2
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-Y2K=		http://www.isc.org/y2k.html
-
-# If you want PGP verification of control messages set PGPVERIFY to "DO"
-PGPVERIFY?=	DONT
-
-# 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
-
-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
-
-pre-install:
-	${MKDIR} ${PREFIX}/news
-	${MKDIR} -m 0755 ${PREFIX}/news/sbin && \
-		chown news.news ${PREFIX}/news/sbin
-
-update: build
-	@(cd ${WRKSRC} ; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} update)
-	@${MAKE} ${.MAKEFLAGS} post-install
+Y2K=		http://www.isc.org/inn-y2k.html
+
+USE_GMAKE=YES
+
+.if exists(/var/news)
+INN_NEWSSPOOL?=/var/news
+.else
+INN_NEWSSPOOL?=/var/spool/news
+.endif
+INN_NEWSLIB?=${PREFIX}/news
+INN_NEWSLOG?=/var/log/news
+
+HAS_CONFIGURE=		yes
+CONFIGURE_ENV+=		MANDIR=${PREFIX}/man
+CONFIGURE_ARGS+=	--prefix=${INN_NEWSLIB}
+CONFIGURE_ARGS+=	--with-spool-dir=$INN_NEWSSPOOL}
+CONFIGURE_ARGS+=	--with-log-dir=${INN_NEWSLOG}
+CONFIGURE_ARGS+=	--with-perl
+
+# Various Options. See ${WRKSRC}/INSTALL for details
+
+# Use tagged hash table for the history database. Uses much less memory but
+# is somewhat slower
+#CONFIGURE_ARGS+=	--enable-tagged-hash
+
+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
 
 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; \
-		${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; \
-	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-current/distinfo b/news/inn-current/distinfo
index af3e7e0ff049..2de21278e4bf 100644
--- a/news/inn-current/distinfo
+++ b/news/inn-current/distinfo
@@ -1 +1 @@
-MD5 (inn-1.7.2.tar.gz) = 91bd5fedf0111e0476229e13932c5cf4
+MD5 (inn-2.2.tar.gz) = 9c8cb250d56428af06c7c49f7d8d1a29
diff --git a/news/inn-current/files/innd.sh b/news/inn-current/files/innd.sh
index 61c1d6601c18..48bf27abf86e 100644
--- a/news/inn-current/files/innd.sh
+++ b/news/inn-current/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.dir ]; then
+      limits -C news !!PREFIX!!/news/bin/rc.news && echo ' inn'
    fi
 fi
 if [ x$1 = xstop ]; then
diff --git a/news/inn-current/pkg-plist b/news/inn-current/pkg-plist
index 0d4f61280d61..e3ce3a136e0c 100644
--- a/news/inn-current/pkg-plist
+++ b/news/inn-current/pkg-plist
@@ -1,96 +1,125 @@
-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
+etc/rc.d/innd.sh