Upgrade to use version 2.2b4

PR:		5492
Submitted by:	Julian Assange <proff@iq.org>

5 files changed, 34 insertions, 19 deletions

diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index bb9969fadd8a..9405845409b5 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -3,21 +3,24 @@
 # Date created:		6 January 1997
 # Whom:			proff@suburbia.net
 #
-# $Id: Makefile,v 1.6 1997/07/31 06:36:03 asami Exp $
+# $Id: Makefile,v 1.7 1997/12/24 01:21:28 alex Exp $
 #
 
-DISTNAME=	nntpcache-1.0.7.1
+DISTNAME=	nntpcache-2.2b4
 CATEGORIES=	news
 MASTER_SITES=	ftp://nntpcache.org/pub/nntpcache/ \
 		ftp://ftp.ntnu.no/pub/unix/news/ \
 		ftp://ftp.nethelp.no/pub/unix/news/ \
 		ftp://suburbia.net/pub/nntpcache/
 
+BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
 MAINTAINER=	nntpcache@nntpcache.org
 
 GNU_CONFIGURE=	TRUE
 CONFIGURE_ARGS=	--localstatedir=/var/spool
-MAN8=		nntpcache.8
+MAN8=		nntpcached.8
+
+USE_GMAKE=	TRUE
 
 post-configure:
 	@sed -e "s:%%PREFIX%%:${PREFIX}:g"  \
@@ -25,6 +28,5 @@ post-configure:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/nntpcached.sh ${PREFIX}/etc/rc.d
-	@-${RM} ${PREFIX}/etc/nntpcache/*.bak
 
 .include <bsd.port.mk>
diff --git a/news/nntpcache/distinfo b/news/nntpcache/distinfo
index 05e2b7d0194c..8780d8640e85 100644
--- a/news/nntpcache/distinfo
+++ b/news/nntpcache/distinfo
@@ -1 +1 @@
-MD5 (nntpcache-1.0.7.1.tar.gz) = 1aebe46659ee0b4d8bb5eac77c12d8eb
+MD5 (nntpcache-2.2b4.tar.gz) = 0c8cbc8d4681864cd3a8975c23be7133
diff --git a/news/nntpcache/pkg-comment b/news/nntpcache/pkg-comment
index 23996ec061a6..b11a5ffe595e 100644
--- a/news/nntpcache/pkg-comment
+++ b/news/nntpcache/pkg-comment
@@ -1 +1 @@
-News caching system.
+News caching/anti-spam/server-merging system.
diff --git a/news/nntpcache/pkg-descr b/news/nntpcache/pkg-descr
index 5680911b7222..3cce70ed2523 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-plist b/news/nntpcache/pkg-plist
index 93a309bbee70..9f9c94c561a9 100644
--- a/news/nntpcache/pkg-plist
+++ b/news/nntpcache/pkg-plist
@@ -1,9 +1,15 @@
-etc/nntpcache/access
-etc/nntpcache/config
-etc/nntpcache/servers
+etc/nntpcache/nntpcache.access-dist
+etc/nntpcache/nntpcache.config-dist
+etc/nntpcache/nntpcache.servers-dist
 etc/nntpcache/spam.filter
+etc/nntpcache/pubring.pgp
+etc/nntpcache/VERSION
+etc/nntpcache/newshound.conf
+@unexec rm -rf etc/nntpcache
 etc/rc.d/nntpcached.sh
+bin/confused
 sbin/nntpcached
+sbin/newshound
 man/man8/nntpcache.8.gz
-@dirrm etc/nntpcache
+man/man8/newshound.8.gz
 @unexec rm -rf /var/spool/nntpcache