4 files changed, 30 insertions, 15 deletions

diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 5a22392e83b3..23821bfb6f2c 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -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 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/:sourceforge \
 DISTNAME=	${PORTNAME}-${PORTVERSION}.rel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sourceforge,sunsite,DEFAULT
 
-MAINTAINER=	matthias.andree@web.de
+MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	NNTP package for offline news caching and reading
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
@@ -31,32 +31,42 @@ PLIST_SUB=	SPOOLDIR=${LEAFNODE_SPOOLDIR}
 
 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 --git a/news/leafnode/distinfo b/news/leafnode/distinfo
index 9339be848680..eb83a6e2440e 100644
--- a/news/leafnode/distinfo
+++ b/news/leafnode/distinfo
@@ -1 +1 @@
-MD5 (leafnode-1.9.40.rel.tar.bz2) = a1d2c1c6eab5c06b370a1000a3acdd5c
+MD5 (leafnode-1.9.41.rel.tar.bz2) = 51d6585c5a7b9661741a18b28d36de87
diff --git a/news/leafnode/files/pkg-message.in b/news/leafnode/files/pkg-message.in
new file mode 100644
index 000000000000..d56a00dd0295
--- /dev/null
+++ b/news/leafnode/files/pkg-message.in
@@ -0,0 +1,10 @@
+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!
+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 --git a/news/leafnode/pkg-message b/news/leafnode/pkg-message
index 497488629667..e69de29bb2d1 100644
--- a/news/leafnode/pkg-message
+++ b/news/leafnode/pkg-message
@@ -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!