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

1 files changed, 12 insertions, 26 deletions

diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index 21ccdf4..725be93 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -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 cpp-runtime.html \
 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
+post-configure-PYTHON-on:
+	(cd ${WRKSRC}/lib/python && ${PYTHON_CMD} setup.py config)
 
-.if ${PORT_OPTIONS:MPYTHON}
-post-build:
-	(cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py build && \
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${ANTLR_PYTHON})
-.endif
+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>