Index: head/news/inn/Makefile
===================================================================
--- head/news/inn/Makefile	(revision 43018)
+++ head/news/inn/Makefile	(revision 43019)
@@ -1,92 +1,93 @@
 # New ports collection makefile for:	inn
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1), 14 Feb 1999 (2.2)
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	inn
 PORTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
 MAINTAINER=	des@FreeBSD.org
 
 USE_GMAKE=YES
 
 .if exists(/var/news)
 INN_NEWSSPOOL?=/var/news
 .elif exists(/var/spool/news)
 INN_NEWSSPOOL?=/var/spool/news
 .else
 INN_NEWSSPOOL?=${PREFIX}/news/spool
 .endif
 INN_NEWSLOG?=/var/log/news
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/news
 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
 
 # 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=	${WRKSRC}/HISTORY ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE
 
-INN_INCLUDES=	clibrary.h config.h libinn.h storage.h
+INN_INCLUDES=	clibrary.h config.h configdata.h dbz.h libinn.h storage.h
 
 pre-install:
 	${MKDIR} ${INN_NEWSSPOOL}
 
 post-install:
 	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
 	@${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd
 	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
 	    ${ECHO} 'Creating empty history database...' ; \
 	    cd ${PREFIX}/news/db ; \
 	    ${TOUCH} history ; \
 	    ${CHMOD} 644 history ; \
 	    ${CHOWN} news:news history ; \
 	    su -fm news -c "../bin/makedbz -i" ; \
 	    for s in dir hash index ; do \
 		${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>

Property changes on: head/news/inn/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/news/inn/pkg-plist
===================================================================
--- head/news/inn/pkg-plist	(revision 43018)
+++ head/news/inn/pkg-plist	(revision 43019)
@@ -1,176 +1,178 @@
 etc/rc.d/innd.sh
 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
 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/expire
 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
 news/bin/gpgverify
 news/bin/grephistory
 news/bin/inews
 news/bin/inncheck
 news/bin/innconfval
 news/bin/innd
 news/bin/inndf
 news/bin/inndstart
 news/bin/innfeed
 news/bin/innmail
 news/bin/innreport
 news/bin/innstat
 news/bin/innwatch
 news/bin/innxbatch
 news/bin/innxmit
 news/bin/mailpost
 news/bin/makedbz
 news/bin/makehistory
 news/bin/mod-active
 news/bin/news.daily
 news/bin/news2mail
 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
 news/bin/procbatch
 news/bin/prunehistory
 news/bin/pullnews
 news/bin/rc.news
 news/bin/rnews
 news/bin/rnews.libexec/c7unbatch
 news/bin/rnews.libexec/decode
 news/bin/rnews.libexec/encode
 news/bin/rnews.libexec/gunbatch
 news/bin/scanlogs
 news/bin/scanspool
 news/bin/send-ihave
 news/bin/send-nntp
 news/bin/send-uucp
 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
 news/etc/expire.ctl
 news/etc/incoming.conf
 news/etc/inn.conf
 news/etc/innfeed.conf
 news/etc/innreport.conf
 news/etc/innwatch.ctl
 news/etc/moderators
 news/etc/motd.news
 news/etc/news2mail.cf
 news/etc/newsfeeds
 news/etc/nnrpd.track
 news/etc/nntpsend.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/etc/subscriptions
 news/include/clibrary.h
 news/include/config.h
+news/include/configdata.h
+news/include/dbz.h
 news/include/libinn.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/libstorage.a
 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/include
 @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

Property changes on: head/news/inn/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/news/inn-current/Makefile
===================================================================
--- head/news/inn-current/Makefile	(revision 43018)
+++ head/news/inn-current/Makefile	(revision 43019)
@@ -1,92 +1,93 @@
 # New ports collection makefile for:	inn
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1), 14 Feb 1999 (2.2)
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	inn
 PORTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
 MAINTAINER=	des@FreeBSD.org
 
 USE_GMAKE=YES
 
 .if exists(/var/news)
 INN_NEWSSPOOL?=/var/news
 .elif exists(/var/spool/news)
 INN_NEWSSPOOL?=/var/spool/news
 .else
 INN_NEWSSPOOL?=${PREFIX}/news/spool
 .endif
 INN_NEWSLOG?=/var/log/news
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/news
 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
 
 # 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=	${WRKSRC}/HISTORY ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE
 
-INN_INCLUDES=	clibrary.h config.h libinn.h storage.h
+INN_INCLUDES=	clibrary.h config.h configdata.h dbz.h libinn.h storage.h
 
 pre-install:
 	${MKDIR} ${INN_NEWSSPOOL}
 
 post-install:
 	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
 	@${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd
 	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
 	    ${ECHO} 'Creating empty history database...' ; \
 	    cd ${PREFIX}/news/db ; \
 	    ${TOUCH} history ; \
 	    ${CHMOD} 644 history ; \
 	    ${CHOWN} news:news history ; \
 	    su -fm news -c "../bin/makedbz -i" ; \
 	    for s in dir hash index ; do \
 		${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>

Property changes on: head/news/inn-current/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/news/inn-current/pkg-plist
===================================================================
--- head/news/inn-current/pkg-plist	(revision 43018)
+++ head/news/inn-current/pkg-plist	(revision 43019)
@@ -1,176 +1,178 @@
 etc/rc.d/innd.sh
 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
 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/expire
 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
 news/bin/gpgverify
 news/bin/grephistory
 news/bin/inews
 news/bin/inncheck
 news/bin/innconfval
 news/bin/innd
 news/bin/inndf
 news/bin/inndstart
 news/bin/innfeed
 news/bin/innmail
 news/bin/innreport
 news/bin/innstat
 news/bin/innwatch
 news/bin/innxbatch
 news/bin/innxmit
 news/bin/mailpost
 news/bin/makedbz
 news/bin/makehistory
 news/bin/mod-active
 news/bin/news.daily
 news/bin/news2mail
 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
 news/bin/procbatch
 news/bin/prunehistory
 news/bin/pullnews
 news/bin/rc.news
 news/bin/rnews
 news/bin/rnews.libexec/c7unbatch
 news/bin/rnews.libexec/decode
 news/bin/rnews.libexec/encode
 news/bin/rnews.libexec/gunbatch
 news/bin/scanlogs
 news/bin/scanspool
 news/bin/send-ihave
 news/bin/send-nntp
 news/bin/send-uucp
 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
 news/etc/expire.ctl
 news/etc/incoming.conf
 news/etc/inn.conf
 news/etc/innfeed.conf
 news/etc/innreport.conf
 news/etc/innwatch.ctl
 news/etc/moderators
 news/etc/motd.news
 news/etc/news2mail.cf
 news/etc/newsfeeds
 news/etc/nnrpd.track
 news/etc/nntpsend.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/etc/subscriptions
 news/include/clibrary.h
 news/include/config.h
+news/include/configdata.h
+news/include/dbz.h
 news/include/libinn.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/libstorage.a
 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/include
 @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

Property changes on: head/news/inn-current/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property