Update to 3.1.2.

Submitted by:	tmclaugh
References:	http://lists.freebsd.org/pipermail/freebsd-eclipse/2006-January/000327.html
Noticed by:	Panagiotis Astithas <past@ebs.gr>

6 files changed, 36 insertions, 36 deletions

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 665928d91108..6e2eea4f3b11 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	eclipse
-PORTVERSION=	3.1.1
-PORTREVISION=	3
+PORTVERSION=	3.1.2
+PORTREVISION=	0
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200509290840
+MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200601181600
 DISTNAME=	${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo
index 74adfd2c3bf3..8ae795ce941b 100644
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,3 +1,3 @@
-MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.1.1.zip) = 0d78d5f8afe767014a1cc69ee8c20869
-SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.1.1.zip) = d7b3d24e2e9f4b15a4b7ab08ab8c0ebf636acccd3b855dd7ce3242841a16326f
-SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.1.1.zip) = 66272356
+MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.1.2.zip) = f2c8066151de14c5ccdf420266ce9f39
+SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.1.2.zip) = 31233332f205a197a42aafdc4f15a4f38eb5e4be19ac8a7192492ab8a21324a4
+SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.1.2.zip) = 66630673
diff --git a/java/eclipse/files/patch-features-platform-build.xml b/java/eclipse/files/patch-features-platform-build.xml
index 93402826e46a..538f383d8474 100644
--- a/java/eclipse/files/patch-features-platform-build.xml
+++ b/java/eclipse/files/patch-features-platform-build.xml
@@ -1,6 +1,6 @@
---- features/org.eclipse.platform/build.xml.orig	Thu Sep 29 15:51:39 2005
-+++ features/org.eclipse.platform/build.xml	Tue Oct  4 19:30:26 2005
-@@ -92,6 +92,11 @@
+--- features/org.eclipse.platform/build.xml.orig	Wed Jan 18 16:09:14 2006
++++ features/org.eclipse.platform/build.xml	Sun Jan 29 19:17:52 2006
+@@ -87,6 +87,11 @@
  			<property name="os" value="win32"/>
  			<property name="ws" value="win32"/>
  		</ant>
@@ -12,9 +12,9 @@
  		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources" target="${target}">
  			<property name="arch" value="x86"/>
  			<property name="os" value="win32"/>
-@@ -102,6 +107,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
+@@ -117,6 +122,11 @@
+ 			<property name="os" value="hpux"/>
+ 			<property name="ws" value="motif"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.freebsd" target="${target}">
 +			<property name="arch" value="x86"/>
@@ -25,11 +25,11 @@
  			<property name="arch" value="x86"/>
  			<property name="os" value="win32"/>
 @@ -346,7 +356,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.1" failonerror="true" overwrite="false">
+ 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.2" failonerror="true" overwrite="false">
  			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
  		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.freebsd,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.freebsd,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
+-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.freebsd,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.freebsd,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">
@@ -53,7 +53,7 @@
  	<target name="rootFileslinux_gtk_ppc">
  		<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/>
  		<copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true">
-@@ -405,6 +428,19 @@
+@@ -407,6 +430,19 @@
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> 
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> 
  	</target>
@@ -73,7 +73,7 @@
  	<target name="rootFileslinux_gtk_ia64">
  		<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/>
  		<copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true">
-@@ -429,6 +465,21 @@
+@@ -431,6 +467,21 @@
  		</copy>
  		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> 
  		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> 
diff --git a/java/eclipse/files/patch-features-platform-source-build.xml b/java/eclipse/files/patch-features-platform-source-build.xml
index 1f94bb21db5b..999ec9f46d96 100644
--- a/java/eclipse/files/patch-features-platform-source-build.xml
+++ b/java/eclipse/files/patch-features-platform-source-build.xml
@@ -1,7 +1,7 @@
---- features/org.eclipse.platform.source/build.xml.orig	Thu Sep 29 15:51:40 2005
-+++ features/org.eclipse.platform.source/build.xml	Tue Oct  4 19:56:03 2005
+--- features/org.eclipse.platform.source/build.xml.orig	Wed Jan 18 16:09:14 2006
++++ features/org.eclipse.platform.source/build.xml	Sun Jan 29 19:36:36 2006
 @@ -72,6 +72,21 @@
- 			<property name="os" value="linux"/>
+ 			<property name="os" value="hpux"/>
  			<property name="ws" value="motif"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.motif.x86" target="${target}">
@@ -23,11 +23,11 @@
  			<property name="arch" value="x86"/>
  			<property name="os" value="win32"/>
 @@ -136,7 +151,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.1" failonerror="true" overwrite="false">
+ 		<copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.2" failonerror="true" overwrite="false">
  			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
  		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp.source,3.1.1," pluginIds="org.eclipse.platform.doc.isv,3.1.1,org.eclipse.platform.source,3.1.1,org.eclipse.platform.source.linux.gtk.ia64,3.1.1,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.1,org.eclipse.platform.source.qnx.photon.x86,3.1.1,org.eclipse.platform.source.linux.gtk.ppc,3.1.1,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.1,org.eclipse.platform.source.hpux.motif.ia64,3.1.1,org.eclipse.platform.source.linux.gtk.x86_64,3.1.1,org.eclipse.platform.source.linux.gtk.ppc64,3.1.1,org.eclipse.platform.source.macosx.carbon.ppc,3.1.1,org.eclipse.platform.source.linux.gtk.x86,3.1.1,org.eclipse.platform.source.win32.win32.x86,3.1.1,org.eclipse.platform.source.linux.motif.x86,3.1.1,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp.source,3.1.1," pluginIds="org.eclipse.platform.doc.isv,3.1.1,org.eclipse.platform.source,3.1.1,org.eclipse.platform.source.linux.gtk.ia64,3.1.1,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.1,org.eclipse.platform.source.qnx.photon.x86,3.1.1,org.eclipse.platform.source.linux.gtk.ppc,3.1.1,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.1,org.eclipse.platform.source.hpux.motif.ia64,3.1.1,org.eclipse.platform.source.linux.gtk.x86_64,3.1.1,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.1,org.eclipse.platform.source.linux.gtk.ppc64,3.1.1,org.eclipse.platform.source.macosx.carbon.ppc,3.1.1,org.eclipse.platform.source.linux.gtk.x86,3.1.1,org.eclipse.platform.source.freebsd.gtk.x86,3.1.1,org.eclipse.platform.source.win32.win32.x86,3.1.1,org.eclipse.platform.source.linux.motif.x86,3.1.1,org.eclipse.platform.source.freebsd.motif.x86,3.1.1,"/>
+-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp.source,3.1.2," pluginIds="org.eclipse.platform.doc.isv,3.1.2,org.eclipse.platform.source,3.1.2,org.eclipse.platform.source.linux.gtk.ia64,3.1.2,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.2,org.eclipse.platform.source.qnx.photon.x86,3.1.2,org.eclipse.platform.source.linux.gtk.ppc,3.1.2,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.platform.source.hpux.motif.ia64,3.1.2,org.eclipse.platform.source.linux.gtk.x86_64,3.1.2,org.eclipse.platform.source.linux.gtk.ppc64,3.1.2,org.eclipse.platform.source.macosx.carbon.ppc,3.1.2,org.eclipse.platform.source.linux.gtk.x86,3.1.2,org.eclipse.platform.source.win32.win32.x86,3.1.2,org.eclipse.platform.source.linux.motif.x86,3.1.2,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp.source,3.1.2," pluginIds="org.eclipse.platform.doc.isv,3.1.2,org.eclipse.platform.source,3.1.2,org.eclipse.platform.source.linux.gtk.ia64,3.1.2,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.2,org.eclipse.platform.source.qnx.photon.x86,3.1.2,org.eclipse.platform.source.linux.gtk.ppc,3.1.2,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.platform.source.hpux.motif.ia64,3.1.2,org.eclipse.platform.source.linux.gtk.x86_64,3.1.2,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.2,org.eclipse.platform.source.linux.gtk.ppc64,3.1.2,org.eclipse.platform.source.macosx.carbon.ppc,3.1.2,org.eclipse.platform.source.linux.gtk.x86,3.1.2,org.eclipse.platform.source.freebsd.gtk.x86,3.1.2,org.eclipse.platform.source.win32.win32.x86,3.1.2,org.eclipse.platform.source.linux.motif.x86,3.1.2,org.eclipse.platform.source.freebsd.motif.x86,3.1.2,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">
diff --git a/java/eclipse/files/patch-features-rcp-build.xml b/java/eclipse/files/patch-features-rcp-build.xml
index 40349d730fe5..583292602655 100644
--- a/java/eclipse/files/patch-features-rcp-build.xml
+++ b/java/eclipse/files/patch-features-rcp-build.xml
@@ -1,5 +1,5 @@
---- features/org.eclipse.rcp/build.xml.orig	Tue Oct  4 22:48:28 2005
-+++ features/org.eclipse.rcp/build.xml	Tue Oct  4 22:48:33 2005
+--- features/org.eclipse.rcp/build.xml.orig	Wed Jan 18 16:09:14 2006
++++ features/org.eclipse.rcp/build.xml	Sun Jan 29 20:51:40 2006
 @@ -127,6 +127,21 @@
  			<property name="os" value="win32"/>
  			<property name="ws" value="win32"/>
@@ -23,11 +23,11 @@
  	<target name="all.features" depends="init">
  	</target>
 @@ -185,7 +200,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.rcp_3.1.1" failonerror="true" overwrite="false">
+ 		<copy todir="${feature.base}/features/org.eclipse.rcp_3.1.2" failonerror="true" overwrite="false">
  			<fileset dir="${basedir}" includes="feature.xml,license.html,epl-v10.html,feature.properties,eclipse_update_120.jpg"			/>
  		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.1,org.eclipse.osgi,3.1.1,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.1,org.eclipse.ui,3.1.1,org.eclipse.ui.workbench,3.1.1,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.1,org.eclipse.swt.gtk.linux.x86,3.1.1,org.eclipse.swt.gtk.solaris.sparc,3.1.1,org.eclipse.swt.gtk.linux.ppc,3.1.1,org.eclipse.swt.gtk.linux.x86_64,3.1.1,org.eclipse.swt.carbon.macosx.ppc,3.1.1,org.eclipse.swt.motif.aix.ppc,3.1.1,org.eclipse.swt.motif.hpux.PA_RISC,3.1.1,org.eclipse.swt.motif.linux.x86,3.1.1,org.eclipse.swt.gtk.linux.ia64,3.1.1,org.eclipse.swt.motif.solaris.sparc,3.1.1,org.eclipse.swt.photon.qnx.x86,3.1.1,org.eclipse.swt.motif.hpux.ia64_32,3.1.1,org.eclipse.rcp,3.1.0,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.1,org.eclipse.osgi,3.1.1,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.1,org.eclipse.ui,3.1.1,org.eclipse.ui.workbench,3.1.1,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.1,org.eclipse.swt.gtk.linux.x86,3.1.1,org.eclipse.swt.gtk.freebsd.x86,3.1.1,org.eclipse.swt.gtk.solaris.sparc,3.1.1,org.eclipse.swt.gtk.linux.ppc,3.1.1,org.eclipse.swt.gtk.linux.x86_64,3.1.1,org.eclipse.swt.gtk.freebsd.amd64,3.1.1,org.eclipse.swt.carbon.macosx.ppc,3.1.1,org.eclipse.swt.motif.aix.ppc,3.1.1,org.eclipse.swt.motif.hpux.PA_RISC,3.1.1,org.eclipse.swt.motif.linux.x86,3.1.1,org.eclipse.swt.motif.freebsd.x86,3.1.1,org.eclipse.swt.gtk.linux.ia64,3.1.1,org.eclipse.swt.motif.solaris.sparc,3.1.1,org.eclipse.swt.photon.qnx.x86,3.1.1,org.eclipse.swt.motif.hpux.ia64_32,3.1.1,org.eclipse.rcp,3.1.0,"/>
+-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.2,org.eclipse.osgi,3.1.2,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.1,org.eclipse.ui,3.1.2,org.eclipse.ui.workbench,3.1.2,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.2,org.eclipse.swt.gtk.linux.x86,3.1.1,org.eclipse.swt.gtk.solaris.sparc,3.1.1,org.eclipse.swt.gtk.linux.ppc,3.1.1,org.eclipse.swt.gtk.linux.x86_64,3.1.1,org.eclipse.swt.carbon.macosx.ppc,3.1.1,org.eclipse.swt.motif.aix.ppc,3.1.1,org.eclipse.swt.motif.hpux.PA_RISC,3.1.1,org.eclipse.swt.motif.linux.x86,3.1.1,org.eclipse.swt.gtk.linux.ia64,3.1.1,org.eclipse.swt.motif.solaris.sparc,3.1.1,org.eclipse.swt.photon.qnx.x86,3.1.1,org.eclipse.swt.motif.hpux.ia64_32,3.1.1,org.eclipse.rcp,3.1.0,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.2,org.eclipse.osgi,3.1.2,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.1,org.eclipse.ui,3.1.2,org.eclipse.ui.workbench,3.1.2,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.2,org.eclipse.swt.gtk.linux.x86,3.1.1,org.eclipse.swt.gtk.freebsd.x86,3.1.1,org.eclipse.swt.gtk.solaris.sparc,3.1.1,org.eclipse.swt.gtk.linux.ppc,3.1.1,org.eclipse.swt.gtk.linux.x86_64,3.1.1,org.eclipse.swt.gtk.freebsd.amd64,3.1.1,org.eclipse.swt.carbon.macosx.ppc,3.1.1,org.eclipse.swt.motif.aix.ppc,3.1.1,org.eclipse.swt.motif.hpux.PA_RISC,3.1.1,org.eclipse.swt.motif.linux.x86,3.1.1,org.eclipse.swt.motif.freebsd.x86,3.1.1,org.eclipse.swt.gtk.linux.ia64,3.1.1,org.eclipse.swt.motif.solaris.sparc,3.1.1,org.eclipse.swt.photon.qnx.x86,3.1.1,org.eclipse.swt.motif.hpux.ia64_32,3.1.1,org.eclipse.rcp,3.1.0,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">
diff --git a/java/eclipse/files/patch-features-rcp-source-build.xml b/java/eclipse/files/patch-features-rcp-source-build.xml
index c7e436e55319..c5a229c98f41 100644
--- a/java/eclipse/files/patch-features-rcp-source-build.xml
+++ b/java/eclipse/files/patch-features-rcp-source-build.xml
@@ -1,8 +1,8 @@
---- features/org.eclipse.rcp.source/build.xml.orig	Thu Sep 29 15:51:40 2005
-+++ features/org.eclipse.rcp.source/build.xml	Tue Oct  4 23:01:00 2005
-@@ -22,6 +22,21 @@
- 			<property name="os" value="hpux"/>
- 			<property name="ws" value="motif"/>
+--- features/org.eclipse.rcp.source/build.xml.orig	Wed Jan 18 16:09:14 2006
++++ features/org.eclipse.rcp.source/build.xml	Sun Jan 29 20:56:53 2006
+@@ -47,6 +47,21 @@
+ 			<property name="os" value="linux"/>
+ 			<property name="ws" value="gtk"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.amd64" target="${target}">
 +			<property name="arch" value="amd64"/>
@@ -23,11 +23,11 @@
  			<property name="arch" value="ppc"/>
  			<property name="os" value="macosx"/>
 @@ -135,7 +150,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.rcp.source_3.1.1" failonerror="true" overwrite="false">
+ 		<copy todir="${feature.base}/features/org.eclipse.rcp.source_3.1.2" failonerror="true" overwrite="false">
  			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
  		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.1,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.1,org.eclipse.rcp.source.linux.gtk.ia64,3.1.1,org.eclipse.rcp.source.qnx.photon.x86,3.1.1,org.eclipse.rcp.source.linux.gtk.ppc,3.1.1,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.1,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.1,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.1,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.1,org.eclipse.rcp.source.linux.gtk.x86,3.1.1,org.eclipse.rcp.source.aix.motif.ppc,3.1.1,org.eclipse.rcp.source.win32.win32.x86,3.1.1,org.eclipse.rcp.source.solaris.motif.sparc,3.1.1,org.eclipse.rcp.source.linux.motif.x86,3.1.1,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.1,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.1,org.eclipse.rcp.source.linux.gtk.ia64,3.1.1,org.eclipse.rcp.source.qnx.photon.x86,3.1.1,org.eclipse.rcp.source.linux.gtk.ppc,3.1.1,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.1,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.1,org.eclipse.rcp.source.freebsd.gtk.amd64,3.1.1,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.1,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.1,org.eclipse.rcp.source.linux.gtk.x86,3.1.1,org.eclipse.rcp.source.freebsd.gtk.x86,3.1.1,org.eclipse.rcp.source.aix.motif.ppc,3.1.1,org.eclipse.rcp.source.win32.win32.x86,3.1.1,org.eclipse.rcp.source.solaris.motif.sparc,3.1.1,org.eclipse.rcp.source.linux.motif.x86,3.1.1,org.eclipse.rcp.source.freebsd.motif.x86,3.1.1,"/>
+-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.2,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.2,org.eclipse.rcp.source.linux.gtk.ia64,3.1.2,org.eclipse.rcp.source.qnx.photon.x86,3.1.2,org.eclipse.rcp.source.linux.gtk.ppc,3.1.2,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.2,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.2,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.2,org.eclipse.rcp.source.linux.gtk.x86,3.1.2,org.eclipse.rcp.source.aix.motif.ppc,3.1.2,org.eclipse.rcp.source.win32.win32.x86,3.1.2,org.eclipse.rcp.source.solaris.motif.sparc,3.1.2,org.eclipse.rcp.source.linux.motif.x86,3.1.2,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.2,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.2,org.eclipse.rcp.source.linux.gtk.ia64,3.1.2,org.eclipse.rcp.source.qnx.photon.x86,3.1.2,org.eclipse.rcp.source.linux.gtk.ppc,3.1.2,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.2,org.eclipse.rcp.source.freebsd.gtk.amd64,3.1.2,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.2,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.2,org.eclipse.rcp.source.linux.gtk.x86,3.1.2,org.eclipse.rcp.source.freebsd.gtk.x86,3.1.2,org.eclipse.rcp.source.aix.motif.ppc,3.1.2,org.eclipse.rcp.source.win32.win32.x86,3.1.2,org.eclipse.rcp.source.solaris.motif.sparc,3.1.2,org.eclipse.rcp.source.linux.motif.x86,3.1.2,org.eclipse.rcp.source.freebsd.motif.x86,3.1.2,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">