- Update to INN 2.5.5

  http://www.eyrie.org/~eagle/software/inn/docs-2.5/news.html#S1
- Set some more options as default for a typical installation

3 files changed, 36 insertions, 58 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 4aa74d0edcbb..2e9121154eb3 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,12 +1,10 @@
 # Created by: torstenb
 # $FreeBSD$
 
-PORTNAME?=	inn
-PORTVERSION?=	2.5.4
-PORTREVISION?=	2
+PORTNAME=	inn
+PORTVERSION=	2.5.5
 CATEGORIES=	news ipv6
-# Master distribution broken
-MASTER_SITES?=	ISC/${PORTNAME}
+MASTER_SITES=	ISC/${PORTNAME}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	InterNetNews -- the Internet meets Netnews
@@ -26,9 +24,9 @@ CPE_VENDOR=	isc
 
 CONFLICTS?=	inn-stable-[0-9]* inn-current-[0-9]*
 
-OPTIONS_DEFINE=		KERBEROS SASL KEYWORDS BERKELEYDB OPENSSL \
-			TAGGED_HASH LARGE_FILES GNUPG
-OPTIONS_DEFAULT=	KEYWORDS
+OPTIONS_DEFINE=		BERKELEYDB GNUPG KERBEROS SASL KEYWORDS \
+			LARGE_FILES OPENSSL TAGGED_HASH
+OPTIONS_DEFAULT=	BERKELEYDB GNUPG KEYWORDS OPENSSL LARGE_FILES
 OPTIONS_SUB=		yes
 
 KERBEROS_DESC=		Enable Kerberos v5 (for auth_krb5)
@@ -121,26 +119,25 @@ RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
 .endif
 
 PORTDOCS=	CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
-HEADERS=	clibrary.h config.h dbz.h libinn.h storage.h
 
-
-TO_BE_STRIPPED=	bin/auth/resolv/domain bin/auth/resolv/ident \
-		bin/auth/passwd/ckpasswd bin/auth/passwd/radius bin/rnews.libexec/decode \
-		bin/rnews.libexec/encode bin/tdx-util bin/innd bin/nnrpd \
-		bin/innfeed bin/imapfeed bin/buffindexed_d bin/convdate bin/expire \
-		bin/expireover bin/fastrm bin/grephistory bin/makedbz bin/makehistory \
-		bin/prunehistory bin/ctlinnd bin/getlist bin/inews bin/innconfval \
-		bin/ovdb_init bin/ovdb_monitor bin/ovdb_server bin/ovdb_stat bin/rnews \
-		bin/sm bin/actsync bin/archive bin/batcher bin/buffchan bin/cvtbatch \
-		bin/filechan bin/inndf bin/innxmit bin/innxbatch bin/ninpaths bin/nntpget \
-		bin/overchan bin/shlock bin/shrinkfile bin/tinyleaf
+TO_BE_STRIPPED=	bin/auth/resolv/domain bin/actsync bin/archive \
+	bin/auth/passwd/ckpasswd bin/auth/passwd/radius bin/auth/resolv/ident \
+	bin/batcher bin/buffchan bin/buffindexed_d bin/convdate bin/ctlinnd \
+	bin/cvtbatch bin/expire bin/expireover bin/fastrm bin/filechan \
+	bin/getlist bin/grephistory bin/imapfeed bin/inews bin/innbind \
+	bin/innconfval bin/innd bin/inndf bin/innfeed bin/innxbatch \
+	bin/innxmit bin/makedbz bin/makehistory bin/ninpaths bin/nnrpd \
+	bin/nntpget bin/ovdb_init bin/ovdb_monitor bin/ovdb_server \
+	bin/ovdb_stat bin/overchan bin/prunehistory bin/rnews \
+	bin/rnews.libexec/decode bin/rnews.libexec/encode bin/shlock \
+	bin/shrinkfile bin/sm bin/tdx-util bin/tinyleaf
 
 CONFIG_FILES=	actsync.cfg actsync.ign buffindexed.conf control.ctl \
 		control.ctl.local cycbuff.conf \
 		distrib.pats distributions \
 		expire.ctl localgroups incoming.conf inn.conf innfeed.conf \
-		innreport.conf innshellvars.local innshellvars.pl.local innshellvars.tcl.local \
-		innwatch.ctl moderators news2mail.cf \
+		innreport.conf innshellvars.local innshellvars.pl.local \
+		innshellvars.tcl.local innwatch.ctl moderators news2mail.cf \
 		newsfeeds nocem.ctl \
 		nnrpd.track nntpsend.ctl ovdb.conf \
 		passwd.nntp readers.conf send-uucp.cf \
diff --git a/news/inn/distinfo b/news/inn/distinfo
index c98d334be6a1..465ba70b6731 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (inn-2.5.4.tar.gz) = 5b62240c3074f2f38b3bcc656c343c587f2a923ec9d45e19f0d4ce269cb3f3f4
-SIZE (inn-2.5.4.tar.gz) = 2408600
+SHA256 (inn-2.5.5.tar.gz) = 4245602c2c30fd3fe38513e9403c8d0ea4eb76256961591f97da630c341053bf
+SIZE (inn-2.5.5.tar.gz) = 2419841
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index 3acc02d21238..b0c3f7826548 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -325,8 +325,8 @@ man/man8/writelog.8.gz
 %%EXAMPLESDIR%%/send-uucp.cf
 %%EXAMPLESDIR%%/storage.conf
 %%EXAMPLESDIR%%/subscriptions
+@dir %%EXAMPLESDIR%%/db
 @comment --------------------------------------------------------------
-@cwd /
 @sample %%DBDIR%%/active.sample
 @sample %%DBDIR%%/active.times.sample
 @sample %%DBDIR%%/newsgroups.sample
@@ -368,38 +368,19 @@ man/man8/writelog.8.gz
 @sample %%CONFDIR%%/storage.conf.sample
 @sample %%CONFDIR%%/subscriptions.sample
 @comment --------------------------------------------------------------
-@cwd
-@dirrm %%EXAMPLESDIR%%/db
-@dirrm %%EXAMPLESDIR%%
 @cwd /
-@dirrm %%TMPDIR%%                
-@dirrm %%SHAREDIR%%              
-@dirrm %%NEWSSPOOL%%/overview    
-@dirrm %%NEWSSPOOL%%/outgoing    
-@dirrm %%NEWSSPOOL%%/innfeed     
-@dirrm %%NEWSSPOOL%%/incoming/bad
-@dirrm %%NEWSSPOOL%%/incoming    
-@dirrm %%NEWSSPOOL%%/articles    
-@dirrm %%NEWSSPOOL%%/archive     
-@dirrm %%NEWSSPOOL%%             
-@dirrm %%RUNDIR%%                
-@dirrm %%NEWSBASE%%/http
-@dirrm %%NEWSBASE%%/lib/perl/INN/Utils
-@dirrm %%NEWSBASE%%/lib/perl/INN
-@dirrm %%NEWSBASE%%/lib/perl
-@dirrm %%NEWSBASE%%/lib
-@dirrm %%NEWSBASE%%/include/inn
-@dirrm %%NEWSBASE%%/include
-@dirrm %%NEWSBASE%%/doc
-@dirrm %%NEWSBASE%%/bin/rnews.libexec
-@dirrm %%NEWSBASE%%/bin/filter
-@dirrm %%NEWSBASE%%/bin/control
-@dirrm %%NEWSBASE%%/bin/auth/resolv
-@dirrm %%NEWSBASE%%/bin/auth/passwd
-@dirrm %%NEWSBASE%%/bin/auth
-@dirrm %%NEWSBASE%%/bin
-@dirrm %%DBDIR%%                 
-@dirrm %%LOGDIR%%/OLD
-@dirrm %%LOGDIR%%
-@dirrm %%CONFDIR%%                
+@dir %%TMPDIR%%
+@dir %%SHAREDIR%%
+@dir %%NEWSSPOOL%%/overview
+@dir %%NEWSSPOOL%%/outgoing
+@dir %%NEWSSPOOL%%/innfeed
+@dir %%NEWSSPOOL%%/incoming/bad
+@dir %%NEWSSPOOL%%/incoming
+@dir %%NEWSSPOOL%%/articles
+@dir %%NEWSSPOOL%%/archive
+@dir %%NEWSSPOOL%%
+@dir %%RUNDIR%%
+@dir %%DBDIR%%
+@dir %%LOGDIR%%/OLD
+@dir %%LOGDIR%%
 @unexec rmdir %%NEWSBASE%% 2>/dev/null ||( echo "===>  If you don't plan to use inn later, you can safely remove %%NEWSBASE%%. Deinstall process kept these files intact:" | fmt && for i in $(find %D/news -type f); do echo "    - $i"; done)