HEADS UP: Eclipse 3.0 updated

[Jeremy Faulkner]

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 at rio.odn.ne.jp>

Patch attached.

-- 
Jeremy Faulkner				http://www.gldis.ca
-------------- next part --------------
--- 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