From owner-svn-ports-all@freebsd.org  Fri Dec  1 11:34:53 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 1F1A0DFD298;
 Fri,  1 Dec 2017 11:34:53 +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 C7DF07DD0F;
 Fri,  1 Dec 2017 11:34:52 +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 vB1BYp0B005184;
 Fri, 1 Dec 2017 11:34:51 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB1BYpkp005183;
 Fri, 1 Dec 2017 11:34:51 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201712011134.vB1BYpkp005183@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: Fri, 1 Dec 2017 11:34:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r455275 - head/security/i2p
X-SVN-Group: ports-head
X-SVN-Commit-Author: amdmi3
X-SVN-Commit-Paths: head/security/i2p
X-SVN-Commit-Revision: 455275
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Dec 2017 11:34:53 -0000

Author: amdmi3
Date: Fri Dec  1 11:34:51 2017
New Revision: 455275
URL: https://svnweb.freebsd.org/changeset/ports/455275

Log:
  - Simplify Makefile
  - Switch to options helpers

Modified:
  head/security/i2p/Makefile

Modified: head/security/i2p/Makefile
==============================================================================
--- head/security/i2p/Makefile	Fri Dec  1 11:34:09 2017	(r455274)
+++ head/security/i2p/Makefile	Fri Dec  1 11:34:51 2017	(r455275)
@@ -28,8 +28,6 @@ LIB_DEPENDS=	libiconv.so:converters/libiconv
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	i2p libwrapper.so library binary only available for i386 and amd64
 
-OPTIONS_DEFINE=	DOCS
-
 USES=		gettext tar:bzip2
 USE_RC_SUBR=	i2p
 
@@ -39,28 +37,17 @@ JAVA_BUILD=	jdk
 JAVA_VERSION=	1.6+
 USE_LOCALE=	en_US.UTF-8
 
-ALL_TARGET=	\
-		updater \
-		tarball
+ALL_TARGET=	updater tarball
 
-PORTDATA=	*
-
-PLIST_FILES=	\
-		sbin/i2prouter
-
 SUB_FILES=	wrapper.sh
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+=	javadoc
-
+PORTDATA=	*
 PORTDOCS=	*
+PLIST_FILES=	sbin/i2prouter
 
-JAVADOC_WRKSRC=	${WRKSRC}/build/javadoc
-.endif
+OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
+DOCS_ALL_TARGET=	javadoc
 
 post-patch:
 # postinstall.sh SHOULD only do post installation house keeping
@@ -75,23 +62,13 @@ post-patch:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-# install
-	@${INSTALL_DATA} ${WRKSRC}/i2p.tar.bz2 \
-		${STAGEDIR}${DATADIR}/
-# update
-	@${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip \
-		${STAGEDIR}${DATADIR}/
-# wrapper
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
-		${STAGEDIR}${PREFIX}/sbin/i2prouter
-# doc
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_DATA} ${WRKSRC}/i2p.tar.bz2 ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip ${STAGEDIR}${DATADIR}/
+	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/sbin/i2prouter
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/installer/resources/readme/readme*.html ${STAGEDIR}${DOCSDIR}
-# line taken from textproc/xerces-j maintained by hq@FreeBSD.org
-	@cd ${JAVADOC_WRKSRC} && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
-		${FIND} * -not -type d -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \;
-.endif
+	${INSTALL_DATA} ${WRKSRC}/installer/resources/readme/readme*.html ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/build/javadoc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>