8 files changed, 71 insertions, 144 deletions

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 4f03c8a12bcd..75de40b78040 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	eclipse
-PORTVERSION=	3.1
-PORTREVISION=	3
+PORTVERSION=	3.1.1
+PORTREVISION=	0
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200506271435
+MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200509290840
 DISTNAME=	${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
@@ -120,7 +120,7 @@ do-install:
 	@${TAR} -xzf ${WRKSRC}/result/*.tar.gz -C ${PREFIX}
 	@${SED} \
 	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
-	  -e "s+%%JAVA_HOME%%+${JAVA_HOME}+g" \
+	  -e "s+%%PREFIX%%+${PREFIX}+g" \
 	  -e "s+%%X11BASE%%+${X11BASE}+g" \
 	  -e "s+%%BROWSER%%+${BROWSER}+g" \
 	${FILESDIR}/eclipse.in > ${WRKSRC}/eclipse.tmp
diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo
index fa7bd6999edf..331b1833e7f8 100644
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,2 +1,2 @@
-MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.1.zip) = 19ad65d52005da5eaa1d3687b3a50de2
-SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.1.zip) = 66241870
+MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.1.1.zip) = 0d78d5f8afe767014a1cc69ee8c20869
+SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.1.1.zip) = 66272356
diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in
index 99edc4af1451..815da2c79353 100644
--- a/java/eclipse/files/eclipse.in
+++ b/java/eclipse/files/eclipse.in
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-DEFAULT_JAVA_HOME=%%JAVA_HOME%%
+DEFAULT_JAVA_HOME=%%PREFIX%%
 ECLIPSE_HOME=%%ECLIPSE_HOME%%
 DEFAULT_JAVA_CMD=java
 export MOZILLA_FIVE_HOME=%%X11BASE%%/lib/%%BROWSER%%
diff --git a/java/eclipse/files/patch-features-platform-build.xml b/java/eclipse/files/patch-features-platform-build.xml
index 02c964e12473..93402826e46a 100644
--- a/java/eclipse/files/patch-features-platform-build.xml
+++ b/java/eclipse/files/patch-features-platform-build.xml
@@ -1,8 +1,8 @@
---- features/org.eclipse.platform/build.xml.orig	Mon Jun 27 21:52:50 2005
-+++ features/org.eclipse.platform/build.xml	Thu Jul 14 00:30:56 2005
+--- 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 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" target="${target}">
 +			<property name="arch" value="x86"/>
@@ -12,7 +12,7 @@
  		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources" target="${target}">
  			<property name="arch" value="x86"/>
  			<property name="os" value="win32"/>
-@@ -132,6 +137,11 @@
+@@ -102,6 +107,11 @@
  			<property name="os" value="linux"/>
  			<property name="ws" value="gtk"/>
  		</ant>
@@ -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.0" failonerror="true" overwrite="false">
+ 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.1" 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.0/feature.xml"  selfVersion="3.1.0" featureIds="org.eclipse.rcp,3.1.0," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,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.0,org.eclipse.osgi.util,3.1.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,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.0,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.0/feature.xml"  selfVersion="3.1.0" featureIds="org.eclipse.rcp,3.1.0," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,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.0,org.eclipse.osgi.util,3.1.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,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.0,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.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,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">
diff --git a/java/eclipse/files/patch-features-platform-source-build.xml b/java/eclipse/files/patch-features-platform-source-build.xml
index 3eb8270a1802..1f94bb21db5b 100644
--- a/java/eclipse/files/patch-features-platform-source-build.xml
+++ b/java/eclipse/files/patch-features-platform-source-build.xml
@@ -1,6 +1,6 @@
---- features/org.eclipse.platform.source/build.xml.orig	Mon Jun 27 21:52:51 2005
-+++ features/org.eclipse.platform.source/build.xml	Thu Jul 14 00:45:53 2005
-@@ -57,11 +57,21 @@
+--- 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
+@@ -72,6 +72,21 @@
  			<property name="os" value="linux"/>
  			<property name="ws" value="motif"/>
  		</ant>
@@ -9,23 +9,11 @@
 +			<property name="os" value="freebsd"/>
 +			<property name="ws" value="motif"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.gtk.x86" target="${target}">
- 			<property name="arch" value="x86"/>
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="${target}">
 +			<property name="arch" value="x86"/>
 +			<property name="os" value="freebsd"/>
 +			<property name="ws" value="gtk"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.hpux.motif.PA_RISC" target="${target}">
- 			<property name="arch" value="PA_RISC"/>
- 			<property name="os" value="hpux"/>
-@@ -72,6 +82,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.amd64" target="${target}">
 +			<property name="arch" value="amd64"/>
 +			<property name="os" value="freebsd"/>
@@ -34,33 +22,25 @@
  		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.doc.isv" target="${target}">
  			<property name="arch" value="x86"/>
  			<property name="os" value="win32"/>
-@@ -136,22 +151,28 @@
- 		<copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.0" failonerror="true" overwrite="false">
+@@ -136,7 +151,7 @@
+ 		<copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.1" 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.0/feature.xml"  selfVersion="3.1.0" featureIds="org.eclipse.rcp.source,3.1.0," pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="org.eclipse.rcp.source,3.1.0," pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.freebsd.gtk.x86,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,org.eclipse.platform.source.freebsd.motif.x86,3.1.0,"/>
+-		<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,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">
+@@ -153,6 +168,12 @@
  	</target>
- 	<target name="rootFileslinux_gtk_x86">
+ 	<target name="rootFileslinux_motif_x86">
  	</target>
 +	<target name="rootFilesfreebsd_gtk_x86">
 +	</target>
- 	<target name="rootFileslinux_gtk_ppc">
- 	</target>
- 	<target name="rootFileslinux_gtk_ppc64">
- 	</target>
- 	<target name="rootFileslinux_gtk_x86_64">
- 	</target>
 +	<target name="rootFilesfreebsd_gtk_amd64">
 +	</target>
- 	<target name="rootFileslinux_gtk_ia64">
- 	</target>
- 	<target name="rootFileslinux_motif_x86">
-+	</target>
 +	<target name="rootFilesfreebsd_motif_x86">
- 	</target>
++ 	</target>
  	<target name="rootFilessolaris_motif_sparc">
  	</target>
+ 	<target name="rootFilessolaris_gtk_sparc">
diff --git a/java/eclipse/files/patch-features-platform-source-feature.xml b/java/eclipse/files/patch-features-platform-source-feature.xml
index 04d17e6eecfa..0a8377fdd6fd 100644
--- a/java/eclipse/files/patch-features-platform-source-feature.xml
+++ b/java/eclipse/files/patch-features-platform-source-feature.xml
@@ -1,15 +1,10 @@
---- features/org.eclipse.platform.source/feature.xml.orig	Mon Jun 27 21:52:50 2005
-+++ features/org.eclipse.platform.source/feature.xml	Thu Jul 14 00:54:19 2005
-@@ -20,9 +20,12 @@
- 	<plugin ws="motif"  os="hpux" fragment="true" arch="PA_RISC" download-size="0" install-size="0" id="org.eclipse.platform.source.hpux.motif.PA_RISC" version="3.1.0"/>
- 	<plugin ws="motif"  os="hpux" fragment="true" arch="ia64" download-size="0" install-size="0" id="org.eclipse.platform.source.hpux.motif.ia64" version="3.1.0"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86_64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86_64" version="3.1.0"/>
-+	<plugin ws="gtk"  os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.amd64" version="3.1.0"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc64" version="3.1.0"/>
- 	<plugin ws="carbon"  os="macosx" fragment="true" arch="ppc" download-size="0" install-size="0" id="org.eclipse.platform.source.macosx.carbon.ppc" version="3.1.0"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.1.0"/>
-+	<plugin ws="gtk"  os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.x86" version="3.1.0"/>
- 	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.1.0"/>
- 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.1.0"/>
-+	<plugin ws="motif"  os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.motif.x86" version="3.1.0"/>
+--- features/org.eclipse.platform.source/feature.xml.orig	Thu Sep 29 15:51:40 2005
++++ features/org.eclipse.platform.source/feature.xml	Tue Oct  4 20:34:16 2005
+@@ -25,4 +25,7 @@
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.1.1"/>
+ 	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.1.1"/>
+ 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.1.1"/>
++	<plugin ws="gtk"  os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.amd64" version="3.1.1"/>
++	<plugin ws="gtk"  os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.x86" version="3.1.1"/>
++	<plugin ws="motif"  os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.motif.x86" version="3.1.1"/>
  </feature>
diff --git a/java/eclipse/files/patch-features-rcp-build.xml b/java/eclipse/files/patch-features-rcp-build.xml
index 6e257a9bac70..40349d730fe5 100644
--- a/java/eclipse/files/patch-features-rcp-build.xml
+++ b/java/eclipse/files/patch-features-rcp-build.xml
@@ -1,53 +1,39 @@
---- features/org.eclipse.rcp/build.xml.orig	Mon Jun 27 21:52:51 2005
-+++ features/org.eclipse.rcp/build.xml	Fri Jul 15 00:34:31 2005
-@@ -37,6 +37,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="motif"/>
+--- 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
+@@ -127,6 +127,21 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.freebsd.x86" target="${target}">
 +			<property name="arch" value="x86"/>
 +			<property name="os" value="freebsd"/>
 +			<property name="ws" value="motif"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.ia64_32" target="${target}">
- 			<property name="arch" value="ia64_32"/>
- 			<property name="os" value="hpux"/>
-@@ -72,6 +77,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}">
 +			<property name="arch" value="x86"/>
 +			<property name="os" value="freebsd"/>
 +			<property name="ws" value="gtk"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.aix.ppc" target="${target}">
- 			<property name="arch" value="ppc"/>
- 			<property name="os" value="aix"/>
-@@ -82,6 +92,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}">
 +			<property name="arch" value="amd64"/>
 +			<property name="os" value="freebsd"/>
 +			<property name="ws" value="gtk"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ia64" target="${target}">
- 			<property name="arch" value="ia64"/>
- 			<property name="os" value="linux"/>
+ 	</target>
+ 	<target name="all.features" depends="init">
+ 	</target>
 @@ -185,7 +200,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.rcp_3.1.0" failonerror="true" overwrite="false">
+ 		<copy todir="${feature.base}/features/org.eclipse.rcp_3.1.1" 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.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.0,org.eclipse.swt.gtk.linux.x86,3.1.0,org.eclipse.swt.gtk.solaris.sparc,3.1.0,org.eclipse.swt.gtk.linux.ppc,3.1.0,org.eclipse.swt.gtk.linux.x86_64,3.1.0,org.eclipse.swt.carbon.macosx.ppc,3.1.0,org.eclipse.swt.motif.aix.ppc,3.1.0,org.eclipse.swt.motif.hpux.PA_RISC,3.1.0,org.eclipse.swt.motif.linux.x86,3.1.0,org.eclipse.swt.gtk.linux.ia64,3.1.0,org.eclipse.swt.motif.solaris.sparc,3.1.0,org.eclipse.swt.photon.qnx.x86,3.1.0,org.eclipse.swt.motif.hpux.ia64_32,3.1.0,org.eclipse.rcp,3.1.0,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.0,org.eclipse.swt.gtk.linux.x86,3.1.0,org.eclipse.swt.gtk.freebsd.x86,3.1.0,org.eclipse.swt.gtk.solaris.sparc,3.1.0,org.eclipse.swt.gtk.linux.ppc,3.1.0,org.eclipse.swt.gtk.linux.x86_64,3.1.0,org.eclipse.swt.gtk.freebsd.amd64,3.1.0,org.eclipse.swt.carbon.macosx.ppc,3.1.0,org.eclipse.swt.motif.aix.ppc,3.1.0,org.eclipse.swt.motif.hpux.PA_RISC,3.1.0,org.eclipse.swt.motif.linux.x86,3.1.0,org.eclipse.swt.motif.freebsd.x86,3.1.0,org.eclipse.swt.gtk.linux.ia64,3.1.0,org.eclipse.swt.motif.solaris.sparc,3.1.0,org.eclipse.swt.photon.qnx.x86,3.1.0,org.eclipse.swt.motif.hpux.ia64_32,3.1.0,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.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,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">
-@@ -211,6 +226,19 @@
- 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> 
- 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> 
+@@ -353,6 +368,46 @@
+ 		</copy>
+ 		<chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" /> 
  	</target>
 +	<target name="rootFilesfreebsd_gtk_x86">
 +		<mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/>
@@ -62,13 +48,6 @@
 +		<chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> 
 +		<chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> 
 +	</target>
- 	<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">
-@@ -243,6 +271,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>
 +	<target name="rootFilesfreebsd_gtk_amd64">
 +		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>
 +		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true">
@@ -82,14 +61,6 @@
 +		<chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> 
 +		<chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> 
 +	</target>
- 	<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">
-@@ -266,6 +307,20 @@
- 		</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*" /> 
-+	</target>
 +	<target name="rootFilesfreebsd_motif_x86">
 +		<mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/>
 +		<copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
@@ -103,6 +74,7 @@
 +		</copy>
 +		<chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" /> 
 +		<chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="*.so*" /> 
- 	</target>
- 	<target name="rootFilessolaris_motif_sparc">
- 		<mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/>
++ 	</target>
+ 
+ 	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.rcp.">
+ 		<delete dir="${feature.temp.folder}"/>
diff --git a/java/eclipse/files/patch-features-rcp-source-build.xml b/java/eclipse/files/patch-features-rcp-source-build.xml
index dcead525d938..c7e436e55319 100644
--- a/java/eclipse/files/patch-features-rcp-source-build.xml
+++ b/java/eclipse/files/patch-features-rcp-source-build.xml
@@ -1,66 +1,46 @@
---- features/org.eclipse.rcp.source/build.xml.orig	Mon Jun 27 21:52:50 2005
-+++ features/org.eclipse.rcp.source/build.xml	Fri Jul 15 00:40:07 2005
-@@ -17,6 +17,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
+--- 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"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.amd64" target="${target}">
 +			<property name="arch" value="amd64"/>
 +			<property name="os" value="freebsd"/>
 +			<property name="ws" value="gtk"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}">
- 			<property name="arch" value="ppc"/>
- 			<property name="os" value="macosx"/>
-@@ -67,11 +72,21 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="motif"/>
- 		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.motif.x86" target="${target}">
 +			<property name="arch" value="x86"/>
 +			<property name="os" value="freebsd"/>
 +			<property name="ws" value="motif"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.x86" target="${target}">
- 			<property name="arch" value="x86"/>
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.x86" target="${target}">
 +			<property name="arch" value="x86"/>
 +			<property name="os" value="freebsd"/>
 +			<property name="ws" value="gtk"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.gtk.sparc" target="${target}">
- 			<property name="arch" value="sparc"/>
- 			<property name="os" value="solaris"/>
-@@ -135,22 +150,28 @@
- 		<copy todir="${feature.base}/features/org.eclipse.rcp.source_3.1.0" failonerror="true" overwrite="false">
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}">
+ 			<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">
  			<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.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.0,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.0,org.eclipse.rcp.source.linux.gtk.ia64,3.1.0,org.eclipse.rcp.source.qnx.photon.x86,3.1.0,org.eclipse.rcp.source.linux.gtk.ppc,3.1.0,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.0,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.0,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.0,org.eclipse.rcp.source.linux.gtk.x86,3.1.0,org.eclipse.rcp.source.aix.motif.ppc,3.1.0,org.eclipse.rcp.source.win32.win32.x86,3.1.0,org.eclipse.rcp.source.solaris.motif.sparc,3.1.0,org.eclipse.rcp.source.linux.motif.x86,3.1.0,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.0/feature.xml"  selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.0,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.0,org.eclipse.rcp.source.linux.gtk.ia64,3.1.0,org.eclipse.rcp.source.qnx.photon.x86,3.1.0,org.eclipse.rcp.source.linux.gtk.ppc,3.1.0,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.0,org.eclipse.rcp.source.freebsd.gtk.amd64,3.1.0,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.0,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.0,org.eclipse.rcp.source.linux.gtk.x86,3.1.0,org.eclipse.rcp.source.freebsd.gtk.x86,3.1.0,org.eclipse.rcp.source.aix.motif.ppc,3.1.0,org.eclipse.rcp.source.win32.win32.x86,3.1.0,org.eclipse.rcp.source.solaris.motif.sparc,3.1.0,org.eclipse.rcp.source.linux.motif.x86,3.1.0,org.eclipse.rcp.source.freebsd.motif.x86,3.1.0,"/>
+-		<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,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">
+@@ -168,6 +183,12 @@
  	</target>
- 	<target name="rootFileslinux_gtk_x86">
+ 	<target name="rootFilesqnx_photon_x86">
  	</target>
 +	<target name="rootFilesfreebsd_gtk_x86">
 +	</target>
- 	<target name="rootFileslinux_gtk_ppc">
- 	</target>
- 	<target name="rootFileslinux_gtk_ppc64">
- 	</target>
- 	<target name="rootFileslinux_gtk_x86_64">
- 	</target>
 +	<target name="rootFilesfreebsd_gtk_amd64">
 +	</target>
- 	<target name="rootFileslinux_gtk_ia64">
- 	</target>
- 	<target name="rootFileslinux_motif_x86">
-+	</target>
 +	<target name="rootFilesfreebsd_motif_x86">
- 	</target>
- 	<target name="rootFilessolaris_motif_sparc">
- 	</target>
++ 	</target>
+ 
+ 	<target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.rcp.source.">
+ 		<delete dir="${feature.temp.folder}"/>