. Update to 3.6.2.

Submitted by:	tg@

2 files changed, 32 insertions, 15 deletions

diff --git a/java/eclipse/files/freebsd-support.patch b/java/eclipse/files/freebsd-support.patch
index 06fae9851f59..324f55064e46 100644
--- a/java/eclipse/files/freebsd-support.patch
+++ b/java/eclipse/files/freebsd-support.patch
@@ -2998,7 +2998,7 @@ $FreeBSD$
 @@ -114,7 +116,13 @@
  fi
  
- if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
+ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then
 -	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
 +	if [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
 +		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
@@ -3232,7 +3232,7 @@ $FreeBSD$
 +Bundle-Name: %fragmentName
 +Bundle-Vendor: %providerName
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true
-+Bundle-Version: 3.6.1.qualifier
++Bundle-Version: 3.6.2.qualifier
 +Bundle-ManifestVersion: 2
 +Bundle-Localization: fragment
 +Export-Package: 
@@ -5055,7 +5055,7 @@ $FreeBSD$
 +	<property name="swt.arch" value="x86" />
 +
 +	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
-+	<property name="version.suffix" value="3.6.1" />
++	<property name="version.suffix" value="3.6.2" />
 +
 +	<import file="../org.eclipse.swt/buildFragment.xml"/>
 +</project>
@@ -5113,7 +5113,7 @@ $FreeBSD$
 +Bundle-Name: %fragmentName
 +Bundle-Vendor: %providerName
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true
-+Bundle-Version: 3.5.0.qualifier
++Bundle-Version: 3.6.2.qualifier
 +Bundle-ManifestVersion: 2
 +Bundle-Localization: fragment
 +Export-Package: 
@@ -6936,7 +6936,7 @@ $FreeBSD$
 +	<property name="swt.arch" value="x86_64" />
 +
 +	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
-+	<property name="version.suffix" value="3.6.1" />
++	<property name="version.suffix" value="3.6.2" />
 +
 +	<import file="../org.eclipse.swt/buildFragment.xml"/>
 +</project>
@@ -7504,19 +7504,19 @@ $FreeBSD$
 +}
 --- build/eclipse-3.6.1-src/pluginVersions.properties~	Fri Oct  1 17:18:03 2010
 +++ build/eclipse-3.6.1-src/pluginVersions.properties	Wed Oct 20 20:19:42 2010
-@@ -33,6 +33,7 @@
- org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20100810
+@@ -34,6 +34,7 @@
+ org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20101019_1345
  org.eclipse.equinox.http,0.0.0=v20100503
- org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3655c
-+org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3655c
- org.eclipse.swt.photon.qnx.x86,0.0.0=v3655c
+ org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3659b
++org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3659b
+ org.eclipse.swt.photon.qnx.x86,0.0.0=v3659b
  org.eclipse.equinox.p2.ui.admin,0.0.0=v20100503
  org.eclipse.equinox.weaving.caching.j9,0.0.0=v20100503
-@@ -244,6 +245,7 @@
- org.eclipse.swt.examples,0.0.0=v3655c
+@@ -245,6 +246,7 @@
+ org.eclipse.swt.examples,0.0.0=v3659b
  org.eclipse.cvs,0.0.0=v20100414
- org.eclipse.swt.gtk.linux.x86,0.0.0=v3655c
-+org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3655c
+ org.eclipse.swt.gtk.linux.x86,0.0.0=v3659b
++org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3659b
  org.eclipse.equinox.log,0.0.0=v20100503
  org.eclipse.equinox.jmx.client,0.0.0=v20100503
  org.eclipse.ui.win32,0.0.0=I20100509-0800
diff --git a/java/eclipse/files/patch-eclipse-build b/java/eclipse/files/patch-eclipse-build
index 38361393d3e3..f85e592a15f1 100644
--- a/java/eclipse/files/patch-eclipse-build
+++ b/java/eclipse/files/patch-eclipse-build
@@ -241,7 +241,7 @@ $FreeBSD$
  buildTag=vM20100211-1343
 -label=3.6.0
 -bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
-+label=3.6.1
++label=3.6.2
 +bootclasspath=%%BOOTCLASSPATH%%
  #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
  
@@ -309,3 +309,20 @@ $FreeBSD$
 +Exec=%%PORTNAME%%
  Terminal=false
  Categories=Development;IDE;Java;
+--- eclipse-build-0.6.1/dependencies.properties.orig	2010-08-11 22:29:29.000000000 +0200
++++ eclipse-build-0.6.1/dependencies.properties	2011-04-28 09:23:04.000000000 +0200
+@@ -2,11 +2,11 @@
+ com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
+ javax.servlet_2.5.0.v200910301333.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
+ javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar:/usr/share/java/jsp-api-2.0.jar
+-org.apache.commons.codec_1.3.0.v20080530-1600.jar=/usr/share/java/commons-codec.jar
+-org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
++org.apache.commons.codec_1.3.0.v20100518-1140.jar=/usr/share/java/commons-codec.jar
++org.apache.commons.el_1.0.0.v201004212143.jar=/usr/share/java/commons-el.jar
+ org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar
+ org.apache.commons.logging_1.0.4.v201005080501.jar=/usr/share/java/commons-logging.jar
+-org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar
++org.apache.jasper_5.5.17.v201004212143.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar
+ org.apache.lucene_1.9.1.v20100518-1140.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
+ org.apache.lucene.analysis_1.9.1.v20100518-1140.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
+ org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar