ports/52550: serious maintainer update port: news/leafnode

[Matthias Andree]

>Number:         52550
>Category:       ports
>Synopsis:       serious maintainer update port: news/leafnode
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 21 18:30:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Andree
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD libertas.emma.line.org 4.8-STABLE FreeBSD 4.8-STABLE #31: Thu May 22 02:37:05 CEST 2003 toor at libertas.emma.line.org:/usr/src/sys/compile/LIBERTAS i386


	
>Description:
This upstream update incorporates a fix for a very long standing bug,
that leafnode never noticed when the user had unsubscribed from a news group.

Please commit before 5.1 ports freeze.

This contains PR # ports/52523, original description:
This patch cleans up the port a bit, uses variables rather than hard coded path
components, prints information on the spool directory, and will generate
pkg-message according to the actual spool directory to give proper
uninstallation info.

NOTE TO COMMITTER: please make sure pkg-message is removed from the source
directory; there is now a source file, files/pkg-message.in, that is run
through sed.
	
>How-To-Repeat:
	
>Fix:

diff -Nur /usr/ports/news/leafnode/Makefile /root/leafnode/Makefile
--- /usr/ports/news/leafnode/Makefile	Thu May  8 17:46:05 2003
+++ /root/leafnode/Makefile	Thu May 22 03:14:23 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	leafnode
-PORTVERSION=	1.9.40
+PORTVERSION=	1.9.41
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge/} \
 		http://www.dt.e-technik.uni-dortmund.de/~ma/${PORTNAME}/ \
@@ -18,7 +18,7 @@
 DISTNAME=	${PORTNAME}-${PORTVERSION}.rel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sourceforge,sunsite,DEFAULT
 
-MAINTAINER=	matthias.andree at web.de
+MAINTAINER=	matthias.andree at gmx.de
 COMMENT=	NNTP package for offline news caching and reading
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
@@ -31,32 +31,42 @@
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--quiet --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc/leafnode \
+CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}/etc/leafnode \
 		--with-lockfile=${LEAFNODE_SPOOLDIR}/leaf.node/lock.file \
 		--with-spooldir=${LEAFNODE_SPOOLDIR} --with-ipv6
 CONFIGURE_TARGET=    --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=
 MAN1=		leafnode-version.1 newsq.1
 MAN8=		applyfilter.8 checkgroups.8 fetchnews.8 leafnode.8 texpire.8
+PKGMESSAGE=	${WRKSRC}/pkg-message
+
+pre-configure:
+		@${ECHO}
+		@${ECHO} "------------------------------------------------------------------------"
+		@${ECHO} "This port will use ${LEAFNODE_SPOOLDIR} as spool directory."
+		@${ECHO} "Use LEAFNODE_SPOOLDIR=d to specify d as spool directory."
+		@${ECHO} "------------------------------------------------------------------------"
+		@${ECHO}
 
 post-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/quickmkdir ${PREFIX}/sbin/
 		${INSTALL_SCRIPT} ${WRKSRC}/setup-daemontools.sh ${PREFIX}/sbin/
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+		${MKDIR} ${DOCSDIR}
 		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 leafnode.cron.daily ; do \
-		  ${INSTALL_MAN} ${WRKSRC}/$$i \
-			${PREFIX}/share/doc/${PORTNAME} ; done
-		${MKDIR} ${PREFIX}/share/doc/${PORTNAME}/doc_german
+		  ${INSTALL_MAN} ${WRKSRC}/$$i ${DOCSDIR} ; \
+		done
+		${MKDIR} ${DOCSDIR}/doc_german
 		for i in INSTALL_de LIESMICH-daemontools README \
 			README_de newsq.1 ${MAN8} ; do \
 		  ${INSTALL_MAN} ${WRKSRC}/doc_german/$$i \
-			${PREFIX}/share/doc/${PORTNAME}/doc_german ; done
+			${DOCSDIR}/doc_german ; done
 .endif
-		${CAT} pkg-message
+		@${SED} 's}%%DOCSDIR%%}${DOCSDIR}}g' ${FILESDIR}/pkg-message.in >${PKGMESSAGE}
+		${CAT} ${PKGMESSAGE}
 		PKG_PREFIX=${PREFIX} SPOOLDIR=${LEAFNODE_SPOOLDIR} \
 			${SH} pkg-install ${PORTNAME} POST-INSTALL
 
diff -Nur /usr/ports/news/leafnode/distinfo /root/leafnode/distinfo
--- /usr/ports/news/leafnode/distinfo	Thu May  8 17:46:05 2003
+++ /root/leafnode/distinfo	Thu May 22 03:14:58 2003
@@ -1 +1 @@
-MD5 (leafnode-1.9.40.rel.tar.bz2) = a1d2c1c6eab5c06b370a1000a3acdd5c
+MD5 (leafnode-1.9.41.rel.tar.bz2) = 51d6585c5a7b9661741a18b28d36de87
diff -Nur /usr/ports/news/leafnode/files/pkg-message.in /root/leafnode/files/pkg-message.in
--- /usr/ports/news/leafnode/files/pkg-message.in	Thu Jan  1 01:00:00 1970
+++ /root/leafnode/files/pkg-message.in	Wed May 21 12:21:31 2003
@@ -0,0 +1,5 @@
+To finalize the leafnode install, proceed as follows:
+
+1. read %%DOCSDIR%%/INSTALL, starting at item #5.
+2. read %%DOCSDIR%%/NEWS, mind the incompatible changes!
+3. read %%DOCSDIR%%/README, mind the incompatible changes!
diff -Nur /usr/ports/news/leafnode/pkg-message /root/leafnode/pkg-message
--- /usr/ports/news/leafnode/pkg-message	Fri Aug 23 17:19:12 2002
+++ /root/leafnode/pkg-message	Thu Jan  1 01:00:00 1970
@@ -1,5 +0,0 @@
-To finalize the leafnode install, proceed as follows:
-
-1. read ${PREFIX}/share/doc/leafnode/INSTALL, starting at item #5.
-2. read ${PREFIX}/share/doc/leafnode/NEWS, mind the incompatible changes!
-3. read ${PREFIX}/share/doc/leafnode/README, mind the incompatible changes!
	


>Release-Note:
>Audit-Trail:
>Unformatted: