From conor@platinum.office.edgespace.net  Wed Aug  9 14:02:41 2006
Return-Path: <conor@platinum.office.edgespace.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 82DD416A4DF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Aug 2006 14:02:41 +0000 (UTC)
	(envelope-from conor@platinum.office.edgespace.net)
Received: from bigben2.bytemark.co.uk (bigben2.bytemark.co.uk [80.68.81.132])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 218C143D45
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Aug 2006 14:02:40 +0000 (GMT)
	(envelope-from conor@platinum.office.edgespace.net)
Received: from edgespace.vm.bytemark.co.uk ([80.68.90.21])
	by bigben2.bytemark.co.uk with esmtp (Exim 4.52)
	id 1GAods-0008Gn-AY
	for FreeBSD-gnats-submit@freebsd.org; Wed, 09 Aug 2006 14:02:40 +0000
Received: from localhost ([127.0.0.1] helo=platinum.office.edgespace.net)
	by edgespace.vm.bytemark.co.uk with esmtp 
	(Cipher TLSv1:DES-CBC3-SHA:168) (Exim 3.35 #1 (Debian))
	id 1GAogW-0007U0-00
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 09 Aug 2006 15:05:24 +0100
Received: (from conor@localhost)
	by platinum.office.edgespace.net (8.13.6/8.13.6/Submit) id k79E2bNq071699;
	Wed, 9 Aug 2006 15:02:37 +0100 (IST)
	(envelope-from conor)
Message-Id: <200608091402.k79E2bNq071699@platinum.office.edgespace.net>
Date: Wed, 9 Aug 2006 15:02:37 +0100 (IST)
From: Conor McDermottroe <ports@mcdermottroe.com>
Reply-To: Conor McDermottroe <ports@mcdermottroe.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER UPDATE] [PATCH] Fix the build for java/jflex
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         101712
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] [PATCH] Fix the build for java/jflex
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hq
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 09 14:10:10 GMT 2006
>Closed-Date:    Tue Aug 22 20:34:57 GMT 2006
>Last-Modified:  Tue Aug 22 20:34:57 GMT 2006
>Originator:     Conor McDermottroe
>Release:        FreeBSD 6.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD platinum.office.edgespace.net 6.1-RELEASE-p2 FreeBSD 6.1-RELEASE-p2 #4: Tue Jun 20 17:03:05 IST 2006 root@platinum.office.edgespace.net:/usr/obj/usr/src/sys/PLATINUM i386


	
>Description:
	The build of JFlex needs to be bootstrapped with a pre-built version of
	JFlex. The previous method of handling this in the port didn't actually
	work, unfortunately, since I had a previous install of JFlex when I tested
	it I didn't notice.

	The patch below should remedy this situation.
>How-To-Repeat:
	
>Fix:

diff -ruN jflex.orig/Makefile jflex/Makefile
--- jflex.orig/Makefile	Wed Aug  9 14:37:15 2006
+++ jflex/Makefile	Wed Aug  9 14:57:04 2006
@@ -24,13 +24,17 @@
 USE_ANT=	yes
 BUILD_WRKSRC=	${WRKSRC}/src
 ALL_TARGET=	jar
-MAKE_ENV+=	CLASSPATH="${DISTDIR}/JFlex.jar:${DISTDIR}/java_cup.jar:${JAVALIBDIR}/junit.jar"
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
 
 SUB_FILES=	jflex.sh
+
+post-extract:
+	${MKDIR} ${WRKSRC}/tools
+	${CP} ${DISTDIR}/JFlex.jar ${WRKSRC}/tools/
+	${CP} ${DISTDIR}/java_cup.jar ${WRKSRC}/tools/
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/jflex.sh ${PREFIX}/bin/jflex
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->hq 
Responsible-Changed-By: hq 
Responsible-Changed-When: Sat Aug 12 22:41:33 UTC 2006 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=101712 
State-Changed-From-To: open->feedback 
State-Changed-By: hq 
State-Changed-When: Sat Aug 12 22:46:23 UTC 2006 
State-Changed-Why:  
Looks like junit.jar is still needed: 

[javac] /tmp/jflex/work/jflex-1.4.1/src/JFlex/tests/AllTests.java:23: package junit.framework does not exist 
[javac] import junit.framework.Test; 
[javac]                        ^ 


http://www.freebsd.org/cgi/query-pr.cgi?pr=101712 

From: Conor McDermottroe <ports@mcdermottroe.com>
To: bug-followup@FreeBSD.org
Cc: hq@freebsd.org
Subject: Re: ports/101712: [MAINTAINER UPDATE] [PATCH] Fix the build for java/jflex
Date: Mon, 14 Aug 2006 14:08:24 +0100

 D'Oh! Mental note: always unset CLASSPATH before testing Java patches. :-)
 
 My apologies.
 
 The following patch should work:
 
 diff -ruN jflex.orig/Makefile jflex/Makefile
 --- jflex.orig/Makefile Mon Aug 14 13:59:15 2006
 +++ jflex/Makefile  Mon Aug 14 14:00:12 2006
 @@ -24,13 +24,18 @@
  USE_ANT=   yes
  BUILD_WRKSRC=  ${WRKSRC}/src
  ALL_TARGET=    jar
 -MAKE_ENV+=
 CLASSPATH="${DISTDIR}/JFlex.jar:${DISTDIR}/java_cup.jar:${JAVALIBDIR}/junit.jar"
 +MAKE_ENV+= CLASSPATH="${JAVALIBDIR}/junit.jar"
 
  .if !defined(NOPORTDOCS)
  PORTDOCS=  *
  .endif
 
  SUB_FILES= jflex.sh
 +
 +post-extract:
 +   ${MKDIR} ${WRKSRC}/tools
 +   ${CP} ${DISTDIR}/JFlex.jar ${WRKSRC}/tools/
 +   ${CP} ${DISTDIR}/java_cup.jar ${WRKSRC}/tools/
 
  do-install:
     ${INSTALL_SCRIPT} ${WRKDIR}/jflex.sh ${PREFIX}/bin/jflex
 
 
State-Changed-From-To: feedback->open 
State-Changed-By: hq 
State-Changed-When: Mon Aug 14 15:30:09 UTC 2006 
State-Changed-Why:  
Feedback received: new patch submitted. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=101712 
State-Changed-From-To: open->closed 
State-Changed-By: hq 
State-Changed-When: Tue Aug 22 20:34:44 UTC 2006 
State-Changed-Why:  
Patch commited. 

Thanks for your contribution! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=101712 
>Unformatted:
