4 files changed, 16 insertions, 27 deletions

diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 98c1c4003e38..23a310cb96eb 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	leafnode
-PORTVERSION=	1.9.29
+PORTVERSION=	1.9.31
+PORTREVISION=	0
 CATEGORIES=	news
 MASTER_SITES=	http://dl.sourceforge.net/sourceforge/leafnode/ \
 		http://www.dt.e-technik.uni-dortmund.de/~ma/${PORTNAME}/ \
@@ -28,9 +29,16 @@ CONFIGURE_ARGS=	--quiet --sysconfdir=${LOCALBASE}/etc/leafnode \
 		--with-lockfile=/var/spool/lock/news/leafnode.lck \
 		--with-spooldir=/var/spool/news
 MAKE_ARGS=
-MAN1=		newsq.1
+MAN1=		leafnode-version.1 newsq.1
 MAN8=		applyfilter.8 checkgroups.8 fetchnews.8 leafnode.8 texpire.8
 
+# The next two parts work around a packaging error in the tarball.
+post-extract:
+		${RM} ${WRKSRC}/leafnode.cron.daily
+
+pre-build:
+		cd ${WRKSRC} && ${MAKE} leafnode.cron.daily
+
 post-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/setup-daemontools.sh ${LOCALBASE}/sbin/
 .if !defined(NOPORTDOCS)
@@ -38,12 +46,12 @@ post-install:
 		for i in ChangeLog COPYING CREDITS FAQ.txt FAQ.pdf FAQ.html \
 			 INSTALL NEWS README \
 			 README-FQDN README-FQDN.html README-daemontools \
-			 README.FIRST TODO ; do \
+			 README.FIRST TODO leafnode.cron.daily ; do \
 		  ${INSTALL_MAN} ${WRKSRC}/$$i \
 			${LOCALBASE}/share/doc/${PORTNAME} ; done
 		${MKDIR} ${LOCALBASE}/share/doc/${PORTNAME}/doc_german
 		for i in INSTALL_de LIESMICH-daemontools README \
-			README_de ${MAN1} ${MAN8} ; do \
+			README_de newsq.1 ${MAN8} ; do \
 		  ${INSTALL_MAN} ${WRKSRC}/doc_german/$$i \
 			${LOCALBASE}/share/doc/${PORTNAME}/doc_german ; done
 .endif
diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo
index 5b55042c3568..11a89c2ee2dd 100644
--- a/news/leafnode/distinfo
+++ b/news/leafnode/distinfo
@@ -1 +1 @@
-MD5 (leafnode-1.9.29.rel.tar.bz2) = 75ac2cace12326c44613635ae6dd4b9d
+MD5 (leafnode-1.9.31.rel.tar.bz2) = f3f687933694816ea8d9260b46c49a70
diff --git a/news/leafnode/files/patch-aa b/news/leafnode/files/patch-aa
deleted file mode 100644
index af6829ce4cb7..000000000000
--- a/news/leafnode/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u leafnode-1/CREDITS:1.7 leafnode-1/CREDITS:1.8
---- CREDITS:1.7	Tue Sep 24 18:24:13 2002
-+++ CREDITS	Wed Nov  6 02:44:42 2002
-@@ -81,6 +81,7 @@
- Heiko Nock <zifnab@wtal.de>
- Holger Graf <Holger.Graf@gmx.net>
- Holger Repp <retaliator@sbsd.de>
-+Jan Knutar <jknutar@nic.fi>
- Jarle Rongved <rongved@online.no>
- Jeff East <an972@freenet.carleton.ca>
- Jeff Grossman <jeff@stikman.com>
-diff -u leafnode-1/nntpd.c:1.81 leafnode-1/nntpd.c:1.83
---- nntpd.c:1.81	Tue Sep 24 18:04:01 2002
-+++ nntpd.c	Fri Nov  8 18:14:41 2002
-@@ -521,6 +521,7 @@
- 			markgroup = group->name;
- 			break;
- 		    }
-+		    p = q;
- 		}
- 	    }
- 	    /* if we don't have a localartno, then we need to mark this
diff --git a/news/leafnode/pkg-plist b/news/leafnode/pkg-plist
index faa0f1cadad8..a0d292c3aed6 100644
--- a/news/leafnode/pkg-plist
+++ b/news/leafnode/pkg-plist
@@ -2,6 +2,7 @@
 bin/leafnode-version
 bin/newsq
 etc/leafnode/config.example
+etc/leafnode/filters.example
 etc/leafnode/nntp.rules.dist
 etc/leafnode/run.tcpd.dist
 etc/leafnode/run.tcpserver.dist
@@ -27,6 +28,7 @@ share/doc/leafnode/README-FQDN.html
 share/doc/leafnode/README-daemontools
 share/doc/leafnode/README.FIRST
 share/doc/leafnode/TODO
+share/doc/leafnode/leafnode.cron.daily
 share/doc/leafnode/doc_german/INSTALL_de
 share/doc/leafnode/doc_german/LIESMICH-daemontools
 share/doc/leafnode/doc_german/README
@@ -39,4 +41,5 @@ share/doc/leafnode/doc_german/leafnode.8
 share/doc/leafnode/doc_german/texpire.8
 @dirrm share/doc/leafnode/doc_german
 @dirrm share/doc/leafnode
+@unexec rmdir %D/lib/leafnode 2>/dev/null || true
 @dirrm etc/leafnode