From owner-freebsd-ports@FreeBSD.ORG  Mon Jul 26 18:16:58 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 937F416A4CE; Mon, 26 Jul 2004 18:16:58 +0000 (GMT)
Received: from gldis.ca (constans.gldis.ca [66.11.169.73])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id F407743D41; Mon, 26 Jul 2004 18:16:57 +0000 (GMT)
	(envelope-from gldisater@gldis.ca)
Received: from [IPv6:::1] (localhost [127.0.0.1])
	by gldis.ca (8.12.11/8.12.11) with ESMTP id i6QIV1u4073174;
	Mon, 26 Jul 2004 14:31:01 -0400 (EDT)
	(envelope-from gldisater@gldis.ca)
Message-ID: <41054B7D.6050206@gldis.ca>
Date: Mon, 26 Jul 2004 14:20:45 -0400
From: Jeremy Faulkner <gldisater@gldis.ca>
User-Agent: Mozilla Thunderbird 0.7 (X11/20040626)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: freebsd-java@freebsd.org
References: <20040725171544.71dc613e.nork@FreeBSD.org>
	<20040726.130935.74732878.sugitk@rio.odn.ne.jp>
In-Reply-To: <20040726.130935.74732878.sugitk@rio.odn.ne.jp>
Content-Type: multipart/mixed;
 boundary="------------090509080500090604010900"
X-Virus-Scanned: ClamAV version 'clamd / ClamAV version 0.65', clamav-milter
	version '0.60p'
cc: ports@freebsd.org
cc: nork@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 18:16:58 -0000

This is a multi-part message in MIME format.
--------------090509080500090604010900
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

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.

-- 
Jeremy Faulkner				http://www.gldis.ca

--------------090509080500090604010900
Content-Type: text/plain;
 name="eclipse-files-Makefile.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="eclipse-files-Makefile.diff"

--- 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
 

--------------090509080500090604010900--