Update to 5.0

* Set LICENSE.
* Update HOMEPAGE and MASTER_SITES.
* Set java commands path.

Changelog:
unknown.

7 files changed, 107 insertions, 14 deletions

diff --git a/devel/javacc/Makefile b/devel/javacc/Makefile
index ead1b2afe71..c24854e5666 100644
--- a/devel/javacc/Makefile
+++ b/devel/javacc/Makefile
@@ -1,29 +1,34 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:17:07 asau Exp $
+# $NetBSD: Makefile,v 1.5 2013/06/30 12:31:42 ryoon Exp $
 
-DISTNAME=	javacc-4.0
+DISTNAME=	javacc-5.0
 CATEGORIES=	devel
-MASTER_SITES=	https://javacc.dev.java.net/files/documents/17/26776/
+MASTER_SITES=	http://java.net/projects/javacc/downloads/download/
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	https://javacc.dev.java.net/
+HOMEPAGE=	https://javacc.java.net/
 COMMENT=	Java Compiler Compiler [tm]
+LICENSE=	modified-bsd
 
 NO_BUILD=	yes
 USE_JAVA=	run
 USE_JAVA2=	yes
 
+# Force using "curl" for fetching the distribution file. It is only available
+# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
+FETCH_USING=	curl
+
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing classpath.
 SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	bin/javacc bin/jjdoc bin/jjtree
-SUBST_SED.paths=	-e 's,`dirname \$$0`/lib,${PREFIX}/lib/java,g'
+SUBST_FILES.paths=	bin/javacc bin/jjdoc bin/jjrun bin/jjtree
+SUBST_VARS.paths=	PREFIX PKG_JAVA_HOME
 
 .include "../../mk/java-vm.mk"
 
 INSTALLATION_DIRS+=	bin share/examples/javacc
 
 do-install:
-.for f in javacc jjdoc jjtree
+.for f in javacc jjdoc jjrun jjtree
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${DESTDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/java
diff --git a/devel/javacc/PLIST b/devel/javacc/PLIST
index 71f8580b8c2..3d5bcb42308 100644
--- a/devel/javacc/PLIST
+++ b/devel/javacc/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/06/30 12:31:42 ryoon Exp $
 bin/javacc
 bin/jjdoc
+bin/jjrun
 bin/jjtree
 lib/java/javacc.jar
 share/doc/javacc/CharStream.html
 share/doc/javacc/JJDoc.html
 share/doc/javacc/JJTree.html
+share/doc/javacc/JavaCC.html
+share/doc/javacc/JavaCC.txt
 share/doc/javacc/LICENSE
 share/doc/javacc/apiroutines.html
 share/doc/javacc/commandline.html
@@ -26,6 +29,7 @@ share/doc/javacc/mailinglist.html
 share/doc/javacc/simpleREADME.html
 share/doc/javacc/support.html
 share/doc/javacc/tokenmanager.html
+share/examples/javacc/CORBA-IDL/Hello.idl
 share/examples/javacc/CORBA-IDL/IDL.jj
 share/examples/javacc/CORBA-IDL/README
 share/examples/javacc/GUIParsing/ParserVersion/CalcGUI.java
@@ -82,19 +86,20 @@ share/examples/javacc/Interpreter/odd.spl
 share/examples/javacc/Interpreter/sqrt.spl
 share/examples/javacc/JJTreeExamples/ASTMyID.java
 share/examples/javacc/JJTreeExamples/ASTMyOtherID.java
+share/examples/javacc/JJTreeExamples/Eg4DumpVisitor.java
 share/examples/javacc/JJTreeExamples/README
 share/examples/javacc/JJTreeExamples/build.xml
 share/examples/javacc/JJTreeExamples/eg1.jjt
 share/examples/javacc/JJTreeExamples/eg2.jjt
 share/examples/javacc/JJTreeExamples/eg3.jjt
 share/examples/javacc/JJTreeExamples/eg4.jjt
-share/examples/javacc/JJTreeExamples/eg4DumpVisitor.java
 share/examples/javacc/JavaCCGrammar/JavaCC.jj
 share/examples/javacc/JavaGrammars/1.5/Java1.5.jj
+share/examples/javacc/JavaGrammars/1.5/JavaGenerics.java
 share/examples/javacc/JavaGrammars/1.5/Main.java
+share/examples/javacc/JavaGrammars/1.5/MyToken.java
 share/examples/javacc/JavaGrammars/1.5/README
 share/examples/javacc/JavaGrammars/1.5/Test.java
-share/examples/javacc/JavaGrammars/1.5/Token.java
 share/examples/javacc/JavaGrammars/1.5/build.xml
 share/examples/javacc/JavaGrammars/Java1.0.2.jj
 share/examples/javacc/JavaGrammars/Java1.0.2LS.jj
diff --git a/devel/javacc/distinfo b/devel/javacc/distinfo
index 66d88e9ead4..bc9970510b4 100644
--- a/devel/javacc/distinfo
+++ b/devel/javacc/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/11 03:50:02 minskim Exp $
+$NetBSD: distinfo,v 1.2 2013/06/30 12:31:42 ryoon Exp $
 
-SHA1 (javacc-4.0.tar.gz) = 74b1daf2e10077f9f64225f2ac8d08075b40445d
-RMD160 (javacc-4.0.tar.gz) = e17b9d81aef094384ee7578432adc66f4ff816dd
-Size (javacc-4.0.tar.gz) = 422038 bytes
+SHA1 (javacc-5.0.tar.gz) = ac9f7833bdd427d05c8364406ff82ee7cab4f86f
+RMD160 (javacc-5.0.tar.gz) = b7d6b5794619fb66a342935ab0644d231c39fb42
+Size (javacc-5.0.tar.gz) = 472721 bytes
+SHA1 (patch-bin_javacc) = c94965d4725aac84b647ccd20fb0a047d84d3bdc
+SHA1 (patch-bin_jjdoc) = bf27fb8b6b30faf37b03426d13b3547eaa49f70d
+SHA1 (patch-bin_jjrun) = 67c36c5bc8ffaeb2a52df0a05f7bdf8af9043831
+SHA1 (patch-bin_jjtree) = 9db1b40005724c78c163735ce00f88e1a6f49b49
diff --git a/devel/javacc/patches/patch-bin_javacc b/devel/javacc/patches/patch-bin_javacc
new file mode 100644
index 00000000000..624e2fa7c67
--- /dev/null
+++ b/devel/javacc/patches/patch-bin_javacc
@@ -0,0 +1,16 @@
+$NetBSD: patch-bin_javacc,v 1.1 2013/06/30 12:31:42 ryoon Exp $
+
+--- bin/javacc.orig	2009-08-31 22:27:03.000000000 +0000
++++ bin/javacc
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+-JAR="`dirname $0`/lib/javacc.jar"
++JAR="@PREFIX@/lib/java/javacc.jar"
+ 
+ case "`uname`" in
+      CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
+ esac
+ 
+-java -classpath "$JAR" javacc "$@"
++@PKG_JAVA_HOME@/bin/java -classpath "$JAR" javacc "$@"
+ 
diff --git a/devel/javacc/patches/patch-bin_jjdoc b/devel/javacc/patches/patch-bin_jjdoc
new file mode 100644
index 00000000000..6a2082877b3
--- /dev/null
+++ b/devel/javacc/patches/patch-bin_jjdoc
@@ -0,0 +1,16 @@
+$NetBSD: patch-bin_jjdoc,v 1.1 2013/06/30 12:31:42 ryoon Exp $
+
+--- bin/jjdoc.orig	2009-08-31 22:27:03.000000000 +0000
++++ bin/jjdoc
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+-JAR="`dirname $0`/lib/javacc.jar"
++JAR="@PREFIX@/lib/java/javacc.jar"
+ 
+ case "`uname`" in
+      CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
+ esac
+ 
+-java -classpath "$JAR" jjdoc "$@"
++@PKG_JAVA_HOME@/bin/java -classpath "$JAR" jjdoc "$@"
+ 
diff --git a/devel/javacc/patches/patch-bin_jjrun b/devel/javacc/patches/patch-bin_jjrun
new file mode 100644
index 00000000000..883d7738fa3
--- /dev/null
+++ b/devel/javacc/patches/patch-bin_jjrun
@@ -0,0 +1,31 @@
+$NetBSD: patch-bin_jjrun,v 1.1 2013/06/30 12:31:42 ryoon Exp $
+
+--- bin/jjrun.orig	2009-08-31 22:27:03.000000000 +0000
++++ bin/jjrun
+@@ -133,8 +133,8 @@ build: ${JAR}
+ # make ${JAR}: build the jar file 
+ ${JAR}: ${SOURCES} ${MANIFEST}
+ 	@echo ${MAKEFILE}: Building ${JAR}...
+-	javac ${SOURCES}
+-	jar cvfm ${JAR} ${MANIFEST} ${CLASSES}
++	@PKG_JAVA_HOME@/bin/javac ${SOURCES}
++	@PKG_JAVA_HOME@/bin/jar cvfm ${JAR} ${MANIFEST} ${CLASSES}
+ 	rm ${CLASSES}
+ 
+ # make clean: remove all generated jar files
+@@ -145,7 +145,7 @@ clean:
+ # make ${SOURCES}: compile the jj file into java sources
+ ${SOURCES}: ${JJ}
+ 	@echo ${MAKEFILE}: Compiling ${JJ}...
+-	@javacc ${JJ}
++	@PREFIX@/bin/javacc ${JJ}
+ 	touch -c ${BOILERSOURCES}
+ 
+ # make ${MANIFEST}: rule to make
+@@ -175,5 +175,5 @@ make -f $MAKEFILE
+ 
+ # Execute the jar file
+ echo $PROGNAME: Executing $PROJECT.jar...
+-java -jar $PROJECT.jar
++@PKG_JAVA_HOME@/bin/java -jar $PROJECT.jar
+ 
diff --git a/devel/javacc/patches/patch-bin_jjtree b/devel/javacc/patches/patch-bin_jjtree
new file mode 100644
index 00000000000..1929ba27375
--- /dev/null
+++ b/devel/javacc/patches/patch-bin_jjtree
@@ -0,0 +1,16 @@
+$NetBSD: patch-bin_jjtree,v 1.1 2013/06/30 12:31:42 ryoon Exp $
+
+--- bin/jjtree.orig	2009-08-31 22:27:03.000000000 +0000
++++ bin/jjtree
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+-JAR="`dirname $0`/lib/javacc.jar"
++JAR="@PREFIX@/lib/java/javacc.jar"
+ 
+ case "`uname`" in
+      CYGWIN*) JAR="`cygpath --windows -- "$JAR"`" ;;
+ esac
+ 
+-java -classpath "$JAR" jjtree "$@"
++@PKG_JAVA_HOME@/bin/java -classpath "$JAR" jjtree "$@"
+