5 files changed, 94 insertions, 487 deletions

diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index ad6ccf173d6c..07455508f647 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -6,54 +6,51 @@
 #
 
 PORTNAME=	antlr
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	devel java
-MASTER_SITES=	http://www.ANTLR.org/nirvana/
-DISTNAME=	antlr-${PORTVERSION}
-DIST_SUBDIR=	antlr
-EXTRACT_ONLY=	antlr-${PORTVERSION}.tar.gz
+MASTER_SITES=	http://www.antlr.org/download/
+DISTNAME=	${PORTNAME}-${PORTVERSION}
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	ANTLR: ANother Tool for Language Recognition
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-
 USE_GMAKE=	yes
+USE_JAVA=	1.2+
+NEED_JAVAC=	YES
 
-.if defined(WITH_PARSEVIEW)
-DISTFILES+=	ParseView.zip
-BUILD_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
-
-PLIST_SUB+=	PARSEVIEW=""
-.else
-PLIST_SUB+=	PARSEVIEW="@comment "
-.endif
-
-ALL_TARGET=	antlr
+ALL_TARGET=	${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/antlr-${PORTVERSION}${EXTRACT_SUFX})
-IGNORE=	You must manually fetch the source distribution (antlr-${PORTVERSION}${EXTRACT_SUFX}) from http://www.jguru.com/jguru/download/view.jsp?EID=201927 (registration required), place it in ${DISTDIR}/${DIST_SUBDIR} and then run make again
-.endif
+BUILD_DEPENDS=	${JAVAC}:${PORTSDIR}/${JAVA_PORT} \
+		${JAVA}:${PORTSDIR}/${JAVA_PORT}
+RUN_DEPENDS=	${JAVA}:${PORTSDIR}/${JAVA_PORT}
 
-.if defined(WITH_PARSEVIEW)
 post-extract:
-	(cd ${WRKSRC} && unzip -o ${DISTDIR}/${DIST_SUBDIR}/ParseView.zip)
-.endif
+	(cd ${WRKSRC} && ${CP} antlr.jar antlrall.jar)
 
 post-configure:
-	(cd ${WRKSRC}/lib/cpp && ./configure --prefix=${PREFIX})
+	(cd ${WRKSRC} && \
+	JAVAC=${JAVAC} JAR=${JAR} JAVA=${JAVA} \
+	./configure --prefix=${PREFIX})
 
 do-build:
-	(cd ${WRKSRC}/lib/cpp && ${GMAKE})
+	(cd ${WRKSRC} && PATH="${PATH}:${JAVA_HOME}/bin" ${JAVA} -classpath "." antlr.build.Tool build)
+	(cd ${WRKSRC} && PATH="${PATH}:${JAVA_HOME}/bin" ${JAVA} -classpath "." antlr.build.Tool jar)
+	(cd ${WRKSRC} && ${GMAKE})
+	@${RM} -f ${WRKDIR}/antlr.sh
+	@${SED} "s|%%JAVA_CLASSES%%|${PREFIX}/java/classes|" ${FILESDIR}/antlr.sh \
+	| ${SED} "s|%%JAVA%%|${JAVA}|" >${WRKDIR}/antlr.sh
 
 do-install:
-	@${SED} "s|%%ANTLR_JAR_PATH%%|${PREFIX}/share/antlr|" ${FILESDIR}/antlr.sh >${WRKDIR}/antlr.sh
+	@${MKDIR} ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/share/antlr
+	@${MKDIR} ${PREFIX}/java/classes
 	@${INSTALL_SCRIPT} ${WRKDIR}/antlr.sh ${PREFIX}/bin/antlr
+	@${INSTALL_SCRIPT} ${WRKSRC}/antlr.jar ${PREFIX}/java/classes
 	(cd ${WRKSRC}/lib/cpp && ${GMAKE} install)
-	(cd ${WRKSRC} && (${TAR} cf - antlr doc examples/cpp examples/java | ${TAR} xf - -C ${PREFIX}/share/antlr))
+	(cd ${WRKSRC} && (${TAR} cf - doc examples/cpp examples/java | ${TAR} xf - -C ${PREFIX}/share/antlr))
 
 .include <bsd.port.post.mk>
diff --git a/devel/antlr/distinfo b/devel/antlr/distinfo
index d54953c23f6c..f82cc57bb3f0 100644
--- a/devel/antlr/distinfo
+++ b/devel/antlr/distinfo
@@ -1,2 +1 @@
-MD5 (antlr/antlr-2.7.1.tar.gz) = 13bae8d2d48fc36b7eda2305a59f4349
-MD5 (antlr/ParseView.zip) = bfbee8ef4d9bbe1dbf3c8f1fab70a843
+MD5 (antlr/antlr-2.7.2.tar.gz) = d67ffcaba6b2cedd99601b9052f63957
diff --git a/devel/antlr/files/antlr.sh b/devel/antlr/files/antlr.sh
index a8ec1ed47857..dec25709d044 100644
--- a/devel/antlr/files/antlr.sh
+++ b/devel/antlr/files/antlr.sh
@@ -1,2 +1,2 @@
 #! /bin/sh
-javavm -classpath %%ANTLR_JAR_PATH%% antlr.Tool
+%%JAVA%% -classpath %%JAVA_CLASSES%%/antlr.jar antlr.Tool "$@"
diff --git a/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp b/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp
new file mode 100644
index 000000000000..7048a047e182
--- /dev/null
+++ b/devel/antlr/files/patch-lib::cpp::antlr::ANTLRException.hpp
@@ -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
diff --git a/devel/antlr/pkg-plist b/devel/antlr/pkg-plist
index 4ce030c8f2f6..26a1215b7088 100644
--- a/devel/antlr/pkg-plist
+++ b/devel/antlr/pkg-plist
@@ -1,5 +1,7 @@
 bin/antlr
+java/classes/antlr.jar
 include/antlr/ANTLRException.hpp
+include/antlr/ANTLRUtil.hpp
 include/antlr/AST.hpp
 include/antlr/ASTArray.hpp
 include/antlr/ASTFactory.hpp
@@ -9,6 +11,7 @@ include/antlr/ASTRefCount.hpp
 include/antlr/BaseAST.hpp
 include/antlr/BitSet.hpp
 include/antlr/CharBuffer.hpp
+include/antlr/CharInputBuffer.hpp
 include/antlr/CharScanner.hpp
 include/antlr/CharStreamException.hpp
 include/antlr/CharStreamIOException.hpp
@@ -18,6 +21,7 @@ include/antlr/CommonASTWithHiddenTokens.hpp
 include/antlr/CommonHiddenStreamToken.hpp
 include/antlr/CommonToken.hpp
 include/antlr/Parser.hpp
+include/antlr/IOException.hpp
 include/antlr/InputBuffer.hpp
 include/antlr/LLkParser.hpp
 include/antlr/LexerSharedInputState.hpp
@@ -44,445 +48,14 @@ include/antlr/TokenStreamSelector.hpp
 include/antlr/TreeParserSharedInputState.hpp
 include/antlr/config.hpp
 lib/libantlr.a
-lib/libantlr.la
-share/antlr/antlr/ANTLRError.java
-share/antlr/antlr/ANTLRException.java
-share/antlr/antlr/ANTLRGrammarParseBehavior.java
-share/antlr/antlr/ANTLRHashString.java
-share/antlr/antlr/ANTLRLexer.java
-share/antlr/antlr/ANTLRParser.java
-share/antlr/antlr/ANTLRStringBuffer.java
-share/antlr/antlr/ANTLRTokdefLexer.java
-share/antlr/antlr/ANTLRTokdefParser.java
-share/antlr/antlr/ANTLRTokdefParserTokenTypes.java
-share/antlr/antlr/ANTLRTokdefParserTokenTypes.txt
-share/antlr/antlr/ANTLRTokenTypes.java
-share/antlr/antlr/ANTLRTokenTypes.txt
-share/antlr/antlr/ASTFactory.java
-share/antlr/antlr/ASTIterator.java
-share/antlr/antlr/Parser.java
-share/antlr/antlr/ASTNULLType.java
-share/antlr/antlr/ASTPair.java
-share/antlr/antlr/ASTVisitor.java
-share/antlr/antlr/ActionElement.java
-share/antlr/antlr/ActionTransInfo.java
-share/antlr/antlr/Alternative.java
-share/antlr/antlr/AlternativeBlock.java
-share/antlr/antlr/AlternativeElement.java
-share/antlr/antlr/BaseAST.java
-share/antlr/antlr/BlockContext.java
-share/antlr/antlr/BlockEndElement.java
-share/antlr/antlr/BlockWithImpliedExitPath.java
-share/antlr/antlr/ByteBuffer.java
-share/antlr/antlr/CharBuffer.java
-share/antlr/antlr/CharFormatter.java
-share/antlr/antlr/CharLiteralElement.java
-share/antlr/antlr/CharQueue.java
-share/antlr/antlr/CharScanner.java
-share/antlr/antlr/CharRangeElement.java
-share/antlr/antlr/CharStreamException.java
-share/antlr/antlr/CharStreamIOException.java
-share/antlr/antlr/CodeGenerator.java
-share/antlr/antlr/CommonAST.java
-share/antlr/antlr/CommonASTWithHiddenTokens.java
-share/antlr/antlr/CommonHiddenStreamToken.java
-share/antlr/antlr/CommonToken.java
-share/antlr/antlr/CppBlockFinishingInfo.java
-share/antlr/antlr/CppCharFormatter.java
-share/antlr/antlr/CppCodeGenerator.java
-share/antlr/antlr/DefaultToolErrorHandler.java
-share/antlr/antlr/DefineGrammarSymbols.java
-share/antlr/antlr/DiagnosticCodeGenerator.java
-share/antlr/antlr/DumpASTVisitor.java
-share/antlr/antlr/ExceptionHandler.java
-share/antlr/antlr/ExceptionSpec.java
-share/antlr/antlr/FileCopyException.java
-share/antlr/antlr/FileLineFormatter.java
-share/antlr/antlr/Grammar.java
-share/antlr/antlr/GrammarAnalyzer.java
-share/antlr/antlr/GrammarAtom.java
-share/antlr/antlr/GrammarElement.java
-share/antlr/antlr/GrammarSymbol.java
-share/antlr/antlr/HTMLCodeGenerator.java
-share/antlr/antlr/ImportVocabTokenManager.java
-share/antlr/antlr/InputBuffer.java
-share/antlr/antlr/JavaBlockFinishingInfo.java
-share/antlr/antlr/JavaCharFormatter.java
-share/antlr/antlr/JavaCodeGenerator.java
-share/antlr/antlr/LLkAnalyzer.java
-share/antlr/antlr/Token.java
-share/antlr/antlr/LLkGrammarAnalyzer.java
-share/antlr/antlr/LLkParser.java
-share/antlr/antlr/LexerGrammar.java
-share/antlr/antlr/LexerSharedInputState.java
-share/antlr/antlr/Lookahead.java
-share/antlr/antlr/MakeGrammar.java
-share/antlr/antlr/MismatchedCharException.java
-share/antlr/antlr/MismatchedTokenException.java
-share/antlr/antlr/NameSpace.java
-share/antlr/antlr/NoViableAltException.java
-share/antlr/antlr/NoViableAltForCharException.java
-share/antlr/antlr/OneOrMoreBlock.java
-share/antlr/antlr/ParserGrammar.java
-share/antlr/antlr/ParserSharedInputState.java
-share/antlr/antlr/RecognitionException.java
-share/antlr/antlr/RuleBlock.java
-share/antlr/antlr/RuleEndElement.java
-share/antlr/antlr/RuleRefElement.java
-share/antlr/antlr/RuleSymbol.java
-share/antlr/antlr/SatherBlockFinishingInfo.java
-share/antlr/antlr/SatherCharFormatter.java
-share/antlr/antlr/SatherCodeGenerator.java
-share/antlr/antlr/SemanticException.java
-share/antlr/antlr/SimpleTokenManager.java
-share/antlr/antlr/StringLiteralElement.java
-share/antlr/antlr/StringLiteralSymbol.java
-share/antlr/antlr/SynPredBlock.java
-share/antlr/antlr/TokenBuffer.java
-share/antlr/antlr/TokenManager.java
-share/antlr/antlr/TokenQueue.java
-share/antlr/antlr/TokenRangeElement.java
-share/antlr/antlr/TokenRefElement.java
-share/antlr/antlr/TokenStream.java
-share/antlr/antlr/TokenStreamBasicFilter.java
-share/antlr/antlr/TokenStreamException.java
-share/antlr/antlr/TokenStreamHiddenTokenFilter.java
-share/antlr/antlr/TokenStreamIOException.java
-share/antlr/antlr/TokenStreamRecognitionException.java
-share/antlr/antlr/TokenStreamRetryException.java
-share/antlr/antlr/TokenStreamSelector.java
-share/antlr/antlr/TokenSymbol.java
-share/antlr/antlr/Tool.java
-share/antlr/antlr/ToolErrorHandler.java
-share/antlr/antlr/TreeBlockContext.java
-share/antlr/antlr/TreeElement.java
-share/antlr/antlr/TreeParser.java
-share/antlr/antlr/TreeParserSharedInputState.java
-share/antlr/antlr/TreeSpecifierNode.java
-share/antlr/antlr/TreeWalkerGrammar.java
-share/antlr/antlr/WildcardElement.java
-share/antlr/antlr/ZeroOrMoreBlock.java
-share/antlr/antlr/actions/cpp/ActionLexer.java
-share/antlr/antlr/actions/cpp/ActionLexerTokenTypes.java
-share/antlr/antlr/actions/cpp/ActionLexerTokenTypes.txt
-share/antlr/antlr/actions/cpp/action.g
-share/antlr/antlr/actions/cpp/ActionLexer.class
-share/antlr/antlr/actions/cpp/ActionLexerTokenTypes.class
-share/antlr/antlr/actions/java/ActionLexer.java
-share/antlr/antlr/actions/java/ActionLexerTokenTypes.java
-share/antlr/antlr/actions/java/ActionLexerTokenTypes.txt
-share/antlr/antlr/actions/java/action.g
-share/antlr/antlr/actions/java/ActionLexer.class
-share/antlr/antlr/actions/java/ActionLexerTokenTypes.class
-share/antlr/antlr/actions/sather/ActionLexer.java
-share/antlr/antlr/actions/sather/ActionLexerTokenTypes.java
-share/antlr/antlr/actions/sather/ActionLexerTokenTypes.txt
-share/antlr/antlr/actions/sather/action.g
-share/antlr/antlr/actions/sather/ActionLexer.class
-share/antlr/antlr/actions/sather/ActionLexerTokenTypes.class
-share/antlr/antlr/antlr.g
-share/antlr/antlr/collections/AST.java
-share/antlr/antlr/collections/ASTEnumeration.java
-share/antlr/antlr/collections/Enumerator.java
-share/antlr/antlr/collections/List.java
-share/antlr/antlr/collections/Stack.java
-share/antlr/antlr/collections/impl/ASTArray.java
-share/antlr/antlr/collections/impl/ASTEnumerator.java
-share/antlr/antlr/collections/impl/BitSet.java
-share/antlr/antlr/collections/impl/IndexedVector.java
-share/antlr/antlr/collections/impl/IntRange.java
-share/antlr/antlr/collections/impl/LLCell.java
-share/antlr/antlr/collections/impl/LLEnumeration.java
-share/antlr/antlr/collections/impl/LList.java
-share/antlr/antlr/collections/impl/Vector.java
-share/antlr/antlr/collections/impl/VectorEnumeration.java
-share/antlr/antlr/collections/impl/VectorEnumerator.java
-share/antlr/antlr/collections/impl/ASTArray.class
-share/antlr/antlr/collections/impl/ASTEnumerator.class
-share/antlr/antlr/collections/impl/BitSet.class
-share/antlr/antlr/collections/impl/IndexedVector.class
-share/antlr/antlr/collections/impl/IntRange.class
-share/antlr/antlr/collections/impl/LLCell.class
-share/antlr/antlr/collections/impl/LLEnumeration.class
-share/antlr/antlr/collections/impl/LList.class
-share/antlr/antlr/collections/impl/Vector.class
-share/antlr/antlr/collections/impl/VectorEnumeration.class
-share/antlr/antlr/collections/impl/VectorEnumerator.class
-share/antlr/antlr/collections/AST.class
-share/antlr/antlr/collections/ASTEnumeration.class
-share/antlr/antlr/collections/Enumerator.class
-share/antlr/antlr/collections/List.class
-share/antlr/antlr/collections/Stack.class
-share/antlr/antlr/debug/DebuggingCharScanner.java
-share/antlr/antlr/debug/DebuggingInputBuffer.java
-share/antlr/antlr/debug/DebuggingParser.java
-share/antlr/antlr/debug/Event.java
-share/antlr/antlr/debug/GuessingEvent.java
-share/antlr/antlr/debug/InputBufferAdapter.java
-share/antlr/antlr/debug/InputBufferEvent.java
-share/antlr/antlr/debug/InputBufferEventSupport.java
-share/antlr/antlr/debug/InputBufferListener.java
-share/antlr/antlr/debug/InputBufferReporter.java
-share/antlr/antlr/debug/LLkDebuggingParser.java
-share/antlr/antlr/debug/ListenerBase.java
-share/antlr/antlr/debug/MessageAdapter.java
-share/antlr/antlr/debug/MessageEvent.java
-share/antlr/antlr/debug/MessageListener.java
-share/antlr/antlr/debug/NewLineEvent.java
-share/antlr/antlr/debug/NewLineListener.java
-share/antlr/antlr/debug/ParserAdapter.java
-share/antlr/antlr/debug/ParserController.java
-share/antlr/antlr/debug/ParserEventSupport.java
-share/antlr/antlr/debug/ParserListener.java
-share/antlr/antlr/debug/ParserMatchAdapter.java
-share/antlr/antlr/debug/ParserMatchEvent.java
-share/antlr/antlr/debug/ParserMatchListener.java
-share/antlr/antlr/debug/ParserReporter.java
-share/antlr/antlr/debug/ParserTokenAdapter.java
-share/antlr/antlr/debug/ParserTokenEvent.java
-share/antlr/antlr/debug/ParserTokenListener.java
-share/antlr/antlr/debug/SemanticPredicateAdapter.java
-share/antlr/antlr/debug/SemanticPredicateEvent.java
-share/antlr/antlr/debug/TraceAdapter.java
-share/antlr/antlr/debug/SemanticPredicateListener.java
-share/antlr/antlr/debug/SyntacticPredicateAdapter.java
-share/antlr/antlr/debug/SyntacticPredicateEvent.java
-share/antlr/antlr/debug/SyntacticPredicateListener.java
-share/antlr/antlr/debug/TraceEvent.java
-share/antlr/antlr/debug/TraceListener.java
-share/antlr/antlr/debug/Tracer.java
-share/antlr/antlr/debug/misc/ASTFrame.java
-share/antlr/antlr/debug/misc/JTreeASTModel.java
-share/antlr/antlr/debug/misc/JTreeASTPanel.java
-share/antlr/antlr/debug/misc/ASTFrame.class
-share/antlr/antlr/debug/misc/ASTFrame$MyTreeSelectionListener.class
-share/antlr/antlr/debug/misc/ASTFrame$1.class
-share/antlr/antlr/debug/misc/JTreeASTModel.class
-share/antlr/antlr/debug/misc/JTreeASTPanel.class
-share/antlr/antlr/debug/DebuggingCharScanner.class
-share/antlr/antlr/debug/DebuggingInputBuffer.class
-share/antlr/antlr/debug/DebuggingParser.class
-share/antlr/antlr/debug/Event.class
-share/antlr/antlr/debug/GuessingEvent.class
-share/antlr/antlr/debug/InputBufferAdapter.class
-share/antlr/antlr/debug/InputBufferEvent.class
-share/antlr/antlr/debug/InputBufferEventSupport.class
-share/antlr/antlr/debug/InputBufferListener.class
-share/antlr/antlr/debug/InputBufferReporter.class
-share/antlr/antlr/debug/LLkDebuggingParser.class
-share/antlr/antlr/debug/ListenerBase.class
-share/antlr/antlr/debug/MessageAdapter.class
-share/antlr/antlr/debug/MessageEvent.class
-share/antlr/antlr/debug/MessageListener.class
-share/antlr/antlr/debug/NewLineEvent.class
-share/antlr/antlr/debug/NewLineListener.class
-share/antlr/antlr/debug/ParserAdapter.class
-share/antlr/antlr/debug/ParserController.class
-share/antlr/antlr/debug/ParserEventSupport.class
-share/antlr/antlr/debug/ParserListener.class
-share/antlr/antlr/debug/ParserMatchAdapter.class
-share/antlr/antlr/debug/ParserMatchEvent.class
-share/antlr/antlr/debug/TraceAdapter.class
-share/antlr/antlr/debug/ParserMatchListener.class
-share/antlr/antlr/debug/ParserReporter.class
-share/antlr/antlr/debug/ParserTokenAdapter.class
-share/antlr/antlr/debug/ParserTokenEvent.class
-share/antlr/antlr/debug/ParserTokenListener.class
-share/antlr/antlr/debug/SemanticPredicateAdapter.class
-share/antlr/antlr/debug/SemanticPredicateEvent.class
-share/antlr/antlr/debug/SemanticPredicateListener.class
-share/antlr/antlr/debug/SyntacticPredicateAdapter.class
-share/antlr/antlr/debug/SyntacticPredicateEvent.class
-share/antlr/antlr/debug/SyntacticPredicateListener.class
-share/antlr/antlr/debug/TraceEvent.class
-share/antlr/antlr/debug/TraceListener.class
-share/antlr/antlr/debug/Tracer.class
-share/antlr/antlr/preprocessor/Grammar.java
-share/antlr/antlr/preprocessor/GrammarFile.java
-share/antlr/antlr/preprocessor/Hierarchy.java
-share/antlr/antlr/preprocessor/Option.java
-share/antlr/antlr/preprocessor/Preprocessor.java
-share/antlr/antlr/preprocessor/PreprocessorLexer.java
-share/antlr/antlr/preprocessor/PreprocessorTokenTypes.java
-share/antlr/antlr/preprocessor/PreprocessorTokenTypes.txt
-share/antlr/antlr/preprocessor/Rule.java
-share/antlr/antlr/preprocessor/Tool.java
-share/antlr/antlr/preprocessor/preproc.g
-share/antlr/antlr/preprocessor/Grammar.class
-share/antlr/antlr/preprocessor/GrammarFile.class
-share/antlr/antlr/preprocessor/Hierarchy.class
-share/antlr/antlr/preprocessor/Option.class
-share/antlr/antlr/preprocessor/Preprocessor.class
-share/antlr/antlr/preprocessor/PreprocessorLexer.class
-share/antlr/antlr/preprocessor/PreprocessorTokenTypes.class
-share/antlr/antlr/preprocessor/Rule.class
-share/antlr/antlr/preprocessor/Tool.class
-share/antlr/antlr/tokdef.g
-share/antlr/antlr/ANTLRError.class
-share/antlr/antlr/ANTLRException.class
-share/antlr/antlr/ANTLRGrammarParseBehavior.class
-share/antlr/antlr/ANTLRHashString.class
-share/antlr/antlr/ANTLRLexer.class
-share/antlr/antlr/ANTLRParser.class
-share/antlr/antlr/ANTLRStringBuffer.class
-share/antlr/antlr/ANTLRTokdefLexer.class
-share/antlr/antlr/Token.class
-share/antlr/antlr/ANTLRTokdefParser.class
-share/antlr/antlr/ANTLRTokdefParserTokenTypes.class
-share/antlr/antlr/ANTLRTokenTypes.class
-share/antlr/antlr/ASTFactory.class
-share/antlr/antlr/ASTIterator.class
-share/antlr/antlr/ASTNULLType.class
-share/antlr/antlr/ASTPair.class
-share/antlr/antlr/ASTVisitor.class
-share/antlr/antlr/ActionElement.class
-share/antlr/antlr/ActionTransInfo.class
-share/antlr/antlr/Alternative.class
-share/antlr/antlr/AlternativeBlock.class
-share/antlr/antlr/AlternativeElement.class
-share/antlr/antlr/BaseAST.class
-share/antlr/antlr/BlockContext.class
-share/antlr/antlr/BlockEndElement.class
-share/antlr/antlr/ByteBuffer.class
-share/antlr/antlr/BlockWithImpliedExitPath.class
-share/antlr/antlr/CharBuffer.class
-share/antlr/antlr/CharFormatter.class
-share/antlr/antlr/CharLiteralElement.class
-share/antlr/antlr/CharQueue.class
-share/antlr/antlr/CharRangeElement.class
-share/antlr/antlr/CharScanner.class
-share/antlr/antlr/CharStreamException.class
-share/antlr/antlr/CharStreamIOException.class
-share/antlr/antlr/CodeGenerator.class
-share/antlr/antlr/CommonAST.class
-share/antlr/antlr/CommonASTWithHiddenTokens.class
-share/antlr/antlr/CommonHiddenStreamToken.class
-share/antlr/antlr/CommonToken.class
-share/antlr/antlr/CppBlockFinishingInfo.class
-share/antlr/antlr/ExceptionSpec.class
-share/antlr/antlr/CppCharFormatter.class
-share/antlr/antlr/CppCodeGenerator.class
-share/antlr/antlr/DefaultToolErrorHandler.class
-share/antlr/antlr/DefineGrammarSymbols.class
-share/antlr/antlr/DiagnosticCodeGenerator.class
-share/antlr/antlr/DumpASTVisitor.class
-share/antlr/antlr/ExceptionHandler.class
-share/antlr/antlr/FileCopyException.class
-share/antlr/antlr/FileLineFormatter.class
-share/antlr/antlr/Grammar.class
-share/antlr/antlr/GrammarAnalyzer.class
-share/antlr/antlr/GrammarAtom.class
-share/antlr/antlr/GrammarElement.class
-share/antlr/antlr/GrammarSymbol.class
-share/antlr/antlr/HTMLCodeGenerator.class
-share/antlr/antlr/InputBuffer.class
-share/antlr/antlr/ImportVocabTokenManager.class
-share/antlr/antlr/JavaBlockFinishingInfo.class
-share/antlr/antlr/JavaCharFormatter.class
-share/antlr/antlr/JavaCodeGenerator.class
-share/antlr/antlr/LLkAnalyzer.class
-share/antlr/antlr/LLkGrammarAnalyzer.class
-share/antlr/antlr/LLkParser.class
-share/antlr/antlr/LexerGrammar.class
-share/antlr/antlr/LexerSharedInputState.class
-share/antlr/antlr/Lookahead.class
-share/antlr/antlr/MakeGrammar.class
-share/antlr/antlr/MismatchedCharException.class
-share/antlr/antlr/MismatchedTokenException.class
-share/antlr/antlr/NameSpace.class
-share/antlr/antlr/NoViableAltException.class
-share/antlr/antlr/Parser.class
-share/antlr/antlr/NoViableAltForCharException.class
-share/antlr/antlr/OneOrMoreBlock.class
-share/antlr/antlr/ParserGrammar.class
-share/antlr/antlr/ParserSharedInputState.class
-share/antlr/antlr/RecognitionException.class
-share/antlr/antlr/RuleBlock.class
-share/antlr/antlr/RuleEndElement.class
-share/antlr/antlr/RuleRefElement.class
-share/antlr/antlr/RuleSymbol.class
-share/antlr/antlr/SatherBlockFinishingInfo.class
-share/antlr/antlr/SatherCharFormatter.class
-share/antlr/antlr/SatherCodeGenerator.class
-share/antlr/antlr/SemanticException.class
-share/antlr/antlr/SimpleTokenManager.class
-share/antlr/antlr/StringLiteralElement.class
-share/antlr/antlr/StringLiteralSymbol.class
-share/antlr/antlr/SynPredBlock.class
-share/antlr/antlr/TokenBuffer.class
-share/antlr/antlr/TokenManager.class
-share/antlr/antlr/TokenQueue.class
-share/antlr/antlr/TokenRangeElement.class
-share/antlr/antlr/TokenRefElement.class
-share/antlr/antlr/TokenStream.class
-share/antlr/antlr/TokenStreamBasicFilter.class
-share/antlr/antlr/TokenStreamException.class
-share/antlr/antlr/TokenStreamHiddenTokenFilter.class
-share/antlr/antlr/TokenStreamIOException.class
-share/antlr/antlr/TokenStreamRecognitionException.class
-share/antlr/antlr/TokenStreamRetryException.class
-share/antlr/antlr/Tool.class
-share/antlr/antlr/TokenStreamSelector.class
-share/antlr/antlr/TokenSymbol.class
-share/antlr/antlr/Tool$1.class
-share/antlr/antlr/ToolErrorHandler.class
-share/antlr/antlr/TreeBlockContext.class
-share/antlr/antlr/TreeElement.class
-share/antlr/antlr/TreeParser.class
-share/antlr/antlr/TreeParserSharedInputState.class
-share/antlr/antlr/TreeSpecifierNode.class
-share/antlr/antlr/TreeWalkerGrammar.class
-share/antlr/antlr/WildcardElement.class
-share/antlr/antlr/ZeroOrMoreBlock.class
-share/antlr/antlr/DefaultFileLineFormatter.java
-share/antlr/antlr/DefaultFileLineFormatter.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/CharacterNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/CharacterNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/Controller.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/Controller.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/GuessingTreeNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/GuessingTreeNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/InputBufferWatcher.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/InputBufferWatcher.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/IntTreeNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/IntTreeNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/NotCharacterNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/NotCharacterNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/NotTokenNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/NotTokenNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/NotTokenNodeWithText.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/NotTokenNodeWithText.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/ParseTree.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/ParseTree.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/ParseTreeCellRenderer.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/ParseTreeCellRenderer.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/ParseView.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/ParseView.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/ParserWatcher.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/ParserWatcher.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/RuleNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/RuleNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/ScannerWatcher$1.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/ScannerWatcher$2.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/ScannerWatcher.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/ScannerWatcher.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/SemPredNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/SemPredNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/StringTreeNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/StringTreeNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/SynPredNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/SynPredNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/TokenNode.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/TokenNode.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/TokenNodeWithText.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/TokenNodeWithText.java
-%%PARSEVIEW%%share/antlr/antlr/parseview/Watcher.class
-%%PARSEVIEW%%share/antlr/antlr/parseview/Watcher.java
 share/antlr/doc/ANTLRException.gif
-share/antlr/doc/antlr271release.html
+share/antlr/doc/antlr272release.html
 share/antlr/doc/closure.gif
+share/antlr/doc/csharp-runtime.html
 share/antlr/doc/cpp-runtime.html
 share/antlr/doc/err.html
+share/antlr/doc/getting-started.html
+share/antlr/doc/glossary.html
 share/antlr/doc/hidden.stream.gif
 share/antlr/doc/index.html
 share/antlr/doc/inheritance.html
@@ -496,7 +69,6 @@ share/antlr/doc/optional.gif
 share/antlr/doc/options.html
 share/antlr/doc/posclosure.gif
 share/antlr/doc/runtime.html
-share/antlr/doc/sa-runtime.html
 share/antlr/doc/sor.html
 share/antlr/doc/stream.perspectives.gif
 share/antlr/doc/stream.selector.gif
@@ -506,32 +78,42 @@ share/antlr/doc/subrule.gif
 share/antlr/doc/trees.html
 share/antlr/doc/vocab.html
 share/antlr/examples/cpp/ASTsupport/Main.cpp
+share/antlr/examples/cpp/ASTsupport/Makefile
 share/antlr/examples/cpp/ASTsupport/test.g
 share/antlr/examples/cpp/HTML/Main.cpp
+share/antlr/examples/cpp/HTML/Makefile
 share/antlr/examples/cpp/HTML/html.g
 share/antlr/examples/cpp/HTML/test.html
 share/antlr/examples/cpp/IDL/Main.cpp
+share/antlr/examples/cpp/IDL/Makefile
 share/antlr/examples/cpp/IDL/idl.g
 share/antlr/examples/cpp/IDL/test.idl
+share/antlr/examples/cpp/Makefile
 share/antlr/examples/cpp/calc/Main.cpp
+share/antlr/examples/cpp/calc/Main2.cpp
 share/antlr/examples/cpp/calc/Makefile
 share/antlr/examples/cpp/calc/calc.g
 share/antlr/examples/cpp/calc/test.in
 share/antlr/examples/cpp/cleanup.ksh
+share/antlr/examples/cpp/columns/Makefile
 share/antlr/examples/cpp/columns/column.g
 share/antlr/examples/cpp/exprAST/Main.cpp
+share/antlr/examples/cpp/exprAST/Makefile
 share/antlr/examples/cpp/exprAST/expr.g
 share/antlr/examples/cpp/exprAST/test.in
 share/antlr/examples/cpp/exprAST/test2.in
+share/antlr/examples/cpp/filter/Makefile
 share/antlr/examples/cpp/filter/Test.cpp
 share/antlr/examples/cpp/filter/t.g
 share/antlr/examples/cpp/filter/test.html
+share/antlr/examples/cpp/filterWithRule/Makefile
 share/antlr/examples/cpp/filterWithRule/Test.cpp
 share/antlr/examples/cpp/filterWithRule/t.g
 share/antlr/examples/cpp/filterWithRule/t.html
 share/antlr/examples/cpp/flexLexer/LexTokenStream.cpp
 share/antlr/examples/cpp/flexLexer/LexTokenStream.hpp
 share/antlr/examples/cpp/flexLexer/Main.cpp
+share/antlr/examples/cpp/flexLexer/Makefile
 share/antlr/examples/cpp/flexLexer/T.java
 share/antlr/examples/cpp/flexLexer/java.g
 share/antlr/examples/cpp/flexLexer/java.l
@@ -546,40 +128,48 @@ share/antlr/examples/cpp/heteroAST/PLUSNode.hpp
 share/antlr/examples/cpp/heteroAST/calc.g
 share/antlr/examples/cpp/heteroAST/test.in
 share/antlr/examples/cpp/imagNodeAST/Main.cpp
+share/antlr/examples/cpp/imagNodeAST/Makefile
 share/antlr/examples/cpp/imagNodeAST/simple.in
 share/antlr/examples/cpp/imagNodeAST/test.in
 share/antlr/examples/cpp/imagNodeAST/treewalk.g
 share/antlr/examples/cpp/includeFile/Main.cpp
 share/antlr/examples/cpp/includeFile/Main.hpp
+share/antlr/examples/cpp/includeFile/Makefile
 share/antlr/examples/cpp/includeFile/P.g
 share/antlr/examples/cpp/includeFile/incl.h
 share/antlr/examples/cpp/includeFile/subincl.h
 share/antlr/examples/cpp/includeFile/test.c
 share/antlr/examples/cpp/inherit.tinyc/Main.cpp
+share/antlr/examples/cpp/inherit.tinyc/Makefile
 share/antlr/examples/cpp/inherit.tinyc/input.c
 share/antlr/examples/cpp/inherit.tinyc/runtest.bat
 share/antlr/examples/cpp/inherit.tinyc/subc.g
 share/antlr/examples/cpp/java/Main.cpp
 share/antlr/examples/cpp/java/Makefile
-share/antlr/examples/cpp/java/T.java
 share/antlr/examples/cpp/java/java.g
 share/antlr/examples/cpp/java/java.tree.g
+share/antlr/examples/cpp/java/tests/E.java
+share/antlr/examples/cpp/java/tests/T.java
 share/antlr/examples/cpp/lexRewrite/Main.cpp
 share/antlr/examples/cpp/lexRewrite/Makefile
 share/antlr/examples/cpp/lexRewrite/rewrite.g
 share/antlr/examples/cpp/lexRewrite/test.in
 share/antlr/examples/cpp/multiLexer/CommonTokenTypes.txt
 share/antlr/examples/cpp/multiLexer/Main.cpp
+share/antlr/examples/cpp/multiLexer/Makefile
 share/antlr/examples/cpp/multiLexer/javadoclex.g
 share/antlr/examples/cpp/multiLexer/javadocparse.g
 share/antlr/examples/cpp/multiLexer/javalex.g
 share/antlr/examples/cpp/multiLexer/javaparse.g
-share/antlr/examples/cpp/multiLexer/shiplist
 share/antlr/examples/cpp/multiLexer/test.in
 share/antlr/examples/cpp/multiParser/Main.cpp
-share/antlr/examples/cpp/multiParser/simple.g
+share/antlr/examples/cpp/multiParser/Makefile
+share/antlr/examples/cpp/multiParser/lexer.g
+share/antlr/examples/cpp/multiParser/parser1.g
+share/antlr/examples/cpp/multiParser/parser2.g
 share/antlr/examples/cpp/multiParser/test.in
 share/antlr/examples/cpp/parseBinary/Main.cpp
+share/antlr/examples/cpp/parseBinary/Makefile
 share/antlr/examples/cpp/parseBinary/data
 share/antlr/examples/cpp/parseBinary/data.g
 share/antlr/examples/cpp/preserveWhiteSpace/Main.cpp
@@ -588,13 +178,16 @@ share/antlr/examples/cpp/preserveWhiteSpace/instr.g
 share/antlr/examples/cpp/preserveWhiteSpace/readme.txt
 share/antlr/examples/cpp/preserveWhiteSpace/test.in
 share/antlr/examples/cpp/tinyc/Main.cpp
+share/antlr/examples/cpp/tinyc/Makefile
 share/antlr/examples/cpp/tinyc/input.c
 share/antlr/examples/cpp/tinyc/lexer.g
 share/antlr/examples/cpp/tinyc/tinyc.g
 share/antlr/examples/cpp/transform/Main.cpp
+share/antlr/examples/cpp/transform/Makefile
 share/antlr/examples/cpp/transform/calc.g
 share/antlr/examples/cpp/transform/test.in
 share/antlr/examples/cpp/treewalk/Main.cpp
+share/antlr/examples/cpp/treewalk/Makefile
 share/antlr/examples/cpp/treewalk/simple.in
 share/antlr/examples/cpp/treewalk/test.in
 share/antlr/examples/cpp/treewalk/treewalk.g
@@ -602,6 +195,9 @@ share/antlr/examples/cpp/unicode/Makefile
 share/antlr/examples/cpp/unicode/NOT_WORKING
 share/antlr/examples/cpp/unicode/test.in
 share/antlr/examples/cpp/unicode/unicode.g
+share/antlr/examples/java/ASTsupport/ASTType49.java
+share/antlr/examples/java/ASTsupport/MyAST.java
+share/antlr/examples/java/ASTsupport/TestASTFactory.java
 share/antlr/examples/java/ASTsupport/shiplist
 share/antlr/examples/java/ASTsupport/t.bat
 share/antlr/examples/java/ASTsupport/test.g
@@ -617,7 +213,9 @@ share/antlr/examples/java/calc/Calc.java
 share/antlr/examples/java/calc/calc.g
 share/antlr/examples/java/calc/shiplist
 share/antlr/examples/java/calc/test.in
-share/antlr/examples/java/cleanup.ksh
+share/antlr/examples/java/columns/shiplist
+share/antlr/examples/java/columns/test.in
+share/antlr/examples/java/columns/track.g
 share/antlr/examples/java/exprAST/Main.java
 share/antlr/examples/java/exprAST/expr.g
 share/antlr/examples/java/exprAST/shiplist
@@ -658,10 +256,11 @@ share/antlr/examples/java/inherit.tinyc/runtest.sh
 share/antlr/examples/java/inherit.tinyc/shiplist
 share/antlr/examples/java/inherit.tinyc/subc.g
 share/antlr/examples/java/java/Main.java
-share/antlr/examples/java/java/T.java
 share/antlr/examples/java/java/java.g
 share/antlr/examples/java/java/java.tree.g
 share/antlr/examples/java/java/shiplist
+share/antlr/examples/java/java/tests/E.java
+share/antlr/examples/java/java/tests/T.java
 share/antlr/examples/java/lexRewrite/Main.java
 share/antlr/examples/java/lexRewrite/rewrite.g
 share/antlr/examples/java/lexRewrite/shiplist
@@ -744,21 +343,19 @@ share/antlr/examples/java/treewalk/treewalk.g
 share/antlr/examples/java/unicode/shiplist
 share/antlr/examples/java/unicode/test.in
 share/antlr/examples/java/unicode/unicode.g
-share/antlr/examples/java/columns/shiplist
-share/antlr/examples/java/columns/test.in
-share/antlr/examples/java/columns/track.g
+share/antlr/examples/java/unicode.IDENTs/Debug.java
+share/antlr/examples/java/unicode.IDENTs/font.properties
+share/antlr/examples/java/unicode.IDENTs/Main.java
+share/antlr/examples/java/unicode.IDENTs/shiplist
+share/antlr/examples/java/unicode.IDENTs/ShowString.java
+share/antlr/examples/java/unicode.IDENTs/StreamConverter.java
+share/antlr/examples/java/unicode.IDENTs/test.in
+share/antlr/examples/java/unicode.IDENTs/Unicode.g
+share/antlr/examples/java/unicode.IDENTs/Unicode.readme
+share/antlr/examples/java/xml/Main.java
+share/antlr/examples/java/xml/test.xml
+share/antlr/examples/java/xml/xml.g
 @dirrm include/antlr
-@dirrm share/antlr/antlr/actions/cpp
-@dirrm share/antlr/antlr/actions/java
-@dirrm share/antlr/antlr/actions/sather
-@dirrm share/antlr/antlr/actions
-@dirrm share/antlr/antlr/collections/impl
-@dirrm share/antlr/antlr/collections
-@dirrm share/antlr/antlr/debug/misc
-@dirrm share/antlr/antlr/debug
-@dirrm share/antlr/antlr/preprocessor
-%%PARSEVIEW%%@dirrm share/antlr/antlr/parseview
-@dirrm share/antlr/antlr
 @dirrm share/antlr/doc
 @dirrm share/antlr/examples/cpp/ASTsupport
 @dirrm share/antlr/examples/cpp/HTML
@@ -773,6 +370,7 @@ share/antlr/examples/java/columns/track.g
 @dirrm share/antlr/examples/cpp/imagNodeAST
 @dirrm share/antlr/examples/cpp/includeFile
 @dirrm share/antlr/examples/cpp/inherit.tinyc
+@dirrm share/antlr/examples/cpp/java/tests
 @dirrm share/antlr/examples/cpp/java
 @dirrm share/antlr/examples/cpp/lexRewrite
 @dirrm share/antlr/examples/cpp/multiLexer
@@ -788,6 +386,7 @@ share/antlr/examples/java/columns/track.g
 @dirrm share/antlr/examples/java/HTML
 @dirrm share/antlr/examples/java/IDL
 @dirrm share/antlr/examples/java/calc
+@dirrm share/antlr/examples/java/columns
 @dirrm share/antlr/examples/java/exprAST
 @dirrm share/antlr/examples/java/filter
 @dirrm share/antlr/examples/java/filterWithRule
@@ -795,6 +394,7 @@ share/antlr/examples/java/columns/track.g
 @dirrm share/antlr/examples/java/imagNodeAST
 @dirrm share/antlr/examples/java/includeFile
 @dirrm share/antlr/examples/java/inherit.tinyc
+@dirrm share/antlr/examples/java/java/tests
 @dirrm share/antlr/examples/java/java
 @dirrm share/antlr/examples/java/lexRewrite
 @dirrm share/antlr/examples/java/linkChecker
@@ -807,7 +407,8 @@ share/antlr/examples/java/columns/track.g
 @dirrm share/antlr/examples/java/transform
 @dirrm share/antlr/examples/java/treewalk
 @dirrm share/antlr/examples/java/unicode
-@dirrm share/antlr/examples/java/columns
+@dirrm share/antlr/examples/java/unicode.IDENTs
+@dirrm share/antlr/examples/java/xml
 @dirrm share/antlr/examples/java
 @dirrm share/antlr/examples
 @dirrm share/antlr