Update INN package to version 2.2. This update is based on the patches

supplied by Chris Jones in PR pkg/7597.

13 files changed, 333 insertions, 277 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index aac09e484a8..ea025877925 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,34 +1,52 @@
-# $NetBSD: Makefile,v 1.3 1998/10/17 18:09:32 bad Exp $
+# $NetBSD: Makefile,v 1.4 1999/07/18 23:34:12 tron Exp $
 
-DISTNAME=		inn-2.1
+DISTNAME=		inn-2.2
 CATEGORIES=		news
-MASTER_SITES=		ftp://wuarchive.wustl.edu/packages/news/transport/inn/
+MASTER_SITES=		ftp://ftp.isc.org/isc/inn/ \
+			ftp://ftp.sunet.se/pub/news/nntp/inn/ \
+			ftp://ftp.fu-berlin.de/unix/news/inn/
 
-MAINTAINER=		root@garbled.net
+MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.isc.org/inn.html
 
 BUILD_DEPENDS+=		bison:../../devel/bison
 
 CONFLICTS+=		nntpclnt-*
 
-INN_SPOOL?=		/var/spool/news
+INN_DATA_DIR?=		/var/news
 
 USE_PERL5=		yes
 USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	--with-perl --with-spool-dir=${INN_SPOOL}
-CONFIGURE_ARGS+=	--with-tmp-path=/tmp  --with-sendmail=/usr/sbin/sendmail
-CONFIGURE_ENV+=		_PATH_PERL=${LOCALBASE}/bin/perl
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-perl --with-tmp-path=/tmp \
+			--with-sendmail=/usr/sbin/sendmail \
+			--with-db-dir=${INN_DATA_DIR}/db \
+			--with-etc-dir=${INN_DATA_DIR}/etc \
+			--with-log-dir=${INN_DATA_DIR}/log \
+			--with-run-dir=${INN_DATA_DIR}/run \
+			--with-spool-dir=${INN_DATA_DIR}/spool
+CONFIGURE_ENV+=		_PATH_PERL=${LOCALBASE}/bin/perl
+
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
+INSTALL_FILE=		${WRKDIR}/INSTALL
+#INSTALL_TARGET=		update
 
-INSTALL_FILE=		${WRKDIR}/.INSTALL
+post-build:
+.for FILE in DEINSTALL INSTALL
+	${SED} -e 's#@@INN_DATA_DIR@@#${INN_DATA_DIR}#g' \
+	       -e 's#@@PREFIX@@#${PREFIX}#g' \
+	        ${PKGDIR}/${FILE} >${WRKDIR}/${FILE}
+.endfor
 
-post-patch:
-	${SED} -e 's@XXXINN_SPOOLXXX@${INN_SPOOL}@g' \
-		-e 's@XXXPREFIXXXX@${PREFIX}@g' \
-		${PKGDIR}/install > ${INSTALL_FILE}
+pre-install:
+	${MKDIR} ${INN_DATA_DIR}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/inn
-	${CP} -R ${WRKSRC}/samples/* ${PREFIX}/share/examples/inn
+	for FILE in `ls -1 ${WRKSRC}/samples/* | \
+		     ${EGREP} -v '\.(in|orig)$'`; do \
+	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/inn; \
+	done
+#	@${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/inn/files/md5 b/news/inn/files/md5
index f1ebeb94d39..cd53ea7dfdc 100644
--- a/news/inn/files/md5
+++ b/news/inn/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1 1998/09/05 03:21:11 garbled Exp $
+$NetBSD: md5,v 1.2 1999/07/18 23:34:13 tron Exp $
 
-MD5 (inn-2.1.tar.gz) = 5c0fc548295474f82cb15e27c78eed7f
+MD5 (inn-2.2.tar.gz) = 9c8cb250d56428af06c7c49f7d8d1a29
diff --git a/news/inn/files/patch-sum b/news/inn/files/patch-sum
index 7668a0df2b9..a6a87e87fc5 100644
--- a/news/inn/files/patch-sum
+++ b/news/inn/files/patch-sum
@@ -1,5 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:33 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/18 23:34:13 tron Exp $
 
-MD5 (patch-aa) = 95e14f5445bdf0855e25dd31a9b98a51
-MD5 (patch-ab) = 120d16170d7b1c4f779495b3e985ad33
-MD5 (patch-ac) = 99cb771f77c90c33b0b6eb0f3eac798a
+MD5 (patch-aa) = 2390c877da186d1501bfb499a9f27096
+MD5 (patch-ab) = 69a4b8bfa51950f4d1fac766e906cc97
+MD5 (patch-ac) = f5aebc01ed0ec6a29bb40b343f308050
+MD5 (patch-ad) = 3eec593f7b8efe5ec284887f713d4ddd
+MD5 (patch-ae) = 084256092f1179105004da3f000ee33f
+MD5 (patch-af) = d8eac199c981d82eed4b454bc20115f7
diff --git a/news/inn/patches/patch-aa b/news/inn/patches/patch-aa
index f8386f172ed..c5b5354baa5 100644
--- a/news/inn/patches/patch-aa
+++ b/news/inn/patches/patch-aa
@@ -1,26 +1,28 @@
-$NetBSD: patch-aa,v 1.4 1998/10/18 09:58:55 matthias Exp $
+$NetBSD: patch-aa,v 1.5 1999/07/18 23:34:13 tron Exp $
 
---- configure.orig	Fri Jul 24 15:13:00 1998
-+++ configure	Thu Oct  8 11:39:49 1998
-@@ -960,7 +960,7 @@
+--- configure.orig	Mon May 17 10:25:36 1999
++++ configure	Mon May 17 10:25:41 1999
+@@ -959,20 +959,9 @@
  
  
  
--
-+if false; then
- LIBTOOL='$(SHELL) ../libtool'
- UPLIBTOOL='$(SHELL) ../../libtool'
- EXTOBJ='lo'
-@@ -1057,7 +1057,11 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
--
-+else
-+UPLIBTOOL=$LIBTOOL
-+EXTLIB=la
-+EXTOBJ=lo
-+fi
+-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'
+ 
+ 
  
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- test "x$exec_prefix" = xNONE && exec_prefix=$ac_default_prefix
diff --git a/news/inn/patches/patch-ab b/news/inn/patches/patch-ab
index 9b041d9d153..40b1027efd2 100644
--- a/news/inn/patches/patch-ab
+++ b/news/inn/patches/patch-ab
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.3 1999/02/11 07:52:43 frueauf Exp $
+$NetBSD: patch-ab,v 1.4 1999/07/18 23:34:13 tron Exp $
 
---- samples/news.daily.in-orig	Fri Jul 24 15:13:00 1998
-+++ samples/news.daily.in	Thu Feb 11 08:47:18 1999
-@@ -224,6 +224,9 @@
+--- samples/news.daily.in.orig	Mon May 17 10:26:41 1999
++++ samples/news.daily.in	Mon May 17 10:27:14 1999
+@@ -226,6 +226,10 @@
  
  cd ${PATHETC}
  
 +## Unlimit
 +ulimit -d `ulimit -H -d`
++ulimit -n `ulimit -H -n`
 +
  ##  Show the status of the news system.
  ${DOSTAT} && {
diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac
index 40441b1de5f..a5ed22c0b94 100644
--- a/news/inn/patches/patch-ac
+++ b/news/inn/patches/patch-ac
@@ -1,4 +1,5 @@
-$NetBSD: patch-ac,v 1.1 1998/09/05 03:21:11 garbled Exp $
+$NetBSD: patch-ac,v 1.2 1999/07/18 23:34:13 tron Exp $
+
 --- Makefile.global.in.orig	Fri Aug 28 12:34:15 1998
 +++ Makefile.global.in	Fri Aug 28 12:29:51 1998
 @@ -34,7 +34,7 @@
diff --git a/news/inn/patches/patch-ad b/news/inn/patches/patch-ad
new file mode 100644
index 00000000000..670242135d4
--- /dev/null
+++ b/news/inn/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.3 1999/07/18 23:34:14 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
+ 
++## 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
new file mode 100644
index 00000000000..a9010a14626
--- /dev/null
+++ b/news/inn/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.3 1999/07/18 23:34:14 tron Exp $
+
+--- backends/actsyncd.sh.in.orig	Sat Oct 17 03:07:27 1998
++++ backends/actsyncd.sh.in	Sun Jul 18 01:47:43 1999
+@@ -156,7 +156,7 @@
+     if [ -z "$ftp" ]; then
+        echo "getlist -h $host" >>$out
+        if getlist -h $host > active 2>>$out; then
+-         :
++         status=0
+        else
+          status=$NOSYNC
+        fi
+@@ -172,7 +172,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/pkg/DEINSTALL b/news/inn/pkg/DEINSTALL
index f9ceac60cd5..6312685c0e8 100644
--- a/news/inn/pkg/DEINSTALL
+++ b/news/inn/pkg/DEINSTALL
@@ -1,18 +1,15 @@
 #! /bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 1998/09/05 03:21:12 garbled Exp $
-#
+# $NetBSD: DEINSTALL,v 1.2 1999/07/18 23:34:14 tron Exp $
 
 case "$2" in
         DEINSTALL) cat <<EOF
 
 ==========================================================================
 
-Note that the inn spool directory (/var/spool/news) and log directory
-(/usr/pkg/log) are NOT deleted by the pkg_delete process.  Please remove
-these directories and all their contents manually, if they are no longer
-needed. Files in /usr/pkg/etc have not been deleted either, if you wish
-to remove them you will need to do so manually as well.
+Note that the inn data directory (@@INN_DATA_DIR@@) is NOT deleted during
+the package deinstallation. Please remove this directory and all its
+contents manually if it is no longer needed.
 
 ==========================================================================
 
@@ -20,3 +17,4 @@ EOF
         ;;
 esac
 
+exit 0
diff --git a/news/inn/pkg/DESCR b/news/inn/pkg/DESCR
index d557c911e44..db101464cbc 100644
--- a/news/inn/pkg/DESCR
+++ b/news/inn/pkg/DESCR
@@ -1,4 +1,4 @@
-This is the public release of version 2.1 of InterNet News (INN). This work
+This is the public release of version 2.2 of InterNet News (INN). This work
 is sponsored by the Internet Software Consortium.
 
 InterNetNews is a complete Usenet system.  The cornerstone of the package
diff --git a/news/inn/pkg/INSTALL b/news/inn/pkg/INSTALL
new file mode 100644
index 00000000000..76b93392d14
--- /dev/null
+++ b/news/inn/pkg/INSTALL
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 1999/07/18 23:34:14 tron Exp $
+
+if [ "$2" != "POST-INSTALL" ]; then
+  exit 0
+fi
+
+if [ ! -d @@INN_DATA_DIR@@ ]; then
+	mkdir -p @@INN_DATA_DIR@@
+	chown news:news @@INN_DATA_DIR@@
+	chmod 775 @@INN_DATA_DIR@@
+fi
+
+DIRS="db etc log log/OLD run spool"
+for DIR in $DIRS; do
+	if [ ! -d @@INN_DATA_DIR@@/$DIR ]; then
+		install -d -o news -g news -m 775 @@INN_DATA_DIR@@/$DIR
+	fi
+done
+
+SPOOLS="articles overview archive incoming incoming/bad outgoing uniover innfeed"
+for DIR in $SPOOLS; do
+	if [ ! -d @@INN_DATA_DIR@@/spool/$DIR ]; then
+		install -d -o news -g news -m 775 @@INN_DATA_DIR@@/spool/$DIR
+	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"
+
+for FILE in $ETC; do 
+	if [ ! -e @@INN_DATA_DIR@@/etc/$FILE ]; then
+		install -c -o news -g news -m 664 @@PREFIX@@/share/examples/inn/$FILE @@INN_DATA_DIR@@/etc
+	fi
+done
+
+exit 0
diff --git a/news/inn/pkg/PLIST b/news/inn/pkg/PLIST
index 159ea7f5124..afe8fcdc730 100644
--- a/news/inn/pkg/PLIST
+++ b/news/inn/pkg/PLIST
@@ -1,145 +1,183 @@
-@comment $NetBSD: PLIST,v 1.1 1998/09/05 03:21:12 garbled Exp $
-bin/sm
+@comment $NetBSD: PLIST,v 1.2 1999/07/18 23:34:14 tron Exp $
+bin/actived
+bin/actmerge
+bin/actsync
+bin/actsyncd
+bin/archive
+@exec mkdir -p %D/bin/auth
+bin/batcher
+bin/buffchan
+bin/cnfsstat
 bin/control/checkgroups
+bin/control/checkgroups.pl
 bin/control/default
 bin/control/ihave
+bin/control/ihave.pl
 bin/control/newgroup
+bin/control/newgroup.pl
 bin/control/rmgroup
+bin/control/rmgroup.pl
 bin/control/sendme
+bin/control/sendme.pl
 bin/control/sendsys
+bin/control/sendsys.pl
 bin/control/senduuname
+bin/control/senduuname.pl
 bin/control/version
-bin/filter/startup_innd.pl
+bin/control/version.pl
+bin/controlbatch
+bin/controlchan
+bin/convdate
+bin/crosspost
+bin/ctlinnd
+bin/cvtbatch
+bin/expire
+bin/expireindex
+bin/expireover
+bin/expirerm
+bin/fastrm
+bin/filechan
+bin/filter/filter.tcl
 bin/filter/filter_innd.pl
 bin/filter/filter_nnrpd.pl
+bin/filter/nnrpd_auth.pl
 bin/filter/startup.tcl
-bin/filter/filter.tcl
-bin/rnews.libexec/c7unbatch
-bin/rnews.libexec/decode
-bin/rnews.libexec/encode
-bin/inews
-bin/rnews
-bin/ctlinnd
+bin/filter/startup_innd.pl
 bin/getlist
+bin/grephistory
+bin/inews
+bin/inncheck
 bin/innconfval
 bin/innd
+bin/inndf
 bin/inndstart
-bin/nnrpd
-bin/actived
-bin/archive
-bin/batcher
-bin/buffchan
-bin/cvtbatch
-bin/filechan
-bin/innxmit
+bin/innfeed
+bin/innfeed-convcfg
+bin/innmail
+bin/innreport
+bin/innstat
+bin/innwatch
 bin/innxbatch
-bin/nntpget
-bin/overchan
-bin/shlock
-bin/shrinkfile
-bin/crosspost
-bin/actsync
-bin/actsyncd
-bin/actmerge
-bin/sendxbatches
-bin/convdate
-bin/expire
-bin/expireover
-bin/fastrm
-bin/grephistory
+bin/innxmit
+bin/mailpost
 bin/makeactive
 bin/makehistory
+bin/mod-active
+bin/news.daily
+bin/news2mail
 bin/newsrequeue
-bin/prunehistory
-bin/expireindex
-bin/innfeed
-bin/startinnfeed
+bin/nnrpd
+bin/nntpget
+bin/nntpsend
+bin/overchan
+bin/parsecontrol
+bin/pgpverify
 bin/procbatch
-bin/innfeed-convcfg
+bin/prunehistory
+bin/pullnews
 bin/rc.news
-bin/parsecontrol
-bin/writelog
-bin/news.daily
+bin/rnews
+bin/rnews.libexec/c7unbatch
+bin/rnews.libexec/decode
+bin/rnews.libexec/encode
+bin/rnews.libexec/gunbatch
 bin/scanlogs
-bin/expirerm
-bin/tally.control
-bin/innmail
-bin/nntpsend
+bin/scanspool
 bin/send-ihave
 bin/send-nntp
 bin/send-uucp
 bin/sendbatch
-bin/inncheck
-bin/innstat
-bin/pgpverify
-bin/innwatch
-bin/innreport
-bin/scanspool
-man/man1/inews.1
-man/man1/rnews.1
+bin/sendxbatches
+bin/shlock
+bin/shrinkfile
+bin/simpleftp
+bin/sm
+bin/startinnfeed
+bin/tally.control
+bin/writelog
+lib/docheckgroups
+lib/innreport_inn.pm
+lib/innshellvars
+lib/innshellvars.pl
+lib/innshellvars.tcl
+lib/libinn.a
+lib/libinn.so.2.0
+lib/libstorage.a
+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/subst.1
-man/man1/innfeed.1
 man/man1/startinnfeed.1
-man/man3/dbz.3
-man/man3/qio.3
+man/man1/subst.1
 man/man3/clientlib.3
+man/man3/dbz.3
 man/man3/inndcomm.3
 man/man3/libinn.3
 man/man3/libstorage.3
 man/man3/parsedate.3
+man/man3/qio.3
 man/man3/wildmat.3
 man/man5/active.5
 man/man5/control.ctl.5
+man/man5/cycbuff.conf.5
 man/man5/distrib.pats.5
 man/man5/expire.ctl.5
 man/man5/history.5
+man/man5/incoming.conf.5
 man/man5/inn.conf.5
+man/man5/innfeed.conf.5
 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/innfeed.conf.5
-man/man5/motd.news.5
-man/man5/overview.ctl.5
+man/man5/storage.conf.5
 man/man5/storage.ctl.5
-man/man5/cycbuff.conf.5
-man/man5/incoming.conf.5
+man/man8/actived.8
 man/man8/actsync.8
+man/man8/actsyncd.8
 man/man8/archive.8
 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
 man/man8/filechan.8
 man/man8/inncheck.8
 man/man8/innd.8
+man/man8/inndf.8
 man/man8/innreport.8
 man/man8/innstat.8
 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/news-recovery.8
 man/man8/news.daily.8
+man/man8/news2mail.8
 man/man8/newslog.8
 man/man8/newsrequeue.8
 man/man8/nnrpd.8
@@ -147,128 +185,95 @@ man/man8/nntpsend.8
 man/man8/overchan.8
 man/man8/pgpverify.8
 man/man8/prunehistory.8
+man/man8/pullnews.8
 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
-man/man8/expireindex.8
-man/man8/sm.8
-man/man8/actived.8
-man/man8/send-uucp.8
 share/examples/inn/actsync.cfg
-share/examples/inn/writelog
-share/examples/inn/version.in
-share/examples/inn/version
-share/examples/inn/tally.control.in
-share/examples/inn/tally.control
-share/examples/inn/storage.ctl
-share/examples/inn/startup_innd.pl
-share/examples/inn/startup.tcl.in
-share/examples/inn/startup.tcl
-share/examples/inn/signcontrol.in
-share/examples/inn/signcontrol
-share/examples/inn/senduuname.in
-share/examples/inn/senduuname
-share/examples/inn/sendsys.in
-share/examples/inn/sendsys
-share/examples/inn/sendme.in
-share/examples/inn/sendme
-share/examples/inn/sendbatch.in
-share/examples/inn/sendbatch
-share/examples/inn/send-uucp.in
-share/examples/inn/send-uucp
-share/examples/inn/send-nntp.in
-share/examples/inn/send-nntp
-share/examples/inn/send-ihave.in
-share/examples/inn/send-ihave
-share/examples/inn/scanspool.in
-share/examples/inn/scanspool
-share/examples/inn/scanlogs.in
-share/examples/inn/scanlogs
-share/examples/inn/sample.control
-share/examples/inn/rmgroup.in
-share/examples/inn/rmgroup
-share/examples/inn/rc.news.in
-share/examples/inn/rc.news
-share/examples/inn/pgpverify.in
-share/examples/inn/pgpverify
-share/examples/inn/passwd.nntp
-share/examples/inn/parsecontrol.in
-share/examples/inn/parsecontrol
-share/examples/inn/overview.fmt
-share/examples/inn/overview.ctl
-share/examples/inn/nntpsend.in
-share/examples/inn/nntpsend.ctl
-share/examples/inn/nntpsend
-share/examples/inn/nnrpd.track
-share/examples/inn/nnrp.access
-share/examples/inn/newsfeeds
-share/examples/inn/news.daily.in
-share/examples/inn/news.daily
-share/examples/inn/newgroup.in
-share/examples/inn/newgroup
-share/examples/inn/motd.news
-share/examples/inn/moderators
-share/examples/inn/innwatch.in
-share/examples/inn/innwatch.ctl.in
-share/examples/inn/innwatch.ctl
-share/examples/inn/innwatch
-share/examples/inn/innstat.in
-share/examples/inn/innstat
-share/examples/inn/innshellvars.tcl.in
-share/examples/inn/innshellvars.tcl
-share/examples/inn/innshellvars.pl.in
-share/examples/inn/innshellvars.pl
-share/examples/inn/innshellvars.in
-share/examples/inn/innshellvars.csh.in
-share/examples/inn/innshellvars.csh
-share/examples/inn/innshellvars
-share/examples/inn/innreport_inn.pm
-share/examples/inn/innreport.in
-share/examples/inn/innreport.conf.in
-share/examples/inn/innreport.conf
-share/examples/inn/innreport
-share/examples/inn/innmail.in
-share/examples/inn/innmail
-share/examples/inn/innfeed.conf
-share/examples/inn/inncheck.in
-share/examples/inn/inncheck
-share/examples/inn/inn.conf.in
-share/examples/inn/inn.conf
-share/examples/inn/incoming.conf
-share/examples/inn/ihave.in
-share/examples/inn/ihave
-share/examples/inn/filter_nnrpd.pl
-share/examples/inn/filter_innd.pl
-share/examples/inn/filter.tcl
-share/examples/inn/expirerm.in
-share/examples/inn/expirerm
-share/examples/inn/expire.ctl
-share/examples/inn/docheckgroups.in
-share/examples/inn/docheckgroups
-share/examples/inn/distrib.pats
-share/examples/inn/default.in
-share/examples/inn/default
-share/examples/inn/cycbuff.conf
-share/examples/inn/control.ctl
-share/examples/inn/checkgroups.in
-share/examples/inn/checkgroups
 share/examples/inn/actsync.ign
-share/examples/inn/actsync.cfg.in
-share/examples/inn/writelog.in
-lib/libinn.so.2.0
-lib/libinn.a
-lib/libstorage.so.2.0
-lib/libstorage.a
-lib/docheckgroups
-lib/innshellvars
-lib/innshellvars.pl
-lib/innshellvars.tcl
-lib/innshellvars.csh
-lib/innreport_inn.pm
-@dirrm bin/control
-@dirrm bin/filter
+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.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/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.track
+share/examples/inn/nnrpd_auth.pl
+share/examples/inn/nntpsend
+share/examples/inn/nntpsend.ctl
+share/examples/inn/overview.ctl
+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/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/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 bin/rnews.libexec
+@dirrm bin/filter
+@dirrm bin/control
 @dirrm bin/auth
-@dirrm log/OLD
-@dirrm share/examples/inn
diff --git a/news/inn/pkg/install b/news/inn/pkg/install
deleted file mode 100644
index 582581895f2..00000000000
--- a/news/inn/pkg/install
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: install,v 1.1 1998/09/05 03:21:12 garbled Exp $
-#
-if [ "$2" != "POST-INSTALL" ]; then
-  exit 0
-fi
-SPOOLS="articles overview archive incoming incoming/bad outgoing uniover innfeed"
-if [ ! -d XXXINN_SPOOLXXX ]; then
-	mkdir -p XXXINN_SPOOLXXX
-	chown news:news XXXINN_SPOOLXXX
-	chmod 775 XXXINN_SPOOLXXX
-fi
-for foo in $SPOOLS; do
-	if [ ! -d XXXINN_SPOOLXXX/$foo ]; then
-		mkdir -p XXXINN_SPOOLXXX/$foo
-		chown news:news XXXINN_SPOOLXXX/$foo
-		chmod 775 XXXINN_SPOOLXXX/$foo
-	fi
-done
-
-if [ ! -d XXXPREFIXXXX/etc ]; then
-	mkdir -p XXXPREFIXXXX/etc
-	chown news:news XXXPREFIXXXX/etc
-	chmod 775 XXXPREFIXXXX/etc
-fi
-if [ ! -d XXXPREFIXXXX/run ]; then
-	mkdir -p XXXPREFIXXXX/run
-	chown news:news XXXPREFIXXXX/run
-	chmod 775 XXXPREFIXXXX/run
-fi
-if [ ! -d XXXPREFIXXXX/db ]; then
-	mkdir -p XXXPREFIXXXX/db
-	chown news:news XXXPREFIXXXX/db
-	chmod 775 XXXPREFIXXXX/db
-fi
-
-
-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 newsfeeds nnrp.access nntpsend.ctl overview.ctl overview.fmt passwd.nntp storage.ctl"
-
-for foo in $ETC; do 
-	if [ ! -e XXXPREFIXXXX/etc/$foo ]; then
-		cp XXXPREFIXXXX/share/examples/inn/$foo XXXPREFIXXXX/etc
-	fi
-done