From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 11 17:00:41 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 442AA16A4CE for ; Sun, 11 Jan 2004 17:00:41 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7504943D58 for ; Sun, 11 Jan 2004 17:00:34 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0C10YFR098241 for ; Sun, 11 Jan 2004 17:00:34 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0C10YST098240; Sun, 11 Jan 2004 17:00:34 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 11 Jan 2004 17:00:34 -0800 (PST) Resent-Message-Id: <200401120100.i0C10YST098240@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Conor McDermottroe Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 968D516A4CE for ; Sun, 11 Jan 2004 16:58:27 -0800 (PST) Received: from mail07.svc.cra.dublin.eircom.net (mail07.svc.cra.dublin.eircom.net [159.134.118.23]) by mx1.FreeBSD.org (Postfix) with SMTP id 5862043D1F for ; Sun, 11 Jan 2004 16:58:25 -0800 (PST) (envelope-from conor@mcdermottroe.com) Received: (qmail 10737 messnum 921817 invoked from network[194.125.175.22/ts14-022.dublin.indigo.ie]); 12 Jan 2004 00:58:23 -0000 Received: from ts14-022.dublin.indigo.ie (HELO mcdermc.mcdermottroe.com) (194.125.175.22) by mail07.svc.cra.dublin.eircom.net (qp 10737) with SMTP; 12 Jan 2004 00:58:23 -0000 Received: by mcdermc.mcdermottroe.com (Postfix, from userid 1001) id 6FE1A255D; Mon, 12 Jan 2004 00:57:16 +0000 (GMT) Message-Id: <20040112005716.6FE1A255D@mcdermc.mcdermottroe.com> Date: Mon, 12 Jan 2004 00:57:16 +0000 (GMT) From: Conor McDermottroe To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/61225: [PATCH] Update java/jlex from 1.2.3 to 1.2.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Conor McDermottroe List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2004 01:00:41 -0000 >Number: 61225 >Category: ports >Synopsis: [PATCH] Update java/jlex from 1.2.3 to 1.2.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jan 11 17:00:33 PST 2004 >Closed-Date: >Last-Modified: >Originator: Conor McDermottroe >Release: FreeBSD 5.1-RELEASE-p11 i386 >Organization: >Environment: System: FreeBSD mcdermc 5.1-RELEASE-p11 FreeBSD 5.1-RELEASE-p11 #8: Sun Jan 4 19:28:08 GMT 2004 root@mcdermc:/usr/obj/usr/src/sys/MCDERMC i386 >Description: This patch updates java/jlex from 1.2.3 to 1.2.6. JLex classes are now put in a JAR. >How-To-Repeat: >Fix: diff -ruN jlex.bak/Makefile jlex/Makefile --- jlex.bak/Makefile Wed Jan 7 22:41:30 2004 +++ jlex/Makefile Sun Jan 11 23:39:41 2004 @@ -6,9 +6,9 @@ # PORTNAME= jlex -PORTVERSION= 1.2.3 +PORTVERSION= 1.2.6 CATEGORIES= java -MASTER_SITES= http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.3/ +MASTER_SITES= http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.6/ DISTNAME= Main EXTRACT_SUFX= .java EXTRACT_ONLY= # @@ -16,14 +16,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A lexical analyzer generator, written for Java, in Java -BUILD_DEPENDS= ${LOCALBASE}/${JAVADIR}/bin/java:${PORTSDIR}/java/jdk11 - -JAVADIR= jdk1.1.8 -JAVAC= ${LOCALBASE}/${JAVADIR}/bin/javac - +USE_JAVA= 1.1+ +NEED_JAVAC= yes NO_WRKSUBDIR= yes -PLIST_SUB= JAVADIR=${JAVADIR} +PLIST_SUB= JAVAJARDIR=${JAVAJARDIR:S|^${PREFIX}/||} do-extract: @${RM} -rf ${WRKDIR} @@ -31,13 +28,14 @@ @${CP} ${DISTDIR}/Main.java ${WRKDIR} do-build: - @${JAVAC} ${WRKDIR}/Main.java + @cd ${WRKDIR} && \ + ${JAVAC} -d . Main.java && \ + ${JAR} cf ${PORTNAME}.jar JLex/*.class do-install: - @${MKDIR} ${PREFIX}/${JAVADIR}/jlex - @${INSTALL_SCRIPT} ${WRKDIR}/*.class ${PREFIX}/${JAVADIR}/jlex + @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.jar ${JAVAJARDIR} post-install: - @${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}: -e s:jdk1.1.8:${JAVADIR}: + @${SED} s:JAVAJARDIR:${JAVAJARDIR}: < ${PKGMESSAGE} .include diff -ruN jlex.bak/distinfo jlex/distinfo --- jlex.bak/distinfo Wed Jan 7 22:41:30 2004 +++ jlex/distinfo Wed Jan 7 22:44:25 2004 @@ -1 +1 @@ -MD5 (Main.java) = 2845da1175e06a50fca26f62840caaa8 +MD5 (Main.java) = fe0cff5db3e2f0f5d67a153cf6c783af diff -ruN jlex.bak/pkg-message jlex/pkg-message --- jlex.bak/pkg-message Wed Jan 7 22:41:30 2004 +++ jlex/pkg-message Thu Jan 8 13:37:55 2004 @@ -1,4 +1,2 @@ - -JLex is installed into /usr/local/jdk1.1.8/jlex. +JLex is installed into JAVAJARDIR. See http://www.cs.princeton.edu/~appel/modern/java/JLex. - diff -ruN jlex.bak/pkg-plist jlex/pkg-plist --- jlex.bak/pkg-plist Wed Jan 7 22:41:30 2004 +++ jlex/pkg-plist Sun Jan 11 23:39:57 2004 @@ -1,21 +1 @@ -%%JAVADIR%%/jlex/CAccept.class -%%JAVADIR%%/jlex/CAcceptAnchor.class -%%JAVADIR%%/jlex/CAlloc.class -%%JAVADIR%%/jlex/CBunch.class -%%JAVADIR%%/jlex/CDTrans.class -%%JAVADIR%%/jlex/CDfa.class -%%JAVADIR%%/jlex/CEmit.class -%%JAVADIR%%/jlex/CError.class -%%JAVADIR%%/jlex/CInput.class -%%JAVADIR%%/jlex/CLexGen.class -%%JAVADIR%%/jlex/CMakeNfa.class -%%JAVADIR%%/jlex/CMinimize.class -%%JAVADIR%%/jlex/CNfa.class -%%JAVADIR%%/jlex/CNfa2Dfa.class -%%JAVADIR%%/jlex/CNfaPair.class -%%JAVADIR%%/jlex/CSet.class -%%JAVADIR%%/jlex/CSpec.class -%%JAVADIR%%/jlex/CUtility.class -%%JAVADIR%%/jlex/JavaLexBitSet.class -%%JAVADIR%%/jlex/Main.class -@dirrm %%JAVADIR%%/jlex +%%JAVAJARDIR%%/jlex.jar >Release-Note: >Audit-Trail: >Unformatted: