87 files changed, 1276 insertions, 1834 deletions

diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile
index a89fa8a14102..9b2056ee004b 100644
--- a/java/eclipse-devel/Makefile
+++ b/java/eclipse-devel/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	eclipse-devel
-PORTVERSION=	3.3.1
-PORTREVISION=	2
+PORTVERSION=	3.3.2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200709211145
+MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200802211800
 DISTNAME=	eclipse-sourceBuild-srcIncluded-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
diff --git a/java/eclipse-devel/distinfo b/java/eclipse-devel/distinfo
index d37aa65584a2..35761b9460e7 100644
--- a/java/eclipse-devel/distinfo
+++ b/java/eclipse-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.3.1.zip) = 764b585d9a05cd518650e31c32899a29
-SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.3.1.zip) = 6dfc8565e94fe06b4187ca58c2bb2c6441753b062d7570fd973a0b9fa5bebbb9
-SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.3.1.zip) = 94348582
+MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.3.2.zip) = 4b7016cf9aedf07b8f34b39470947799
+SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.3.2.zip) =  94d2f41d317c0d15b5e15420f261ed543928811c93283f4219c177f5547d7827
+SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.3.2.zip) = 94184642  
diff --git a/java/eclipse-devel/files/XXXorg.eclipse.rcp-build.xml b/java/eclipse-devel/files/XXXorg.eclipse.rcp-build.xml
new file mode 100644
index 000000000000..fe3cb04a340d
--- /dev/null
+++ b/java/eclipse-devel/files/XXXorg.eclipse.rcp-build.xml
@@ -0,0 +1,781 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.rcp" default="build.update.jar" basedir=".">
+
+	<target name="init">
+		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
+		<property name="feature.destination" value="${basedir}"/>
+	</target>
+
+	<target name="all.plugins" depends="init">
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.win32.win32.x86" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.wpf.win32.x86" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="wpf"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.motif.hpux.PA_RISC" target="${target}">
+			<property name="arch" value="PA_RISC"/>
+			<property name="os" value="hpux"/>
+			<property name="ws" value="motif"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.motif.aix.ppc" target="${target}">
+			<property name="arch" value="ppc"/>
+			<property name="os" value="aix"/>
+			<property name="ws" value="motif"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64" target="${target}">
+			<property name="arch" value="x86_64"/>
+			<property name="os" value="linux"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.motif.linux.x86" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="linux"/>
+			<property name="ws" value="motif"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.s390x" target="${target}">
+			<property name="arch" value="s390x"/>
+			<property name="os" value="linux"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.s390" target="${target}">
+			<property name="arch" value="s390"/>
+			<property name="os" value="linux"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.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.equinox.launcher.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.equinox.launcher.gtk.linux.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.equinox.launcher.gtk.linux.ppc" target="${target}">
+			<property name="arch" value="ppc"/>
+			<property name="os" value="linux"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.carbon.macosx" target="${target}">
+			<property name="arch" value="ppc"/>
+			<property name="os" value="macosx"/>
+			<property name="ws" value="carbon"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.solaris.sparc" target="${target}">
+			<property name="arch" value="sparc"/>
+			<property name="os" value="solaris"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</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"/>
+			<property name="ws" value="motif"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.photon.qnx.x86" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="qnx"/>
+			<property name="ws" value="photon"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}">
+			<property name="arch" value="sparc"/>
+			<property name="os" value="solaris"/>
+			<property name="ws" value="motif"/>
+		</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"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.linux.x86" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="linux"/>
+			<property name="ws" value="motif"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.PA_RISC" target="${target}">
+			<property name="arch" value="PA_RISC"/>
+			<property name="os" value="hpux"/>
+			<property name="ws" value="motif"/>
+		</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"/>
+			<property name="ws" value="motif"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.carbon.macosx" target="${target}">
+			<property name="arch" value="ppc"/>
+			<property name="os" value="macosx"/>
+			<property name="ws" value="carbon"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ppc" target="${target}">
+			<property name="arch" value="ppc"/>
+			<property name="os" value="linux"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.x86" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="solaris"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}">
+			<property name="arch" value="sparc"/>
+			<property name="os" value="solaris"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390x" target="${target}">
+			<property name="arch" value="s390x"/>
+			<property name="os" value="linux"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390" target="${target}">
+			<property name="arch" value="s390"/>
+			<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.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.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.swt.wpf.win32.x86" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="wpf"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.osgi" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.common" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.update.configurator" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime.compatibility.auth" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.jobs" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.registry" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.preferences" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.contenttype" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.commands" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.app" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.expressions" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.help" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.databinding" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.databinding.beans" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86_64" target="${target}">
+			<property name="arch" value="x86_64"/>
+			<property name="os" value="linux"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jface" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jface.databinding" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.workbench" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.carbon" target="${target}">
+			<property name="arch" value="ppc"/>
+			<property name="os" value="macosx"/>
+			<property name="ws" value="carbon"/>
+		</ant>
+	</target>
+	<target name="all.features" depends="init">
+	</target>
+	<target name="update.feature" depends="init">
+	</target>
+
+	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
+	</target>
+
+	<target name="children" if="include.children">
+		<antcall target="all.children"/>
+	</target>
+
+	<target name="build.jars" depends="init" description="Build all the jars for the feature: org.eclipse.rcp.">
+		<antcall target="all.children">
+			<param name="target" value="build.jars"/>
+		</antcall>
+	</target>
+
+	<target name="build.sources" depends="init">
+		<antcall target="all.children">
+			<param name="target" value="build.sources"/>
+		</antcall>
+	</target>
+
+	<target name="build.zips" depends="init">
+		<antcall target="all.children">
+			<param name="target" value="build.zips"/>
+		</antcall>
+	</target>
+
+	<target name="build.update.jar" depends="init" description="Build the feature jar of: org.eclipse.rcp for an update site.">
+		<antcall target="all.children">
+			<param name="target" value="build.update.jar"/>
+		</antcall>
+		<property name="feature.base" value="${feature.temp.folder}"/>
+		<delete dir="${feature.temp.folder}"/>
+		<mkdir dir="${feature.temp.folder}"/>
+		<antcall target="gather.bin.parts" inheritAll="false">
+			<param name="arch" value="*"/>
+			<param name="ws" value="*"/>
+			<param name="nl" value="*"/>
+			<param name="os" value="*"/>
+			<param name="feature.base" value="${feature.temp.folder}"/>
+		</antcall>
+		<jar destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.jar" basedir="${feature.temp.folder}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc"/>
+		<delete dir="${feature.temp.folder}"/>
+	</target>
+
+	<target name="gather.bin.parts" depends="init" if="feature.base">
+		<mkdir dir="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc"/>
+		<antcall target="children">
+			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
+			<param name="target" value="gather.bin.parts"/>
+		</antcall>
+		<copy todir="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" failonerror="true" overwrite="false">
+			<fileset dir="${basedir}">
+				<include name="feature.xml"/>
+				<include name="license.html"/>
+				<include name="epl-v10.html"/>
+				<include name="feature.properties"/>
+				<include name="eclipse_update_120.jpg"/>
+			</fileset>
+		</copy>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/feature.xml"  selfVersion="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.6.1.v20070906,org.eclipse.core.commands:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.databinding:0.0.0,1.0.1.M20070822-0800,org.eclipse.core.databinding.beans:0.0.0,1.0.1.M20070910-0800b,org.eclipse.core.jobs:0.0.0,3.3.1.R33x_v20070709,org.eclipse.core.expressions:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.runtime:0.0.0,3.3.100.v20070530,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.3.2.R33x_v20080105,org.eclipse.help:0.0.0,3.3.2.v20071126_33x,org.eclipse.swt:0.0.0,3.3.2.v3349d,org.eclipse.jface:0.0.0,3.3.2.M20080207-0800,org.eclipse.jface.databinding:0.0.0,1.1.1.M20080207-0800,org.eclipse.ui:0.0.0,3.3.1.M20071128-0800,org.eclipse.ui.workbench:0.0.0,3.3.2.M20080207-0800,org.eclipse.ui.carbon:0.0.0,3.2.100.I20070605-0010,org.eclipse.update.configurator:0.0.0,3.2.101.R33x_v20070810,org.eclipse.swt.win32.win32.x86:0.0.0,3.3.3.v3349,org.eclipse.swt.wpf.win32.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.freebsd.amd64:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.s390:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.3.2.v3349,org.eclipse.swt.carbon.macosx:0.0.0,3.3.3.v3349,org.eclipse.swt.motif.aix.ppc:0.0.0,3.3.1.v3349,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.3.1.v3348,org.eclipse.swt.motif.linux.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.3.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.3.1.v3349,org.eclipse.swt.photon.qnx.x86:0.0.0,3.3.1.v3349,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.3.0.HEAD,org.eclipse.rcp:0.0.0,3.2.1.r33x_r20080131,org.eclipse.core.contenttype:0.0.0,3.2.100.v20070319,org.eclipse.equinox.app:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.common:0.0.0,3.3.0.v20070426,org.eclipse.equinox.preferences:0.0.0,3.2.101.R33x_v20080117,org.eclipse.equinox.registry:0.0.0,3.3.1.R33x_v20070802,org.eclipse.equinox.launcher:0.0.0,1.0.1.R33x_v20080118,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.freebsd.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.freebsd.amd64:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.1.R33x_v20070803,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.3.R33x_v20080118,"/>
+		<antcall target="rootFiles${os}_${ws}_${arch}"/>
+	</target>
+	<target name="rootFileswin32_win32_x86">
+		<mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}/"/>
+		<copy todir="${feature.base}/win32.win32.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/win32/win32/x86">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFileswin32_wpf_x86">
+		<mkdir dir="${feature.base}/win32.wpf.x86/${collectingFolder}/"/>
+		<copy todir="${feature.base}/win32.wpf.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/wpf/win32/x86">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/win32.wpf.x86/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFilesmacosx_carbon_ppc">
+		<mkdir dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}/"/>
+		<copy todir="${feature.base}/macosx.carbon.ppc/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="eclipse" /> 
+		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt" /> 
+		<exec executable="ln" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" os="Linux">
+			<arg line="-sf"/>
+			<arg line="Eclipse.app/Contents/MacOS/eclipse"/>
+			<arg line="eclipse"/>
+		</exec>
+	</target>
+	<target name="rootFilesfreebsd_gtk_x86">
+		<mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/>
+		<copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.x86">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<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="rootFilesfreebsd_gtk_amd64">
+		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/>
+		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<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_x86">
+		<mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/>
+		<copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> 
+		<chmod perm="755" dir="${feature.base}/linux.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">
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/ppc">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFileslinux_gtk_ppc64">
+		<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}/"/>
+		<copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFileslinux_gtk_x86_64">
+		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/"/>
+		<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86_64">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<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="rootFileslinux_gtk_ia64">
+		<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}/"/>
+		<copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFileslinux_gtk_s390">
+		<mkdir dir="${feature.base}/linux.gtk.s390/${collectingFolder}/"/>
+		<copy todir="${feature.base}/linux.gtk.s390/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.s390">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="*.so*" /> 
+		<chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFileslinux_gtk_s390x">
+		<mkdir dir="${feature.base}/linux.gtk.s390x/${collectingFolder}/"/>
+		<copy todir="${feature.base}/linux.gtk.s390x/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.s390x">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="*.so*" /> 
+		<chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFileslinux_motif_x86">
+		<mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}/"/>
+		<copy todir="${feature.base}/linux.motif.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.motif.x86">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/motif/linux/x86">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.linux.x86">
+				<include name="libXm.so.2"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</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="rootFilessolaris_gtk_sparc">
+		<mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/"/>
+		<copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFilessolaris_gtk_x86">
+		<mkdir dir="${feature.base}/solaris.gtk.x86/${collectingFolder}/"/>
+		<copy todir="${feature.base}/solaris.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFilessolaris_motif_sparc">
+		<mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}/"/>
+		<copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFilesaix_motif_ppc">
+		<mkdir dir="${feature.base}/aix.motif.ppc/${collectingFolder}/"/>
+		<copy todir="${feature.base}/aix.motif.ppc/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/motif/aix/ppc">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFileshpux_motif_PA_RISC">
+		<mkdir dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}/"/>
+		<copy todir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFileshpux_motif_ia64">
+		<mkdir dir="${feature.base}/hpux.motif.ia64/${collectingFolder}/"/>
+		<copy todir="${feature.base}/hpux.motif.ia64/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFileshpux_motif_ia64_32">
+		<mkdir dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}/"/>
+		<copy todir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFilesqnx_photon_x86">
+		<mkdir dir="${feature.base}/qnx.photon.x86/${collectingFolder}/"/>
+		<copy todir="${feature.base}/qnx.photon.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" /> 
+	</target>
+	<target name="rootFilesgroup_group_group">
+		<antcall target="rootFileswin32_win32_x86"/>
+		<antcall target="rootFileswin32_wpf_x86"/>
+		<antcall target="rootFilesmacosx_carbon_ppc"/>
+		<antcall target="rootFilesfreebsd_gtk_x86"/>
+		<antcall target="rootFilesfreebsd_gtk_amd64"/>
+		<antcall target="rootFileslinux_gtk_x86"/>
+		<antcall target="rootFileslinux_gtk_ppc"/>
+		<antcall target="rootFileslinux_gtk_ppc64"/>
+		<antcall target="rootFileslinux_gtk_x86_64"/>
+		<antcall target="rootFileslinux_gtk_ia64"/>
+		<antcall target="rootFileslinux_gtk_s390"/>
+		<antcall target="rootFileslinux_gtk_s390x"/>
+		<antcall target="rootFileslinux_motif_x86"/>
+		<antcall target="rootFilessolaris_gtk_sparc"/>
+		<antcall target="rootFilessolaris_gtk_x86"/>
+		<antcall target="rootFilessolaris_motif_sparc"/>
+		<antcall target="rootFilesaix_motif_ppc"/>
+		<antcall target="rootFileshpux_motif_PA_RISC"/>
+		<antcall target="rootFileshpux_motif_ia64"/>
+		<antcall target="rootFileshpux_motif_ia64_32"/>
+		<antcall target="rootFilesqnx_photon_x86"/>
+	</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}"/>
+		<mkdir dir="${feature.temp.folder}"/>
+		<antcall target="gather.bin.parts">
+			<param name="arch" value="*"/>
+			<param name="ws" value="*"/>
+			<param name="nl" value="*"/>
+			<param name="include.children" value="true"/>
+			<param name="feature.base" value="${feature.temp.folder}"/>
+			<param name="os" value="*"/>
+		</antcall>
+		<zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
+		<delete dir="${feature.temp.folder}"/>
+	</target>
+
+	<target name="zip.sources" depends="init">
+		<delete dir="${feature.temp.folder}"/>
+		<mkdir dir="${feature.temp.folder}"/>
+		<antcall target="all.children">
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/src"/>
+			<param name="include.children" value="true"/>
+			<param name="target" value="gather.sources"/>
+		</antcall>
+		<zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<delete dir="${feature.temp.folder}"/>
+	</target>
+
+	<target name="zip.logs" depends="init">
+		<delete dir="${feature.temp.folder}"/>
+		<mkdir dir="${feature.temp.folder}"/>
+		<antcall target="all.children" inheritAll="false">
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
+			<param name="include.children" value="true"/>
+			<param name="target" value="gather.logs"/>
+		</antcall>
+		<zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<delete dir="${feature.temp.folder}"/>
+	</target>
+
+	<target name="clean" depends="init" description="Clean the feature: org.eclipse.rcp of all the zips, jars and logs created.">
+		<delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.jar"/>
+		<delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.bin.dist.zip"/>
+		<delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.log.zip"/>
+		<delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.src.zip"/>
+		<delete dir="${feature.temp.folder}"/>
+		<antcall target="all.children">
+			<param name="target" value="clean"/>
+		</antcall>
+	</target>
+
+	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+		<eclipse.convertPath fileSystemPath="/builds/M200802211800/src/features/org.eclipse.rcp/" property="resourcePath"/>
+		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
+		<antcall target="all.children">
+			<param name="target" value="refresh"/>
+		</antcall>
+	</target>
+	<target name="gather.sources">
+		<antcall target="children">
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/src"/>
+			<param name="target" value="gather.sources"/>
+		</antcall>
+	</target>
+
+	<target name="gather.logs" depends="init">
+		<mkdir dir="${feature.temp.folder}"/>
+		<antcall target="all.children" inheritAll="false">
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/>
+			<param name="target" value="gather.logs"/>
+		</antcall>
+	</target>
+
+</project>
diff --git a/java/eclipse-devel/files/eclipse.desktop b/java/eclipse-devel/files/eclipse.desktop
index 310996614773..37a3c2b75e31 100644
--- a/java/eclipse-devel/files/eclipse.desktop
+++ b/java/eclipse-devel/files/eclipse.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Eclipse IDE
 Name=Eclipse
-Exec=%%PREFIX%%/bin/eclipse-devel
+Exec=%%PREFIX%%/bin/eclipse
 Encoding=UTF-8
 Terminal=false
 Type=Application
diff --git a/java/eclipse-devel/files/eclipse.in b/java/eclipse-devel/files/eclipse.in
index 6e7b9a3dc712..3f30044bbe93 100644
--- a/java/eclipse-devel/files/eclipse.in
+++ b/java/eclipse-devel/files/eclipse.in
@@ -45,4 +45,4 @@ if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then
 	exit 1
 fi
 
-JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" %%JAVA_VENDOR_SPECIFICATION%% PATH=${JAVA_HOME}/bin:${PATH} exec "${ECLIPSE_HOME}/eclipse" $@
+JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} exec "${ECLIPSE_HOME}/eclipse" $@
diff --git a/java/eclipse-devel/files/org.eclipse.platform-build.xml b/java/eclipse-devel/files/org.eclipse.platform-build.xml
index 5affe24ba4ec..f580aaffc034 100644
--- a/java/eclipse-devel/files/org.eclipse.platform-build.xml
+++ b/java/eclipse-devel/files/org.eclipse.platform-build.xml
@@ -47,6 +47,11 @@
 			<property name="os" value="solaris"/>
 			<property name="ws" value="gtk"/>
 		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.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.core.filesystem.linux.x86_64" target="${target}">
 			<property name="arch" value="x86_64"/>
 			<property name="os" value="linux"/>
@@ -62,11 +67,6 @@
 			<property name="os" value="freebsd"/>
 			<property name="ws" value="gtk"/>
 		</ant>
-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.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.core.filesystem.linux.ppc" target="${target}">
 			<property name="arch" value="ppc"/>
 			<property name="os" value="linux"/>
@@ -418,17 +418,17 @@
 			<param name="os" value="*"/>
 			<param name="feature.base" value="${feature.temp.folder}"/>
 		</antcall>
-		<jar destfile="${feature.destination}/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G.jar" basedir="${feature.temp.folder}/features/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
+		<jar destfile="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.jar" basedir="${feature.temp.folder}/features/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
+		<mkdir dir="${feature.base}/features/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft"/>
 		<antcall target="children">
 			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
 			<param name="target" value="gather.bin.parts"/>
 		</antcall>
-		<copy todir="${feature.base}/features/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G" failonerror="true" overwrite="false">
+		<copy todir="${feature.base}/features/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}">
 				<include name="epl-v10.html"/>
 				<include name="eclipse_update_120.jpg"/>
@@ -437,7 +437,7 @@
 				<include name="license.html"/>
 			</fileset>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G/feature.xml"  selfVersion="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G" featureIds="org.eclipse.rcp:0.0.0,3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG," pluginIds="com.jcraft.jsch:0.0.0,0.1.31,javax.servlet:0.0.0,2.4.0.v200706111738,javax.servlet.jsp:0.0.0,2.0.0.v200706191603,org.apache.jasper:0.0.0,5.5.17.v200706111724,org.apache.commons.el:0.0.0,1.0.0.v200706111724,org.apache.commons.logging:0.0.0,1.0.4.v200706111724,org.apache.ant:0.0.0,1.7.0.v200706080842,org.apache.lucene:0.0.0,1.9.1.v200706111724,org.apache.lucene.analysis:0.0.0,1.9.1.v200706181610,org.eclipse.ant.core:0.0.0,3.1.200.v20070522,org.eclipse.compare:0.0.0,3.3.0.I20070606,org.eclipse.core.boot:0.0.0,3.1.100.v20060603,org.eclipse.core.filebuffers:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.filesystem:0.0.0,1.1.0.v20070606,org.eclipse.core.net:0.0.0,1.0.0.I20070531,org.eclipse.core.resources:0.0.0,3.3.0.v20070604,org.eclipse.core.resources.compatibility:0.0.0,3.2.100.v20070502,org.eclipse.core.runtime.compatibility:0.0.0,3.1.200.v20070502,org.eclipse.osgi.services:0.0.0,3.1.200.v20070605,org.eclipse.osgi.util:0.0.0,3.1.200.v20070605,org.eclipse.core.variables:0.0.0,3.2.0.v20070426,org.eclipse.debug.core:0.0.0,3.3.0.v20070607-1800,org.eclipse.debug.ui:0.0.0,3.3.0.v20070607-1800,org.eclipse.equinox.http.registry:0.0.0,1.0.0.v20070608,org.eclipse.equinox.http.jetty:0.0.0,1.0.0.v20070607,org.eclipse.equinox.http.servlet:0.0.0,1.0.0.v20070606,org.eclipse.equinox.jsp.jasper:0.0.0,1.0.0.v20070607,org.eclipse.equinox.jsp.jasper.registry:0.0.0,1.0.0.v20070607,org.eclipse.help.webapp:0.0.0,3.3.0.v20070607,org.eclipse.help.base:0.0.0,3.3.0.v20070606,org.eclipse.help.ui:0.0.0,3.3.0.v20070530,org.eclipse.help.appserver:0.0.0,3.1.200.v20070510,org.eclipse.ltk.core.refactoring:0.0.0,3.3.0.v20070606-0010,org.eclipse.ltk.ui.refactoring:0.0.0,3.3.0.v20070606-0010,org.eclipse.platform:0.0.0,3.3.0.v20070613,org.eclipse.platform.doc.user:0.0.0,3.3.0.I20070615-1300,org.eclipse.search:0.0.0,3.3.0.v20070606-0010,org.eclipse.team.core:0.0.0,3.3.0.I20070607,org.eclipse.team.ui:0.0.0,3.3.0.I20070607,org.eclipse.tomcat:0.0.0,4.1.230.v20070531,org.eclipse.text:0.0.0,3.3.0.v20070606-0010,org.eclipse.jface.text:0.0.0,3.3.0.v20070606-0010,org.eclipse.jsch.core:0.0.0,1.0.0.I20070426,org.eclipse.jsch.ui:0.0.0,1.0.0.I20070525,org.eclipse.ui.console:0.0.0,3.2.0.v20070530,org.eclipse.ui.presentations.r21:0.0.0,3.2.100.I20070605-0010,org.eclipse.ui.intro:0.0.0,3.2.100.v20070530,org.eclipse.ui.intro.universal:0.0.0,3.2.100.v20070530A,org.eclipse.ui.cheatsheets:0.0.0,3.3.0.v20070507,org.eclipse.ui.browser:0.0.0,3.2.100.v20070524A,org.eclipse.ui.navigator:0.0.0,3.3.0.I20070605-0010,org.eclipse.ui.navigator.resources:0.0.0,3.3.0.I20070605-0010,org.eclipse.ui.net:0.0.0,1.0.0.I20070516,org.eclipse.ui.workbench.texteditor:0.0.0,3.3.0.v20070606-0010,org.eclipse.ui.views:0.0.0,3.2.100.I20070319-0010,org.eclipse.ui.editors:0.0.0,3.3.0.v20070606-0010,org.eclipse.ui.forms:0.0.0,3.3.0.v20070511,org.eclipse.ui.externaltools:0.0.0,3.1.200.v20070416,org.eclipse.ui.ide:0.0.0,3.3.0.I20070620,org.eclipse.ui.ide.application:0.0.0,1.0.0.I20070530-0100,org.eclipse.ui.win32:0.0.0,3.2.100.I20070319-0010,org.eclipse.update.core:0.0.0,3.2.100.v20070615,org.eclipse.update.scheduler:0.0.0,3.2.100.v20070615,org.eclipse.update.ui:0.0.0,3.2.100.v20070615,org.eclipse.ui.workbench.compatibility:0.0.0,3.2.0.I20070319-0010,org.eclipse.core.filesystem.hpux.ia64_32:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.linux.ppc:0.0.0,1.0.100.v20070430,org.eclipse.core.filesystem.freebsd.x86:0.0.0,1.1.0.v20070416,org.eclipse.core.filesystem.freebsd.amd64:0.0.0,1.1.0.v20070416,org.eclipse.core.filesystem.linux.x86:0.0.0,1.1.0.v20070416,org.eclipse.core.filesystem.linux.x86_64:0.0.0,1.0.100.v20070510,org.eclipse.core.filesystem.solaris.sparc:0.0.0,1.0.100.v20070425,org.eclipse.core.filesystem.macosx:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86:0.0.0,1.1.0.v20070510,org.eclipse.core.resources.win32:0.0.0,3.3.0.v20070226,org.eclipse.update.core.freebsd:0.0.0,3.2.0.v20070615,org.eclipse.update.core.linux:0.0.0,3.2.0.v20070615,org.eclipse.update.core.win32:0.0.0,3.2.100.v20070615,org.eclipse.ui.views.properties.tabbed:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.runtime.compatibility.registry:0.0.0,3.2.100.v20070316,org.mortbay.jetty:0.0.0,5.1.11.v200706111724,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft/feature.xml"  selfVersion="3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" featureIds="org.eclipse.rcp:0.0.0,3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc," pluginIds="com.jcraft.jsch:0.0.0,0.1.31,javax.servlet:0.0.0,2.4.0.v200706111738,javax.servlet.jsp:0.0.0,2.0.0.v200706191603,org.apache.jasper:0.0.0,5.5.17.v200706111724,org.apache.commons.el:0.0.0,1.0.0.v200706111724,org.apache.commons.logging:0.0.0,1.0.4.v200706111724,org.apache.ant:0.0.0,1.7.0.v200706080842,org.apache.lucene:0.0.0,1.9.1.v200706111724,org.apache.lucene.analysis:0.0.0,1.9.1.v200706181610,org.eclipse.ant.core:0.0.0,3.1.200.v20070522,org.eclipse.compare:0.0.0,3.3.2.r33x_20080128,org.eclipse.core.boot:0.0.0,3.1.100.v20060603,org.eclipse.core.filebuffers:0.0.0,3.3.1.r331_v20070829,org.eclipse.core.filesystem:0.0.0,1.1.0.v20070606,org.eclipse.core.net:0.0.0,1.0.1.r33x_20070709,org.eclipse.core.resources:0.0.0,3.3.1.R33x_v20080205,org.eclipse.core.resources.compatibility:0.0.0,3.2.100.v20070502,org.eclipse.core.runtime.compatibility:0.0.0,3.1.200.v20070502,org.eclipse.osgi.services:0.0.0,3.1.200.v20070605,org.eclipse.osgi.util:0.0.0,3.1.200.v20070605,org.eclipse.core.variables:0.0.0,3.2.0.v20070426,org.eclipse.debug.core:0.0.0,3.3.2.v20080117_r332,org.eclipse.debug.ui:0.0.0,3.3.2.v20080117_r332,org.eclipse.equinox.http.registry:0.0.0,1.0.1.R33x_v20071231,org.eclipse.equinox.http.jetty:0.0.0,1.0.1.R33x_v20070816,org.eclipse.equinox.http.servlet:0.0.0,1.0.1.R33x_v20070816,org.eclipse.equinox.jsp.jasper:0.0.0,1.0.1.R33x_v20070816,org.eclipse.equinox.jsp.jasper.registry:0.0.0,1.0.0.v20070607,org.eclipse.help.webapp:0.0.0,3.3.2.v20071102_33x,org.eclipse.help.base:0.0.0,3.3.1.v20070813_33x,org.eclipse.help.ui:0.0.0,3.3.2.v20071126_33x,org.eclipse.help.appserver:0.0.0,3.1.200.v20070510,org.eclipse.ltk.core.refactoring:0.0.0,3.3.1.r332_20080128,org.eclipse.ltk.ui.refactoring:0.0.0,3.3.1.r332_20080128,org.eclipse.platform:0.0.0,3.3.3.r33x_r20080129,org.eclipse.platform.doc.user:0.0.0,3.3.0.M20070913-1400,org.eclipse.search:0.0.0,3.3.1.r331_v20070831-0800,org.eclipse.team.core:0.0.0,3.3.1.r33x_20080128,org.eclipse.team.ui:0.0.0,3.3.2.r33x_20080128,org.eclipse.tomcat:0.0.0,4.1.230.v20070531,org.eclipse.text:0.0.0,3.3.0.v20070606-0010,org.eclipse.jface.text:0.0.0,3.3.2.r332_20071017-0800,org.eclipse.jsch.core:0.0.0,1.0.0.I20070426,org.eclipse.jsch.ui:0.0.0,1.0.1.r33x_20070709,org.eclipse.ui.console:0.0.0,3.2.2.v20071031_r332,org.eclipse.ui.presentations.r21:0.0.0,3.2.100.I20070605-0010,org.eclipse.ui.intro:0.0.0,3.2.101.v20070827_33x,org.eclipse.ui.intro.universal:0.0.0,3.2.100.v20070530A,org.eclipse.ui.cheatsheets:0.0.0,3.3.1.v20080125_33x,org.eclipse.ui.browser:0.0.0,3.2.100.v20070524A,org.eclipse.ui.navigator:0.0.0,3.3.2.M20080207-0800,org.eclipse.ui.navigator.resources:0.0.0,3.3.1.M20070831-2000,org.eclipse.ui.net:0.0.0,1.0.0.I20070516,org.eclipse.ui.workbench.texteditor:0.0.0,3.3.2.r332_20080109-0800,org.eclipse.ui.views:0.0.0,3.2.101.M20080207-0800,org.eclipse.ui.editors:0.0.0,3.3.2.r332_20080109-0800,org.eclipse.ui.forms:0.0.0,3.3.0.v20070511,org.eclipse.ui.externaltools:0.0.0,3.1.200.v20070416,org.eclipse.ui.ide:0.0.0,3.3.2.M20080207-0800,org.eclipse.ui.ide.application:0.0.0,1.0.0.I20070530-0100,org.eclipse.ui.win32:0.0.0,3.2.100.I20070319-0010,org.eclipse.update.core:0.0.0,3.2.101.R33x_v20070911,org.eclipse.update.scheduler:0.0.0,3.2.100.v20070615,org.eclipse.update.ui:0.0.0,3.2.100.v20070615,org.eclipse.ui.workbench.compatibility:0.0.0,3.2.0.I20070319-0010,org.eclipse.core.filesystem.hpux.ia64_32:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.linux.ppc:0.0.0,1.0.100.v20070430,org.eclipse.core.filesystem.freebsd.x86:0.0.0,1.1.0.v20070416,org.eclipse.core.filesystem.linux.x86:0.0.0,1.1.0.v20070416,org.eclipse.core.filesystem.freebsd.amd64:0.0.0,1.0.100.v20070510,org.eclipse.core.filesystem.linux.x86_64:0.0.0,1.0.100.v20070510,org.eclipse.core.filesystem.solaris.sparc:0.0.0,1.0.100.v20070425,org.eclipse.core.filesystem.macosx:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86:0.0.0,1.1.0.v20070510,org.eclipse.core.resources.win32:0.0.0,3.3.0.v20070226,org.eclipse.update.core.freebsd:0.0.0,3.2.0.v20070615,org.eclipse.update.core.linux:0.0.0,3.2.0.v20070615,org.eclipse.update.core.win32:0.0.0,3.2.100.v20070615,org.eclipse.ui.views.properties.tabbed:0.0.0,3.3.1.M20070831-0800,org.eclipse.core.runtime.compatibility.registry:0.0.0,3.2.100.v20070316,org.mortbay.jetty:0.0.0,5.1.11.v200706111724,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="rootFileswin32_win32_x86">
@@ -522,28 +522,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="rootFilesfreebsd_gtk_amd64">
-		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/>
-		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}/about_files/freebsd.gtk.amd64">
-				<include name="**"/>
-			</fileset>
-			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64">
-				<include name="**"/>
-			</fileset>
-			<fileset dir="${basedir}/gtk">
-				<include name="**"/>
-			</fileset>
-			<fileset dir="${basedir}/rootfiles">
-				<include name="**"/>
-			</fileset>
-			<fileset dir="${basedir}/../../plugins/org.eclipse.platform">
-				<include name="startup.jar"/>
-			</fileset>
-		</copy>
-		<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_x86">
 		<mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/>
 		<copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
@@ -604,6 +582,28 @@
 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="*.so*" /> 
 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> 
 	</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">
+			<fileset dir="${basedir}/about_files/freebsd.gtk.amd64">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/gtk">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../plugins/org.eclipse.platform">
+				<include name="startup.jar"/>
+			</fileset>
+		</copy>
+		<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_x86_64">
 		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/"/>
 		<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true">
@@ -844,10 +844,10 @@
 		<antcall target="rootFileswin32_wpf_x86"/>
 		<antcall target="rootFilesmacosx_carbon_ppc"/>
 		<antcall target="rootFilesfreebsd_gtk_x86"/>
-		<antcall target="rootFilesfreebsd_gtk_amd64"/>
 		<antcall target="rootFileslinux_gtk_x86"/>
 		<antcall target="rootFileslinux_gtk_ppc"/>
 		<antcall target="rootFileslinux_gtk_ppc64"/>
+		<antcall target="rootFilesfreebsd_gtk_amd64"/>
 		<antcall target="rootFileslinux_gtk_x86_64"/>
 		<antcall target="rootFileslinux_gtk_ia64"/>
 		<antcall target="rootFileslinux_gtk_s390"/>
@@ -874,7 +874,7 @@
 			<param name="feature.base" value="${feature.temp.folder}"/>
 			<param name="os" value="*"/>
 		</antcall>
-		<zip destfile="${feature.destination}/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
+		<zip destfile="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
@@ -882,11 +882,11 @@
 		<delete dir="${feature.temp.folder}"/>
 		<mkdir dir="${feature.temp.folder}"/>
 		<antcall target="all.children">
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.platform.source_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G/src"/>
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.platform.source_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft/src"/>
 			<param name="include.children" value="true"/>
 			<param name="target" value="gather.sources"/>
 		</antcall>
-		<zip destfile="${feature.destination}/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip destfile="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
@@ -898,15 +898,15 @@
 			<param name="include.children" value="true"/>
 			<param name="target" value="gather.logs"/>
 		</antcall>
-		<zip destfile="${feature.destination}/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip destfile="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the feature: org.eclipse.platform of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G.jar"/>
-		<delete file="${feature.destination}/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G.bin.dist.zip"/>
-		<delete file="${feature.destination}/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G.log.zip"/>
-		<delete file="${feature.destination}/org.eclipse.platform_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G.src.zip"/>
+		<delete file="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.jar"/>
+		<delete file="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.bin.dist.zip"/>
+		<delete file="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.log.zip"/>
+		<delete file="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.src.zip"/>
 		<delete dir="${feature.temp.folder}"/>
 		<antcall target="all.children">
 			<param name="target" value="clean"/>
@@ -914,7 +914,7 @@
 	</target>
 
 	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/builds/I200706251500/src/features/org.eclipse.platform/" property="resourcePath"/>
+		<eclipse.convertPath fileSystemPath="/builds/M200802211800/src/features/org.eclipse.platform/" property="resourcePath"/>
 		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
 		<antcall target="all.children">
 			<param name="target" value="refresh"/>
@@ -922,7 +922,7 @@
 	</target>
 	<target name="gather.sources">
 		<antcall target="children">
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.platform.source_3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G/src"/>
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.platform.source_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft/src"/>
 			<param name="target" value="gather.sources"/>
 		</antcall>
 	</target>
diff --git a/java/eclipse-devel/files/org.eclipse.rcp-build.xml b/java/eclipse-devel/files/org.eclipse.rcp-build.xml
index 858727a4088b..66ef7881f6d7 100644
--- a/java/eclipse-devel/files/org.eclipse.rcp-build.xml
+++ b/java/eclipse-devel/files/org.eclipse.rcp-build.xml
@@ -32,6 +32,11 @@
 			<property name="os" value="aix"/>
 			<property name="ws" value="motif"/>
 		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.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.equinox.launcher.gtk.linux.x86_64" target="${target}">
 			<property name="arch" value="x86_64"/>
 			<property name="os" value="linux"/>
@@ -52,19 +57,14 @@
 			<property name="os" value="linux"/>
 			<property name="ws" value="gtk"/>
 		</ant>
-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86" target="${target}">
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.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.equinox.launcher.gtk.freebsd.amd64" target="${target}">
-			<property name="arch" value="amd64"/>
-			<property name="os" value="freebsd"/>
+			<property name="os" value="linux"/>
 			<property name="ws" value="gtk"/>
 		</ant>
-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.x86" target="${target}">
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86" target="${target}">
 			<property name="arch" value="x86"/>
-			<property name="os" value="linux"/>
+			<property name="os" value="freebsd"/>
 			<property name="ws" value="gtk"/>
 		</ant>
 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.ppc" target="${target}">
@@ -157,19 +157,14 @@
 			<property name="os" value="linux"/>
 			<property name="ws" value="gtk"/>
 		</ant>
-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.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.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.gtk.freebsd.amd64" target="${target}">
-			<property name="arch" value="amd64"/>
-			<property name="os" value="freebsd"/>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.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.swt.wpf.win32.x86" target="${target}">
@@ -257,6 +252,11 @@
 			<property name="os" value="win32"/>
 			<property name="ws" value="win32"/>
 		</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.x86_64" target="${target}">
 			<property name="arch" value="x86_64"/>
 			<property name="os" value="linux"/>
@@ -332,17 +332,17 @@
 			<param name="os" value="*"/>
 			<param name="feature.base" value="${feature.temp.folder}"/>
 		</antcall>
-		<jar destfile="${feature.destination}/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG.jar" basedir="${feature.temp.folder}/features/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
+		<jar destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.jar" basedir="${feature.temp.folder}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="feature.base">
-		<mkdir dir="${feature.base}/features/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
+		<mkdir dir="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc"/>
 		<antcall target="children">
 			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
 			<param name="target" value="gather.bin.parts"/>
 		</antcall>
-		<copy todir="${feature.base}/features/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG" failonerror="true" overwrite="false">
+		<copy todir="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}">
 				<include name="feature.xml"/>
 				<include name="license.html"/>
@@ -351,7 +351,7 @@
 				<include name="eclipse_update_120.jpg"/>
 			</fileset>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG/feature.xml"  selfVersion="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.6.1.v20070417,org.eclipse.core.commands:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.databinding:0.0.0,1.0.0.I20070606-0010,org.eclipse.core.databinding.beans:0.0.0,1.0.0.I20070606-0010,org.eclipse.core.jobs:0.0.0,3.3.0.v20070423,org.eclipse.core.expressions:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.runtime:0.0.0,3.3.100.v20070530,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.3.0.v20070530,org.eclipse.help:0.0.0,3.3.0.v20070524,org.eclipse.swt:0.0.0,3.3.0.v3346,org.eclipse.jface:0.0.0,3.3.0.I20070606-0010,org.eclipse.jface.databinding:0.0.0,1.1.0.I20070606-0010,org.eclipse.ui:0.0.0,3.3.0.I20070614-0800,org.eclipse.ui.workbench:0.0.0,3.3.0.I20070608-1100,org.eclipse.ui.carbon:0.0.0,3.2.100.I20070605-0010,org.eclipse.update.configurator:0.0.0,3.2.100.v20070615,org.eclipse.swt.win32.win32.x86:0.0.0,3.3.0.v3346,org.eclipse.swt.wpf.win32.x86:0.0.0,3.3.0.v3346,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.3.0.v3346,org.eclipse.swt.gtk.freebsd.amd64:0.0.0,3.3.0.v3346,org.eclipse.swt.gtk.linux.x86:0.0.0,3.3.0.v3346,org.eclipse.swt.gtk.linux.s390:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.3.0.v3346,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.3.0.v3346,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.3.0.v3346,org.eclipse.swt.carbon.macosx:0.0.0,3.3.0.v3346,org.eclipse.swt.motif.aix.ppc:0.0.0,3.3.0.v3346,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.3.0.v3345a,org.eclipse.swt.motif.linux.x86:0.0.0,3.3.0.v3346,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.3.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.3.0.v3346,org.eclipse.swt.photon.qnx.x86:0.0.0,3.3.0.v3346,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.3.0.HEAD,org.eclipse.rcp:0.0.0,3.2.0.v20070612,org.eclipse.core.contenttype:0.0.0,3.2.100.v20070319,org.eclipse.equinox.app:0.0.0,1.0.0.v20070606,org.eclipse.equinox.common:0.0.0,3.3.0.v20070426,org.eclipse.equinox.preferences:0.0.0,3.2.100.v20070522,org.eclipse.equinox.registry:0.0.0,3.3.0.v20070522,org.eclipse.equinox.launcher:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.freebsd.x86:0.0.0,1.0.0.v20070524,org.eclipse.equinox.launcher.gtk.freebsd.amd64:0.0.0,1.0.0.v20070524,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.0.v20070524,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.0.v20070524,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.0.v20070219,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.0.v20070523,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.0.v20070523,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/feature.xml"  selfVersion="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.6.1.v20070906,org.eclipse.core.commands:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.databinding:0.0.0,1.0.1.M20070822-0800,org.eclipse.core.databinding.beans:0.0.0,1.0.1.M20070910-0800b,org.eclipse.core.jobs:0.0.0,3.3.1.R33x_v20070709,org.eclipse.core.expressions:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.runtime:0.0.0,3.3.100.v20070530,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.3.2.R33x_v20080105,org.eclipse.help:0.0.0,3.3.2.v20071126_33x,org.eclipse.swt:0.0.0,3.3.2.v3349d,org.eclipse.jface:0.0.0,3.3.2.M20080207-0800,org.eclipse.jface.databinding:0.0.0,1.1.1.M20080207-0800,org.eclipse.ui:0.0.0,3.3.1.M20071128-0800,org.eclipse.ui.workbench:0.0.0,3.3.2.M20080207-0800,org.eclipse.ui.carbon:0.0.0,3.2.100.I20070605-0010,org.eclipse.update.configurator:0.0.0,3.2.101.R33x_v20070810,org.eclipse.swt.win32.win32.x86:0.0.0,3.3.3.v3349,org.eclipse.swt.wpf.win32.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.s390:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.freebsd.amd64:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.3.2.v3349,org.eclipse.swt.carbon.macosx:0.0.0,3.3.3.v3349,org.eclipse.swt.motif.aix.ppc:0.0.0,3.3.1.v3349,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.3.1.v3348,org.eclipse.swt.motif.linux.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.3.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.3.1.v3349,org.eclipse.swt.photon.qnx.x86:0.0.0,3.3.1.v3349,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.3.0.HEAD,org.eclipse.rcp:0.0.0,3.2.1.r33x_r20080131,org.eclipse.core.contenttype:0.0.0,3.2.100.v20070319,org.eclipse.equinox.app:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.common:0.0.0,3.3.0.v20070426,org.eclipse.equinox.preferences:0.0.0,3.2.101.R33x_v20080117,org.eclipse.equinox.registry:0.0.0,3.3.1.R33x_v20070802,org.eclipse.equinox.launcher:0.0.0,1.0.1.R33x_v20080118,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.freebsd.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.freebsd.amd64:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.1.R33x_v20070803,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.3.R33x_v20080118,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="rootFileswin32_win32_x86">
@@ -405,25 +405,6 @@
 			<arg line="eclipse"/>
 		</exec>
 	</target>
-	<target name="rootFileslinux_gtk_x86">
-		<mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/>
-		<copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86">
-				<include name="**"/>
-			</fileset>
-			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86">
-				<include name="**"/>
-			</fileset>
-			<fileset dir="${basedir}/rootfiles">
-				<include name="**"/>
-			</fileset>
-			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> 
-		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> 
-	</target>
 	<target name="rootFilesfreebsd_gtk_x86">
 		<mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/>
 		<copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
@@ -443,13 +424,13 @@
 		<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="rootFilesfreebsd_gtk_amd64">
-		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/>
-		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64">
+	<target name="rootFileslinux_gtk_x86">
+		<mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/>
+		<copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86">
 				<include name="**"/>
 			</fileset>
-			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64">
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86">
 				<include name="**"/>
 			</fileset>
 			<fileset dir="${basedir}/rootfiles">
@@ -459,8 +440,8 @@
 				<include name="**"/>
 			</fileset>
 		</copy>
-		<chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> 
-		<chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> 
+		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> 
+		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> 
 	</target>
 	<target name="rootFileslinux_gtk_ppc">
 		<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}/"/>
@@ -489,6 +470,25 @@
 		</copy>
 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> 
 	</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">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/rootfiles">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
+				<include name="**"/>
+			</fileset>
+		</copy>
+		<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_x86_64">
 		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/"/>
 		<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true">
@@ -687,10 +687,10 @@
 		<antcall target="rootFileswin32_wpf_x86"/>
 		<antcall target="rootFilesmacosx_carbon_ppc"/>
 		<antcall target="rootFilesfreebsd_gtk_x86"/>
-		<antcall target="rootFilesfreebsd_gtk_amd64"/>
 		<antcall target="rootFileslinux_gtk_x86"/>
 		<antcall target="rootFileslinux_gtk_ppc"/>
 		<antcall target="rootFileslinux_gtk_ppc64"/>
+		<antcall target="rootFilesfreebsd_gtk_amd64"/>
 		<antcall target="rootFileslinux_gtk_x86_64"/>
 		<antcall target="rootFileslinux_gtk_ia64"/>
 		<antcall target="rootFileslinux_gtk_s390"/>
@@ -717,7 +717,7 @@
 			<param name="feature.base" value="${feature.temp.folder}"/>
 			<param name="os" value="*"/>
 		</antcall>
-		<zip destfile="${feature.destination}/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
+		<zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
@@ -725,11 +725,11 @@
 		<delete dir="${feature.temp.folder}"/>
 		<mkdir dir="${feature.temp.folder}"/>
 		<antcall target="all.children">
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG/src"/>
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/src"/>
 			<param name="include.children" value="true"/>
 			<param name="target" value="gather.sources"/>
 		</antcall>
-		<zip destfile="${feature.destination}/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
@@ -741,15 +741,15 @@
 			<param name="include.children" value="true"/>
 			<param name="target" value="gather.logs"/>
 		</antcall>
-		<zip destfile="${feature.destination}/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the feature: org.eclipse.rcp of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG.jar"/>
-		<delete file="${feature.destination}/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG.bin.dist.zip"/>
-		<delete file="${feature.destination}/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG.log.zip"/>
-		<delete file="${feature.destination}/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG.src.zip"/>
+		<delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.jar"/>
+		<delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.bin.dist.zip"/>
+		<delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.log.zip"/>
+		<delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.src.zip"/>
 		<delete dir="${feature.temp.folder}"/>
 		<antcall target="all.children">
 			<param name="target" value="clean"/>
@@ -757,7 +757,7 @@
 	</target>
 
 	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/builds/I200706251500/src/features/org.eclipse.rcp/" property="resourcePath"/>
+		<eclipse.convertPath fileSystemPath="/builds/M200802211800/src/features/org.eclipse.rcp/" property="resourcePath"/>
 		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
 		<antcall target="all.children">
 			<param name="target" value="refresh"/>
@@ -765,7 +765,7 @@
 	</target>
 	<target name="gather.sources">
 		<antcall target="children">
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG/src"/>
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/src"/>
 			<param name="target" value="gather.sources"/>
 		</antcall>
 	</target>
diff --git a/java/eclipse-devel/files/patch-assemble-sdk-freebsd-gtk-amd64.xml b/java/eclipse-devel/files/patch-assemble-sdk-freebsd-gtk-amd64.xml
index b0a4864b7bb6..f5cf21777a4d 100644
--- a/java/eclipse-devel/files/patch-assemble-sdk-freebsd-gtk-amd64.xml
+++ b/java/eclipse-devel/files/patch-assemble-sdk-freebsd-gtk-amd64.xml
@@ -1,90 +1,97 @@
---- assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml.orig	2007-10-23 13:56:54.000000000 +0900
-+++ assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml	2007-10-23 14:02:23.000000000 +0900
-@@ -11,6 +11,10 @@
+--- assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml.orig	2008-03-11 00:23:57.000000000 +0900
++++ assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml	2008-03-11 01:00:02.000000000 +0900
+@@ -11,6 +11,9 @@
  	<property name="eclipse.features" value="${eclipse.base}/features"/>
  	<property name="archiveFullPath" value="${basedir}/${buildLabel}/${archiveName}"/>
  	<property name="tarargs" value=""/>
 +	<condition property="jdk16">
 +		<isset property="JavaSE-1.6"/>
 +	</condition>
-+
  	<!-- Beginning of the jarUp task -->
  	<target name="jarUp" description="Create a jar from the given location.">
  		<available property="${source}/${elementName}_exists" file="${source}/${elementName}"/>
-@@ -65,9 +69,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.externaltools" target="gather.bin.parts">
+@@ -50,9 +53,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui.templates" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -164,9 +165,6 @@
+@@ -128,9 +128,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.app" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -143,15 +140,15 @@
  		<ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ui" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.commands" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.intro.universal" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -314,9 +312,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.cvs.source" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
++		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
++			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
++		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jsch.core" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -188,9 +185,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.compare" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.junit.runtime" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jsch.ui" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -482,10 +477,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jdt.junit_3.3.1.r331_v20070829"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -598,10 +589,6 @@
+@@ -474,10 +468,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.core.commands_3.3.0.I20070605-0010"/>
+ 			<param name="elementName" value="org.eclipse.help_3.3.2.v20071126_33x"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -778,10 +765,6 @@
+@@ -590,10 +580,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.pde.junit.runtime_3.3.0.v20070608-1300"/>
+ 			<param name="elementName" value="org.eclipse.jdt.junit.runtime_3.3.0.v20070606-0010"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -892,6 +875,9 @@
+@@ -892,6 +878,9 @@
  			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.ui.intro_3.2.101.v20070827_33x"/>
+ 			<param name="elementName" value="org.eclipse.team.core_3.3.1.r33x_20080128"/>
  		</antcall>
 +
-+		<antcall target="main.jdk16" inheritAll="true"/>
++		<antcall target="main.jdk16" inheritAll="true" />
 +
  		<eclipse.brand root="${eclipse.base}/freebsd.gtk.amd64/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
  		<exec executable="cp" dir="${basedir}">
  			<arg line="-r &apos;${assemblyTempDir}/${collectingFolder}/freebsd.gtk.amd64/${collectingFolder}&apos; &apos;${assemblyTempDir}&apos;"/>
-@@ -909,6 +895,31 @@
+@@ -909,6 +898,31 @@
  		</exec>
  		<delete dir="${assemblyTempDir}"/>
  	</target>
@@ -101,15 +108,15 @@
 +		</ant>
 +		<antcall target="jarUp">
 +			<param name="source" value="${eclipse.plugins}" />
-+			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435" />
++			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100" />
 +		</antcall>
 +		<antcall target="jarUp">
 +			<param name="source" value="${eclipse.plugins}" />
-+			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435" />
++			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100" />
 +		</antcall>
 +		<antcall target="jarUp">
 +			<param name="source" value="${eclipse.plugins}" />
-+			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x" />
++			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x" />
 +		</antcall>
 +	</target>
 +
diff --git a/java/eclipse-devel/files/patch-assemble-sdk-freebsd-gtk-x86.xml b/java/eclipse-devel/files/patch-assemble-sdk-freebsd-gtk-x86.xml
index c6dde7ee611e..45d2d2245bb0 100644
--- a/java/eclipse-devel/files/patch-assemble-sdk-freebsd-gtk-x86.xml
+++ b/java/eclipse-devel/files/patch-assemble-sdk-freebsd-gtk-x86.xml
@@ -1,126 +1,91 @@
---- assemble.org.eclipse.sdk.freebsd.gtk.x86.xml.orig	Sun Oct 21 11:04:01 2007
-+++ assemble.org.eclipse.sdk.freebsd.gtk.x86.xml	Sun Oct 21 16:46:44 2007
-@@ -11,6 +11,11 @@
+--- assemble.org.eclipse.sdk.freebsd.gtk.x86.xml.orig	2008-03-08 12:58:43.000000000 +0900
++++ assemble.org.eclipse.sdk.freebsd.gtk.x86.xml	2008-03-08 13:35:32.000000000 +0900
+@@ -11,6 +11,9 @@
  	<property name="eclipse.features" value="${eclipse.base}/features"/>
  	<property name="archiveFullPath" value="${basedir}/${buildLabel}/${archiveName}"/>
  	<property name="tarargs" value=""/>
-+
 +	<condition property="jdk16">
 +		<isset property="JavaSE-1.6"/>
 +	</condition>
-+
  	<!-- Beginning of the jarUp task -->
  	<target name="jarUp" description="Create a jar from the given location.">
  		<available property="${source}/${elementName}_exists" file="${source}/${elementName}"/>
-@@ -29,7 +34,7 @@
- 		<eclipse.jarProcessor sign="${jarProcessor.sign}" pack="${jarProcessor.pack200}" unsign="${jarProcessor.unsign}" jar="${source}/${elementName}.jar" alias="${sign.alias}" keystore="${sign.keystore}" storepass="${sign.storepass}"/>
- 	</target>
- 	<!-- End of the jarUp task -->
--	<target name="main">
-+	<target name="main" >
- 		<condition property="pluginArchivePrefix" value="plugins">
- 			<equals arg1="${archivePrefix}"  arg2="" trim="true"/>
- 		</condition>
-@@ -65,9 +70,7 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.externaltools" target="gather.bin.parts">
+@@ -50,9 +53,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui.templates" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
-+
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -161,9 +164,7 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ui" target="gather.bin.parts">
+@@ -134,9 +134,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
-+
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.commands" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.app" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -311,9 +312,7 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.cvs.source" target="gather.bin.parts">
+@@ -146,9 +143,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ui" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
-+
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.junit.runtime" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.intro.universal" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -480,10 +479,7 @@
- 			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.ui.externaltools_3.1.200.v20070416"/>
+@@ -474,10 +468,6 @@
  		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x"/>
+-		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
--		</antcall>
-+
+ 			<param name="elementName" value="org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349"/>
+ 		</antcall>
  		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jdt.junit_3.3.1.r331_v20070829"/>
-@@ -596,10 +592,7 @@
- 			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.team.cvs.ui_3.3.1.r33x_20070807"/>
+@@ -574,10 +564,6 @@
  		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100"/>
+-		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
--		</antcall>
-+
+ 			<param name="elementName" value="org.eclipse.equinox.app_1.0.1.R33x_v20070828"/>
+ 		</antcall>
  		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.core.commands_3.3.0.I20070605-0010"/>
-@@ -776,10 +769,7 @@
- 			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.debug.core_3.3.1.v20070731_r331"/>
+@@ -590,10 +576,6 @@
  		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100"/>
+-		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
--		</antcall>
-+
+ 			<param name="elementName" value="org.eclipse.jdt.junit.runtime_3.3.0.v20070606-0010"/>
+ 		</antcall>
  		<antcall target="jarUp">
+@@ -892,6 +874,9 @@
  			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.pde.junit.runtime_3.3.0.v20070608-1300"/>
-@@ -892,23 +882,51 @@
- 			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.ui.intro_3.2.101.v20070827_33x"/>
+ 			<param name="elementName" value="org.eclipse.team.core_3.3.1.r33x_20080128"/>
  		</antcall>
--		<eclipse.brand root="${eclipse.base}/freebsd.gtk.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
 +
 +		<antcall target="main.jdk16" inheritAll="true"/>
 +
-+		<eclipse.brand root="${eclipse.base}/freebsd.gtk.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
+ 		<eclipse.brand root="${eclipse.base}/freebsd.gtk.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
  		<exec executable="cp" dir="${basedir}">
--			<arg line="-r &apos;${assemblyTempDir}/${collectingFolder}/freebsd.gtk.x86/${collectingFolder}&apos; &apos;${assemblyTempDir}&apos;"/>
-+			<arg line="-r &apos;${assemblyTempDir}/${collectingFolder}/freebsd.gtk.x86/${collectingFolder}&apos; &apos;${assemblyTempDir}&apos;" />
- 		</exec>
- 		<exec executable="rm" dir="${basedir}">
--			<arg line="-rf &apos;${assemblyTempDir}/${collectingFolder}/freebsd.gtk.x86&apos;"/>
-+			<arg line="-rf &apos;${assemblyTempDir}/${collectingFolder}/freebsd.gtk.x86&apos;" />
- 		</exec>
- 		<exec executable="tar" dir="${assemblyTempDir}">
--			<arg line="${tarargs}-cvf &apos;${archiveFullPath}&apos; ${archivePrefix} "/>
-+			<arg line="${tarargs}-cvf &apos;${archiveFullPath}&apos; ${archivePrefix} " />
- 		</exec>
--		<antcall target="gzipResults"/>
-+		<antcall target="gzipResults" />
- 		<exec executable="rm">
--			<arg line="-rf"/>
--			<arg line="&apos;${assemblyTempDir}&apos;"/>
-+			<arg line="-rf" />
-+			<arg line="&apos;${assemblyTempDir}&apos;" />
+ 			<arg line="-r &apos;${assemblyTempDir}/${collectingFolder}/freebsd.gtk.x86/${collectingFolder}&apos; &apos;${assemblyTempDir}&apos;"/>
+@@ -909,6 +894,31 @@
  		</exec>
--		<delete dir="${assemblyTempDir}"/>
-+		<delete dir="${assemblyTempDir}" />
+ 		<delete dir="${assemblyTempDir}"/>
  	</target>
 +
 +	<target name="main.jdk16" if="jdk16">
@@ -135,15 +100,15 @@
 +		</ant>
 +		<antcall target="jarUp">
 +			<param name="source" value="${eclipse.plugins}" />
-+			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435" />
++			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100" />
 +		</antcall>
 +		<antcall target="jarUp">
 +			<param name="source" value="${eclipse.plugins}" />
-+			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435" />
++			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100" />
 +		</antcall>
 +		<antcall target="jarUp">
 +			<param name="source" value="${eclipse.plugins}" />
-+			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x" />
++			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x" />
 +		</antcall>
 +	</target>
 +
diff --git a/java/eclipse-devel/files/patch-features-jdt-feature.xml b/java/eclipse-devel/files/patch-features-jdt-feature.xml
new file mode 100644
index 000000000000..a5865b096491
--- /dev/null
+++ b/java/eclipse-devel/files/patch-features-jdt-feature.xml
@@ -0,0 +1,32 @@
+--- features/org.eclipse.jdt/feature.xml.orig	2008-02-22 09:09:09.000000000 +0900
++++ features/org.eclipse.jdt/feature.xml	2008-03-11 00:19:04.000000000 +0900
+@@ -52,29 +52,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.jdt.apt.pluggable.core"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.jdt.compiler.apt"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.jdt.compiler.tool"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.jdt.core"
+          download-size="0"
+          install-size="0"
diff --git a/java/eclipse-devel/files/patch-features-platform-build.xml b/java/eclipse-devel/files/patch-features-platform-build.xml
deleted file mode 100644
index cc56d98ff957..000000000000
--- a/java/eclipse-devel/files/patch-features-platform-build.xml
+++ /dev/null
@@ -1,91 +0,0 @@
---- features/org.eclipse.platform/build.xml.orig	2007-06-26 04:39:42.000000000 +0900
-+++ features/org.eclipse.platform/build.xml	2007-09-02 14:11:58.000000000 +0900
-@@ -57,6 +57,16 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
-+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.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.core.filesystem.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.core.filesystem.linux.ppc" target="${target}">
- 			<property name="arch" value="ppc"/>
- 			<property name="os" value="linux"/>
-@@ -127,6 +137,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
-+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" 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.ant.core" target="${target}">
- 			<property name="arch" value="x86"/>
- 			<property name="os" value="win32"/>
-@@ -485,6 +500,50 @@
- 			<arg line="eclipse"/>
- 		</exec>
- 	</target>
-+	<target name="rootFilesfreebsd_gtk_x86">
-+		<mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/>
-+		<copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
-+			<fileset dir="${basedir}/about_files/freebsd.gtk.x86">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/gtk">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/rootfiles">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/../../plugins/org.eclipse.platform">
-+				<include name="startup.jar"/>
-+			</fileset>
-+		</copy>
-+		<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="rootFilesfreebsd_gtk_amd64">
-+		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/>
-+		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true">
-+			<fileset dir="${basedir}/about_files/freebsd.gtk.amd64">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/gtk">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/rootfiles">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/../../plugins/org.eclipse.platform">
-+				<include name="startup.jar"/>
-+			</fileset>
-+		</copy>
-+		<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_x86">
- 		<mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/>
- 		<copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
-@@ -784,6 +843,8 @@
- 		<antcall target="rootFileswin32_win32_x86"/>
- 		<antcall target="rootFileswin32_wpf_x86"/>
- 		<antcall target="rootFilesmacosx_carbon_ppc"/>
-+		<antcall target="rootFilesfreebsd_gtk_x86"/>
-+		<antcall target="rootFilesfreebsd_gtk_amd64"/>
- 		<antcall target="rootFileslinux_gtk_x86"/>
- 		<antcall target="rootFileslinux_gtk_ppc"/>
- 		<antcall target="rootFileslinux_gtk_ppc64"/>
diff --git a/java/eclipse-devel/files/patch-features-platform-source-feature.xml b/java/eclipse-devel/files/patch-features-platform-source-feature.xml
deleted file mode 100644
index 0fc2281b64ba..000000000000
--- a/java/eclipse-devel/files/patch-features-platform-source-feature.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- features/org.eclipse.platform.source/feature.xml.orig	2007-09-22 01:26:58.000000000 +0900
-+++ features/org.eclipse.platform.source/feature.xml	2007-10-10 20:19:31.000000000 +0900
-@@ -38,6 +38,8 @@
- 	<plugin ws="gtk"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.gtk.sparc" version="3.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
- 	<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.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
- 	<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.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
-+	<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.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
-+	<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.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
- 	<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.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.motif.sparc" version="3.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390" version="3.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
diff --git a/java/eclipse-devel/files/patch-features-rcp-build.xml b/java/eclipse-devel/files/patch-features-rcp-build.xml
new file mode 100644
index 000000000000..77e36c5ac94f
--- /dev/null
+++ b/java/eclipse-devel/files/patch-features-rcp-build.xml
@@ -0,0 +1,38 @@
+--- features/org.eclipse.rcp/feature.xml.orig	2008-02-22 09:17:35.000000000 +0900
++++ features/org.eclipse.rcp/feature.xml	2008-03-10 18:21:58.000000000 +0900
+@@ -168,6 +168,17 @@
+          unpack="false"/>
+ 
+    <plugin
++         id="org.eclipse.swt.gtk.freebsd.x86"
++         os="freebsd"
++         ws="gtk"
++         arch="x86"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.swt.gtk.linux.x86"
+          os="linux"
+          ws="gtk"
+@@ -234,6 +245,17 @@
+          unpack="false"/>
+ 
+    <plugin
++         id="org.eclipse.swt.gtk.freebsd.amd64"
++         os="freebsd"
++         ws="gtk"
++         arch="amd64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.swt.gtk.linux.x86_64"
+          os="linux"
+          ws="gtk"
diff --git a/java/eclipse-devel/files/patch-features-rcp-source-feature.xml b/java/eclipse-devel/files/patch-features-rcp-source-feature.xml
deleted file mode 100644
index 135035d8e361..000000000000
--- a/java/eclipse-devel/files/patch-features-rcp-source-feature.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- features/org.eclipse.rcp.source/feature.xml.orig	2007-09-22 01:25:26.000000000 +0900
-+++ features/org.eclipse.rcp.source/feature.xml	2007-10-10 20:29:56.000000000 +0900
-@@ -26,6 +26,8 @@
- 	<plugin ws="carbon"  os="macosx" fragment="true" arch="ppc" download-size="0" install-size="0" id="org.eclipse.rcp.source.macosx.carbon.ppc" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
- 	<plugin ws="motif"  os="aix" fragment="true" arch="ppc" download-size="0" install-size="0" id="org.eclipse.rcp.source.aix.motif.ppc" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
-+	<plugin ws="gtk"  os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.freebsd.gtk.x86" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
-+	<plugin ws="gtk"  os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.rcp.source.freebsd.gtk.amd64" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
- 	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.win32.win32.x86" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
diff --git a/java/eclipse-devel/files/patch-features_org.eclipse.rcp_build.xml b/java/eclipse-devel/files/patch-features_org.eclipse.rcp_build.xml
deleted file mode 100644
index bd133d2739bc..000000000000
--- a/java/eclipse-devel/files/patch-features_org.eclipse.rcp_build.xml
+++ /dev/null
@@ -1,99 +0,0 @@
---- features/org.eclipse.rcp/build.xml.orig	2007-09-22 01:27:03.000000000 +0900
-+++ features/org.eclipse.rcp/build.xml	2007-10-10 20:45:10.000000000 +0900
-@@ -57,6 +57,16 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
-+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.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.equinox.launcher.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.equinox.launcher.gtk.linux.ppc" target="${target}">
- 			<property name="arch" value="ppc"/>
- 			<property name="os" value="linux"/>
-@@ -152,6 +162,16 @@
- 			<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.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.wpf.win32.x86" target="${target}">
- 			<property name="arch" value="x86"/>
- 			<property name="os" value="win32"/>
-@@ -331,7 +351,7 @@
- 				<include name="eclipse_update_120.jpg"/>
- 			</fileset>
- 		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS/feature.xml"  selfVersion="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.6.1.v20070906,org.eclipse.core.commands:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.databinding:0.0.0,1.0.1.M20070822-0800,org.eclipse.core.databinding.beans:0.0.0,1.0.1.M20070910-0800b,org.eclipse.core.jobs:0.0.0,3.3.1.R33x_v20070709,org.eclipse.core.expressions:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.runtime:0.0.0,3.3.100.v20070530,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.3.1.R33x_v20070828,org.eclipse.help:0.0.0,3.3.1.v20070726_33x,org.eclipse.swt:0.0.0,3.3.1.v3346j,org.eclipse.jface:0.0.0,3.3.1.M20070910-0800b,org.eclipse.jface.databinding:0.0.0,1.1.1.M20070910-0800b,org.eclipse.ui:0.0.0,3.3.1.M20070910-0800b,org.eclipse.ui.workbench:0.0.0,3.3.1.M20070921-1200,org.eclipse.ui.carbon:0.0.0,3.2.100.I20070605-0010,org.eclipse.update.configurator:0.0.0,3.2.101.R33x_v20070810,org.eclipse.swt.win32.win32.x86:0.0.0,3.3.1.v3346i,org.eclipse.swt.wpf.win32.x86:0.0.0,3.3.0.v3346i,org.eclipse.swt.gtk.linux.x86:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.linux.s390:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.3.1.v3346i,org.eclipse.swt.carbon.macosx:0.0.0,3.3.1.v3346i,org.eclipse.swt.motif.aix.ppc:0.0.0,3.3.0.v3346i,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.3.0.v3346i,org.eclipse.swt.motif.linux.x86:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.3.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.3.0.v3346i,org.eclipse.swt.photon.qnx.x86:0.0.0,3.3.0.v3346i,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.3.0.HEAD,org.eclipse.rcp:0.0.0,3.2.0.v20070612,org.eclipse.core.contenttype:0.0.0,3.2.100.v20070319,org.eclipse.equinox.app:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.common:0.0.0,3.3.0.v20070426,org.eclipse.equinox.preferences:0.0.0,3.2.100.v20070522,org.eclipse.equinox.registry:0.0.0,3.3.1.R33x_v20070802,org.eclipse.equinox.launcher:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.1.R33x_v20070803,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.1.R33x_v20070828,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS/feature.xml"  selfVersion="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.6.1.v20070906,org.eclipse.core.commands:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.databinding:0.0.0,1.0.1.M20070822-0800,org.eclipse.core.databinding.beans:0.0.0,1.0.1.M20070910-0800b,org.eclipse.core.jobs:0.0.0,3.3.1.R33x_v20070709,org.eclipse.core.expressions:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.runtime:0.0.0,3.3.100.v20070530,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.3.1.R33x_v20070828,org.eclipse.help:0.0.0,3.3.1.v20070726_33x,org.eclipse.swt:0.0.0,3.3.1.v3346j,org.eclipse.jface:0.0.0,3.3.1.M20070910-0800b,org.eclipse.jface.databinding:0.0.0,1.1.1.M20070910-0800b,org.eclipse.ui:0.0.0,3.3.1.M20070910-0800b,org.eclipse.ui.workbench:0.0.0,3.3.1.M20070921-1200,org.eclipse.ui.carbon:0.0.0,3.2.100.I20070605-0010,org.eclipse.update.configurator:0.0.0,3.2.101.R33x_v20070810,org.eclipse.swt.win32.win32.x86:0.0.0,3.3.1.v3346i,org.eclipse.swt.wpf.win32.x86:0.0.0,3.3.0.v3346i,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.freebsd.amd64:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.linux.x86:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.linux.s390:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.3.1.v3346i,org.eclipse.swt.carbon.macosx:0.0.0,3.3.1.v3346i,org.eclipse.swt.motif.aix.ppc:0.0.0,3.3.0.v3346i,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.3.0.v3346i,org.eclipse.swt.motif.linux.x86:0.0.0,3.3.1.v3346i,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.3.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.3.0.v3346i,org.eclipse.swt.photon.qnx.x86:0.0.0,3.3.0.v3346i,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.3.0.HEAD,org.eclipse.rcp:0.0.0,3.2.0.v20070612,org.eclipse.core.contenttype:0.0.0,3.2.100.v20070319,org.eclipse.equinox.app:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.common:0.0.0,3.3.0.v20070426,org.eclipse.equinox.preferences:0.0.0,3.2.100.v20070522,org.eclipse.equinox.registry:0.0.0,3.3.1.R33x_v20070802,org.eclipse.equinox.launcher:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.freebsd.x86:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.freebsd.amd64:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.1.R33x_v20070803,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.1.R33x_v20070828,"/>
- 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
- 	</target>
- 	<target name="rootFileswin32_win32_x86">
-@@ -404,6 +424,44 @@
- 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> 
- 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> 
- 	</target>
-+	<target name="rootFilesfreebsd_gtk_x86">
-+		<mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/>
-+		<copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
-+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.x86">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/rootfiles">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
-+				<include name="**"/>
-+			</fileset>
-+		</copy>
-+		<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="rootFilesfreebsd_gtk_amd64">
-+		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/>
-+		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true">
-+			<fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/rootfiles">
-+				<include name="**"/>
-+			</fileset>
-+			<fileset dir="${basedir}/../org.eclipse.platform/rootfiles">
-+				<include name="**"/>
-+			</fileset>
-+		</copy>
-+		<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_ppc">
- 		<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}/"/>
- 		<copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}/" failonerror="true" overwrite="true">
-@@ -628,6 +686,8 @@
- 		<antcall target="rootFileswin32_win32_x86"/>
- 		<antcall target="rootFileswin32_wpf_x86"/>
- 		<antcall target="rootFilesmacosx_carbon_ppc"/>
-+		<antcall target="rootFilesfreebsd_gtk_x86"/>
-+		<antcall target="rootFilesfreebsd_gtk_amd64"/>
- 		<antcall target="rootFileslinux_gtk_x86"/>
- 		<antcall target="rootFileslinux_gtk_ppc"/>
- 		<antcall target="rootFileslinux_gtk_ppc64"/>
diff --git a/java/eclipse-devel/files/patch-plugins-compare-build.xml b/java/eclipse-devel/files/patch-plugin-compare-build.xml
index 90336f39d58b..4a82c3e16c68 100644
--- a/java/eclipse-devel/files/patch-plugins-compare-build.xml
+++ b/java/eclipse-devel/files/patch-plugin-compare-build.xml
@@ -1,27 +1,35 @@
---- plugins/org.eclipse.compare/build.xml.orig	2007-09-22 01:24:04.000000000 +0900
-+++ plugins/org.eclipse.compare/build.xml	2007-10-10 21:19:01.000000000 +0900
-@@ -133,6 +133,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
+--- plugins/org.eclipse.compare/build.xml.orig	2008-02-22 08:45:33.000000000 +0900
++++ plugins/org.eclipse.compare/build.xml	2008-03-10 16:48:47.000000000 +0900
+@@ -127,12 +127,16 @@
+ 			<pathelement path="../javax.servlet_2.4.0.v200706111738.jar"/>
+ 			<pathelement path="../org.eclipse.swt/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt_3.3.2.v3349d/@dot"/>
++			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_64_3.3.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/>
 +			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -209,6 +213,10 @@
+@@ -209,8 +213,12 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
 @@ -238,6 +246,8 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-core-filebuffers-build.xml b/java/eclipse-devel/files/patch-pluging-ltk-core-refactoring-build.xml
index 6cde4330cdd2..f23c439b4517 100644
--- a/java/eclipse-devel/files/patch-plugins-core-filebuffers-build.xml
+++ b/java/eclipse-devel/files/patch-pluging-ltk-core-refactoring-build.xml
@@ -1,13 +1,13 @@
---- plugins/org.eclipse.core.filebuffers/build.xml.orig	2007-06-26 04:39:42.000000000 +0900
-+++ plugins/org.eclipse.core.filebuffers/build.xml	2007-08-27 00:21:41.000000000 +0900
-@@ -148,6 +148,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
+--- plugins/org.eclipse.ltk.core.refactoring/build.xml.orig	2008-02-22 08:45:35.000000000 +0900
++++ plugins/org.eclipse.ltk.core.refactoring/build.xml	2008-03-10 16:52:01.000000000 +0900
+@@ -134,6 +134,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ant-ui-build.xml b/java/eclipse-devel/files/patch-plugins-ant-ui-build.xml
index b44d834f5532..ae9bd07a9fed 100644
--- a/java/eclipse-devel/files/patch-plugins-ant-ui-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-ant-ui-build.xml
@@ -1,64 +1,66 @@
---- plugins/org.eclipse.ant.ui/build.xml.orig	2007-09-22 01:23:54.000000000 +0900
-+++ plugins/org.eclipse.ant.ui/build.xml	2007-10-10 21:10:43.000000000 +0900
-@@ -153,6 +153,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
+--- plugins/org.eclipse.ant.ui/build.xml.orig	2008-02-22 08:45:19.000000000 +0900
++++ plugins/org.eclipse.ant.ui/build.xml	2008-03-10 16:58:30.000000000 +0900
+@@ -155,6 +155,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -180,6 +182,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
+@@ -180,6 +184,8 @@
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/>
 +			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -468,6 +474,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
+@@ -470,6 +476,8 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -495,6 +503,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
+@@ -495,6 +503,8 @@
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/>
 +			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -782,6 +794,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
+@@ -784,6 +794,8 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -809,6 +825,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
+@@ -803,12 +815,16 @@
+ 			<pathelement path="../org.eclipse.ui.carbon/@dot"/>
+ 			<pathelement path="../org.eclipse.swt/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt_3.3.2.v3349d/@dot"/>
++			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_64_3.3.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/>
 +			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-core-resources-build.xml b/java/eclipse-devel/files/patch-plugins-core-resources-build.xml
deleted file mode 100644
index 3b78219e5103..000000000000
--- a/java/eclipse-devel/files/patch-plugins-core-resources-build.xml
+++ /dev/null
@@ -1,25 +0,0 @@
---- plugins/org.eclipse.core.resources/build.xml.orig	Mon Jun 25 15:39:42 2007
-+++ plugins/org.eclipse.core.resources/build.xml	Fri Aug 17 17:32:24 2007
-@@ -139,6 +139,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.solaris.sparc_1.0.100.v20070425/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.macosx/@dot"/>
-@@ -252,6 +256,11 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
-+
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.0.100.v20070510/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.solaris.sparc_1.0.100.v20070425/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.macosx/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-core-resources-comaptibility-build.xml b/java/eclipse-devel/files/patch-plugins-core-resources-comaptibility-build.xml
deleted file mode 100644
index e54f9c78a19d..000000000000
--- a/java/eclipse-devel/files/patch-plugins-core-resources-comaptibility-build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/org.eclipse.core.resources.compatibility/build.xml.orig	2007-06-26 04:39:43.000000000 +0900
-+++ plugins/org.eclipse.core.resources.compatibility/build.xml	2007-08-27 14:28:39.000000000 +0900
-@@ -142,6 +142,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-debug-core-build.xml b/java/eclipse-devel/files/patch-plugins-debug-core-build.xml
index 03d1184e0d9d..22d02a1b56f4 100644
--- a/java/eclipse-devel/files/patch-plugins-debug-core-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-debug-core-build.xml
@@ -1,13 +1,15 @@
---- plugins/org.eclipse.debug.core/build.xml.orig	2007-06-26 04:39:42.000000000 +0900
-+++ plugins/org.eclipse.debug.core/build.xml	2007-08-27 14:38:00.000000000 +0900
-@@ -148,6 +148,10 @@
+--- plugins/org.eclipse.debug.core/build.xml.orig	2008-02-22 08:45:23.000000000 +0900
++++ plugins/org.eclipse.debug.core/build.xml	2008-03-10 17:05:48.000000000 +0900
+@@ -148,8 +148,12 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-debug-ui-build.xml b/java/eclipse-devel/files/patch-plugins-debug-ui-build.xml
deleted file mode 100644
index c74812119efe..000000000000
--- a/java/eclipse-devel/files/patch-plugins-debug-ui-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.debug.ui/build.xml.orig	2007-09-22 01:25:40.000000000 +0900
-+++ plugins/org.eclipse.debug.ui/build.xml	2007-10-10 21:27:37.000000000 +0900
-@@ -137,6 +137,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -209,6 +213,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -246,6 +254,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.win32_3.2.100.v20070615/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.net/bin/"/>
diff --git a/java/eclipse-devel/files/patch-plugins-help-ui-build.xml b/java/eclipse-devel/files/patch-plugins-help-ui-build.xml
deleted file mode 100644
index 0d12f55850ad..000000000000
--- a/java/eclipse-devel/files/patch-plugins-help-ui-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.help.ui/build.xml.orig	2007-09-22 01:25:34.000000000 +0900
-+++ plugins/org.eclipse.help.ui/build.xml       2007-10-10 21:39:12.000000000 +0900
-@@ -155,6 +155,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -223,6 +227,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-apt-core-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-apt-core-build.xml
index 62b6865038e4..4d04d801fe74 100644
--- a/java/eclipse-devel/files/patch-plugins-jdt-apt-core-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-jdt-apt-core-build.xml
@@ -1,13 +1,15 @@
---- plugins/org.eclipse.jdt.apt.core/build.xml.orig	2007-06-26 04:39:42.000000000 +0900
-+++ plugins/org.eclipse.jdt.apt.core/build.xml	2007-09-05 23:08:12.000000000 +0900
-@@ -159,6 +159,10 @@
+--- plugins/org.eclipse.jdt.apt.core/build.xml.orig	2008-02-22 08:45:26.000000000 +0900
++++ plugins/org.eclipse.jdt.apt.core/build.xml	2008-03-10 17:08:57.000000000 +0900
+@@ -159,8 +159,12 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-apt-pluggable-core-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-apt-pluggable-core-build.xml
index f030830fd044..c0cdd3dc9c67 100644
--- a/java/eclipse-devel/files/patch-plugins-jdt-apt-pluggable-core-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-jdt-apt-pluggable-core-build.xml
@@ -1,13 +1,15 @@
---- plugins/org.eclipse.jdt.apt.pluggable.core/build.xml.orig	2007-06-26 04:39:41.000000000 +0900
-+++ plugins/org.eclipse.jdt.apt.pluggable.core/build.xml	2007-09-04 16:39:44.000000000 +0900
-@@ -159,6 +159,10 @@
+--- plugins/org.eclipse.jdt.apt.pluggable.core/build.xml.orig	2008-02-22 08:45:49.000000000 +0900
++++ plugins/org.eclipse.jdt.apt.pluggable.core/build.xml	2008-03-10 17:12:40.000000000 +0900
+@@ -159,8 +159,12 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-apt-ui-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-apt-ui-build.xml
deleted file mode 100644
index 791cd580334a..000000000000
--- a/java/eclipse-devel/files/patch-plugins-jdt-apt-ui-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.jdt.apt.ui/build.xml.orig	2007-09-22 01:24:47.000000000 +0900
-+++ plugins/org.eclipse.jdt.apt.ui/build.xml	2007-10-10 21:44:26.000000000 +0900
-@@ -165,6 +165,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
-@@ -223,6 +227,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-compiler-apt-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-compiler-apt-build.xml
index e1647ed8572e..6932f19d1596 100644
--- a/java/eclipse-devel/files/patch-plugins-jdt-compiler-apt-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-jdt-compiler-apt-build.xml
@@ -1,15 +1,13 @@
---- plugins/org.eclipse.jdt.compiler.apt/build.xml.orig	2007-09-04 15:32:12.000000000 +0900
-+++ plugins/org.eclipse.jdt.compiler.apt/build.xml	2007-09-04 16:40:23.000000000 +0900
-@@ -163,6 +163,12 @@
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-+			
+--- plugins/org.eclipse.jdt.compiler.apt/build.xml.orig	2007-10-24 06:31:15.000000000 +0900
++++ plugins/org.eclipse.jdt.compiler.apt/build.xml	2007-11-19 13:39:25.000000000 +0900
+@@ -156,6 +156,10 @@
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64.0.100.v20070510/@dot"/>
-+
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.solaris.sparc_1.0.100.v20070425/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-compiler-tool-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-compiler-tool-build.xml
index 1822ae3f03f1..2503030065d7 100644
--- a/java/eclipse-devel/files/patch-plugins-jdt-compiler-tool-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-jdt-compiler-tool-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.jdt.compiler.tool/build.xml.orig	2007-06-26 04:39:41.000000000 +0900
-+++ plugins/org.eclipse.jdt.compiler.tool/build.xml	2007-09-04 16:40:39.000000000 +0900
+--- plugins/org.eclipse.jdt.compiler.tool/build.xml.orig	2008-02-22 08:45:25.000000000 +0900
++++ plugins/org.eclipse.jdt.compiler.tool/build.xml	2008-03-08 13:14:06.000000000 +0900
 @@ -153,6 +153,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,7 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-core-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-core-build.xml
deleted file mode 100644
index 520cd089997a..000000000000
--- a/java/eclipse-devel/files/patch-plugins-jdt-core-build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/org.eclipse.jdt.core/build.xml.orig	2007-06-26 04:39:42.000000000 +0900
-+++ plugins/org.eclipse.jdt.core/build.xml	2007-09-04 16:40:57.000000000 +0900
-@@ -149,6 +149,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-core-resoureces-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-core-build.xmo
index f238ff44606e..c3b2073de328 100644
--- a/java/eclipse-devel/files/patch-plugins-core-resoureces-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-jdt-core-build.xmo
@@ -1,28 +1,24 @@
---- plugins/org.eclipse.core.resources/build.xml.orig	2007-06-26 04:39:42.000000000 +0900
-+++ plugins/org.eclipse.core.resources/build.xml	2007-08-25 11:38:27.000000000 +0900
-@@ -137,6 +137,12 @@
+--- plugins/org.eclipse.jdt.core/build.xml.orig	2007-10-24 06:31:15.000000000 +0900
++++ plugins/org.eclipse.jdt.core/build.xml	2007-11-19 13:44:12.000000000 +0900
+@@ -149,6 +149,10 @@
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
-+
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
-+
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
-@@ -250,6 +256,12 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
-+
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
+@@ -367,6 +371,10 @@
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
-+
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-core-manipulation-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-core-manipulation-build.xml
index 30245a10080f..94608d24f532 100644
--- a/java/eclipse-devel/files/patch-plugins-jdt-core-manipulation-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-jdt-core-manipulation-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.jdt.core.manipulation/build.xml.orig	2007-06-26 04:39:43.000000000 +0900
-+++ plugins/org.eclipse.jdt.core.manipulation/build.xml	2007-09-05 23:13:01.000000000 +0900
+--- plugins/org.eclipse.jdt.core.manipulation/build.xml.orig	2007-10-24 06:31:14.000000000 +0900
++++ plugins/org.eclipse.jdt.core.manipulation/build.xml	2007-11-19 13:46:06.000000000 +0900
 @@ -147,6 +147,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,7 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-debug-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-debug-build.xml
index 3f53a3ba9e36..ce683e779e70 100644
--- a/java/eclipse-devel/files/patch-plugins-jdt-debug-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-jdt-debug-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.jdt.debug/build.xml.orig	2007-06-26 04:39:43.000000000 +0900
-+++ plugins/org.eclipse.jdt.debug/build.xml	2007-09-04 16:41:32.000000000 +0900
+--- plugins/org.eclipse.jdt.debug/build.xml.orig	2007-10-24 06:31:14.000000000 +0900
++++ plugins/org.eclipse.jdt.debug/build.xml	2007-11-19 13:51:36.000000000 +0900
 @@ -148,6 +148,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,18 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
+@@ -294,6 +298,10 @@
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-debug-ui-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-debug-ui-build.xml
deleted file mode 100644
index 4bcc5285255e..000000000000
--- a/java/eclipse-devel/files/patch-plugins-jdt-debug-ui-build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
---- plugins/org.eclipse.jdt.debug.ui/build.xml.orig	2007-09-22 01:26:36.000000000 +0900
-+++ plugins/org.eclipse.jdt.debug.ui/build.xml	2007-10-10 21:50:07.000000000 +0900
-@@ -153,6 +153,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -180,6 +182,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -431,6 +437,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -458,6 +468,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-junit-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-junit-build.xml
deleted file mode 100644
index 4205d50ddbc9..000000000000
--- a/java/eclipse-devel/files/patch-plugins-jdt-junit-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.jdt.junit/build.xml.orig	2007-09-22 01:23:53.000000000 +0900
-+++ plugins/org.eclipse.jdt.junit/build.xml	2007-10-10 21:54:20.000000000 +0900
-@@ -153,6 +153,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsdx.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsdx.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -180,6 +184,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-launching-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-launching-build.xml
index d0ae48d51ded..c9608056fb4b 100644
--- a/java/eclipse-devel/files/patch-plugins-jdt-launching-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-jdt-launching-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.jdt.launching/build.xml.orig	2007-06-26 04:39:43.000000000 +0900
-+++ plugins/org.eclipse.jdt.launching/build.xml	2007-09-05 23:18:19.000000000 +0900
+--- plugins/org.eclipse.jdt.launching/build.xml.orig	2007-10-24 06:31:15.000000000 +0900
++++ plugins/org.eclipse.jdt.launching/build.xml	2007-11-19 14:01:46.000000000 +0900
 @@ -148,6 +148,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,18 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
+@@ -305,6 +309,10 @@
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jdt-ui-build.xml b/java/eclipse-devel/files/patch-plugins-jdt-ui-build.xml
deleted file mode 100644
index aba410da9b4c..000000000000
--- a/java/eclipse-devel/files/patch-plugins-jdt-ui-build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
---- plugins/org.eclipse.jdt.ui/build.xml.orig	2007-09-22 01:25:26.000000000 +0900
-+++ plugins/org.eclipse.jdt.ui/build.xml	2007-10-10 22:00:13.000000000 +0900
-@@ -133,6 +133,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -209,6 +213,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -407,6 +415,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -483,6 +495,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jface-build.xml b/java/eclipse-devel/files/patch-plugins-jface-build.xml
deleted file mode 100644
index d5ae34631d4f..000000000000
--- a/java/eclipse-devel/files/patch-plugins-jface-build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/org.eclipse.jface/build.xml.orig	2007-09-22 01:25:23.000000000 +0900
-+++ plugins/org.eclipse.jface/build.xml  	2007-10-10 22:03:43.000000000 +0900
-@@ -102,6 +102,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jface-databinding-build.xml b/java/eclipse-devel/files/patch-plugins-jface-databinding-build.xml
deleted file mode 100644
index 9f8474885311..000000000000
--- a/java/eclipse-devel/files/patch-plugins-jface-databinding-build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/org.eclipse.jface.databinding/build.xml.orig	2007-09-22 01:23:54.000000000 +0900
-+++ plugins/org.eclipse.jface.databinding/build.xml	2007-10-10 22:08:09.000000000 +0900
-@@ -134,6 +134,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jface-text-build.xml b/java/eclipse-devel/files/patch-plugins-jface-text-build.xml
deleted file mode 100644
index e2ec25cacdab..000000000000
--- a/java/eclipse-devel/files/patch-plugins-jface-text-build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/org.eclipse.jface.text/build.xml.orig	2007-09-22 01:27:18.000000000 +0900
-+++ plugins/org.eclipse.jface.text/build.xml	2007-10-10 22:11:42.000000000 +0900
-@@ -136,6 +136,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jsch-core-build.xml b/java/eclipse-devel/files/patch-plugins-jsch-core-build.xml
index 49b55a7e6016..540e021dcb37 100644
--- a/java/eclipse-devel/files/patch-plugins-jsch-core-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-jsch-core-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.jsch.core/build.xml.orig	2007-06-26 04:39:43.000000000 +0900
-+++ plugins/org.eclipse.jsch.core/build.xml	2007-08-27 11:01:15.000000000 +0900
+--- plugins/org.eclipse.jsch.core/build.xml.orig	2007-10-24 06:31:14.000000000 +0900
++++ plugins/org.eclipse.jsch.core/build.xml	2007-11-19 14:15:37.000000000 +0900
 @@ -139,6 +139,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,7 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-jsch-ui-build.xml b/java/eclipse-devel/files/patch-plugins-jsch-ui-build.xml
deleted file mode 100644
index 0d33a32e0b6d..000000000000
--- a/java/eclipse-devel/files/patch-plugins-jsch-ui-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.jsch.ui/build.xml.orig	2007-09-22 01:25:14.000000000 +0900
-+++ plugins/org.eclipse.jsch.ui/build.xml	2007-10-10 22:16:28.000000000 +0900
-@@ -132,6 +132,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -207,6 +211,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsdx.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ltk-core-refactoring-build.xml b/java/eclipse-devel/files/patch-plugins-ltk-core-refactoring-build.xml
deleted file mode 100644
index 4ea05e7e778b..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ltk-core-refactoring-build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/org.eclipse.ltk.core.refactoring/build.xml.orig	2007-06-26 04:39:42.000000000 +0900
-+++ plugins/org.eclipse.ltk.core.refactoring/build.xml	2007-08-27 00:09:02.000000000 +0900
-@@ -132,6 +132,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ltk-ui-refactoring-build.xml b/java/eclipse-devel/files/patch-plugins-ltk-ui-refactoring-build.xml
deleted file mode 100644
index ebbc14882889..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ltk-ui-refactoring-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ltk.ui.refactoring/build.xml.orig	2007-09-22 01:25:12.000000000 +0900
-+++ plugins/org.eclipse.ltk.ui.refactoring/build.xml	2007-10-10 22:20:14.000000000 +0900
-@@ -150,6 +150,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -182,6 +186,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-pde-build-build.xml b/java/eclipse-devel/files/patch-plugins-pde-build-build.xml
index 032cb4098038..dd4947056ba6 100644
--- a/java/eclipse-devel/files/patch-plugins-pde-build-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-pde-build-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.pde.build/build.xml.orig	2007-09-22 01:27:14.000000000 +0900
-+++ plugins/org.eclipse.pde.build/build.xml	2007-10-10 22:23:27.000000000 +0900
+--- plugins/org.eclipse.pde.build/build.xml.orig	2007-10-24 06:31:14.000000000 +0900
++++ plugins/org.eclipse.pde.build/build.xml	2007-11-19 14:25:31.000000000 +0900
 @@ -128,6 +128,8 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml b/java/eclipse-devel/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml
index 15794e486db3..1df59c08ceef 100644
--- a/java/eclipse-devel/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml
+++ b/java/eclipse-devel/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml
@@ -1,6 +1,6 @@
---- plugins/org.eclipse.pde.build/scripts/productBuild/allElements.xml.orig	2007-06-26 04:57:20.000000000 +0900
-+++ plugins/org.eclipse.pde.build/scripts/productBuild/allElements.xml	2007-09-06 11:16:27.000000000 +0900
-@@ -37,6 +37,16 @@
+--- plugins/org.eclipse.pde.build/scripts/productBuild/allElements.xml.orig	2007-10-24 06:49:23.000000000 +0900
++++ plugins/org.eclipse.pde.build/scripts/productBuild/allElements.xml	2007-11-19 14:28:29.000000000 +0900
+@@ -37,6 +37,17 @@
  		</ant>
   	</target>
  	
@@ -14,6 +14,7 @@
 + 			<property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/>
 +		</ant>
 + 	</target>
++
   	<target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86">
   		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
   			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86.zip"/>
diff --git a/java/eclipse-devel/files/patch-plugins-pde-build-templates-packager-customTargets.xml b/java/eclipse-devel/files/patch-plugins-pde-build-templates-packager-customTargets.xml
index 5feacb6c532a..412bd99f51f0 100644
--- a/java/eclipse-devel/files/patch-plugins-pde-build-templates-packager-customTargets.xml
+++ b/java/eclipse-devel/files/patch-plugins-pde-build-templates-packager-customTargets.xml
@@ -1,6 +1,6 @@
---- plugins/org.eclipse.pde.build/templates/packager/customTargets.xml.orig	2007-06-26 04:57:18.000000000 +0900
-+++ plugins/org.eclipse.pde.build/templates/packager/customTargets.xml	2007-09-06 11:20:06.000000000 +0900
-@@ -18,6 +18,16 @@
+--- plugins/org.eclipse.pde.build/templates/packager/customTargets.xml.orig	2007-10-24 06:49:06.000000000 +0900
++++ plugins/org.eclipse.pde.build/templates/packager/customTargets.xml	2007-11-19 14:34:19.000000000 +0900
+@@ -18,6 +18,17 @@
  		</ant>
  	</target>
  	
@@ -14,6 +14,7 @@
 +			<property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/>
 +		</ant>
 +	</target>
++
  	<target name="assemble.linux.gtk.x86.xml">
  		<ant antfile="${assembleScriptName}" >
  			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86.zip"/>
diff --git a/java/eclipse-devel/files/patch-plugins-pde-core-build.xml b/java/eclipse-devel/files/patch-plugins-pde-core-build.xml
index f26ecc2ad66f..59b7d5921568 100644
--- a/java/eclipse-devel/files/patch-plugins-pde-core-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-pde-core-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.pde.core/build.xml.orig	2007-09-22 01:24:18.000000000 +0900
-+++ plugins/org.eclipse.pde.core/build.xml      2007-10-10 22:28:24.000000000 +0900
+--- plugins/org.eclipse.pde.core/build.xml.orig	2007-10-24 06:31:15.000000000 +0900
++++ plugins/org.eclipse.pde.core/build.xml	2007-11-19 14:38:35.000000000 +0900
 @@ -148,6 +148,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,7 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
@@ -26,8 +26,8 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd644/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-pde-junit-runtime-build.xml b/java/eclipse-devel/files/patch-plugins-pde-junit-runtime-build.xml
deleted file mode 100644
index 86361dda5422..000000000000
--- a/java/eclipse-devel/files/patch-plugins-pde-junit-runtime-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.pde.junit.runtime/build.xml.orig	2007-09-22 01:25:38.000000000 +0900
-+++ plugins/org.eclipse.pde.junit.runtime/build.xml	2007-10-10 22:32:21.000000000 +0900
-@@ -135,6 +135,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -212,6 +216,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-pde-runtime-build.xml b/java/eclipse-devel/files/patch-plugins-pde-runtime-build.xml
deleted file mode 100644
index 7bd1ac1d9958..000000000000
--- a/java/eclipse-devel/files/patch-plugins-pde-runtime-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.pde.runtime/build.xml.orig	2007-09-22 01:25:23.000000000 +0900
-+++ plugins/org.eclipse.pde.runtime/build.xml	2007-10-10 22:36:30.000000000 +0900
-@@ -133,6 +133,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -209,6 +213,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -234,6 +242,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-pde-ui-build.xml b/java/eclipse-devel/files/patch-plugins-pde-ui-build.xml
deleted file mode 100644
index 64960604a397..000000000000
--- a/java/eclipse-devel/files/patch-plugins-pde-ui-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.pde.ui/build.xml.orig	2007-09-22 01:26:07.000000000 +0900
-+++ plugins/org.eclipse.pde.ui/build.xml	2007-10-10 22:40:33.000000000 +0900
-@@ -174,6 +174,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -224,6 +228,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
-@@ -252,6 +258,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-pde-ui-templates-build.xml b/java/eclipse-devel/files/patch-plugins-pde-ui-templates-build.xml
deleted file mode 100644
index 7c77c218b057..000000000000
--- a/java/eclipse-devel/files/patch-plugins-pde-ui-templates-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.pde.ui.templates/build.xml.orig	2007-09-22 01:26:34.000000000 +0900
-+++ plugins/org.eclipse.pde.ui.templates/build.xml	2007-10-10 22:44:39.000000000 +0900
-@@ -132,6 +132,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -209,6 +213,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-platform-build.xml b/java/eclipse-devel/files/patch-plugins-platform-build.xml
index 3c63532dc213..3cbb53cd20bf 100644
--- a/java/eclipse-devel/files/patch-plugins-platform-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-platform-build.xml
@@ -1,33 +1,41 @@
---- plugins/org.eclipse.platform/build.xml.orig	2007-09-22 01:24:45.000000000 +0900
-+++ plugins/org.eclipse.platform/build.xml	2007-10-10 22:49:21.000000000 +0900
-@@ -175,6 +175,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
+--- plugins/org.eclipse.platform/build.xml.orig	2008-02-22 08:46:01.000000000 +0900
++++ plugins/org.eclipse.platform/build.xml	2008-03-11 00:02:20.000000000 +0900
+@@ -169,12 +169,16 @@
+ 			<pathelement path="../org.eclipse.ui.carbon/@dot"/>
+ 			<pathelement path="../org.eclipse.swt/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt_3.3.2.v3349d/@dot"/>
++			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_64_3.3.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/>
 +			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -243,6 +247,10 @@
+@@ -243,8 +247,12 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
++			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -269,6 +277,8 @@
+ 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
+ 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
+@@ -267,6 +275,8 @@
+ 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
 +			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
+ 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
  			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.win32_3.2.100.v20070615/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.configurator/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-platform-doc-isv-build.xml b/java/eclipse-devel/files/patch-plugins-platform-doc-isv-build.xml
deleted file mode 100644
index dbc9e9550a4c..000000000000
--- a/java/eclipse-devel/files/patch-plugins-platform-doc-isv-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.platform.doc.isv/build.xml.orig	2007-09-22 01:25:01.000000000 +0900
-+++ plugins/org.eclipse.platform.doc.isv/build.xml	2007-10-10 22:54:17.000000000 +0900
-@@ -129,6 +129,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -202,6 +206,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-search-build.xml b/java/eclipse-devel/files/patch-plugins-search-build.xml
deleted file mode 100644
index d34b8572c5a2..000000000000
--- a/java/eclipse-devel/files/patch-plugins-search-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.search/build.xml.orig	2007-09-22 01:25:21.000000000 +0900
-+++ plugins/org.eclipse.search/build.xml	2007-10-10 22:58:51.000000000 +0900
-@@ -148,6 +148,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -181,6 +185,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -238,6 +246,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-swt-amd64-build.xml b/java/eclipse-devel/files/patch-plugins-swt-amd64-build.xml
index 5b5f70bfe5f8..7a763f3911cc 100644
--- a/java/eclipse-devel/files/patch-plugins-swt-amd64-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-swt-amd64-build.xml
@@ -1,15 +1,11 @@
---- plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig	Fri Aug 17 17:35:50 2007
-+++ plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml	Fri Aug 17 17:49:35 2007
-@@ -40,18 +40,17 @@
- 
- 	<target name="properties" if="eclipse.running">
- 		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
--		<!--compile the jar in org.eclipse.swt.tools-->
+--- plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig	2007-11-19 13:18:37.000000000 +0900
++++ plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml	2007-11-19 15:06:14.000000000 +0900
+@@ -44,14 +44,14 @@
  	</target>
  
  	<target name="build.update.jar" depends="init">
 -		<delete dir="${temp.folder}"/>
-+		<!-- <delete dir="${temp.folder}"/>
++		<!-- <delete dir="${temp.folder}"/>  
  		<mkdir dir="${temp.folder}"/>
  		<antcall target="build.jars"/>
  		<antcall target="gather.bin.parts">
@@ -21,18 +17,16 @@
  	</target>
  
  	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
-@@ -231,7 +230,9 @@
- 
+@@ -232,6 +232,8 @@
  	<target name="build.cfiles" depends="build.jars">
  		<!-- generate the C code from the (64 bit) SWT PI java classes -->
--		<!-- assumes the swt.jar has already been built  -->
-+		<!-- compile the jar in org.eclipse.swt.tools -->
-+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />		
+ 		<!-- assumes the swt.jar has already been built  -->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
 + 		<!-- assumes the swttools.jar has already been built  -->
  		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
  		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
  		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
-@@ -345,6 +346,8 @@
+@@ -345,6 +347,8 @@
  		<delete file="${plugin.destination}/${full.name}.jar"/>
  		<delete file="${plugin.destination}/${full.name}.zip"/>
  		<delete dir="${temp.folder}"/>
diff --git a/java/eclipse-devel/files/patch-plugins-swt-tools-build.xml b/java/eclipse-devel/files/patch-plugins-swt-tools-build.xml
index b32c8c2da2be..b491024bcc7a 100644
--- a/java/eclipse-devel/files/patch-plugins-swt-tools-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-swt-tools-build.xml
@@ -1,11 +1,11 @@
---- plugins/org.eclipse.swt.tools/build.xml.orig	2007-06-26 04:39:41.000000000 +0900
-+++ plugins/org.eclipse.swt.tools/build.xml	2007-08-26 23:31:30.000000000 +0900
-@@ -67,6 +67,8 @@
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/>
- 			<pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
+--- plugins/org.eclipse.swt.tools/build.xml.orig	2007-10-24 06:31:15.000000000 +0900
++++ plugins/org.eclipse.swt.tools/build.xml	2007-11-19 15:08:07.000000000 +0900
+@@ -70,6 +70,8 @@
  			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
  			<pathelement path="../org.eclipse.swt.gtk.linux.s390x/@dot"/>
++			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
++			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.solaris.sparc/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.solaris.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.linux.ppc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-team-core-build.xml b/java/eclipse-devel/files/patch-plugins-team-core-build.xml
index 31709a1f0229..1208921e539a 100644
--- a/java/eclipse-devel/files/patch-plugins-team-core-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-team-core-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.team.core/build.xml.orig	2007-06-26 04:39:43.000000000 +0900
-+++ plugins/org.eclipse.team.core/build.xml	2007-09-05 23:58:46.000000000 +0900
+--- plugins/org.eclipse.team.core/build.xml.orig	2007-10-24 06:31:14.000000000 +0900
++++ plugins/org.eclipse.team.core/build.xml	2007-11-19 15:10:19.000000000 +0900
 @@ -147,6 +147,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,7 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-team-cvs-core-build.xml b/java/eclipse-devel/files/patch-plugins-team-cvs-core-build.xml
index a79be2b85cbb..8697c395740a 100644
--- a/java/eclipse-devel/files/patch-plugins-team-cvs-core-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-team-cvs-core-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.team.cvs.core/build.xml.orig	2007-06-26 04:39:42.000000000 +0900
-+++ plugins/org.eclipse.team.cvs.core/build.xml	2007-08-27 14:34:31.000000000 +0900
+--- plugins/org.eclipse.team.cvs.core/build.xml.orig	2007-10-24 06:31:15.000000000 +0900
++++ plugins/org.eclipse.team.cvs.core/build.xml	2007-11-19 15:12:15.000000000 +0900
 @@ -148,6 +148,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,7 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-team-cvs-ssh-build.xml b/java/eclipse-devel/files/patch-plugins-team-cvs-ssh-build.xml
index e39c21a72830..fef8a86d3259 100644
--- a/java/eclipse-devel/files/patch-plugins-team-cvs-ssh-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-team-cvs-ssh-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.team.cvs.ssh/build.xml.orig	2007-06-26 04:39:41.000000000 +0900
-+++ plugins/org.eclipse.team.cvs.ssh/build.xml	2007-08-26 23:32:54.000000000 +0900
+--- plugins/org.eclipse.team.cvs.ssh/build.xml.orig	2007-10-24 06:31:14.000000000 +0900
++++ plugins/org.eclipse.team.cvs.ssh/build.xml	2007-11-19 15:13:49.000000000 +0900
 @@ -147,6 +147,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,7 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-team-cvs-ssh2-build.xml b/java/eclipse-devel/files/patch-plugins-team-cvs-ssh2-build.xml
deleted file mode 100644
index c3a21f595b9a..000000000000
--- a/java/eclipse-devel/files/patch-plugins-team-cvs-ssh2-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.team.cvs.ssh2/build.xml.orig	2007-09-22 01:25:55.000000000 +0900
-+++ plugins/org.eclipse.team.cvs.ssh2/build.xml	2007-10-10 23:04:02.000000000 +0900
-@@ -147,6 +147,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -181,6 +185,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -251,6 +259,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-team-cvs-ui-build.xml b/java/eclipse-devel/files/patch-plugins-team-cvs-ui-build.xml
deleted file mode 100644
index c84decaaf9f7..000000000000
--- a/java/eclipse-devel/files/patch-plugins-team-cvs-ui-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.team.cvs.ui/build.xml.orig	2007-09-22 01:24:37.000000000 +0900
-+++ plugins/org.eclipse.team.cvs.ui/build.xml	2007-10-10 23:08:29.000000000 +0900
-@@ -153,6 +153,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -180,6 +184,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -234,6 +242,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-team-ui-build.xml b/java/eclipse-devel/files/patch-plugins-team-ui-build.xml
deleted file mode 100644
index 376831378e33..000000000000
--- a/java/eclipse-devel/files/patch-plugins-team-ui-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.team.ui/build.xml.orig	2007-09-22 01:24:03.000000000 +0900
-+++ plugins/org.eclipse.team.ui/build.xml	2007-10-10 23:12:52.000000000 +0900
-@@ -153,6 +153,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -180,6 +184,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -234,6 +242,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-browser-build.xml b/java/eclipse-devel/files/patch-plugins-ui-browser-build.xml
deleted file mode 100644
index 22c337fb2d87..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-browser-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.browser/build.xml.orig	2007-09-22 01:24:25.000000000 +0900
-+++ plugins/org.eclipse.ui.browser/build.xml	2007-10-10 23:17:51.000000000 +0900
-@@ -133,6 +133,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -207,6 +211,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-browser-plugin.xml b/java/eclipse-devel/files/patch-plugins-ui-browser-plugin.xml
index 4651859c6cb8..d8db8ba04807 100644
--- a/java/eclipse-devel/files/patch-plugins-ui-browser-plugin.xml
+++ b/java/eclipse-devel/files/patch-plugins-ui-browser-plugin.xml
@@ -1,6 +1,6 @@
---- plugins/org.eclipse.ui.browser/plugin.xml.orig	2007-06-26 04:57:13.000000000 +0900
-+++ plugins/org.eclipse.ui.browser/plugin.xml	2007-09-06 11:26:03.000000000 +0900
-@@ -74,11 +74,11 @@
+--- plugins/org.eclipse.ui.browser/plugin.xml.orig	2007-10-24 06:48:42.000000000 +0900
++++ plugins/org.eclipse.ui.browser/plugin.xml	2007-11-19 15:30:34.000000000 +0900
+@@ -74,11 +74,12 @@
        <browser
           id="org.eclipse.ui.browser.mozilla"
           name="%browserMozilla"
@@ -9,12 +9,12 @@
           executable="mozilla"
           factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
           <location>usr/bin/mozilla</location>
--         <location>usr/X11/bin/mozilla</location>
+          <location>usr/X11/bin/mozilla</location>
 +         <location>usr/local/bin/mozilla</location>
        </browser>
        <browser
           id="org.eclipse.ui.browser.netscape"
-@@ -93,24 +93,26 @@
+@@ -93,23 +94,25 @@
        <browser
           id="org.eclipse.ui.browser.firefox"
           name="%browserFirefox"
@@ -30,6 +30,7 @@
 +         os="freebsd,linux,aix,hpux,solaris"
           executable="konqueror">
           <location>opt/kde3/bin/konqueror</location>
++         <location>/usr/local/bin/konqueror</location>
        </browser>
        <browser
           id="org.eclipse.ui.browser.galeon"
@@ -38,9 +39,7 @@
 +         os="freebsd,linux,aix,hpux,solaris"
           executable="galeon">
           <location>opt/usr/gnome/bin/galeon</location>
-+         <location>usr/local/bin/galeon</location>
++         <location>/usr/local/bin/galeon</location>
        </browser>
-+
        
        <!-- Windows -->
-       <browser
diff --git a/java/eclipse-devel/files/patch-plugins-ui-build.xml b/java/eclipse-devel/files/patch-plugins-ui-build.xml
deleted file mode 100644
index 044a032bfb6c..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
---- plugins/org.eclipse.ui/build.xml.orig	2007-09-22 01:26:44.000000000 +0900
-+++ plugins/org.eclipse.ui/build.xml	2007-10-10 23:21:50.000000000 +0900
-@@ -131,6 +131,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -192,6 +196,8 @@
- 			<pathelement path="../org.eclipse.core.filesystem.hpux.ia64_32/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.hpux.PA_RISC/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-cheatsheets-build.xml b/java/eclipse-devel/files/patch-plugins-ui-cheatsheets-build.xml
deleted file mode 100644
index a4c8e9f52792..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-cheatsheets-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.cheatsheets/build.xml.orig	2007-09-22 01:25:32.000000000 +0900
-+++ plugins/org.eclipse.ui.cheatsheets/build.xml	2007-10-10 23:25:42.000000000 +0900
-@@ -152,6 +152,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -228,6 +232,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-console-build.xml b/java/eclipse-devel/files/patch-plugins-ui-console-build.xml
deleted file mode 100644
index 3fb6dd6a2d91..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-console-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.console/build.xml.orig	2007-09-22 01:23:51.000000000 +0900
-+++ plugins/org.eclipse.ui.console/build.xml	2007-10-10 23:34:21.000000000 +0900
-@@ -133,6 +133,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -209,6 +213,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-editor-build.xml b/java/eclipse-devel/files/patch-plugins-ui-editor-build.xml
deleted file mode 100644
index 124b9b53b30d..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-editor-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.ui.editors/build.xml.orig	2007-09-22 01:25:14.000000000 +0900
-+++ plugins/org.eclipse.ui.editors/build.xml     2007-10-10 23:38:58.000000000 +0900
-@@ -155,6 +155,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
-@@ -180,6 +184,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -234,6 +242,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-externaltools-build.xml b/java/eclipse-devel/files/patch-plugins-ui-externaltools-build.xml
deleted file mode 100644
index 18a6703ff55c..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-externaltools-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.ui.externaltools/build.xml.orig	2007-09-22 01:24:52.000000000 +0900
-+++ plugins/org.eclipse.ui.externaltools/build.xml	2007-10-10 23:42:35.000000000 +0900
-@@ -153,6 +153,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -180,6 +184,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -234,6 +242,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-forms-build.xml b/java/eclipse-devel/files/patch-plugins-ui-forms-build.xml
deleted file mode 100644
index 28a1eb43bef0..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-forms-build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
---- plugins/org.eclipse.ui.forms/build.xml.orig	2007-09-22 01:25:53.000000000 +0900
-+++ plugins/org.eclipse.ui.forms/build.xml	2007-10-10 23:46:22.000000000 +0900
-@@ -148,6 +148,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -229,6 +231,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-ide-application-build.xml b/java/eclipse-devel/files/patch-plugins-ui-ide-application-build.xml
deleted file mode 100644
index e12b88cd6165..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-ide-application-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.ui.ide.application/build.xml.orig	2007-09-22 01:25:14.000000000 +0900
-+++ plugins/org.eclipse.ui.ide.application/build.xml	2007-10-10 23:50:55.000000000 +0900
-@@ -144,6 +144,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -171,6 +175,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -225,6 +233,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-ide-build.xml b/java/eclipse-devel/files/patch-plugins-ui-ide-build.xml
deleted file mode 100644
index 6f7ed431a2fe..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-ide-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.ui.ide/build.xml.orig	2007-09-22 01:25:46.000000000 +0900
-+++ plugins/org.eclipse.ui.ide/build.xml	2007-10-10 23:55:22.000000000 +0900
-@@ -148,6 +148,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -175,6 +179,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -229,6 +237,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-intro-build.xml b/java/eclipse-devel/files/patch-plugins-ui-intro-build.xml
deleted file mode 100644
index 7bbedfc599f4..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-intro-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.intro/build.xml.orig	2007-09-22 01:25:23.000000000 +0900
-+++ plugins/org.eclipse.ui.intro/build.xml	2007-10-11 00:00:37.000000000 +0900
-@@ -173,6 +173,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -241,6 +245,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-intro-universal-build.xml b/java/eclipse-devel/files/patch-plugins-ui-intro-universal-build.xml
deleted file mode 100644
index 9599bd823a87..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-intro-universal-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.intro.universal/build.xml.orig	2007-09-22 01:25:30.000000000 +0900
-+++ plugins/org.eclipse.ui.intro.universal/build.xml	2007-10-11 00:04:18.000000000 +0900
-@@ -154,6 +154,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -229,6 +233,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-navigator-build.xml b/java/eclipse-devel/files/patch-plugins-ui-navigator-build.xml
deleted file mode 100644
index ea2da3fc895b..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-navigator-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.navigator/build.xml.orig	2007-09-22 01:26:58.000000000 +0900
-+++ plugins/org.eclipse.ui.navigator/build.xml	2007-10-11 00:07:54.000000000 +0900
-@@ -86,6 +86,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -204,6 +208,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-navigator-resources-build.xml b/java/eclipse-devel/files/patch-plugins-ui-navigator-resources-build.xml
deleted file mode 100644
index 457794573f65..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-navigator-resources-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.ui.navigator.resources/build.xml.orig	2007-09-22 01:25:42.000000000 +0900
-+++ plugins/org.eclipse.ui.navigator.resources/build.xml	2007-10-11 00:11:43.000000000 +0900
-@@ -153,6 +153,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
-@@ -180,6 +184,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -234,6 +242,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-net-build.xml b/java/eclipse-devel/files/patch-plugins-ui-net-build.xml
deleted file mode 100644
index b676266d00be..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-net-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.net/build.xml.orig	2007-09-22 01:27:17.000000000 +0900
-+++ plugins/org.eclipse.ui.net/build.xml	2007-10-11 00:15:23.000000000 +0900
-@@ -150,6 +150,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -225,6 +229,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-presentations-r21-build.xml b/java/eclipse-devel/files/patch-plugins-ui-presentations-r21-build.xml
deleted file mode 100644
index a7606f8a960b..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-presentations-r21-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.presentations.r21/build.xml.orig	2007-09-22 01:26:20.000000000 +0900
-+++ plugins/org.eclipse.ui.presentations.r21/build.xml	2007-10-11 00:19:23.000000000 +0900
-@@ -133,6 +133,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -207,6 +211,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-views-build.xml b/java/eclipse-devel/files/patch-plugins-ui-views-build.xml
deleted file mode 100644
index 36cfda96bcc1..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-views-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.views/build.xml.orig	2007-09-22 01:23:49.000000000 +0900
-+++ plugins/org.eclipse.ui.views/build.xml	2007-10-11 00:23:04.000000000 +0900
-@@ -136,6 +136,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -207,6 +211,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-views-properties-tabbed-build.xml b/java/eclipse-devel/files/patch-plugins-ui-views-properties-tabbed-build.xml
deleted file mode 100644
index e0542af27f23..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-views-properties-tabbed-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.views.properties.tabbed/build.xml.orig	2007-09-22 01:25:21.000000000 +0900
-+++ plugins/org.eclipse.ui.views.properties.tabbed/build.xml	2007-10-11 00:26:38.000000000 +0900
-@@ -141,6 +141,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -220,6 +224,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-win32-build.xml b/java/eclipse-devel/files/patch-plugins-ui-win32-build.xml
index ef891ae58709..9a1793e9fbfd 100644
--- a/java/eclipse-devel/files/patch-plugins-ui-win32-build.xml
+++ b/java/eclipse-devel/files/patch-plugins-ui-win32-build.xml
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.ui.win32/build.xml.orig	2007-09-22 01:24:41.000000000 +0900
-+++ plugins/org.eclipse.ui.win32/build.xml	2007-10-11 00:29:42.000000000 +0900
+--- plugins/org.eclipse.ui.win32/build.xml.orig	2007-10-24 06:31:15.000000000 +0900
++++ plugins/org.eclipse.ui.win32/build.xml	2007-11-19 16:15:45.000000000 +0900
 @@ -150,6 +150,10 @@
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
@@ -7,7 +7,7 @@
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
 +			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
  			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
  			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-workbench-build.xml b/java/eclipse-devel/files/patch-plugins-ui-workbench-build.xml
deleted file mode 100644
index 51c336a53896..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-workbench-build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
---- plugins/org.eclipse.ui.workbench/build.xml.orig	2007-09-22 01:23:59.000000000 +0900
-+++ plugins/org.eclipse.ui.workbench/build.xml	2007-10-11 00:33:05.000000000 +0900
-@@ -147,6 +147,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -195,6 +199,8 @@
- 			<pathelement path="../org.eclipse.core.filesystem.hpux.ia64_32/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.hpux.PA_RISC/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-workbench-compatibility-build.xml b/java/eclipse-devel/files/patch-plugins-ui-workbench-compatibility-build.xml
deleted file mode 100644
index 300d40aeef4f..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-workbench-compatibility-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.workbench.compatibility/build.xml.orig	2007-09-22 01:25:45.000000000 +0900
-+++ plugins/org.eclipse.ui.workbench.compatibility/build.xml	2007-10-11 00:36:20.000000000 +0900
-@@ -138,6 +138,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -200,6 +204,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-ui-workbench-texteditor-build.xml b/java/eclipse-devel/files/patch-plugins-ui-workbench-texteditor-build.xml
deleted file mode 100644
index 5e914d14df5d..000000000000
--- a/java/eclipse-devel/files/patch-plugins-ui-workbench-texteditor-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.ui.workbench.texteditor/build.xml.orig	2007-09-22 01:26:42.000000000 +0900
-+++ plugins/org.eclipse.ui.workbench.texteditor/build.xml	2007-10-11 00:40:21.000000000 +0900
-@@ -140,6 +140,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -213,6 +217,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-update-scheduler-build.xml b/java/eclipse-devel/files/patch-plugins-update-scheduler-build.xml
deleted file mode 100644
index 2e7272d2daca..000000000000
--- a/java/eclipse-devel/files/patch-plugins-update-scheduler-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.update.scheduler/build.xml.orig	2007-09-22 01:27:08.000000000 +0900
-+++ plugins/org.eclipse.update.scheduler/build.xml	2007-10-11 00:44:16.000000000 +0900
-@@ -132,6 +132,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
-@@ -157,6 +159,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -234,6 +240,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
diff --git a/java/eclipse-devel/files/patch-plugins-update-ui-build.xml b/java/eclipse-devel/files/patch-plugins-update-ui-build.xml
deleted file mode 100644
index df7d24ba392d..000000000000
--- a/java/eclipse-devel/files/patch-plugins-update-ui-build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.update.ui/build.xml.orig	2007-09-22 01:25:06.000000000 +0900
-+++ plugins/org.eclipse.update.ui/build.xml	2007-10-11 00:48:08.000000000 +0900
-@@ -150,6 +150,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.0.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.1.v3346i/@dot"/>
-+			<pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.1.v3346i/@dot"/>
- 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
-@@ -229,6 +233,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/>
-+			<pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070416/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/>
-@@ -243,6 +251,8 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/>
-+			<pathelement path="../org.eclipse.update.core.freebsd/@dot"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.linux/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/>
- 			<pathelement path="../org.eclipse.update.core.win32/@dot"/>
diff --git a/java/eclipse-devel/files/post-patch-plugins-swt-gtk-swt-FileDialog.java b/java/eclipse-devel/files/post-patch-plugins-swt-gtk-swt-FileDialog.java
index 3d3e5bf5d90c..631f647124ef 100644
--- a/java/eclipse-devel/files/post-patch-plugins-swt-gtk-swt-FileDialog.java
+++ b/java/eclipse-devel/files/post-patch-plugins-swt-gtk-swt-FileDialog.java
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java.orig	2007-09-21 18:58:07.000000000 +0200
 +++ plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java	2008-02-05 20:49:58.000000000 +0100
 @@ -378,29 +378,29 @@