ports/66231: [maintainer update] java/jflex 1.3.5 -> 1.4
Conor McDermottroe
ports at mcdermottroe.com
Mon May 3 23:40:26 UTC 2004
>Number: 66231
>Category: ports
>Synopsis: [maintainer update] java/jflex 1.3.5 -> 1.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon May 03 16:40:24 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Conor McDermottroe
>Release: FreeBSD 5.2.1-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD mcdermc 5.2.1-RELEASE-p4 FreeBSD 5.2.1-RELEASE-p4 #0: Tue Mar 30 00:31:33 IST 2004 root at mcdermc:/usr/obj/usr/src/sys/MCDERMC i386
>Description:
Update of java/jflex from 1.3.5 to 1.4
>How-To-Repeat:
>Fix:
diff -ruN jflex.bak/Makefile jflex/Makefile
--- jflex.bak/Makefile Tue Apr 13 14:15:45 2004
+++ jflex/Makefile Tue May 4 00:20:41 2004
@@ -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 at mcdermottroe.com
COMMENT= The Fast Lexical Analyser Generator for Java[tm]
@@ -16,10 +21,11 @@
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 -ruN jflex.bak/distinfo jflex/distinfo
--- jflex.bak/distinfo Tue Apr 13 14:15:45 2004
+++ jflex/distinfo Mon May 3 22:55:52 2004
@@ -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 -ruN jflex.bak/files/patch-Makefile jflex/files/patch-Makefile
--- jflex.bak/files/patch-Makefile Tue Apr 13 14:15:45 2004
+++ jflex/files/patch-Makefile Tue May 4 00:20:54 2004
@@ -1,23 +1,7 @@
-$FreeBSD: ports/java/jflex/files/patch-Makefile,v 1.4 2004/02/19 18:14:45 glewis Exp $
-
---- 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 -ruN jflex.bak/files/patch-jflex jflex/files/patch-jflex
--- jflex.bak/files/patch-jflex Tue Apr 13 14:15:45 2004
+++ jflex/files/patch-jflex Mon May 3 23:12:04 2004
@@ -1,13 +1,14 @@
-$FreeBSD: ports/java/jflex/files/patch-jflex,v 1.2 2004/02/19 17:33:29 glewis Exp $
-
---- 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 @@
-JFLEX_HOME=${PRG}/..
-
-# --------------------------------------------------------------------
--
++# Conor McDermottroe <ports at 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 at 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 -ruN jflex.bak/pkg-plist jflex/pkg-plist
--- jflex.bak/pkg-plist Tue Apr 13 14:15:45 2004
+++ jflex/pkg-plist Mon May 3 23:55:37 2004
@@ -39,6 +39,7 @@
%%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 @@
%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list