5 files changed, 42 insertions, 46 deletions

diff --git a/java/jflex/Makefile b/java/jflex/Makefile
index d4e780412026..3d918ef0071f 100644
--- a/java/jflex/Makefile
+++ b/java/jflex/Makefile
@@ -6,9 +6,14 @@
 #
 
 PORTNAME=	jflex
-PORTVERSION=	1.3.5
+PORTVERSION=	1.4
 CATEGORIES=	java devel
-MASTER_SITES=	http://www.jflex.de/
+MASTER_SITES=	http://www.jflex.de/:jflexde \
+		http://jflex.sourceforge.net/jar/devel/:jflexsf
+DISTFILES=	jflex-1.4.tar.gz:jflexde \
+		JFlex.jar:jflexsf \
+		java_cup.jar:jflexsf
+EXTRACT_ONLY=	jflex-1.4.tar.gz
 
 MAINTAINER=	ports@mcdermottroe.com
 COMMENT=	The Fast Lexical Analyser Generator for Java[tm]
@@ -16,10 +21,11 @@ COMMENT=	The Fast Lexical Analyser Generator for Java[tm]
 USE_JAVA=	1.1+
 NEED_JAVAC=	yes
 USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/JFlex
 BUILD_WRKSRC=	${WRKSRC}/src
-MAKE_ENV+=	JAVAC="${JAVAC}" JAR="${JAR}" JAVAJARDIR="${JAVAJARDIR}" \
-		JAVA_CLASSES="${JAVA_CLASSES}"
+BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant \
+		${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit
+MAKE_ENV+=	DISTDIR="${DISTDIR}" JAVAJARDIR="${JAVAJARDIR}" \
+		LOCALBASE="${LOCALBASE}" SETENV="${SETENV}"
 
 PLIST_SUB=	JAVAJARDIR=${JAVAJARDIR:S|^${PREFIX}/||}
 .if !defined(NOPORTDOCS)
diff --git a/java/jflex/distinfo b/java/jflex/distinfo
index 7550bdfce916..8398af83acf1 100644
--- a/java/jflex/distinfo
+++ b/java/jflex/distinfo
@@ -1,2 +1,6 @@
-MD5 (jflex-1.3.5.tar.gz) = c77a9656aa20979f2268d7443995700f
-SIZE (jflex-1.3.5.tar.gz) = 799903
+MD5 (jflex-1.4.tar.gz) = 120cedc76b278a476682edfa6828841f
+SIZE (jflex-1.4.tar.gz) = 912690
+MD5 (JFlex.jar) = da256e01b8ef7d87fb02b10554c15d0e
+SIZE (JFlex.jar) = 171538
+MD5 (java_cup.jar) = 26aef43b31cf3e0b581017e75a325b7b
+SIZE (java_cup.jar) = 97241
diff --git a/java/jflex/files/patch-Makefile b/java/jflex/files/patch-Makefile
index 6ae7f7ad203f..86a6f4679b92 100644
--- a/java/jflex/files/patch-Makefile
+++ b/java/jflex/files/patch-Makefile
@@ -1,23 +1,7 @@
-$FreeBSD$
-
---- src/Makefile.orig	Mon Oct  8 03:57:06 2001
-+++ src/Makefile	Thu Feb 19 11:11:04 2004
-@@ -1,16 +1,14 @@
- # you need JFlex 1.2.2 and CUP 0.10j or later for this Makefile to work
- 
- JFLEX     = jflex -skel skeleton.nested
--CUP       = java java_cup.Main 
-+CUP       = java -classpath ${JAVAJARDIR}/java_cup.jar java_cup.Main 
- 
--JAVAC     = javac -target 1.1 -bootclasspath /usr/lib/jdk1.1/lib/classes.zip
- #JAVAC     = jikes   
--JAR       = jar
- 
- DEST      = ../lib
- 
- # jdk 1.2 
--CLPATH    = -classpath /usr/lib/java/jre/lib/rt.jar:.
-+CLPATH    = -classpath ${JAVA_CLASSES}:.
- 
- # jdk 1.1
- #CLPATH    = -classpath /usr/lib/java/lib/classes.zip:.
+--- src/Makefile.orig	Mon May  3 23:23:09 2004
++++ src/Makefile	Mon May  3 23:20:03 2004
+@@ -0,0 +1,4 @@
++# Makefile to wrap a call to ant
++
++all:
++	${SETENV} CLASSPATH=${DISTDIR}/JFlex.jar:${DISTDIR}/java_cup.jar:${JAVAJARDIR}/junit.jar:. ${LOCALBASE}/bin/ant jar
diff --git a/java/jflex/files/patch-jflex b/java/jflex/files/patch-jflex
index 29ddff094b62..3ea64aef137a 100644
--- a/java/jflex/files/patch-jflex
+++ b/java/jflex/files/patch-jflex
@@ -1,13 +1,14 @@
-$FreeBSD$
-
---- bin/jflex.orig	Mon Oct  1 04:18:48 2001
-+++ bin/jflex	Wed Feb 18 12:19:00 2004
+--- bin/jflex.orig	Mon May  3 23:06:29 2004
++++ bin/jflex	Mon May  3 23:11:12 2004
 @@ -1,51 +1,19 @@
 -#! /bin/bash 
 +#!/bin/sh 
  #
--#     JFlex start script $Revision: 1.16 $
--#
+-#     JFlex start script $Revision: 2.0 $
++# Replacement for the script that came with JFlex
++# because bash is not necessarily on a FreeBSD
++# machine. Also, we know where the jar is.
+ #
 -# if Java is not in your binary path, you need to supply its
 -# location in this script. The script automatically finds 
 -# JFLEX_HOME when called directly, via binary path, or symbolic
@@ -47,22 +48,16 @@ $FreeBSD$
 -JFLEX_HOME=${PRG}/.. 
 -
 -# --------------------------------------------------------------------
--
++# Conor McDermottroe <ports@mcdermottroe.com>
+ 
 -export CLASSPATH
 -CLASSPATH=$JFLEX_HOME/lib/JFlex.jar
--
--$JAVA JFlex.Main $@
-+# Replacement for the script that came with JFlex
-+# because bash is not necessarily on a FreeBSD
-+# machine. Also, we know where the jar is.
-+# 
-+# Conor McDermottroe <ports@mcdermottroe.com>
-+
 +# Allow the user to override where JFlex.jar lives
 +if [ -z "$JAVAJARDIR" ]; then
 +	JAVAJARDIR=%%JAVAJARDIR%%
 +fi
-+
+ 
+-$JAVA JFlex.Main $@
 +# Allow the user to specify which java interpreter to use
 +if [ -z "$JAVA" ]; then
 +	JAVA="`which javavm`"
diff --git a/java/jflex/pkg-plist b/java/jflex/pkg-plist
index 4db29dd8f78a..0cf411b947ef 100644
--- a/java/jflex/pkg-plist
+++ b/java/jflex/pkg-plist
@@ -39,6 +39,7 @@ bin/jflex
 %%EXAMPLESDIR%%/interpreter/Tparlist.java
 %%EXAMPLESDIR%%/interpreter/Tprogram.java
 %%EXAMPLESDIR%%/interpreter/Tuminus.java
+%%EXAMPLESDIR%%/interpreter/build.xml
 %%EXAMPLESDIR%%/interpreter/example.as
 %%EXAMPLESDIR%%/interpreter/parser.cup
 %%EXAMPLESDIR%%/interpreter/scanner.flex
@@ -47,17 +48,23 @@ bin/jflex
 %%EXAMPLESDIR%%/java/JavaSymbol.java
 %%EXAMPLESDIR%%/java/Makefile
 %%EXAMPLESDIR%%/java/README
+%%EXAMPLESDIR%%/java/TestLexer.java
 %%EXAMPLESDIR%%/java/java.flex
 %%EXAMPLESDIR%%/java/java12.cup
+%%EXAMPLESDIR%%/java/lexer-output.good
 %%EXAMPLESDIR%%/java/unicode.flex
 @dirrm %%EXAMPLESDIR%%/java
+%%EXAMPLESDIR%%/simple/Makefile
 %%EXAMPLESDIR%%/simple/README
 %%EXAMPLESDIR%%/simple/Utility.java
 %%EXAMPLESDIR%%/simple/Yytoken.java
+%%EXAMPLESDIR%%/simple/output.good
 %%EXAMPLESDIR%%/simple/simple.flex
+%%EXAMPLESDIR%%/simple/test.txt
 @dirrm %%EXAMPLESDIR%%/simple
 %%EXAMPLESDIR%%/standalone/Makefile
 %%EXAMPLESDIR%%/standalone/README
+%%EXAMPLESDIR%%/standalone/build.xml
 %%EXAMPLESDIR%%/standalone/sample.inp
 %%EXAMPLESDIR%%/standalone/standalone.flex
 @dirrm %%EXAMPLESDIR%%/standalone