[Midnightbsd-cvs] mports [15440] trunk/devel/antlr: new options

[laffer1 at midnightbsd.org]

Revision: 15440
          http://svnweb.midnightbsd.org/mports/?rev=15440
Author:   laffer1
Date:     2013-09-12 19:42:05 -0400 (Thu, 12 Sep 2013)
Log Message:
-----------
new options

Modified Paths:
--------------
    trunk/devel/antlr/Makefile
    trunk/devel/antlr/distinfo

Modified: trunk/devel/antlr/Makefile
===================================================================
--- trunk/devel/antlr/Makefile	2013-09-12 23:40:01 UTC (rev 15439)
+++ trunk/devel/antlr/Makefile	2013-09-12 23:42:05 UTC (rev 15440)
@@ -16,9 +16,9 @@
 
 USE_GMAKE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
-OPTIONS=	PYTHON "Include Python runtime support" off
+OPTIONS_DEFINE=	PYTHON DOCS
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" CLASSPATH="${PORT_CLASSPATH}"
@@ -27,7 +27,9 @@
 PORT_CLASSPATH=	${WRKSRC}/antlrall.jar:.
 
 EXAMPLES=	cpp java
-.if !defined(NOPORTDOCS)
+
+.include <bsd.mport.options.mk>
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	ANTLRException.gif closure.gif cpp-runtime.html \
 		csharp-runtime.html err.html glossary.html hidden.stream.gif \
 		index.html inheritance.html j-guru-blue.jpg jguru-logo.gif \
@@ -38,13 +40,8 @@
 		vocab.html
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	2.2+
-# we need to manually include this, because USE_PYTHON is defined
-# after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 PORTDOCS+=	python-runtime.html
 ANTLR_PYTHON=	${WRKSRC}/lib/python
 PLIST_SUB+=	WITH_PYTHON=""
@@ -59,7 +56,7 @@
 	${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|' \
 	-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	-e 's|%%JAVA_VERSION%%|${JAVA_VERSION}|' ${FILESDIR}/antlr.sh > ${WRKDIR}/antlr.sh
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	(cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py config)
 .endif
 
@@ -69,7 +66,7 @@
 	(cd ${WRKSRC} && ${JAVA} -classpath "${PORT_CLASSPATH}" antlr.build.Tool jar)
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 post-build:
 	(cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py build && \
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${ANTLR_PYTHON})
@@ -86,12 +83,12 @@
 	@${ECHO_MSG} ">> Installing native files..."
 	@(cd ${WRKSRC}/lib/cpp && ${GMAKE} install)
 	@${ECHO_MSG} "   [ DONE ]"
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	@${ECHO_MSG} -n ">> Installing Python runtime files..."
 	@(cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py install)
 	@${ECHO_MSG} "   [ DONE ]"
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
@@ -98,4 +95,4 @@
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/devel/antlr/distinfo
===================================================================
--- trunk/devel/antlr/distinfo	2013-09-12 23:40:01 UTC (rev 15439)
+++ trunk/devel/antlr/distinfo	2013-09-12 23:42:05 UTC (rev 15440)
@@ -1,3 +1,2 @@
 SHA256 (antlr-2.7.7.tar.gz) = 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9
-RMD160 (antlr-2.7.7.tar.gz) = 0b7951a28b748e912721fe0f6de4095d9f8da57d
 SIZE (antlr-2.7.7.tar.gz) = 1816180