94 files changed, 4648 insertions, 1140 deletions

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 89633d194385..6def234c7919 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	eclipse
-PORTVERSION=	3.2.2
-PORTREVISION=	2
+PORTVERSION=	3.3.2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200702121330
-DISTNAME=	${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION}
+MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200802211800
+DISTNAME=	eclipse-sourceBuild-srcIncluded-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
-MAINTAINER=	freebsd-eclipse@freebsd.org
+MAINTAINER=	freebsd-eclipse@FreeBSD.org
 COMMENT=	An open extensible IDE for anything and nothing in particular
 
 BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
 		zip:${PORTSDIR}/archivers/zip
-
 BUILD_DEPENDS+=	${EXTRACT_DEPENDS}
 
+ECLIPSE=	${PORTNAME}
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
 USE_ZIP=	yes
-USE_GL=		yes
+USE_GL=		glu
 
 .if !defined(WITHOUT_MOZILLA)
 USE_GECKO=	xulrunner firefox mozilla seamonkey
@@ -37,7 +37,7 @@ JAVA_OS=	native
 
 NO_WRKSUBDIR=	yes
 
-PORTDESTDIR=	${PREFIX}/eclipse
+PORTDESTDIR=	${PREFIX}/${ECLIPSE}
 
 ECLIPSE_OS=	freebsd
 
@@ -54,7 +54,7 @@ USE_GNOME=	gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils
 .if defined(WITHOUT_CAIRO)
 MAKE_CAIRO=
 .else
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 MAKE_CAIRO=	make_cairo
 .endif
 
@@ -94,40 +94,43 @@ MAKE_ENV+=	BROWSER=${BROWSER} \
 		MAKE_CAIRO=${MAKE_CAIRO} \
 		MACHINE_ARCH=${MACHINE_ARCH}
 
-PLIST_FILES=	bin/eclipse share/applications/eclipse.desktop
+PLIST_FILES=	bin/${ECLIPSE} share/applications/${ECLIPSE}.desktop
 
 SWTCAIRO=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library
-SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library
+SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI
 SWTMOZ=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla
 
-# Manually patch some files with spaces in the path
 post-patch:
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/gtk/org/eclipse/swt/browser/Browser.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-Browser.java
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/org/eclipse/swt/internal/mozilla/XPCOM.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.java
-	@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.properties
-	@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM_PROFILE.properties" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM_PROFILE.properties
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom.cpp" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom.cpp
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom.h" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom.h
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom_profile.h" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom_profile.h
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom_stats.cpp" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom_stats.cpp
-	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom_stats.h" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom_stats.h
+	@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile" ${FILESDIR}/post-patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-Makefile
+	@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.update.core.freebsd/src/update.c" ${FILESDIR}/post-patch-plugins-org.eclipse.update.core.freebsd-src-update.c
+	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/library/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh
+	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/library/build.xml" ${FILESDIR}/post-patch-plugins-swt-PI-gtk-library-build.xml
+	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/library/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak
+	@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/gtk/org/eclipse/swt/browser/MozillaDelegate.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-gtk-swt-browser-MozillaDelegate.java
+	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/org/eclipse/swt/internal/gtk/OS.java" ${FILESDIR}/post-patch-plugins-swt-gtk-swt-internal-gtk-OS.java
+	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/library/os.c" ${FILESDIR}/post-patch-plugins-swt-gtk-library-os.c
+	@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java" ${FILESDIR}/post-patch-plugins-swt-gtk-swt-FileDialog.java
+
 	@${REINPLACE_CMD} -e 's|%%GECKO%%|${GECKO}|g' \
 		"${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh" \
 		"${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak"
+	@${RM} ${WRKSRC}/features/org.eclipse.platform/build.xml
+	@${CP} ${FILESDIR}/org.eclipse.platform-build.xml ${WRKSRC}/features/org.eclipse.platform/build.xml
+	@${RM} ${WRKSRC}/features/org.eclipse.rcp/build.xml
+	@${CP} ${FILESDIR}/org.eclipse.rcp-build.xml ${WRKSRC}/features/org.eclipse.rcp/build.xml
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-	  ./build -os ${ECLIPSE_OS} -ws ${ECLIPSE_WS} -arch ${ECLIPSE_ARCH} -java5home ${JAVA_HOME} -compilelibs)
+	./build -os ${ECLIPSE_OS} -ws ${ECLIPSE_WS} -arch ${ECLIPSE_ARCH} -compilelibs)
 
 do-install:
 	@${MKDIR} ${PORTDESTDIR}
-	@${CP} -R ${WRKSRC}/eclipse ${PREFIX}
+	@${CP} -R ${WRKSRC}/eclipse/ ${PORTDESTDIR}
 	@${SED} \
 	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
 	  -e "s+%%PREFIX%%+${PREFIX}+g" \
 	  -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
+	  -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
 	  -e "s+%%BROWSER%%+${BROWSER}+g" \
 	  -e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \
 	  -e "s+%%JAVA_OS%%+${JAVA_OS}+g" \
@@ -141,19 +144,21 @@ do-install:
 	  -e "s+%%JAVA_VENDOR_SPECIFICATION%%++g" \
 	  ${WRKSRC}/eclipse.tmp
 .endif
-	${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/eclipse
+	${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${ECLIPSE}
 	@${SED} \
 	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
 	  -e "s+%%PREFIX%%+${PREFIX}+g" \
 	${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp
 	${MKDIR} ${PREFIX}/share/applications/ || ${TRUE}
-	${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/eclipse.desktop
-	${INSTALL_PROGRAM} ${WRKSRC}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse
+	${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/${ECLIPSE}.desktop
+	${INSTALL_PROGRAM} ${WRKSRC}/features/org.eclipse.equinox.executable/library/gtk/eclipse ${PORTDESTDIR}/eclipse
 	@-update-desktop-database
-	@(cd ${WRKSRC}; ${FIND} -s eclipse -not -type d) >> ${TMPPLIST}
+	@(cd ${WRKSRC}; ${FIND} -s eclipse -not -type d) \
+	  | ${SED} -e "s+^eclipse+${ECLIPSE}+g" >> ${TMPPLIST}
 	@echo '@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
 	@(cd ${WRKSRC}; ${FIND} -s -d eclipse -type d) \
-	  | ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
+	  | ${SED} -e "s+^eclipse+${ECLIPSE}+g" \
+	    -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
 	@echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
 
 .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo
index a57e1fd30919..35761b9460e7 100644
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,3 +1,3 @@
-MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.2.zip) = 5d1b9f6a146ffc59191e513083a6ec86
-SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.2.zip) = 84759dc6085e68b31228ce2b226778494481be38681dc8ca5b0e2f226bf963a7
-SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.2.2.zip) = 82487328
+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/files/XXXorg.eclipse.rcp-build.xml b/java/eclipse/files/XXXorg.eclipse.rcp-build.xml
new file mode 100644
index 000000000000..fe3cb04a340d
--- /dev/null
+++ b/java/eclipse/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/files/eclipse.in b/java/eclipse/files/eclipse.in
index 8a2b7e32eb51..3f30044bbe93 100644
--- a/java/eclipse/files/eclipse.in
+++ b/java/eclipse/files/eclipse.in
@@ -6,7 +6,6 @@
 #
 # $FreeBSD$
 #
-
 DEFAULT_JAVA_HOME=%%PREFIX%%
 ECLIPSE_HOME=%%ECLIPSE_HOME%%
 DEFAULT_JAVA_CMD=java
@@ -46,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/files/org.eclipse.platform-build.xml b/java/eclipse/files/org.eclipse.platform-build.xml
new file mode 100644
index 000000000000..f580aaffc034
--- /dev/null
+++ b/java/eclipse/files/org.eclipse.platform-build.xml
@@ -0,0 +1,938 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.platform" 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.core.runtime.compatibility.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.text" 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.osgi.util" 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.filesystem" 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.filesystem.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.core.filesystem.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.core.filesystem.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.core.filesystem.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.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"/>
+			<property name="ws" value="gtk"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.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.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.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.core.filesystem.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.core.filesystem.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.core.boot" 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.osgi.services" 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.platform.doc.user" 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.appserver" 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.tomcat" 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.variables" 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" 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.net" 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.core" 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.core.win32" 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.core.linux" 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.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"/>
+			<property name="ws" value="win32"/>
+		</ant>
+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources" 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.resources.win32" 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.resources.compatibility" 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.team.core" 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.debug.core" 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.filebuffers" 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.ltk.core.refactoring" 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.http.servlet" 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.http.jetty" 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.base" 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.http.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.jsp.jasper" 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.jsp.jasper.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.help.webapp" 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.jsch.core" 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.views" 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.net" 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.browser" 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.presentations.r21" 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.jsch.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.workbench.compatibility" 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.forms" 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.views.properties.tabbed" 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.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.update.scheduler" 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.intro" 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.intro.universal" 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.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.cheatsheets" 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.navigator" 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.text" 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.ide" 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.win32" 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.texteditor" 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.editors" 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.navigator.resources" 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.ide.application" 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.platform" 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.console" 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.search" 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.debug.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.externaltools" 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.compare" 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.team.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.ltk.ui.refactoring" target="${target}">
+			<property name="arch" value="x86"/>
+			<property name="os" value="win32"/>
+			<property name="ws" value="win32"/>
+		</ant>
+	</target>
+	<target name="all.features" depends="init">
+		<ant antfile="build.xml" dir="../org.eclipse.rcp/" target="${target}"/>
+	</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.platform.">
+		<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.platform 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.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.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.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" failonerror="true" overwrite="false">
+			<fileset dir="${basedir}">
+				<include name="epl-v10.html"/>
+				<include name="eclipse_update_120.jpg"/>
+				<include name="feature.xml"/>
+				<include name="feature.properties"/>
+				<include name="license.html"/>
+			</fileset>
+		</copy>
+		<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">
+		<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}/win32">
+				<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}/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}/wpf">
+				<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}/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}/macosx.carbon">
+				<include name="**"/>
+			</fileset>
+			<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}/../../plugins/org.eclipse.platform">
+				<include name="startup.jar"/>
+			</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}/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="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}/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}/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}/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}/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}/linux.gtk.ppc/${collectingFolder}" includes="*.so*" /> 
+		<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}/../../launchertmp">
+				<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}/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">
+			<fileset dir="${basedir}/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}/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}/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}/../../plugins/org.eclipse.platform">
+				<include name="startup.jar"/>
+			</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}/../../launchertmp">
+				<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}/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}/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}/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}/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}/about_files/linux.motif.x86">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/motif">
+				<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="Xm.so.2"/>
+			</fileset>
+			<fileset dir="${basedir}/motif">
+				<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}/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}/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}/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}/../../launchertmp">
+				<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}/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}/../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/motif">
+				<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}/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}/motif">
+				<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}/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}/../../plugins/org.eclipse.platform">
+				<include name="startup.jar"/>
+			</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}/../../launchertmp">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/motif">
+				<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}/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}/../../launchertmp">
+				<include name="**"/>
+			</fileset>
+			<fileset dir="${basedir}/motif">
+				<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}/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}/../../plugins/org.eclipse.platform">
+				<include name="startup.jar"/>
+			</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="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"/>
+		<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.platform.">
+		<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.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>
+
+	<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.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.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.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.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.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"/>
+		</antcall>
+	</target>
+
+	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+		<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"/>
+		</antcall>
+	</target>
+	<target name="gather.sources">
+		<antcall target="children">
+			<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>
+
+	<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/files/org.eclipse.rcp-build.xml b/java/eclipse/files/org.eclipse.rcp-build.xml
new file mode 100644
index 000000000000..66ef7881f6d7
--- /dev/null
+++ b/java/eclipse/files/org.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.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"/>
+			<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.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.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.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.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.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"/>
+			<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.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">
+		<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="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="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">
+			<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="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"/>
+		<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/files/patch-another-extra-patches b/java/eclipse/files/patch-another-extra-patches
new file mode 100644
index 000000000000..1dfd472483e5
--- /dev/null
+++ b/java/eclipse/files/patch-another-extra-patches
@@ -0,0 +1,182 @@
+--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig	2007-06-26 04:57:18.000000000 +0900
++++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	2007-09-13 09:48:55.000000000 +0900
+@@ -193,6 +193,17 @@
+ 	public static final String OS_WIN32 = "win32";//$NON-NLS-1$
+ 
+ 	/**
++	 * Constant string (value "freebsd") indicating the platform is running on a
++	 * FreeBSD-based operating system.
++	 * <p>
++	 * Note this constant has been moved from the deprecated 
++	 * org.eclipse.core.boot.BootLoader class and its value has not changed.
++	 * </p>
++	 * @since 3.0
++	 */
++	public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
++
++	/**
+ 	 * Constant string (value "linux") indicating the platform is running on a
+ 	 * Linux-based operating system.
+ 	 * <p>
+
+--- plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java.orig	2007-06-26 04:57:18.000000000 +0900
++++ plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java	2007-09-13 09:37:01.000000000 +0900
+@@ -18,6 +18,7 @@
+ 	public static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$
+ 	public static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$
+ 	public static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$
++	public static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$
+ 	public static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$
+ 	public static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$
+ 	public static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$
+@@ -34,6 +35,12 @@
+ 	public static final String OS_WIN32 = "win32";//$NON-NLS-1$
+ 
+ 	/**
++	 * Constant string (value "freebsd") indicating the platform is running on a
++	 * Linux-based operating system.
++	 */
++	public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
++
++	/**
+ 	 * Constant string (value "linux") indicating the platform is running on a
+ 	 * Linux-based operating system.
+ 	 */
+
+--- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java.orig	2007-06-26 04:57:16.000000000 +0900
++++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java	2007-09-13 01:54:23.000000000 +0900
+@@ -72,6 +72,8 @@
+ 			brandWindows();
+ 		if ("linux".equals(os)) //$NON-NLS-1$
+ 			brandLinux();
++		if ("freebsd".equals(os)) //$NON-NLS-1$
++			brandFreeBSD();
+ 		if ("solaris".equals(os)) //$NON-NLS-1$
+ 			brandSolaris();
+ 		if ("macosx".equals(os)) //$NON-NLS-1$
+@@ -90,6 +92,12 @@
+ 		renameLauncher();
+ 	}
+ 
++	private void brandFreeBSD() throws Exception {
++		renameLauncher();
++		if (brandIcons)
++			copy(new File(icons[0]), new File(root, "icon.xpm"));
++	}
++
+ 	private void brandLinux() throws Exception {
+ 		renameLauncher();
+ 		if (brandIcons)
+
+--- plugins/org.eclipse.pde.build/templates/packager/packaging.properties.orig	2007-06-26 04:57:16.000000000 +0900
++++ plugins/org.eclipse.pde.build/templates/packager/packaging.properties	2007-09-13 01:51:19.000000000 +0900
+@@ -18,6 +18,8 @@
+ 
+ root.win32.win32.x86=eclipse.exe, eclipsec.exe
+ root.linux.motif.x86=eclipse,libcairo-swt.so,libXm.so.2,about_files/,about.html,icon.xpm
++root.freebsd.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
++root.freebsd.amd64.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
+ root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
+ root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
+ root.linux.gtk.ppc=eclipse
+
+--- plugins/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java.orig	2007-06-26 04:57:02.000000000 +0900
++++ plugins/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java	2007-09-13 01:40:37.000000000 +0900
+@@ -169,7 +169,7 @@
+ 		IPluginElement implementationElement = factory
+ 				.createElement(presentationElement);
+ 		implementationElement.setName("implementation"); //$NON-NLS-1$
+-        implementationElement.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$
++        implementationElement.setAttribute("os", "win32,linux,freebsd,macosx"); //$NON-NLS-1$ //$NON-NLS-2$
+         if (getTargetVersion() == 3.0)
+             implementationElement.setAttribute("style", "content/shared.css");  //$NON-NLS-1$//$NON-NLS-2$
+        
+
+--- plugins/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java.orig	2007-06-26 04:57:25.000000000 +0900
++++ plugins/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java	2007-09-13 01:38:36.000000000 +0900
+@@ -72,6 +72,13 @@
+ 	public static final String OS_LINUX = "linux";//$NON-NLS-1$
+ 
+ 	/**
++	 * Constant string (value "freebsd") indicating the platform is running on a
++	 * Linux-based operating system.
++	 * @deprecated Replaced by {@link Platform#OS_FREEBSD}.
++	 */
++	public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
++
++	/**
+ 	 * Constant string (value "aix") indicating the platform is running on an
+ 	 * AIX-based operating system.
+ 	 * @deprecated Replaced by {@link Platform#OS_AIX}.
+
+--- plugins/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java.orig	2007-06-26 04:57:18.000000000 +0900
++++ plugins/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java	2007-09-13 01:10:07.000000000 +0900
+@@ -82,8 +82,8 @@
+ 			isBidi = true;
+ 		
+ 		String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
+-		if (osName.startsWith("windows") || osName.startsWith("linux")) { //$NON-NLS-1$	//$NON-NLS-2$
+-																			
++		if (osName.startsWith("windows") || osName.startsWith("linux") 
++                               || osName.startsWith("freebsd")) { //$NON-NLS-1$	//$NON-NLS-2$
+ 			// Only consider platforms that can support control characters
+ 			isSupportedPlatform = true;
+ 		}
+
+--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java.orig	2007-06-26 04:57:02.000000000 +0900
++++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java	2007-09-13 01:03:14.000000000 +0900
+@@ -29,6 +29,12 @@
+ 	public static final String OS_LINUX = "linux";//$NON-NLS-1$
+ 
+ 	/**
++	 * Constant string (value "freebsd") indicating the platform is running on a
++	 * FreeBSD-based operating system.
++	 */
++	public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
++
++	/**
+ 	 * Constant string (value "aix") indicating the platform is running on an
+ 	 * AIX-based operating system.
+ 	 */
+
+
+--- features/org.eclipse.rcp/build.properties.orig	2007-06-26 04:57:18.000000000 +0900
++++ features/org.eclipse.rcp/build.properties	2007-09-13 00:43:31.000000000 +0900
+@@ -23,6 +23,10 @@
+ 
+ root.solaris.gtk.sparc=../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc
+ 
++root.freebsd.gtk.x86=../../features/org.eclipse.platform/about_files/freebsd.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86
++root.freebsd.gtk.x86.permissions.755=*.so*
++root.freebsd.gtk.amd64=../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64
++root.freebsd.gtk.amd64.permissions.755=*.so*
+ root.linux.gtk.x86=../../features/org.eclipse.platform/about_files/linux.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86
+ root.linux.gtk.x86.permissions.755=*.so*
+ root.linux.gtk.s390=../../features/org.eclipse.platform/about_files/linux.gtk.s390,../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390
+
+--- features/org.eclipse.platform/build.properties.orig	2007-06-26 04:57:18.000000000 +0900
++++ features/org.eclipse.platform/build.properties	2007-09-13 00:35:59.000000000 +0900
+@@ -32,7 +32,10 @@
+ root.solaris.motif.sparc=../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc,motif
+ root.solaris.gtk.x86=../../launchertmp,gtk
+ 
+-
++root.freebsd.gtk.x86=about_files/freebsd.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86,gtk
++root.freebsd.gtk.x86.permissions.755=*.so*
++root.freebsd.gtk.amd64=about_files/freebsd.gtk.amd64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64,gtk
++root.freebsd.gtk.amd64.permissions.755=*.so*
+ root.linux.gtk.x86=about_files/linux.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86,gtk
+ root.linux.gtk.x86.permissions.755=*.so*
+ root.linux.gtk.s390=about_files/linux.gtk.s390,../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390,gtk
+
+--- features/org.eclipse.sdk/build.properties.orig	2007-06-26 04:57:03.000000000 +0900
++++ features/org.eclipse.sdk/build.properties	2007-09-13 00:32:31.000000000 +0900
+@@ -32,6 +32,8 @@
+ root.aix.motif.ppc=motif
+ root.hpux.motif.PA_RISC=motif
+ root.solaris.gtk.sparc=gtk
++root.freebsd.gtk.x86=gtk
++root.freebsd.gtk.amd64=gtk
+ root.linux.gtk.x86=gtk
+ root.linux.gtk.x86_64=gtk
+ root.linux.gtk.ppc=gtk
diff --git a/java/eclipse/files/patch-another-extra-patches2 b/java/eclipse/files/patch-another-extra-patches2
new file mode 100644
index 000000000000..9d2ded65ca21
--- /dev/null
+++ b/java/eclipse/files/patch-another-extra-patches2
@@ -0,0 +1,119 @@
+--- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java.orig	2007-06-26 04:57:03.000000000 +0900
++++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java	2007-09-13 13:38:20.000000000 +0900
+@@ -214,6 +214,9 @@
+ 			key = VM_ARGS_WIN;
+ 		} else if( os.equals(Platform.OS_LINUX)) {
+ 			key = VM_ARGS_LINUX;
++		} else if( os.equals(Platform.OS_FREEBSD)) {
++		    // You do not like this?
++		        key = VM_ARGS_LINUX;
+ 		} else if( os.equals(Platform.OS_MACOSX)) {
+ 			key = VM_ARGS_MAC;
+ 		} else if(os.equals(Platform.OS_SOLARIS)) {
+@@ -237,6 +240,8 @@
+ 			key = PROGRAM_ARGS_WIN;
+ 		} else if( os.equals(Platform.OS_LINUX)) {
+ 			key = PROGRAM_ARGS_LINUX;
++		} else if( os.equals(Platform.OS_FREEBSD)) {
++			key = PROGRAM_ARGS_LINUX;
+ 		} else if( os.equals(Platform.OS_MACOSX)) {
+ 			key = PROGRAM_ARGS_MAC;
+ 		} else if(os.equals(Platform.OS_SOLARIS)) {
+@@ -494,7 +499,7 @@
+ 	}
+ 
+ 	private void processLinux(Attributes attributes) {
+-		if (!osMatch(Platform.OS_LINUX)) 
++		if (!osMatch(Platform.OS_LINUX) && !osMatch(Platform.OS_FREEBSD) ) 
+ 			return;
+ 		result.add(attributes.getValue("icon")); //$NON-NLS-1$
+ 	}
+
+
+--- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java.orig	2007-06-26 04:57:09.000000000 +0900
++++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java	2007-09-13 15:40:52.000000000 +0900
+@@ -419,12 +419,18 @@
+ 
+ 	private static void generateLinkInstruction(AntScript script, String dir, String files) {
+ 		String[] links = Utils.getArrayFromString(files, ","); //$NON-NLS-1$
+-		List arguments = new ArrayList(2);
++	    	List arguments = new ArrayList(2);
++		String os_running = "FreeBSD";
++
++		String os = System.getProperty("os.name"); //$NON-NLS-1$
++		if (os != null && os.toLowerCase().indexOf("lin") >= 0) os_running = "Linux"; //$NON-NLS-1$
++		if (os != null && os.toLowerCase().indexOf("free") >= 0) os_running = "FreeBSD"; //$NON-NLS-1$
++
+ 		for (int i = 0; i < links.length; i += 2) {
+ 			arguments.add("-sf"); //$NON-NLS-1$
+ 			arguments.add(links[i]);
+ 			arguments.add(links[i + 1]);
+-			script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$
++			script.printExecTask("ln", dir, arguments, os_running); //$NON-NLS-1$ //$NON-NLS-2$
+ 			arguments.clear();
+ 		}
+ 	}
+
+
+--- plugins/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java.orig	2007-06-26 04:57:06.000000000 +0900
++++ plugins/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java	2007-09-13 13:45:14.000000000 +0900
+@@ -307,6 +307,8 @@
+ 			return "Mac"; //$NON-NLS-1$
+ 		if ("linux".equalsIgnoreCase(os)) //$NON-NLS-1$
+ 			return "Linux"; //$NON-NLS-1$
++		if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$
++			return "FreeBSD"; //$NON-NLS-1$
+ 		if ("solaris".equalsIgnoreCase(os)) //$NON-NLS-1$
+ 			return "Solaris"; //$NON-NLS-1$
+ 		if ("hpux".equalsIgnoreCase(os)) //$NON-NLS-1$
+
+
+--- plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java.orig	2007-06-26 04:57:14.000000000 +0900
++++ plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java	2007-09-13 13:48:02.000000000 +0900
+@@ -70,6 +70,18 @@
+ 	}
+ 
+ 	/**
++	 * Returns true if we're running on freebsd.
++	 * 
++	 * @return boolean
++	 */
++	public static boolean isFreeBSD() {
++		String os = System.getProperty("os.name"); //$NON-NLS-1$
++		if (os != null && os.toLowerCase().indexOf("free") >= 0) //$NON-NLS-1$
++			return true;
++		return false;
++	}
++
++	/**
+ 	 * Open a dialog window.
+ 	 * 
+ 	 * @param message
+@@ -293,4 +305,4 @@
+ 		}
+ 		return encodedId;
+ 	}
+-}
+\ No newline at end of file
++}
+
+
+--- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java.orig	2007-06-26 04:57:21.000000000 +0900
++++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java	2007-09-13 15:40:33.000000000 +0900
+@@ -561,10 +561,15 @@
+ 	private void generateLinkInstruction(String dir, String files) {
+ 		String[] links = Utils.getArrayFromString(files, ","); //$NON-NLS-1$
+ 		List arguments = new ArrayList(2);
++		String os_running = "FreeBSD";
++		String os = System.getProperty("os.name"); //$NON-NLS-1$
++		if (os != null && os.toLowerCase().indexOf("lin") >= 0) os_running = "Linux"; //$NON-NLS-1$
++		if (os != null && os.toLowerCase().indexOf("free") >= 0) os_running = "FreeBSD"; //$NON-NLS-1$
++
+ 		for (int i = 0; i < links.length; i += 2) {
+ 			arguments.add(links[i]);
+ 			arguments.add(links[i + 1]);
+-			script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$
++			script.printExecTask("ln", dir, arguments, os_running); //$NON-NLS-1$ //$NON-NLS-2$
+ 			arguments.clear();
+ 		}
+ 	}
diff --git a/java/eclipse/files/patch-assemble-freebsd-amd64.xml b/java/eclipse/files/patch-assemble-freebsd-amd64.xml
deleted file mode 100644
index ca395b2105a3..000000000000
--- a/java/eclipse/files/patch-assemble-freebsd-amd64.xml
+++ /dev/null
@@ -1,23 +0,0 @@
---- assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml.orig	Thu Oct 26 13:49:34 2006
-+++ assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml	Thu Oct 26 14:04:20 2006
-@@ -747,18 +747,7 @@
- 		<exec executable="rm" dir="${basedir}">
- 			<arg line="-rf '${assemblyTempDir}/${collectingFolder}/freebsd.gtk.amd64'"/>
- 		</exec>
--		<exec executable="tar" dir="${assemblyTempDir}">
--			<arg line="${tarargs}-cvf '${archiveFullPath}' ${archivePrefix} "/>
--		</exec>
--		<antcall target="gzipResults"/>
--		<exec executable="rm">
--			<arg line="-rf"/>
--			<arg line="'${assemblyTempDir}'"/>
--		</exec>
--		<delete dir="${assemblyTempDir}"/>
--	</target>
--	<target name="gzipResults" unless="runPackager">
--		<move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/>
--		<gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/>
-+		<move file="${eclipse.base}" todir="${buildDirectory}"/>
-+                <delete dir="${assemblyTempDir}"/>
- 	</target>
- </project>
diff --git a/java/eclipse/files/patch-assemble-freebsd-x86.xml b/java/eclipse/files/patch-assemble-freebsd-x86.xml
deleted file mode 100644
index 64aacb1b45c6..000000000000
--- a/java/eclipse/files/patch-assemble-freebsd-x86.xml
+++ /dev/null
@@ -1,22 +0,0 @@
---- assemble.org.eclipse.sdk.freebsd.gtk.x86.xml.orig	Thu Oct 26 13:49:56 2006
-+++ assemble.org.eclipse.sdk.freebsd.gtk.x86.xml	Thu Oct 26 14:03:12 2006
-@@ -747,18 +747,7 @@
- 		<exec executable="rm" dir="${basedir}">
- 			<arg line="-rf '${assemblyTempDir}/${collectingFolder}/freebsd.gtk.x86'"/>
- 		</exec>
--		<exec executable="tar" dir="${assemblyTempDir}">
--			<arg line="${tarargs}-cvf '${archiveFullPath}' ${archivePrefix} "/>
--		</exec>
--		<antcall target="gzipResults"/>
--		<exec executable="rm">
--			<arg line="-rf"/>
--			<arg line="'${assemblyTempDir}'"/>
--		</exec>
-+		<move file="${eclipse.base}" todir="${buildDirectory}"/>
- 		<delete dir="${assemblyTempDir}"/>
--	</target>
--	<target name="gzipResults" unless="runPackager">
--		<move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/>
--		<gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/>
- 	</target>
- </project>
diff --git a/java/eclipse/files/patch-assemble-sdk-all.xml b/java/eclipse/files/patch-assemble-sdk-all.xml
index 301beea3675e..b8ce1b3bb4cb 100644
--- a/java/eclipse/files/patch-assemble-sdk-all.xml
+++ b/java/eclipse/files/patch-assemble-sdk-all.xml
@@ -1,15 +1,15 @@
---- assemble.org.eclipse.sdk.all.xml.orig	Sun Jul 30 00:47:29 2006
-+++ assemble.org.eclipse.sdk.all.xml	Sun Jul 30 00:48:52 2006
-@@ -25,6 +25,12 @@
- 		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.motif.x86">
- 			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.motif.x86.xml"/>
+--- assemble.org.eclipse.sdk.all.xml.orig	2007-06-26 04:39:43.000000000 +0900
++++ assemble.org.eclipse.sdk.all.xml		2007-08-25 12:12:43.000000000 +0900
+@@ -10,6 +10,12 @@
+ 		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.macosx.carbon.ppc">
+ 			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.macosx.carbon.ppc.xml"/>
  		</ant>
 +		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.freebsd.gtk.x86">
-+                        <property name="assembleScriptName" value="assemble.org.eclipse.sdk.freebsd.gtk.x86.xml"/>
-+                </ant>
++			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.freebsd.gtk.x86.xml"/>
++		</ant>
 +		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.freebsd.gtk.amd64">
-+                        <property name="assembleScriptName" value="assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml"/>
-+                </ant>
- 		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.solaris.gtk.sparc">
- 			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.solaris.gtk.sparc.xml"/>
++			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml"/>
++		</ant>
+ 		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.x86">
+ 			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.x86.xml"/>
  		</ant>
diff --git a/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-amd64.xml b/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-amd64.xml
new file mode 100644
index 000000000000..f5cf21777a4d
--- /dev/null
+++ b/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-amd64.xml
@@ -0,0 +1,125 @@
+--- 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}"/>
+@@ -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.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -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.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.intro.universal" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+ 		<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.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.jsch.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -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.help_3.3.2.v20071126_33x"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -590,10 +580,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.junit.runtime_3.3.0.v20070606-0010"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -892,6 +878,9 @@
+ 			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.team.core_3.3.1.r33x_20080128"/>
+ 		</antcall>
++
++		<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 +898,31 @@
+ 		</exec>
+ 		<delete dir="${assemblyTempDir}"/>
+ 	</target>
++
++	<target name="main.jdk16" if="jdk16">
++		<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.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.compiler.apt" target="gather.bin.parts">
++			<property name="destination.temp.folder" value="${eclipse.plugins}" />
++		</ant>
++		<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_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_793_R33x" />
++		</antcall>
++	</target>
++
+ 	<target name="gzipResults" unless="runPackager">
+ 		<move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/>
+ 		<gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/>
diff --git a/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-x86.xml b/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-x86.xml
new file mode 100644
index 000000000000..45d2d2245bb0
--- /dev/null
+++ b/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-x86.xml
@@ -0,0 +1,117 @@
+--- 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}"/>
+@@ -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.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -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.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>
+@@ -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.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.intro.universal" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -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.swt.gtk.freebsd.x86_3.3.2.v3349"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -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.equinox.app_1.0.1.R33x_v20070828"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -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.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.team.core_3.3.1.r33x_20080128"/>
+ 		</antcall>
++
++		<antcall target="main.jdk16" inheritAll="true"/>
++
+ 		<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;"/>
+@@ -909,6 +894,31 @@
+ 		</exec>
+ 		<delete dir="${assemblyTempDir}"/>
+ 	</target>
++
++	<target name="main.jdk16" if="jdk16">
++		<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.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.compiler.apt" target="gather.bin.parts">
++			<property name="destination.temp.folder" value="${eclipse.plugins}" />
++		</ant>
++		<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_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_793_R33x" />
++		</antcall>
++	</target>
++
+ 	<target name="gzipResults" unless="runPackager">
+ 		<move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/>
+ 		<gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/>
diff --git a/java/eclipse/files/patch-build b/java/eclipse/files/patch-build
index d389b31c8fd9..46047caff10d 100644
--- a/java/eclipse/files/patch-build
+++ b/java/eclipse/files/patch-build
@@ -1,18 +1,23 @@
---- build.orig	Fri Jul 28 14:48:47 2006
-+++ build	Tue Jul 25 18:06:18 2006
-@@ -60,7 +60,7 @@
- 	exit 1
+--- build.orig	2007-06-26 04:57:50.000000000 +0900
++++ build	2007-08-31 23:03:43.000000000 +0900
+@@ -52,16 +52,16 @@
+         exit 1
  fi
  
--if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ]
-+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-amd64" ]
+-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ]
++if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ]  || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-amd64" ]
  then
- 		 ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH		 
- 		 ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
-@@ -71,4 +71,4 @@
- 		 else
- 		 		 echo "The os-ws-arch combination of $os-$ws-$arch is not valid."
-  		 exit 1
-- fi
+                 ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH
+                 ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
+                 CLASSPATH=$PWD/jdtcoresrc/ecj.jar:$CLASSPATH;export CLASSPATH
+                 ant -q -buildfile jdtcoresrc/compilejdtcore.xml
+                 CLASSPATH=$PWD/ecj.jar:$ORIGCLASSPATH;export CLASSPATH
+-                ant -q -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch $compilelibs $bootclasspath
++                ant -q -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch $compilelibs $bootclasspath
+                                  else
+                                  echo "The os-ws-arch combination of $os-$ws-$arch is not valid."
+                  exit 1
+  fi
+-                                                       
 \ No newline at end of file
-+ fi
++                                                       
diff --git a/java/eclipse/files/patch-build.xml b/java/eclipse/files/patch-build.xml
index 0c85ddff331d..aa74f0125b20 100644
--- a/java/eclipse/files/patch-build.xml
+++ b/java/eclipse/files/patch-build.xml
@@ -1,65 +1,87 @@
---- build.xml.orig	Thu Sep 21 10:57:38 2006
-+++ build.xml	Thu Oct 26 14:32:58 2006
-@@ -86,11 +86,11 @@
- 		<!--unzip launcher -->
- 		<property name="launcherlibs" value="${buildDirectory}/launchertmp" />
- 		<mkdir dir="${launcherlibs}" />
--		<unzip dest="${launcherlibs}">
--			<fileset dir="${buildDirectory}/plugins/org.eclipse.platform.source/src/">
--				<include name="org.eclipse.platform_*/launchersrc.zip" />
--			</fileset>
--		</unzip>
-+		<copy todir="${launcherlibs}">
-+                        <fileset dir="${buildDirectory}/features/org.eclipse.platform.launchers">
-+                                <include name ="**"/>
-+                        </fileset>
-+                </copy>
- 		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
- 			<arg line="build.sh" />
- 		</exec>
-@@ -142,7 +142,6 @@
- 	<target name="build.doc.plugins">
- 		<!--Build doc plug-ins using antRunner in eclipse to gain access to classpath required for
- 		 pde.convertSchemaToHTML and help.buildHelpIndex tasks which are used when generating extension-point and help indeces.-->
--		<antcall target="install.eclipse.${archive.format}" />
- 		<property name="plugin.destination" value="${buildDirectory}/tmp/eclipse/plugins" />
- 		<mkdir dir="${plugin.destination}" />
- 		
-@@ -179,7 +178,6 @@
- 			<fileset dir="${buildDirectory}/${buildLabel}" />
+--- build.xml.orig	2007-09-22 02:02:44.000000000 +0900
++++ build.xml	2007-10-19 13:37:04.000000000 +0900
+@@ -10,6 +10,7 @@
+ 
+ 	<target name="fetch" depends="init" if="srcFetch">
+ 		<touch file="${cvspass}" />
++		
+ 		<property name="featureOnly" value="true" />
+ 		<property name="featureAndPlugins" value="true" />
+ 		<property name="featuresRecursively" value="true" />
+@@ -21,6 +22,17 @@
+ 		<mkdir dir="${linux.motif.rootfiles}" />
+ 		<copy tofile="${linux.motif.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.motif.linux.x86/about.html" />
+ 
++		<!--copy freebsd gtk x86 about_files to in temp location where it will be copied into root of eclipse at assembly time-->
++		<property name="freebsd.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.x86" />
++		<mkdir dir="${freebsd.gtk.x86.rootfiles}" />
++		<copy tofile="${freebsd.gtk.x86.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.x86/about.html" />
++
++		<!--copy freebsd gtk amd64 about_files to in temp location where it will be copied into root of eclipse at assembly time-->
++		<property name="freebsd.gtk.amd64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.amd64" />
++		<mkdir dir="${freebsd.gtk.amd64.rootfiles}" />
++		<copy tofile="${freebsd.gtk.amd64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.amd64/about.html" />
++
++
+ 		<!--copy linux gtk x86 about_files to in temp location where it will be copied into root of eclipse at assembly time-->
+ 		<property name="linux.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86" />
+ 		<mkdir dir="${linux.gtk.x86.rootfiles}" />
+@@ -108,11 +120,18 @@
+ 		</copy>
+ 
+ 		<!-- build liblocalfile -->
++		<!--
+ 		<exec dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" />
+ 		<move file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}">
++		  -->
++		<exec dir="plugins/org.eclipse.core.filesystem/natives/unix/freebsd" executable="make" failonerror="true" />
++		<move file="plugins/org.eclipse.core.filesystem/natives/unix/freebsd/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.freebsd.${installArch}/os/freebsd/${installArch}">
  		</move>
- 		<mkdir dir="${buildDirectory}/${buildLabel}" />
--		<antcall target="archive.eclipse.${archive.format}" />
- 		<delete dir="${buildDirectory}/${buildLabel}-old" />
+ 		<!-- build libupdate -->
++		<!--
+ 		<ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
++		-->
++		<ant dir="plugins/org.eclipse.update.core.freebsd/src" antfile="build.xml" />
+ 
  	</target>
  
-@@ -285,8 +283,8 @@
+@@ -305,8 +324,16 @@
  		</fail>
  
- 		<property name="compilerArg" value="-encoding ISO-8859-1" />
--		<property name="javacSource" value="1.3" />
--		<property name="javacTarget" value="1.2" />
+ 		<property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1" />
+-		<property name="javacSource" value="1.6" />
+-		<property name="javacTarget" value="1.6" />
 +		<property name="javacSource" value="1.5" />
 +		<property name="javacTarget" value="1.5" />
++               <!-- for jdk1.6 -->
++		<condition property="javacSource" value="1.6">
++		  <isset property="JavaSE-1.6"/>
++		</condition>
++		<condition property="javacTarget" value="1.6">
++		  <isset property="JavaSE-1.6"/>
++		</condition>
++
  		<property name="javacDebugInfo" value="true" />
  		<property name="javacFailOnError" value="true" />
  
-@@ -306,12 +304,17 @@
- 				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-ia64" />
- 				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-ia64_32" />
- 				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="solaris-gtk-x86" />
-+				<equals arg1="${install0s}-${installWs}-${installArch}" arg2="freebsd-gtk-x86" />
-+                               <equals arg1="${install0s}-${installWs}-${installArch}" arg2="freebsd-gtk-amd64" />
- 			</or>
- 		</condition>
+@@ -322,6 +349,8 @@
+ 		<!-- determines if libraries need to be recompiled for specific platforms -->
+ 		<condition property="libsconfig">
+ 			<or>
++				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-x86" />
++				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-amd64" />
+ 				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ppc64" />
+ 				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-motif-x86" />
+ 				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-s390" />
+@@ -335,7 +364,10 @@
  
  		<!--used to add doc plug-ins to result after initial assembly-->
  		<condition property="archive.format" value="tar">
--			<equals arg1="${installOs}" arg2="linux" />
-+			<or>
-+				<equals arg1="${installOs}" arg2="linux" />
-+				<equals arg1="${installOs}" arg2="freebsd" />
-+			</or>
++		    <or>
+ 			<equals arg1="${installOs}" arg2="linux" />
++			<equals arg1="${installOs}" arg2="freebsd" />
++		    </or>
  		</condition>
  		<property name="archive.format" value="zip" />
  	</target>
+
diff --git a/java/eclipse/files/patch-features-cvs-build.xml b/java/eclipse/files/patch-features-cvs-build.xml
new file mode 100644
index 000000000000..51acc07c11f9
--- /dev/null
+++ b/java/eclipse/files/patch-features-cvs-build.xml
@@ -0,0 +1,34 @@
+--- features/org.eclipse.cvs/build.xml.orig	2007-06-26 04:39:43.000000000 +0900
++++ features/org.eclipse.cvs/build.xml		2007-08-23 23:51:19.000000000 +0900
+@@ -123,6 +123,22 @@
+ 			</fileset>
+ 		</copy>
+ 	</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}/rootfiles">
++				<include name="**"/>
++			</fileset>
++		</copy>
++	</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}/rootfiles">
++				<include name="**"/>
++			</fileset>
++		</copy>
++	</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">
+@@ -255,6 +271,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/files/patch-features-cvs-source-build.xml b/java/eclipse/files/patch-features-cvs-source-build.xml
new file mode 100644
index 000000000000..f8f669f7d0e8
--- /dev/null
+++ b/java/eclipse/files/patch-features-cvs-source-build.xml
@@ -0,0 +1,22 @@
+--- features/org.eclipse.cvs.source/build.xml.orig	2007-06-26 04:39:42.000000000 +0900
++++ features/org.eclipse.cvs.source/build.xml		2007-08-23 23:49:08.000000000 +0900
+@@ -83,6 +83,10 @@
+ 	</target>
+ 	<target name="rootFileswin32_wpf_x86">
+ 	</target>
++	<target name="rootFilesfreebsd_gtk_x86">
++	</target>
++	<target name="rootFilesfreebsd_gtk_amd64">
++	</target>
+ 	<target name="rootFilesmacosx_carbon_ppc">
+ 	</target>
+ 	<target name="rootFileslinux_gtk_x86">
+@@ -121,6 +125,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/files/patch-features-equinox-executable-feature.xml b/java/eclipse/files/patch-features-equinox-executable-feature.xml
new file mode 100644
index 000000000000..997b83780f76
--- /dev/null
+++ b/java/eclipse/files/patch-features-equinox-executable-feature.xml
@@ -0,0 +1,31 @@
+--- features/org.eclipse.equinox.executable/feature.xml.orig	2007-06-26 04:57:23.000000000 +0900
++++ features/org.eclipse.equinox.executable/feature.xml		2007-08-23 23:47:11.000000000 +0900
+@@ -52,6 +52,28 @@
+          unpack="true"/>
+ 
+ 	<plugin
++         id="org.eclipse.equinox.launcher.gtk.freebsd.x86"
++         os="freebsd"
++         ws="gtk"
++         arch="x86"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="true"/>  
++
++	<plugin
++         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
++         os="freebsd"
++         ws="gtk"
++         arch="amd64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="true"/>  
++
++	<plugin
+          id="org.eclipse.equinox.launcher.gtk.linux.x86"
+          os="linux"
+          ws="gtk"
diff --git a/java/eclipse/files/patch-features-equinox-executable-library-gtk-build.sh b/java/eclipse/files/patch-features-equinox-executable-library-gtk-build.sh
new file mode 100644
index 000000000000..60227e2bb485
--- /dev/null
+++ b/java/eclipse/files/patch-features-equinox-executable-library-gtk-build.sh
@@ -0,0 +1,64 @@
+--- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig	2007-09-22 01:59:40.000000000 +0900
++++ features/org.eclipse.equinox.executable/library/gtk/build.sh	2007-10-20 18:57:55.000000000 +0900
+@@ -10,6 +10,9 @@
+ #     IBM Corporation - initial API and implementation
+ #     Kevin Cornell (Rational Software Corporation)
+ # Martin Oberhuber (Wind River) - [176805] Support building with gcc and debug
++#
++#   This is from "features/org.eclipse.equinox.executable/library/gtk/build.sh"
++#
+ #*******************************************************************************
+ #
+ # Usage: sh build.sh [<optional switches>] [clean]
+@@ -50,6 +53,25 @@
+ fi
+ 
+ case $OS in
++	"FreeBSD")
++		makefile="make_freebsd.mak"
++		defaultOS="freebsd"
++		case $MODEL in
++			"amd64")
++				defaultOSArch="amd64"
++				defaultJava=DEFAULT_JAVA_EXEC
++				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
++				;;
++			i?86)
++				defaultOSArch="x86"
++				defaultJava=DEFAULT_JAVA_EXEC
++				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
++				;;
++			*)
++				echo "*** Unknown MODEL <${MODEL}>"
++				;;
++		esac
++		;;
+ 	"Linux")
+ 		makefile="make_linux.mak"
+ 		defaultOS="linux"
+@@ -148,7 +170,6 @@
+ DEFAULT_OS="$defaultOS"
+ DEFAULT_OS_ARCH="$defaultOSArch"
+ DEFAULT_WS="$defaultWS"
+-JAVA_HOME=$javaHome
+ DEFAULT_JAVA=$defaultJava
+ 
+ export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA
+@@ -156,13 +177,13 @@
+ # If the OS is supported (a makefile exists)
+ if [ "$makefile" != "" ]; then
+ 	if [ "$extraArgs" != "" ]; then
+-		make -f $makefile $extraArgs
++		gmake -f $makefile $extraArgs
+ 	else
+ 		echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS"
+-		make -f $makefile clean
++		gmake -f $makefile clean
+ 		case x$CC in
+-		  x*gcc*) make -f $makefile all PICFLAG=-fpic ;;
+-		  *)      make -f $makefile all ;;
++		  x*gcc*) gmake -f $makefile all PICFLAG=-fpic ;;
++		  *)      gmake -f $makefile all ;;
+ 		esac
+ 	fi
+ else
diff --git a/java/eclipse/files/patch-features-equinox-executable-target-build.properties b/java/eclipse/files/patch-features-equinox-executable-target-build.properties
new file mode 100644
index 000000000000..ed8b557399d7
--- /dev/null
+++ b/java/eclipse/files/patch-features-equinox-executable-target-build.properties
@@ -0,0 +1,14 @@
+--- features/org.eclipse.equinox.executable/target.build.properties.orig	2007-06-26 04:57:23.000000000 +0900
++++ features/org.eclipse.equinox.executable/target.build.properties	2007-08-24 16:35:31.000000000 +0900
+@@ -21,6 +21,12 @@
+ root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
+ root.linux.gtk.x86.permissions.755=libcairo-swt.so
+ 
++root.freebsd.gtk.x86=bin/gtk/freebsd/x86,gtk_root
++root.freebsd.gtk.x86.permissions.755=libcairo-swt.so
++
++root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root
++root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so
++
+ root.linux.gtk.ppc=bin/gtk/linux/ppc,gtk_root
+ root.linux.gtk.ppc.permissions.755=libcairo-swt.so
diff --git a/java/eclipse/files/patch-features-equinox-executable-target.build.xml b/java/eclipse/files/patch-features-equinox-executable-target.build.xml
new file mode 100644
index 000000000000..854251ced0ee
--- /dev/null
+++ b/java/eclipse/files/patch-features-equinox-executable-target.build.xml
@@ -0,0 +1,36 @@
+--- features/org.eclipse.equinox.executable/target.build.xml.orig	2007-06-26 04:57:02.000000000 +0900
++++ features/org.eclipse.equinox.executable/target.build.xml	2007-09-05 21:45:39.000000000 +0900
+@@ -73,6 +73,24 @@
+ 		<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}.app/Contents/MacOS/${launcherName}" /> 
+ 		<chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}.app/Contents/Resources/Splash.app/Contents/MacOS/${launcherName}"/>
+ 	</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}/bin/gtk/freebsd/x86" includes="**"			/>
++			<fileset dir="${basedir}/gtk_root" includes="**"			/>
++		</copy>
++		<chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="${launcherName}" /> 
++		<chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="libcairo-swt.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}/bin/gtk/freebsd/amd64" includes="**"			/>
++			<fileset dir="${basedir}/gtk_root" includes="**"			/>
++		</copy>
++		<chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="${launcherName}" /> 
++		<chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="libcairo-swt.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">
+@@ -166,6 +184,8 @@
+ 		<antcall target="rootFileswin32_wpf_x86"/>
+ 		<antcall target="rootFilesmacosx_carbon_ppc"/>
+ 		<antcall target="rootFilesmacosx_carbon_x86"/>
++		<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/files/patch-features-equinox-gtk-make_freebsd.mak b/java/eclipse/files/patch-features-equinox-gtk-make_freebsd.mak
new file mode 100644
index 000000000000..0be077f9b453
--- /dev/null
+++ b/java/eclipse/files/patch-features-equinox-gtk-make_freebsd.mak
@@ -0,0 +1,25 @@
+--- features/org.eclipse.equinox.executable/library/gtk/make_freebsd.mak.orig	2007-10-11 15:42:00.000000000 +0900
++++ features/org.eclipse.equinox.executable/library/gtk/make_freebsd.mak	2007-10-11 15:57:13.000000000 +0900
+@@ -32,7 +32,7 @@
+ ifeq ($(DEFAULT_JAVA),)
+   DEFAULT_JAVA=DEFAULT_JAVA_JNI
+ endif
+-
++
+ # Define the object modules to be compiled and flags.
+ CC=gcc
+ MAIN_OBJS = eclipseMain.o
+@@ -41,11 +41,11 @@
+ 
+ EXEC = $(PROGRAM_OUTPUT)
+ DLL = $(PROGRAM_LIBRARY)
+-LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl
++LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread #-ldl
+ LFLAGS = -shared -fpic -Wl,--export-dynamic 
+ CFLAGS = -O -s -Wall\
+ 	-fpic \
+-	-DLINUX \
++	-DFREEBSD \
+ 	-DMOZILLA_FIX \
+ 	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
+ 	-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
diff --git a/java/eclipse/files/patch-features-jdt-build.xml b/java/eclipse/files/patch-features-jdt-build.xml
index 2e8d2fd0892f..734b3ab5fb13 100644
--- a/java/eclipse/files/patch-features-jdt-build.xml
+++ b/java/eclipse/files/patch-features-jdt-build.xml
@@ -1,27 +1,96 @@
---- features/org.eclipse.jdt/build.xml.orig	Thu Jul 27 17:40:53 2006
-+++ features/org.eclipse.jdt/build.xml	Tue Jul 25 19:25:14 2006
-@@ -201,6 +201,18 @@
- 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+--- features/org.eclipse.jdt/build.xml.orig	Fri Sep 21 18:25:30 2007
++++ features/org.eclipse.jdt/build.xml	Sun Oct 21 17:11:44 2007
+@@ -1,5 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project name="org.eclipse.jdt" default="build.update.jar" basedir=".">
++	<condition property="jdk16">
++		<isset property="JavaSE-1.6"/>
++	</condition>
+ 
+ 	<target name="init">
+ 		<property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/>
+@@ -32,26 +35,13 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.tool" 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.jdt.compiler.apt" 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.jdt.apt.core" 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.jdt.apt.pluggable.core" 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.jdt.debug" target="${target}">
+ 			<property name="arch" value="x86"/>
+ 			<property name="os" value="win32"/>
+@@ -102,7 +92,30 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
++
++		<antcall target="all.plugins.jdk16" inheritAll="true"/>
+ 	</target>
++	<target name="all.plugins.jdk16" if="jdk16">
++		<!-- 1.6 -->
++		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.pluggable.core" target="${target}">
++			<property name="arch" value="x86" />
++			<property name="os" value="win32" />
++			<property name="ws" value="win32" />
++		</ant>
++		<!-- 1.6 -->
++		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.tool" target="${target}">
++			<property name="arch" value="x86" />
++			<property name="os" value="win32" />
++			<property name="ws" value="win32" />
++		</ant>
++		<!-- 1.6 -->
++		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.apt" target="${target}">
++			<property name="arch" value="x86" />
++			<property name="os" value="win32" />
++			<property name="ws" value="win32" />
++		</ant>
++	</target>
++
+ 	<target name="all.features" depends="init">
+ 	</target>
+ 	<target name="update.feature" depends="init">
+@@ -257,6 +270,18 @@
+ 			</fileset>
  		</copy>
  	</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}/rootfiles" includes="**"                       />
-+                </copy>
-+        </target>
++		<mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/>
++		<copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true">
++			<fileset dir="${basedir}/rootfiles" includes="**"                       />
++		</copy>
++	</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}/rootfiles" includes="**"                       />
-+                </copy>
-+        </target>
++		<mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>
++		<copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true">
++			<fileset dir="${basedir}/rootfiles" includes="**"                       />
++		</copy>
++	</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">
-@@ -258,6 +270,8 @@
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
- 		<antcall target="rootFileslinux_gtk_ia64"/>
+ 		<mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/"/>
+ 		<copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/" failonerror="true" overwrite="true">
+@@ -333,6 +358,8 @@
+ 		<antcall target="rootFileslinux_gtk_s390"/>
+ 		<antcall target="rootFileslinux_gtk_s390x"/>
  		<antcall target="rootFileslinux_motif_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_amd64"/>
diff --git a/java/eclipse/files/patch-features-jdt-feature.xml b/java/eclipse/files/patch-features-jdt-feature.xml
new file mode 100644
index 000000000000..a5865b096491
--- /dev/null
+++ b/java/eclipse/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/files/patch-features-jdt-source-build.xml b/java/eclipse/files/patch-features-jdt-source-build.xml
index 21e2ca212459..619787c5b776 100644
--- a/java/eclipse/files/patch-features-jdt-source-build.xml
+++ b/java/eclipse/files/patch-features-jdt-source-build.xml
@@ -1,6 +1,6 @@
---- features/org.eclipse.jdt.source/build.xml.orig	Thu Jul 27 17:42:44 2006
-+++ features/org.eclipse.jdt.source/build.xml	Tue Jul 25 19:23:28 2006
-@@ -99,6 +99,10 @@
+--- features/org.eclipse.jdt.source/build.xml.orig	Mon Jun 25 15:39:41 2007
++++ features/org.eclipse.jdt.source/build.xml	Fri Aug 17 15:41:11 2007
+@@ -111,6 +111,10 @@
  	</target>
  	<target name="rootFileslinux_motif_x86">
  	</target>
@@ -11,9 +11,9 @@
  	<target name="rootFilessolaris_gtk_sparc">
  	</target>
  	<target name="rootFilessolaris_gtk_x86">
-@@ -124,6 +128,8 @@
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
- 		<antcall target="rootFileslinux_gtk_ia64"/>
+@@ -139,6 +143,8 @@
+ 		<antcall target="rootFileslinux_gtk_s390"/>
+ 		<antcall target="rootFileslinux_gtk_s390x"/>
  		<antcall target="rootFileslinux_motif_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_amd64"/>
diff --git a/java/eclipse/files/patch-features-pde-build.xml b/java/eclipse/files/patch-features-pde-build.xml
index 0b1e9d8cc8d9..df6f705a7ae8 100644
--- a/java/eclipse/files/patch-features-pde-build.xml
+++ b/java/eclipse/files/patch-features-pde-build.xml
@@ -1,6 +1,6 @@
---- features/org.eclipse.pde/build.xml.orig	Thu Jul 27 17:44:29 2006
-+++ features/org.eclipse.pde/build.xml	Tue Jul 25 19:20:37 2006
-@@ -119,6 +119,10 @@
+--- features/org.eclipse.pde/build.xml.orig	Mon Jun 25 15:39:42 2007
++++ features/org.eclipse.pde/build.xml	Fri Aug 17 15:41:11 2007
+@@ -136,6 +136,10 @@
  	</target>
  	<target name="rootFileslinux_motif_x86">
  	</target>
@@ -11,9 +11,9 @@
  	<target name="rootFilessolaris_gtk_sparc">
  	</target>
  	<target name="rootFilessolaris_gtk_x86">
-@@ -144,6 +148,8 @@
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
- 		<antcall target="rootFileslinux_gtk_ia64"/>
+@@ -164,6 +168,8 @@
+ 		<antcall target="rootFileslinux_gtk_s390"/>
+ 		<antcall target="rootFileslinux_gtk_s390x"/>
  		<antcall target="rootFileslinux_motif_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_amd64"/>
diff --git a/java/eclipse/files/patch-features-pde-source-build.xml b/java/eclipse/files/patch-features-pde-source-build.xml
index 587b8477dcf5..fc7899c1c47f 100644
--- a/java/eclipse/files/patch-features-pde-source-build.xml
+++ b/java/eclipse/files/patch-features-pde-source-build.xml
@@ -1,6 +1,6 @@
---- features/org.eclipse.pde.source/build.xml.orig	Thu Jul 27 17:45:38 2006
-+++ features/org.eclipse.pde.source/build.xml	Tue Jul 25 19:22:14 2006
-@@ -89,6 +89,10 @@
+--- features/org.eclipse.pde.source/build.xml.orig	Mon Jun 25 15:39:43 2007
++++ features/org.eclipse.pde.source/build.xml	Fri Aug 17 15:41:11 2007
+@@ -101,6 +101,10 @@
  	</target>
  	<target name="rootFileslinux_motif_x86">
  	</target>
@@ -11,9 +11,9 @@
  	<target name="rootFilessolaris_gtk_sparc">
  	</target>
  	<target name="rootFilessolaris_gtk_x86">
-@@ -114,6 +118,8 @@
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
- 		<antcall target="rootFileslinux_gtk_ia64"/>
+@@ -129,6 +133,8 @@
+ 		<antcall target="rootFileslinux_gtk_s390"/>
+ 		<antcall target="rootFileslinux_gtk_s390x"/>
  		<antcall target="rootFileslinux_motif_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_amd64"/>
diff --git a/java/eclipse/files/patch-features-plat-launchers-make_freebsd.mak b/java/eclipse/files/patch-features-plat-launchers-make_freebsd.mak
deleted file mode 100644
index bc11b0c26d5f..000000000000
--- a/java/eclipse/files/patch-features-plat-launchers-make_freebsd.mak
+++ /dev/null
@@ -1,11 +0,0 @@
---- features/org.eclipse.platform.launchers/library/gtk/make_linux.mak	Thu Jun 29 19:22:13 2006
-+++ features/org.eclipse.platform.launchers/library/gtk/make_freebsd.mak	Wed Jul 26 18:17:24 2006
-@@ -29,7 +29,7 @@
- LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0
- CFLAGS = -O -s \
- 	-fpic \
--	-DLINUX \
-+	-DFREEBSD \
- 	-DMOZILLA_FIX \
- 	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
- 	-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
diff --git a/java/eclipse/files/patch-features-plat-library-eclipseShm.c b/java/eclipse/files/patch-features-plat-library-eclipseShm.c
index 5c1d998a0741..4e7a4a190282 100644
--- a/java/eclipse/files/patch-features-plat-library-eclipseShm.c
+++ b/java/eclipse/files/patch-features-plat-library-eclipseShm.c
@@ -1,5 +1,5 @@
---- features/org.eclipse.platform.launchers/library/eclipseShm.c.orig	Wed Aug  2 11:32:25 2006
-+++ features/org.eclipse.platform.launchers/library/eclipseShm.c	Wed Aug  2 11:33:30 2006
+--- features/org.eclipse.equinox.executable/library/eclipseShm.c.orig	Wed Aug  2 11:32:25 2006
++++ features/org.eclipse.equinox.executable/library/eclipseShm.c	Wed Aug  2 11:33:30 2006
 @@ -182,11 +182,13 @@
  
  #else /* Unix like platforms */
diff --git a/java/eclipse/files/patch-features-platform-build.xml b/java/eclipse/files/patch-features-platform-build.xml
deleted file mode 100644
index ed322d0e4976..000000000000
--- a/java/eclipse/files/patch-features-platform-build.xml
+++ /dev/null
@@ -1,87 +0,0 @@
---- features/org.eclipse.platform/build.xml.orig	Tue Apr  3 16:32:56 2007
-+++ features/org.eclipse.platform/build.xml	Tue Apr  3 17:10:16 2007
-@@ -27,6 +27,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.text" target="${target}">
- 			<property name="arch" value="x86"/>
- 			<property name="os" value="win32"/>
-@@ -97,6 +102,16 @@
- 			<property name="os" value="linux"/>
- 			<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.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.hpux.PA_RISC" target="${target}">
- 			<property name="arch" value="PA_RISC"/>
- 			<property name="os" value="hpux"/>
-@@ -391,7 +406,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
- 		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml"  selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.2.R32x_v20061218,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.2.r322_v20070202,org.eclipse.help.webapp,3.2.2.R322_v20061114,org.eclipse.help.base,3.2.2.R322_v20061207,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.2.r322_v20070124,org.eclipse.platform,3.2.2.r322_v20070117b,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.2.M20061114,org.eclipse.team.cvs.core,3.2.2.M20061205,org.eclipse.team.cvs.ssh,3.2.1.M20061205,org.eclipse.team.cvs.ssh2,3.2.1.M20061205,org.eclipse.team.cvs.ui,3.2.2.M20061121,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.2.r322_v20070104,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.2.R322_v20061214,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.3.R32x_v20070118,org.eclipse.update.scheduler,3.2.2.R32x_v20061214,org.eclipse.update.ui,3.2.2.R32x_v20070111,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.2.R32x_v20061214,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml"  selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.2.R32x_v20061218,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.2.r322_v20070202,org.eclipse.help.webapp,3.2.2.R322_v20061114,org.eclipse.help.base,3.2.2.R322_v20061207,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.2.r322_v20070124,org.eclipse.platform,3.2.2.r322_v20070117b,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.2.M20061114,org.eclipse.team.cvs.core,3.2.2.M20061205,org.eclipse.team.cvs.ssh,3.2.1.M20061205,org.eclipse.team.cvs.ssh2,3.2.1.M20061205,org.eclipse.team.cvs.ui,3.2.2.M20061121,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.2.r322_v20070104,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.2.R322_v20061214,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.3.R32x_v20070118,org.eclipse.update.scheduler,3.2.2.R32x_v20061214,org.eclipse.update.ui,3.2.2.R32x_v20070111,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.freebsd.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.freebsd.amd64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.freebsd,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.2.R32x_v20061214,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/>
- 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
- 	</target>
- 	<target name="rootFileswin32_win32_x86">
-@@ -432,6 +447,18 @@
- 		<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}/about_files/freebsd.gtk.x86" includes="**"                       />
-+                        <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**"       />
-+                        <fileset dir="${basedir}/gtk" includes="**"                     />
-+                        <fileset dir="${basedir}/rootfiles" includes="**"                       />
-+                        <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"                     />
-+                </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="rootFileslinux_gtk_ppc">
- 		<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/>
- 		<copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true">
-@@ -466,6 +493,18 @@
- 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> 
- 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> 
- 	</target>
-+	<target name="rootFilesfreebsd_gtk_amd64">
-+                <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/>
-+                <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true">
-+                        <fileset dir="${basedir}/about_files/freebsd.gtk.amd64" includes="**"                    />
-+                        <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**"    />
-+                        <fileset dir="${basedir}/gtk" includes="**"                     />
-+                        <fileset dir="${basedir}/rootfiles" includes="**"                       />
-+                        <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"                     />
-+                </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_ia64">
- 		<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/>
- 		<copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true">
-@@ -579,6 +618,8 @@
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
- 		<antcall target="rootFileslinux_gtk_ia64"/>
- 		<antcall target="rootFileslinux_motif_x86"/>
-+		<antcall target="rootFilesfreebsd_gtk_x86"/>
-+		<antcall target="rootFilesfreebsd_gtk_amd64"/>
- 		<antcall target="rootFilessolaris_gtk_sparc"/>
- 		<antcall target="rootFilessolaris_gtk_x86"/>
- 		<antcall target="rootFilessolaris_motif_sparc"/>
diff --git a/java/eclipse/files/patch-features-platform-feature.xml b/java/eclipse/files/patch-features-platform-feature.xml
new file mode 100644
index 000000000000..01dd087306c7
--- /dev/null
+++ b/java/eclipse/files/patch-features-platform-feature.xml
@@ -0,0 +1,50 @@
+--- features/org.eclipse.platform/feature.xml.orig	2007-06-26 04:57:25.000000000 +0900
++++ features/org.eclipse.platform/feature.xml	2007-08-23 23:20:27.000000000 +0900
+@@ -523,9 +523,29 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.core.filesystem.linux.x86_64"
++         id="org.eclipse.core.filesystem.freebsd.x86"
++         os="freebsd"
++         arch="x86"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.core.filesystem.linux.x86"
+          os="linux"
+-         arch="x86_64"
++         arch="x86"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.core.filesystem.freebsd.amd64"
++         os="freebsd"
++         arch="amd64"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+@@ -582,6 +602,15 @@
+          unpack="false"/>
+ 
+    <plugin
++         id="org.eclipse.update.core.freebsd"
++         os="freebsd"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.update.core.linux"
+          os="linux"
+          download-size="0"
diff --git a/java/eclipse/files/patch-features-platform-launchers-build.sh b/java/eclipse/files/patch-features-platform-launchers-build.sh
deleted file mode 100644
index edeeca893c36..000000000000
--- a/java/eclipse/files/patch-features-platform-launchers-build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
---- features/org.eclipse.platform.launchers/library/gtk/build.sh.orig	Thu Jul 27 18:07:06 2006
-+++ features/org.eclipse.platform.launchers/library/gtk/build.sh	Wed Jul 26 18:19:38 2006
-@@ -92,6 +92,23 @@
- 				;;
- 		esac
- 		;;
-+	"FreeBSD")
-+		makefile="make_freebsd.mak"
-+                defaultOS="freebsd"
-+                case $MODEL in
-+                        "amd64")
-+                                defaultOSArch="amd64"
-+                                OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
-+                                ;;
-+                        i?86)
-+                                defaultOSArch="x86"
-+                                OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
-+                                ;;
-+                        *)
-+                                echo "*** Unknown MODEL <${MODEL}>"
-+                                ;;
-+                esac
-+                ;;		
- 	*)
- 	echo "Unknown OS -- build aborted"
- 	;;
diff --git a/java/eclipse/files/patch-features-platform-source-build.xml b/java/eclipse/files/patch-features-platform-source-build.xml
index c3db0f4aa642..9a0499cbd3c8 100644
--- a/java/eclipse/files/patch-features-platform-source-build.xml
+++ b/java/eclipse/files/patch-features-platform-source-build.xml
@@ -1,6 +1,6 @@
---- features/org.eclipse.platform.source/build.xml.orig	Mon Feb 12 12:45:20 2007
-+++ features/org.eclipse.platform.source/build.xml	Tue Apr  3 17:15:03 2007
-@@ -27,6 +27,11 @@
+--- features/org.eclipse.platform.source/build.xml.orig	Mon Jun 25 15:39:42 2007
++++ features/org.eclipse.platform.source/build.xml	Fri Aug 17 16:38:54 2007
+@@ -37,6 +37,11 @@
  			<property name="os" value="linux"/>
  			<property name="ws" value="gtk"/>
  		</ant>
@@ -12,9 +12,9 @@
  		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.macosx.carbon.ppc" target="${target}">
  			<property name="arch" value="ppc"/>
  			<property name="os" value="macosx"/>
-@@ -42,6 +47,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
+@@ -62,6 +67,11 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="wpf"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.amd64" target="${target}">
 +                        <property name="arch" value="amd64"/>
@@ -24,16 +24,7 @@
  		<ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.hpux.motif.PA_RISC" target="${target}">
  			<property name="arch" value="PA_RISC"/>
  			<property name="os" value="hpux"/>
-@@ -131,7 +141,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.platform.source_3.2.2.r322_v20070119-CXMbUe9K_WF26uA" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
- 		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml"  selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp.source,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="org.eclipse.platform.doc.isv,3.2.2.R32x_v20070115,org.eclipse.platform.source,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.hpux.motif.ia64_32,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ia64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.qnx.photon.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ppc,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.hpux.motif.PA_RISC,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.x86_64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ppc64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.macosx.carbon.ppc,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.win32.win32.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.motif.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml"  selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp.source,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="org.eclipse.platform.doc.isv,3.2.2.R32x_v20070115,org.eclipse.platform.source,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.hpux.motif.ia64_32,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ia64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.freebsd.gtk.amd64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.qnx.photon.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ppc,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.hpux.motif.PA_RISC,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.x86_64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.freebsd.gtk.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ppc64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.macosx.carbon.ppc,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.win32.win32.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.motif.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,"/>
- 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
- 	</target>
- 	<target name="rootFileswin32_win32_x86">
-@@ -150,6 +160,10 @@
+@@ -187,6 +197,10 @@
  	</target>
  	<target name="rootFileslinux_motif_x86">
  	</target>
@@ -44,9 +35,9 @@
  	<target name="rootFilessolaris_gtk_sparc">
  	</target>
  	<target name="rootFilessolaris_gtk_x86">
-@@ -175,6 +189,8 @@
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
- 		<antcall target="rootFileslinux_gtk_ia64"/>
+@@ -215,6 +229,8 @@
+ 		<antcall target="rootFileslinux_gtk_s390"/>
+ 		<antcall target="rootFileslinux_gtk_s390x"/>
  		<antcall target="rootFileslinux_motif_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_amd64"/>
diff --git a/java/eclipse/files/patch-features-platform-source-feature.xml b/java/eclipse/files/patch-features-platform-source-feature.xml
deleted file mode 100644
index 1541b1e8234d..000000000000
--- a/java/eclipse/files/patch-features-platform-source-feature.xml
+++ /dev/null
@@ -1,9 +0,0 @@
---- features/org.eclipse.platform.source/feature.xml.orig	Sat Jul 29 21:49:46 2006
-+++ features/org.eclipse.platform.source/feature.xml	Sat Jul 29 21:52:58 2006
-@@ -28,4 +28,6 @@
- 	<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.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
- 	<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.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
- 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
-+	<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.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
-+	<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.2.2.r322_v20070119-CXMbUe9K_WF26uA"/>
- </feature>
diff --git a/java/eclipse/files/patch-features-rcp-build.xml b/java/eclipse/files/patch-features-rcp-build.xml
index 8f6673f62e3c..77e36c5ac94f 100644
--- a/java/eclipse/files/patch-features-rcp-build.xml
+++ b/java/eclipse/files/patch-features-rcp-build.xml
@@ -1,75 +1,38 @@
---- features/org.eclipse.rcp/build.xml.orig	Mon Feb 12 12:45:21 2007
-+++ features/org.eclipse.rcp/build.xml	Tue Apr  3 17:17:52 2007
-@@ -77,6 +77,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
-+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}">
-+                        <property name="arch" value="x86"/>
-+                        <property name="os" value="freebsd"/>
-+                        <property name="ws" value="gtk"/>
-+                </ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.osgi" target="${target}">
- 			<property name="arch" value="x86"/>
- 			<property name="os" value="win32"/>
-@@ -167,6 +172,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
-+		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}">
-+                        <property name="arch" value="amd64"/>
-+                        <property name="os" value="freebsd"/>
-+                        <property name="ws" value="gtk"/>
-+                </ant>
- 	</target>
- 	<target name="all.features" depends="init">
- 	</target>
-@@ -225,7 +235,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="feature.xml,license.html,epl-v10.html,feature.properties,eclipse_update_120.jpg"			/>
- 		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml"  selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu,3.4.5.20061213,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.2.r322_v20070109a,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.2.R32x_v20070118,org.eclipse.help,3.2.2.R322_v20061213,org.eclipse.swt,3.2.2.v3236b,org.eclipse.jface,3.2.2.M20061214-1200,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20061108,org.eclipse.ui.workbench,3.2.2.M20070119-0800,org.eclipse.update.configurator,3.2.2.R32x_v20070111,org.eclipse.swt.win32.win32.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.solaris.sparc,3.2.2.v3236,org.eclipse.swt.gtk.solaris.x86,3.2.2.R3_2_maintenance,org.eclipse.swt.gtk.linux.ppc,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86_64,3.2.2.v3236,org.eclipse.swt.carbon.macosx,3.2.2.v3236,org.eclipse.swt.motif.aix.ppc,3.2.2.v3236,org.eclipse.swt.motif.hpux.PA_RISC,3.2.2.v3236,org.eclipse.swt.motif.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.ia64,3.2.2.R3_2_maintenance,org.eclipse.swt.motif.solaris.sparc,3.2.2.v3236,org.eclipse.swt.photon.qnx.x86,3.2.1.v3236,org.eclipse.swt.motif.hpux.ia64_32,3.2.2.R3_2_maintenance,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml"  selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu,3.4.5.20061213,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.2.r322_v20070109a,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.2.R32x_v20070118,org.eclipse.help,3.2.2.R322_v20061213,org.eclipse.swt,3.2.2.v3236b,org.eclipse.jface,3.2.2.M20061214-1200,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20061108,org.eclipse.ui.workbench,3.2.2.M20070119-0800,org.eclipse.update.configurator,3.2.2.R32x_v20070111,org.eclipse.swt.win32.win32.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.freebsd.x86,3.2.2.v3236,org.eclipse.swt.gtk.solaris.sparc,3.2.2.v3236,org.eclipse.swt.gtk.solaris.x86,3.2.2.R3_2_maintenance,org.eclipse.swt.gtk.linux.ppc,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86_64,3.2.2.v3236,org.eclipse.swt.gtk.freebsd.amd64,3.2.2.v3236,org.eclipse.swt.carbon.macosx,3.2.2.v3236,org.eclipse.swt.motif.aix.ppc,3.2.2.v3236,org.eclipse.swt.motif.hpux.PA_RISC,3.2.2.v3236,org.eclipse.swt.motif.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.ia64,3.2.2.R3_2_maintenance,org.eclipse.swt.motif.solaris.sparc,3.2.2.v3236,org.eclipse.swt.photon.qnx.x86,3.2.1.v3236,org.eclipse.swt.motif.hpux.ia64_32,3.2.2.R3_2_maintenance,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/>
- 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
- 	</target>
- 	<target name="rootFileswin32_win32_x86">
-@@ -320,6 +330,30 @@
- 		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> 
- 		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> 
- 	</target>
-+	<target name="rootFilesfreebsd_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" includes="**"         />
-+                        <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**"       />
-+                        <fileset dir="${basedir}/rootfiles" includes="**"                       />
-+                        <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**"                       />
-+                        <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"                     />
-+                </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" includes="**"       />
-+                        <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**"     />
-+                        <fileset dir="${basedir}/rootfiles" includes="**"                       />
-+                        <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**"                       />
-+                        <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"                     />
-+                </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="rootFilessolaris_gtk_sparc">
- 		<mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}"/>
- 		<copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" failonerror="true" overwrite="true">
-@@ -406,6 +440,8 @@
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
- 		<antcall target="rootFileslinux_gtk_ia64"/>
- 		<antcall target="rootFileslinux_motif_x86"/>
-+		<antcall target="rootFilesfreebsd_gtk_x86"/>
-+		<antcall target="rootFilesfreebsd_gtk_amd64"/>
- 		<antcall target="rootFilessolaris_gtk_sparc"/>
- 		<antcall target="rootFilessolaris_gtk_x86"/>
- 		<antcall target="rootFilessolaris_motif_sparc"/>
+--- 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/files/patch-features-rcp-feature.xml b/java/eclipse/files/patch-features-rcp-feature.xml
new file mode 100644
index 000000000000..b86cd7745c14
--- /dev/null
+++ b/java/eclipse/files/patch-features-rcp-feature.xml
@@ -0,0 +1,56 @@
+--- features/org.eclipse.rcp/feature.xml.orig	2007-10-10 20:23:28.000000000 +0900
++++ features/org.eclipse.rcp/feature.xml	2007-10-10 20:26:39.000000000 +0900
+@@ -199,6 +199,26 @@
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
++   <plugin
++         id="org.eclipse.swt.gtk.freebsd.x86"
++         os="linux"
++         ws="gtk"
++         arch="x86"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++   <plugin
++         id="org.eclipse.swt.gtk.freebsd.amd64"
++         os="linux"
++         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.s390"
+@@ -442,6 +462,26 @@
+          fragment="true"/>
+ 
+    <plugin
++         id="org.eclipse.equinox.launcher.gtk.freebsd.x86"
++         os="linux"
++         ws="gtk"
++         arch="x86"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
++         os="linux"
++         ws="gtk"
++         arch="x86"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
+          id="org.eclipse.equinox.launcher.gtk.linux.s390"
+          os="linux"
+          ws="gtk"
diff --git a/java/eclipse/files/patch-features-rcp-source-build.xml b/java/eclipse/files/patch-features-rcp-source-build.xml
index c91d5effdeb2..fa5b86172537 100644
--- a/java/eclipse/files/patch-features-rcp-source-build.xml
+++ b/java/eclipse/files/patch-features-rcp-source-build.xml
@@ -1,55 +1,39 @@
---- features/org.eclipse.rcp.source/build.xml.orig	Mon Feb 12 12:45:21 2007
-+++ features/org.eclipse.rcp.source/build.xml	Tue Apr  3 17:20:15 2007
-@@ -37,6 +37,11 @@
+--- features/org.eclipse.rcp.source/build.xml.orig	2007-06-26 04:39:43.000000000 +0900
++++ features/org.eclipse.rcp.source/build.xml	2007-08-23 23:11:51.000000000 +0900
+@@ -37,6 +37,16 @@
  			<property name="os" value="linux"/>
  			<property name="ws" value="gtk"/>
  		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.x86" target="${target}">
-+                        <property name="arch" value="x86"/>
-+                        <property name="os" value="freebsd"/>
-+                        <property name="ws" value="gtk"/>
-+                </ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}">
- 			<property name="arch" value="ppc"/>
- 			<property name="os" value="macosx"/>
-@@ -57,6 +62,11 @@
- 			<property name="os" value="linux"/>
- 			<property name="ws" value="gtk"/>
- 		</ant>
++			<property name="arch" value="x86"/>
++			<property name="os" value="freebsd"/>
++			<property name="ws" value="gtk"/>
++		</ant>
 +		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.amd64" target="${target}">
-+                        <property name="arch" value="amd64"/>
-+                        <property name="os" value="freebsd"/>
-+                        <property name="ws" value="gtk"/>
-+                </ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.hpux.motif.PA_RISC" target="${target}">
- 			<property name="arch" value="PA_RISC"/>
- 			<property name="os" value="hpux"/>
-@@ -140,7 +150,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.rcp.source_3.2.2.r322_v20070104-iwP0VLKnfFC923K" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
- 		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml"  selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu.source,3.4.5.20061213,org.eclipse.rcp.source,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.hpux.motif.ia64_32,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.ia64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.qnx.photon.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.x86_64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.gtk.sparc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.macosx.carbon.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.aix.motif.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.win32.win32.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.motif.sparc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.motif.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml"  selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu.source,3.4.5.20061213,org.eclipse.rcp.source,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.hpux.motif.ia64_32,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.ia64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.qnx.photon.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.x86_64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.freebsd.gtk.amd64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.freebsd.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.gtk.sparc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.macosx.carbon.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.aix.motif.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.win32.win32.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.motif.sparc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.motif.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,"/>
- 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
- 	</target>
- 	<target name="rootFileswin32_win32_x86">
-@@ -159,6 +169,10 @@
++			<property name="arch" value="amd64"/>
++			<property name="os" value="freebsd"/>
++			<property name="ws" value="gtk"/>
++		</ant>
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.aix.motif.ppc" target="${target}">
+ 			<property name="arch" value="ppc"/>
+ 			<property name="os" value="aix"/>
+@@ -170,6 +180,10 @@
  	</target>
- 	<target name="rootFileslinux_motif_x86">
+ 	<target name="rootFilesmacosx_carbon_ppc">
  	</target>
 +	<target name="rootFilesfreebsd_gtk_x86">
-+        </target>
++	</target>
 +	<target name="rootFilesfreebsd_gtk_amd64">
-+        </target>
- 	<target name="rootFilessolaris_gtk_sparc">
++	</target>
+ 	<target name="rootFileslinux_gtk_x86">
  	</target>
- 	<target name="rootFilessolaris_gtk_x86">
-@@ -184,6 +198,8 @@
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
- 		<antcall target="rootFileslinux_gtk_ia64"/>
- 		<antcall target="rootFileslinux_motif_x86"/>
+ 	<target name="rootFileslinux_gtk_ppc">
+@@ -206,6 +220,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="rootFilessolaris_gtk_sparc"/>
- 		<antcall target="rootFilessolaris_gtk_x86"/>
- 		<antcall target="rootFilessolaris_motif_sparc"/>
+ 		<antcall target="rootFileslinux_gtk_x86"/>
+ 		<antcall target="rootFileslinux_gtk_ppc"/>
+ 		<antcall target="rootFileslinux_gtk_ppc64"/>
diff --git a/java/eclipse/files/patch-features-sdk-build.xml b/java/eclipse/files/patch-features-sdk-build.xml
index daa37eb7489f..0862854d290f 100644
--- a/java/eclipse/files/patch-features-sdk-build.xml
+++ b/java/eclipse/files/patch-features-sdk-build.xml
@@ -1,7 +1,7 @@
---- features/org.eclipse.sdk/build.xml.orig	Thu Jul 27 17:49:19 2006
-+++ features/org.eclipse.sdk/build.xml	Wed Jul 26 16:11:29 2006
-@@ -123,6 +123,18 @@
- 			<fileset dir="${basedir}/motif" includes="**"			/>
+--- features/org.eclipse.sdk/build.xml.orig	Mon Jun 25 15:39:43 2007
++++ features/org.eclipse.sdk/build.xml	Fri Aug 17 17:23:44 2007
+@@ -169,6 +169,18 @@
+ 			</fileset>
  		</copy>
  	</target>
 +	<target name="rootFilesfreebsd_gtk_x86">
@@ -17,11 +17,11 @@
 +                </copy>
 +        </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">
-@@ -172,6 +184,8 @@
- 		<antcall target="rootFileslinux_gtk_x86_64"/>
- 		<antcall target="rootFileslinux_gtk_ia64"/>
+ 		<mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/"/>
+ 		<copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/" failonerror="true" overwrite="true">
+@@ -227,6 +239,8 @@
+ 		<antcall target="rootFileslinux_gtk_s390"/>
+ 		<antcall target="rootFileslinux_gtk_s390x"/>
  		<antcall target="rootFileslinux_motif_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_x86"/>
 +		<antcall target="rootFilesfreebsd_gtk_amd64"/>
diff --git a/java/eclipse/files/patch-package-freebsd-amd64.xml b/java/eclipse/files/patch-package-freebsd-amd64.xml
deleted file mode 100644
index 668c49d830ea..000000000000
--- a/java/eclipse/files/patch-package-freebsd-amd64.xml
+++ /dev/null
@@ -1,23 +0,0 @@
---- package.org.eclipse.sdk.freebsd.gtk.amd64.xml.orig	Thu Oct 26 13:50:27 2006
-+++ package.org.eclipse.sdk.freebsd.gtk.amd64.xml	Thu Oct 26 14:07:26 2006
-@@ -57,18 +57,7 @@
- 			<param name="elementName" value="com.jcraft.jsch_0.1.28"/>
- 		</antcall>
- 		<eclipse.brand root="${eclipse.base}/freebsd.gtk.amd64/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
--		<exec executable="tar" dir="${assemblyTempDir}">
--			<arg line="${tarargs}-rvf '${archiveFullPath}' ${archivePrefix} "/>
--		</exec>
--		<antcall target="gzipResults"/>
--		<exec executable="rm">
--			<arg line="-rf"/>
--			<arg line="'${assemblyTempDir}'"/>
--		</exec>
--		<delete dir="${assemblyTempDir}"/>
--	</target>
--	<target name="gzipResults">
--		<move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/>
--		<gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/>
-+		<move file="${eclipse.base}" todir="${buildDirectory}"/>
-+                <delete dir="${assemblyTempDir}"/>
- 	</target>
- </project>
diff --git a/java/eclipse/files/patch-package-freebsd-x86.xml b/java/eclipse/files/patch-package-freebsd-x86.xml
deleted file mode 100644
index 917e9e05f11d..000000000000
--- a/java/eclipse/files/patch-package-freebsd-x86.xml
+++ /dev/null
@@ -1,23 +0,0 @@
---- package.org.eclipse.sdk.freebsd.gtk.x86.xml.orig	Thu Oct 26 13:50:12 2006
-+++ package.org.eclipse.sdk.freebsd.gtk.x86.xml	Thu Oct 26 14:06:35 2006
-@@ -57,18 +57,7 @@
- 			<param name="elementName" value="com.jcraft.jsch_0.1.28"/>
- 		</antcall>
- 		<eclipse.brand root="${eclipse.base}/freebsd.gtk.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
--		<exec executable="tar" dir="${assemblyTempDir}">
--			<arg line="${tarargs}-rvf '${archiveFullPath}' ${archivePrefix} "/>
--		</exec>
--		<antcall target="gzipResults"/>
--		<exec executable="rm">
--			<arg line="-rf"/>
--			<arg line="'${assemblyTempDir}'"/>
--		</exec>
--		<delete dir="${assemblyTempDir}"/>
--	</target>
--	<target name="gzipResults">
--		<move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/>
--		<gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/>
-+		<move file="${eclipse.base}" todir="${buildDirectory}"/>
-+                <delete dir="${assemblyTempDir}"/>
- 	</target>
- </project>
diff --git a/java/eclipse/files/patch-package-sdk-all.xml b/java/eclipse/files/patch-package-sdk-all.xml
index e2a8489936a3..710e6f8b5714 100644
--- a/java/eclipse/files/patch-package-sdk-all.xml
+++ b/java/eclipse/files/patch-package-sdk-all.xml
@@ -1,6 +1,6 @@
---- package.org.eclipse.sdk.all.xml.orig	Sun Jul 30 03:12:52 2006
-+++ package.org.eclipse.sdk.all.xml	Sun Jul 30 03:14:02 2006
-@@ -19,6 +19,12 @@
+--- package.org.eclipse.sdk.all.xml.orig	Mon Jun 25 15:39:43 2007
++++ package.org.eclipse.sdk.all.xml	Fri Aug 17 17:45:03 2007
+@@ -22,6 +22,12 @@
  		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.x86_64">
  			<property name="assembleScriptName" value="package.org.eclipse.sdk.linux.gtk.x86_64.xml"/>
  		</ant>
diff --git a/java/eclipse/files/patch-plugin-compare-build.xml b/java/eclipse/files/patch-plugin-compare-build.xml
new file mode 100644
index 000000000000..4a82c3e16c68
--- /dev/null
+++ b/java/eclipse/files/patch-plugin-compare-build.xml
@@ -0,0 +1,41 @@
+--- 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.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.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.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
+@@ -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.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"/>
+ 			<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/files/patch-pluging-ltk-core-refactoring-build.xml b/java/eclipse/files/patch-pluging-ltk-core-refactoring-build.xml
new file mode 100644
index 000000000000..f23c439b4517
--- /dev/null
+++ b/java/eclipse/files/patch-pluging-ltk-core-refactoring-build.xml
@@ -0,0 +1,13 @@
+--- 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.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/files/patch-plugins-ant-ui-build.xml b/java/eclipse/files/patch-plugins-ant-ui-build.xml
new file mode 100644
index 000000000000..ae9bd07a9fed
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-ant-ui-build.xml
@@ -0,0 +1,66 @@
+--- 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.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"/>
+ 			<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.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.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.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@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.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"/>
+@@ -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.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.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.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@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.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"/>
+@@ -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.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.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.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
diff --git a/java/eclipse/files/patch-plugins-ant-ui-buildfiles-buildRemoteExtraJAR.xml b/java/eclipse/files/patch-plugins-ant-ui-buildfiles-buildRemoteExtraJAR.xml
new file mode 100644
index 000000000000..496fc2a35432
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-ant-ui-buildfiles-buildRemoteExtraJAR.xml
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml.orig	2007-06-26 04:57:25.000000000 +0900
++++ plugins/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml	2007-09-06 11:06:07.000000000 +0900
+@@ -8,6 +8,8 @@
+ 		<property name="build.result.folder" value="${basedir}"/>
+ 		<property name="version.suffix" value="_3.1.0"/>
+ 		<property name="win32.jar" value="${eclipse.home}/plugins/org.eclipse.swt.win32.win32.x86${version.suffix}.jar"/>
++		<property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.freebsd.x86${version.suffix}.jar"/>
++		<property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.freebsd.amd64${version.suffix}.jar"/>
+ 		<property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.linux.x86${version.suffix}.jar"/>
+ 		<property name="motif.jar" value="${eclipse.home}/plugins/org.eclipse.swt.motif${version.suffix}.jar"/>
+ 		<property name="osx.jar" value="${eclipse.home}/plugins/org.eclipse.swt.carbon.macosx.ppc${version.suffix}.jar"/>
diff --git a/java/eclipse/files/patch-plugins-core-resources-build.xml b/java/eclipse/files/patch-plugins-core-resources-build.xml
deleted file mode 100644
index 3c5016c681ef..000000000000
--- a/java/eclipse/files/patch-plugins-core-resources-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/org.eclipse.core.resources/build.xml.orig	Thu Jul 27 18:44:45 2006
-+++ plugins/org.eclipse.core.resources/build.xml	Tue Jul 25 19:18:21 2006
-@@ -102,6 +102,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64/@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.macosx/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.macosx/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.qnx.x86/@dot"/>
-@@ -176,6 +180,10 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64/@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.macosx/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.macosx/@dot"/>
- 			<pathelement path="../org.eclipse.core.filesystem.qnx.x86/@dot"/>
diff --git a/java/eclipse/files/patch-plugins-core-resources-component.xml b/java/eclipse/files/patch-plugins-core-resources-component.xml
new file mode 100644
index 000000000000..50cf5dfe97ba
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-core-resources-component.xml
@@ -0,0 +1,10 @@
+--- plugins/org.eclipse.core.resources/component.xml.orig	2007-06-26 04:57:20.000000000 +0900
++++ plugins/org.eclipse.core.resources/component.xml	2007-09-06 11:12:08.000000000 +0900
+@@ -7,6 +7,7 @@
+ 
+  <plugin id="org.eclipse.core.resources" />
+  <plugin id="org.eclipse.core.resources.win32" fragment="true" />
++ <plugin id="org.eclipse.core.resources.freebsd" fragment="true" />
+  <plugin id="org.eclipse.core.resources.linux" fragment="true" />
+  <plugin id="org.eclipse.core.resources.hpux" fragment="true" />
+  <plugin id="org.eclipse.core.resources.macosx" fragment="true" />
diff --git a/java/eclipse/files/patch-plugins-debug-core-build.xml b/java/eclipse/files/patch-plugins-debug-core-build.xml
new file mode 100644
index 000000000000..22d02a1b56f4
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-debug-core-build.xml
@@ -0,0 +1,15 @@
+--- 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.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/files/patch-plugins-filesystem-component.xml b/java/eclipse/files/patch-plugins-filesystem-component.xml
new file mode 100644
index 000000000000..3cb31f9822ed
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-filesystem-component.xml
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.core.filesystem/component.xml.orig	2007-06-26 04:57:18.000000000 +0900
++++ plugins/org.eclipse.core.filesystem/component.xml	2007-09-06 11:09:49.000000000 +0900
+@@ -8,6 +8,8 @@
+  <plugin id="org.eclipse.core.filesystem" />
+  <plugin id="org.eclipse.core.filesystem.hpux.ia64_32" fragment="true" />
+  <plugin id="org.eclipse.core.filesystem.hpux.PA_RISC" fragment="true" />
++ <plugin id="org.eclipse.core.filesystem.freebsd.x86" fragment="true" />
++ <plugin id="org.eclipse.core.filesystem.freebsd.amd64" fragment="true" />
+  <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true" />
+  <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true" />
+  <plugin id="org.eclipse.core.filesystem.macosx.ppc" fragment="true" />
diff --git a/java/eclipse/files/patch-plugins-jdt-apt-core-build.xml b/java/eclipse/files/patch-plugins-jdt-apt-core-build.xml
new file mode 100644
index 000000000000..4d04d801fe74
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-jdt-apt-core-build.xml
@@ -0,0 +1,15 @@
+--- 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.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/files/patch-plugins-jdt-apt-pluggable-core-build.xml b/java/eclipse/files/patch-plugins-jdt-apt-pluggable-core-build.xml
new file mode 100644
index 000000000000..c0cdd3dc9c67
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-jdt-apt-pluggable-core-build.xml
@@ -0,0 +1,15 @@
+--- 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.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/files/patch-plugins-jdt-compiler-apt-build.xml b/java/eclipse/files/patch-plugins-jdt-compiler-apt-build.xml
new file mode 100644
index 000000000000..6932f19d1596
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-jdt-compiler-apt-build.xml
@@ -0,0 +1,13 @@
+--- 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_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/files/patch-plugins-jdt-compiler-tool-build.xml b/java/eclipse/files/patch-plugins-jdt-compiler-tool-build.xml
new file mode 100644
index 000000000000..2503030065d7
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-jdt-compiler-tool-build.xml
@@ -0,0 +1,13 @@
+--- 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"/>
+ 			<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/files/patch-plugins-jdt-core-build.xmo b/java/eclipse/files/patch-plugins-jdt-core-build.xmo
new file mode 100644
index 000000000000..c3b2073de328
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-jdt-core-build.xmo
@@ -0,0 +1,24 @@
+--- 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.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"/>
+@@ -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.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/files/patch-plugins-jdt-core-manipulation-build.xml b/java/eclipse/files/patch-plugins-jdt-core-manipulation-build.xml
new file mode 100644
index 000000000000..94608d24f532
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-jdt-core-manipulation-build.xml
@@ -0,0 +1,13 @@
+--- 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"/>
+ 			<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/files/patch-plugins-jdt-debug-build.xml b/java/eclipse/files/patch-plugins-jdt-debug-build.xml
new file mode 100644
index 000000000000..ce683e779e70
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-jdt-debug-build.xml
@@ -0,0 +1,24 @@
+--- 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"/>
+ 			<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"/>
+@@ -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/files/patch-plugins-jdt-launching-build.xml b/java/eclipse/files/patch-plugins-jdt-launching-build.xml
new file mode 100644
index 000000000000..c9608056fb4b
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-jdt-launching-build.xml
@@ -0,0 +1,24 @@
+--- 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"/>
+ 			<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"/>
+@@ -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/files/patch-plugins-jsch-core-build.xml b/java/eclipse/files/patch-plugins-jsch-core-build.xml
new file mode 100644
index 000000000000..540e021dcb37
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-jsch-core-build.xml
@@ -0,0 +1,13 @@
+--- 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"/>
+ 			<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/files/patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-include-os_custom.h b/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-include-os_custom.h
new file mode 100644
index 000000000000..909bb37ae2ba
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-include-os_custom.h
@@ -0,0 +1,13 @@
+--- plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h.orig	Sun Aug 19 23:58:06 2007
++++ plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h	Sun Aug 19 23:58:15 2007
+@@ -11,8 +11,8 @@
+ ***********************************************************************/
+ 
+ /* Use this directive when introducing platform-specific code in localfile.c */
+-#ifndef LINUX
+-#define LINUX
++#ifndef FREEBSD
++#define FREEBSD
+ #endif
+ 
+ /* Linux supports reading symbolic links */
diff --git a/java/eclipse/files/patch-plugins-pde-build-build.xml b/java/eclipse/files/patch-plugins-pde-build-build.xml
new file mode 100644
index 000000000000..dd4947056ba6
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-pde-build-build.xml
@@ -0,0 +1,20 @@
+--- 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"/>
+ 			<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"/>
+@@ -231,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/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml b/java/eclipse/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml
new file mode 100644
index 000000000000..1df59c08ceef
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml
@@ -0,0 +1,20 @@
+--- 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>
+ 	
++ 	<target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.x86">
++ 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
++ 			<property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.x86.zip"/>
++		</ant>
++ 	</target>
++ 	<target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64">
++ 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
++ 			<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/files/patch-plugins-pde-build-templates-packager-customTargets.xml b/java/eclipse/files/patch-plugins-pde-build-templates-packager-customTargets.xml
new file mode 100644
index 000000000000..412bd99f51f0
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-pde-build-templates-packager-customTargets.xml
@@ -0,0 +1,20 @@
+--- 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>
+ 	
++	<target name="assemble.freebsd.gtk.x86.xml">
++		<ant antfile="${assembleScriptName}" >
++			<property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.x86.zip"/>
++		</ant>
++	</target>
++	<target name="assemble.freebsd.gtk.amd64.xml">
++		<ant antfile="${assembleScriptName}" >
++			<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/files/patch-plugins-pde-core-build.xml b/java/eclipse/files/patch-plugins-pde-core-build.xml
new file mode 100644
index 000000000000..59b7d5921568
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-pde-core-build.xml
@@ -0,0 +1,42 @@
+--- 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"/>
+ 			<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"/>
+@@ -204,6 +208,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"/>
+@@ -336,6 +342,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.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"/>
+@@ -392,6 +402,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/files/patch-plugins-plat-i-customBuildCallbacks.xml b/java/eclipse/files/patch-plugins-plat-i-customBuildCallbacks.xml
deleted file mode 100644
index 654b7ed32864..000000000000
--- a/java/eclipse/files/patch-plugins-plat-i-customBuildCallbacks.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/org.eclipse.platform.doc.isv/customBuildCallbacks.xml.orig	Sun Jul 30 00:30:12 2006
-+++ plugins/org.eclipse.platform.doc.isv/customBuildCallbacks.xml	Sun Jul 30 00:30:38 2006
-@@ -88,6 +88,8 @@
- 	<!-- ===================================================================== -->
- 	<target name="post.gather.bin.parts">
- 	</target>
-+	<target name="pre.gather.bin.parts">
-+        </target>
- 	
- 	<!-- ===================================================================== -->
- 	<!-- Steps to do before the target gather.sources                          -->
diff --git a/java/eclipse/files/patch-plugins-plat-u-customBuildCallbacks.xml b/java/eclipse/files/patch-plugins-plat-u-customBuildCallbacks.xml
deleted file mode 100644
index ea350ab185e6..000000000000
--- a/java/eclipse/files/patch-plugins-plat-u-customBuildCallbacks.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/org.eclipse.platform.doc.user/customBuildCallbacks.xml.orig	Sun Jul 30 00:26:51 2006
-+++ plugins/org.eclipse.platform.doc.user/customBuildCallbacks.xml	Sun Jul 30 00:28:00 2006
-@@ -82,6 +82,8 @@
- 	<!-- ===================================================================== -->
- 	<target name="post.gather.bin.parts">
- 	</target>
-+	<target name="pre.gather.bin.parts">
-+        </target>
- 
- 	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.platform.doc.user." if="eclipse.running">
- 		<help.buildHelpIndex manifest="plugin.xml" destination="."/>
diff --git a/java/eclipse/files/patch-plugins-platform-build.xml b/java/eclipse/files/patch-plugins-platform-build.xml
new file mode 100644
index 000000000000..3cbb53cd20bf
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-platform-build.xml
@@ -0,0 +1,41 @@
+--- 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.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.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.2.v3349/@dot"/>
+ 			<pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/>
+@@ -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.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"/>
+@@ -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.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/files/patch-plugins-swt-amd64-build.xml b/java/eclipse/files/patch-plugins-swt-amd64-build.xml
index abd941e25dab..7a763f3911cc 100644
--- a/java/eclipse/files/patch-plugins-swt-amd64-build.xml
+++ b/java/eclipse/files/patch-plugins-swt-amd64-build.xml
@@ -1,15 +1,11 @@
---- plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig	Mon Dec 11 01:10:05 2006
-+++ plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml	Mon Dec 11 01:20:33 2006
-@@ -39,18 +39,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,20 +17,16 @@
  	</target>
  
  	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
-@@ -222,8 +221,11 @@
- 	</target>
- 
+@@ -232,6 +232,8 @@
  	<target name="build.cfiles" depends="build.jars">
-+		<!-- compile the jar in org.eclipse.swt.tools -->
-+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />		
-+
  		<!-- generate the C code from the (64 bit) SWT PI java classes -->
--		<!-- assumes the swt.jar has already been built  -->
-+		<!-- assumes the swttools.jar has already been built  -->
+ 		<!-- 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>
- 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
-@@ -325,6 +327,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/files/patch-plugins-swt-tools-build.xml b/java/eclipse/files/patch-plugins-swt-tools-build.xml
new file mode 100644
index 000000000000..b491024bcc7a
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-swt-tools-build.xml
@@ -0,0 +1,11 @@
+--- 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/files/patch-plugins-team-core-build.xml b/java/eclipse/files/patch-plugins-team-core-build.xml
new file mode 100644
index 000000000000..1208921e539a
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-team-core-build.xml
@@ -0,0 +1,13 @@
+--- 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"/>
+ 			<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/files/patch-plugins-team-cvs-core-build.xml b/java/eclipse/files/patch-plugins-team-cvs-core-build.xml
new file mode 100644
index 000000000000..8697c395740a
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-team-cvs-core-build.xml
@@ -0,0 +1,13 @@
+--- 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"/>
+ 			<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/files/patch-plugins-team-cvs-ssh-build.xml b/java/eclipse/files/patch-plugins-team-cvs-ssh-build.xml
new file mode 100644
index 000000000000..fef8a86d3259
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-team-cvs-ssh-build.xml
@@ -0,0 +1,13 @@
+--- 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"/>
+ 			<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/files/patch-plugins-ui-browser-plugin.xml b/java/eclipse/files/patch-plugins-ui-browser-plugin.xml
new file mode 100644
index 000000000000..d8db8ba04807
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-ui-browser-plugin.xml
@@ -0,0 +1,45 @@
+--- 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"
+-         os="linux,aix,hpux,solaris"
++         os="freebsd,linux,aix,hpux,solaris"
+          executable="mozilla"
+          factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
+          <location>usr/bin/mozilla</location>
+          <location>usr/X11/bin/mozilla</location>
++         <location>usr/local/bin/mozilla</location>
+       </browser>
+       <browser
+          id="org.eclipse.ui.browser.netscape"
+@@ -93,23 +94,25 @@
+       <browser
+          id="org.eclipse.ui.browser.firefox"
+          name="%browserFirefox"
+-         os="linux,aix,hpux,solaris"
++         os="freebsd,linux,aix,hpux,solaris"
+          executable="firefox"
+          factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
+       </browser>
+       <browser
+          id="org.eclipse.ui.browser.konqueror"
+          name="%browserKonqueror"
+-         os="linux,aix,hpux,solaris"
++         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"
+          name="%browserGaleon"
+-         os="linux,aix,hpux,solaris"
++         os="freebsd,linux,aix,hpux,solaris"
+          executable="galeon">
+          <location>opt/usr/gnome/bin/galeon</location>
++         <location>/usr/local/bin/galeon</location>
+       </browser>
+       
+       <!-- Windows -->
diff --git a/java/eclipse/files/patch-plugins-ui-intro-universal-plugin.xml b/java/eclipse/files/patch-plugins-ui-intro-universal-plugin.xml
new file mode 100644
index 000000000000..f4619e7aff75
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-ui-intro-universal-plugin.xml
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.ui.intro.universal/plugin.xml.orig	2007-06-26 04:57:27.000000000 +0900
++++ plugins/org.eclipse.ui.intro.universal/plugin.xml	2007-09-06 11:28:55.000000000 +0900
+@@ -35,7 +35,7 @@
+             <implementation
+                   style="$theme$/html/shared.css,themes/shared/html/shared.css"
+                   kind="html"
+-                  os="win32,linux,macosx">
++                  os="win32,freebsd,linux,macosx">
+             </implementation>
+             <implementation
+                   kind="swt">
diff --git a/java/eclipse/files/patch-plugins-ui-win32-build.xml b/java/eclipse/files/patch-plugins-ui-win32-build.xml
new file mode 100644
index 000000000000..9a1793e9fbfd
--- /dev/null
+++ b/java/eclipse/files/patch-plugins-ui-win32-build.xml
@@ -0,0 +1,22 @@
+--- 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"/>
+ 			<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"/>
+@@ -196,6 +200,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/files/post-patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-Makefile b/java/eclipse/files/post-patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-Makefile
new file mode 100644
index 000000000000..aec22abb6bda
--- /dev/null
+++ b/java/eclipse/files/post-patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-Makefile
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig	Sun Aug 19 23:58:06 2007
++++ plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	Sun Aug 19 23:58:15 2007
+@@ -17,7 +17,7 @@
+ OS_TYPE = freebsd
+ 
+ #Set this to be the location of your JRE
+-JAVA_HOME = ~/vm/sun142
++
+ 
+ JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
+ COMMON_INCLUDE = -I include
diff --git a/java/eclipse/files/post-patch-plugins-org.eclipse.update.core.freebsd-src-update.c b/java/eclipse/files/post-patch-plugins-org.eclipse.update.core.freebsd-src-update.c
new file mode 100644
index 000000000000..59c6f1b9eeaa
--- /dev/null
+++ b/java/eclipse/files/post-patch-plugins-org.eclipse.update.core.freebsd-src-update.c
@@ -0,0 +1,12 @@
+--- plugins/org.eclipse.update.core.freebsd/src/update.c.orig	2007-09-01 18:09:27.000000000 +0900
++++ plugins/org.eclipse.update.core.freebsd/src/update.c	2007-09-01 18:24:02.000000000 +0900
+@@ -12,7 +12,8 @@
+ /* bug 82520 : need to include stdlib.h */

+ # include <stdlib.h>

+ # include <sys/types.h>

+-# include <sys/statfs.h>

++# include <sys/param.h>

++# include <sys/mount.h>

+ # include <update.h>

+ 

+ /*

diff --git a/java/eclipse/files/post-patch-plugins-swt-PI-gtk-library-build.xml b/java/eclipse/files/post-patch-plugins-swt-PI-gtk-library-build.xml
new file mode 100644
index 000000000000..1f90a394f1cd
--- /dev/null
+++ b/java/eclipse/files/post-patch-plugins-swt-PI-gtk-library-build.xml
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml.orig	2007-06-26 04:57:11.000000000 +0900
++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml	2007-09-05 23:53:21.000000000 +0900
+@@ -14,7 +14,7 @@
+ 		<arg line="${basedir}/bin/library/build.sh"/>
+ 		<arg line="install"/>
+ 	</exec>
+-	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86" depth="infinite" />
++	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.freebsd.x86" depth="infinite" />
+ </target>
+ 
+ <!-- Build swt.so for PowerPC 32 bit GTK (no Mozilla)-->
diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-build.sh b/java/eclipse/files/post-patch-plugins-swt-gtk-build.sh
index 516e926da1e5..363430308afc 100644
--- a/java/eclipse/files/post-patch-plugins-swt-gtk-build.sh
+++ b/java/eclipse/files/post-patch-plugins-swt-gtk-build.sh
@@ -1,26 +1,46 @@
---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	Thu Jun 29 19:22:14 2006
-+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	Wed Sep  6 15:55:41 2006
-@@ -31,6 +31,10 @@
+--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	2007-06-26 04:57:13.000000000 +0900
++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2007-10-07 14:10:27.000000000 +0900
+@@ -10,6 +10,9 @@
+ #     IBM Corporation - initial API and implementation
+ #     Kevin Cornell (Rational Software Corporation)
+ #     Tom Tromey (Red Hat, Inc.)
++#
++# This is Eclipse SWT PI/gtk/library/build.xml
++#
+ #*******************************************************************************
+ 
+ cd `dirname $0`
+@@ -26,6 +29,7 @@
+ if [ "${OS}" = "" ]; then
+ 	OS=`uname -s`
+ fi
++
+ case $OS in
+ 	"SunOS")
  		SWT_OS=solaris
- 		MAKEFILE=make_solaris.mak
- 		;;
-+	"FreeBSD")
-+                SWT_OS=freebsd
-+                MAKEFILE=make_freebsd.mak
-+               ;;
- 	*)
- 		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
- 		MAKEFILE=make_linux.mak
-@@ -61,7 +65,7 @@
+@@ -50,6 +54,10 @@
+ 	fi
+ fi
+ case $MODEL in
++	"amd64")
++		SWT_ARCH=x86_64
++		AWT_ARCH=amd64
++		;;
+ 	"x86_64")
+ 		SWT_ARCH=x86_64
+ 		AWT_ARCH=amd64
+@@ -65,32 +73,37 @@
  esac
  
  # For 64-bit CPUs, we have a switch
--if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' ]; then
-+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'amd64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' ]; then
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'amd64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
  	SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
  	export SWT_PTR_CFLAGS
  	if [ -d /lib64 ]; then
-@@ -70,32 +74,38 @@
+-		XLIB64=-L/usr/X11R6/lib64
++		XLIB64=-L/usr/local/lib64
+ 		export XLIB64
  	fi
  fi
  
@@ -30,7 +50,7 @@
 -else
 -	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
 -	echo "    *** SWT Program support for GNOME will not be compiled."
-+if [ ${MAKE_GNOME} != "" ]; then
++if [ x${MAKE_GNOME} = "xmake_gnome" ]; then
 +	if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
 +		echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
 +		MAKE_GNOME=make_gnome
@@ -46,7 +66,7 @@
 -else
 -	echo "Cairo not found:"
 -	echo "    *** Advanced graphics support using cairo will not be compiled."
-+if [ ${MAKE_CAIRO} != "" ]; then
++if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then
 +	if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
 +		echo "Cairo found, compiling SWT support for the cairo graphics library."
 +		MAKE_CAIRO=make_cairo
@@ -56,28 +76,17 @@
 +	fi
  fi
  
--if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
--	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
--		GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
--		GECKO_LIBS=`pkg-config --libs mozilla-xpcom`
--		export GECKO_INCLUDES
--		export GECKO_LIBS
--		MAKE_MOZILLA=make_mozilla
--	else
--		echo "Mozilla/XPCOM libraries not found:"
--		echo "    *** Mozilla embedding support will not be compiled."
-+if [ ${MAKE_MOZILLA} != "" ]; then
-+	if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
-+		if [ x`pkg-config --exists %%GECKO%%-xpcom && echo YES` = "xYES" ]; then
-+			GECKO_INCLUDES=`pkg-config --cflags %%GECKO%%-xpcom`
-+			GECKO_LIBS=`pkg-config --libs %%GECKO%%-xpcom`
-+			export GECKO_INCLUDES
-+			export GECKO_LIBS
-+			MAKE_MOZILLA=make_mozilla
-+		else
-+			echo "Mozilla/XPCOM libraries not found:"
-+			echo "    *** Mozilla embedding support will not be compiled."
-+		fi
+-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
++if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then
++    if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
+ 	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
+ 		MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
+ 		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
+@@ -107,6 +120,7 @@
+ 		echo "Mozilla/XPCOM or Firefox/XPCOM libraries not found:"
+ 		echo "    *** Mozilla embedding support will not be compiled."
  	fi
++    fi
  fi
  
+ # Find AWT if available
diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-build.xml b/java/eclipse/files/post-patch-plugins-swt-gtk-build.xml
new file mode 100644
index 000000000000..0c30699caf3d
--- /dev/null
+++ b/java/eclipse/files/post-patch-plugins-swt-gtk-build.xml
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml.orig	2007-06-26 04:57:11.000000000 +0900
++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml	2007-08-23 22:58:43.000000000 +0900
+@@ -14,7 +14,7 @@
+ 		<arg line="${basedir}/bin/library/build.sh"/>
+ 		<arg line="install"/>
+ 	</exec>
+-	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86" depth="infinite" />
++	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.freebsd.x86" depth="infinite" />
+ </target>
+ 
+ <!-- Build swt.so for PowerPC 32 bit GTK (no Mozilla)-->
diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-library-os.c b/java/eclipse/files/post-patch-plugins-swt-gtk-library-os.c
new file mode 100644
index 000000000000..a9841275e672
--- /dev/null
+++ b/java/eclipse/files/post-patch-plugins-swt-gtk-library-os.c
@@ -0,0 +1,20 @@
+--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c.orig	2007-06-26 04:57:29.000000000 +0900
++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c	2007-09-16 16:44:43.000000000 +0900
+@@ -17397,11 +17397,16 @@
+ 	jint rc = 0;
+ 	OS_NATIVE_ENTER(env, that, realpath_FUNC);
+ 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
++	if (arg1) {
++	    if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
++	} else
++	    lparg1 = malloc(PATH_MAX);
+ 	rc = (jint)realpath((const char *)lparg0, (char *)lparg1);
+ fail:
+ 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+ 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
++	if (!arg1 && lparg1 && rc == 0)
++	    free(lparg1);
+ 	OS_NATIVE_EXIT(env, that, realpath_FUNC);
+ 	return rc;
+ }
diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak
index b08943add954..d57dcd73014e 100644
--- a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak
+++ b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak
@@ -1,6 +1,6 @@
---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig	Thu Dec 14 18:01:12 2006
-+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak	Thu Dec 14 18:03:00 2006
-@@ -48,7 +48,7 @@
+--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig	2007-10-08 00:19:29.000000000 +0900
++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak	2007-10-08 00:36:34.000000000 +0900
+@@ -46,7 +46,7 @@
  
  # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
  GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
@@ -9,7 +9,7 @@
  
  CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
  
-@@ -61,7 +61,7 @@
+@@ -59,10 +59,10 @@
  GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
  
  GLXCFLAGS = 
@@ -17,72 +17,84 @@
 +GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm
  
  # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
-@@ -79,6 +79,10 @@
+-#NATIVE_STATS = -DNATIVE_STATS
++NATIVE_STATS = -DNATIVE_STATS
+ 
+ MOZILLACFLAGS = -O \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+@@ -74,11 +74,15 @@
+ 	-Wno-non-virtual-dtor \
+ 	-fPIC \
  	-I. \
++	-I$(LOCALBASE)/include \
  	-I$(JAVA_HOME)/include \
  	-I$(JAVA_HOME)/include/freebsd \
-+	-I$(LOCALBASE)/include/%%GECKO%% \
-+	-I$(LOCALBASE)/include/%%GECKO%%/profdirserviceprovider \
-+	-I$(LOCALBASE)/include/%%GECKO%%/string \
++	-I$(LOCALBASE)/include/xulrunner \
++	-I$(LOCALBASE)/include/xulrunner/profdirserviceprovider \
++	-I$(LOCALBASE)/include/xulrunner/string \
 +	-I$(LOCALBASE)/include/nspr \
  	${SWT_PTR_CFLAGS}
- MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic
+ MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
+-MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
  	
-@@ -98,15 +102,16 @@
+ SWT_OBJECTS = swt.o c.o c_stats.o callback.o
+ CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
+@@ -88,27 +92,28 @@
+ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
+ GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
+ MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
+-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
++XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o
+ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
  CFLAGS = -O -Wall \
  		-DSWT_VERSION=$(SWT_VERSION) \
  		$(NATIVE_STATS) \
 -		-DLINUX -DGTK \
 +		-DFREEBSD -DGTK \
++		-I$(LOCALBASE)/include \
  		-I$(JAVA_HOME)/include \
  		-I$(JAVA_HOME)/include/freebsd \
-+                -I$(LOCALBASE)/include \
  		-fPIC \
  		${SWT_PTR_CFLAGS}
- LIBS = -shared -fPIC -s
- 
+ LIBS = -shared -fPIC
+ 
+-ifndef NO_STRIP
+-	AWT_LIBS := $(AWT_LIBS) -s
+-	MOZILLALIBS := $(MOZILLALIBS) -s
+-	LIBS := $(LIBS) -s
+-endif
++.ifndef NO_STRIP
++AWT_LIBS := $(AWT_LIBS) -s
++MOZILLALIBS := $(MOZILLALIBS) -s
++LIBS := $(LIBS) -s
++.endif
  
 -all: make_swt make_atk make_gnome make_glx
 +all: make_swt make_atk $(MAKE_GNOME) make_glx $(MAKE_MOZILLA) $(MAKE_CAIRO)
  
  #
  # SWT libs
-@@ -202,7 +207,7 @@
- #
- # Mozilla lib
+@@ -210,7 +215,7 @@
+ 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
++	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
+ 
+ xpcom_structs.o: xpcom_structs.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
+@@ -241,6 +246,12 @@
+ xpcomxul_stats.o: xpcom_stats.cpp
+ 	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+ 
++xpcomxulglue.o: xpcomglue.cpp
++	$(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp
++
++xpcomxulglue_stats.o: xpcomglue_stats.cpp
++	$(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp
++
  #
--make_mozilla:$(MOZILLA_LIB) $(PROFILE14_LIB) $(PROFILE17_LIB) $(PROFILE18_LIB)
-+make_mozilla:$(MOZILLA_LIB)
- 
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
- 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS}
-@@ -220,22 +225,22 @@
- 	$(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp	
- 
- $(PROFILE14_OBJECTS): xpcom_profile.cpp
--	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp	
-+	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp	
- 
- $(PROFILE17_OBJECTS): xpcom_profile.cpp
--	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp	
-+	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp	
- 
- $(PROFILE18_OBJECTS): xpcom_profile.cpp
--	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp	
-+	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} ${GECKO_INCLUDES} -c xpcom_profile.cpp	
- 
- $(PROFILE14_LIB): $(PROFILE14_OBJECTS)
--	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS}
-+	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS} ${GECKO_LIBS}
- 
- $(PROFILE17_LIB): $(PROFILE17_OBJECTS)
--	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS}
-+	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS} ${GECKO_LIBS}
- 
- $(PROFILE18_LIB): $(PROFILE18_OBJECTS)
--	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS}
-+	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS} ${GECKO_LIBS}
- 
+ # XPCOMInit lib
  #
- # GLX lib
diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-swt-FileDialog.java b/java/eclipse/files/post-patch-plugins-swt-gtk-swt-FileDialog.java
new file mode 100644
index 000000000000..631f647124ef
--- /dev/null
+++ b/java/eclipse/files/post-patch-plugins-swt-gtk-swt-FileDialog.java
@@ -0,0 +1,36 @@
+--- 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 @@
+ 			stringBuffer.append ('.');
+ 		}
+ 		byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString (), true);
++		byte [] bufspc = new byte[1024];
+ 		/*
+ 		* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
+ 		* when setting a file name that is not a true canonical path. 
+ 		* The fix is to use the canonical path.
+ 		*/
+-		int /*long*/ ptr = OS.realpath (buffer, null);
++		int /*long*/ ptr = OS.realpath (buffer, bufspc);
+ 		if (ptr != 0) {
+ 			OS.gtk_file_chooser_set_filename (handle, ptr);
+-			OS.g_free (ptr);
+ 		}
+ 	} else {
+ 		if (fileName.length () > 0) {
+ 			if (fileName.charAt (0) == SEPARATOR) {
+ 				byte [] buffer = Converter.wcsToMbcs (null, fileName, true);
++				byte [] bufspc = new byte[1024];
+ 				/*
+ 				* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
+ 				* when setting a file name that is not a true canonical path. 
+ 				* The fix is to use the canonical path.
+ 				*/
+-				int /*long*/ ptr = OS.realpath (buffer, null);
++				int /*long*/ ptr = OS.realpath (buffer, bufspc);
+ 				if (ptr != 0) {
+ 					OS.gtk_file_chooser_set_filename (handle, ptr);
+-					OS.g_free (ptr);
+ 				}
+ 			}
+ 		}
diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-swt-internal-gtk-OS.java b/java/eclipse/files/post-patch-plugins-swt-gtk-swt-internal-gtk-OS.java
new file mode 100644
index 000000000000..da7fe1620e47
--- /dev/null
+++ b/java/eclipse/files/post-patch-plugins-swt-gtk-swt-internal-gtk-OS.java
@@ -0,0 +1,26 @@
+--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java.orig	2007-06-26 04:57:20.000000000 +0900
++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	2007-09-12 13:29:42.000000000 +0900
+@@ -23,18 +23,20 @@
+ 	}
+ 	
+ 	/** OS Constants */
+-	public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX;
++	public static final boolean IsFreeBSD, IsAIX, IsSunOS, IsLinux, IsHPUX;
+ 	static {
+ 		
+ 		/* Initialize the OS flags and locale constants */
+ 		String osName = System.getProperty ("os.name");
+-		boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false;
++		boolean isFreeBSD = false, isAIX = false, isSunOS = false, isLinux = false, isHPUX = false ;
++		if (osName.equals ("FreeBSD")) isFreeBSD = true;
+ 		if (osName.equals ("Linux")) isLinux = true;
+ 		if (osName.equals ("AIX")) isAIX = true;
+ 		if (osName.equals ("Solaris")) isSunOS = true;
+ 		if (osName.equals ("SunOS")) isSunOS = true;
+ 		if (osName.equals ("HP-UX")) isHPUX = true;
+-		IsAIX = isAIX;  IsSunOS = isSunOS;  IsLinux = isLinux;  IsHPUX = isHPUX;
++		IsFreeBSD = isFreeBSD; IsAIX = isAIX;  IsSunOS = isSunOS;  
++                IsLinux = isLinux;  IsHPUX = isHPUX;
+ 	}
+ 
+ 	/** Constants */
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-Browser.java b/java/eclipse/files/post-patch-plugins-swt-mozilla-Browser.java
deleted file mode 100644
index f8d7c65b806c..000000000000
--- a/java/eclipse/files/post-patch-plugins-swt-mozilla-Browser.java
+++ /dev/null
@@ -1,186 +0,0 @@
---- plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java.orig	Wed Nov 29 14:32:45 2006
-+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java	Wed Nov 29 14:42:01 2006
-@@ -10,15 +10,75 @@
-  *******************************************************************************/
- package org.eclipse.swt.browser;
- 
--import java.io.*;
--import java.util.*;
--import org.eclipse.swt.*;
--import org.eclipse.swt.widgets.*;
--import org.eclipse.swt.graphics.*;
--import org.eclipse.swt.internal.*;
--import org.eclipse.swt.internal.gtk.*;
--import org.eclipse.swt.internal.mozilla.*;
--import org.eclipse.swt.layout.*;
-+import java.io.File;
-+import java.io.UnsupportedEncodingException;
-+import java.util.Locale;
-+import java.util.StringTokenizer;
-+
-+import org.eclipse.swt.SWT;
-+import org.eclipse.swt.SWTError;
-+import org.eclipse.swt.SWTException;
-+import org.eclipse.swt.graphics.Point;
-+import org.eclipse.swt.graphics.Rectangle;
-+import org.eclipse.swt.internal.Callback;
-+import org.eclipse.swt.internal.Converter;
-+import org.eclipse.swt.internal.Library;
-+import org.eclipse.swt.internal.gtk.GdkEvent;
-+import org.eclipse.swt.internal.gtk.LONG;
-+import org.eclipse.swt.internal.gtk.OS;
-+import org.eclipse.swt.internal.mozilla.XPCOM;
-+import org.eclipse.swt.internal.mozilla.XPCOMObject;
-+import org.eclipse.swt.internal.mozilla.nsEmbedString;
-+import org.eclipse.swt.internal.mozilla.nsIAppShell;
-+import org.eclipse.swt.internal.mozilla.nsIBaseWindow;
-+import org.eclipse.swt.internal.mozilla.nsICategoryManager;
-+import org.eclipse.swt.internal.mozilla.nsIComponentManager;
-+import org.eclipse.swt.internal.mozilla.nsIComponentRegistrar;
-+import org.eclipse.swt.internal.mozilla.nsIContextMenuListener;
-+import org.eclipse.swt.internal.mozilla.nsICookie;
-+import org.eclipse.swt.internal.mozilla.nsICookieManager;
-+import org.eclipse.swt.internal.mozilla.nsID;
-+import org.eclipse.swt.internal.mozilla.nsIDOMEvent;
-+import org.eclipse.swt.internal.mozilla.nsIDOMMouseEvent;
-+import org.eclipse.swt.internal.mozilla.nsIDOMWindow;
-+import org.eclipse.swt.internal.mozilla.nsIDirectoryService;
-+import org.eclipse.swt.internal.mozilla.nsIDocShell;
-+import org.eclipse.swt.internal.mozilla.nsIEmbeddingSiteWindow;
-+import org.eclipse.swt.internal.mozilla.nsIFile;
-+import org.eclipse.swt.internal.mozilla.nsIIOService;
-+import org.eclipse.swt.internal.mozilla.nsIInterfaceRequestor;
-+import org.eclipse.swt.internal.mozilla.nsILocalFile;
-+import org.eclipse.swt.internal.mozilla.nsIPrefBranch;
-+import org.eclipse.swt.internal.mozilla.nsIPrefLocalizedString;
-+import org.eclipse.swt.internal.mozilla.nsIPrefService;
-+import org.eclipse.swt.internal.mozilla.nsIProperties;
-+import org.eclipse.swt.internal.mozilla.nsIRequest;
-+import org.eclipse.swt.internal.mozilla.nsIServiceManager;
-+import org.eclipse.swt.internal.mozilla.nsISimpleEnumerator;
-+import org.eclipse.swt.internal.mozilla.nsISupports;
-+import org.eclipse.swt.internal.mozilla.nsISupportsWeakReference;
-+import org.eclipse.swt.internal.mozilla.nsITooltipListener;
-+import org.eclipse.swt.internal.mozilla.nsIURI;
-+import org.eclipse.swt.internal.mozilla.nsIURIContentListener;
-+import org.eclipse.swt.internal.mozilla.nsIWeakReference;
-+import org.eclipse.swt.internal.mozilla.nsIWebBrowser;
-+import org.eclipse.swt.internal.mozilla.nsIWebBrowserChrome;
-+import org.eclipse.swt.internal.mozilla.nsIWebBrowserChromeFocus;
-+import org.eclipse.swt.internal.mozilla.nsIWebBrowserFocus;
-+import org.eclipse.swt.internal.mozilla.nsIWebBrowserStream;
-+import org.eclipse.swt.internal.mozilla.nsIWebNavigation;
-+import org.eclipse.swt.internal.mozilla.nsIWebProgress;
-+import org.eclipse.swt.internal.mozilla.nsIWebProgressListener;
-+import org.eclipse.swt.internal.mozilla.nsIWindowWatcher;
-+import org.eclipse.swt.layout.FillLayout;
-+import org.eclipse.swt.widgets.Composite;
-+import org.eclipse.swt.widgets.Display;
-+import org.eclipse.swt.widgets.Event;
-+import org.eclipse.swt.widgets.Label;
-+import org.eclipse.swt.widgets.Listener;
-+import org.eclipse.swt.widgets.Menu;
-+import org.eclipse.swt.widgets.Shell;
-+import org.eclipse.swt.widgets.Widget;
- 
- /**
-  * Instances of this class implement the browser user interface
-@@ -175,40 +235,9 @@
- 		 * - mozilla17profile/mozilla17profile-gcc should succeed for mozilla 1.7.x and firefox
- 		 * - mozilla18profile/mozilla18profile-gcc should succeed for mozilla 1.8.x (seamonkey)
- 		 */
--		try {
--			Library.loadLibrary ("swt-mozilla14-profile"); //$NON-NLS-1$
--			usingProfile = true;
--		} catch (UnsatisfiedLinkError e1) {
--			try {
--				Library.loadLibrary ("swt-mozilla17-profile"); //$NON-NLS-1$
--				usingProfile = true;
--			} catch (UnsatisfiedLinkError e2) {
--				try {
--					Library.loadLibrary ("swt-mozilla14-profile-gcc3"); //$NON-NLS-1$
--					usingProfile = true;
--				} catch (UnsatisfiedLinkError e3) {
--					try {
--						Library.loadLibrary ("swt-mozilla17-profile-gcc3"); //$NON-NLS-1$
--						usingProfile = true;
--					} catch (UnsatisfiedLinkError e4) {
--						try {
--							Library.loadLibrary ("swt-mozilla18-profile"); //$NON-NLS-1$
--							usingProfile = true;
--						} catch (UnsatisfiedLinkError e5) {
--							try {
--								Library.loadLibrary ("swt-mozilla18-profile-gcc3"); //$NON-NLS-1$
--								usingProfile = true;
--							} catch (UnsatisfiedLinkError e6) {
--								/* 
--								* fail silently, the Browser will still work without profile support
--								* but will abort any attempts to navigate to HTTPS pages
--								*/
--							}
--						}
--					}
--				}
--			}
--		}
-+		//Library.loadLibrary("swt-mozilla17-profile");
-+		// We build the profile stuff without the need for a separate DSO
-+		usingProfile = true;
- 
- 		int /*long*/[] retVal = new int /*long*/[1];
- 		nsEmbedString pathString = new nsEmbedString(mozillaPath);
-@@ -218,11 +247,11 @@
- 		if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER);
- 		
- 		nsILocalFile localFile = new nsILocalFile(retVal[0]);
--		rc = XPCOM.NS_InitEmbedding(localFile.getAddress(), 0);
-+		rc = XPCOM.NS_InitXPCOM3(0, localFile.getAddress(), 0, 0, 0);
- 		localFile.Release();
- 		if (rc != XPCOM.NS_OK) {
- 			dispose();
--			SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitEmbedding "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-+			SWT.error(SWT.ERROR_NO_HANDLES, null, " [NS_InitXPCOM3 "+mozillaPath+" error "+rc+"]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- 		}
- 
- 		rc = XPCOM.NS_GetComponentManager(result);
-@@ -283,7 +312,7 @@
- 			rc = properties.Get(buffer, nsIFile.NS_IFILE_IID, result);
- 			if (rc != XPCOM.NS_OK) error(rc);
- 			if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
--			properties.Release();
-+			// properties.Release() is now after the Set below
- 
- 			nsIFile profileDir = new nsIFile(result[0]);
- 			result[0] = 0;
-@@ -305,24 +334,15 @@
- 			pathString.dispose(); //
- 
- 			profileDir = new nsIFile(result[0]);
--			result[0] = 0;
--
--			rc = XPCOM_PROFILE.NS_NewProfileDirServiceProvider(true, result);
-+			
-+			// Set the profile dir property so that it's initialized for
-+			// things like password manager and https
-+			buffer = Converter.wcsToMbcs(null, XPCOM.NS_APP_USER_PROFILE_50_DIR, true);
-+			rc = properties.Set(buffer, profileDir.getAddress());
- 			if (rc != XPCOM.NS_OK) error(rc);
--			if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
--
--			final int /*long*/ dirServiceProvider = result[0];
-+			properties.Release();
-+						
- 			result[0] = 0;
--			rc = XPCOM_PROFILE.ProfileDirServiceProvider_Register(dirServiceProvider);
--			if (rc != XPCOM.NS_OK) error(rc);
--			rc = XPCOM_PROFILE.ProfileDirServiceProvider_SetProfileDir(dirServiceProvider, profileDir.getAddress());
--			if (rc != XPCOM.NS_OK) error(rc);
--
--			getDisplay().addListener(SWT.Dispose, new Listener() {
--				public void handleEvent(Event e) {
--					XPCOM_PROFILE.ProfileDirServiceProvider_Shutdown(dirServiceProvider);
--				}
--			});
- 		}
- 
- 		/*
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-XPCOM.java b/java/eclipse/files/post-patch-plugins-swt-mozilla-XPCOM.java
deleted file mode 100644
index b18678a5aa28..000000000000
--- a/java/eclipse/files/post-patch-plugins-swt-mozilla-XPCOM.java
+++ /dev/null
@@ -1,21 +0,0 @@
---- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java.orig	Wed Nov 29 14:11:42 2006
-+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java	Wed Nov 29 14:14:30 2006
-@@ -89,6 +89,7 @@
- 	public static final int NS_ERROR_HTMLPARSER_UNRESOLVEDDTD = 0x804e03f3;
- 	public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012;
- 	public static final String NS_APP_APPLICATION_REGISTRY_DIR = "AppRegD"; //$NON-NLS-1$
-+	public static final String NS_APP_USER_PROFILE_50_DIR = "ProfD"; //$NON-NLS-1$
- 
- public static final native void memmove(nsID dest, int /*long*/ src, int nbytes);
- public static final native void memmove(int /*long*/ dest, nsID src, int nbytes);
-@@ -103,9 +104,8 @@
- public static final native void memmove(byte[] dest, char[] src, int nbytes);
- public static final native int NS_GetComponentManager(int /*long*/[] result);
- public static final native int NS_GetServiceManager(int /*long*/[] result);
--public static final native int NS_InitEmbedding(int /*long*/ aMozBinDirectory, int /*long*/ aAppFileLocProvider);
-+public static final native int NS_InitXPCOM3(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider, int /*long*/ staticComponents, int componentCount);
- public static final native int NS_NewLocalFile(int /*long*/ path, boolean followLinks, int /*long*/[] result);
--public static final native int NS_TermEmbedding();
- public static final native int strlen_PRUnichar(int /*long*/ s);
- public static final native int /*long*/ nsEmbedCString_new();
- public static final native int /*long*/ nsEmbedCString_new(byte[] aString, int length);
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-XPCOM.properties b/java/eclipse/files/post-patch-plugins-swt-mozilla-XPCOM.properties
deleted file mode 100644
index c662b2c6935b..000000000000
--- a/java/eclipse/files/post-patch-plugins-swt-mozilla-XPCOM.properties
+++ /dev/null
@@ -1,25 +0,0 @@
---- plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties.orig	Wed Nov 29 14:17:21 2006
-+++ plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties	Wed Nov 29 14:18:14 2006
-@@ -24,16 +24,17 @@
- XPCOM_NS_GetServiceManager=
- XPCOM_NS_GetServiceManager_0=cast=(nsIServiceManager**)
- 
--XPCOM_NS_InitEmbedding=
--XPCOM_NS_InitEmbedding_0=cast=(nsILocalFile *)
--XPCOM_NS_InitEmbedding_1=cast=(nsIDirectoryServiceProvider *)
-+XPCOM_NS_InitXPCOM3=
-+XPCOM_NS_InitXPCOM3_0=cast=(nsIServiceManager**)
-+XPCOM_NS_InitXPCOM3_1=cast=(nsIFile *)
-+XPCOM_NS_InitXPCOM3_2=cast=(nsIDirectoryServiceProvider *)
-+XPCOM_NS_InitXPCOM3_3=cast=(const nsStaticModuleInfo *)
-+XPCOM_NS_InitXPCOM3_4=cast=(PRUint32)
- 
- XPCOM_NS_NewLocalFile=
- XPCOM_NS_NewLocalFile_0=cast=(nsAString *),flags=struct
- XPCOM_NS_NewLocalFile_1=
- XPCOM_NS_NewLocalFile_2=cast=(nsILocalFile**)
--
--XPCOM_NS_TermEmbedding=
- 
- XPCOM_PR_Free=
- XPCOM_PR_Free_0=cast=(void *)
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-XPCOM_PROFILE.properties b/java/eclipse/files/post-patch-plugins-swt-mozilla-XPCOM_PROFILE.properties
deleted file mode 100644
index 448c9445bd2d..000000000000
--- a/java/eclipse/files/post-patch-plugins-swt-mozilla-XPCOM_PROFILE.properties
+++ /dev/null
@@ -1,25 +0,0 @@
---- plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM_PROFILE.properties.orig	Mon Dec 11 02:02:04 2006
-+++ plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM_PROFILE.properties	Mon Dec 11 02:03:34 2006
-@@ -24,16 +24,17 @@
- XPCOM_NS_GetServiceManager=
- XPCOM_NS_GetServiceManager_0=
- 
--XPCOM_NS_InitEmbedding=
--XPCOM_NS_InitEmbedding_0=
--XPCOM_NS_InitEmbedding_1=
-+XPCOM_NS_InitXPCOM3=
-+XPCOM_NS_InitXPCOM3_0=cast=(nsIServiceManager**)
-+XPCOM_NS_InitXPCOM3_1=cast=(nsIFile *)
-+XPCOM_NS_InitXPCOM3_2=cast=(nsIDirectoryServiceProvider *)
-+XPCOM_NS_InitXPCOM3_3=cast=(const nsStaticModuleInfo *)
-+XPCOM_NS_InitXPCOM3_4=cast=(PRUint32)
- 
- XPCOM_NS_NewLocalFile=
- XPCOM_NS_NewLocalFile_0=
- XPCOM_NS_NewLocalFile_1=
- XPCOM_NS_NewLocalFile_2=
--
--XPCOM_NS_TermEmbedding=
- 
- XPCOM_PR_Free=
- XPCOM_PR_Free_0=
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-gtk-swt-browser-MozillaDelegate.java b/java/eclipse/files/post-patch-plugins-swt-mozilla-gtk-swt-browser-MozillaDelegate.java
new file mode 100644
index 000000000000..86aeebc3b326
--- /dev/null
+++ b/java/eclipse/files/post-patch-plugins-swt-mozilla-gtk-swt-browser-MozillaDelegate.java
@@ -0,0 +1,21 @@
+--- plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java.orig	2007-06-26 04:57:02.000000000 +0900
++++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java	2007-09-12 13:17:45.000000000 +0900
+@@ -26,14 +26,17 @@
+ 	static final int STOP_PROPOGATE = 1;
+ 
+ 	static boolean IsLinux;
++	static boolean IsFreeBSD;
+ 	static {
+ 		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
+ 		IsLinux = osName.startsWith ("linux"); //$NON-NLS-1$
++		IsFreeBSD = osName.startsWith ("freebsd"); //$NON-NLS-1$
++		
+ 	}
+ 
+ MozillaDelegate (Browser browser) {
+ 	super ();
+-	if (!IsLinux) {
++	if (!IsLinux && !IsFreeBSD) {
+ 		browser.dispose ();
+ 		SWT.error (SWT.ERROR_NO_HANDLES, null, " [Unsupported platform]"); //$NON-NLS-1$
+ 	}
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom.cpp b/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom.cpp
deleted file mode 100644
index 2c7342aec328..000000000000
--- a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
---- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp.orig	Thu Sep 21 10:57:23 2006
-+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp	Wed Nov 29 19:46:27 2006
-@@ -85,14 +85,16 @@
- }
- #endif
- 
--#ifndef NO_NS_1InitEmbedding
--JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitEmbedding)
--	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-+#ifndef NO_NS_1InitXPCOM3
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM3)
-+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
- {
- 	jint rc = 0;
--	XPCOM_NATIVE_ENTER(env, that, NS_1InitEmbedding_FUNC);
--	rc = (jint)NS_InitEmbedding((nsILocalFile *)arg0, (nsIDirectoryServiceProvider *)arg1);
--	XPCOM_NATIVE_EXIT(env, that, NS_1InitEmbedding_FUNC);
-+	XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentRegistrar_FUNC);
-+	rc = (jint)NS_InitXPCOM3((nsIServiceManager **)arg0, (nsIFile *)arg1,
-+		(nsIDirectoryServiceProvider *)arg2, (nsStaticModuleInfo *)arg3,
-+		(PRUint32) arg4);
-+	XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentRegistrar_FUNC);
- 	return rc;
- }
- #endif
-@@ -113,18 +115,6 @@
- }
- #endif
- 
--#ifndef NO_NS_1TermEmbedding
--JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1TermEmbedding)
--	(JNIEnv *env, jclass that)
--{
--	jint rc = 0;
--	XPCOM_NATIVE_ENTER(env, that, NS_1TermEmbedding_FUNC);
--	rc = (jint)NS_TermEmbedding();
--	XPCOM_NATIVE_EXIT(env, that, NS_1TermEmbedding_FUNC);
--	return rc;
--}
--#endif
--
- #ifndef NO_PR_1Free
- JNIEXPORT void JNICALL XPCOM_NATIVE(PR_1Free)
- 	(JNIEnv *env, jclass that, jint arg0)
-@@ -141,7 +131,7 @@
- {
- 	jint rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, PR_1Malloc_FUNC);
--	rc = (jint)PR_Malloc(arg0);
-+	rc = (long)PR_Malloc(arg0);
- 	XPCOM_NATIVE_EXIT(env, that, PR_1Malloc_FUNC);
- 	return rc;
- }
-@@ -2091,7 +2081,7 @@
- {
- 	jint rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1get_FUNC);
--	rc = (jint)((nsEmbedCString *)arg0)->get();
-+	rc = (long)((nsEmbedCString *)arg0)->get();
- 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1get_FUNC);
- 	return rc;
- }
-@@ -2103,7 +2093,7 @@
- {
- 	jint rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___FUNC);
--	rc = (jint)new nsEmbedCString();
-+	rc = (long)new nsEmbedCString();
- 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___FUNC);
- 	return rc;
- }
-@@ -2117,7 +2107,7 @@
- 	jint rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___3BI_FUNC);
- 	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
--	rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
-+	rc = (long)new nsEmbedCString((const char *)lparg0, arg1);
- fail:
- 	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
- 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___3BI_FUNC);
-@@ -2131,7 +2121,7 @@
- {
- 	jint rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1Length_FUNC);
--	rc = (jint)((nsEmbedString *)arg0)->Length();
-+	rc = (long)((nsEmbedString *)arg0)->Length();
- 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1Length_FUNC);
- 	return rc;
- }
-@@ -2153,7 +2143,7 @@
- {
- 	jint rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1get_FUNC);
--	rc = (jint)((nsEmbedString *)arg0)->get();
-+	rc = (long)((nsEmbedString *)arg0)->get();
- 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1get_FUNC);
- 	return rc;
- }
-@@ -2165,7 +2155,7 @@
- {
- 	jint rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___FUNC);
--	rc = (jint)new nsEmbedString();
-+	rc = (long)new nsEmbedString();
- 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___FUNC);
- 	return rc;
- }
-@@ -2179,7 +2169,7 @@
- 	jint rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___3C_FUNC);
- 	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
--	rc = (jint)new nsEmbedString(lparg0);
-+	rc = (long)new nsEmbedString(lparg0);
- fail:
- 	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
- 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___3C_FUNC);
-@@ -2193,7 +2183,7 @@
- {
- 	jboolean rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsID_1Equals_FUNC);
--	rc = (jboolean)((nsID *)arg0)->Equals(*(nsID *)arg1);
-+	rc = (long)((nsID *)arg0)->Equals(*(nsID *)arg1);
- 	XPCOM_NATIVE_EXIT(env, that, nsID_1Equals_FUNC);
- 	return rc;
- }
-@@ -2207,7 +2197,7 @@
- 	jboolean rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsID_1Parse_FUNC);
- 	if (arg1) if ((lparg1 = env->GetStringUTFChars(arg1, NULL)) == NULL) goto fail;
--	rc = (jboolean)((nsID *)arg0)->Parse((const char *)lparg1);
-+	rc = (long)((nsID *)arg0)->Parse((const char *)lparg1);
- fail:
- 	if (arg1 && lparg1) env->ReleaseStringUTFChars(arg1, lparg1);
- 	XPCOM_NATIVE_EXIT(env, that, nsID_1Parse_FUNC);
-@@ -2231,7 +2221,7 @@
- {
- 	jint rc = 0;
- 	XPCOM_NATIVE_ENTER(env, that, nsID_1new_FUNC);
--	rc = (jint)new nsID();
-+	rc = (long)new nsID();
- 	XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC);
- 	return rc;
- }
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom.h b/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom.h
deleted file mode 100644
index bd7827847566..000000000000
--- a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h.orig	Wed Nov 29 12:11:18 2006
-+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h	Wed Nov 29 12:12:03 2006
-@@ -31,8 +31,7 @@
- 
- #define NDEBUG
- 
--#include "nsXPCOM.h"
--#include "nsEmbedAPI.h"	
-+#include "nsXPCOM.h"	
- #include "nsEmbedString.h"
- #include "nsIInputStream.h"
- #include "nsISupportsUtils.h"
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom_profile.h b/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom_profile.h
deleted file mode 100644
index 254ff2218492..000000000000
--- a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom_profile.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_profile.h.orig	Wed Nov 29 12:08:43 2006
-+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_profile.h	Wed Nov 29 12:09:33 2006
-@@ -32,7 +32,7 @@
- #define NDEBUG
- 
- #include "nsCOMPtr.h"
--#include "nsProfileDirServiceProvider.h"
-+#include "profdirserviceprovider/nsProfileDirServiceProvider.h"
- #include "xpcom_stats.h"
- 
- #endif /* INC_xpcom_profile_H */
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom_stats.cpp b/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom_stats.cpp
deleted file mode 100644
index f8f19cc3d7e4..000000000000
--- a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom_stats.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp.orig	Wed Nov 29 12:03:05 2006
-+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp	Wed Nov 29 12:05:26 2006
-@@ -31,15 +31,14 @@
- 
- #ifdef NATIVE_STATS
- 
--int XPCOM_nativeFunctionCount = 132;
--int XPCOM_nativeFunctionCallCount[132];
-+int XPCOM_nativeFunctionCount = 131;
-+int XPCOM_nativeFunctionCallCount[131];
- char * XPCOM_nativeFunctionNames[] = {
- 	"Call",
- 	"NS_1GetComponentManager",
- 	"NS_1GetServiceManager",
--	"NS_1InitEmbedding",
-+	"NS_1InitXPCOM3_FUNC",
- 	"NS_1NewLocalFile",
--	"NS_1TermEmbedding",
- 	"PR_1Free",
- 	"PR_1Malloc",
- 	"VtblCall__II",
diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom_stats.h b/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom_stats.h
deleted file mode 100644
index eaa50b76ee8b..000000000000
--- a/java/eclipse/files/post-patch-plugins-swt-mozilla-xpcom_stats.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h.orig	Wed Nov 29 13:51:40 2006
-+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h	Wed Nov 29 13:52:23 2006
-@@ -41,9 +41,8 @@
- 	Call_FUNC,
- 	NS_1GetComponentManager_FUNC,
- 	NS_1GetServiceManager_FUNC,
--	NS_1InitEmbedding_FUNC,
-+	NS_1InitXPCOM3_FUNC,
- 	NS_1NewLocalFile_FUNC,
--	NS_1TermEmbedding_FUNC,
- 	PR_1Free_FUNC,
- 	PR_1Malloc_FUNC,
- 	VtblCall__II_FUNC,
diff --git a/java/eclipse/scripts/pre-patch b/java/eclipse/scripts/pre-patch
index 1987cdddcc75..8b43019dc5e7 100644
--- a/java/eclipse/scripts/pre-patch
+++ b/java/eclipse/scripts/pre-patch
@@ -5,9 +5,17 @@ copy_file()
 {
 	srcfile="$1"
 	dstfile="$2"
-
-	rm -f $dstfile
-	cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' > "$dstfile"
+	
+	case $distfile in
+		*.zip)
+			#We may not want to push all files through sed			echo "zip file"
+			mv $srcfile $dstfile
+			;;
+		*)
+			rm -f $dstfile
+			cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' > "$dstfile"
+			;;
+		esac
 }
 
 copy_dir()
@@ -30,7 +38,7 @@ copy_dir()
 
 prepare_files()
 {
-	mkdir ${WRKSRC}/features/org.eclipse.platform.launchers/bin/gtk/freebsd
+	mkdir ${WRKSRC}/features/org.eclipse.equinox.executable/bin/gtk/freebsd
 
 	# Copy the files and rename/change them appropriately
 	for src in $COPY_LIST
@@ -54,7 +62,7 @@ prepare_files()
 	find ${WRKSRC} -name \*.so -delete
 	find ${WRKSRC} -name \*.so.\* -delete
 }
-
+#features/org.eclipse.platform.launchers/library/gtk/make_linux.mak
 COPY_LIST="
 assemble.org.eclipse.sdk.linux.gtk.x86.xml
 assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
@@ -62,11 +70,15 @@ package.org.eclipse.sdk.linux.gtk.x86.xml
 package.org.eclipse.sdk.linux.gtk.x86_64.xml
 features/org.eclipse.platform/about_files/linux.gtk.x86
 features/org.eclipse.platform/about_files/linux.gtk.x86_64
-features/org.eclipse.platform.launchers/bin/gtk/linux/x86
-features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64
-features/org.eclipse.platform.launchers/library/gtk/make_linux.mak
+features/org.eclipse.equinox.executable/bin/gtk/linux
+features/org.eclipse.equinox.executable/bin/gtk/linux/x86
+features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
+features/org.eclipse.equinox.executable/library/gtk/make_linux.mak
 plugins/org.eclipse.core.filesystem.linux.x86
 plugins/org.eclipse.core.filesystem.linux.x86_64
+plugins/org.eclipse.core.filesystem.linux.x86/os/linux
+plugins/org.eclipse.core.filesystem.linux.x86_64/os/linux
+plugins/org.eclipse.core.filesystem/natives/unix/linux
 plugins/org.eclipse.jdt.source.linux.gtk.x86
 plugins/org.eclipse.jdt.source.linux.gtk.x86_64
 plugins/org.eclipse.pde.source.linux.gtk.x86
@@ -79,6 +91,18 @@ plugins/org.eclipse.swt.gtk.linux.x86
 plugins/org.eclipse.swt.gtk.linux.x86_64
 plugins/org.eclipse.update.core.linux
 plugins/org.eclipse.update.core.linux/os/linux
+plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86
+plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64
+plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties
+plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties
+plugins/org.eclipse.equinox.launcher.gtk.linux.x86
+plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64
+plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties
+plugins/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties
+plugins/org.eclipse.cvs.source.linux.gtk.x86
+plugins/org.eclipse.cvs.source.linux.gtk.x86_64
+plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux.properties
+plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux_gtk.properties
 "
 
 SWTGTK="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"