4 files changed, 42 insertions, 34 deletions

diff --git a/textproc/javacc/Makefile b/textproc/javacc/Makefile
index 35c1bfb971b5..a9962b94622b 100644
--- a/textproc/javacc/Makefile
+++ b/textproc/javacc/Makefile
@@ -6,38 +6,41 @@
 #
 
 PORTNAME=	javacc
-PORTVERSION=	3.2
-PORTREVISION=	1
+PORTVERSION=	4.0
 CATEGORIES=	textproc java devel
-MASTER_SITES=	https://javacc.dev.java.net/files/documents/17/685/
+MASTER_SITES=	https://javacc.dev.java.net/files/documents/17/26783/
+DISTNAME=	${PORTNAME}-${PORTVERSION}src
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Compiler compiler for Java; includes tools for building syntax trees
+MAINTAINER=	rainer.alves@gmail.com
+COMMENT=	Java parser generator and lexical analyzer
 
 FETCH_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
 USE_JAVA=	yes
-FETCH_CMD=	${LOCALBASE}/bin/wget
-NO_BUILD=	yes
+USE_ANT=	yes
 DISABLE_SIZE=	yes
-#DOWNLOAD_URL?=	https://javacc.dev.java.net/servlets/ProjectDocumentList?folderID=212
+FETCH_CMD=	${LOCALBASE}/bin/wget
+FETCH_BEFORE_ARGS=	--no-check-certificate
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+.include <bsd.port.pre.mk>
 
-do-configure:
-	for f in "${WRKSRC}/bin/j*"; do \
+post-patch:
+	@for f in "${WRKSRC}/bin/j*"; do \
 		${REINPLACE_CMD} -e 's:`dirname \$$0`/lib:${JAVAJARDIR}:' $$f; \
 	done
 
 do-install:
-	${MKDIR} ${JAVAJARDIR}
+	@${MKDIR} ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/lib/javacc.jar ${JAVAJARDIR}
-	cd ${WRKSRC}/bin/ && ${INSTALL_SCRIPT} javacc jjdoc jjtree ${PREFIX}/bin/
+	(cd ${WRKSRC}/bin/ && ${INSTALL_SCRIPT} javacc jjdoc jjtree ${PREFIX}/bin/)
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/www/doc/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
-	${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/examples && ${FIND} . \
-		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${FIND} . \
+		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR})
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/javacc/distinfo b/textproc/javacc/distinfo
index 2b876a05642b..240c60fd2bbe 100644
--- a/textproc/javacc/distinfo
+++ b/textproc/javacc/distinfo
@@ -1,3 +1,3 @@
-MD5 (javacc-3.2.tar.gz) = 88829881cd1a6ccc0ab308e48a1ccbaf
-SHA256 (javacc-3.2.tar.gz) = 0a3f2e236774f2ad97fb07e412459282121f4d20f083645c1ff96b8a90d457f4
-SIZE (javacc-3.2.tar.gz) = 509819
+MD5 (javacc-4.0src.tar.gz) = bf91835dc1bb4821f4b26fd552b43c8d
+SHA256 (javacc-4.0src.tar.gz) = 062a35b89cf1bb4260627c32f480d26e17bf4595024e4b4e472a46fe1b24655f
+SIZE (javacc-4.0src.tar.gz) = 765150
diff --git a/textproc/javacc/pkg-descr b/textproc/javacc/pkg-descr
index 0e45e23d5875..92c9a80639ee 100644
--- a/textproc/javacc/pkg-descr
+++ b/textproc/javacc/pkg-descr
@@ -1,12 +1,9 @@
-JavaCC is a compiler compiler for Java.  It is similar to lex/yacc.
-Your output is a set of Java classes that can parse data defined
-by your grammar.
+Java Compiler Compiler (JavaCC) is a parser generator for use with
+Java applications. A parser generator is a tool that reads a grammar
+specification and converts it to a Java program that can recognize
+matches to the grammar. In addition to the parser generator itself,
+JavaCC provides other standard capabilities related to parser
+generation, such as tree building (via a tool called JJTree included
+with JavaCC), actions, debugging, and more.
 
-This includes JJTree, a preprocessor that greatly simplifies the
-construction of abstract syntax trees.  Also included is JJDoc, a
-tool that can generate documentation for your grammar.
-
-WWW: https://javacc.dev.java.net/
-
-- Andy Gerweck
-gerweck@yahoo.com
+WWW: http://javacc.dev.java.net
diff --git a/textproc/javacc/pkg-plist b/textproc/javacc/pkg-plist
index a9f8be976224..aaf28ce2c2d5 100644
--- a/textproc/javacc/pkg-plist
+++ b/textproc/javacc/pkg-plist
@@ -10,7 +10,6 @@ bin/jjtree
 %%PORTDOCS%%%%DOCSDIR%%/docindex.html
 %%PORTDOCS%%%%DOCSDIR%%/errorrecovery.html
 %%PORTDOCS%%%%DOCSDIR%%/features.html
-%%PORTDOCS%%%%DOCSDIR%%/getstarted.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/installhelp.html
 %%PORTDOCS%%%%DOCSDIR%%/javaccgrm.html
@@ -71,29 +70,37 @@ bin/jjtree
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/ASTVarDeclaration.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/ASTWhileStatement.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/ASTWriteStatement.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/MyNode.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/Node.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/SPL.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/SPL.jjt
-%%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/SimpleNode.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/fact.spl
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/odd.spl
 %%PORTDOCS%%%%EXAMPLESDIR%%/Interpreter/sqrt.spl
 %%PORTDOCS%%%%EXAMPLESDIR%%/JJTreeExamples/ASTMyID.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/JJTreeExamples/ASTMyOtherID.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/JJTreeExamples/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/JJTreeExamples/build.xml
 %%PORTDOCS%%%%EXAMPLESDIR%%/JJTreeExamples/eg1.jjt
 %%PORTDOCS%%%%EXAMPLESDIR%%/JJTreeExamples/eg2.jjt
 %%PORTDOCS%%%%EXAMPLESDIR%%/JJTreeExamples/eg3.jjt
 %%PORTDOCS%%%%EXAMPLESDIR%%/JJTreeExamples/eg4.jjt
 %%PORTDOCS%%%%EXAMPLESDIR%%/JJTreeExamples/eg4DumpVisitor.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/JavaCCGrammar/JavaCC.jj
+%%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/1.5/Java1.5.jj
+%%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/1.5/Main.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/1.5/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/1.5/Test.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/1.5/Token.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/1.5/build.xml
 %%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/Java1.0.2.jj
 %%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/Java1.0.2LS.jj
 %%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/Java1.1.jj
 %%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/Java1.1noLA.jj
 %%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/OPTIMIZING
 %%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/JavaGrammars/Test.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/Lookahead/Example1.jj
 %%PORTDOCS%%%%EXAMPLESDIR%%/Lookahead/Example10.jj
 %%PORTDOCS%%%%EXAMPLESDIR%%/Lookahead/Example2.jj
@@ -151,6 +158,7 @@ bin/jjtree
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Obfuscator
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/MailProcessing
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Lookahead
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/JavaGrammars/1.5
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/JavaGrammars
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/JavaCCGrammar
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/JJTreeExamples