Date: Tue, 25 Aug 2015 10:00:12 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395226 - head/devel/antlr Message-ID: <201508251000.t7PA0CGE054032@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Aug 25 10:00:11 2015 New Revision: 395226 URL: https://svnweb.freebsd.org/changeset/ports/395226 Log: devel/antlr: - Convert to new options helpers - Remove outdated JAVA_VERSION restriction - Remove WITH_BUILT_JAVA_LIB knob, I don't see a point for converting it into option Modified: head/devel/antlr/Makefile Modified: head/devel/antlr/Makefile ============================================================================== --- head/devel/antlr/Makefile Tue Aug 25 09:57:04 2015 (r395225) +++ head/devel/antlr/Makefile Tue Aug 25 10:00:11 2015 (r395226) @@ -13,7 +13,6 @@ CONFLICTS= pccts-[0-9]* USES= gmake USE_JAVA= yes -JAVA_VERSION= 1.6+ HAS_CONFIGURE= yes CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" CLASSPATH="${PORT_CLASSPATH}" @@ -35,33 +34,18 @@ PORTDOCS= ANTLRException.gif closure.gif OPTIONS_DEFINE= PYTHON DOCS OPTIONS_SUB= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPYTHON} -USES+= python -PORTDOCS+= python-runtime.html -ANTLR_PYTHON= ${WRKSRC}/lib/python -.endif +PYTHON_USES= python +PYTHON_PORTDOCS= python-runtime.html post-extract: (cd ${WRKSRC} && ${CP} antlr.jar antlrall.jar) -post-configure: -.if ${PORT_OPTIONS:MPYTHON} - (cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py config) -.endif - -.if defined(WITH_BUILT_JAVA_LIB) -pre-build: - (cd ${WRKSRC} && ${JAVA} -classpath "${PORT_CLASSPATH}" antlr.build.Tool build) - (cd ${WRKSRC} && ${JAVA} -classpath "${PORT_CLASSPATH}" antlr.build.Tool jar) -.endif - -.if ${PORT_OPTIONS:MPYTHON} -post-build: - (cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py build && \ - ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${ANTLR_PYTHON}) -.endif +post-configure-PYTHON-on: + (cd ${WRKSRC}/lib/python && ${PYTHON_CMD} setup.py config) + +post-build-PYTHON-on: + (cd ${WRKSRC}/lib/python && ${PYTHON_CMD} setup.py build && \ + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/lib/python) do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} @@ -71,10 +55,12 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lib/cpp/antlr/*.hpp \ ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/lib/cpp/src/libantlr.a ${STAGEDIR}${PREFIX}/lib + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -.if ${PORT_OPTIONS:MPYTHON} - @(cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py install --root=${STAGEDIR}) -.endif + +do-install-PYTHON-on: + @(cd ${WRKSRC}/lib/python && ${PYTHON_CMD} setup.py install --root=${STAGEDIR}) .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508251000.t7PA0CGE054032>