Date: Fri, 11 Sep 2015 19:51:56 +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: r396712 - head/textproc/lucene Message-ID: <201509111951.t8BJpuTc015821@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Sep 11 19:51:55 2015 New Revision: 396712 URL: https://svnweb.freebsd.org/changeset/ports/396712 Log: - Add NO_ARCH - Switch to options helpers - Don't install empty doc dirs Approved by: portmgr blanket Modified: head/textproc/lucene/Makefile Modified: head/textproc/lucene/Makefile ============================================================================== --- head/textproc/lucene/Makefile Fri Sep 11 19:20:07 2015 (r396711) +++ head/textproc/lucene/Makefile Fri Sep 11 19:51:55 2015 (r396712) @@ -20,6 +20,7 @@ PORTSCOUT= limit:^3\. USES= tar:tgz USE_JAVA= yes NO_BUILD= yes +NO_ARCH= yes JAVA_VERSION= 1.6+ OPTIONS_DEFINE= CONTRIB DOCS EXAMPLES @@ -28,8 +29,6 @@ OPTIONS_DEFAULT= CONTRIB PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}-core-${PORTVERSION}.jar -.include <bsd.port.options.mk> - CONTRIBS= benchmark \ demo \ facet \ @@ -55,11 +54,9 @@ EXTRA_CONTRIBS_DIRS= kuromoji \ smartcn \ stempel -.if ${PORT_OPTIONS:MCONTRIB} .for f in ${EXTRA_CONTRIBS_BASE} ${CONTRIBS} ${EXTRA_CONTRIBS_DIRS} -PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar +CONTRIB_PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar .endfor -.endif PORTDOCS= * PORTEXAMPLES= * @@ -68,24 +65,27 @@ DEMODIR= contrib/demo do-install: ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR} -.if ${PORT_OPTIONS:MCONTRIB} -. for f in ${CONTRIBS} + +do-install-CONTRIB-on: +.for f in ${CONTRIBS} ${INSTALL_DATA} ${WRKSRC}/contrib/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR} -. endfor -. for d in ${EXTRA_CONTRIBS_DIRS} +.endfor +.for d in ${EXTRA_CONTRIBS_DIRS} ${INSTALL_DATA} ${WRKSRC}/contrib/${EXTRA_CONTRIBS_BASE}/${d}/${PORTNAME}-${d}-${PORTVERSION}.jar \ ${STAGEDIR}${JAVAJARDIR} -. endfor +.endfor ${INSTALL_DATA} \ ${WRKSRC}/contrib/${EXTRA_CONTRIBS_BASE}/common/${PORTNAME}-${EXTRA_CONTRIBS_BASE}-${PORTVERSION}.jar \ ${STAGEDIR}${JAVAJARDIR} -.endif +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in CHANGES.txt LICENSE.txt NOTICE.txt README.txt ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor - (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} "-not -empty") + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/${DEMODIR} && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509111951.t8BJpuTc015821>