From owner-svn-ports-head@freebsd.org Tue Aug 25 10:00:12 2015 Return-Path: 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 EAC4B99A453; Tue, 25 Aug 2015 10:00:12 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 C1AC86D5; Tue, 25 Aug 2015 10:00:12 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7PA0Ch9054033; Tue, 25 Aug 2015 10:00:12 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7PA0CGE054032; Tue, 25 Aug 2015 10:00:12 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201508251000.t7PA0CGE054032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Tue, 25 Aug 2015 10:00:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395226 - head/devel/antlr 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Aug 2015 10:00:13 -0000 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 - -.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