Update to 2.3.3, including some changes from FreeBSD's port. Update

approved by proff@nntpcache.org (one of the authors, who runs it on
NetBSD).

6 files changed, 66 insertions, 56 deletions

diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index a5a4c191ad6..2f14cb43ce1 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 1998/10/19 11:23:31 agc Exp $
-# FreeBSD Id: Makefile,v 1.6 1997/07/31 06:36:03 asami Exp
+# $NetBSD: Makefile,v 1.5 1999/02/23 00:38:04 tv Exp $
+# FreeBSD Id: Makefile,v 1.11 1998/02/01 03:04:11 itojun Exp
 #
 
-DISTNAME=		nntpcache-1.0.7.1
+DISTNAME=		nntpcache-2.3.3
 CATEGORIES=		news
 MASTER_SITES=		ftp://nntpcache.org/pub/nntpcache/ \
 			ftp://ftp.ntnu.no/pub/unix/news/ \
-			ftp://ftp.nethelp.no/pub/unix/news/ \
+			ftp://ftp.nethelp.no/pub/news/ \
 			ftp://suburbia.net/pub/nntpcache/
 
 MAINTAINER=		packages@netbsd.org
@@ -14,8 +14,13 @@ HOMEPAGE=		http://www.nntpcache.org/
 
 LICENSE=		fee-based-commercial-use
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=/var/spool
+CONFIGURE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+USE_GMAKE=		yes
+
+INSTALL_TARGET=		SUBDIRS="cf src filters http doc pgp contrib/newshound innreport" \
+			install
 
 post-configure:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g"  \
@@ -23,9 +28,8 @@ post-configure:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/nntpcached.sh ${PREFIX}/etc/rc.d
-	@-${RM} ${PREFIX}/etc/nntpcache/*.bak
-.for file in config access servers spam.filter
-	@${CP} ${PREFIX}/etc/nntpcache/${file} ${PREFIX}/etc/nntpcache/${file}.default
-.endfor
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nntpcache
+	cd ${WRKSRC} && ${INSTALL_DATA} FAQ FAQ.html LICENSING \
+		${PREFIX}/share/doc/nntpcache/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/nntpcache/files/md5 b/news/nntpcache/files/md5
index e1ebaeeed52..18068fa6e35 100644
--- a/news/nntpcache/files/md5
+++ b/news/nntpcache/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:14 agc Exp $
+$NetBSD: md5,v 1.3 1999/02/23 00:38:05 tv Exp $
 
-MD5 (nntpcache-1.0.7.1.tar.gz) = 1aebe46659ee0b4d8bb5eac77c12d8eb
+MD5 (nntpcache-2.3.3.tar.gz) = 93db846416ed88bcb39bbcea88480579
diff --git a/news/nntpcache/patches/patch-aa b/news/nntpcache/patches/patch-aa
deleted file mode 100644
index 9f68a43f5ab..00000000000
--- a/news/nntpcache/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:11:11 agc Exp $
-
---- ./Makefile.in.org	Fri Nov  8 12:47:37 1996
-+++ ./Makefile.in	Mon Jan  6 22:20:33 1997
-@@ -119,8 +119,14 @@
- 	$(INSTALL_PROGRAM) nntpcached $(sbindir)/nntpcached
- 	-strip $(sbindir)/nntpcached
- 	for d in $(SUBDIRS) ; do { ( cd $$d && $(MAKE) $@ ) ;} done
--	-for n in config access servers ; do { cp -i nntpcache.$$n $(CONFIG_DIR)/$$n ;} done
--	-cp -i filters/* $(CONFIG_DIR)
-+	-for n in config access servers ; do { if [ -e $(CONFIG_DIR)/$$n ]; \
-+ 		then cp nntpcache.$$n $(CONFIG_DIR)/$$n-dist; \
-+ 		else cp nntpcache.$$n $(CONFIG_DIR)/$$n ; \
-+		fi } done
-+	-cd filters && for n in * ; do { if [ -e $(CONFIG_DIR)/$$n ]; \
-+ 		then cp $$n $(CONFIG_DIR)/$$n-dist; \
-+ 		else cp $$n $(CONFIG_DIR)/$$n ; \
-+		fi } done
- 	cat <install.msg
- 
- ftp: spotless VERSION
diff --git a/news/nntpcache/pkg/DESCR b/news/nntpcache/pkg/DESCR
index 5680911b722..3cce70ed252 100644
--- a/news/nntpcache/pkg/DESCR
+++ b/news/nntpcache/pkg/DESCR
@@ -1,9 +1,16 @@
-nntpcache (very efficiently) executes on the localhost pretending to be
-an NNRP news reading server. In fact, what it does is pass certain NNTP
-commands through to real (remote and possibly local) news-servers based
-on various pattern matching rules. nntpcache then takes the output from
-those servers and caches & indexes it in funky ways (much specific case
-magic goes into this).  The next time such information is asked for, or
-other information which can be logically inferred from the previously
-collated information, it is sent directly from the cache, without
-consulting the remote servers.
+NNTPCache is Squid for news (plus lots more).
+
+NNTPCache (very efficiently, using shared memory, COW, mmaps, etc)
+executes on the localhost pretending to be an NNRP news reading
+server. In fact, what it does is pass certain NNTP commands through
+to real (remote and possibly local) news-servers based on various
+pattern matching rules. nntpcache then takes the output from those
+servers and caches & indexes it in funky ways (much specific case
+magic goes into this).  The next time such information is asked
+for, or other information which can be logically inferred from the
+previously collated information, it is sent directly from the cache,
+without consulting the remote servers. NNTPCache can transparently
+merge multiple servers, (permiting local newsgroups with remote
+NNTP feeds), filter articles, xovers, and headers based on weighted
+regular expressions, and has built in NoCem/PGP (anti-spam) support
+(see www.nntpcache.org/www.nocem.org for details).
diff --git a/news/nntpcache/pkg/MESSAGE b/news/nntpcache/pkg/MESSAGE
index f2f8106775f..a403bd6f1f5 100644
--- a/news/nntpcache/pkg/MESSAGE
+++ b/news/nntpcache/pkg/MESSAGE
@@ -1,10 +1,9 @@
-$NetBSD: MESSAGE,v 1.2 1998/08/07 11:11:12 agc Exp $
+$NetBSD: MESSAGE,v 1.3 1999/02/23 00:38:05 tv Exp $
 
 You may want to customize
 
-	${PREFIX}/etc/nntpcache/access
-	${PREFIX}/etc/nntpcache/config
-	${PREFIX}/etc/nntpcache/servers
-	${PREFIX}/etc/nntpcache/spam.filter
+	${PREFIX}/etc/nntpcache/nntpcache.access
+	${PREFIX}/etc/nntpcache/nntpcache.config
+	${PREFIX}/etc/nntpcache/nntpcache.servers
 
 to fit your personal needs.
diff --git a/news/nntpcache/pkg/PLIST b/news/nntpcache/pkg/PLIST
index d0fe962913c..ffdf7165dcf 100644
--- a/news/nntpcache/pkg/PLIST
+++ b/news/nntpcache/pkg/PLIST
@@ -1,14 +1,35 @@
-@comment $NetBSD: PLIST,v 1.1 1998/06/06 15:28:36 frueauf Exp $
-etc/nntpcache/access
-etc/nntpcache/access.default
-etc/nntpcache/config
-etc/nntpcache/config.default
-etc/nntpcache/servers
-etc/nntpcache/servers.default
+@comment $NetBSD: PLIST,v 1.2 1999/02/23 00:38:05 tv Exp $
+etc/nntpcache/VERSION
+etc/nntpcache/innreport.conf-dist
+etc/nntpcache/innreport.pl
+etc/nntpcache/innreport.pm
+etc/nntpcache/newshound.conf-dist
+etc/nntpcache/nntpcache.access-dist
+etc/nntpcache/nntpcache.config-dist
+etc/nntpcache/nntpcache.servers-dist
+etc/nntpcache/pubring.asc-dist
+etc/nntpcache/pubring.pgp-dist
 etc/nntpcache/spam.filter
-etc/nntpcache/spam.filter.default
+etc/nntpcache/http/index.html
+etc/nntpcache/http/moose.gif
+etc/nntpcache/http/nntpcache.jpg
+@exec mkdir -p %D/etc/nntpcache/http/innreport/pics
+@exec chown -R news:news %D/etc/nntpcache
+@exec chmod 700 %D/etc/nntpcache
+@unexec rmdir -p %D/etc/nntpcache/http/innreport/pics 2>/dev/null || true
 etc/rc.d/nntpcached.sh
+sbin/innreport.sh
+sbin/newshound
 sbin/nntpcached
-man/man8/nntpcache.8.gz
-@dirrm etc/nntpcache
+man/man8/newshound.8
+man/man8/nntpcached.8
+@unexec rmdir etc/nntpcache 2>/dev/null || true
+@exec mkdir -p /var/spool/nntpcache
+@exec cp %D/etc/nntpcache/VERSION /var/spool/nntpcache/VERSION
+@exec chown -R news:news /var/spool/nntpcache
+@exec chmod 700 /var/spool/nntpcache
 @unexec rm -rf /var/spool/nntpcache
+share/doc/nntpcache/FAQ
+share/doc/nntpcache/FAQ.html
+share/doc/nntpcache/LICENSING
+@dirrm share/doc/nntpcache