Maintainer update [1]:

- Update to 1.9.45, lots of bugfixes, too many to list here,
  see http://mandree.home.pages.de/leafnode/NEWS
- Install German manual pages into standard location so that man(1) can find
  them.  (MANLANG and all that, along the lines used in security/nmap)
- Fix up NOPORTDOCS mode so it actually works
- Fix pkg-message to not contain the same text twice

While I'm here [2]:
- simplify/shorten post-install target a bit by using few new variables
  and unrolling loops
- rename ${PREFIX}/share/doc/leafnode/doc_german to just .../german.
  I think extra "doc_" there is unnecessary
- s/ECHO/ECHO_MSG/
- whitespace changes to shorten line lengths in Makefile

PR:		58799 [1]
Submitted by:	maintainer [1], sergei [2]
Approved by:	maintainer [2]

1 files changed, 32 insertions, 28 deletions

diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index afdf6de..05499f8 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	leafnode
-PORTVERSION=	1.9.43
+PORTVERSION=	1.9.45
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge/} \
 		http://www.dt.e-technik.uni-dortmund.de/~ma/${PORTNAME}/ \
@@ -35,40 +35,44 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}/etc/leafnode \
 		--with-spooldir=${LEAFNODE_SPOOLDIR} --with-ipv6
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=
+PKGMESSAGE=	${WRKSRC}/pkg-message
+
 MAN1=		leafnode-version.1 newsq.1
 MAN8=		applyfilter.8 checkgroups.8 fetchnews.8 leafnode.8 texpire.8
-PKGMESSAGE=	${WRKSRC}/pkg-message
+MANLANG=	"" de.ISO8859-1
+MAN1DIR_DE=	${MAN1PREFIX}/man/de.ISO8859-1/man1
+MAN8DIR_DE=	${MAN8PREFIX}/man/de.ISO8859-1/man8
+
+DOCS=		ADD-ONS ChangeLog COPYING CREDITS FAQ.txt FAQ.pdf FAQ.html \
+		INSTALL NEWS README ChangeLog.old README-FQDN README-FQDN.html \
+		README-daemontools README.FIRST TODO leafnode.cron.daily \
+		leafnode-SA-2002-01 leafnode-SA-2003-01 KNOWNBUGS
+DOCS_DE=	INSTALL_de LIESMICH-daemontools README README_de
 
 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}
+	@${ECHO_MSG}
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} "This port will use ${LEAFNODE_SPOOLDIR} as spool directory."
+	@${ECHO_MSG} "Use LEAFNODE_SPOOLDIR=d to specify d as spool directory."
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG}
 
 post-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/quickmkdir ${PREFIX}/sbin/
-		${INSTALL_SCRIPT} ${WRKSRC}/setup-daemontools.sh ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/quickmkdir ${PREFIX}/sbin/
+	${INSTALL_SCRIPT} ${WRKSRC}/setup-daemontools.sh ${PREFIX}/sbin/
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}
-		for i in ChangeLog COPYING CREDITS FAQ.txt FAQ.pdf FAQ.html \
-			 INSTALL NEWS README ChangeLog.old \
-			 README-FQDN README-FQDN.html README-daemontools \
-			 README.FIRST TODO leafnode.cron.daily \
-			 leafnode-SA-2002-01 leafnode-SA-2003-01 \
-			 KNOWNBUGS ; do \
-		  ${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 \
-			${DOCSDIR}/doc_german ; done
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/german
+	cd ${WRKSRC}/doc_german && ${INSTALL_DATA} ${DOCS_DE} ${DOCSDIR}/german
 .endif
-		@${SED} 's:%%DOCSDIR%%:${DOCSDIR}:g' ${FILESDIR}/pkg-message.in >${PKGMESSAGE}
-		${CAT} ${PKGMESSAGE}
-		PKG_PREFIX=${PREFIX} SPOOLDIR=${LEAFNODE_SPOOLDIR} \
-			${SH} pkg-install ${PORTNAME} POST-INSTALL
+	${MKDIR} ${MAN1DIR_DE} ${MAN8DIR_DE}
+	cd ${WRKSRC}/doc_german && \
+	${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/de.ISO8859-1/man1 && \
+	${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/de.ISO8859-1/man8
+	@${SED} 's:%%DOCSDIR%%:${DOCSDIR}:g' ${FILESDIR}/pkg-message.in >${PKGMESSAGE}
+	PKG_PREFIX=${PREFIX} SPOOLDIR=${LEAFNODE_SPOOLDIR} \
+		${SH} pkg-install ${PORTNAME} POST-INSTALL
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>