7 files changed, 108 insertions, 102 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 9e7ad675f1db..3e9fbb40c6cb 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	inn
-PORTVERSION?=	2.4.6
-PORTREVISION?=	3
+PORTVERSION?=	2.5.2
 CATEGORIES=	news ipv6
 # Master distribution broken
 #MASTER_SITES?=	${MASTER_SITE_ISC}
@@ -29,8 +28,6 @@ USE_PERL5=	yes
 
 CONFLICTS?=	inn-stable-[0-9]* inn-current-[0-9]*
 
-BRANCH?=	# Empty
-
 OPTIONS=	PYTHON		"Embedded Python module support"		Off	\
 		TCL		"Embedded TCL support"				Off	\
 		KERBEROS	"Enable Kerberos auth support"			Off	\
@@ -44,6 +41,12 @@ VARBASE?=	/var
 
 .include "Makefile.layout"
 
+BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
+		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
+#		${SITE_PERL}/MIME/parser.pm:${PORTSDIR}/mail/p5-MIME-Tools
+
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man		\
@@ -55,6 +58,7 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man		\
 			--with-etc-dir=${INN_ETCDIR}		\
 			--with-run-dir=${INN_RUNDIR}		\
 			--with-db-dir=${INN_DBDIR}		\
+			--with-datarootdirdir=${INN_SHAREDIR}	\
 			--with-ssl=${OPENSSLBASE}		\
 			--enable-ipv6 --with-perl
 
@@ -124,35 +128,38 @@ PLIST_SUB+=		WITHOUT_TAGGED_HASH=""
 .endif
 
 PORTDOCS=	CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
-HEADERS=	clibrary.h config.h dbz.h
+HEADERS=	clibrary.h config.h dbz.h libinn.h storage.h
 
 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 pullnews.1
-MAN3=		clientlib.3 dbz.3 inndcomm.3 libauth.3 libinn.3 libinnhist.3 \
-		libstorage.3 list.3 qio.3 tst.3 uwildmat.3
+MAN3=		INN::Config.3pm clientlib.3 dbz.3 inndcomm.3 libauth.3 libinn.3 \
+		libinnhist.3 libstorage.3 list.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 \
+		cycbuff.conf.5 distrib.pats.5 distributions.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 newsgroups.5 \
+		newslog.5 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \
+		passwd.nntp.5 radius.conf.5 readers.conf.5 \
 		storage.conf.5 subscriptions.5
-MAN8=		actsync.8 archive.8 auth_smb.8 batcher.8 buffchan.8 \
+MAN8=		actsync.8 archive.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 innreport.8 innstat.8 \
+		cvtbatch.8 docheckgroups.8 domain.8 expire.8 expireover.8 \
+		expirerm.8 filechan.8 \
+		ident.8 inncheck.8 innbind.8 innd.8 inndf.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 \
 		radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \
-		tally.control.8 tdx-util.8 writelog.8
+		tally.control.8 tdx-util.8 tinyleaf.8 writelog.8
+MLINKS=		actsync.8 actsyncd.8	docheckgroups.8 localgroups.5	perl-nocem.8 nocem.ctl.5
 
 .if defined(WITH_KERBEROS)
 MAN8+=		auth_krb5.8
 .endif
 
-TO_BE_STRIPPED=	bin/auth/resolv/domain bin/auth/resolv/ident bin/auth/passwd/auth_smb \
+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/convdate bin/expire \
@@ -163,29 +170,27 @@ TO_BE_STRIPPED=	bin/auth/resolv/domain bin/auth/resolv/ident bin/auth/passwd/aut
 		bin/filechan bin/inndf bin/innxmit bin/innxbatch bin/ninpaths bin/nntpget \
 		bin/overchan bin/shlock bin/shrinkfile
 
-CONFIG_FILES=	actsync.cfg actsync.ign buffindexed.conf control.ctl cycbuff.conf \
-		distrib.pats expire.ctl incoming.conf inn.conf innfeed.conf \
+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 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 \
-		subscriptions
-
-.if ${BRANCH} != "current"
-MAN1+=		startinnfeed.1
-MAN3+=		parsedate.3
-MAN5+=		sasl.conf.5
-MAN8+=		actsyncd.8 inndstart.8
-TO_BE_STRIPPED+=bin/inndstart bin/startinnfeed
-HEADERS+=	libinn.h storage.h
-PLIST_SUB+=	NOTCURRENT=""
-.else
-PLIST_SUB+=	NOTCURRENT="@comment "
-MAN8+=		innbind.8 tinyleaf.8
-.endif
+		newsfeeds nocem.ctl \
+		nnrpd.track nntpsend.ctl ovdb.conf overview.fmt \
+		passwd.nntp radius.conf readers.conf sasl.conf send-uucp.cf \
+		storage.conf subscriptions
 
 SUB_LIST+=	EGDIR="${EXAMPLESDIR:C,^${PREFIX},\\$\\${PREFIX},}"
 PLIST_SUB+=	ETCFILES="${CONFIG_FILES}"
 
+.include <bsd.port.pre.mk>
+
+# Perl 5.12 deprecated $[
+.if ${PERL_LEVEL} >= 501200
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-scripts_innreport.in \
+		${PATCHDIR}/extra-patch-scripts_innreport_inn.pm
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -E 's!\$$[{(]PATHETC[})]!${EXAMPLESDIR}!g' \
 	                  ${WRKSRC}/site/Makefile
@@ -228,9 +233,9 @@ post-install:
 .    endfor
 .endif
 	${MKDIR} ${INN_NEWSBASE}/include
-.for FILE in ${HEADERS}
-	${INSTALL_DATA} ${WRKSRC}/include/${FILE} ${INN_NEWSBASE}/include/
-.endfor
+# XXX  .for FILE in ${HEADERS}
+# XXX  	${INSTALL_DATA} ${WRKSRC}/include/${FILE} ${INN_NEWSBASE}/include/
+# XXX  .endfor
 	${CHOWN} ${BINOWN}:news ${INN_NEWSBASE}/bin/auth/passwd/ckpasswd
 	${CHMOD} 4755 ${INN_NEWSBASE}/bin/auth/passwd/ckpasswd
 	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF ${INN_ETCDIR}
@@ -247,4 +252,4 @@ post-install:
 	fi)
 	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL PORTMODE
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/news/inn/Makefile.layout b/news/inn/Makefile.layout
index 1ad1f77469fb..5a3b77f7ef5e 100644
--- a/news/inn/Makefile.layout
+++ b/news/inn/Makefile.layout
@@ -9,6 +9,7 @@ INN_LAYOUT?=		old
 #-----------------------------------------------------------------------
 INN_NEWSBASE=		${PREFIX}/news
 INN_ETCDIR=		${INN_NEWSBASE}/etc
+INN_SHAREDIR=		${INN_NEWSBASE}/share
 INN_RUNDIR=		${VARBASE}/run/news
 INN_LOGDIR=		${VARBASE}/log/news
 INN_DBDIR=		${VARBASE}/news/db
@@ -21,6 +22,7 @@ INN_NEWSSPOOL=		${VARBASE}/news
 #-----------------------------------------------------------------------
 INN_NEWSBASE=		${PREFIX}/news
 INN_ETCDIR=		${PREFIX}/etc/news
+INN_SHAREDIR=		${PREFIX}/share/inn
 INN_RUNDIR=		${VARBASE}/run/news
 INN_LOGDIR=		${VARBASE}/log/news
 INN_DBDIR=		${VARBASE}/db/news
@@ -43,6 +45,7 @@ INN_NEWSLOG?=		${VARBASE}/log/news
 INN_LOGDIR?=		${INN_NEWSLOG}
 INN_DBDIR=		${INN_NEWSBASE}/db
 INN_TMPDIR=		${INN_NEWSBASE}/tmp
+INN_SHAREDIR=		${INN_NEWSBASE}/share
 .  if exists(${VARBASE}/news) && !defined(PACKAGE_BUILDING)
 INN_NEWSSPOOL?=		${VARBASE}/news
 .  elif exists(${VARBASE}/spool/news) && !defined(PACKAGE_BUILDING)
@@ -52,7 +55,7 @@ INN_NEWSSPOOL?=		${PREFIX}/news/spool
 .  endif
 .endif
 
-.for sub in NEWSBASE ETCDIR RUNDIR LOGDIR DBDIR TMPDIR NEWSSPOOL
+.for sub in NEWSBASE ETCDIR RUNDIR LOGDIR DBDIR TMPDIR NEWSSPOOL SHAREDIR
 PLIST_SUB+=		${sub}="${INN_${sub}:C,^${PREFIX},%D,}"
 SUB_LIST+=		${sub}="${INN_${sub}:C,^${PREFIX},${PREFIX},}"
 .endfor
diff --git a/news/inn/distinfo b/news/inn/distinfo
index e60ce0d456bc..912dec5411e0 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (inn-2.4.6.tar.gz) = 912b4c56a08697b49be279b15ed4ca007de2204b6485a58d1f9db60e3d4a6690
-SIZE (inn-2.4.6.tar.gz) = 1942874
+SHA256 (inn-2.5.2.tar.gz) = f5edd48f48ecee9b6430db94fe504f893d7dfae4257f55f382ba1cf7375b4e68
+SIZE (inn-2.5.2.tar.gz) = 2331916
diff --git a/news/inn/files/extra-patch-scripts_innreport.in b/news/inn/files/extra-patch-scripts_innreport.in
new file mode 100644
index 000000000000..a1573a52a5dc
--- /dev/null
+++ b/news/inn/files/extra-patch-scripts_innreport.in
@@ -0,0 +1,18 @@
+--- scripts/innreport.in.orig	2012-03-14 01:02:54.000000000 +0800
++++ scripts/innreport.in	2012-03-14 01:21:13.000000000 +0800
+@@ -674,7 +674,6 @@
+ 
+   # $[ ... The index of the first element in an array, and of the first
+   #        character in a substring. Default is 0.
+-  local $[ = 0;
+ 
+   # The 2 dates are near. The range is less than a few days that's why we
+   # can cheat to determine the order. It is only important if one date
+@@ -791,7 +790,6 @@
+ 
+ # Compare 2 filenames
+ sub filenamecmp {
+-  local $[ = 0;
+   my ($la, $lb) = ($a, $b);
+   my ($ya) = $la =~ m/news-notice\.(\d+)\./o;
+   $ya += 100  if $ya < 90; # Try to pacify the year 2000 !
diff --git a/news/inn/files/extra-patch-scripts_innreport_inn.pm b/news/inn/files/extra-patch-scripts_innreport_inn.pm
new file mode 100644
index 000000000000..bbb4de57967a
--- /dev/null
+++ b/news/inn/files/extra-patch-scripts_innreport_inn.pm
@@ -0,0 +1,11 @@
+--- scripts/innreport_inn.pm.orig	2012-03-14 01:09:58.000000000 +0800
++++ scripts/innreport_inn.pm	2012-03-14 01:17:41.000000000 +0800
+@@ -2197,7 +2197,7 @@
+ # Compare 2 dates (+hour)
+ sub datecmp {
+   # ex: "May 12 06"   for May 12, 6:00am
+-  local($[) = 0;
++
+   # The 2 dates are near. The range is less than a few days that's why we
+   # can cheat to determine the order. It is only important if one date
+   # is in January and the other in December.
diff --git a/news/inn/files/patch-configure b/news/inn/files/patch-configure
index 0eed46af6376..a88a6aaa8058 100644
--- a/news/inn/files/patch-configure
+++ b/news/inn/files/patch-configure
@@ -1,42 +1,23 @@
---- configure.orig	2008-06-30 04:56:57.000000000 +1100
-+++ configure	2008-08-18 12:35:35.000000000 +1100
-@@ -7535,36 +7535,9 @@
- 	    done
-         done
+--- configure.orig	2010-03-25 06:10:36.000000000 +1000
++++ configure	2012-06-27 21:44:02.000000000 +1100
+@@ -15762,7 +15762,7 @@
+ echo $ECHO_N "checking for Berkeley DB location... $ECHO_C" >&6; }
+     if test x"$DB_DIR" = xyes ; then
+         for dir in $prefix /usr/local /usr ; do
+-            if test -f "$dir/include/db.h" ; then
++            if test -f "$dir/include/${DB_VER}/db.h" ; then
+                 DB_DIR=$dir
+                 break
+             fi
+@@ -15773,9 +15773,9 @@
+ echo "$as_me: error: cannot find Berkeley DB" >&2;}
+    { (exit 1); exit 1; }; }
+     else
+-        DB_CPPFLAGS="-I$DB_DIR/include"
++        DB_CPPFLAGS="-I$DB_DIR/include/${DB_VER}"
+         DB_LDFLAGS="-L$DB_DIR/lib"
+-        DB_LIBS="-ldb"
++        DB_LIBS="-l${DB_LIB}"
+         { echo "$as_me:$LINENO: result: $DB_DIR" >&5
+ echo "${ECHO_T}$DB_DIR" >&6; }
      fi
--    if test x"$BERKELEY_DB_DIR" = xyes ; then
--        for v in db46 db45 db44 db43 db42 db41 db4 db3 db2 ; do
--            if test -d "/usr/local/include/$v" ; then
--                BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
--                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
--                BERKELEY_DB_LIB="-l$v"
--                echo "$ac_t""FreeBSD locations" 1>&6
--                break
--            fi
--        done
--        if test x"$BERKELEY_DB_LIB" = x ; then
--            for v in db44 db43 db42 db41 db4 db3 db2 ; do
--                if test -d "/usr/include/$v" ; then
--                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
--                    BERKELEY_DB_LIB="-l$v"
--                    echo "$ac_t""Linux locations" 1>&6
--                    break
--                fi
--            done
--            if test x"$BERKELEY_DB_LIB" = x ; then        
--                BERKELEY_DB_LIB=-ldb
--                echo "$ac_t""trying -ldb" 1>&6
--            fi
--        fi
--    else
--        BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
--        BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
--        BERKELEY_DB_LIB="-ldb"
--        echo "$ac_t""$BERKELEY_DB_DIR" 1>&6
--    fi
-+         BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
-+         BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/${DB_VER}"
-+         BERKELEY_DB_LIB="-l${DB_LIB}"
-     cat >> confdefs.h <<\EOF
- #define USE_BERKELEY_DB 1
- EOF
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index 95f56fbb9984..5370600ac695 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -4,7 +4,6 @@ bin/actmerge
 bin/actsync
 bin/actsyncd
 bin/archive
-bin/auth/passwd/auth_smb
 bin/auth/passwd/ckpasswd
 bin/auth/passwd/radius
 bin/auth/resolv/domain
@@ -33,7 +32,6 @@ bin/expirerm
 bin/fastrm
 bin/filechan
 bin/filter/INN.py
-%%NOTCURRENT%%bin/filter/filter.tcl
 bin/filter/filter_innd.pl
 bin/filter/filter_innd.py
 bin/filter/filter_nnrpd.pl
@@ -42,10 +40,8 @@ bin/filter/nnrpd_access.py
 bin/filter/nnrpd_auth.pl
 bin/filter/nnrpd_auth.py
 bin/filter/nnrpd_dynamic.py
-%%NOTCURRENT%%bin/filter/startup.tcl
 bin/filter/startup_innd.pl
 bin/getlist
-bin/gpgverify
 bin/grephistory
 bin/imapfeed
 bin/inews
@@ -53,7 +49,6 @@ bin/inncheck
 bin/innconfval
 bin/innd
 bin/inndf
-%%NOTCURRENT%%bin/inndstart
 bin/innfeed
 bin/innmail
 bin/innreport
@@ -100,7 +95,6 @@ bin/shrinkfile
 bin/signcontrol
 bin/simpleftp
 bin/sm
-%%NOTCURRENT%%bin/startinnfeed
 bin/tally.control
 bin/tdx-util
 bin/writelog
@@ -112,7 +106,6 @@ doc/LICENSE
 doc/NEWS
 doc/README
 doc/TODO
-doc/compliance-nntp
 doc/config-design
 doc/config-semantics
 doc/config-syntax
@@ -120,12 +113,8 @@ doc/external-auth
 doc/history
 doc/hook-perl
 doc/hook-python
-%%NOTCURRENT%%doc/hook-tcl
 doc/sample-control
-include/clibrary.h
-%%NOTCURRENT%%include/conffile.h
-include/config.h
-include/dbz.h
+http/innreport.css
 include/inn/buffer.h
 include/inn/confparse.h
 include/inn/defines.h
@@ -144,12 +133,6 @@ include/inn/tst.h
 include/inn/vector.h
 include/inn/version.h
 include/inn/wire.h
-%%NOTCURRENT%%include/inndcomm.h
-%%NOTCURRENT%%include/libinn.h
-%%NOTCURRENT%%include/nntp.h
-%%NOTCURRENT%%include/ov.h
-%%NOTCURRENT%%include/paths.h
-%%NOTCURRENT%%include/storage.h
 lib/innreport_inn.pm
 lib/innshellvars
 lib/innshellvars.pl
@@ -188,26 +171,29 @@ lib/libstorage.a
 %%EXAMPLESDIR%%/actsync.ign
 %%EXAMPLESDIR%%/buffindexed.conf
 %%EXAMPLESDIR%%/control.ctl
+%%EXAMPLESDIR%%/control.ctl.local
 %%EXAMPLESDIR%%/cycbuff.conf
 %%EXAMPLESDIR%%/distrib.pats
+%%EXAMPLESDIR%%/distributions
 %%EXAMPLESDIR%%/expire.ctl
 %%EXAMPLESDIR%%/incoming.conf
 %%EXAMPLESDIR%%/inn.conf
 %%EXAMPLESDIR%%/innfeed.conf
 %%EXAMPLESDIR%%/innreport.conf
 %%EXAMPLESDIR%%/innwatch.ctl
+%%EXAMPLESDIR%%/localgroups
 %%EXAMPLESDIR%%/moderators
 %%EXAMPLESDIR%%/motd.news
 %%EXAMPLESDIR%%/news2mail.cf
 %%EXAMPLESDIR%%/newsfeeds
 %%EXAMPLESDIR%%/nnrpd.track
 %%EXAMPLESDIR%%/nntpsend.ctl
+%%EXAMPLESDIR%%/nocem.ctl
 %%EXAMPLESDIR%%/ovdb.conf
-%%EXAMPLESDIR%%/overview.fmt
 %%EXAMPLESDIR%%/passwd.nntp
 %%EXAMPLESDIR%%/radius.conf
 %%EXAMPLESDIR%%/readers.conf
-%%EXAMPLESDIR%%/sasl.conf
+%%EXAMPLESDIR%%/send-uucp.cf
 %%EXAMPLESDIR%%/storage.conf
 %%EXAMPLESDIR%%/subscriptions
 @exec mkdir -p %%ETCDIR%%
@@ -216,6 +202,7 @@ lib/libstorage.a
 @dirrm %%EXAMPLESDIR%%/db
 @dirrm %%EXAMPLESDIR%%
 @unexec rm -Rf %%TMPDIR%%                 2>/dev/null || true
+@unexec rmdir  %%SHAREDIR%%               2>/dev/null || true
 @unexec rmdir  %%NEWSSPOOL%%/overview     2>/dev/null || true
 @unexec rmdir  %%NEWSSPOOL%%/outgoing     2>/dev/null || true
 @unexec rmdir  %%NEWSSPOOL%%/innfeed      2>/dev/null || true
@@ -226,6 +213,7 @@ lib/libstorage.a
 @unexec rm -Rf %%NEWSSPOOL%%/tmp          2>/dev/null || true
 @unexec rmdir  %%NEWSSPOOL%%              2>/dev/null || true
 @unexec rm -Rf %%RUNDIR%%                 2>/dev/null || true
+@unexec rm -R  %%NEWSBASE%%/http
 @unexec rm -R  %%NEWSBASE%%/lib
 @unexec rm -R  %%NEWSBASE%%/include/inn
 @unexec rm -R  %%NEWSBASE%%/include