Update to 1.9.25

Submitted by:	matthias.andree@web.de
PR:		42250

3 files changed, 41 insertions, 13 deletions

diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index b74bf0dbac72..90eb240665a8 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,27 +1,27 @@
-# New ports collection makefile for:	leafnode
-# Date created:		10 April 1996
+#
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	leafnode
-PORTVERSION=	1.9.24
+PORTVERSION=	1.9.25
 CATEGORIES=	news
-MASTER_SITES=	ftp://wpxx02.toxi.uni-wuerzburg.de/pub/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/leafnode/ \
+		http://www.dt.e-technik.uni-dortmund.de/~ma/${PORTNAME}/ \
+		ftp://wpxx02.toxi.uni-wuerzburg.de/pub/ \
 		http://www.Awfulhak.org/leafnode/ \
-		${MASTER_SITE_SUNSITE} \
+		${MASTER_SITE_SUNSITE}/system/news/transport/ \
 		ftp://ftp.karlsruhe.org/pub/news/servers/leafnode/ \
 		ftp://ftp.stikman.com/pub/leafnode/ \
-		ftp://ftp.gigabell.net/pub/leafnode/ \
-		http://www.dt.e-technik.uni-dortmund.de/~ma/leafnode/
-MASTER_SITE_SUBDIR=	system/news/transport
+		ftp://ftp.gigabell.net/pub/leafnode/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.rel
 
 MAINTAINER=	brian@FreeBSD.org
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--quiet --sysconfdir=${LOCALBASE}/etc/leafnode \
 		--with-lockfile=/var/spool/lock/news/leafnode.lck \
@@ -31,12 +31,18 @@ MAN1=		newsq.1
 MAN8=		applyfilter.8 checkgroups.8 fetchnews.8 leafnode.8 texpire.8
 
 post-install:
+		${INSTALL_SCRIPT} ${WRKSRC}/setup-daemontools.sh ${LOCALBASE}/sbin/
 .if !defined(NOPORTDOCS)
 		${MKDIR} ${LOCALBASE}/share/doc/${PORTNAME}
-		for i in ChangeLog CREDITS FAQ INSTALL NEWS README \
-			 README.FIRST TODO ; do \
+		for i in ChangeLog COPYING CREDITS FAQ INSTALL NEWS README \
+			 README-FQDN README-FQDN.html README-daemontools README.FIRST TODO \
+			 TROUBLESHOOTING TROUBLESHOOTING.html ; 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 \
+		  ${INSTALL_MAN} ${WRKSRC}/doc_german/$$i \
+			${LOCALBASE}/share/doc/${PORTNAME}/doc_german ; done
 .endif
 		${CAT} pkg-message
 
diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo
index 7bab8326dfeb..2f6da0c9c3aa 100644
--- a/news/leafnode/distinfo
+++ b/news/leafnode/distinfo
@@ -1 +1 @@
-MD5 (leafnode-1.9.24.rel.tar.gz) = 92e992ec99343b0d1eea7359f90e7a44
+MD5 (leafnode-1.9.25.rel.tar.bz2) = 745cb4d9a89d02016a279f2c73be1fdc
diff --git a/news/leafnode/pkg-plist b/news/leafnode/pkg-plist
index 3a6b459c022e..f8d677518147 100644
--- a/news/leafnode/pkg-plist
+++ b/news/leafnode/pkg-plist
@@ -1,18 +1,40 @@
 bin/newsq
 etc/leafnode/config.example
+etc/leafnode/nntp.rules.dist
+etc/leafnode/run.tcpd.dist
+etc/leafnode/run.tcpserver.dist
+etc/leafnode/Makefile.dist
+etc/leafnode/UNINSTALL-daemontools
 sbin/leafnode
 sbin/fetchnews
 sbin/texpire
 sbin/checkgroups
 sbin/applyfilter
-sbin/lsort
+sbin/setup-daemontools.sh
 share/doc/leafnode/ChangeLog
+share/doc/leafnode/COPYING
 share/doc/leafnode/CREDITS
 share/doc/leafnode/FAQ
 share/doc/leafnode/INSTALL
 share/doc/leafnode/NEWS
 share/doc/leafnode/README
+share/doc/leafnode/README-FQDN
+share/doc/leafnode/README-FQDN.html
+share/doc/leafnode/README-daemontools
 share/doc/leafnode/README.FIRST
 share/doc/leafnode/TODO
-@dirrm etc/leafnode
+share/doc/leafnode/TROUBLESHOOTING
+share/doc/leafnode/TROUBLESHOOTING.html
+share/doc/leafnode/doc_german/INSTALL_de
+share/doc/leafnode/doc_german/LIESMICH-daemontools
+share/doc/leafnode/doc_german/README
+share/doc/leafnode/doc_german/README_de
+share/doc/leafnode/doc_german/newsq.1
+share/doc/leafnode/doc_german/applyfilter.8
+share/doc/leafnode/doc_german/checkgroups.8
+share/doc/leafnode/doc_german/fetchnews.8
+share/doc/leafnode/doc_german/leafnode.8
+share/doc/leafnode/doc_german/texpire.8
+@dirrm share/doc/leafnode/doc_german
 @dirrm share/doc/leafnode
+@dirrm etc/leafnode