- bump inn version to 2.4.4

- major change of directory structure
- two new options (uucp and perl now both optional)
- change of maintainer

10 files changed, 338 insertions, 253 deletions

diff --git a/news/inn/MESSAGE b/news/inn/MESSAGE
index aa795aa4ae6..7c65ed3c042 100644
--- a/news/inn/MESSAGE
+++ b/news/inn/MESSAGE
@@ -1,9 +1,19 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/29 10:39:36 jlam Exp $
+$NetBSD: MESSAGE,v 1.4 2008/06/23 09:10:53 spz Exp $
 
 The following programs have been installed suid root on your machine:
 
-	${PREFIX}/inn/bin/inndstart
-	${PREFIX}/inn/bin/startinnfeed
+	${INN_PATHBIN}/inndstart
+	${INN_PATHBIN}/startinnfeed
 
+---------------------------------------------------------------------------
+UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING
+
+The directory structure of the package has changed.
+
+INNs etc is now in ${PREFIX}/etc/inn
+the binaries are now in ${INN_PATHBIN}
+
+UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING
+---------------------------------------------------------------------------
 ===========================================================================
diff --git a/news/inn/Makefile b/news/inn/Makefile
index a4e1e7e7729..3478dafa6e5 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.87 2008/01/18 05:08:52 tnn Exp $
+# $NetBSD: Makefile,v 1.88 2008/06/23 09:10:53 spz Exp $
 
-DISTNAME=		inn-2.4.3
-PKGREVISION=		2
+DISTNAME=		inn-2.4.4
 CATEGORIES=		news
 MASTER_SITES=		ftp://ftp.isc.org/isc/inn/ \
 			ftp://ftp.fu-berlin.de/unix/news/inn/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		spz@NetBSD.org
 HOMEPAGE=		http://www.isc.org/sw/inn/
 COMMENT=		The public release of InterNet News (INN)
 
@@ -17,22 +16,29 @@ CONFLICTS+=		libradius-[0-9]* nntpclnt-[0-9]*
 BUILD_DEFS+=		INN_DATA_DIR
 FILES_SUBST+=		INN_DATA_DIR=${INN_DATA_DIR:Q}
 
+BUILD_DEFS+=		INN_PATHBIN
+FILES_SUBST+=		INN_PATHBIN=${INN_PATHBIN:Q}
+
+MESSAGE_SUBST+=		INN_PATHBIN=${INN_PATHBIN:Q}
+
 GNU_CONFIGURE=		YES
 GNU_CONFIGURE_PREFIX=	${INN_PREFIX}
 GNU_CONFIGURE_MANDIR=	${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--enable-setgid-inews 				\
-			--enable-uucp-rnews 				\
-			--with-perl					\
+			--enable-largefiles				\
 			--with-openssl=${SSLBASE:Q}			\
+			--with-etc-dir=${PREFIX}/etc/inn 		\
+			--with-doc-dir=${PREFIX}/share/doc/inn	 	\
+			--with-control-dir=${INN_PATHBIN}/control \
+			--with-filter-dir=${INN_PATHBIN}/filter	\
 			--with-tmp-dir=${INN_DATA_DIR}/tmp		\
 			--with-db-dir=${INN_DATA_DIR}/db 		\
-			--with-etc-dir=${INN_DATA_DIR}/etc 		\
 			--with-log-dir=${INN_DATA_DIR}/log 		\
 			--with-run-dir=${INN_DATA_DIR}/run 		\
+			--includedir=${PREFIX}/include/inn 		\
 			--with-spool-dir=${INN_SPOOL:Q}			\
 			--with-news-user=${INN_USER:Q}			\
 			--with-news-group=${INN_GROUP:Q}
-CONFIGURE_ENV+=		_PATH_PERL=${PERL5:Q}
 CONFIGURE_ENV+=		_PATH_AWK=${TOOLS_AWK:Q}
 CONFIGURE_ENV+=		_PATH_EGREP=${TOOLS_EGREP:Q}
 CONFIGURE_ENV+=		_PATH_SED=${TOOLS_SED:Q}
@@ -50,19 +56,27 @@ PKG_GECOS.${INN_USER}=	Internet\ News
 PKG_HOME.${INN_USER}=	${INN_DATA_DIR}
 PKG_SHELL.${INN_USER}=	${SH}
 
-PKG_SYSCONFDIR.inn=	${INN_DATA_DIR}/etc
+PKG_SYSCONFDIR.inn=	${PREFIX}/etc/inn
 EXAMPLEDIR=		${PREFIX}/share/examples/inn
-INN_DATADIRS=		db etc log log/OLD run spool tmp
+INN_DATADIRS=		log log/OLD run tmp
 INN_SPOOLDIRS=		archive articles overview incoming incoming/bad	\
 			outgoing uniover innfeed
 
-OWN_DIRS=		${PREFIX}/etc/nntp
-OWN_DIRS_PERMS=		${INN_DATA_DIR}			${INN_USER} ${INN_GROUP} 0775
+OWN_DIRS+=		${PREFIX}/etc/nntp
+OWN_DIRS+=		${PREFIX}/etc/inn
+OWN_DIRS+=		${INN_DATA_DIR}
+OWN_DIRS+=		${INN_DATA_DIR}/db
+OWN_DIRS+=		${INN_DATA_DIR}/spool
+
+.for dir in ${OWN_DIRS}
+OWN_DIRS_PERMS+=	${dir}	${INN_USER} ${INN_GROUP} 0775
+.endfor
 .for dir in ${INN_DATADIRS}
-MAKE_DIRS_PERMS+=	${INN_DATA_DIR}/${dir}		${INN_USER} ${INN_GROUP} 0775
+MAKE_DIRS_PERMS+=	${INN_DATA_DIR}/${dir}	${INN_USER} ${INN_GROUP} 0775
 .endfor
 .for dir in ${INN_SPOOLDIRS}
-MAKE_DIRS_PERMS+=	${INN_DATA_DIR}/spool/${dir}	${INN_USER} ${INN_GROUP} 0775
+OWN_DIRS_PERMS+=	${INN_DATA_DIR}/spool/${dir} \
+						${INN_USER} ${INN_GROUP} 0775
 .endfor
 
 CFILES=			actsync.cfg actsync.ign buffindexed.conf \
@@ -95,36 +109,56 @@ GCC_REQD+=		2.95.3
 
 post-patch:
 	${RM} -f ${WRKSRC}/samples/inn.conf.in.orig_dist
-
-post-build:
-	for DIR in backends expire frontends innd innfeed lib nnrpd	\
-		storage; do \
-		${SED} -e 's#-b .OLD##' -e 's#-G#-g#' -e 's#-O#-o#'	\
-			${WRKSRC}/$$DIR/Makefile			\
-			> ${WRKSRC}/$$DIR/Makefile.patch;		\
-		${MV} ${WRKSRC}/$$DIR/Makefile.patch			\
-			${WRKSRC}/$$DIR/Makefile;			\
+	${SED} -e "s#^PATHBIN.*#PATHBIN	= ${INN_PATHBIN}#"	\
+		${WRKSRC}/Makefile.global.in			\
+		> ${WRKSRC}/Makefile.global.in.patch;		\
+	${MV} ${WRKSRC}/Makefile.global.in.patch		\
+		${WRKSRC}/Makefile.global.in;			\
+	for FILE in innshellvars.in innshellvars.pl.in innshellvars.tcl.in ; do \
+		${SED} -e "s#@prefix@/bin/innconfval #${INN_PATHBIN}/innconfval #" \
+			${WRKSRC}/scripts/$$FILE			\
+			> ${WRKSRC}/scripts/$$FILE.patch ;		\
+		${MV} ${WRKSRC}/scripts/$$FILE.patch			\
+			${WRKSRC}/scripts/$$FILE ;			\
 	done
 
 pre-install:
-	for DIR in ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/inn; do	\
-		${INSTALL_DATA_DIR} $$DIR;				\
-	done
-
-post-install:
-	${RM} -f ${PREFIX}/bin/inews
-	${LN} -s ../inn/bin/inews ${PREFIX}/bin/inews
-	${INSTALL_DATA_DIR} ${PREFIX}/include/inn
-	cd ${PREFIX}/include/inn;					\
-	for FILE in config.h dbz.h libinn.h storage.h; do		\
-	  ${LN} -s ${INN_PREFIX}/include/$$FILE $$FILE;			\
-	done
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
 	for FILE in `ls -1 ${WRKSRC}/samples/* |			\
 		     ${EGREP} -v '(Makefile|.*\.(in|orig)$$)'`; do	\
 		${INSTALL_DATA} $$FILE ${EXAMPLEDIR};			\
 	done
+	# makedbz needs these earlier than pkgsrc will install them normally
+	if [ ! -f ${PKG_SYSCONFDIR}/inn.conf ] ; then			\
+		${INSTALL_DATA} ${EXAMPLEDIR}/inn.conf			\
+				${PKG_SYSCONFDIR}/inn.conf ;		\
+	fi
+	if [ ! -d ${INN_DATA_DIR}/db ] ; then				\
+		${MKDIR} ${INN_DATA_DIR}/db ;		\
+	fi
+	${CHOWN} ${INN_USER} ${INN_DATA_DIR}/db
+	
+
+post-install:
+	for FILE in cnfsstat ctlinnd inndstart makehistory ; do		\
+		${LN} -s ${INN_PATHBIN}/$$FILE ${PREFIX}/sbin/$$FILE ; \
+	done
+	${LN} -s ${INN_PATHBIN}/inews ${PREFIX}/bin/inews
+	${LN} -s ${INN_PATHBIN}/rnews ${PREFIX}/bin/rnews
+	for FILE in libinn.a libstorage.a libinnhist.a ; do		\
+		${CHMOD} 644 ${PREFIX}/lib/$$FILE ;			\
+	done
+	if [ -d ${INN_DATA_DIR}/etc ] ; then				\
+		echo "" ; 						\
+		echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING";\
+		echo "" ; 						\
+		echo "WARNING: old inn config directory ${INN_DATA_DIR}/etc found";\
+		echo "WARNING: please move your config to ${PREFIX}/etc/inn"; \
+		echo "WARNING: before starting your new inn install" ;	\
+		echo "" ; 						\
+		echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING";\
+		echo "" ; 						\
+	fi
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/inn/Makefile.common b/news/inn/Makefile.common
index 134c9e4e65a..9950e3b8261 100644
--- a/news/inn/Makefile.common
+++ b/news/inn/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2005/12/27 17:45:40 reed Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/06/23 09:10:53 spz Exp $
 #
 
-INN_PREFIX?=	${PREFIX}/inn
+INN_PREFIX?=	${PREFIX}
+INN_PATHBIN?=	${PREFIX}/libexec/inn
 INN_DATA_DIR?=	${VARBASE}/news
 INN_SPOOL?=	${INN_DATA_DIR}/spool
diff --git a/news/inn/PLIST b/news/inn/PLIST
index 03e1509e8de..3d9cac21f44 100644
--- a/news/inn/PLIST
+++ b/news/inn/PLIST
@@ -1,162 +1,168 @@
-@comment $NetBSD: PLIST,v 1.11 2006/04/10 16:27:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/06/23 09:10:53 spz Exp $
+include/inn/config.h
+include/inn/dbz.h
+include/inn/libinn.h
+include/inn/storage.h
+libexec/inn/actmerge
+libexec/inn/actsync
+libexec/inn/actsyncd
+libexec/inn/archive
+libexec/inn/auth/passwd/auth_smb
+libexec/inn/auth/passwd/ckpasswd
+libexec/inn/auth/passwd/radius
+libexec/inn/auth/resolv/domain
+libexec/inn/auth/resolv/ident
+libexec/inn/batcher
+libexec/inn/buffchan
+libexec/inn/cnfsheadconf
+libexec/inn/cnfsstat
+sbin/cnfsstat
+libexec/inn/control/checkgroups.pl
+libexec/inn/control/ihave.pl
+libexec/inn/control/newgroup.pl
+libexec/inn/control/rmgroup.pl
+libexec/inn/control/sendme.pl
+libexec/inn/control/sendsys.pl
+libexec/inn/control/senduuname.pl
+libexec/inn/control/version.pl
+libexec/inn/controlbatch
+libexec/inn/controlchan
+libexec/inn/convdate
+libexec/inn/ctlinnd
+sbin/ctlinnd
+libexec/inn/cvtbatch
+libexec/inn/docheckgroups
+libexec/inn/expire
+libexec/inn/expireover
+libexec/inn/expirerm
+libexec/inn/fastrm
+libexec/inn/filechan
+libexec/inn/filter/INN.py
+libexec/inn/filter/filter.tcl
+libexec/inn/filter/filter_innd.pl
+libexec/inn/filter/filter_innd.py
+libexec/inn/filter/filter_nnrpd.pl
+libexec/inn/filter/nnrpd_access.pl
+libexec/inn/filter/nnrpd_auth.pl
+libexec/inn/filter/nnrpd_auth.py
+libexec/inn/filter/startup.tcl
+libexec/inn/filter/startup_innd.pl
+libexec/inn/getlist
+libexec/inn/gpgverify
+libexec/inn/grephistory
+libexec/inn/imapfeed
+libexec/inn/inews
 bin/inews
+libexec/inn/inncheck
+libexec/inn/innconfval
+libexec/inn/innd
+libexec/inn/inndf
+libexec/inn/inndstart
+sbin/inndstart
+libexec/inn/innfeed
+libexec/inn/innmail
+libexec/inn/innreport
+libexec/inn/innstat
+libexec/inn/innupgrade
+libexec/inn/innwatch
+libexec/inn/innxbatch
+libexec/inn/innxmit
+libexec/inn/mailpost
+libexec/inn/makedbz
+libexec/inn/makehistory
+sbin/makehistory
+libexec/inn/mod-active
+libexec/inn/news.daily
+libexec/inn/news2mail
+libexec/inn/ninpaths
+libexec/inn/nnrpd
+libexec/inn/nntpget
+libexec/inn/nntpsend
+libexec/inn/ovdb_init
+libexec/inn/ovdb_monitor
+libexec/inn/ovdb_server
+libexec/inn/ovdb_stat
+libexec/inn/overchan
+libexec/inn/perl-nocem
+libexec/inn/pgpverify
+libexec/inn/procbatch
+libexec/inn/prunehistory
+libexec/inn/pullnews
+libexec/inn/rc.news
+libexec/inn/rnews
+bin/rnews
+libexec/inn/rnews.libexec/c7unbatch
+libexec/inn/rnews.libexec/decode
+libexec/inn/rnews.libexec/encode
+libexec/inn/rnews.libexec/gunbatch
+libexec/inn/scanlogs
+libexec/inn/scanspool
+libexec/inn/send-ihave
+libexec/inn/send-nntp
+libexec/inn/send-uucp
+libexec/inn/sendinpaths
+libexec/inn/sendxbatches
+libexec/inn/shlock
+libexec/inn/shrinkfile
+libexec/inn/signcontrol
+libexec/inn/simpleftp
+libexec/inn/sm
+libexec/inn/startinnfeed
+libexec/inn/tally.control
+libexec/inn/tdx-util
+libexec/inn/writelog
+share/doc/inn/CONTRIBUTORS
+share/doc/inn/GPL
+share/doc/inn/HACKING
+share/doc/inn/INSTALL
+share/doc/inn/LICENSE
+share/doc/inn/NEWS
+share/doc/inn/README
+share/doc/inn/TODO
+share/doc/inn/compliance-nntp
+share/doc/inn/config-design
+share/doc/inn/config-semantics
+share/doc/inn/config-syntax
+share/doc/inn/external-auth
+share/doc/inn/history
+share/doc/inn/hook-perl
+share/doc/inn/hook-python
+share/doc/inn/hook-tcl
+share/doc/inn/sample-control
+include/inn/conffile.h
 include/inn/config.h
 include/inn/dbz.h
+include/inn/inn/buffer.h
+include/inn/inn/confparse.h
+include/inn/inn/defines.h
+include/inn/inn/hashtab.h
+include/inn/inn/history.h
+include/inn/inn/innconf.h
+include/inn/inn/list.h
+include/inn/inn/md5.h
+include/inn/inn/messages.h
+include/inn/inn/mmap.h
+include/inn/inn/qio.h
+include/inn/inn/sequence.h
+include/inn/inn/system.h
+include/inn/inn/timer.h
+include/inn/inn/tst.h
+include/inn/inn/vector.h
+include/inn/inn/version.h
+include/inn/inn/wire.h
+include/inn/inndcomm.h
 include/inn/libinn.h
+include/inn/nntp.h
+include/inn/ov.h
+include/inn/paths.h
 include/inn/storage.h
-inn/bin/actmerge
-inn/bin/actsync
-inn/bin/actsyncd
-inn/bin/archive
-inn/bin/auth/passwd/auth_smb
-inn/bin/auth/passwd/ckpasswd
-inn/bin/auth/passwd/radius
-inn/bin/auth/resolv/domain
-inn/bin/auth/resolv/ident
-inn/bin/batcher
-inn/bin/buffchan
-inn/bin/cnfsheadconf
-inn/bin/cnfsstat
-inn/bin/control/checkgroups.pl
-inn/bin/control/ihave.pl
-inn/bin/control/newgroup.pl
-inn/bin/control/rmgroup.pl
-inn/bin/control/sendme.pl
-inn/bin/control/sendsys.pl
-inn/bin/control/senduuname.pl
-inn/bin/control/version.pl
-inn/bin/controlbatch
-inn/bin/controlchan
-inn/bin/convdate
-inn/bin/ctlinnd
-inn/bin/cvtbatch
-inn/bin/docheckgroups
-inn/bin/expire
-inn/bin/expireover
-inn/bin/expirerm
-inn/bin/fastrm
-inn/bin/filechan
-inn/bin/filter/INN.py
-inn/bin/filter/filter.tcl
-inn/bin/filter/filter_innd.pl
-inn/bin/filter/filter_innd.py
-inn/bin/filter/filter_nnrpd.pl
-inn/bin/filter/nnrpd_auth.pl
-inn/bin/filter/nnrpd_auth.py
-inn/bin/filter/startup.tcl
-inn/bin/filter/startup_innd.pl
-inn/bin/getlist
-inn/bin/gpgverify
-inn/bin/grephistory
-inn/bin/imapfeed
-inn/bin/inews
-inn/bin/inncheck
-inn/bin/innconfval
-inn/bin/innd
-inn/bin/inndf
-inn/bin/inndstart
-inn/bin/innfeed
-inn/bin/innmail
-inn/bin/innreport
-inn/bin/innstat
-inn/bin/innupgrade
-inn/bin/innwatch
-inn/bin/innxbatch
-inn/bin/innxmit
-inn/bin/mailpost
-inn/bin/makedbz
-inn/bin/makehistory
-inn/bin/mod-active
-inn/bin/news.daily
-inn/bin/news2mail
-inn/bin/ninpaths
-inn/bin/nnrpd
-inn/bin/nntpget
-inn/bin/nntpsend
-inn/bin/ovdb_init
-inn/bin/ovdb_monitor
-inn/bin/ovdb_server
-inn/bin/ovdb_stat
-inn/bin/overchan
-inn/bin/perl-nocem
-inn/bin/pgpverify
-inn/bin/procbatch
-inn/bin/prunehistory
-inn/bin/pullnews
-inn/bin/rc.news
-inn/bin/rnews
-inn/bin/rnews.libexec/c7unbatch
-inn/bin/rnews.libexec/decode
-inn/bin/rnews.libexec/encode
-inn/bin/rnews.libexec/gunbatch
-inn/bin/scanlogs
-inn/bin/scanspool
-inn/bin/send-ihave
-inn/bin/send-nntp
-inn/bin/send-uucp
-inn/bin/sendinpaths
-inn/bin/sendxbatches
-inn/bin/shlock
-inn/bin/shrinkfile
-inn/bin/signcontrol
-inn/bin/simpleftp
-inn/bin/sm
-inn/bin/startinnfeed
-inn/bin/tally.control
-inn/bin/tdx-util
-inn/bin/writelog
-inn/doc/CONTRIBUTORS
-inn/doc/GPL
-inn/doc/HACKING
-inn/doc/INSTALL
-inn/doc/LICENSE
-inn/doc/NEWS
-inn/doc/README
-inn/doc/TODO
-inn/doc/compliance-nntp
-inn/doc/config-design
-inn/doc/config-semantics
-inn/doc/config-syntax
-inn/doc/external-auth
-inn/doc/history
-inn/doc/hook-perl
-inn/doc/hook-python
-inn/doc/hook-tcl
-inn/doc/sample-control
-inn/include/conffile.h
-inn/include/config.h
-inn/include/dbz.h
-inn/include/inn/buffer.h
-inn/include/inn/confparse.h
-inn/include/inn/defines.h
-inn/include/inn/hashtab.h
-inn/include/inn/history.h
-inn/include/inn/innconf.h
-inn/include/inn/list.h
-inn/include/inn/md5.h
-inn/include/inn/messages.h
-inn/include/inn/mmap.h
-inn/include/inn/qio.h
-inn/include/inn/sequence.h
-inn/include/inn/system.h
-inn/include/inn/timer.h
-inn/include/inn/tst.h
-inn/include/inn/vector.h
-inn/include/inn/version.h
-inn/include/inn/wire.h
-inn/include/inndcomm.h
-inn/include/libinn.h
-inn/include/nntp.h
-inn/include/ov.h
-inn/include/paths.h
-inn/include/storage.h
-inn/lib/innreport_inn.pm
-inn/lib/innshellvars
-inn/lib/innshellvars.pl
-inn/lib/innshellvars.tcl
-inn/lib/libinn.a
-inn/lib/libinnhist.a
-inn/lib/libstorage.a
+lib/innreport_inn.pm
+lib/innshellvars
+lib/innshellvars.pl
+lib/innshellvars.tcl
+lib/libinn.a
+lib/libinnhist.a
+lib/libstorage.a
 man/man1/convdate.1
 man/man1/fastrm.1
 man/man1/getlist.1
@@ -311,16 +317,13 @@ share/examples/inn/storage.conf
 share/examples/inn/subscriptions
 share/examples/rc.d/innd
 @dirrm share/examples/inn
-@dirrm inn/lib
-@dirrm inn/include/inn
-@dirrm inn/include
-@dirrm inn/doc
-@dirrm inn/bin/rnews.libexec
-@dirrm inn/bin/filter
-@dirrm inn/bin/control
-@dirrm inn/bin/auth/resolv
-@dirrm inn/bin/auth/passwd
-@dirrm inn/bin/auth
-@dirrm inn/bin
-@dirrm inn
+@dirrm include/inn/inn
 @dirrm include/inn
+@dirrm share/doc/inn
+@dirrm libexec/inn/rnews.libexec
+@dirrm libexec/inn/filter
+@dirrm libexec/inn/control
+@dirrm libexec/inn/auth/resolv
+@dirrm libexec/inn/auth/passwd
+@dirrm libexec/inn/auth
+@dirrm libexec/inn
diff --git a/news/inn/distinfo b/news/inn/distinfo
index b6515569106..21e1b3b2938 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.15 2006/03/31 17:58:40 tron Exp $
+$NetBSD: distinfo,v 1.16 2008/06/23 09:10:53 spz Exp $
 
-SHA1 (inn-2.4.3.tar.gz) = 95c30835b0990a3c432858948266dd4db639a3e1
-RMD160 (inn-2.4.3.tar.gz) = f9465f3fe905d1173fb30c00d591ab8f9cbaecfc
-Size (inn-2.4.3.tar.gz) = 1871994 bytes
-SHA1 (patch-aa) = 548acc9d7b8386ed055fae772c8c26e5c6225da6
+SHA1 (inn-2.4.4.tar.gz) = bbdaa5b1d7a36c08d8be281761ba4947d1a00038
+RMD160 (inn-2.4.4.tar.gz) = 546e6b0ee09305c95109fae42df9639988beab3b
+Size (inn-2.4.4.tar.gz) = 1897421 bytes
+SHA1 (patch-aa) = 908b169b944cd10a385428de8897fa55c05b858c
 SHA1 (patch-ab) = a681fdecf562088cfb25e8625be1380b32331af0
-SHA1 (patch-ac) = c37aa2ea182fafd01ee4a20dbcd67816217a8587
+SHA1 (patch-ac) = 586748ecfbe0bb48dd42b422f262a1741cef9e90
 SHA1 (patch-ad) = 1f4d4b15a478d6d35185977d8bc32a4e161665c5
 SHA1 (patch-ag) = d70bbbfd0fd2d33d33884000bf3e46b7c33fd15a
-SHA1 (patch-ah) = f8f641895dd663289366815037f654a0e56dd791
+SHA1 (patch-ah) = 6ed2c3b97a37ef52a62fd209c742511d5c0719ff
 SHA1 (patch-ai) = 9d99bd095dc5cb4b9c99274c0adeaab779ca2c2d
-SHA1 (patch-aj) = a53726b9a510ba4e6e7a9e0905b91b9820cf86c8
+SHA1 (patch-aj) = 0e67bf2c553d6bb9e6da5f6ee57c3340a7507e4f
diff --git a/news/inn/files/innd.sh b/news/inn/files/innd.sh
index 90494923e26..bd6ca4849d5 100644
--- a/news/inn/files/innd.sh
+++ b/news/inn/files/innd.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: innd.sh,v 1.13 2002/09/29 10:39:36 jlam Exp $
+# $NetBSD: innd.sh,v 1.14 2008/06/23 09:10:53 spz Exp $
 #
 # PROVIDE: inn
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
-if [ -x @PREFIX@/inn/bin/rc.news -a -s @INN_DATA_DIR@/db/active ]
+if [ -x @INN_PATHBIN@/rc.news -a -s @INN_DATA_DIR@/db/active ]
 then
 	if [ ! -f @PREFIX@/etc/nntp/server ]
 	then
@@ -25,18 +25,18 @@ then
 	if [ $# -eq 0 ]
 	then
 		echo -n ' innd'
-		su news -c "@PREFIX@/inn/bin/rc.news start" >/dev/null
+		su news -c "@INN_PATHBIN@/rc.news start" >/dev/null
 		exit 0
 	fi
 
 	case "$1" in
 	start )
 		echo "Starting INN."
-		su news -c "@PREFIX@/inn/bin/rc.news $1" >/dev/null
+		su news -c "@INN_PATHBIN@/rc.news $1" >/dev/null
 		exit 0
 		;;
 	stop )
-		su news -c "@PREFIX@/inn/bin/rc.news $1"
+		su news -c "@INN_PATHBIN@/rc.news $1"
 		exit 0
 		;;
 	restart )
diff --git a/news/inn/options.mk b/news/inn/options.mk
index 490cfc89150..d7a156e9bf9 100644
--- a/news/inn/options.mk
+++ b/news/inn/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2007/09/07 22:12:20 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2008/06/23 09:10:53 spz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.inn
-PKG_SUPPORTED_OPTIONS=	inet6 python
-PKG_SUGGESTED_OPTIONS=	# empty
+PKG_SUPPORTED_OPTIONS=	inet6 perl python uucp
+PKG_SUGGESTED_OPTIONS=	inet6 perl
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,6 +14,26 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
 ###
+### uucp support (requires a group uucp to exist)
+###
+.if !empty(PKG_OPTIONS:Muucp)
+CONFIGURE_ARGS+=	--enable-uucp-rnews
+.else
+CONFIGURE_ARGS+=	--disable-uucp-rnews
+.endif
+
+###
+### perl support for INN
+###
+.if !empty(PKG_OPTIONS:Mperl)
+CONFIGURE_ARGS+=	--with-perl
+CONFIGURE_ENV+=		_PATH_PERL=${PERL5:Q}
+
+.include "../../lang/perl5/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-perl
+.endif
+###
 ### Python support for INN
 ###
 .if !empty(PKG_OPTIONS:Mpython)
diff --git a/news/inn/patches/patch-aa b/news/inn/patches/patch-aa
index c0763f25f0d..c3c4c953df6 100644
--- a/news/inn/patches/patch-aa
+++ b/news/inn/patches/patch-aa
@@ -1,17 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2004/07/24 23:55:27 grant Exp $
+$NetBSD: patch-aa,v 1.11 2008/06/23 09:10:53 spz Exp $
 
 --- configure.orig	2004-01-08 09:47:19.000000000 +1100
 +++ configure
-@@ -5684,8 +5684,7 @@ RNEWSMODE=0500
- if test "${enable_uucp_rnews+set}" = set; then
-   enableval="$enable_uucp_rnews"
-   if test "x$enableval" = xyes ; then
--        RNEWSGRP=uucp
--        RNEWSMODE=04550
-+        RNEWSMODE=04555
-     fi
- fi
- 
 @@ -6522,7 +6521,7 @@ else
    echo "$ac_t""no" 1>&6
  fi
diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac
index ffb1e5dd94e..e1b7fd85175 100644
--- a/news/inn/patches/patch-ac
+++ b/news/inn/patches/patch-ac
@@ -1,19 +1,36 @@
-$NetBSD: patch-ac,v 1.9 2004/07/24 23:55:28 grant Exp $
+$NetBSD: patch-ac,v 1.10 2008/06/23 09:10:53 spz Exp $
 
---- Makefile.global.in.orig	2004-01-08 09:47:19.000000000 +1100
+--- Makefile.global.in.orig	2008-06-22 19:21:59.000000000 +0000
 +++ Makefile.global.in
-@@ -225,10 +225,10 @@ PATHINBAD       = $(PATHINCOMING)/bad
- PATHOVERVIEW    = $(PATHSPOOL)/overview
- PATHOUTGOING    = $(PATHSPOOL)/outgoing
+@@ -258,19 +258,19 @@ INSTALL         = $(top)/support/install
+ ##  files like active and newsgroups that should have the same permissions as
+ ##  article files.
  
--MAN1            = @mandir@/man1
--MAN3            = @mandir@/man3
--MAN5            = @mandir@/man5
--MAN8            = @mandir@/man8
-+MAN1            = $(LOCALBASE)/man/man1
-+MAN3            = $(LOCALBASE)/man/man3
-+MAN5            = $(LOCALBASE)/man/man5
-+MAN8            = $(LOCALBASE)/man/man8
+-LI_SPRI         = $(LIBTOOL) $(INSTALL) -o root -g $(NEWSGROUP) -m 4550 -B .OLD
+-LI_XPRI         = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0550 -B .OLD
+-LI_XPUB         = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0555 -B .OLD
+-
+-LI_INEWS        = $(LIBTOOL) $(INSTALL) $(OWNER) -m $(INEWSMODE) -B .OLD
+-LI_RNEWS        = $(LIBTOOL) $(INSTALL) $(ROWNER) -m $(RNEWSMODE) -B .OLD
+-
+-CP_RPRI         = $(INSTALL) $(OWNER) -m 0640 -B .OLD
+-CP_RPUB         = $(INSTALL) $(OWNER) -m 0644 -B .OLD
+-CP_XPRI         = $(INSTALL) $(OWNER) -m 0550 -B .OLD
+-CP_XPUB         = $(INSTALL) $(OWNER) -m 0555 -B .OLD
++LI_SPRI         = $(LIBTOOL) $(INSTALL) -o root -g $(NEWSGROUP) -m 4550
++LI_XPRI         = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0550
++LI_XPUB         = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0555
++
++LI_INEWS        = $(LIBTOOL) $(INSTALL) $(OWNER) -m $(INEWSMODE)
++LI_RNEWS        = $(LIBTOOL) $(INSTALL) $(ROWNER) -m $(RNEWSMODE)
++
++CP_RPRI         = $(INSTALL) $(OWNER) -m 0640
++CP_RPUB         = $(INSTALL) $(OWNER) -m 0644
++CP_XPRI         = $(INSTALL) $(OWNER) -m 0550
++CP_XPUB         = $(INSTALL) $(OWNER) -m 0555
  
- ##  Installation settings.  The file installation modes are determined by
- ##  configure; inews and rnews are special and have configure flags to
+-CP_DATA	        = $(INSTALL) $(OWNER) -m $(FILEMODE) -B .OLD
++CP_DATA	        = $(INSTALL) $(OWNER) -m $(FILEMODE)
+ 
+ ##  How to install man pages.  Pick one of SOURCE, BSD4.4, NROFF-PACK, or
+ ##  NROFF-PACK-SCO.  Used by doc/man/putman.sh; read that script for more
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
index 6a29303f311..0d044bff7e0 100644
--- a/news/inn/patches/patch-ah
+++ b/news/inn/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.8 2006/03/31 17:58:40 tron Exp $
+$NetBSD: patch-ah,v 1.9 2008/06/23 09:10:53 spz Exp $
 
---- site/Makefile.orig	2004-01-08 09:47:19.000000000 +1100
+--- site/Makefile.orig	2008-05-05 10:18:36.000000000 +0000
 +++ site/Makefile
-@@ -68,22 +68,11 @@ REST		= \
+@@ -70,22 +70,11 @@ REST		= \
  ALL		= $(MOST) $(REST)
  
  REST_INSTALLED	= \
@@ -23,7 +23,17 @@ $NetBSD: patch-ah,v 1.8 2006/03/31 17:58:40 tron Exp $
 -	$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \
 -	$D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \
 -	$D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS)
-+	$D$(PATH_NNRPAUTH) $D$(PATH_NNRPYAUTH)
++	$D$(PATH_NNRPAUTH) $D$(PATH_NNRPYAUTH) $D$(PATH_NNRPACCESS)
  
  ALL_INSTALLED	= $(MOST_INSTALLED) $(REST_INSTALLED)
  
+@@ -140,7 +129,8 @@ $D$(PATH_HISTORY):
+ 	chown $(NEWSUSER) $@
+ 	chgrp $(NEWSGROUP) $@
+ 	chmod $(FILEMODE) $@
+-	$(PATHBIN)/makedbz -i -o
++	# makedbz wants ridiculous amounts of RAM for -s 0
++	$(PATHBIN)/makedbz -i -o -s 100000
+ 
+ ##  Remove files that are unchanged from the release version.
+ clean: