From 9f74d41a1103fe22d374914990c4559b21f98b11 Mon Sep 17 00:00:00 2001 From: amdmi3 Date: Wed, 6 Jan 2016 01:16:11 +0000 Subject: - Switch to options helpers - Simplify makefile - Unsilence installation --- net-p2p/xnap/Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/net-p2p/xnap/Makefile b/net-p2p/xnap/Makefile index 6c711c3f49b3..8adc706739ae 100644 --- a/net-p2p/xnap/Makefile +++ b/net-p2p/xnap/Makefile @@ -22,16 +22,13 @@ NO_ARCH= yes JAVAVM= ${LOCALBASE}/bin/java -OPTIONS_DEFINE= DOCS - -DOC_FILES= AUTHORS COPYING COPYING.LIB NEWS README \ - TODO -PORTDOCS= ${DOC_FILES} +PORTDOCS= AUTHORS COPYING COPYING.LIB NEWS README TODO -PLIST_FILES= \ - bin/${PORTNAME:tl} \ +PLIST_FILES= bin/${PORTNAME:tl} \ %%JAVAJARDIR%%/${PORTNAME:tl}.jar +OPTIONS_DEFINE= DOCS + post-patch: @${SED} -e "s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|; \ s|%%JAVAVM%%|${JAVAVM}|; \ @@ -40,12 +37,14 @@ post-patch: ${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh do-install: - @${INSTALL_DATA} ${WRKSRC}/xnap.jar \ + ${INSTALL_DATA} ${WRKSRC}/xnap.jar \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME:tl}.jar - @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl} + ${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for doc in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} +.for doc in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .include -- cgit