From owner-freebsd-ports@FreeBSD.ORG  Mon Jul 26 19:47:22 2004
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A587516A4CE; Mon, 26 Jul 2004 19:47:22 +0000 (GMT)
Received: from diomedes.noc.ntua.gr (diomedes.noc.ntua.gr [147.102.222.220])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id DC19F43D2F; Mon, 26 Jul 2004 19:47:21 +0000 (GMT)
	(envelope-from past@netmode.ntua.gr)
Received: from netmode.ece.ntua.gr (dolly.netmode.ece.ntua.gr [147.102.13.10])
	i6QJlKjD071858;	Mon, 26 Jul 2004 22:47:20 +0300 (EEST)
	(envelope-from past@netmode.ntua.gr)
Received: from [147.102.229.10] (ppp-229-010.dialup.ntua.gr [147.102.229.10])
	by netmode.ece.ntua.gr (8.12.10/8.12.8) with ESMTP id i6QJlJNC096462;
	Mon, 26 Jul 2004 22:47:20 +0300 (EEST)
	(envelope-from past@netmode.ntua.gr)
Message-ID: <41055FC2.4070909@netmode.ntua.gr>
Date: Mon, 26 Jul 2004 22:47:14 +0300
From: Panagiotis Astithas <past@netmode.ntua.gr>
User-Agent: Mozilla Thunderbird 0.7 (X11/20040702)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Jeremy Faulkner <gldisater@gldis.ca>
References: <20040725171544.71dc613e.nork@FreeBSD.org>
	<20040726.130935.74732878.sugitk@rio.odn.ne.jp> <41054B7D.6050206@gldis.ca>
In-Reply-To: <41054B7D.6050206@gldis.ca>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
cc: ports@freebsd.org
cc: nork@freebsd.org
cc: freebsd-java@freebsd.org
Subject: Re: HEADS UP: Eclipse 3.0 updated
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jul 2004 19:47:22 -0000

Jeremy Faulkner wrote:
> SUGIMURA Takashi wrote:
> 
>> I made Eclipse 3.0 from the newest ports, and I found a problem.
>>
>> At /usr/local/eclipse/eclipse,
>> DEFAULT_JAVA_HOME and ECLIPSE_HOME are not set.
>>
>> ---
>> SUGIMURA Takashi <sugitk@rio.odn.ne.jp>
> 
> 
> Patch attached.
> 
> 
> ------------------------------------------------------------------------
> 
> --- eclipse/files/Makefile	Sun Jul 25 07:30:36 2004
> +++ eclipse.mod/files/Makefile	Mon Jul 26 14:09:47 2004
> @@ -59,7 +59,7 @@
>  		$(ANT) -Djava.home=$(JAVA_HOME)
>  	@$(ECHO) "===> Building libcore."
>  	cd plugins/org.eclipse.core.resources.freebsd/src && \
> -		env JDK_INCLUDE="/usr/local/jdk1.4.2/include -I/usr/local/jdk1.4.2/include/freebsd" $(GMAKE) && \
> +		env JDK_INCLUDE="$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd" $(GMAKE) && \
>  		$(CP) *.so ../../org.eclipse.core.resources.freebsd/os/freebsd/x86
>  
>  java:		build-install
> @@ -74,8 +74,8 @@
>  	$(UNZIP_CMD) result/$(ECLIPSE_OS)-$(ECLIPSE_WS)-$(ECLIPSE_ARCH)-sdk.zip -d $(PREFIX)
>  	@$(ECHO) "===> Installing a shell script..."
>  	@$(SED) \
> -	-e "/%%ECLIPSE_HOME%%/s//$(PORTDESTDIR:S/\//\\\//g)/g" \
> -	-e "/%%JAVA_HOME%%/s//$(JAVA_HOME:S/\//\\\//g)/g" \
> +	-e "s+%%ECLIPSE_HOME%%+$(PORTDESTDIR)+g" \
> +	-e "s+%%JAVA_HOME%%+$(JAVA_HOME)+g" \
>  	eclipse.in > eclipse.tmp
>  	$(BSD_INSTALL_SCRIPT) eclipse.tmp $(PREFIX)/bin/eclipse

Nice catch! I can't test it right now, but if it works I like it.