From owner-svn-ports-head@freebsd.org  Wed Jan  6 01:16:12 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98ECDA6371D;
 Wed,  6 Jan 2016 01:16:12 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6730F1C0F;
 Wed,  6 Jan 2016 01:16:12 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u061GBsx044609;
 Wed, 6 Jan 2016 01:16:11 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u061GBZh044608;
 Wed, 6 Jan 2016 01:16:11 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201601060116.u061GBZh044608@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 6 Jan 2016 01:16:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405324 - head/net-p2p/xnap
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jan 2016 01:16:12 -0000

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>