Date: Fri, 1 Dec 2017 11:34:51 +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: r455275 - head/security/i2p Message-ID: <201712011134.vB1BYpkp005183@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712011134.vB1BYpkp005183>