4 files changed, 111 insertions, 79 deletions

diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 371f203f19da..3162b0a19a0f 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	inn
-PORTVERSION=	2.3.5
-CATEGORIES=	news
+PORTVERSION=	2.4.0
+CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	inn
-NO_LATEST_LINK=	yes
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	InterNetNews -- the Internet meets Netnews
 
-USE_GMAKE=YES
+NO_LATEST_LINK=	yes
+USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_OPENSSL=	yes
 
 .if exists(/var/news) && !defined(PACKAGE_BUILDING)
 INN_NEWSSPOOL?=/var/news
@@ -34,41 +35,50 @@ CONFIGURE_ARGS+=	--with-spool-dir=${INN_NEWSSPOOL}
 CONFIGURE_ARGS+=	--with-log-dir=${INN_NEWSLOG}
 CONFIGURE_ARGS+=	--with-perl
 CONFIGURE_ARGS+=	--with-tmp-path=${INN_NEWSSPOOL}/tmp
-CONFIGURE_ARGS+=	--with-largefiles
+CONFIGURE_ARGS+=	--enable-largefiles
 CONFIGURE_ARGS+=	--with-openssl
+CONFIGURE_ARGS+=	--enable-ipv6
 
-# 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=	ckpasswd.1 convdate.1 fastrm.1 getlist.1 grephistory.1 inews.1 \
-	innconfval.1 innfeed.1 innmail.1 nntpget.1 rnews.1 shlock.1 \
-	shrinkfile.1 simpleftp.1 startinnfeed.1
-MAN3=	clientlib.3 dbz.3 inndcomm.3 libinn.3 libstorage.3 parsedate.3 qio.3 \
-	wildmat.3
-MAN5=	active.5 buffindexed.conf.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 ovdb.5 \
-	overview.fmt.5 passwd.nntp.5 readers.conf.5 sasl.conf.5 \
-	storage.conf.5 subscriptions.5
-MAN8=	actsync.8 actsyncd.8 archive.8 batcher.8 buffchan.8 cnfsheadconf.8 \
-	cnfsstat.8 controlchan.8 ctlinnd.8 cvtbatch.8 dbprocs.8 expire.8 \
-	expireover.8 expirerm.8 filechan.8 inncheck.8 innd.8 inndf.8 \
-	inndstart.8 innreport.8 innstat.8 innwatch.8 innxbatch.8 innxmit.8 \
-	mailpost.8 makedbz.8 makehistory.8 mod-active.8 news.daily.8 \
-	news2mail.8 newsrequeue.8 nnrpd.8 nntpsend.8 ovdb_recover.8 \
-	ovdb_upgrade.8 overchan.8 pgpverify.8 prunehistory.8 pullnews.8 \
-	scanlogs.8 send-uucp.8 sm.8 tally.control.8 writelog.8
+EXTRA=	CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
+HEADERS=clibrary.h config.h dbz.h libinn.h storage.h
 
-EXTRA=	${WRKSRC}/HISTORY ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE
+MAN1=	convdate.1 fastrm.1 getlist.1 grephistory.1 inews.1 innconfval.1 \
+	innfeed.1 innmail.1 nntpget.1 pgpverify.1 rnews.1 shlock.1 \
+	shrinkfile.1 simpleftp.1 sm.1 startinnfeed.1
+MAN3=	clientlib.3 dbz.3 inndcomm.3 libauth.3 libinn.3 libinnhist.3 \
+	libstorage.3 list.3 parsedate.3 qio.3 tst.3 uwildmat.3
+MAN5=	active.5 active.times.5 buffindexed.conf.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 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \
+	overview.fmt.5 passwd.nntp.5 radius.conf.5 readers.conf.5 \
+	sasl.conf.5 storage.conf.5 subscriptions.5
+MAN8=	actsync.8 actsyncd.8 archive.8 auth_smb.8 batcher.8 buffchan.8 \
+	ckpasswd.8 cnfsheadconf.8 cnfsstat.8 controlchan.8 ctlinnd.8 \
+	cvtbatch.8 domain.8 expire.8 expireover.8 expirerm.8 filechan.8 \
+	ident.8 inncheck.8 innd.8 inndf.8 inndstart.8 innreport.8 innstat.8 \
+	innupgrade.8 innwatch.8 innxbatch.8 innxmit.8 mailpost.8 makedbz.8 \
+	makehistory.8 mod-active.8 news.daily.8 news2mail.8 ninpaths.8 \
+	nnrpd.8 nntpsend.8 ovdb_init.8 ovdb_monitor.8 ovdb_server.8 \
+	ovdb_stat.8 overchan.8 perl-nocem.8 prunehistory.8 pullnews.8 \
+	radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \
+	tally.control.8 tdx-util.8 writelog.8
 
-INN_INCLUDES=	clibrary.h config.h configdata.h dbz.h libinn.h storage.h
-
-pre-install:
+do-install:
 	${MKDIR} ${INN_NEWSSPOOL}
+	(cd ${WRKSRC} && ${GMAKE} install)
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for FILE in ${EXTRA}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+.endfor
+.endif
+	${MKDIR} ${PREFIX}/news/include
+.for FILE in ${HEADERS}
+	${INSTALL_DATA} ${WRKSRC}/include/${FILE} ${PREFIX}/news/include/
+.endfor
+	@${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
+	    s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh
 
 post-install:
 	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
@@ -84,14 +94,6 @@ post-install:
 		${MV} history.n.$${s} history.$${s} ; \
 	    done ; \
 	fi)
-	@${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
-	    s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh
-	@${MKDIR} ${PREFIX}/share/doc/inn
-	@${INSTALL_DATA} ${EXTRA} ${PREFIX}/share/doc/inn
-	@${MKDIR} ${PREFIX}/news/include
-.for FILE in ${INN_INCLUDES}
-	@${INSTALL_DATA} ${WRKSRC}/include/${FILE} ${PREFIX}/news/include/
-.endfor
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/news/inn-current/distinfo b/news/inn-current/distinfo
index 1a09909e39bc..df9d0b77c60a 100644
--- a/news/inn-current/distinfo
+++ b/news/inn-current/distinfo
@@ -1 +1 @@
-MD5 (inn-2.3.5.tar.gz) = 97223e05d37e568f2ba95793b8133246
+MD5 (inn-2.4.0.tar.gz) = 629c445b7c7fe2a01257b883abb7bddf
diff --git a/news/inn-current/files/patch-aa b/news/inn-current/files/patch-aa
deleted file mode 100644
index cb4a2a9c872f..000000000000
--- a/news/inn-current/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	Sun Mar 11 01:59:11 2001
-+++ Makefile	Sun Mar 11 01:59:56 2001
-@@ -81,7 +81,9 @@
- directories:
- 	@chmod +x support/install-sh
- 	for D in $(INSTDIRS) ; do \
--	    support/install-sh $(OWNER) -m 0755 -d $$D ; \
-+	    if [ ! -d $$D ] ; then \
-+		support/install-sh $(OWNER) -m 0755 -d $$D ; \
-+	    fi ; \
- 	done
- 	support/install-sh $(OWNER) -m 0750 -d $(PATHRUN)
- 
diff --git a/news/inn-current/pkg-plist b/news/inn-current/pkg-plist
index 72fd7641694c..e019b86895dd 100644
--- a/news/inn-current/pkg-plist
+++ b/news/inn-current/pkg-plist
@@ -3,8 +3,8 @@ news/bin/actmerge
 news/bin/actsync
 news/bin/actsyncd
 news/bin/archive
+news/bin/auth/passwd/auth_smb
 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
@@ -12,29 +12,20 @@ news/bin/batcher
 news/bin/buffchan
 news/bin/cnfsheadconf
 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/version.pl
 news/bin/controlbatch
 news/bin/controlchan
 news/bin/convdate
 news/bin/ctlinnd
 news/bin/cvtbatch
-news/bin/dbprocs
+news/bin/docheckgroups
 news/bin/expire
 news/bin/expireover
 news/bin/expirerm
@@ -52,6 +43,7 @@ news/bin/filter/startup_innd.pl
 news/bin/getlist
 news/bin/gpgverify
 news/bin/grephistory
+news/bin/imapfeed
 news/bin/inews
 news/bin/inncheck
 news/bin/innconfval
@@ -62,6 +54,7 @@ news/bin/innfeed
 news/bin/innmail
 news/bin/innreport
 news/bin/innstat
+news/bin/innupgrade
 news/bin/innwatch
 news/bin/innxbatch
 news/bin/innxmit
@@ -71,14 +64,16 @@ news/bin/makehistory
 news/bin/mod-active
 news/bin/news.daily
 news/bin/news2mail
-news/bin/newsrequeue
+news/bin/ninpaths
 news/bin/nnrpd
 news/bin/nntpget
 news/bin/nntpsend
-news/bin/ovdb_recover
-news/bin/ovdb_upgrade
+news/bin/ovdb_init
+news/bin/ovdb_monitor
+news/bin/ovdb_server
+news/bin/ovdb_stat
 news/bin/overchan
-news/bin/parsecontrol
+news/bin/perl-nocem
 news/bin/pgpverify
 news/bin/procbatch
 news/bin/prunehistory
@@ -94,7 +89,7 @@ news/bin/scanspool
 news/bin/send-ihave
 news/bin/send-nntp
 news/bin/send-uucp
-news/bin/sendbatch
+news/bin/sendinpaths
 news/bin/sendxbatches
 news/bin/shlock
 news/bin/shrinkfile
@@ -103,6 +98,7 @@ news/bin/simpleftp
 news/bin/sm
 news/bin/startinnfeed
 news/bin/tally.control
+news/bin/tdx-util
 news/bin/writelog
 news/db/active
 news/db/active.times
@@ -111,6 +107,24 @@ news/db/history.dir
 news/db/history.hash
 news/db/history.index
 news/db/newsgroups
+news/doc/CONTRIBUTORS
+news/doc/GPL
+news/doc/HACKING
+news/doc/INSTALL
+news/doc/LICENSE
+news/doc/NEWS
+news/doc/README
+news/doc/TODO
+news/doc/compliance-nntp
+news/doc/config-design
+news/doc/config-semantics
+news/doc/config-syntax
+news/doc/external-auth
+news/doc/history
+news/doc/hook-perl
+news/doc/hook-python
+news/doc/hook-tcl
+news/doc/sample-control
 news/etc/actsync.cfg
 news/etc/actsync.ign
 news/etc/buffindexed.conf
@@ -138,23 +152,50 @@ news/etc/sasl.conf
 news/etc/storage.conf
 news/etc/subscriptions
 news/include/clibrary.h
+news/include/conffile.h
 news/include/config.h
-news/include/configdata.h
 news/include/dbz.h
+news/include/inn/buffer.h
+news/include/inn/confparse.h
+news/include/inn/defines.h
+news/include/inn/hashtab.h
+news/include/inn/history.h
+news/include/inn/innconf.h
+news/include/inn/list.h
+news/include/inn/md5.h
+news/include/inn/messages.h
+news/include/inn/mmap.h
+news/include/inn/qio.h
+news/include/inn/sequence.h
+news/include/inn/system.h
+news/include/inn/timer.h
+news/include/inn/tst.h
+news/include/inn/vector.h
+news/include/inn/version.h
+news/include/inn/wire.h
+news/include/inndcomm.h
 news/include/libinn.h
+news/include/nntp.h
+news/include/ov.h
+news/include/paths.h
 news/include/storage.h
-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/libinnhist.a
 news/lib/libstorage.a
-share/doc/inn/HISTORY
-share/doc/inn/INSTALL
-share/doc/inn/LICENSE
-@dirrm share/doc/inn
-@dirrm news/spool/tmp
+%%PORTDOCS%%share/doc/inn/CONTRIBUTORS
+%%PORTDOCS%%share/doc/inn/HACKING
+%%PORTDOCS%%share/doc/inn/INSTALL
+%%PORTDOCS%%share/doc/inn/LICENSE
+%%PORTDOCS%%share/doc/inn/MANIFEST
+%%PORTDOCS%%share/doc/inn/NEWS
+%%PORTDOCS%%share/doc/inn/README
+%%PORTDOCS%%share/doc/inn/TODO
+%%PORTDOCS%%@dirrm share/doc/inn
+@dirrm news/tmp
 @dirrm news/spool/overview
 @dirrm news/spool/outgoing
 @dirrm news/spool/innfeed
@@ -165,8 +206,10 @@ share/doc/inn/LICENSE
 @dirrm news/spool
 @dirrm news/run
 @dirrm news/lib
+@dirrm news/include/inn
 @dirrm news/include
 @dirrm news/etc
+@dirrm news/doc
 @dirrm news/db
 @dirrm news/bin/rnews.libexec
 @dirrm news/bin/filter