Update to 2.3.20001220, and try to get as close to news/inn as possible.

Ideally, this should use news/inn as MASTERDIR, or the two ports should
be merged.

1 files changed, 49 insertions, 18 deletions

diff --git a/news/inn-stable/pkg-plist b/news/inn-stable/pkg-plist
index b2e6feda4421..94c33da99e15 100644
--- a/news/inn-stable/pkg-plist
+++ b/news/inn-stable/pkg-plist
@@ -1,11 +1,16 @@
 etc/rc.d/innd.sh
-news/bin/actived
 news/bin/actmerge
 news/bin/actsync
 news/bin/actsyncd
 news/bin/archive
+news/bin/auth/passwd/ckpasswd
+news/bin/auth/passwd/pwcheck
+news/bin/auth/passwd/radius
+news/bin/auth/resolv/domain
+news/bin/auth/resolv/ident
 news/bin/batcher
 news/bin/buffchan
+news/bin/cnfsheadconf
 news/bin/cnfsstat
 news/bin/control/checkgroups
 news/bin/control/checkgroups.pl
@@ -27,19 +32,21 @@ news/bin/control/version.pl
 news/bin/controlbatch
 news/bin/controlchan
 news/bin/convdate
-news/bin/crosspost
 news/bin/ctlinnd
 news/bin/cvtbatch
+news/bin/dbprocs
 news/bin/expire
-news/bin/expireindex
 news/bin/expireover
 news/bin/expirerm
 news/bin/fastrm
 news/bin/filechan
+news/bin/filter/INN.py
 news/bin/filter/filter.tcl
 news/bin/filter/filter_innd.pl
+news/bin/filter/filter_innd.py
 news/bin/filter/filter_nnrpd.pl
 news/bin/filter/nnrpd_auth.pl
+news/bin/filter/nnrpd_auth.py
 news/bin/filter/startup.tcl
 news/bin/filter/startup_innd.pl
 news/bin/getlist
@@ -51,7 +58,6 @@ 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
@@ -59,7 +65,7 @@ news/bin/innwatch
 news/bin/innxbatch
 news/bin/innxmit
 news/bin/mailpost
-news/bin/makeactive
+news/bin/makedbz
 news/bin/makehistory
 news/bin/mod-active
 news/bin/news.daily
@@ -68,6 +74,8 @@ news/bin/newsrequeue
 news/bin/nnrpd
 news/bin/nntpget
 news/bin/nntpsend
+news/bin/ovdb_recover
+news/bin/ovdb_upgrade
 news/bin/overchan
 news/bin/parsecontrol
 news/bin/pgpverify
@@ -89,13 +97,22 @@ news/bin/sendbatch
 news/bin/sendxbatches
 news/bin/shlock
 news/bin/shrinkfile
+news/bin/signcontrol
 news/bin/simpleftp
 news/bin/sm
 news/bin/startinnfeed
 news/bin/tally.control
 news/bin/writelog
+news/db/active
+news/db/active.times
+news/db/history
+news/db/history.dir
+news/db/history.hash
+news/db/history.index
+news/db/newsgroups
 news/etc/actsync.cfg
 news/etc/actsync.ign
+news/etc/buffindexed.conf
 news/etc/control.ctl
 news/etc/cycbuff.conf
 news/etc/distrib.pats
@@ -109,12 +126,14 @@ 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/ovdb.conf
 news/etc/overview.fmt
 news/etc/passwd.nntp
+news/etc/radius.conf
+news/etc/readers.conf
+news/etc/sasl.conf
 news/etc/storage.conf
 news/lib/docheckgroups
 news/lib/innreport_inn.pm
@@ -123,16 +142,28 @@ news/lib/innshellvars.pl
 news/lib/innshellvars.tcl
 news/lib/libinn.a
 news/lib/libstorage.a
-news/log/.keep_me
-news/run/.keep_me
-@dirrm news/bin/auth
-@dirrm news/bin/control
-@dirrm news/bin/filter
+share/doc/inn/HISTORY
+share/doc/inn/INSTALL
+share/doc/inn/LICENSE
+@dirrm share/doc/inn
+@dirrm news/spool/tmp
+@dirrm news/spool/overview
+@dirrm news/spool/outgoing
+@dirrm news/spool/innfeed
+@dirrm news/spool/incoming/bad
+@dirrm news/spool/incoming
+@dirrm news/spool/articles
+@dirrm news/spool/archive
+@dirrm news/spool
+@dirrm news/run
+@dirrm news/lib
+@dirrm news/etc
+@dirrm news/db
 @dirrm news/bin/rnews.libexec
+@dirrm news/bin/filter
+@dirrm news/bin/control
+@dirrm news/bin/auth/resolv
+@dirrm news/bin/auth/passwd
+@dirrm news/bin/auth
 @dirrm news/bin
-@dirrm news/db
-@dirrm news/etc
-@dirrm news/lib
-@dirrm news/log
-@dirrm news/run
-@dirrm news
+@dirrm news