Upgrade of Leafnode (news/leafnode) to version 1.9.26.

Differences to previous NetBSD package:

* Use devel/pcre rather than the one supplied with Leafnode.

Differences to Leafnode version 1.9.22:

* Bug fixes and changes including:
	+ No longer install lsort
	+ Merge in timeout_client patch from Jonathan Larmour
	+ Fix file descriptor leak in markdownload()
	+ No longer emit "400 Service discontinued" to clients.
	+ Drop connection when the upstream server runs NNTPcache 2.3.x
	+ More verbose POST reject messages.
	+ Fix two filtering bugs in fetchnews.
	+ Expire groups that are not in group.info
	+ Fix several memory leaks (e.g. in fetchnews.c, newsq.c &
		artutil.c)
	+ Fix possible overflow in nntpd.c
	+ Some speed improvements (e.g. in getline.c and mastring.c)
	+ Fix bogus error messages.
	+ Several documentation fixes.
	+ Various fixes from Leafnode 2.

(For more details, please see the Leafnode ChangeLog file)

4 files changed, 27 insertions, 21 deletions

diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index ac55645c36a..be96fe4d9df 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,17 +1,23 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/16 11:34:26 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/22 10:35:48 cjep Exp $
 
-DISTNAME=		leafnode-1.9.22
+DISTNAME=		leafnode-1.9.26.rel
+PKGNAME=		leafnode-1.9.26
 CATEGORIES=		news
-MASTER_SITES=		ftp://wpxx02.toxi.uni-wuerzburg.de/pub/            \
-			ftp://ftp.karlsruhe.org/pub/news/servers/leafnode/ \
-			ftp://ftp.stikman.com/pub/leafnode/                \
-			${MASTER_SITE_SUNSITE:=system/news/transport/}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=leafnode/}
+
+EXTRACT_SUFX=		.tar.bz2
+#MASTER_SITES=		ftp://wpxx02.toxi.uni-wuerzburg.de/pub/            \
+#			ftp://ftp.karlsruhe.org/pub/news/servers/leafnode/ \
+#			ftp://ftp.stikman.com/pub/leafnode/                \
+#			${MASTER_SITE_SUNSITE:=system/news/transport/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.leafnode.org/
 COMMENT=		NNTP server for small (dialup) sites
 
-WRKSRC=			${WRKDIR}/${DISTNAME}.rel
+WRKSRC=			${WRKDIR}/${DISTNAME}
+
+USE_BUILDLINK2=		yes
 
 LEAFNODE_SPOOL?=	/var/spool/leafnode
 LEAFNODE_LOCKDIR?=	/var/spool/lock/leafnode
@@ -50,4 +56,5 @@ post-install:
 				${PREFIX}/share/examples/leafnode
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../devel/pcre/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/leafnode/PLIST b/news/leafnode/PLIST
index bf044a50d46..3f67ee6f031 100644
--- a/news/leafnode/PLIST
+++ b/news/leafnode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/16 11:34:26 cjep Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/22 10:35:48 cjep Exp $
 bin/newsq
 man/man1/newsq.1
 man/man8/applyfilter.8
@@ -10,7 +10,6 @@ sbin/applyfilter
 sbin/checkgroups
 sbin/fetchnews
 sbin/leafnode
-sbin/lsort
 sbin/texpire
 share/examples/leafnode/config.example
 @dirrm share/examples/leafnode
diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo
index e7429c9815f..e0bab9a6dee 100644
--- a/news/leafnode/distinfo
+++ b/news/leafnode/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/16 11:34:26 cjep Exp $
+$NetBSD: distinfo,v 1.2 2002/09/22 10:35:48 cjep Exp $
 
-SHA1 (leafnode-1.9.22.tar.gz) = fde8b7b97247a184438c1395fc7d3b3c8a12418e
-Size (leafnode-1.9.22.tar.gz) = 641708 bytes
-SHA1 (patch-aa) = 442143f000b0c1af91bbeda81bcaead26204deb6
+SHA1 (leafnode-1.9.26.rel.tar.bz2) = a3db611ea4f6dc084fee94c850a47913c61b53ee
+Size (leafnode-1.9.26.rel.tar.bz2) = 548636 bytes
+SHA1 (patch-aa) = d1aa900eb9040f8810afd7dbe4f26551c7dad99e
diff --git a/news/leafnode/patches/patch-aa b/news/leafnode/patches/patch-aa
index 40c800c5d9a..0ba738f7af1 100644
--- a/news/leafnode/patches/patch-aa
+++ b/news/leafnode/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/16 11:34:26 cjep Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/22 10:35:48 cjep Exp $
 
---- Makefile.in.orig	Wed Apr 17 19:39:31 2002
+--- Makefile.in.orig	Fri Sep 20 11:49:58 2002
 +++ Makefile.in
-@@ -587,14 +587,14 @@
+@@ -623,14 +623,14 @@
  	done
  sysconfDATA_INSTALL = $(INSTALL_DATA)
  install-sysconfDATA: $(sysconf_DATA)
@@ -25,29 +25,29 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/06/16 11:34:26 cjep Exp $
  
  uninstall-sysconfDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -995,18 +995,18 @@
+@@ -1059,18 +1059,18 @@
  	rpm -ba leafnode.spec
  
  install-data-hook: quickmkdir amiroot
 -	set -e ; for i in . leaf.node failed.postings interesting.groups \
--		out.going message.id ; do \
+-		out.going message.id temp.files ; do \
 -        mkdir -p $(DESTDIR)$(SPOOLDIR)/$$i ; \
 -	if ./amiroot ; then \
 -	 chown news:news $(DESTDIR)$(SPOOLDIR)/$$i ; \
 -	 chmod 2775      $(DESTDIR)$(SPOOLDIR)/$$i ; fi ; \
--	done 
+-	done
 -	d="`dirname $(DESTDIR)@LOCKFILE@`" ; mkdir -p "$${d}" && \
 -	if ./amiroot ; then \
 -          chown news:news "$${d}" ; \
 -	  chmod 2775 "$${d}" ; fi
 -	./quickmkdir $(DESTDIR)
 +#	set -e ; for i in . leaf.node failed.postings interesting.groups \
-+#		out.going message.id ; do \
++#		out.going message.id temp.files ; do \
 +#        mkdir -p $(DESTDIR)$(SPOOLDIR)/$$i ; \
 +#	if ./amiroot ; then \
 +#	 chown news:news $(DESTDIR)$(SPOOLDIR)/$$i ; \
 +#	 chmod 2775      $(DESTDIR)$(SPOOLDIR)/$$i ; fi ; \
-+#	done 
++#	done
 +#	d="`dirname $(DESTDIR)@LOCKFILE@`" ; mkdir -p "$${d}" && \
 +#	if ./amiroot ; then \
 +#          chown news:news "$${d}" ; \