o Fix build with KDE WITH_MOTIF. [1]

o Fix build on 4-stable. [2]
o Fix a problem expect using JDK1.4.2. [3]
o Respect CC/CXX. [4]
o Bump PORTREVISION Accordingly.

Reported by:	Jiawei Ye <leafy7382@gmail.com> [2]
		SUGIMURA Takashi <sugimura@jp.FreeBSD.org> [3]
		Jan-Peter Koopmann <Jan-Peter.Koopmann@seceidos.de> [4]
Submitted by:	Jeremy Faulkner <gldisater@gldis.ca> [1] [3]
		Fernan Aguero <fernan@iib.unsam.edu.ar> [2]
Reviewed by:	Panagiotis Astithas <past@ebs.gr> [1] [3] [4]
Pointy hat to:	myself [2]

6 files changed, 14 insertions, 15 deletions

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index da941d1c6b5f..76d0607618c7 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	eclipse
 PORTVERSION=	3.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200406251208
diff --git a/java/eclipse/files/Makefile b/java/eclipse/files/Makefile
index 6e7eba9f5863..95cd54717e5f 100644
--- a/java/eclipse/files/Makefile
+++ b/java/eclipse/files/Makefile
@@ -56,10 +56,10 @@ launcher:
 libupdate:
 	@$(ECHO) "===> Building libupdate."
 	cd plugins/org.eclipse.update.core.freebsd/src && \
-		$(ANT) -Djava.home=$(JAVA_HOME)
+		$(ANT) -Djava.home=$(JAVA_HOME) -DCC=$(CC)
 	@$(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 @@ install:
 	$(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
 
diff --git a/java/eclipse/files/make_freebsd.mak b/java/eclipse/files/make_freebsd.mak
index 8515026e3499..e2eeeb8fbefa 100644
--- a/java/eclipse/files/make_freebsd.mak
+++ b/java/eclipse/files/make_freebsd.mak
@@ -84,16 +84,16 @@ os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h
 make_gnome: $(GNOME_LIB)
 
 $(GNOME_LIB): $(GNOME_OBJECTS)
-	gcc -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS)
+	$(CC) -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS)
 
 gnome.o: gnome.c
-	gcc -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome.o gnome.c
+	$(CC) -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome.o gnome.c
 
 gnome_structs.o: gnome_structs.c
-	gcc -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_structs.o gnome_structs.c
+	$(CC) -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_structs.o gnome_structs.c
 
 gnome_stats.o: gnome_stats.c
-	gcc -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_stats.o gnome_stats.c
+	$(CC) -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_stats.o gnome_stats.c
 
 make_kde: $(KDE_LIB)
 
@@ -101,7 +101,7 @@ $(KDE_LIB): $(KDE_OBJS)
 	ld -o $@ $(KDE_OBJS) $(KDE_LIBS)
 
 $(KDE_OBJS): kde.cc
-	g++ $(KDE_CFLAGS) -o kde.o kde.cc
+	$(CXX) $(KDE_CFLAGS) -o kde.o kde.cc
 
 make_awt: $(AWT_LIB)
 
diff --git a/java/eclipse/files/make_gtk.mak b/java/eclipse/files/make_gtk.mak
index fc79ad54c74b..0e8d27898c0c 100644
--- a/java/eclipse/files/make_gtk.mak
+++ b/java/eclipse/files/make_gtk.mak
@@ -13,8 +13,7 @@
 
 include make_common.mak
 
-CC=gcc
-LD=gcc
+LD=$(CC)
 
 SWT_VERSION=$(maj_ver)$(min_ver)
 
diff --git a/java/eclipse/files/swt-motif-build.sh b/java/eclipse/files/swt-motif-build.sh
index aadb5a2da704..7e6ed8a8592f 100644
--- a/java/eclipse/files/swt-motif-build.sh
+++ b/java/eclipse/files/swt-motif-build.sh
@@ -37,7 +37,7 @@ case $OS in
             echo "Building FreeBSD version of SWT and GNOME DLLs."
             gmake -f make_freebsd.mak ${1} ${2} ${3} ${4}
             build_kde=`pkg_info -xc kdebase | grep "no packages match"`
-            if [ "$build_kde" = "" ]; then
+            if [ "$build_kde" != "" ]; then
                 echo "Building FreeBSD version of KDE DLL."
                 gmake -f make_freebsd.mak make_kde
             fi
diff --git a/java/eclipse/files/update-build.xml b/java/eclipse/files/update-build.xml
index e38591896af5..fc5007598f16 100644
--- a/java/eclipse/files/update-build.xml
+++ b/java/eclipse/files/update-build.xml
@@ -47,9 +47,9 @@
     <property name="header-path" value="${jdk-path}/include"/>
     <property name="header-freebsd-path" value="${header-path}/freebsd" />
 
-	<echo message="gcc33 -o  ${library-file} -shared -I${src-path} -I${header-path} -I${header-freebsd-path} ${library-file} -static -lc"/>
+	<echo message="${CC} -o  ${library-file} -shared -I${src-path} -I${header-path} -I${header-freebsd-path} ${library-file} -static -lc"/>
 
-    <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
+    <apply executable="${CC}" dest="${eclipse-home}/" parallel="false">
       <arg value="-o"/>
       <arg value="${library-file}"/>
       <arg value="-shared"/>