Update of the INN package to the latest stable version (2.5.0).

1 files changed, 29 insertions, 27 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 9979ab0f492..0a5f319c30b 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2009/03/15 15:00:50 spz Exp $
+# $NetBSD: Makefile,v 1.97 2009/09/22 13:17:00 spz Exp $
 
-DISTNAME=		inn-2.4.6
+DISTNAME=		inn-2.5.0
 CATEGORIES=		news
 MASTER_SITES=		ftp://ftp.isc.org/isc/inn/ \
 			ftp://ftp.fu-berlin.de/unix/news/inn/
@@ -8,6 +8,7 @@ MASTER_SITES=		ftp://ftp.isc.org/isc/inn/ \
 MAINTAINER=		spz@NetBSD.org
 HOMEPAGE=		http://www.isc.org/software/inn/
 COMMENT=		The public release of InterNet News (INN)
+LICENSE=		modified-bsd AND gnu-gpl-v2
 
 CONFLICTS+=		libradius-[0-9]* nntpclnt-[0-9]*
 
@@ -25,23 +26,13 @@ MESSAGE_SUBST+=		INN_PATHBIN=${INN_PATHBIN:Q}
 
 PLIST_SUBST+=		INN_PATHBIN=${INN_PATHBIN:Q}
 
-SUBST_CLASSES+=		BADPATHBIN
-SUBST_STAGE.BADPATHBIN=	post-patch
-SUBST_MESSAGE.BADPATHBIN=	fixing up unfortunate pathbin paths
-SUBST_FILES.BADPATHBIN= Makefile.global.in \
-			samples/inn.conf.in samples/newsfeeds.in \
-			scripts/innshellvars.in scripts/innshellvars.pl.in \
-			scripts/innshellvars.tcl.in backends/news2mail.in \
-			control/controlbatch.in control/controlchan.in
-SUBST_SED.BADPATHBIN=	-e 's,@prefix@/bin,${PREFIX}/${INN_PATHBIN:Q},g'
-SUBST_SED.BADPATHBIN+=	-e 's,$$(PATHNEWS)/bin,${PREFIX}/${INN_PATHBIN:Q},g'
-
-
 GNU_CONFIGURE=		YES
 GNU_CONFIGURE_PREFIX=	${INN_PREFIX}
 GNU_CONFIGURE_MANDIR=	${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--enable-setgid-inews 				\
 			--enable-largefiles				\
+			--bindir=${PREFIX}/${INN_PATHBIN}		\
+			--sbindir=${PREFIX}/${INN_PATHBIN}		\
 			--with-openssl=${SSLBASE:Q}			\
 			--with-etc-dir=${PREFIX}/etc/inn 		\
 			--with-doc-dir=${PREFIX}/share/doc/inn	 	\
@@ -49,9 +40,10 @@ CONFIGURE_ARGS+=	--enable-setgid-inews 				\
 			--with-filter-dir=${PREFIX}/${INN_PATHBIN}/filter \
 			--with-tmp-dir=${INN_DATA_DIR}/tmp		\
 			--with-db-dir=${INN_DATA_DIR}/db 		\
+			--with-http-dir=${INN_DATA_DIR}/http		\
 			--with-log-dir=${INN_DATA_DIR}/log 		\
 			--with-run-dir=${INN_DATA_DIR}/run 		\
-			--includedir=${PREFIX}/include/inn 		\
+			--includedir=${PREFIX}/include 			\
 			--with-spool-dir=${INN_SPOOL:Q}			\
 			--with-news-user=${INN_USER:Q}			\
 			--with-news-group=${INN_GROUP:Q}
@@ -63,6 +55,9 @@ CONFIGURE_ENV+=		_PATH_SORT=${TOOLS_SORT:Q}
 CONFIGURE_ENV+=		GZIP=${TOOLS_GZIP_CMD:Q}
 USE_TOOLS+=		awk egrep gzip perl:run sed sh sort yacc
 
+DEPENDS+=		p5-MIME-tools>0:../../mail/p5-MIME-tools
+DEPENDS+=		p5-GD>0:../../graphics/p5-GD
+
 PKG_GROUPS_VARS+=	INN_GROUP
 PKG_USERS_VARS+=	INN_USER
 
@@ -74,10 +69,15 @@ PKG_SHELL.${INN_USER}=	${SH}
 
 PKG_SYSCONFDIR.inn=	${PREFIX}/etc/inn
 EXAMPLEDIR=		${PREFIX}/share/examples/inn
-INN_DATADIRS=		log log/OLD run tmp db spool
+INN_DATADIRS=		log log/OLD run tmp db spool http
 INN_SPOOLDIRS=		archive articles overview incoming incoming/bad	\
 			outgoing uniover innfeed
 
+INSTALLATION_DIRS+=	etc/nntp
+INSTALLATION_DIRS+=	sbin
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	${EXAMPLEDIR}
+
 MAKE_DIRS+=		${PREFIX}/bin
 MAKE_DIRS+=		${PREFIX}/sbin
 MAKE_DIRS+=		${PREFIX}/lib
@@ -101,13 +101,15 @@ MAKE_DIRS_PERMS+=	${INN_DATA_DIR}/spool/${dir} \
 .endfor
 
 CFILES=			actsync.cfg actsync.ign buffindexed.conf \
-			control.ctl cycbuff.conf distrib.pats \
+			control.ctl control.ctl.local cycbuff.conf \
+			distrib.pats distributions \
 			expire.ctl incoming.conf inn.conf innfeed.conf \
-			innreport.conf innwatch.ctl moderators \
+			innreport.conf innwatch.ctl \
+			localgroups 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
+			nntpsend.ctl nocem.ctl ovdb.conf passwd.nntp \
+			radius.conf readers.conf send-uucp.cf \
+			storage.conf subscriptions
 .for file in ${CFILES}
 CONF_FILES_PERMS+=	${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR}/${file} \
 			${INN_USER} ${INN_GROUP} 0664
@@ -118,6 +120,10 @@ CONF_FILES_PERMS+=      ${EXAMPLEDIR}/newsgroups.minimal ${INN_DATA_DIR}/db/news
 
 DBFILES=		active.times history
 
+HTTPFILES=		innreport.css
+
+CONF_FILES_PERMS+=      ${EXAMPLEDIR}/innreport.css ${INN_DATA_DIR}/http/innreport.css ${INN_USER} ${INN_GROUP} 0664
+
 .for file in ${DBFILES}
 CONF_FILES_PERMS+=      ${EXAMPLEDIR}/${file} ${INN_DATA_DIR}/db/${file} \
 			${INN_USER} ${INN_GROUP} 0664
@@ -142,25 +148,21 @@ GCC_REQD+=		2.95.3
 .include "options.mk"
 
 pre-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLEDIR}
 	for FILE in ${CFILES} active.minimal newsgroups.minimal; do	\
 		${INSTALL_DATA} ${WRKSRC}/site/$$FILE			\
 					${DESTDIR}${EXAMPLEDIR};	\
 	done
-	for FILE in ${DBFILES} ; do					\
+	for FILE in ${DBFILES} ${HTTPFILES}; do				\
 		${TOUCH} ${WRKSRC}/site/$$FILE ;			\
 		${INSTALL_DATA} ${WRKSRC}/site/$$FILE			\
 					${DESTDIR}${EXAMPLEDIR};	\
 	done
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/etc/nntp
-	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/sbin
-	for FILE in cnfsstat ctlinnd inndstart makehistory ; do		\
+	for FILE in cnfsstat ctlinnd makehistory innbind; do		\
 		${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/$$FILE	\
 				${DESTDIR}${PREFIX}/sbin ;		\
 	done
-	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
 	${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/inews		\
 			${DESTDIR}${PREFIX}/bin
 	${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/rnews		\