Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Jan 2016 01:16:11 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r405324 - head/net-p2p/xnap
Message-ID:  <201601060116.u061GBZh044608@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Jan  6 01:16:11 2016
New Revision: 405324
URL: https://svnweb.freebsd.org/changeset/ports/405324

Log:
  - Switch to options helpers
  - Simplify makefile
  - Unsilence installation

Modified:
  head/net-p2p/xnap/Makefile

Modified: head/net-p2p/xnap/Makefile
==============================================================================
--- head/net-p2p/xnap/Makefile	Wed Jan  6 01:14:20 2016	(r405323)
+++ head/net-p2p/xnap/Makefile	Wed Jan  6 01:16:11 2016	(r405324)
@@ -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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601060116.u061GBZh044608>