4 files changed, 121 insertions, 133 deletions

diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 56c582a1fc55..14a865fcf0dd 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -6,24 +6,22 @@
 #
 
 PORTNAME=	nntpcache
-PORTVERSION=	2.4.0b5
+PORTVERSION=	3.0.1
 CATEGORIES=	news
-MASTER_SITES=	ftp://nntpcache.org/pub/nntpcache/ \
+MASTER_SITES=	ftp://ftp.nntpcache.org/pub/nntpcache/ \
 		ftp://ftp.nethelp.no/pub/news/ \
 		ftp://ftp.netsw.org/net/news/proxy/nntpcache/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14
-
+BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake
 .if defined(WITH_LDAP) && !defined(WITH_LDAP2)
-LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap
-LIB_DEPENDS+= lber.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap
 .endif
-
 .if defined(WITH_LDAP2)
-LIB_DEPENDS+=   ldap.2:${PORTSDIR}/net/openldap2
-LIB_DEPENDS+=   lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap2
 .endif
 
 # This may be set interactively at install-time.  NNTPCache will
@@ -36,18 +34,19 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${SPOOLDIR}
 
-AUTHINFO_EXT= authinfo_pam.ext
+AUTHINFO_EXT=	authinfo_pam.ext
 .if !defined(WITHOUT_RADIUS)
-CONFIGURE_ARGS+= --with-authinfo-radius
-AUTHINFO_EXT+= authinfo_radius.ext
+CONFIGURE_ARGS+=	--with-authinfo-radius
+AUTHINFO_EXT+=		authinfo_radius.ext
 .endif
 .if defined(WITH_LDAP) || defined(WITH_LDAP2)
-CONFIGURE_ARGS+= --with-authinfo-ldap
-CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include
-LDFLAGS+= -L${PREFIX}/lib -L${LOCALBASE}/lib
-AUTHINFO_EXT+= authinfo_ldap.ext
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS+=	--with-authinfo-ldap
+CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include
+LDFLAGS+=	-L${PREFIX}/lib -L${LOCALBASE}/lib
+AUTHINFO_EXT+=	authinfo_ldap.ext
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .endif
+CONFIGURE_ARGS+=	--program-transform-name=''
 
 NNTPSPOOLDIR?=	${SPOOLDIR}/${PORTNAME}
 PLIST_SUB+=	SPOOLDIR=${NNTPSPOOLDIR}
@@ -68,10 +67,6 @@ post-fetch:
 post-configure:
 	@cd ${WRKSRC}/src && ${GMAKE} ${AUTHINFO_EXT}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,AUTOMAKE=automake,AUTOMAKE=automake14,' \
-		${WRKSRC}/configure
-
 post-install:
 	@ ${MKDIR} ${PREFIX}/etc/rc.d
 	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${FILESDIR}/nntpcached.rc \
diff --git a/news/nntpcache/distinfo b/news/nntpcache/distinfo
index 122b0a1453f8..2dd7d75edff8 100644
--- a/news/nntpcache/distinfo
+++ b/news/nntpcache/distinfo
@@ -1 +1 @@
-MD5 (nntpcache-2.4.0b5.tar.gz) = 20cee920aabe44d9b196857928891509
+MD5 (nntpcache-3.0.1.tar.gz) = 26f142bf39d76699d2b9620c5940a4dd
diff --git a/news/nntpcache/files/patch-src-authinfo_pam.c b/news/nntpcache/files/patch-src-authinfo_pam.c
deleted file mode 100644
index 0c71400c31f8..000000000000
--- a/news/nntpcache/files/patch-src-authinfo_pam.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/authinfo_pam.c.orig	Sun Jun 11 14:32:55 2000
-+++ src/authinfo_pam.c	Wed Sep 26 11:27:09 2001
-@@ -15,7 +15,9 @@
- #include "authinfo_pam.h"
- 
- #include <security/pam_appl.h>
-+#ifndef __FreeBSD__
- #include <security/pam_misc.h>
-+#endif
- 
- /*
-  * pam authenticator.
diff --git a/news/nntpcache/pkg-plist b/news/nntpcache/pkg-plist
index e8e7003cbbb6..5b6c1feac100 100644
--- a/news/nntpcache/pkg-plist
+++ b/news/nntpcache/pkg-plist
@@ -13,54 +13,63 @@ etc/nntpcache/innreport.conf-dist
 etc/nntpcache/innreport.pl
 etc/nntpcache/innreport.pm
 etc/nntpcache/newshound.conf-dist
+@unexec if cmp -s %D/etc/nntpcache/nntpcache.access %D/etc/nntpcache/nntpcache.access-dist; then rm -f %D/etc/nntpcache/nntpcache.access; fi
 etc/nntpcache/nntpcache.access-dist
+@unexec if cmp -s %D/etc/nntpcache/nntpcache.config %D/etc/nntpcache/nntpcache.config-dist; then rm -f %D/etc/nntpcache/nntpcache.config; fi
 etc/nntpcache/nntpcache.config-dist
+@unexec if cmp -s %D/etc/nntpcache/nntpcache.servers %D/etc/nntpcache/nntpcache.servers-dist; then rm -f %D/etc/nntpcache/nntpcache.servers; fi
 etc/nntpcache/nntpcache.servers-dist
+@unexec if cmp -s %D/etc/nntpcache/pubring.asc %D/etc/nntpcache/pubring.asc-dist; then rm -f %D/etc/nntpcache/pubring.asc; fi
 etc/nntpcache/pubring.asc-dist
+@unexec if cmp -s %D/etc/nntpcache/pubring.pgp %D/etc/nntpcache/pubring.pgp-dist; then rm -f %D/etc/nntpcache/pubring.pgp; fi
 etc/nntpcache/pubring.pgp-dist
 etc/nntpcache/spam.filter
 etc/rc.d/nntpcached.sh
 include/mmap_results.h
 libexec/nntpcache-gdb.sh
 libexec/nntpcache.gdb
+libexec/nntpcached.debug
 libexec/unixauth
 sbin/innreport.sh
 sbin/newshound
+sbin/newshound.pl
 sbin/nntpcached
+@exec mkdir -p %D/etc/nntpcache/http/innreport/pics
 %%PORTDOCS%%share/doc/nntpcache/AUTHORS
 %%PORTDOCS%%share/doc/nntpcache/ChangeLog
 %%PORTDOCS%%share/doc/nntpcache/FAQ
 %%PORTDOCS%%share/doc/nntpcache/FAQ.html
 %%PORTDOCS%%share/doc/nntpcache/HACKING
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/104.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/103.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/12.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/131.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/142.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/130.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/141.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/194.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/195.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/196.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/287.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/326.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/330.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/344.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/419.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/463.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/285.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/324.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/328.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/342.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/417.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/461.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/519.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/52.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/521.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/53.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/533.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/531.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/535.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/537.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/539.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/54.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/59.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/592.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/591.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/60.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/63.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/62.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/65.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/666.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/667.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/668.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/673.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/692.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/719.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/D/741.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/672.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/691.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/718.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/D/740.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/76.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/87.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/D/88.html
@@ -103,19 +112,19 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/145.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/147.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/148.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/149.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/15.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/150.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/151.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/152.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/153.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/154.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/155.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/156.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/157.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/158.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/159.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/162.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/167.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/169.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/161.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/166.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/168.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/170.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/171.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/172.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/173.html
@@ -125,42 +134,42 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/177.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/178.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/179.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/180.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/183.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/185.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/187.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/189.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/182.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/184.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/186.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/188.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/190.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/191.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/192.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/194.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/195.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/196.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/197.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/198.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/2.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/206.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/207.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/208.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/209.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/210.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/212.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/211.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/213.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/214.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/215.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/216.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/221.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/223.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/228.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/229.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/220.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/222.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/226.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/227.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/230.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/232.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/234.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/233.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/235.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/237.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/236.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/238.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/239.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/24.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/240.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/241.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/242.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/243.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/244.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/245.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/246.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/247.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/248.html
@@ -168,23 +177,23 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/250.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/251.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/252.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/253.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/254.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/255.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/256.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/257.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/258.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/259.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/260.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/261.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/262.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/263.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/265.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/266.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/267.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/268.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/269.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/27.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/270.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/271.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/272.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/273.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/275.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/276.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/277.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/278.html
@@ -192,99 +201,98 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/28.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/280.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/281.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/282.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/285.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/286.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/287.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/288.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/289.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/29.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/290.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/291.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/292.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/293.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/294.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/295.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/296.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/297.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/298.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/299.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/3.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/30.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/300.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/301.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/302.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/303.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/304.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/305.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/306.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/307.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/308.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/309.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/31.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/310.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/311.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/312.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/313.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/314.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/315.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/316.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/318.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/317.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/32.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/320.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/321.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/322.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/324.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/325.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/326.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/327.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/328.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/329.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/33.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/330.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/331.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/333.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/336.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/339.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/332.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/335.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/338.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/34.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/340.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/341.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/342.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/343.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/344.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/346.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/345.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/349.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/35.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/350.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/351.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/352.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/358.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/357.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/36.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/362.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/365.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/361.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/364.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/37.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/370.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/371.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/372.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/376.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/375.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/379.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/38.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/380.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/381.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/382.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/383.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/385.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/386.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/387.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/388.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/389.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/39.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/390.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/391.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/392.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/393.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/394.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/395.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/396.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/397.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/398.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/399.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/40.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/400.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/401.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/402.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/403.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/404.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/408.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/407.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/41.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/411.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/412.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/413.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/414.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/415.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/416.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/417.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/418.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/419.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/42.html
@@ -293,16 +301,16 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/422.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/423.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/424.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/425.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/427.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/431.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/433.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/435.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/426.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/430.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/432.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/434.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/436.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/437.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/438.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/440.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/439.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/442.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/443.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/444.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/445.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/446.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/447.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/448.html
@@ -322,7 +330,6 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/471.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/472.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/475.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/476.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/477.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/478.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/480.html
@@ -412,24 +419,27 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/594.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/595.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/596.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/597.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/6.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/60.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/600.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/601.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/602.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/603.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/604.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/605.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/606.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/607.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/608.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/61.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/610.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/611.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/613.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/614.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/616.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/R/617.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/619.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/62.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/620.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/622.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/623.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/R/625.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/63.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/64.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/R/65.html
@@ -507,8 +517,6 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/S/142.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/S/143.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/S/144.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/S/145.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/S/146.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/S/15.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/S/16.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/S/17.html
@@ -602,7 +610,10 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/S/97.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/S/98.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/S/99.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/defines.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/files.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/files/145.html
+%%PORTDOCS%%share/doc/nntpcache/HTML/files/146.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/files/147.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/files/148.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/files/149.html
@@ -616,9 +627,6 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/HTML/files/157.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/files/158.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/files/159.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/files/160.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/files/161.html
-%%PORTDOCS%%share/doc/nntpcache/HTML/funcs.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/help.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/index.html
 %%PORTDOCS%%share/doc/nntpcache/HTML/mains.html
@@ -628,16 +636,13 @@ sbin/nntpcached
 %%PORTDOCS%%share/doc/nntpcache/README
 %%PORTDOCS%%share/doc/nntpcache/README.INN
 %%PORTDOCS%%share/doc/nntpcache/VERSION
-@exec mkdir -p %D/etc/nntpcache/http/innreport/pics
 @dirrm etc/nntpcache/http/innreport/pics
 @dirrm etc/nntpcache/http/innreport
 @dirrm etc/nntpcache/http
 @dirrm etc/nntpcache
-%%PORTDOCS%%@dirrm share/doc/nntpcache/HTML/funcs
 %%PORTDOCS%%@dirrm share/doc/nntpcache/HTML/files
 %%PORTDOCS%%@dirrm share/doc/nntpcache/HTML/S
 %%PORTDOCS%%@dirrm share/doc/nntpcache/HTML/R
-%%PORTDOCS%%@dirrm share/doc/nntpcache/HTML/I
 %%PORTDOCS%%@dirrm share/doc/nntpcache/HTML/D
 %%PORTDOCS%%@dirrm share/doc/nntpcache/HTML
 %%PORTDOCS%%@dirrm share/doc/nntpcache