Update to 2.4-b5. Changes are bugfixes only.

4 files changed, 21 insertions, 49 deletions

diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 02dca341cd3..0599b7ce578 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2000/02/20 06:53:59 proff Exp $
+# $NetBSD: Makefile,v 1.8 2000/06/21 12:50:28 mjl Exp $
 # FreeBSD Id: Makefile,v 1.11 1998/02/01 03:04:11 itojun Exp
 #
 
-DISTNAME=		nntpcache-2.4.0b3
+DISTNAME=		nntpcache-2.4.0b5
 CATEGORIES=		news
 MASTER_SITES=		ftp://ftp.nntpcache.org/pub/nntpcache/ \
 			ftp://ftp.fu-berlin.de/unix/news/nntpcache/ \
@@ -19,17 +19,9 @@ HOMEPAGE=		http://www.nntpcache.org/
 LICENSE=		fee-based-commercial-use
 
 # enable ldap support?
-NNTP_USE_LDAP=		no
+NNTP_USE_LDAP?=		no
 # enable pgp signed nocem support?
-NNTP_USE_PGP=		no
-
-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 scripts unixauth" \
-			install
+NNTP_USE_PGP?=		no
 
 .if ${NNTP_USE_LDAP} == yes
 DEPENDS+=		openldap-*:../../databases/openldap
@@ -39,6 +31,16 @@ DEPENDS+=		openldap-*:../../databases/openldap
 DEPENDS+=		pgp-2.*:../../security/pgp2
 .endif
 
+BUILD_DEFS+=	NNTP_USE_LDAP NNTP_USE_PGP
+
+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 scripts unixauth" \
+			install
+
 post-configure:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g"  \
 		${FILESDIR}/nntpcached.rc > ${WRKSRC}/nntpcached.sh
diff --git a/news/nntpcache/files/md5 b/news/nntpcache/files/md5
index 10bc06b4fbc..f6f965f32df 100644
--- a/news/nntpcache/files/md5
+++ b/news/nntpcache/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/02/20 06:54:00 proff Exp $
+$NetBSD: md5,v 1.5 2000/06/21 12:50:33 mjl Exp $
 
-MD5 (nntpcache-2.4.0b3.tar.gz) = f28fac698380b9a3fd5fe20db3274824
+MD5 (nntpcache-2.4.0b5.tar.gz) = 20cee920aabe44d9b196857928891509
diff --git a/news/nntpcache/files/patch-sum b/news/nntpcache/files/patch-sum
index 81b3cf5f230..614de807bf4 100644
--- a/news/nntpcache/files/patch-sum
+++ b/news/nntpcache/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/04/25 09:59:51 mjl Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/21 12:50:33 mjl Exp $
 
-MD5 (patch-aa) = 22a6e7c50f944d31bea5f9acd26ceca2
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/news/nntpcache/patches/patch-aa b/news/nntpcache/patches/patch-aa
deleted file mode 100644
index 1c80493e2de..00000000000
--- a/news/nntpcache/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2000/04/25 09:59:51 mjl Exp $
-
---- src/newgroups.c.orig	Fri Mar  3 20:15:48 2000
-+++ src/newgroups.c	Fri Mar  3 20:36:25 2000
-@@ -25,7 +25,7 @@
- 	char gmt[4]="";
- 	char dist[128]="";
- 	int i;
--	int t[4];
-+	int t[5];
- 	char arg1[9];
- 	int len;
- 	int yr;
-@@ -39,15 +39,15 @@
- 	len = strlen(arg1);
- 	if (len < 6 || atoi(arg1) == 0)
- 		goto bad;
--	strncpy(arg1+len-4, d, 4);
--	for (i=0; i<4; i++)
-+	strncpy(d, arg1+len-4, 4);
-+	for (i=0; i<5; i++)
- 		if ((t[i]=c2i(d+2*i))==-1)
- 			goto bad;
- 	/* deal with y2k bugged readers */
--	arg1[len-4] = '0';
-+	arg1[len-4] = '\0';
- 	yr = atoi(arg1);
- 	if (yr>19100)
--	    yr-=1900;
-+	    yr-=19000;
- 	if (yr>1900)
- 		yr-=1900;
- 	if (yr <70)