. Update to 3.4.1

. Fix support for xulrunner as the WITH_GECKO option. [1]
. Remove mozilla as a WITH_GECKO option.

PR:		127353 [1]
Submitted by:	Stephane Potvin (maintainer)

15 files changed, 147 insertions, 160 deletions

diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile
index 5427b54c3640..0108a2328a22 100644
--- a/java/eclipse-devel/Makefile
+++ b/java/eclipse-devel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	eclipse-devel
-PORTVERSION=	3.4
+PORTVERSION=	3.4.1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200806172000
+MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200809111700
 DISTNAME=	eclipse-sourceBuild-srcIncluded-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
@@ -18,7 +18,7 @@ COMMENT=	An open extensible IDE for anything and nothing in particular
 
 BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
 		zip:${PORTSDIR}/archivers/zip \
-		${EXTRACT_DEPENDS} 
+		unzip:${PORTSDIR}/archivers/unzip
 PATCH_DEPENDS+=	gpatch:${PORTSDIR}/devel/patch
 
 ECLIPSE=	${PORTNAME}
@@ -31,7 +31,7 @@ USE_GL=		glu
 PATCH=		${LOCALBASE}/bin/gpatch
 
 .if !defined(WITHOUT_MOZILLA)
-USE_GECKO=	firefox xulrunner mozilla seamonkey
+USE_GECKO=	firefox xulrunner seamonkey
 .endif
 
 USE_JAVA=	yes
@@ -100,7 +100,7 @@ SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI
 SWTMOZ=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla
 
 ECLIPSE_IU=FreeBSD Eclipse SDK
-ECLIPSE_IU_VERSION=${PORTVERSION}.0.${PORTREVISION}
+ECLIPSE_IU_VERSION=${PORTVERSION}.${PORTREVISION}
 
 post-patch:
 	@${PATCH} ${PATCH_DIST_ARGS} -d "${SWTBASE}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-FileDialog.java
@@ -115,7 +115,7 @@ do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
 	./build -os ${ECLIPSE_OS} -ws ${ECLIPSE_WS} -arch ${ECLIPSE_ARCH} -compilelibs)
 	@${JAVA} \
-	  -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.100.v20080509-1800.jar \
+	  -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar \
 	  -data ${WRKSRC}/workspace \
 	  -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
 	  -flavor tooling \
@@ -133,7 +133,7 @@ do-install:
 	@${MKDIR} ${PORTDESTDIR}
 	@${JAVA} \
 	  -Declipse.p2.data.area="file:${PORTDESTDIR}/p2" \
-	  -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.100.v20080509-1800.jar \
+	  -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar \
 	  -data ${WRKSRC}/workspace \
 	  -application org.eclipse.equinox.p2.director.app.application \
 	  -flavor tooling \
diff --git a/java/eclipse-devel/distinfo b/java/eclipse-devel/distinfo
index 9ab4f0aeba5b..c52b329858c0 100644
--- a/java/eclipse-devel/distinfo
+++ b/java/eclipse-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.zip) = 555c99aee06fc52d2ec03995b5ac0710
-SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.zip) = df829822473886aa62b15d9f95654f88e868634fb1b78ce0b12c550b85054e93
-SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.4.zip) = 105671901
+MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.1.zip) = 5814fb2019f70f00c0952f29df1cac3d
+SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.1.zip) = cb451bcc8866ab289b3a322e17eda7d20429463e8b3f329f66626b45b0fd6824
+SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.4.1.zip) = 106290656
diff --git a/java/eclipse-devel/files/patch-build.xml b/java/eclipse-devel/files/patch-build.xml
index 0aca1aade304..50a29ce0b1ac 100644
--- a/java/eclipse-devel/files/patch-build.xml
+++ b/java/eclipse-devel/files/patch-build.xml
@@ -1,11 +1,11 @@
---- build.xml.orig	2008-08-04 19:39:49.000000000 -0400
-+++ build.xml	2008-08-04 19:17:16.000000000 -0400
+--- build.xml.orig	2008-09-29 19:16:32.000000000 -0400
++++ build.xml	2008-09-29 19:19:37.000000000 -0400
 @@ -1,7 +1,7 @@
  <project name="Eclipse SDK Source Build" default="run" basedir=".">
  
  	<!--  default target that runs complete build  -->
 -	<target name="run" depends="fetch,insertBuildId,compile,install" />
-+	<target name="run" depends="fetch,insertBuildId,compile,compilelibs,install" />
++	<target name="run" depends="fetch,insertBuildId,compilelibs,compile,install" />
  
  	<!--  all features required to build eclipse sdk and javadoc  -->
  	<target name="allElements">
@@ -26,11 +26,11 @@
  		<copy todir="${linux.gtk.x86_64.rootfiles}">
  			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86_64" includes="
  				about_files/mpl-v11.txt" />
-@@ -71,6 +81,32 @@
+@@ -71,6 +81,25 @@
  		<record name="compilelog.txt" action="stop" />
  	</target>
  
-+        <target name="compilelibs" depends="init,clean,compile" if="libsconfig">
++        <target name="compilelibs" depends="init,clean" if="libsconfig">
 +		<echo message="Compiling SWT native libraries..."/>
 +		<ant dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" antfile="build.xml" target="build.jnilibs"/>
 +
@@ -40,13 +40,6 @@
 +                        <arg line="build.sh install" />
 +                </exec>
 +
-+                <property name="launcherfragment" value="org.eclipse.equinox.launcher.${installWs}.${installOs}.${installArch}" />
-+                <copy todir="${buildDirectory}/plugins/${launcherfragment}">
-+			<fileset dir="${launcherlibs}/bin/${installWs}/${installOs}/${installArch}">
-+                                <include name="**/*.so" />
-+                        </fileset>
-+                </copy>
-+
 +		<echo message="Compiling liblocalfile..."/>
 +                <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}">
@@ -59,7 +52,7 @@
  	<!--create an installable eclipse runtime-->
  	<target name="install" depends="init">
  		<echo message="Assembling..." />
-@@ -277,6 +313,8 @@
+@@ -277,6 +306,8 @@
  				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-motif-x86" />
  				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-s390" />
  				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-s390x" />								
@@ -68,7 +61,7 @@
  				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="solaris-gtk-x86" />
  				<equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-PA_RISC" />
  			</or>
-@@ -284,7 +322,10 @@
+@@ -284,7 +315,10 @@
  
  		<!--used to add doc plug-ins to result after initial assembly-->
  		<condition property="archive.format" value="tar">
diff --git a/java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh b/java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh
index 58b6aa1e76cb..a86cc3eb059b 100644
--- a/java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh
+++ b/java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh
@@ -1,5 +1,5 @@
---- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig	2008-08-02 22:30:31.469155349 -0400
-+++ features/org.eclipse.equinox.executable/library/gtk/build.sh	2008-08-02 22:32:13.519781895 -0400
+--- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig	2008-09-30 19:29:09.000000000 -0400
++++ features/org.eclipse.equinox.executable/library/gtk/build.sh	2008-09-30 19:28:40.000000000 -0400
 @@ -53,6 +53,7 @@
  	"Linux")
  		makefile="make_linux.mak"
@@ -8,7 +8,7 @@
  		case $MODEL in
  			"x86_64")
  				defaultOSArch="x86_64"
-@@ -93,9 +94,30 @@
+@@ -94,9 +95,31 @@
  				;;
  		esac
  		;;
@@ -16,6 +16,7 @@
 +		makefile="make_freebsd.mak"
 +		defaultOS="freebsd"
 +		MAKE=gmake
++		javaHome="$JAVA_HOME"
 +		case $MODEL in
 +			"amd64")
 +				defaultOSArch="amd64"
@@ -36,19 +37,19 @@
  		makefile="make_solaris.mak"
  		defaultOS="solaris"
 +		MAKE=make
+ 		javaHome="/usr/jdk/jdk1.5.0_01"
  		OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
  		#PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
- 		PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH
-@@ -149,7 +171,7 @@
- DEFAULT_OS="$defaultOS"
- DEFAULT_OS_ARCH="$defaultOSArch"
- DEFAULT_WS="$defaultWS"
--JAVA_HOME=$javaHome
-+#JAVA_HOME=$javaHome
+@@ -154,7 +177,7 @@
+ JAVA_HOME=$javaHome
  DEFAULT_JAVA=$defaultJava
  
- export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA
-@@ -157,13 +179,13 @@
+-LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
++LIBRARY_DIR="../../../../plugins/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ 
+ export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA LIBRARY_DIR
+@@ -162,13 +185,13 @@
  # If the OS is supported (a makefile exists)
  if [ "$makefile" != "" ]; then
  	if [ "$extraArgs" != "" ]; then
diff --git a/java/eclipse-devel/files/patch-features-org.eclipse.platform-build.xml b/java/eclipse-devel/files/patch-features-org.eclipse.platform-build.xml
index f77a5beef181..f441d4f4550c 100644
--- a/java/eclipse-devel/files/patch-features-org.eclipse.platform-build.xml
+++ b/java/eclipse-devel/files/patch-features-org.eclipse.platform-build.xml
@@ -1,5 +1,5 @@
---- features/org.eclipse.platform/build.xml.orig	2008-08-02 15:21:05.000000000 -0400
-+++ features/org.eclipse.platform/build.xml	2008-08-02 15:23:39.000000000 -0400
+--- features/org.eclipse.platform/build.xml.orig	2008-09-25 19:20:11.000000000 -0400
++++ features/org.eclipse.platform/build.xml	2008-09-25 19:19:54.000000000 -0400
 @@ -27,6 +27,11 @@
  			<property name="os" value="linux"/>
  			<property name="ws" value="gtk"/>
@@ -52,8 +52,8 @@
  				<include name="license.html"/>
  			</fileset>
  		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.4.0.v20080610-9I96EhtEm-T_5LxIsybz-3MdGZmOA3uwv7Ka_M/feature.xml"  selfVersion="3.4.0.v20080610-9I96EhtEm-T_5LxIsybz-3MdGZmOA3uwv7Ka_M" featureIds="org.eclipse.help:0.0.0,1.0.0.v20080603-7r7xEHJEJkZu5nE6Q4Qrtvu6JZ9L,org.eclipse.equinox.p2.user.ui:0.0.0,1.0.0.v20080516-7d--ETu637E5se-QIGiA," pluginIds="com.jcraft.jsch:0.0.0,0.1.37.v200803061811,org.eclipse.compare:0.0.0,3.4.0.I20080604,org.eclipse.core.boot:0.0.0,3.1.100.v20080218,org.eclipse.core.filebuffers:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.filesystem:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.net:0.0.0,1.1.0.I20080604,org.eclipse.core.net.win32.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.net.linux.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.resources:0.0.0,3.4.0.v20080604-1400,org.eclipse.core.resources.compatibility:0.0.0,3.4.0.v20080604-1400,org.eclipse.osgi.util:0.0.0,3.1.300.v20080303,org.eclipse.debug.core:0.0.0,3.4.0.v20080612,org.eclipse.debug.ui:0.0.0,3.4.0.v20080529-1300,org.eclipse.help.appserver:0.0.0,3.1.300.v20080507,org.eclipse.ltk.core.refactoring:0.0.0,3.4.0.v20080603-2000,org.eclipse.ltk.ui.refactoring:0.0.0,3.4.0.v20080605-1800,org.eclipse.platform:0.0.0,3.3.100.v200806172000,org.eclipse.platform.doc.user:0.0.0,3.4.0.v20080612-1340,org.eclipse.search:0.0.0,3.4.0.v20080603-2000,org.eclipse.team.core:0.0.0,3.4.0.I20080605,org.eclipse.team.ui:0.0.0,3.4.0.I20080604,org.eclipse.text:0.0.0,3.4.0.v20080605-1800,org.eclipse.jface.text:0.0.0,3.4.0.v20080603-2000,org.eclipse.jsch.core:0.0.0,1.1.100.I20080604,org.eclipse.jsch.ui:0.0.0,1.1.100.I20080415,org.eclipse.ui.console:0.0.0,3.3.0.v20080529-1300,org.eclipse.ui.presentations.r21:0.0.0,3.2.100.I20080512-2000,org.eclipse.ui.intro:0.0.0,3.2.200.v20080610,org.eclipse.ui.intro.universal:0.0.0,3.2.200.v20080508,org.eclipse.ui.cheatsheets:0.0.0,3.3.100.v20080508,org.eclipse.ui.browser:0.0.0,3.2.200.v20080507,org.eclipse.ui.navigator:0.0.0,3.3.100.I20080606-1300,org.eclipse.ui.navigator.resources:0.0.0,3.3.100.I20080606-1300,org.eclipse.ui.net:0.0.0,1.0.0.I20080605,org.eclipse.ui.workbench.texteditor:0.0.0,3.4.0.v20080603-2000,org.eclipse.ui.views:0.0.0,3.3.0.I20080509-2000,org.eclipse.ui.editors:0.0.0,3.4.0.v20080603-2000,org.eclipse.ui.externaltools:0.0.0,3.2.0.v20080514-1542,org.eclipse.ui.ide:0.0.0,3.4.0.I20080606-1300,org.eclipse.ui.ide.application:0.0.0,1.0.0.I20080603-2000,org.eclipse.ui.win32:0.0.0,3.2.100.v20080408-0800,org.eclipse.update.core:0.0.0,3.2.200.v20080515,org.eclipse.update.scheduler:0.0.0,3.2.100.v20080404,org.eclipse.update.ui:0.0.0,3.2.100.v20080318,org.eclipse.ui.workbench.compatibility:0.0.0,3.2.0.I20080509-2000,org.eclipse.core.filesystem.hpux.ia64_32:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.hpux.PA_RISC:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.linux.ppc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.linux.x86:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.filesystem.linux.x86_64:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.solaris.sparc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.macosx:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.qnx.x86:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.win32.x86:0.0.0,1.1.0.v20080604-1400,org.eclipse.core.filesystem.win32.ia64:0.0.0,1.1.0.v20071121,org.eclipse.core.resources.win32.x86:0.0.0,3.4.0.v20071204,org.eclipse.core.resources.win32.ia64:0.0.0,3.4.0.v20071204,org.eclipse.update.core.linux:0.0.0,3.2.0.v20080422,org.eclipse.update.core.win32:0.0.0,3.2.100.v20080107,org.eclipse.ui.views.properties.tabbed:0.0.0,3.4.0.I20080527-2000,org.eclipse.equinox.security:0.0.0,1.0.0.v20080512-1800,org.eclipse.equinox.security.ui:0.0.0,1.0.0.v20080603-1810,org.eclipse.equinox.security.win32.x86:0.0.0,1.0.0.v20080529-1600,org.eclipse.equinox.security.macosx:0.0.0,1.0.0.v20080602-2000,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.4.0.v20080610-9I96EhtEm-T_5LxIsybz-3MdGZmOA3uwv7Ka_M/feature.xml"  selfVersion="3.4.0.v20080610-9I96EhtEm-T_5LxIsybz-3MdGZmOA3uwv7Ka_M" featureIds="org.eclipse.help:0.0.0,1.0.0.v20080603-7r7xEHJEJkZu5nE6Q4Qrtvu6JZ9L,org.eclipse.equinox.p2.user.ui:0.0.0,1.0.0.v20080516-7d--ETu637E5se-QIGiA," pluginIds="com.jcraft.jsch:0.0.0,0.1.37.v200803061811,org.eclipse.compare:0.0.0,3.4.0.I20080604,org.eclipse.core.boot:0.0.0,3.1.100.v20080218,org.eclipse.core.filebuffers:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.filesystem:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.net:0.0.0,1.1.0.I20080604,org.eclipse.core.net.win32.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.net.linux.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.net.freebsd.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.resources:0.0.0,3.4.0.v20080604-1400,org.eclipse.core.resources.compatibility:0.0.0,3.4.0.v20080604-1400,org.eclipse.osgi.util:0.0.0,3.1.300.v20080303,org.eclipse.debug.core:0.0.0,3.4.0.v20080612,org.eclipse.debug.ui:0.0.0,3.4.0.v20080529-1300,org.eclipse.help.appserver:0.0.0,3.1.300.v20080507,org.eclipse.ltk.core.refactoring:0.0.0,3.4.0.v20080603-2000,org.eclipse.ltk.ui.refactoring:0.0.0,3.4.0.v20080605-1800,org.eclipse.platform:0.0.0,3.3.100.v200806172000,org.eclipse.platform.doc.user:0.0.0,3.4.0.v20080612-1340,org.eclipse.search:0.0.0,3.4.0.v20080603-2000,org.eclipse.team.core:0.0.0,3.4.0.I20080605,org.eclipse.team.ui:0.0.0,3.4.0.I20080604,org.eclipse.text:0.0.0,3.4.0.v20080605-1800,org.eclipse.jface.text:0.0.0,3.4.0.v20080603-2000,org.eclipse.jsch.core:0.0.0,1.1.100.I20080604,org.eclipse.jsch.ui:0.0.0,1.1.100.I20080415,org.eclipse.ui.console:0.0.0,3.3.0.v20080529-1300,org.eclipse.ui.presentations.r21:0.0.0,3.2.100.I20080512-2000,org.eclipse.ui.intro:0.0.0,3.2.200.v20080610,org.eclipse.ui.intro.universal:0.0.0,3.2.200.v20080508,org.eclipse.ui.cheatsheets:0.0.0,3.3.100.v20080508,org.eclipse.ui.browser:0.0.0,3.2.200.v20080507,org.eclipse.ui.navigator:0.0.0,3.3.100.I20080606-1300,org.eclipse.ui.navigator.resources:0.0.0,3.3.100.I20080606-1300,org.eclipse.ui.net:0.0.0,1.0.0.I20080605,org.eclipse.ui.workbench.texteditor:0.0.0,3.4.0.v20080603-2000,org.eclipse.ui.views:0.0.0,3.3.0.I20080509-2000,org.eclipse.ui.editors:0.0.0,3.4.0.v20080603-2000,org.eclipse.ui.externaltools:0.0.0,3.2.0.v20080514-1542,org.eclipse.ui.ide:0.0.0,3.4.0.I20080606-1300,org.eclipse.ui.ide.application:0.0.0,1.0.0.I20080603-2000,org.eclipse.ui.win32:0.0.0,3.2.100.v20080408-0800,org.eclipse.update.core:0.0.0,3.2.200.v20080515,org.eclipse.update.scheduler:0.0.0,3.2.100.v20080404,org.eclipse.update.ui:0.0.0,3.2.100.v20080318,org.eclipse.ui.workbench.compatibility:0.0.0,3.2.0.I20080509-2000,org.eclipse.core.filesystem.hpux.ia64_32:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.hpux.PA_RISC:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.linux.ppc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.linux.x86:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.filesystem.freebsd.x86:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.filesystem.linux.x86_64:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.freebsd.amd64:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.solaris.sparc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.macosx:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.qnx.x86:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.win32.x86:0.0.0,1.1.0.v20080604-1400,org.eclipse.core.filesystem.win32.ia64:0.0.0,1.1.0.v20071121,org.eclipse.core.resources.win32.x86:0.0.0,3.4.0.v20071204,org.eclipse.core.resources.win32.ia64:0.0.0,3.4.0.v20071204,org.eclipse.update.core.linux:0.0.0,3.2.0.v20080422,org.eclipse.update.core.freebsd:0.0.0,3.2.0.v20080422,org.eclipse.update.core.win32:0.0.0,3.2.100.v20080107,org.eclipse.ui.views.properties.tabbed:0.0.0,3.4.0.I20080527-2000,org.eclipse.equinox.security:0.0.0,1.0.0.v20080512-1800,org.eclipse.equinox.security.ui:0.0.0,1.0.0.v20080603-1810,org.eclipse.equinox.security.win32.x86:0.0.0,1.0.0.v20080529-1600,org.eclipse.equinox.security.macosx:0.0.0,1.0.0.v20080602-2000,"/>
+-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.4.1.r341_v20080731-9I96EiDElYevwz-p1bP5z-NlAaP7vtX6Utotqsu/feature.xml"  selfVersion="3.4.1.r341_v20080731-9I96EiDElYevwz-p1bP5z-NlAaP7vtX6Utotqsu" featureIds="org.eclipse.help:0.0.0,1.0.1.R34x_v20080827-7r7xEIxEI6Zu5nEqN7M3UBpglaat,org.eclipse.equinox.p2.user.ui:0.0.0,1.0.1.r34x_v20080721-7d-7OEMsLAz-vTBJ-ZHQaF155CE," pluginIds="com.jcraft.jsch:0.0.0,0.1.37.v200803061811,org.eclipse.compare:0.0.0,3.4.0.I20080604,org.eclipse.core.boot:0.0.0,3.1.100.v20080218,org.eclipse.core.filebuffers:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.filesystem:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.net:0.0.0,1.1.0.I20080604,org.eclipse.core.net.win32.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.net.linux.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.resources:0.0.0,3.4.1.R34x_v20080902,org.eclipse.core.resources.compatibility:0.0.0,3.4.0.v20080604-1400,org.eclipse.osgi.util:0.0.0,3.1.300.v20080303,org.eclipse.debug.core:0.0.0,3.4.0.v20080612,org.eclipse.debug.ui:0.0.0,3.4.1.v20080811_r341,org.eclipse.help.appserver:0.0.0,3.1.300.v20080507,org.eclipse.ltk.core.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.ltk.ui.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.platform:0.0.0,3.3.101.v200809111700,org.eclipse.platform.doc.user:0.0.0,3.4.1.r341_v20080808-0800,org.eclipse.search:0.0.0,3.4.1.r341_v20080813-0800,org.eclipse.team.core:0.0.0,3.4.1.r34x_20080827,org.eclipse.team.ui:0.0.0,3.4.1.r34x_20080827,org.eclipse.text:0.0.0,3.4.0.v20080605-1800,org.eclipse.jface.text:0.0.0,3.4.1.r341_v20080827-1100,org.eclipse.jsch.core:0.0.0,1.1.100.I20080604,org.eclipse.jsch.ui:0.0.0,1.1.100.I20080415,org.eclipse.ui.console:0.0.0,3.3.0.v20080529-1300,org.eclipse.ui.presentations.r21:0.0.0,3.2.100.I20080512-2000,org.eclipse.ui.intro:0.0.0,3.2.201.v20080702_34x,org.eclipse.ui.intro.universal:0.0.0,3.2.200.v20080508,org.eclipse.ui.cheatsheets:0.0.0,3.3.101.v20080702_34x,org.eclipse.ui.browser:0.0.0,3.2.201.v20080708_34x,org.eclipse.ui.navigator:0.0.0,3.3.101.M20080827-0800,org.eclipse.ui.navigator.resources:0.0.0,3.3.101.M20080910-0800,org.eclipse.ui.net:0.0.0,1.0.0.I20080605,org.eclipse.ui.workbench.texteditor:0.0.0,3.4.1.r341_v20080827-1100,org.eclipse.ui.views:0.0.0,3.3.0.I20080509-2000,org.eclipse.ui.editors:0.0.0,3.4.0.v20080603-2000,org.eclipse.ui.externaltools:0.0.0,3.2.0.v20080514-1542,org.eclipse.ui.ide:0.0.0,3.4.1.M20080903-2000,org.eclipse.ui.ide.application:0.0.0,1.0.0.I20080603-2000,org.eclipse.ui.win32:0.0.0,3.2.100.v20080408-0800,org.eclipse.update.core:0.0.0,3.2.201.R34x_v20080714,org.eclipse.update.scheduler:0.0.0,3.2.100.v20080404,org.eclipse.update.ui:0.0.0,3.2.100.v20080318,org.eclipse.ui.workbench.compatibility:0.0.0,3.2.0.I20080509-2000,org.eclipse.core.filesystem.hpux.ia64_32:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.hpux.PA_RISC:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.linux.ppc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.linux.x86:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.filesystem.linux.x86_64:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.solaris.sparc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.macosx:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.qnx.x86:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.win32.x86:0.0.0,1.1.0.v20080604-1400,org.eclipse.core.filesystem.win32.ia64:0.0.0,1.1.0.v20071121,org.eclipse.core.resources.win32.x86:0.0.0,3.4.0.v20071204,org.eclipse.core.resources.win32.ia64:0.0.0,3.4.0.v20071204,org.eclipse.update.core.linux:0.0.0,3.2.0.v20080422,org.eclipse.update.core.win32:0.0.0,3.2.100.v20080107,org.eclipse.ui.views.properties.tabbed:0.0.0,3.4.1.M20080730-0800,org.eclipse.equinox.security:0.0.0,1.0.1.R34x_v20080721,org.eclipse.equinox.security.ui:0.0.0,1.0.0.v20080603-1810,org.eclipse.equinox.security.win32.x86:0.0.0,1.0.0.v20080529-1600,org.eclipse.equinox.security.macosx:0.0.0,1.0.0.v20080602-2000,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.4.1.r341_v20080731-9I96EiDElYevwz-p1bP5z-NlAaP7vtX6Utotqsu/feature.xml"  selfVersion="3.4.1.r341_v20080731-9I96EiDElYevwz-p1bP5z-NlAaP7vtX6Utotqsu" featureIds="org.eclipse.help:0.0.0,1.0.1.R34x_v20080827-7r7xEIxEI6Zu5nEqN7M3UBpglaat,org.eclipse.equinox.p2.user.ui:0.0.0,1.0.1.r34x_v20080721-7d-7OEMsLAz-vTBJ-ZHQaF155CE," pluginIds="com.jcraft.jsch:0.0.0,0.1.37.v200803061811,org.eclipse.compare:0.0.0,3.4.0.I20080604,org.eclipse.core.boot:0.0.0,3.1.100.v20080218,org.eclipse.core.filebuffers:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.filesystem:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.net:0.0.0,1.1.0.I20080604,org.eclipse.core.net.win32.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.net.linux.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.net.freebsd.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.resources:0.0.0,3.4.1.R34x_v20080902,org.eclipse.core.resources.compatibility:0.0.0,3.4.0.v20080604-1400,org.eclipse.osgi.util:0.0.0,3.1.300.v20080303,org.eclipse.debug.core:0.0.0,3.4.0.v20080612,org.eclipse.debug.ui:0.0.0,3.4.1.v20080811_r341,org.eclipse.help.appserver:0.0.0,3.1.300.v20080507,org.eclipse.ltk.core.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.ltk.ui.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.platform:0.0.0,3.3.101.v200809111700,org.eclipse.platform.doc.user:0.0.0,3.4.1.r341_v20080808-0800,org.eclipse.search:0.0.0,3.4.1.r341_v20080813-0800,org.eclipse.team.core:0.0.0,3.4.1.r34x_20080827,org.eclipse.team.ui:0.0.0,3.4.1.r34x_20080827,org.eclipse.text:0.0.0,3.4.0.v20080605-1800,org.eclipse.jface.text:0.0.0,3.4.1.r341_v20080827-1100,org.eclipse.jsch.core:0.0.0,1.1.100.I20080604,org.eclipse.jsch.ui:0.0.0,1.1.100.I20080415,org.eclipse.ui.console:0.0.0,3.3.0.v20080529-1300,org.eclipse.ui.presentations.r21:0.0.0,3.2.100.I20080512-2000,org.eclipse.ui.intro:0.0.0,3.2.201.v20080702_34x,org.eclipse.ui.intro.universal:0.0.0,3.2.200.v20080508,org.eclipse.ui.cheatsheets:0.0.0,3.3.101.v20080702_34x,org.eclipse.ui.browser:0.0.0,3.2.201.v20080708_34x,org.eclipse.ui.navigator:0.0.0,3.3.101.M20080827-0800,org.eclipse.ui.navigator.resources:0.0.0,3.3.101.M20080910-0800,org.eclipse.ui.net:0.0.0,1.0.0.I20080605,org.eclipse.ui.workbench.texteditor:0.0.0,3.4.1.r341_v20080827-1100,org.eclipse.ui.views:0.0.0,3.3.0.I20080509-2000,org.eclipse.ui.editors:0.0.0,3.4.0.v20080603-2000,org.eclipse.ui.externaltools:0.0.0,3.2.0.v20080514-1542,org.eclipse.ui.ide:0.0.0,3.4.1.M20080903-2000,org.eclipse.ui.ide.application:0.0.0,1.0.0.I20080603-2000,org.eclipse.ui.win32:0.0.0,3.2.100.v20080408-0800,org.eclipse.update.core:0.0.0,3.2.201.R34x_v20080714,org.eclipse.update.scheduler:0.0.0,3.2.100.v20080404,org.eclipse.update.ui:0.0.0,3.2.100.v20080318,org.eclipse.ui.workbench.compatibility:0.0.0,3.2.0.I20080509-2000,org.eclipse.core.filesystem.hpux.ia64_32:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.hpux.PA_RISC:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.linux.ppc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.linux.x86:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.filesystem.linux.x86_64:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.freebsd.x86:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.filesystem.freebsd.amd64:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.solaris.sparc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.macosx:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.qnx.x86:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.win32.x86:0.0.0,1.1.0.v20080604-1400,org.eclipse.core.filesystem.win32.ia64:0.0.0,1.1.0.v20071121,org.eclipse.core.resources.win32.x86:0.0.0,3.4.0.v20071204,org.eclipse.core.resources.win32.ia64:0.0.0,3.4.0.v20071204,org.eclipse.update.core.linux:0.0.0,3.2.0.v20080422,org.eclipse.update.core.freebsd:0.0.0,3.2.0.v20080422,org.eclipse.update.core.win32:0.0.0,3.2.100.v20080107,org.eclipse.ui.views.properties.tabbed:0.0.0,3.4.1.M20080730-0800,org.eclipse.equinox.security:0.0.0,1.0.1.R34x_v20080721,org.eclipse.equinox.security.ui:0.0.0,1.0.0.v20080603-1810,org.eclipse.equinox.security.win32.x86:0.0.0,1.0.0.v20080529-1600,org.eclipse.equinox.security.macosx:0.0.0,1.0.0.v20080602-2000,"/>
  		<antcall target="rootFiles">
  			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
  		</antcall>
diff --git a/java/eclipse-devel/files/patch-features-org.eclipse.platform.source-feature.xml b/java/eclipse-devel/files/patch-features-org.eclipse.platform.source-feature.xml
index ebea1623bb6d..d1b022b59f3a 100644
--- a/java/eclipse-devel/files/patch-features-org.eclipse.platform.source-feature.xml
+++ b/java/eclipse-devel/files/patch-features-org.eclipse.platform.source-feature.xml
@@ -1,10 +1,10 @@
---- features/org.eclipse.platform.source/feature.xml.orig	2008-08-02 15:27:51.000000000 -0400
-+++ features/org.eclipse.platform.source/feature.xml	2008-08-02 15:28:00.000000000 -0400
-@@ -68,6 +68,7 @@
+--- features/org.eclipse.platform.source/feature.xml.orig	2008-09-25 19:28:09.000000000 -0400
++++ features/org.eclipse.platform.source/feature.xml	2008-09-25 19:27:48.000000000 -0400
+@@ -67,6 +67,7 @@
+ 	<plugin id="org.eclipse.update.ui.source" version="3.2.100.v20080318"     unpack="false"/>
  	<plugin id="org.eclipse.ui.workbench.compatibility.source" version="3.2.0.I20080509-2000"     unpack="false"/>
  	<plugin id="org.eclipse.update.core.linux.source" version="3.2.0.v20080422" os="linux"    unpack="false"/>
- 	<plugin id="org.eclipse.update.core.win32.source" version="3.2.100.v20080107" os="win32"    unpack="false"/>
 +	<plugin id="org.eclipse.update.core.freebsd.source" version="3.2.0.v20080422" os="freebsd"    unpack="false"/>
- 	<plugin id="org.eclipse.ui.views.properties.tabbed.source" version="3.4.0.I20080527-2000"     unpack="false"/>
- 	<plugin id="org.eclipse.equinox.security.source" version="1.0.0.v20080512-1800"     unpack="false"/>
- 	<plugin id="org.eclipse.equinox.security.ui.source" version="1.0.0.v20080603-1810"     unpack="false"/>
+ 	<plugin id="org.eclipse.update.core.win32.source" version="3.2.100.v20080107" os="win32"    unpack="false"/>
+ 	<plugin id="org.eclipse.ui.views.properties.tabbed.source" version="3.4.1.M20080730-0800"     unpack="false"/>
+ 	<plugin id="org.eclipse.equinox.security.source" version="1.0.1.R34x_v20080721"     unpack="false"/>
diff --git a/java/eclipse-devel/files/patch-features-org.eclipse.rcp-build.xml b/java/eclipse-devel/files/patch-features-org.eclipse.rcp-build.xml
index 1c378a65e6f1..b1602cff84de 100644
--- a/java/eclipse-devel/files/patch-features-org.eclipse.rcp-build.xml
+++ b/java/eclipse-devel/files/patch-features-org.eclipse.rcp-build.xml
@@ -1,5 +1,5 @@
---- features/org.eclipse.rcp/build.xml.orig	2008-08-02 15:29:28.000000000 -0400
-+++ features/org.eclipse.rcp/build.xml	2008-08-02 15:33:55.000000000 -0400
+--- features/org.eclipse.rcp/build.xml.orig	2008-09-26 19:38:22.000000000 -0400
++++ features/org.eclipse.rcp/build.xml	2008-09-26 19:38:10.000000000 -0400
 @@ -37,6 +37,11 @@
  			<property name="os" value="linux"/>
  			<property name="ws" value="gtk"/>
@@ -50,8 +50,8 @@
  				<include name="eclipse_update_120.jpg"/>
  			</fileset>
  		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.4.0.v20080324a-989JERhEk-jWnd5IY8K5tjxB/feature.xml"  selfVersion="3.4.0.v20080324a-989JERhEk-jWnd5IY8K5tjxB" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.8.1.v20080530,org.eclipse.core.commands:0.0.0,3.4.0.I20080509-2000,org.eclipse.core.databinding:0.0.0,1.1.0.I20080527-2000,org.eclipse.core.databinding.beans:0.0.0,1.1.0.I20080508-2000a,org.eclipse.core.jobs:0.0.0,3.4.0.v20080512,org.eclipse.core.expressions:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.runtime:0.0.0,3.4.0.v20080512,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.4.0.v20080605-1900,org.eclipse.help:0.0.0,3.3.100.v20080610,org.eclipse.swt:0.0.0,3.4.0.v3448f,org.eclipse.jface:0.0.0,3.4.0.I20080606-1300,org.eclipse.jface.databinding:0.0.0,1.2.0.I20080515-2000a,org.eclipse.ui:0.0.0,3.4.0.I20080610-1200,org.eclipse.ui.workbench:0.0.0,3.4.0.I20080606-1300,org.eclipse.ui.carbon:0.0.0,4.0.0.I20080610-1200,org.eclipse.update.configurator:0.0.0,3.2.200.v20080417,org.eclipse.equinox.simpleconfigurator:0.0.0,1.0.0.v20080604,org.eclipse.swt.win32.win32.x86:0.0.0,3.4.0.v3448f,org.eclipse.swt.win32.win32.x86_64:0.0.0,3.4.0.v3448f,org.eclipse.swt.wpf.win32.x86:0.0.0,3.4.0.v3448f,org.eclipse.swt.win32.win32.ia64:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.linux.x86:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.linux.s390:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.4.0.v3448f,org.eclipse.swt.carbon.macosx:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.aix.ppc:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.linux.x86:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.4.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.4.0.v3448f,org.eclipse.swt.photon.qnx.x86:0.0.0,3.4.0.v3448f,org.eclipse.rcp:0.0.0,3.4.0.v20080507,org.eclipse.core.contenttype:0.0.0,3.3.0.v20080604-1400,org.eclipse.equinox.app:0.0.0,1.1.0.v20080421-2006,org.eclipse.equinox.common:0.0.0,3.4.0.v20080421-2006,org.eclipse.equinox.preferences:0.0.0,3.2.200.v20080421-2006,org.eclipse.equinox.registry:0.0.0,3.4.0.v20080516-0950,org.eclipse.equinox.launcher:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.motif.hpux.ia64_32:0.0.0,1.0.0.v20080606,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.100.v20080303,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.win32.win32.x86_64:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.win32.win32.ia64:0.0.0,1.0.100.v20080509-1800,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.4.0.v20080324a-989JERhEk-jWnd5IY8K5tjxB/feature.xml"  selfVersion="3.4.0.v20080324a-989JERhEk-jWnd5IY8K5tjxB" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.8.1.v20080530,org.eclipse.core.commands:0.0.0,3.4.0.I20080509-2000,org.eclipse.core.databinding:0.0.0,1.1.0.I20080527-2000,org.eclipse.core.databinding.beans:0.0.0,1.1.0.I20080508-2000a,org.eclipse.core.jobs:0.0.0,3.4.0.v20080512,org.eclipse.core.expressions:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.runtime:0.0.0,3.4.0.v20080512,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.4.0.v20080605-1900,org.eclipse.help:0.0.0,3.3.100.v20080610,org.eclipse.swt:0.0.0,3.4.0.v3448f,org.eclipse.jface:0.0.0,3.4.0.I20080606-1300,org.eclipse.jface.databinding:0.0.0,1.2.0.I20080515-2000a,org.eclipse.ui:0.0.0,3.4.0.I20080610-1200,org.eclipse.ui.workbench:0.0.0,3.4.0.I20080606-1300,org.eclipse.ui.carbon:0.0.0,4.0.0.I20080610-1200,org.eclipse.update.configurator:0.0.0,3.2.200.v20080417,org.eclipse.equinox.simpleconfigurator:0.0.0,1.0.0.v20080604,org.eclipse.swt.win32.win32.x86:0.0.0,3.4.0.v3448f,org.eclipse.swt.win32.win32.x86_64:0.0.0,3.4.0.v3448f,org.eclipse.swt.wpf.win32.x86:0.0.0,3.4.0.v3448f,org.eclipse.swt.win32.win32.ia64:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.linux.x86:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.linux.s390:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.freebsd.amd64:0.0.0,3.4.0.v3448f,org.eclipse.swt.carbon.macosx:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.aix.ppc:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.linux.x86:0.0.0,3.4.0.v3448f,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.4.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.4.0.v3448f,org.eclipse.swt.photon.qnx.x86:0.0.0,3.4.0.v3448f,org.eclipse.rcp:0.0.0,3.4.0.v20080507,org.eclipse.core.contenttype:0.0.0,3.3.0.v20080604-1400,org.eclipse.equinox.app:0.0.0,1.1.0.v20080421-2006,org.eclipse.equinox.common:0.0.0,3.4.0.v20080421-2006,org.eclipse.equinox.preferences:0.0.0,3.2.200.v20080421-2006,org.eclipse.equinox.registry:0.0.0,3.4.0.v20080516-0950,org.eclipse.equinox.launcher:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.gtk.freebsd.x86:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.gtk.freebsd.amd64:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.100.v20080606,org.eclipse.equinox.launcher.motif.hpux.ia64_32:0.0.0,1.0.0.v20080606,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.100.v20080303,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.win32.win32.x86_64:0.0.0,1.0.100.v20080509-1800,org.eclipse.equinox.launcher.win32.win32.ia64:0.0.0,1.0.100.v20080509-1800,"/>
+-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.4.100.r341_v20080814-989JESIEdAciFYfkZZsBfSwQ2341/feature.xml"  selfVersion="3.4.100.r341_v20080814-989JESIEdAciFYfkZZsBfSwQ2341" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.8.1.v20080530,org.eclipse.core.commands:0.0.0,3.4.0.I20080509-2000,org.eclipse.core.databinding:0.0.0,1.1.1.M20080827-0800b,org.eclipse.core.databinding.beans:0.0.0,1.1.1.M20080827-0800a,org.eclipse.core.jobs:0.0.0,3.4.0.v20080512,org.eclipse.core.expressions:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.runtime:0.0.0,3.4.0.v20080512,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.4.2.R34x_v20080826-1230,org.eclipse.help:0.0.0,3.3.101.v20080702_34x,org.eclipse.swt:0.0.0,3.4.1.v3449c,org.eclipse.jface:0.0.0,3.4.1.M20080827-2000,org.eclipse.jface.databinding:0.0.0,1.2.1.M20080827-0800a,org.eclipse.ui:0.0.0,3.4.1.M20080910-0800,org.eclipse.ui.workbench:0.0.0,3.4.1.M20080827-0800a,org.eclipse.ui.carbon:0.0.0,4.0.0.I20080610-1200,org.eclipse.update.configurator:0.0.0,3.2.201.R34x_v20080819,org.eclipse.equinox.simpleconfigurator:0.0.0,1.0.0.v20080604,org.eclipse.swt.win32.win32.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.win32.win32.x86_64:0.0.0,3.4.1.v3449c,org.eclipse.swt.wpf.win32.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.win32.win32.ia64:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.s390:0.0.0,3.4.0.R3_4,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.4.0.R3_4,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.4.1.v3449c,org.eclipse.swt.carbon.macosx:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.aix.ppc:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.linux.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.4.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.4.1.v3449c,org.eclipse.swt.photon.qnx.x86:0.0.0,3.4.1.v3449c,org.eclipse.rcp:0.0.0,3.4.0.v20080507,org.eclipse.core.contenttype:0.0.0,3.3.0.v20080604-1400,org.eclipse.equinox.app:0.0.0,1.1.0.v20080421-2006,org.eclipse.equinox.common:0.0.0,3.4.0.v20080421-2006,org.eclipse.equinox.preferences:0.0.0,3.2.201.R34x_v20080709,org.eclipse.equinox.registry:0.0.0,3.4.0.v20080516-0950,org.eclipse.equinox.launcher:0.0.0,1.0.101.R34x_v20080819,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.motif.hpux.ia64_32:0.0.0,1.0.1.R34x_v20080731,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.100.v20080303,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.x86_64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.ia64:0.0.0,1.0.101.R34x_v20080731,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.4.100.r341_v20080814-989JESIEdAciFYfkZZsBfSwQ2341/feature.xml"  selfVersion="3.4.100.r341_v20080814-989JESIEdAciFYfkZZsBfSwQ2341" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.8.1.v20080530,org.eclipse.core.commands:0.0.0,3.4.0.I20080509-2000,org.eclipse.core.databinding:0.0.0,1.1.1.M20080827-0800b,org.eclipse.core.databinding.beans:0.0.0,1.1.1.M20080827-0800a,org.eclipse.core.jobs:0.0.0,3.4.0.v20080512,org.eclipse.core.expressions:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.runtime:0.0.0,3.4.0.v20080512,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.4.2.R34x_v20080826-1230,org.eclipse.help:0.0.0,3.3.101.v20080702_34x,org.eclipse.swt:0.0.0,3.4.1.v3449c,org.eclipse.jface:0.0.0,3.4.1.M20080827-2000,org.eclipse.jface.databinding:0.0.0,1.2.1.M20080827-0800a,org.eclipse.ui:0.0.0,3.4.1.M20080910-0800,org.eclipse.ui.workbench:0.0.0,3.4.1.M20080827-0800a,org.eclipse.ui.carbon:0.0.0,4.0.0.I20080610-1200,org.eclipse.update.configurator:0.0.0,3.2.201.R34x_v20080819,org.eclipse.equinox.simpleconfigurator:0.0.0,1.0.0.v20080604,org.eclipse.swt.win32.win32.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.win32.win32.x86_64:0.0.0,3.4.1.v3449c,org.eclipse.swt.wpf.win32.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.win32.win32.ia64:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.s390:0.0.0,3.4.0.R3_4,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.4.0.R3_4,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.freebsd.amd64:0.0.0,3.4.1.v3449c,org.eclipse.swt.carbon.macosx:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.aix.ppc:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.linux.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.4.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.4.1.v3449c,org.eclipse.swt.photon.qnx.x86:0.0.0,3.4.1.v3449c,org.eclipse.rcp:0.0.0,3.4.0.v20080507,org.eclipse.core.contenttype:0.0.0,3.3.0.v20080604-1400,org.eclipse.equinox.app:0.0.0,1.1.0.v20080421-2006,org.eclipse.equinox.common:0.0.0,3.4.0.v20080421-2006,org.eclipse.equinox.preferences:0.0.0,3.2.201.R34x_v20080709,org.eclipse.equinox.registry:0.0.0,3.4.0.v20080516-0950,org.eclipse.equinox.launcher:0.0.0,1.0.101.R34x_v20080819,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.freebsd.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.freebsd.amd64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.motif.hpux.ia64_32:0.0.0,1.0.1.R34x_v20080731,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.100.v20080303,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.x86_64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.ia64:0.0.0,1.0.101.R34x_v20080731,"/>
  		<antcall target="rootFiles">
  			<param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/>
  		</antcall>
diff --git a/java/eclipse-devel/files/patch-features-org.eclipse.rcp-feature.xml b/java/eclipse-devel/files/patch-features-org.eclipse.rcp-feature.xml
index 0bcdfab72f74..b91aeb55ff02 100644
--- a/java/eclipse-devel/files/patch-features-org.eclipse.rcp-feature.xml
+++ b/java/eclipse-devel/files/patch-features-org.eclipse.rcp-feature.xml
@@ -1,12 +1,9 @@
---- features/org.eclipse.rcp/feature.xml.orig	2008-08-02 15:35:43.000000000 -0400
-+++ features/org.eclipse.rcp/feature.xml	2008-08-02 15:36:20.000000000 -0400
-@@ -205,7 +205,18 @@
-          version="0.0.0"
-          fragment="true"
+--- features/org.eclipse.rcp/feature.xml.orig	2008-09-26 19:47:12.000000000 -0400
++++ features/org.eclipse.rcp/feature.xml	2008-09-26 19:46:59.000000000 -0400
+@@ -207,6 +207,17 @@
           unpack="false"/>
--         
-+
-+  <plugin
+ 
+    <plugin
 +         id="org.eclipse.swt.gtk.freebsd.x86"
 +         os="freebsd"
 +         ws="gtk"
@@ -16,10 +13,11 @@
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+ 
-   <plugin
++
++   <plugin
           id="org.eclipse.swt.gtk.linux.s390"
           os="linux"
+          ws="gtk"
 @@ -273,6 +284,17 @@
           unpack="false"/>
  
@@ -38,12 +36,10 @@
           id="org.eclipse.swt.carbon.macosx"
           os="macosx"
           ws="carbon"
-@@ -448,6 +470,17 @@
-          version="0.0.0"
-          fragment="true"
-          unpack="true"/>
-+
-+        <plugin
+@@ -448,6 +470,16 @@
+          fragment="true"/>
+ 
+    <plugin
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.x86"
 +         os="freebsd"
 +         ws="gtk"
@@ -51,17 +47,16 @@
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
-+         fragment="true"
-+         unpack="true"/>
-          
-     <plugin
-          id="org.eclipse.equinox.launcher.gtk.linux.s390"
-@@ -492,6 +525,17 @@
-          version="0.0.0"
-          fragment="true"
-          unpack="true"/>
++         fragment="true"/>
 +
-+        <plugin
++   <plugin
+          id="org.eclipse.equinox.launcher.gtk.linux.s390"
+          os="linux"
+          ws="gtk"
+@@ -488,6 +520,16 @@
+          fragment="true"/>
+ 
+    <plugin
 +         id="org.eclipse.equinox.launcher.gtk.freebsd.amd64"
 +         os="freebsd"
 +         ws="gtk"
@@ -69,8 +64,9 @@
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
-+         fragment="true"
-+         unpack="true"/>
-          
- 	<plugin
++         fragment="true"/>
++
++   <plugin
           id="org.eclipse.equinox.launcher.motif.aix.ppc"
+          os="aix"
+          ws="motif"
diff --git a/java/eclipse-devel/files/patch-features-org.eclipse.rcp.source-feature.xml b/java/eclipse-devel/files/patch-features-org.eclipse.rcp.source-feature.xml
index ea4925ff3262..21762a8d7c98 100644
--- a/java/eclipse-devel/files/patch-features-org.eclipse.rcp.source-feature.xml
+++ b/java/eclipse-devel/files/patch-features-org.eclipse.rcp.source-feature.xml
@@ -1,11 +1,11 @@
---- features/org.eclipse.rcp.source/feature.xml.orig	2008-08-02 15:39:10.000000000 -0400
-+++ features/org.eclipse.rcp.source/feature.xml	2008-08-02 15:39:29.000000000 -0400
-@@ -39,6 +39,8 @@
+--- features/org.eclipse.rcp.source/feature.xml.orig	2008-09-26 19:53:35.000000000 -0400
++++ features/org.eclipse.rcp.source/feature.xml	2008-09-26 19:53:21.000000000 -0400
+@@ -35,6 +35,8 @@
+ 	<plugin id="org.eclipse.swt.gtk.linux.x86.source" version="3.4.1.v3449c" os="linux" arch="x86" ws="gtk"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.gtk.linux.s390.source" version="3.4.0.R3_4" os="linux" arch="s390" ws="gtk"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.gtk.linux.s390x.source" version="3.4.0.R3_4" os="linux" arch="s390x" ws="gtk"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.freebsd.x86.source" version="3.4.1.v3449c" os="freebsd" arch="x86" ws="gtk"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.freebsd.amd64.source" version="3.4.1.v3449c" os="freebsd" arch="amd64" ws="gtk"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.gtk.solaris.sparc.source" version="3.4.1.v3449c" os="solaris" arch="sparc" ws="gtk"  unpack="false"/>
  	<plugin id="org.eclipse.swt.gtk.solaris.x86.source" version="3.4.0.HEAD" os="solaris" arch="x86" ws="gtk"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.gtk.linux.ppc.source" version="3.4.0.v3448f" os="linux" arch="ppc" ws="gtk"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.gtk.linux.x86_64.source" version="3.4.0.v3448f" os="linux" arch="x86_64" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.freebsd.x86.source" version="3.4.0.v3448f" os="freebsd" arch="x86" ws="gtk" unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.freebsd.amd64.source" version="3.4.0.v3448f" os="freebsd" arch="amd64" ws="gtk" unpack="false"/>
- 	<plugin id="org.eclipse.swt.carbon.macosx.source" version="3.4.0.v3448f" os="macosx"  ws="carbon"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.motif.aix.ppc.source" version="3.4.0.v3448f" os="aix" arch="ppc" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.motif.hpux.PA_RISC.source" version="3.4.0.v3448f" os="hpux" arch="PA_RISC" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.gtk.linux.ppc.source" version="3.4.1.v3449c" os="linux" arch="ppc" ws="gtk"  unpack="false"/>
diff --git a/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-APIToolsVerivicationTask.java b/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-APIToolsVerivicationTask.java
deleted file mode 100644
index f4233fce2136..000000000000
--- a/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-APIToolsVerivicationTask.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java.orig	2008-08-02 23:44:38.060798145 -0400
-+++ plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java	2008-08-02 23:45:19.561053624 -0400
-@@ -656,7 +656,7 @@
- 			public int compare(Object o1, Object o2) {
- 				Map.Entry entry1 = (Map.Entry) o1;
- 				Map.Entry entry2 = (Map.Entry) o2;
--				return ((String) entry1.getKey()).compareTo(entry2.getKey());
-+				return ((String) entry1.getKey()).compareTo((String) entry2.getKey());
- 			}
- 		});
- 		Summary[] summaries = new Summary[size];
diff --git a/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-DeltaReportConversionTask.java b/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-DeltaReportConversionTask.java
deleted file mode 100644
index 55c98f627849..000000000000
--- a/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.api.tools-src_ant-org-eclipse-pde-api-tools-internal-tasks-DeltaReportConversionTask.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java.orig	2008-08-02 23:45:53.571262184 -0400
-+++ plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java	2008-08-02 23:46:12.521379029 -0400
-@@ -288,7 +288,7 @@
- 			public int compare(Object o1, Object o2) {
- 				Map.Entry entry1 = (Map.Entry) o1;
- 				Map.Entry entry2 = (Map.Entry) o2;
--				return ((String) entry1.getKey()).compareTo(entry2.getKey());
-+				return ((String) entry1.getKey()).compareTo((String) entry2.getKey());
- 			}
- 		});
- 		for (Iterator iterator = allEntries.iterator(); iterator.hasNext(); ) {
diff --git a/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.api.tools.ui-src-org-eclipse-pde-api-tools-ui-internal-wizards-ApiProfileWizardPage.java b/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.api.tools.ui-src-org-eclipse-pde-api-tools-ui-internal-wizards-ApiProfileWizardPage.java
deleted file mode 100644
index 2f1e34bb33bf..000000000000
--- a/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.api.tools.ui-src-org-eclipse-pde-api-tools-ui-internal-wizards-ApiProfileWizardPage.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java.orig	2008-08-02 10:08:15.000000000 -0400
-+++ plugins/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java	2008-08-02 10:08:23.000000000 -0400
-@@ -309,7 +309,7 @@
- 		}
- 		Collections.sort(items, new Comparator() {
- 			public int compare(Object o1, Object o2) {
--				return ((String)o1).compareTo(o2);
-+				return ((String)o1).compareTo((String)o2);
- 			}
- 		});		
- 				
diff --git a/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties b/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties
index 24ec0a26f227..bd44b42486e3 100644
--- a/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties
+++ b/java/eclipse-devel/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties
@@ -1,6 +1,6 @@
---- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties.orig	2008-08-02 21:44:34.122219356 -0400
-+++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties	2008-08-02 21:45:10.322441730 -0400
-@@ -572,6 +572,7 @@
+--- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties.orig	2008-09-25 20:35:26.000000000 -0400
++++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties	2008-09-25 20:32:37.000000000 -0400
+@@ -574,6 +574,7 @@
  LauncherSection_48Low=48x48 (8-bit):
  LauncherSection_48High=48x48 (32-bit):
  LauncherSection_linuxLabel=A single XPM icon is required:
@@ -8,10 +8,3 @@
  LauncherSection_large=Large:
  LauncherSection_medium=Medium:
  LauncherSection_small=Small:
-@@ -2516,4 +2517,4 @@
- 
- PDECompilersConfigurationBlock_error = Error
- PDECompilersConfigurationBlock_warning = Warning
--PDECompilersConfigurationBlock_ignore = Ignore
-\ No newline at end of file
-+PDECompilersConfigurationBlock_ignore = Ignore
diff --git a/java/eclipse-devel/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF b/java/eclipse-devel/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF
index 7175726bd2b0..d7c5f8c8909e 100644
--- a/java/eclipse-devel/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF
+++ b/java/eclipse-devel/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF.orig	2008-08-09 16:48:52.839706184 -0400
-+++ plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF	2008-08-09 16:49:24.369835991 -0400
+--- plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF.orig	2008-09-25 20:44:00.000000000 -0400
++++ plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF	2008-09-25 20:46:29.000000000 -0400
 @@ -6,7 +6,6 @@
  Bundle-ManifestVersion: 2

  Bundle-Localization: fragment

@@ -7,5 +7,5 @@
 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x8

 - 6_64))

 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))

- Bundle-Version: 3.4.0.v3448f

+ Bundle-Version: 3.4.1.v3449c

  

diff --git a/java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh b/java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh
index ee57619488c9..88b57e05c52a 100644
--- a/java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh
+++ b/java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh
@@ -1,5 +1,5 @@
---- gtk/library/build.sh.orig	2008-08-02 20:48:26.157201172 -0400
-+++ gtk/library/build.sh	2008-08-02 22:49:45.246241822 -0400
+--- gtk/library/build.sh.orig	2008-09-11 21:18:02.725614374 -0400
++++ gtk/library/build.sh	2008-09-11 21:18:07.455632295 -0400
 @@ -50,6 +50,10 @@
  	fi
  fi
@@ -20,7 +20,7 @@
  	SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
  	export SWT_PTR_CFLAGS
  	if [ -d /lib64 ]; then
-@@ -74,23 +78,28 @@
+@@ -74,47 +78,44 @@
  	fi
  fi
  
@@ -30,43 +30,80 @@
 -else
 -	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
 -	echo "    *** SWT Program support for GNOME will not be compiled."
+-fi
+-
+-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
+-else
+-	echo "Cairo not found:"
+-	echo "    *** Advanced graphics support using cairo will not be compiled."
 +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
++		_MAKE_GNOME=make_gnome
 +	else
 +		echo "libgnome-2.0 and libgnomeui-2.0 not found:"
 +		echo "    *** SWT Program support for GNOME will not be compiled."
 +	fi
  fi
  
--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
--else
--	echo "Cairo not found:"
--	echo "    *** Advanced graphics support using cairo will not be compiled."
+-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`
+-		export MOZILLA_INCLUDES
+-		export MOZILLA_LIBS
+-		MAKE_MOZILLA=make_mozilla
+-	elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
+-		MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
+-		MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
+-		export MOZILLA_INCLUDES
+-		export MOZILLA_LIBS
+-		MAKE_MOZILLA=make_mozilla
+-	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
+-		MOZILLA_INCLUDES=`pkg-config --cflags libxul`
+-		MOZILLA_LIBS=`pkg-config --libs libxul`
+-		export MOZILLA_INCLUDES
+-		export MOZILLA_LIBS
+-		MAKE_MOZILLA=make_mozilla
 +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
-+	else
++		_MAKE_CAIRO=make_cairo
+ 	else
+-		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
+-		echo "    *** Mozilla embedding support will not be compiled."
 +		echo "Cairo not found:"
 +		echo "    *** Advanced graphics support using cairo will not be compiled."
-+	fi
+ 	fi
  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`
-@@ -113,6 +122,7 @@
- 		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
- 		echo "    *** Mozilla embedding support will not be compiled."
- 	fi
++	case ${BROWSER} in
++		"firefox" | "mozilla" | "seamonkey" | "xulrunner")
++			MOZILLA_INCLUDES=`pkg-config --cflags ${BROWSER}-xpcom`
++			MOZILLA_LIBS=`pkg-config --libs ${BROWSER}-xpcom`
++			export MOZILLA_INCLUDES
++			export MOZILLA_LIBS
++			_MAKE_MOZILLA=make_mozilla
++			;;
++		*)
++			echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
++			echo "    *** Mozilla embedding support will not be compiled."
++			;;
++	esac
 +    fi
- fi
- 
++fi
++
  # Find AWT if available
+ if [ -z "${AWT_LIB_PATH}" ]; then
+ 	if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then
+@@ -142,5 +143,5 @@
+ if [ "x${1}" = "xclean" ]; then
+ 	make -f $MAKEFILE clean
+ else
+-	make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
++	make -f $MAKEFILE all $_MAKE_GNOME $_MAKE_CAIRO $MAKE_AWT $_MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
+ fi