Update "inn" package to version 2.3.1. Changes since version 2.2.3:

 INN 2.3.0 represents a significant architectural change to INN, with a
 completely new internal overview interface, three new overview mechanisms,
 two new article storage mechanisms, and the elimination of quite a few old
 interfaces and old code.
The NetBSD package furthermore includes IPv6 support and a new style
startup script with backwards compatibility.

14 files changed, 157 insertions, 222 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 47187b5e5b7..94547acaa2b 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2001/01/26 05:21:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.22 2001/02/08 16:23:06 tron Exp $
 
-DISTNAME=		inn-2.2.3
+DISTNAME=		inn-2.3.1
 CATEGORIES=		news
 MASTER_SITES=		ftp://ftp.isc.org/isc/inn/ \
 			ftp://ftp.sunet.se/pub/news/nntp/inn/ \
@@ -11,14 +11,18 @@ HOMEPAGE=		http://www.isc.org/inn.html
 
 CONFLICTS+=		nntpclnt-*
 
+PATCH_SITES=		ftp://ftp.north.ad.jp/pub/IPv6/INN/
+PATCHFILES=		inn-2.3.1-v6-20010204.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 INN_DATA_DIR?=		/var/news
 
-USE_PERL5=		# defined
-USE_LIBTOOL=		# defined
-HAS_CONFIGURE=		# defined
+USE_PERL5=		YES
+HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}/inn \
+			--enable-uucp-rnews \
 			--mandir=${PREFIX}/man \
-			--with-perl --with-tmp-path=/tmp \
+			--with-perl --with-tmp-path=${INN_DATA_DIR}/tmp \
 			--with-db-dir=${INN_DATA_DIR}/db \
 			--with-etc-dir=${INN_DATA_DIR}/etc \
 			--with-log-dir=${INN_DATA_DIR}/log \
@@ -28,6 +32,13 @@ CONFIGURE_ENV+=		_PATH_PERL=${PERL5}
 
 .include "../../mk/bsd.prefs.mk"
 
+# IPv6 support
+.if defined(USE_INET6) && ${USE_INET6} == YES
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=	--with-sendmail=/usr/lib/sendmail
 .else
@@ -61,10 +72,11 @@ pre-install:
 	${MKDIR} ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/inn
 
 post-install:
+	${RM} -f ${PREFIX}/bin/inews
 	${LN} -s ../inn/bin/inews ${PREFIX}/bin/inews
 	${MKDIR} ${PREFIX}/share/examples/inn
 	for FILE in `ls -1 ${WRKSRC}/samples/* | \
-		     ${EGREP} -v '\.(in|orig)$'`; do \
+		     ${EGREP} -v '(Makefile|.*\.(in|orig)$$)'`; do \
 	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/inn; \
 	done
 	cd ${WRKSRC}/site && \
diff --git a/news/inn/files/innd.sh b/news/inn/files/innd.sh
index aa6182a77cb..f53fd2d1cf6 100644
--- a/news/inn/files/innd.sh
+++ b/news/inn/files/innd.sh
@@ -1,25 +1,45 @@
 #!/bin/sh
 #
-# $NetBSD: innd.sh,v 1.7 1999/07/29 21:15:46 tron Exp $
-#
-if [ -x @@PREFIX@@/inn/bin/rc.news -a -s @@INN_DATA_DIR@@/db/active ];
+# $NetBSD: innd.sh,v 1.8 2001/02/08 16:23:06 tron Exp $
+
+if [ -x @@PREFIX@@/inn/bin/rc.news -a -s @@INN_DATA_DIR@@/db/active ]
 then
- su news -c @@PREFIX@@/inn/bin/rc.news >/dev/null
+	if [ ! -f @@PREFIX@@/etc/nntp/server ]
+	then
+		hostname >@@PREFIX@@/etc/nntp/server
+	fi
 
- if [ ! -f @@PREFIX@@/etc/nntp/server ]
- then
-  hostname >@@PREFIX@@/etc/nntp/server
- fi
+	if [ ! -f @@PREFIX@@/etc/nntp/domainname ]
+	then
+		(set - X `grep ^fromhost: @@INN_DATA_DIR@@/etc/inn.conf`
+		if [ $# -eq 3 ]
+		then
+			echo $3 >@@PREFIX@@/etc/nntp/domainname
+		fi)
+	fi
 
- if [ ! -f @@PREFIX@@/etc/nntp/domainname ]
- then
-  set - X `grep -w ^fromhost: @@INN_DATA_DIR@@/etc/inn.conf | head -1`
-  if [ $# -eq 3 ]
-  then
-   echo $3 >@@PREFIX@@/etc/nntp/domainname
-  fi
- fi
+	if [ $# -eq 0 ]
+	then
+		echo -n ' innd'
+		su news -c "@@PREFIX@@/inn/bin/rc.news start" >/dev/null
+		exit 0
+	fi
 
- echo -n ' innd'
+	case "$1" in
+	start | stop)
+		su news -c "@@PREFIX@@/inn/bin/rc.news $1"
+		exit 0
+		;;
+	restart )
+		$0 stop
+		sleep 5
+		exec $0 start
+		;;
+	* )
+		echo "Usage: $0 (start|stop|restart)"
+		exit 1
+		;;
+	esac
 fi
+
 exit 0
diff --git a/news/inn/files/md5 b/news/inn/files/md5
index 682c1079bb5..f596343e99d 100644
--- a/news/inn/files/md5
+++ b/news/inn/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.4 2000/09/01 20:16:59 veego Exp $
+$NetBSD: md5,v 1.5 2001/02/08 16:23:06 tron Exp $
 
-MD5 (inn-2.2.3.tar.gz) = 0c0f71d79cc2b4fbd5bad4a7f093f53f
+MD5 (inn-2.3.1.tar.gz) = 2032f076fb18f5fa87c8b763e83fbdd4
+MD5 (inn-2.3.1-v6-20010204.diff.gz) = f4c8fa7f290cf4ba9d5ac465e366a0ff
diff --git a/news/inn/files/patch-sum b/news/inn/files/patch-sum
index 1a1330a00db..160fef2d2ba 100644
--- a/news/inn/files/patch-sum
+++ b/news/inn/files/patch-sum
@@ -1,10 +1,9 @@
-$NetBSD: patch-sum,v 1.11 2000/09/01 20:16:59 veego Exp $
+$NetBSD: patch-sum,v 1.12 2001/02/08 16:23:06 tron Exp $
 
-MD5 (patch-aa) = ead4ab4be11008849e115d08b82344f3
-MD5 (patch-ab) = 69a4b8bfa51950f4d1fac766e906cc97
-MD5 (patch-ac) = 808e2c3c73f842c5e4907c20dc0e30f1
-MD5 (patch-ad) = 3eec593f7b8efe5ec284887f713d4ddd
-MD5 (patch-ae) = 6e561b9181179eda11f99e247c7e3e0e
-MD5 (patch-af) = d8eac199c981d82eed4b454bc20115f7
-MD5 (patch-ah) = 3a87d8d980c0beab113268d18388ecb5
-MD5 (patch-ai) = 6826b9e835b9157f22cd1dc4251d5810
+MD5 (patch-aa) = aecdf8765d7f087f028410f87c0d72b0
+MD5 (patch-ab) = 99a110bac958f68157766c648fc5f82a
+MD5 (patch-ac) = 9b7c550f347d0791e2f1fd7a14e10343
+MD5 (patch-ad) = 43a0140ae013d4068b9749df816aa191
+MD5 (patch-ae) = 84d20f6fdd7661b7d54dc10eefadd43a
+MD5 (patch-af) = c26a093bdf776f481c7fc8127546e04b
+MD5 (patch-ah) = 7accf7fe26075b1029ce7b75abce9d1c
diff --git a/news/inn/patches/patch-aa b/news/inn/patches/patch-aa
index 7582bdbdd49..f7b8738e21c 100644
--- a/news/inn/patches/patch-aa
+++ b/news/inn/patches/patch-aa
@@ -1,42 +1,19 @@
-$NetBSD: patch-aa,v 1.7 2000/09/01 20:16:59 veego Exp $
+$NetBSD: patch-aa,v 1.8 2001/02/08 16:23:06 tron Exp $
 
---- configure	Wed Jul 19 01:54:07 2000
-+++ configure	Fri Sep  1 21:42:33 2000
-@@ -1019,20 +1019,9 @@
- 
- 
- 
--LIBTOOL=''
--UPLIBTOOL=''
--EXTOBJ='o'
--EXTLIB='a'
--# Check whether --enable-libtool or --disable-libtool was given.
--if test "${enable_libtool+set}" = set; then
--  enableval="$enable_libtool"
--  if test "$enableval" = yes; then
--  LIBTOOL='$(SHELL) ../libtool'
--  UPLIBTOOL='$(SHELL) ../../libtool'
--  EXTOBJ='lo'
--  EXTLIB='la'
--fi
--fi
-+UPLIBTOOL="${LIBTOOL}"
-+EXTOBJ='lo'
-+EXTLIB='la'
- 
- 
- 
-@@ -1291,7 +1280,7 @@
- 
- 
- RNEWSGRP=$NEWSGRP
--RNEWSMODE=0500
-+RNEWSMODE=4555
- # Check whether --enable-uucp-rnews or --disable-uucp-rnews was given.
+--- configure.orig	Mon Feb  5 10:10:58 2001
++++ configure	Mon Feb  5 10:21:23 2001
+@@ -953,8 +953,7 @@
  if test "${enable_uucp_rnews+set}" = set; then
    enableval="$enable_uucp_rnews"
-@@ -1582,7 +1571,7 @@
-   SET_MAKE="MAKE=${MAKE-make}"
+   if test "x$enableval" = xyes ; then
+-        RNEWSGRP=uucp
+-        RNEWSMODE=4550
++        RNEWSMODE=4555
+     fi
+ fi
+ 
+@@ -2333,7 +2332,7 @@
+   echo "$ac_t""no" 1>&6
  fi
  
 -for ac_prog in 'bison -y' byacc
diff --git a/news/inn/patches/patch-ab b/news/inn/patches/patch-ab
index 40b1027efd2..b727c13037b 100644
--- a/news/inn/patches/patch-ab
+++ b/news/inn/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 1999/07/18 23:34:13 tron Exp $
+$NetBSD: patch-ab,v 1.5 2001/02/08 16:23:07 tron Exp $
 
---- samples/news.daily.in.orig	Mon May 17 10:26:41 1999
-+++ samples/news.daily.in	Mon May 17 10:27:14 1999
+--- scripts/news.daily.in.orig	Mon May 17 10:26:41 1999
++++ scripts/news.daily.in	Mon May 17 10:27:14 1999
 @@ -226,6 +226,10 @@
  
  cd ${PATHETC}
diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac
index 425833928d6..55aaee196f6 100644
--- a/news/inn/patches/patch-ac
+++ b/news/inn/patches/patch-ac
@@ -1,30 +1,19 @@
-$NetBSD: patch-ac,v 1.7 2000/09/01 20:16:59 veego Exp $
+$NetBSD: patch-ac,v 1.8 2001/02/08 16:23:07 tron Exp $
 
---- Makefile.global.in	Wed Jul 19 01:54:07 2000
-+++ Makefile.global.in	Fri Sep  1 20:59:13 2000
-@@ -39,8 +39,8 @@
- TCLINC	= @TCL_INC@
- EXTRA_SRC = @EXTRA_SRC@
+--- Makefile.global.in.orig	Thu Jan 11 09:55:23 2001
++++ Makefile.global.in	Thu Feb  8 13:58:22 2001
+@@ -169,10 +169,10 @@
+ PATHOVERVIEW    = $(PATHSPOOL)/overview
+ PATHOUTGOING    = $(PATHSPOOL)/outgoing
  
--OWNER		= -O @NEWSUSER@ -G @NEWSGRP@
--ROWNER		= -O @NEWSUSER@ -G @RNEWSGRP@
-+OWNER		= -o @NEWSUSER@ -g @NEWSGRP@
-+ROWNER		= -o @NEWSUSER@ -g @RNEWSGRP@
- NEWSGROUP	= @NEWSGRP@
- INEWSMODE	= @INEWSMODE@
- RNEWSMODE	= @RNEWSMODE@
-@@ -63,10 +63,10 @@
+-MAN1            = @mandir@/man1
+-MAN3            = @mandir@/man3
+-MAN5            = @mandir@/man5
+-MAN8            = @mandir@/man8
++MAN1            = $(LOCALBASE)/man/man1
++MAN3            = $(LOCALBASE)/man/man3
++MAN5            = $(LOCALBASE)/man/man5
++MAN8            = $(LOCALBASE)/man/man8
  
- # Pick on of SOURCE, NROFF-PACK or NROFF-PACK-SCO
- MANPAGESTYLE	= SOURCE
--MAN1    = @MANDIR@/man1
--MAN3    = @MANDIR@/man3
--MAN5    = @MANDIR@/man5
--MAN8    = @MANDIR@/man8
-+MAN1    = $(LOCALBASE)/man/man1
-+MAN3    = $(LOCALBASE)/man/man3
-+MAN5    = $(LOCALBASE)/man/man5
-+MAN8    = $(LOCALBASE)/man/man8
- 
- LEX	= @LEX@ 
- YACC	= @YACC@
+ ##  Installation settings.  The file installation modes are determined by
+ ##  configure; inews and rnews are special and have configure flags to
diff --git a/news/inn/patches/patch-ad b/news/inn/patches/patch-ad
index 670242135d4..2704850f350 100644
--- a/news/inn/patches/patch-ad
+++ b/news/inn/patches/patch-ad
@@ -1,14 +1,13 @@
-$NetBSD: patch-ad,v 1.3 1999/07/18 23:34:14 tron Exp $
+$NetBSD: patch-ad,v 1.4 2001/02/08 16:23:07 tron Exp $
 
---- samples/rc.news.in.orig	Mon May 17 11:48:11 1999
-+++ samples/rc.news.in	Mon May 17 11:48:38 1999
-@@ -6,6 +6,9 @@
- 
- . @LIBDIR@/innshellvars
+--- scripts/rc.news.in.orig	Thu Jan 11 09:55:23 2001
++++ scripts/rc.news.in	Mon Feb  5 11:39:49 2001
+@@ -48,6 +48,8 @@
+ ;;
+ esac
  
 +## Unlimit
 +ulimit -n `ulimit -H -n`
-+
+ 
  AZ=ABCDEFGHIJKLMNOPQRSTUVWXYZ
  az=abcdefghijklmnopqrstuvwxyz
- ##  Pick ${INND} or ${INNDSTART}
diff --git a/news/inn/patches/patch-ae b/news/inn/patches/patch-ae
index 0c21f3cab2f..5c5497e3dcb 100644
--- a/news/inn/patches/patch-ae
+++ b/news/inn/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.5 2000/09/01 20:16:59 veego Exp $
+$NetBSD: patch-ae,v 1.6 2001/02/08 16:23:07 tron Exp $
 
---- backends/actsyncd.sh.in.orig	Wed Jul 19 01:54:07 2000
-+++ backends/actsyncd.sh.in	Fri Sep  1 21:05:19 2000
+--- backends/actsyncd.in.orig	Wed Jul 19 01:54:07 2000
++++ backends/actsyncd.in	Fri Sep  1 21:05:19 2000
 @@ -163,7 +163,7 @@
          if [ -z "$ftp" ]; then
             echo "getlist -h $host" >>$out
@@ -11,12 +11,3 @@ $NetBSD: patch-ae,v 1.5 2000/09/01 20:16:59 veego Exp $
             else
               status=$NOSYNC
             fi
-@@ -179,7 +179,7 @@
-              # does not understand gzip.
-              *.gz|*.Z) echo "$COMPRESS -d active" >>$out
-                    if $COMPRESS -d active  >>$out 2>&1; then
--                     :
-+                     status=0
-                    else
-                      status=1
-                    fi ;;
diff --git a/news/inn/patches/patch-af b/news/inn/patches/patch-af
index 26ef8673314..3f111eb9e98 100644
--- a/news/inn/patches/patch-af
+++ b/news/inn/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 1999/07/18 23:36:55 tron Exp $
+$NetBSD: patch-af,v 1.4 2001/02/08 16:23:07 tron Exp $
 
---- samples/sendbatch.in.orig	Thu Sep 17 08:15:02 1998
-+++ samples/sendbatch.in	Mon Jul 19 01:23:35 1999
+--- backends/sendbatch.in.orig	Thu Sep 17 08:15:02 1998
++++ backends/sendbatch.in	Mon Jul 19 01:23:35 1999
 @@ -12,7 +12,7 @@
  COMP=
  COMPFLAGS=
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
index 6adedff4d82..a3df44fd2fd 100644
--- a/news/inn/patches/patch-ah
+++ b/news/inn/patches/patch-ah
@@ -1,26 +1,29 @@
-$NetBSD: patch-ah,v 1.3 1999/07/21 22:29:38 tron Exp $
+$NetBSD: patch-ah,v 1.4 2001/02/08 16:23:07 tron Exp $
 
---- site/Makefile.orig	Thu Nov 12 00:02:49 1998
-+++ site/Makefile	Thu Jul 22 00:10:10 1999
-@@ -87,19 +87,10 @@
+--- site/Makefile.orig	Thu Jan 11 09:55:23 2001
++++ site/Makefile	Tue Feb  6 14:51:11 2001
+@@ -83,22 +83,11 @@
  	$D$(CTLBIN)/sendsys.pl $D$(CTLBIN)/senduuname.pl $D$(CTLBIN)/version.pl
  
  REST_INSTALLED	= \
 -	$D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
--	$D$(PATH_NNRPACCESS) $D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
+-	$D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
 -	$D$(PATH_CONFIG) $D$(PATH_MODERATORS) \
 -	$D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl \
--	$D$(PATHETC)/innreport.conf $D$(PATHLIB)/innreport_inn.pm \
+-	$D$(PATHETC)/innreport.conf \
 -	$D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_SCHEMA) \
 -	$D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \
 -	$D$(PATH_MOTD) $D$(PATH_STORAGECONF) \
--	$D$(PATH_OVERVIEWCTL) $D$(PATH_CYCBUFFCONFIG) \
+-	$D$(PATH_OVERVIEWCTL) $D$(PATH_CYCBUFFCONFIG) $D$(PATH_BUFFINDEXED) \
 -	$D$(PATH_INNFEEDCTL) $D$(PATH_PERL_STARTUP_INND) \
-+	$D$(PATHLIB)/innreport_inn.pm $D$(PATH_PERL_STARTUP_INND) \
++	$D$(PATH_PERL_STARTUP_INND) \
  	$D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \
+ 	$D$(PATH_PYTHON_FILTER_INND) $D$(PATH_PYTHON_INN_MODULE) \
  	$D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \
--	$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf
-+	$D$(PATH_NNRPAUTH)
+-	$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \
+-	$D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \
+-	$D$(PATH_SASL_CONF)
++	$D$(PATH_NNRPAUTH) $D$(PATH_NNRPYAUTH)
  
  ALL_INSTALLED	= $(MOST_INSTALLED) $(REST_INSTALLED)
  
diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai
deleted file mode 100644
index e02ab67c133..00000000000
--- a/news/inn/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2000/08/17 14:00:28 wiz Exp $
-
---- installit.sh.orig	Mon Dec 13 14:18:37 1999
-+++ installit.sh
-@@ -95,7 +95,7 @@
- 	    ;;
- 	esac
- 	if ${ROOT} ; then
--	    GROUP=`expr "$1" : '-g\(.*\)'`
-+	    GROUP=`expr "$1" : '-G\(.*\)'`
- 	    CHGROUPIT=true
- 	fi
- 	;;
-@@ -151,7 +151,7 @@
- 	    ;;
- 	esac
- 	if ${ROOT} ; then
--	    OWNER=`expr "$1" : '-o\(.*\)'`
-+	    OWNER=`expr "$1" : '-O\(.*\)'`
- 	    CHOWNIT=true
- 	fi
- 	;;
diff --git a/news/inn/pkg/INSTALL b/news/inn/pkg/INSTALL
index 80f866286e6..5c7257beb73 100644
--- a/news/inn/pkg/INSTALL
+++ b/news/inn/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2000/07/03 13:45:54 veego Exp $
+# $NetBSD: INSTALL,v 1.3 2001/02/08 16:23:07 tron Exp $
 
 if [ "$2" != "POST-INSTALL" ]; then
   exit 0
@@ -12,7 +12,7 @@ if [ ! -d @@INN_DATA_DIR@@ ]; then
 	chmod 775 @@INN_DATA_DIR@@
 fi
 
-DIRS="db etc log log/OLD run spool"
+DIRS="db etc log log/OLD run spool tmp"
 for DIR in $DIRS; do
 	if [ ! -d @@INN_DATA_DIR@@/$DIR ]; then
 		install -d -o news -g news -m 775 @@INN_DATA_DIR@@/$DIR
@@ -26,7 +26,7 @@ for DIR in $SPOOLS; do
 	fi
 done
 
-ETC="actsync.cfg actsync.ign control.ctl cycbuff.conf distrib.pats expire.ctl incoming.conf inn.conf innfeed.conf innreport.conf innwatch.ctl moderators motd.news news2mail.cf newsfeeds nnrp.access nnrpd.track nntpsend.ctl overview.ctl overview.fmt passwd.nntp storage.conf"
+ETC="actsync.cfg actsync.ign buffindexed.conf control.ctl cycbuff.conf distrib.pats expire.ctl incoming.conf inn.conf innfeed.conf innreport.conf innwatch.ctl moderators motd.news news2mail.cf newsfeeds nnrpd.track nntpsend.ctl ovdb.conf overview.fmt passwd.nntp radius.conf readers.conf sasl.conf storage.conf"
 
 for FILE in $ETC; do 
 	if [ ! -f @@INN_DATA_DIR@@/etc/$FILE ]; then
diff --git a/news/inn/pkg/PLIST b/news/inn/pkg/PLIST
index 995a9ae45a0..81ea3e70fbd 100644
--- a/news/inn/pkg/PLIST
+++ b/news/inn/pkg/PLIST
@@ -1,16 +1,20 @@
-@comment $NetBSD: PLIST,v 1.10 2001/01/26 05:21:47 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/02/08 16:23:07 tron Exp $
 bin/inews
-etc/rc.d/innd
 @exec mkdir -p %D/etc/nntp
 @unexec rm -rf %D/etc/nntp
-inn/bin/actived
+etc/rc.d/innd
 inn/bin/actmerge
 inn/bin/actsync
 inn/bin/actsyncd
 inn/bin/archive
-@exec mkdir -p %D/inn/bin/auth
+inn/bin/auth/passwd/ckpasswd
+inn/bin/auth/passwd/pwcheck
+inn/bin/auth/passwd/radius
+inn/bin/auth/resolv/domain
+inn/bin/auth/resolv/ident
 inn/bin/batcher
 inn/bin/buffchan
+inn/bin/cnfsheadconf
 inn/bin/cnfsstat
 inn/bin/control/checkgroups
 inn/bin/control/checkgroups.pl
@@ -32,19 +36,21 @@ inn/bin/control/version.pl
 inn/bin/controlbatch
 inn/bin/controlchan
 inn/bin/convdate
-inn/bin/crosspost
 inn/bin/ctlinnd
 inn/bin/cvtbatch
+inn/bin/dbprocs
 inn/bin/expire
-inn/bin/expireindex
 inn/bin/expireover
 inn/bin/expirerm
 inn/bin/fastrm
 inn/bin/filechan
+inn/bin/filter/INN.py
 inn/bin/filter/filter.tcl
 inn/bin/filter/filter_innd.pl
+inn/bin/filter/filter_innd.py
 inn/bin/filter/filter_nnrpd.pl
 inn/bin/filter/nnrpd_auth.pl
+inn/bin/filter/nnrpd_auth.py
 inn/bin/filter/startup.tcl
 inn/bin/filter/startup_innd.pl
 inn/bin/getlist
@@ -56,7 +62,6 @@ inn/bin/innd
 inn/bin/inndf
 inn/bin/inndstart
 inn/bin/innfeed
-inn/bin/innfeed-convcfg
 inn/bin/innmail
 inn/bin/innreport
 inn/bin/innstat
@@ -64,7 +69,7 @@ inn/bin/innwatch
 inn/bin/innxbatch
 inn/bin/innxmit
 inn/bin/mailpost
-inn/bin/makeactive
+inn/bin/makedbz
 inn/bin/makehistory
 inn/bin/mod-active
 inn/bin/news.daily
@@ -73,6 +78,8 @@ inn/bin/newsrequeue
 inn/bin/nnrpd
 inn/bin/nntpget
 inn/bin/nntpsend
+inn/bin/ovdb_recover
+inn/bin/ovdb_upgrade
 inn/bin/overchan
 inn/bin/parsecontrol
 inn/bin/pgpverify
@@ -94,6 +101,7 @@ inn/bin/sendbatch
 inn/bin/sendxbatches
 inn/bin/shlock
 inn/bin/shrinkfile
+inn/bin/signcontrol
 inn/bin/simpleftp
 inn/bin/sm
 inn/bin/startinnfeed
@@ -105,29 +113,19 @@ inn/lib/innshellvars
 inn/lib/innshellvars.pl
 inn/lib/innshellvars.tcl
 inn/lib/libinn.a
-inn/lib/libinn.la
-inn/lib/libinn.so
-inn/lib/libinn.so.2
-inn/lib/libinn.so.2.0
 inn/lib/libstorage.a
-inn/lib/libstorage.la
-inn/lib/libstorage.so
-inn/lib/libstorage.so.2
-inn/lib/libstorage.so.2.0
 man/man1/convdate.1
 man/man1/getlist.1
 man/man1/grephistory.1
 man/man1/inews.1
 man/man1/innconfval.1
 man/man1/innfeed.1
-man/man1/installit.1
 man/man1/nntpget.1
 man/man1/rnews.1
 man/man1/shlock.1
 man/man1/shrinkfile.1
 man/man1/simpleftp.1
 man/man1/startinnfeed.1
-man/man1/subst.1
 man/man3/clientlib.3
 man/man3/dbz.3
 man/man3/inndcomm.3
@@ -149,16 +147,12 @@ man/man5/innwatch.ctl.5
 man/man5/moderators.5
 man/man5/motd.news.5
 man/man5/newsfeeds.5
-man/man5/newslog.5
 man/man5/nnrp.access.5
 man/man5/nnrpd.track.5
 man/man5/nntpsend.ctl.5
-man/man5/overview.ctl.5
 man/man5/overview.fmt.5
 man/man5/passwd.nntp.5
 man/man5/storage.conf.5
-man/man5/storage.ctl.5
-man/man8/actived.8
 man/man8/actsync.8
 man/man8/actsyncd.8
 man/man8/archive.8
@@ -166,11 +160,9 @@ man/man8/batcher.8
 man/man8/buffchan.8
 man/man8/cnfsstat.8
 man/man8/controlchan.8
-man/man8/crosspost.8
 man/man8/ctlinnd.8
 man/man8/cvtbatch.8
 man/man8/expire.8
-man/man8/expireindex.8
 man/man8/expireover.8
 man/man8/expirerm.8
 man/man8/fastrm.8
@@ -184,13 +176,10 @@ man/man8/innwatch.8
 man/man8/innxbatch.8
 man/man8/innxmit.8
 man/man8/mailpost.8
-man/man8/makeactive.8
 man/man8/makehistory.8
 man/man8/mod-active.8
-man/man8/news-recovery.8
 man/man8/news.daily.8
 man/man8/news2mail.8
-man/man8/newslog.8
 man/man8/newsrequeue.8
 man/man8/nnrpd.8
 man/man8/nntpsend.8
@@ -202,93 +191,70 @@ man/man8/scanlogs.8
 man/man8/send-uucp.8
 man/man8/sm.8
 man/man8/tally.control.8
-man/man8/tally.unwanted.8
 man/man8/writelog.8
+share/examples/inn/INN.py
+share/examples/inn/active.minimal
 share/examples/inn/actsync.cfg
 share/examples/inn/actsync.ign
+share/examples/inn/buffindexed.conf
 share/examples/inn/checkgroups
 share/examples/inn/checkgroups.pl
-share/examples/inn/cnfsstat
 share/examples/inn/control.ctl
-share/examples/inn/controlbatch
-share/examples/inn/controlchan
 share/examples/inn/cycbuff.conf
 share/examples/inn/default
 share/examples/inn/distrib.pats
 share/examples/inn/docheckgroups
 share/examples/inn/expire.ctl
-share/examples/inn/expirerm
 share/examples/inn/filter.tcl
+share/examples/inn/filter_innd.py
 share/examples/inn/filter_innd.pl
 share/examples/inn/filter_nnrpd.pl
 share/examples/inn/ihave
 share/examples/inn/ihave.pl
 share/examples/inn/incoming.conf
 share/examples/inn/inn.conf
-share/examples/inn/inncheck
 share/examples/inn/innfeed.conf
-share/examples/inn/innmail
-share/examples/inn/innreport
 share/examples/inn/innreport.conf
-share/examples/inn/innreport_inn.pm
-share/examples/inn/innshellvars
-share/examples/inn/innshellvars.pl
-share/examples/inn/innshellvars.tcl
-share/examples/inn/innstat
-share/examples/inn/innwatch
 share/examples/inn/innwatch.ctl
-share/examples/inn/mailpost
-share/examples/inn/mod-active
 share/examples/inn/moderators
 share/examples/inn/motd.news
 share/examples/inn/newgroup
+share/examples/inn/newsgroups.minimal
 share/examples/inn/newgroup.pl
-share/examples/inn/news.daily
-share/examples/inn/news2mail
 share/examples/inn/news2mail.cf
 share/examples/inn/newsfeeds
-share/examples/inn/nnrp.access
+share/examples/inn/nnrpd.py
 share/examples/inn/nnrpd.track
 share/examples/inn/nnrpd_auth.pl
-share/examples/inn/nntpsend
+share/examples/inn/nnrpd_auth.py
 share/examples/inn/nntpsend.ctl
-share/examples/inn/overview.ctl
+share/examples/inn/ovdb.conf
 share/examples/inn/overview.fmt
 share/examples/inn/parsecontrol
 share/examples/inn/passwd.nntp
-share/examples/inn/pgpverify
-share/examples/inn/pullnews
-share/examples/inn/rc.news
+share/examples/inn/radius.conf
+share/examples/inn/readers.conf
 share/examples/inn/rmgroup
 share/examples/inn/rmgroup.pl
-share/examples/inn/sample.control
-share/examples/inn/scanlogs
-share/examples/inn/scanspool
-share/examples/inn/send-ihave
-share/examples/inn/send-nntp
-share/examples/inn/send-uucp
-share/examples/inn/sendbatch
+share/examples/inn/sasl.conf
 share/examples/inn/sendme
 share/examples/inn/sendme.pl
 share/examples/inn/sendsys
 share/examples/inn/sendsys.pl
 share/examples/inn/senduuname
 share/examples/inn/senduuname.pl
-share/examples/inn/signcontrol
-share/examples/inn/simpleftp
 share/examples/inn/startup.tcl
 share/examples/inn/startup_innd.pl
 share/examples/inn/storage.conf
-share/examples/inn/storage.ctl
-share/examples/inn/tally.control
 share/examples/inn/version
 share/examples/inn/version.pl
-share/examples/inn/writelog
 @dirrm share/examples/inn
 @dirrm inn/lib
 @dirrm inn/bin/rnews.libexec
 @dirrm inn/bin/filter
 @dirrm inn/bin/control
+@dirrm inn/bin/auth/resolv
+@dirrm inn/bin/auth/passwd
 @dirrm inn/bin/auth
 @dirrm inn/bin
 @dirrm inn