[Midnightbsd-cvs] mports [21136] trunk/devel/antlr: fix build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Mar 12 18:18:12 EST 2016
Revision: 21136
http://svnweb.midnightbsd.org/mports/?rev=21136
Author: laffer1
Date: 2016-03-12 18:18:12 -0500 (Sat, 12 Mar 2016)
Log Message:
-----------
fix build
Modified Paths:
--------------
trunk/devel/antlr/Makefile
trunk/devel/antlr/files/patch-configure
trunk/devel/antlr/pkg-plist
Added Paths:
-----------
trunk/devel/antlr/files/antlr.sh.in
trunk/devel/antlr/files/patch-lib__cpp__antlr__ANTLRException.hpp
Removed Paths:
-------------
trunk/devel/antlr/files/antlr.sh
trunk/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp
trunk/devel/antlr/files/patch-lib::cpp::antlr::CharBuffer.hpp
trunk/devel/antlr/files/patch-lib::cpp::src::ASTFactory.cpp
Property Changed:
----------------
trunk/devel/antlr/files/patch-configure
Modified: trunk/devel/antlr/Makefile
===================================================================
--- trunk/devel/antlr/Makefile 2016-03-12 23:06:03 UTC (rev 21135)
+++ trunk/devel/antlr/Makefile 2016-03-12 23:18:12 UTC (rev 21136)
@@ -3,6 +3,7 @@
PORTNAME= antlr
PORTVERSION= 2.7.7
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= http://www.antlr2.org/download/
@@ -14,22 +15,19 @@
CONFLICTS= pccts-[0-9]*
-USE_GMAKE= yes
+USES= gmake
USE_JAVA= yes
-JAVA_VERSION= 1.6+
-OPTIONS_DEFINE= PYTHON DOCS
-
HAS_CONFIGURE= yes
CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" CLASSPATH="${PORT_CLASSPATH}"
-CONFIGURE_ARGS= --disable-csharp --prefix=${PREFIX}
+CONFIGURE_ARGS= --disable-csharp --prefix=${PREFIX} \
+ --build=${ARCH}-portbld-freebsd9.1 \
+ --host=${ARCH}-portbld-freebsd9.1
PORT_CLASSPATH= ${WRKSRC}/antlrall.jar:.
-EXAMPLES= cpp java
+SUB_FILES= antlr.sh
-.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,61 +36,35 @@
stream.perspectives.gif stream.selector.gif \
stream.splitter.gif streams.html subrule.gif trees.html \
vocab.html
-.endif
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= 2.2+
-PORTDOCS+= python-runtime.html
-ANTLR_PYTHON= ${WRKSRC}/lib/python
-PLIST_SUB+= WITH_PYTHON=""
-.else
-PLIST_SUB+= WITH_PYTHON="@comment "
-.endif
+OPTIONS_DEFINE= PYTHON DOCS
+OPTIONS_SUB= yes
+PYTHON_USES= python
+PYTHON_PORTDOCS= python-runtime.html
+
post-extract:
(cd ${WRKSRC} && ${CP} antlr.jar antlrall.jar)
-post-configure:
- ${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|' \
- -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
- -e 's|%%JAVA_VERSION%%|${JAVA_VERSION}|' ${FILESDIR}/antlr.sh > ${WRKDIR}/antlr.sh
-.if ${PORT_OPTIONS:MPYTHON}
- (cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py config)
-.endif
+post-configure-PYTHON-on:
+ (cd ${WRKSRC}/lib/python && ${PYTHON_CMD} setup.py config)
-.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-build-PYTHON-on:
+ (cd ${WRKSRC}/lib/python && ${PYTHON_CMD} setup.py build && \
+ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/lib/python)
-.if ${PORT_OPTIONS:MPYTHON}
-post-build:
- (cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py build && \
- ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${ANTLR_PYTHON})
-.endif
-
do-install:
- @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
- @${MKDIR} ${JAVAJARDIR}
- @${INSTALL_DATA} ${WRKSRC}/antlr.jar ${JAVAJARDIR}/${PORTNAME}.jar
- @${ECHO_MSG} " [ DONE ]"
- @${ECHO_MSG} -n ">> Installing antlr script as ${PREFIX}/bin/${PORTNAME}..."
- @${INSTALL_SCRIPT} ${WRKDIR}/antlr.sh ${PREFIX}/bin/antlr
- @${ECHO_MSG} " [ DONE ]"
- @${ECHO_MSG} ">> Installing native files..."
- @(cd ${WRKSRC}/lib/cpp && ${GMAKE} install)
- @${ECHO_MSG} " [ DONE ]"
-.if ${PORT_OPTIONS:MPYTHON}
- @${ECHO_MSG} -n ">> Installing Python runtime files..."
- @(cd ${ANTLR_PYTHON} && ${PYTHON_CMD} setup.py install)
- @${ECHO_MSG} " [ DONE ]"
-.endif
-.if ${PORT_OPTIONS:MDOCS}
- @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
- @${MKDIR} ${DOCSDIR}
- @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
- @${ECHO_MSG} " [ DONE ]"
-.endif
+ @${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+ ${INSTALL_DATA} ${WRKSRC}/antlr.jar ${STAGEDIR}${JAVAJARDIR}
+ ${INSTALL_SCRIPT} ${WRKDIR}/antlr.sh ${STAGEDIR}${PREFIX}/bin/antlr
+ @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+ ${INSTALL_DATA} ${WRKSRC}/lib/cpp/antlr/*.hpp \
+ ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+ ${INSTALL_DATA} ${WRKSRC}/lib/cpp/src/libantlr.a ${STAGEDIR}${PREFIX}/lib
+ ${MKDIR} ${DOCSDIR}
+ (cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
+do-install-PYTHON-on:
+ @(cd ${WRKSRC}/lib/python && ${PYTHON_CMD} setup.py install --root=${FAKE_DESTDIR})
+
.include <bsd.port.mk>
Deleted: trunk/devel/antlr/files/antlr.sh
===================================================================
--- trunk/devel/antlr/files/antlr.sh 2016-03-12 23:06:03 UTC (rev 21135)
+++ trunk/devel/antlr/files/antlr.sh 2016-03-12 23:18:12 UTC (rev 21136)
@@ -1,5 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD: ports/devel/antlr/files/antlr.sh,v 1.4 2004/11/15 23:59:52 glewis Exp $
-
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/antlr.jar" antlr.Tool "$@"
Added: trunk/devel/antlr/files/antlr.sh.in
===================================================================
--- trunk/devel/antlr/files/antlr.sh.in (rev 0)
+++ trunk/devel/antlr/files/antlr.sh.in 2016-03-12 23:18:12 UTC (rev 21136)
@@ -0,0 +1,5 @@
+#! /bin/sh
+#
+# $FreeBSD: head/devel/antlr/files/antlr.sh.in 350206 2014-04-05 08:01:26Z pawel $
+
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/antlr.jar" antlr.Tool "$@"
Property changes on: trunk/devel/antlr/files/antlr.sh.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/antlr/files/patch-configure
===================================================================
--- trunk/devel/antlr/files/patch-configure 2016-03-12 23:06:03 UTC (rev 21135)
+++ trunk/devel/antlr/files/patch-configure 2016-03-12 23:18:12 UTC (rev 21136)
@@ -1,5 +1,3 @@
-$FreeBSD: ports/devel/antlr/files/patch-configure,v 1.2 2010/12/18 08:03:12 glewis Exp $
-
--- configure.orig 2010-12-17 23:55:00.000000000 -0800
+++ configure 2010-12-17 23:56:08.000000000 -0800
@@ -2234,7 +2234,7 @@
Property changes on: trunk/devel/antlr/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp
===================================================================
--- trunk/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp 2016-03-12 23:06:03 UTC (rev 21135)
+++ trunk/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp 2016-03-12 23:18:12 UTC (rev 21136)
@@ -1,10 +0,0 @@
---- lib/cpp/antlr/ANTLRException.hpp.orig Fri Apr 25 01:59:50 2003
-+++ lib/cpp/antlr/ANTLRException.hpp Fri Apr 25 01:55:50 2003
-@@ -9,6 +9,7 @@
- */
-
- #include <antlr/config.hpp>
-+#include <exception>
- #include <string>
-
- #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
Deleted: trunk/devel/antlr/files/patch-lib::cpp::antlr::CharBuffer.hpp
===================================================================
--- trunk/devel/antlr/files/patch-lib::cpp::antlr::CharBuffer.hpp 2016-03-12 23:06:03 UTC (rev 21135)
+++ trunk/devel/antlr/files/patch-lib::cpp::antlr::CharBuffer.hpp 2016-03-12 23:18:12 UTC (rev 21136)
@@ -1,16 +0,0 @@
-$FreeBSD: ports/devel/antlr/files/patch-lib::cpp::antlr::CharBuffer.hpp,v 1.1 2004/11/15 23:57:59 glewis Exp $
-
---- lib/cpp/antlr/CharBuffer.hpp.orig Mon Nov 15 16:35:21 2004
-+++ lib/cpp/antlr/CharBuffer.hpp Mon Nov 15 16:36:04 2004
-@@ -8,7 +8,11 @@
- * $Id: patch-lib::cpp::antlr::CharBuffer.hpp,v 1.1 2011-12-21 04:33:29 laffer1 Exp $
- */
-
-+#if defined(__GNUC__) && (__GNUC__ < 3 || __GNUC_MINOR__ < 2)
-+#include <istream.h>
-+#else
- #include <istream>
-+#endif
-
- #include <antlr/config.hpp>
- #include <antlr/InputBuffer.hpp>
Deleted: trunk/devel/antlr/files/patch-lib::cpp::src::ASTFactory.cpp
===================================================================
--- trunk/devel/antlr/files/patch-lib::cpp::src::ASTFactory.cpp 2016-03-12 23:06:03 UTC (rev 21135)
+++ trunk/devel/antlr/files/patch-lib::cpp::src::ASTFactory.cpp 2016-03-12 23:18:12 UTC (rev 21136)
@@ -1,16 +0,0 @@
-$FreeBSD: ports/devel/antlr/files/patch-lib::cpp::src::ASTFactory.cpp,v 1.1 2004/11/15 23:57:59 glewis Exp $
-
---- lib/cpp/src/ASTFactory.cpp.orig Mon Nov 15 16:31:34 2004
-+++ lib/cpp/src/ASTFactory.cpp Mon Nov 15 16:32:20 2004
-@@ -12,7 +12,11 @@
- #include "antlr/ANTLRUtil.hpp"
-
- #include <iostream>
-+#if defined(__GNUC__) && (__GNUC__ < 3 || __GNUC_MINOR__ < 2)
-+#include <istream.h>
-+#else
- #include <istream>
-+#endif
-
- using namespace std;
-
Copied: trunk/devel/antlr/files/patch-lib__cpp__antlr__ANTLRException.hpp (from rev 21114, trunk/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp)
===================================================================
--- trunk/devel/antlr/files/patch-lib__cpp__antlr__ANTLRException.hpp (rev 0)
+++ trunk/devel/antlr/files/patch-lib__cpp__antlr__ANTLRException.hpp 2016-03-12 23:18:12 UTC (rev 21136)
@@ -0,0 +1,10 @@
+--- lib/cpp/antlr/ANTLRException.hpp.orig Fri Apr 25 01:59:50 2003
++++ lib/cpp/antlr/ANTLRException.hpp Fri Apr 25 01:55:50 2003
+@@ -9,6 +9,7 @@
+ */
+
+ #include <antlr/config.hpp>
++#include <exception>
+ #include <string>
+
+ #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
Modified: trunk/devel/antlr/pkg-plist
===================================================================
--- trunk/devel/antlr/pkg-plist 2016-03-12 23:06:03 UTC (rev 21135)
+++ trunk/devel/antlr/pkg-plist 2016-03-12 23:18:12 UTC (rev 21136)
@@ -51,9 +51,7 @@
include/antlr/config.hpp
lib/libantlr.a
%%JAVAJARDIR%%/antlr.jar
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/antlr/__init__.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/antlr/__init__.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/antlr/antlr.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/antlr/antlr.pyc
-%%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/antlr
- at dirrm include/antlr
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/antlr/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/antlr/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/antlr/antlr.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/antlr/antlr.pyc
More information about the Midnightbsd-cvs
mailing list