Update to 1.6.0

Changelog:
## JFlex 1.6.0
- Unicode 7.0 is supported.
- In %unicode mode, supplementary code points are now handled properly.
  . Regular expressions are now code-point based, rather than code-unit/
    char based.
  . Input streams are read as code point sequences - properly paired
    surrogate code units are read as a single character.
  . All supported Unicode properties now match supplementary characters
    when Unicode 3.0 or above is specified, or when no version is
    specified, causing the default Unicode version, Unicode 7.0 in this
    release, to be used.
- New \u{...} escape sequence allows code points (and whitespace-separated
  sequences of code points) to be specified as 1-6 hexadecimal digit values.
- Characters in matches printed in %debug mode are now Unicode escaped
  (\uXXXX) when they are outside the range 32..127.
- fixed bug #127, detect javadoc class comment when followed by annotation(s)
- removed the "switch" and "table" code generation options
- By default no InputStream constructor is included in the generated
  scanner.  The capability to include one is deprecated and will be
  removed in JFlex 1.7.

## JFlex 1.5.1 (Mar 21, 2014)
- fixed bug #126, problem calling ./jflex start scripts
- fixed bug #125, minor documentation flaws
- further documentation and website updates
- JFlex now reports the correct version string
- added support for CUP2 with %cup2 switch, based on patch by Andreas Wenger

## JFlex 1.5.0 (Jan 21, 2014)
- the "switch" and "table" code generation options are deprecated
  and will be removed in JFlex 1.6
- the JFlex license has been changed from GPL to BSD.
- updated JFlex to CUP version 0.11a.
- changed the build from Ant to Maven.
- JFlex now mostly conforms with Unicode Regular Expressions UTS#18
  Basic Unicode Support - Level 1.  Supplementary code points (above
  the Basic Multilingual Plane) are not yet supported.
- new meta characters supported: `\s, \S, \d, \D, \w, \W`.
- nested character sets now supported, e.g. [[[ABC]D]E[FG]]
- new character set operations supported: union (e.g. [A||B]), intersection (e.g.
  [A&&B]), set-difference (e.g. [A--B]), and symmetric difference (e.g. [A~~B]).
- the meaning of the dot (".") meta character has been changed from `[^\n]` to
  `[^\n\r\u000B\u000C\u0085\u2028\u2029]`. Use the new `--legacydot` option to
  cause "." to be interpreted as `[^\n]`.
- new `\R` meta character matches any newline:
  `"\r\n" | [\n\r\u000B\u000C\u0085\u2028\u2029]`.
- new option --noinputstreamctor to not include an InputStream
  constructor in the generated scanner.
- %include <file> can now be used in the rules section (bug #116)
- fixed bug #105 & #106 (yychar and zzAtBOL should be reset for nested input streams)
- fixed bug #107 (could not match input for empty string matches.)
- fixed bug #110 & #118 (properly update zzFin when reallocating zzBuffer)
- fixed bug #114 (noncompileable scanner generation when default locale is Turkish)
- fixed bug #113 (zzEOFDone not included with pushed nested stream state)
- fixed bug #103 (can't build examples/java/)
- fixed bug #104 (impossible char class range should trigger syntax error)

3 files changed, 12 insertions, 30 deletions

diff --git a/devel/jflex/Makefile b/devel/jflex/Makefile
index 4eb70e0d9ff..b2b798dc8e5 100644
--- a/devel/jflex/Makefile
+++ b/devel/jflex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2013/12/31 22:12:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2014/10/06 13:33:54 ryoon Exp $
 #
 
-DISTNAME=	jflex-1.4.3
+DISTNAME=	jflex-1.6.0
 CATEGORIES=	devel
 MASTER_SITES=	http://jflex.de/
 
@@ -16,11 +16,12 @@ USE_TOOLS+=	pax
 INSTALLATION_DIRS=	bin lib/java share/doc/jflex share/examples/jflex
 
 do-build:
-	printf "#! ${SH}\\nexec ${PKG_JAVA_HOME}/bin/java -jar ${PREFIX}/lib/java/JFlex.jar \"\$$@\"\\n" > ${WRKSRC}/jflex.sh
+	printf "#! ${SH}\\nexec ${PKG_JAVA_HOME}/bin/java -jar ${PREFIX}/lib/java/${DISTNAME}.jar \"\$$@\"\\n" > ${WRKSRC}/jflex.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/jflex.sh ${DESTDIR}${PREFIX}/bin/jflex
-	${INSTALL_DATA} ${WRKSRC}/lib/JFlex.jar ${DESTDIR}${PREFIX}/lib/java/
+	${INSTALL_DATA} ${WRKSRC}/lib/${DISTNAME}.jar \
+		${DESTDIR}${PREFIX}/lib/java/
 	cd ${WRKSRC}/doc && pax -wr -pm * ${DESTDIR}${PREFIX}/share/doc/jflex
 	cd ${WRKSRC}/examples && pax -wr -pm * \
 		${DESTDIR}${PREFIX}/share/examples/jflex
diff --git a/devel/jflex/PLIST b/devel/jflex/PLIST
index d6b4b9676b5..c336197addc 100644
--- a/devel/jflex/PLIST
+++ b/devel/jflex/PLIST
@@ -1,19 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/31 22:12:03 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/10/06 13:33:54 ryoon Exp $
 bin/jflex
-lib/java/JFlex.jar
+lib/java/${PKGNAME}.jar
 share/doc/jflex/COPYRIGHT
-share/doc/jflex/crossref.png
 share/doc/jflex/footnote.png
+share/doc/jflex/jflex-black.png
 share/doc/jflex/jflex_anttask.html
-share/doc/jflex/logo.png
 share/doc/jflex/manual.css
 share/doc/jflex/manual.html
 share/doc/jflex/manual.pdf
-share/doc/jflex/manual.ps.gz
-share/examples/jflex/binary/Makefile
-share/examples/jflex/binary/README
-share/examples/jflex/binary/StraightStreamReader.java
-share/examples/jflex/binary/binary.flex
 share/examples/jflex/byaccj/Makefile
 share/examples/jflex/byaccj/README
 share/examples/jflex/byaccj/calc.flex
@@ -61,7 +55,6 @@ share/examples/jflex/java/java12.cup
 share/examples/jflex/java/lexer-output.good
 share/examples/jflex/java/unicode.flex
 share/examples/jflex/pom.xml
-share/examples/jflex/simple-maven/README.txt
 share/examples/jflex/simple-maven/pom.xml
 share/examples/jflex/simple-maven/src/README
 share/examples/jflex/simple-maven/src/main/java/Utility.java
@@ -72,22 +65,10 @@ share/examples/jflex/simple-maven/src/site/site.xml
 share/examples/jflex/simple-maven/src/test/java/YylexTest.java
 share/examples/jflex/simple-maven/src/test/resources/output.good
 share/examples/jflex/simple-maven/src/test/resources/test.txt
-share/examples/jflex/simple/Makefile
-share/examples/jflex/simple/README
-share/examples/jflex/simple/Utility.java
-share/examples/jflex/simple/Yytoken.java
-share/examples/jflex/simple/output.good
-share/examples/jflex/simple/simple.flex
-share/examples/jflex/simple/test.txt
 share/examples/jflex/standalone-maven/pom.xml
 share/examples/jflex/standalone-maven/src/main/jflex/standalone.flex
 share/examples/jflex/standalone-maven/src/test/java/de/jflex/example/standalone/SubstTest.java
 share/examples/jflex/standalone-maven/src/test/resources/sample.expected
 share/examples/jflex/standalone-maven/src/test/resources/sample.in
-share/examples/jflex/standalone/Makefile
-share/examples/jflex/standalone/README
-share/examples/jflex/standalone/build.xml
-share/examples/jflex/standalone/sample.inp
-share/examples/jflex/standalone/standalone.flex
 @pkgdir share/examples/jflex/standalone-maven/src/main/java
 @pkgdir share/examples/jflex/simple-maven/src/main/resources
diff --git a/devel/jflex/distinfo b/devel/jflex/distinfo
index 154bb008ed5..c12b5c1638d 100644
--- a/devel/jflex/distinfo
+++ b/devel/jflex/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2013/12/31 22:12:03 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2014/10/06 13:33:54 ryoon Exp $
 
-SHA1 (jflex-1.4.3.tar.gz) = d90c618d6b5dc9650f38843605834f18d0a76a4c
-RMD160 (jflex-1.4.3.tar.gz) = e45d7343cc8c66ceeb13ac9dbcaa8554dbb09f6b
-Size (jflex-1.4.3.tar.gz) = 1247939 bytes
+SHA1 (jflex-1.6.0.tar.gz) = b0f43c3106592eac7e935514f5d8245d56a25102
+RMD160 (jflex-1.6.0.tar.gz) = f01de346bf18c35c273de6f2ff7d1110a7398bc3
+Size (jflex-1.6.0.tar.gz) = 3035885 bytes