From 8df24cfa4361c7f1062844dc51f9884d12fbc6ee Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Sun, 6 May 2012 03:27:22 +0000
Subject: . Update to 3.7.1.

---
 .../files/eclipse-build-config-upstream.patch      |   2 +
 java/eclipse/files/eclipse-build-upstream.patch    |  79 ++++-
 java/eclipse/files/freebsd-support.patch           | 393 +++++++++------------
 java/eclipse/files/patch-dependencyManifests       |  90 +++++
 java/eclipse/files/patch-eclipse-build             | 359 ++++++++++++-------
 java/eclipse/files/patch-generatedScripts          |  80 +++++
 6 files changed, 625 insertions(+), 378 deletions(-)
 create mode 100644 java/eclipse/files/patch-dependencyManifests
 create mode 100644 java/eclipse/files/patch-generatedScripts

(limited to 'java/eclipse/files')

diff --git a/java/eclipse/files/eclipse-build-config-upstream.patch b/java/eclipse/files/eclipse-build-config-upstream.patch
index 1395c355997f..711d267b7dd0 100644
--- a/java/eclipse/files/eclipse-build-config-upstream.patch
+++ b/java/eclipse/files/eclipse-build-config-upstream.patch
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 ### Eclipse Workspace Patch 1.0
 #P eclipse-build-config
 Index: build.properties.in
diff --git a/java/eclipse/files/eclipse-build-upstream.patch b/java/eclipse/files/eclipse-build-upstream.patch
index d393f7447deb..d4c5991762b7 100644
--- a/java/eclipse/files/eclipse-build-upstream.patch
+++ b/java/eclipse/files/eclipse-build-upstream.patch
@@ -17,16 +17,18 @@ Index: build.xml
 ===================================================================
 --- build.xml	(revision 23733)
 +++ build.xml	(working copy)
-@@ -130,6 +130,7 @@
+@@ -131,7 +131,8 @@
  		<ant inheritall="false" antfile="pdebuild.xml">
  			<property name="buildId" value="${buildId}" />
  			<property name="buildArch" value="${buildArch}" />
+-			<property name="buildDirectory" value="../../" />
 +			<property name="buildOs" value="${buildOs}" />
++			<property name="buildDirectory" value="../../" />
  		</ant>
  	</target>
  
-@@ -315,7 +316,10 @@
- 		<!-- end back-ported patches -->
+@@ -312,7 +313,10 @@
+ 		<!-- end eclipse-build-only patches -->
  		<!-- Only build for one target (bug #293952) -->
  		<copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
 -		<replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
@@ -34,9 +36,9 @@ Index: build.xml
 +			<replacefilter token="@build_arch@" value="${buildArch}" />
 +			<replacefilter token="@build_os@" value="${buildOs}" />
 +		</replace>
- 		<patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
+ 		<patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" />
+ 		<patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" />
  		<echo file="patch-stamp" />
- 	</target>
 @@ -399,6 +403,7 @@
  		<!--
  		<ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
@@ -117,6 +119,15 @@ Index: build.xml
  			<param name="p2.director.install.path" value="${provisionDir}" />
  			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
 -			<param name="p2.os" value="linux" />
++			<param name="p2.os" value="${buildOs}" />
+ 			<param name="p2.ws" value="gtk" />
+ 			<param name="p2.arch" value="${buildArch}" />
+ 			<param name="p2.repo" value="${reposource}" />
+@@ -750,7 +753,7 @@
+ 			<param name="p2.director.profile" value="${profileName}" />
+ 			<param name="p2.director.install.path" value="${provisionDir}" />
+ 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
+-			<param name="p2.os" value="linux" />
 +			<param name="p2.os" value="${buildOs}" />
  			<param name="p2.ws" value="gtk" />
  			<param name="p2.arch" value="${buildArch}" />
@@ -139,20 +150,29 @@ Index: build.xml
  		<property name="swtjarpath" refid="swtjar" />
  		<symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" />
  		<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" />
+@@ -1061,7 +1074,7 @@
+                         <param name="p2.director.profile" value="PlatformProfile" />
+                         <param name="p2.director.install.path" value="${installationDir}" />
+                         <param name="p2.director.extraArgs" value="-purgeHistory" />
+-			<param name="p2.os" value="linux" />
++			<param name="p2.os" value="${buildOs}" />
+                         <param name="p2.ws" value="gtk" />
+                         <param name="p2.arch" value="${buildArch}" />
+                         <param name="p2.repo" value="${installationDir}" />
 Index: pdebuild.xml
 ===================================================================
 --- pdebuild.xml	(revision 23733)
 +++ pdebuild.xml	(working copy)
-@@ -78,7 +78,7 @@
- 		<file name="org.eclipse.help.base" />
- 	</filelist>
- 	<filelist id="depsDirs2" dir="${sdkSource}/plugins">
--		<file name="org.eclipse.swt.gtk.linux.${buildArch}" />
-+		<file name="org.eclipse.swt.gtk.${buildOs}.${buildArch}" />
- 		<file name="org.eclipse.core.filesystem" />
- 		<file name="org.eclipse.core.resources" />
- 		<file name="org.eclipse.core.commands" />
-@@ -164,12 +164,14 @@
+@@ -88,7 +88,7 @@
+ 	<filelist id="helpDirs" dir="${sdkSource}/plugins" files="${helpDirsProperty}"/>
+ 	
+ 	<property name="depsDirs2Property"
+-		value="org.eclipse.swt.gtk.linux.${buildArch}
++		value="org.eclipse.swt.gtk.${buildOs}.${buildArch}
+ 		       org.eclipse.core.filesystem
+ 		       org.eclipse.core.resources
+ 		       org.eclipse.core.commands
+@@ -214,12 +214,14 @@
  		<subant>
  			<property name="buildId" value="${buildId}" />
  			<property name="buildArch" value="${buildArch}" />
@@ -167,14 +187,27 @@ Index: pdebuild.xml
  			<property file="pdebuild.properties" />
  			<filelist refid="helpDirs" />
  		</subant>
-@@ -195,6 +197,7 @@
+@@ -245,6 +247,7 @@
  			<arg line="-application org.eclipse.ant.core.antRunner " />
  			<arg line="-buildfile ../pdebuild.xml generateScripts2" />
  			<arg line="-DbuildArch=${buildArch} " />
 +			<arg line="-DbuildOs=${buildOs} " />
  			<arg line="-DbuildId=${buildId} " />
- 			<arg line="-debug -consolelog " />
+ 			<arg line="-debug -consolelog" />
  		</java>
+@@ -287,10 +288,10 @@
+ 	<target name="removeGeneratedBuildXMLs" depends="zipPlugins2">
+ 		<fileset id="buildXMLsToKeep" dir="${sdkSource}/plugins"
+ 			excludes="**/org.eclipse.swt.gtk.*/*,
+-			**/org.eclipse.update.core.linux/**/*,
++			**/org.eclipse.update.core.${buildOs}/**/*,
+ 			**/org.eclipse.pde.build/scripts/*,
+ 			**/org.eclipse.jdt.core/scripts/*,
+-			**/org.eclipse.update.core.linux/src/*,
++			**/org.eclipse.update.core.${buildOs}/src/*,
+ 			**/org.eclipse.jdt.doc.isv/*,
+ 			**/org.eclipse.swt/*,
+ 			**/org.eclipse.jdt.doc.user/*"
 Index: publishProduct.xml
 ===================================================================
 --- publishProduct.xml	(revision 23733)
@@ -310,3 +343,15 @@ Index: runtests.sh
           h)
               usage
               exit 1
+--- task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java~	Thu Feb 25 21:14:10 2010
++++ task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java	Fri Nov  5 11:39:46 2010
+@@ -36,8 +36,8 @@
+     	for (Iterator<Object> jarIter = jarLocations.iterator(); jarIter.hasNext();) {
+ 			
+     		String origLocation = (String) jarIter.next();
+ 			
+-			String systemLocations = (String) dependencies.get(origLocation);
++			String systemLocations = getProject().replaceProperties((String) dependencies.get(origLocation));
+ 			String[] systemLocationList = systemLocations.split(":");
+ 			String attemptedLocations = "";
+ 			for (int j = 0; j < systemLocationList.length; j++) {
diff --git a/java/eclipse/files/freebsd-support.patch b/java/eclipse/files/freebsd-support.patch
index 324f55064e46..90d530fd4805 100644
--- a/java/eclipse/files/freebsd-support.patch
+++ b/java/eclipse/files/freebsd-support.patch
@@ -10,12 +10,12 @@ $FreeBSD$
  		case $MODEL in
  			"x86_64")
  				defaultOSArch="x86_64"
-@@ -98,6 +98,7 @@
+@@ -112,6 +113,7 @@
  	"SunOS")
  		makefile="make_solaris.mak"
  		defaultOS="solaris"
 +		MAKE=make
- 		[ -d /usr/jdk/jdk1.5.0_01 ] && javaHome="/usr/jdk/jdk1.5.0_01"
+ 		[ -d /usr/jdk/jdk1.5.0_01 ] && defaultJavaHome="/usr/jdk/jdk1.5.0_01"
  		OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
  		#PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
 @@ -119,6 +121,24 @@
@@ -276,7 +276,7 @@ $FreeBSD$
           id="org.eclipse.swt.gtk.solaris.sparc"
           os="solaris"
           ws="gtk"
-@@ -707,6 +729,26 @@
+@@ -556,6 +578,26 @@
           fragment="true"/>
  
     <plugin
@@ -300,9 +300,9 @@ $FreeBSD$
 +         fragment="true"/>
 +
 +   <plugin
-          id="org.eclipse.equinox.launcher.motif.aix.ppc"
+          id="org.eclipse.equinox.launcher.gtk.aix.ppc"
           os="aix"
-          ws="motif"
+          ws="gtk"
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	1969-12-31 19:00:00.000000000 -0500
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile	2009-12-23 15:14:12.391816744 -0500
 @@ -0,0 +1,36 @@
@@ -1019,8 +1019,8 @@ $FreeBSD$
 +Bundle-Name: %pluginName
 +Bundle-Vendor: %providerName
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true
-+Bundle-Version: 1.0.200.qualifier
-+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.2.0)"
++Bundle-Version: 1.1.100.qualifier
++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.3.0)"
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
 +Bundle-Localization: launcher.gtk.freebsd.x86_64
 +Eclipse-BundleShape: dir
@@ -1269,8 +1269,8 @@ $FreeBSD$
 +Bundle-Name: %pluginName
 +Bundle-Vendor: %providerName
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true
-+Bundle-Version: 1.0.200.qualifier
-+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.2.0)"
++Bundle-Version: 1.1.100.qualifier
++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.3.0)"
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
 +Bundle-Localization: launcher.gtk.freebsd.x86
 +Eclipse-BundleShape: dir
@@ -1483,8 +1483,8 @@ $FreeBSD$
 +Bundle-Name: %pluginName
 +Bundle-Vendor: %providerName
 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true
-+Bundle-Version: 1.0.200.qualifier
-+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.2.0)"
++Bundle-Version: 1.1.100.qualifier
++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.3.0)"
 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
 +Bundle-Localization: launcher.gtk.freebsd.x86_64
 +Eclipse-BundleShape: dir
@@ -1657,177 +1657,34 @@ $FreeBSD$
 +###############################################################################
 +pluginName = Equinox Launcher FreeBSD X86_64 Fragment
 +providerName = Eclipse.org - Equinox
---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/ProductFile.java	2009-03-09 18:37:22.000000000 -0400
-+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/ProductFile.java	2009-12-23 15:14:12.431975410 -0500
-@@ -27,11 +27,13 @@
- 	private final static SAXParserFactory parserFactory = SAXParserFactory.newInstance();
- 
- 	private static final String PROGRAM_ARGS = "programArgs"; //$NON-NLS-1$
-+	private static final String PROGRAM_ARGS_FREEBSD = "programArgsFre"; //$NON-NLS-1$
- 	private static final String PROGRAM_ARGS_LINUX = "programArgsLin"; //$NON-NLS-1$
- 	private static final String PROGRAM_ARGS_MAC = "programArgsMac"; //$NON-NLS-1$
- 	private static final String PROGRAM_ARGS_SOLARIS = "programArgsSol"; //$NON-NLS-1$
- 	private static final String PROGRAM_ARGS_WIN = "programArgsWin"; //$NON-NLS-1$
- 	private static final String VM_ARGS = "vmArgs"; //$NON-NLS-1$
-+	private static final String VM_ARGS_FREEBSD = "vmArgsFre"; //$NON-NLS-1$
- 	private static final String VM_ARGS_LINUX = "vmArgsLin"; //$NON-NLS-1$
- 	private static final String VM_ARGS_MAC = "vmArgsMac"; //$NON-NLS-1$
- 	private static final String VM_ARGS_SOLARIS = "vmArgsSol"; //$NON-NLS-1$
-@@ -53,6 +55,7 @@
- 	private static final String OS_LINUX = "linux";//$NON-NLS-1$
- 	private static final String OS_SOLARIS = "solaris";//$NON-NLS-1$
- 	private static final String OS_MACOSX = "macosx";//$NON-NLS-1$
-+	private static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
- 
- 	private static final String PRODUCT = "product"; //$NON-NLS-1$
- 	private static final String CONFIG_INI = "configIni"; //$NON-NLS-1$
-@@ -70,16 +73,18 @@
- 	private static final int STATE_PLUGINS = 4;
- 	private static final int STATE_FEATURES = 5;
- 	private static final int STATE_PROGRAM_ARGS = 6;
--	private static final int STATE_PROGRAM_ARGS_LINUX = 7;
--	private static final int STATE_PROGRAM_ARGS_MAC = 8;
--	private static final int STATE_PROGRAM_ARGS_SOLARIS = 9;
--	private static final int STATE_PROGRAM_ARGS_WIN = 10;
--	private static final int STATE_VM_ARGS = 11;
--	private static final int STATE_VM_ARGS_LINUX = 12;
--	private static final int STATE_VM_ARGS_MAC = 13;
--	private static final int STATE_VM_ARGS_SOLARIS = 14;
--	private static final int STATE_VM_ARGS_WIN = 15;
--	private static final int STATE_CONFIG_INI = 16;
-+	private static final int STATE_PROGRAM_ARGS_FREEBSD = 7;
-+	private static final int STATE_PROGRAM_ARGS_LINUX = 8;
-+	private static final int STATE_PROGRAM_ARGS_MAC = 9;
-+	private static final int STATE_PROGRAM_ARGS_SOLARIS = 10;
-+	private static final int STATE_PROGRAM_ARGS_WIN = 11;
-+	private static final int STATE_VM_ARGS = 12;
-+	private static final int STATE_VM_ARGS_FREEBSD = 13;
-+	private static final int STATE_VM_ARGS_LINUX = 14;
-+	private static final int STATE_VM_ARGS_MAC = 15;
-+	private static final int STATE_VM_ARGS_SOLARIS = 16;
-+	private static final int STATE_VM_ARGS_WIN = 17;
-+	private static final int STATE_CONFIG_INI = 18;
- 
- 	private int state = STATE_START;
- 
-@@ -190,6 +195,8 @@
- 			key = VM_ARGS_MAC;
- 		} else if (os.equals(OS_SOLARIS)) {
- 			key = VM_ARGS_SOLARIS;
-+		} else if (os.equals(OS_FREEBSD)) {
-+			key = VM_ARGS_FREEBSD;
- 		}
- 
- 		String prefix = launcherArgs.getProperty(VM_ARGS);
-@@ -213,6 +220,8 @@
- 			key = PROGRAM_ARGS_MAC;
- 		} else if (os.equals(OS_SOLARIS)) {
- 			key = PROGRAM_ARGS_SOLARIS;
-+		} else if (os.equals(OS_FREEBSD)) {
-+			key = PROGRAM_ARGS_FREEBSD;
- 		}
- 
- 		String prefix = launcherArgs.getProperty(PROGRAM_ARGS);
-@@ -264,6 +273,8 @@
- 					processLinux(attributes);
- 				} else if (OS_MACOSX.equals(localName)) {
- 					processMac(attributes);
-+				} else if (OS_FREEBSD.equals(localName)) {
-+					processFreeBSD(attributes);
- 				}
- 				if ("ico".equals(localName)) { //$NON-NLS-1$
- 					processIco(attributes);
-@@ -275,6 +286,8 @@
- 			case STATE_LAUNCHER_ARGS :
- 				if (PROGRAM_ARGS.equals(localName)) {
- 					state = STATE_PROGRAM_ARGS;
-+				} else if (PROGRAM_ARGS_FREEBSD.equals(localName)) {
-+					state = STATE_PROGRAM_ARGS_FREEBSD;
- 				} else if (PROGRAM_ARGS_LINUX.equals(localName)) {
- 					state = STATE_PROGRAM_ARGS_LINUX;
- 				} else if (PROGRAM_ARGS_MAC.equals(localName)) {
-@@ -285,6 +298,8 @@
- 					state = STATE_PROGRAM_ARGS_WIN;
- 				} else if (VM_ARGS.equals(localName)) {
- 					state = STATE_VM_ARGS;
-+				} else if (VM_ARGS_FREEBSD.equals(localName)) {
-+					state = STATE_VM_ARGS_FREEBSD;
- 				} else if (VM_ARGS_LINUX.equals(localName)) {
- 					state = STATE_VM_ARGS_LINUX;
- 				} else if (VM_ARGS_MAC.equals(localName)) {
-@@ -330,11 +345,13 @@
- 				break;
- 
- 			case STATE_PROGRAM_ARGS :
-+			case STATE_PROGRAM_ARGS_FREEBSD :
- 			case STATE_PROGRAM_ARGS_LINUX :
- 			case STATE_PROGRAM_ARGS_MAC :
- 			case STATE_PROGRAM_ARGS_SOLARIS :
- 			case STATE_PROGRAM_ARGS_WIN :
- 			case STATE_VM_ARGS :
-+			case STATE_VM_ARGS_FREEBSD :
- 			case STATE_VM_ARGS_LINUX :
- 			case STATE_VM_ARGS_MAC :
- 			case STATE_VM_ARGS_SOLARIS :
-@@ -356,6 +373,9 @@
- 			case STATE_PROGRAM_ARGS :
- 				addLaunchArgumentToMap(PROGRAM_ARGS, String.valueOf(ch, start, length));
- 				break;
-+			case STATE_PROGRAM_ARGS_FREEBSD :
-+				addLaunchArgumentToMap(PROGRAM_ARGS_FREEBSD, String.valueOf(ch, start, length));
-+				break;
- 			case STATE_PROGRAM_ARGS_LINUX :
- 				addLaunchArgumentToMap(PROGRAM_ARGS_LINUX, String.valueOf(ch, start, length));
- 				break;
-@@ -371,6 +391,9 @@
- 			case STATE_VM_ARGS :
- 				addLaunchArgumentToMap(VM_ARGS, String.valueOf(ch, start, length));
- 				break;
-+			case STATE_VM_ARGS_FREEBSD :
-+				addLaunchArgumentToMap(VM_ARGS_FREEBSD, String.valueOf(ch, start, length));
-+				break;
- 			case STATE_VM_ARGS_LINUX :
- 				addLaunchArgumentToMap(VM_ARGS_LINUX, String.valueOf(ch, start, length));
- 				break;
-@@ -500,6 +523,12 @@
- 		result.add(attributes.getValue(WIN32_48_LOW));
- 	}
- 
-+	private void processFreeBSD(Attributes attributes) {
-+		if (!osMatch(OS_FREEBSD))
-+			return;
-+		result.add(attributes.getValue("icon")); //$NON-NLS-1$
-+	}
-+
- 	private void processLinux(Attributes attributes) {
- 		if (!osMatch(OS_LINUX))
- 			return;
---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java	2009-05-20 00:10:51.000000000 -0400
-+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java	2009-12-23 15:14:12.440005914 -0500
-@@ -93,6 +93,8 @@
- 			brandAIX();
+--- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java	2009-05-20 00:10:51.000000000 -0400
++++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java	2009-12-23 15:14:12.440005914 -0500
+@@ -111,6 +111,8 @@
+ 			brandAIX(descriptor);
  		else if ("hpux".equals(os)) //$NON-NLS-1$
- 			brandHPUX();
+ 			brandHPUX(descriptor);
 +		else if ("freebsd".equals(os)) //$NON-NLS-1$
-+			brandFreeBSD();
++			brandFreeBSD(descriptor);
  		else
- 			renameLauncher();
- 	}
-@@ -224,6 +226,12 @@
+ 			renameLauncher(descriptor);
+ 		descriptor.setExecutableName(name, true);
+@@ -166,6 +168,14 @@
  		}
  	}
  
-+	private void brandFreeBSD() throws Exception {
-+		renameLauncher();
++	private void brandFreeBSD(ExecutablesDescriptor descriptor) throws Exception {
++		renameLauncher(descriptor);
++
++		File root = descriptor.getLocation();
 +		if (brandIcons)
-+			copy(new File(icons[0]), new File(root, "icon.xpm")); //$NON-NLS-1$
++			Utils.copy(new File(icons[0]), new File(root, "icon.xpm")); //$NON-NLS-1$
 +	}
 +
- 	private void moveContents(File source, File target) {
- 		if (!source.exists())
- 			return;
---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java	2009-04-29 16:41:50.000000000 -0400
-+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java	2009-12-23 15:14:12.441010216 -0500
+ 	private void brandMac(ExecutablesDescriptor descriptor) throws Exception {
+ 		//Initially the files are in: <root>/Eclipse.app/ 
+ 		//and they must appear in <root>/MyAppName.app/
+--- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java	2009-04-29 16:41:50.000000000 -0400
++++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java	2009-12-23 15:14:12.441010216 -0500
 @@ -47,11 +47,13 @@
  	private final static SAXParserFactory parserFactory = SAXParserFactory.newInstance();
  
@@ -2144,7 +2001,7 @@ $FreeBSD$
   		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java	2009-08-19 15:25:06.000000000 -0400
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java	2009-12-23 15:14:12.471129495 -0500
-@@ -80,6 +80,8 @@
+@@ -93,6 +93,8 @@
  			brandAIX();
  		else if ("hpux".equals(os)) //$NON-NLS-1$
  			brandHPUX();
@@ -2153,7 +2010,7 @@ $FreeBSD$
  		else
  			renameLauncher();
  	}
-@@ -110,6 +112,12 @@
+@@ -224,6 +226,12 @@
  		}
  	}
  
@@ -2163,9 +2020,9 @@ $FreeBSD$
 +			Utils.copy(new File(icons[0]), new File(root, "icon.xpm")); //$NON-NLS-1$
 +	}
 +
- 	private void brandSolaris() throws Exception {
- 		renameLauncher();
- 		if (brandIcons == false)
+ 	private void moveContents(File source, File target) {
+ 		if (!source.exists())
+ 			return;
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java	2009-05-06 16:48:13.000000000 -0400
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java	2009-12-23 15:14:12.472135194 -0500
 @@ -29,11 +29,13 @@
@@ -2995,34 +2852,6 @@ $FreeBSD$
  		;;
  	*)
  		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
-@@ -114,7 +116,13 @@
- fi
- 
- if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then
--	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
-+	if [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
-+		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
-+		XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
-+		export XULRUNNER_INCLUDES
-+		export XULRUNNER_LIBS
-+		MAKE_MOZILLA="make_xulrunner make_xpcominit"
-+	elif [ 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
-@@ -126,12 +134,6 @@
- 		export MOZILLA_INCLUDES
- 		export MOZILLA_LIBS
- 		MAKE_MOZILLA="make_mozilla make_xpcominit"
--	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
--		XULRUNNER_INCLUDES=`pkg-config --cflags libxul-unstable`
--		XULRUNNER_LIBS="`pkg-config --libs libxul-unstable` -lxpcomglue"
--		export XULRUNNER_INCLUDES
--		export XULRUNNER_LIBS
--		MAKE_MOZILLA="make_xulrunner make_xpcominit"
- 	else
- 		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
- 		echo "    *** Mozilla embedding support will not be compiled."
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak	2007-06-20 12:01:22.000000000 -0400
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak	2009-12-23 15:17:21.337309883 -0500
 @@ -39,6 +39,7 @@
@@ -3232,7 +3061,7 @@ $FreeBSD$
 +Bundle-Name: %fragmentName
 +Bundle-Vendor: %providerName
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true
-+Bundle-Version: 3.6.2.qualifier
++Bundle-Version: 3.7.1.qualifier
 +Bundle-ManifestVersion: 2
 +Bundle-Localization: fragment
 +Export-Package: 
@@ -5046,18 +4875,23 @@ $FreeBSD$
 +custom = true
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml	1969-12-31 19:00:00.000000000 -0500
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml	2009-12-23 15:14:12.583575548 -0500
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,17 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project name="org.eclipse.swt.gtk.freebsd.x86" default="build.jars" basedir=".">
 +
 +	<property name="swt.ws" value="gtk" />
 +	<property name="swt.os" value="freebsd" />
 +	<property name="swt.arch" value="x86" />
++	<property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
 +
 +	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
-+	<property name="version.suffix" value="3.6.2" />
++	<property name="version.suffix" value="3.7.1" />
 +
-+	<import file="../org.eclipse.swt/buildFragment.xml"/>
++	<condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="${buildDirectory}/plugins/org.eclipse.swt">
++		<available file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/>
++	</condition>
++	<import file="${plugindir}/buildFragment.xml"/>
++	<import file="${plugindir}/buildSWT.xml"/>
 +</project>
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/fragment.properties	1969-12-31 19:00:00.000000000 -0500
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/fragment.properties	2009-12-23 15:14:12.583575548 -0500
@@ -5113,7 +4947,7 @@ $FreeBSD$
 +Bundle-Name: %fragmentName
 +Bundle-Vendor: %providerName
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true
-+Bundle-Version: 3.6.2.qualifier
++Bundle-Version: 3.7.1.qualifier
 +Bundle-ManifestVersion: 2
 +Bundle-Localization: fragment
 +Export-Package: 
@@ -6927,18 +6761,23 @@ $FreeBSD$
 +custom = true
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml	1969-12-31 19:00:00.000000000 -0500
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml	2009-12-23 15:14:12.588595660 -0500
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,17 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<project name="org.eclipse.swt.gtk.freebsd.x86_64" default="build.jars" basedir=".">
 +
 +	<property name="swt.ws" value="gtk" />
 +	<property name="swt.os" value="freebsd" />
 +	<property name="swt.arch" value="x86_64" />
++	<property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
 +
 +	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
-+	<property name="version.suffix" value="3.6.2" />
++	<property name="version.suffix" value="3.7.1" />
 +
-+	<import file="../org.eclipse.swt/buildFragment.xml"/>
++	<condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="${buildDirectory}/plugins/org.eclipse.swt">
++		<available file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/>
++	</condition>
++	<import file="${plugindir}/buildFragment.xml"/>
++	<import file="${plugindir}/buildSWT.xml"/>
 +</project>
 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/fragment.properties	1969-12-31 19:00:00.000000000 -0500
 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/fragment.properties	2009-12-23 15:14:12.588595660 -0500
@@ -7505,18 +7344,118 @@ $FreeBSD$
 --- build/eclipse-3.6.1-src/pluginVersions.properties~	Fri Oct  1 17:18:03 2010
 +++ build/eclipse-3.6.1-src/pluginVersions.properties	Wed Oct 20 20:19:42 2010
 @@ -34,6 +34,7 @@
- org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20101019_1345
- org.eclipse.equinox.http,0.0.0=v20100503
- org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3659b
-+org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3659b
- org.eclipse.swt.photon.qnx.x86,0.0.0=v3659b
- org.eclipse.equinox.p2.ui.admin,0.0.0=v20100503
- org.eclipse.equinox.weaving.caching.j9,0.0.0=v20100503
-@@ -245,6 +246,7 @@
- org.eclipse.swt.examples,0.0.0=v3659b
- org.eclipse.cvs,0.0.0=v20100414
- org.eclipse.swt.gtk.linux.x86,0.0.0=v3659b
-+org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3659b
- org.eclipse.equinox.log,0.0.0=v20100503
+ org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=v20110502
+ org.eclipse.equinox.http,0.0.0=v20110413
+ org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3738a
++org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3738a
+ org.eclipse.equinox.p2.ui.admin,0.0.0=v20110502-1955
+ org.eclipse.equinox.p2.publisher.eclipse,0.0.0=v20110511
+ org.eclipse.equinox.weaving.caching.j9,0.0.0=v20110502
+@@ -52,6 +52,7 @@
+ org.eclipse.ui.workbench.texteditor,0.0.0=v20110505-0800
+ org.eclipse.ui.examples.multipageeditor,0.0.0=I20110413-1600
+ org.eclipse.core.filesystem.linux.x86,0.0.0=v20110423-0524
++org.eclipse.core.filesystem.freebsd.x86,0.0.0=v20110423-0524
+ org.eclipse.equinox.p2.ui.discovery,0.0.0=v20110502-1955
+ org.eclipse.ui.examples.javaeditor,0.0.0=v20110524-0800
+ org.eclipse.ant.core,0.0.0=v20110511
+@@ -93,6 +94,7 @@
+ org.eclipse.core.runtime,0.0.0=v20110110
+ org.eclipse.core.resources.win32.x86,0.0.0=v20110423-0524
+ org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=v20110505
++org.eclipse.equinox.launcher.gtk.freebsd.x86_64,0.0.0=v20110505
+ org.eclipse.help,0.0.0=v20110426
+ org.eclipse.pde.api.tools.ee.j2se15,0.0.0=v20110401-1030
+ org.junit4,0.0.0=v20100525
+@@ -135,6 +137,7 @@
+ org.eclipse.equinox.p2.ui.importexport,0.0.0=v20110511
+ org.eclipse.pde.api.tools.ee.jre11,0.0.0=v20110401-1030
+ org.eclipse.core.net.linux.x86_64,0.0.0=I20110331-0827
++org.eclipse.core.net.freebsd.x86_64,0.0.0=I20110331-0827
+ org.eclipse.equinox.jsp.jasper,0.0.0=v20110502
+ org.eclipse.pde.api.tools.ee.j2se14,0.0.0=v20110401-1030
+ org.eclipse.equinox.p2.ui,0.0.0=v20110601
+@@ -158,6 +161,7 @@
+ org.eclipse.swt.gtk.solaris.x86,0.0.0=v3738a
+ org.eclipse.pde.ds.ui,0.0.0=v20110516
+ org.eclipse.core.net.linux.x86,0.0.0=I20110419-0800
++org.eclipse.core.net.freebsd.x86,0.0.0=I20110419-0800
+ org.eclipse.equinox.p2.console,0.0.0=v20110502-1955
+ org.eclipse.equinox.http.jetty,0.0.0=v20110502
+ org.eclipse.swt.examples.browser.demos,0.0.0=v3738a
+@@ -175,6 +179,7 @@
+ org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=v20110502
+ org.eclipse.swt.examples.browser,0.0.0=v3738a
+ org.eclipse.core.filesystem.linux.x86_64,0.0.0=v20110423-0524
++org.eclipse.core.filesystem.freebsd.x86_64,0.0.0=v20110423-0524
+ org.eclipse.equinox.event,0.0.0=v20110502
+ org.eclipse.ui.ide,0.0.0=v20110809-1737
+ org.eclipse.ui.views.log,0.0.0=v20110404
+@@ -185,6 +190,7 @@
+ org.eclipse.equinox.ds,0.0.0=R37x_v20110701
+ org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=v20110502
+ org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=v20110505
++org.eclipse.equinox.launcher.gtk.freebsd.x86,0.0.0=v20110505
+ org.eclipse.update.core.linux,0.0.0=v20100512
+ org.eclipse.core.databinding.property,0.0.0=I20110222-0800
+ org.eclipse.ui.examples.propertysheet,0.0.0=I20110413-1600
+@@ -246,6 +247,7 @@
+ org.eclipse.swt.examples,0.0.0=v3738a
+ org.eclipse.cvs,0.0.0=v20110505-0800
+ org.eclipse.swt.gtk.linux.x86,0.0.0=v3738a
++org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3738a
+ org.eclipse.equinox.log,0.0.0=v20110502
  org.eclipse.equinox.jmx.client,0.0.0=v20100503
  org.eclipse.ui.win32,0.0.0=I20100509-0800
+--- build/eclipse-3.7.0-src/features/org.eclipse.equinox.executable/feature.xml~	Fri Feb 18 17:56:16 2011
++++ build/eclipse-3.7.0-src/features/org.eclipse.equinox.executable/feature.xml	Thu Sep 15 11:03:18 2011
+@@ -131,6 +131,26 @@
+          fragment="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"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.freebsd.x86_64"
++         os="freebsd"
++         ws="gtk"
++         arch="x86_64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
+          id="org.eclipse.equinox.launcher.motif.aix.ppc"
+          os="aix"
+          ws="motif"
+--- build/eclipse-3.7.0-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	2011-05-27 13:45:22.000000000 -0500
++++ build/eclipse-3.7.0-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2012-01-23 11:51:27.000000000 -0600
+@@ -25,7 +25,7 @@
+ fi
+ 
+ # Check if we have to compile external.xpt from external.idl
+-COMPONENTS_DIR=`pwd`/../../components
++COMPONENTS_DIR=`pwd`/../../org.eclipse.swt/components
+ if test ! -f ${COMPONENTS_DIR}/external.xpt; then
+ 	if test ! -f ${COMPONENTS_DIR}/external.idl; then
+ 		echo "Can't find ${COMPONENTS_DIR}/external.idl"
+@@ -179,9 +181,10 @@
+ 	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
+ 		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
+ 		XULRUNNER_LIBS=`pkg-config --libs libxul`
++		XULRUNNER_LIBS=`echo ${XULRUNNER_LIBS} -lxpcomglue`
+ 		export XULRUNNER_INCLUDES
+ 		export XULRUNNER_LIBS
+-		MAKE_MOZILLA=make_xulrunner
++		MAKE_MOZILLA=`echo make_xulrunner make_xpcominit`
+ 	else
+ 		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
+ 		echo "    *** Mozilla embedding support will not be compiled."
diff --git a/java/eclipse/files/patch-dependencyManifests b/java/eclipse/files/patch-dependencyManifests
new file mode 100644
index 000000000000..2dcbe7ef58c0
--- /dev/null
+++ b/java/eclipse/files/patch-dependencyManifests
@@ -0,0 +1,90 @@
+$FreeBSD$
+
+--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF~	2012-01-26 18:03:49.377369870 +0100
++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF	2012-01-26 18:18:27.055000978 +0100
+@@ -6,6 +6,6 @@
+ Bundle-Localization: plugin
+-Bundle-Version: 2.5.0.v200806031605
++Bundle-Version: 3.0.0.v201103241727
+ Bundle-Vendor: %bundleProvider
+-Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
+- ="2.5",javax.servlet.resources;version="2.5"
++Export-Package: javax.servlet;version="3.0",javax.servlet.http;version
++ ="3.0",javax.servlet.resources;version="3.0"
+ 
+--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF~	2011-12-19 16:40:57.000000000 +0100
++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF	2012-01-26 18:43:30.749772042 +0100
+@@ -4,10 +4,10 @@
+ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+ Bundle-Name: %bundleName
+ Bundle-SymbolicName: javax.servlet.jsp
+-Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
+- ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
+- .tagext; version=2.0
+-Bundle-Version: 2.0.0.v200806031607
++Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v
++ ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp
++ .tagext; version=2.2
++Bundle-Version: 2.2.0.v200806031607
+ Bundle-ManifestVersion: 2
+-Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
+- =2.4,javax.servlet.resources; version=2.4
++Import-Package: javax.servlet; version=3.0,javax.servlet.http; version
++ =3.0,javax.servlet.resources; version=3.0
+--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF~	2011-12-19 16:40:57.000000000 +0100
++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF	2012-01-26 18:36:42.891544584 +0100
+@@ -6,21 +6,21 @@
+  2SE-1.3
+ Bundle-Name: %bundleName
+ Bundle-SymbolicName: org.apache.jasper
+-Export-Package: org.apache.jasper;version="5.5.17",org.apache.jasper.c
+- ompiler;version="5.5.17",org.apache.jasper.compiler.tagplugin;version
+- ="5.5.17",org.apache.jasper.resources;version="5.5.17",org.apache.jas
+- per.runtime;version="5.5.17",org.apache.jasper.security;version="5.5.
+- 17",org.apache.jasper.servlet;version="5.5.17",org.apache.jasper.tagp
+- lugins.jstl;version="5.5.17",org.apache.jasper.tagplugins.jstl.core;v
+- ersion="5.5.17",org.apache.jasper.util;version="5.5.17",org.apache.ja
+- sper.xmlparser;version="5.5.17"
+-Bundle-Version: 5.5.17.v201004212143
++Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c
++ ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version
++ ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas
++ per.runtime;version="7.0.21",org.apache.jasper.security;version="5.5.
++ 17",org.apache.jasper.servlet;version="7.0.21",org.apache.jasper.tagp
++ lugins.jstl;version="7.0.21",org.apache.jasper.tagplugins.jstl.core;v
++ ersion="7.0.21",org.apache.jasper.util;version="7.0.21",org.apache.ja
++ sper.xmlparser;version="7.0.21"
++Bundle-Version: 7.0.21.v201004212143
+ Bundle-ManifestVersion: 2
+-Import-Package: javax.servlet;version="[2.4, 3.0)",javax.servlet.http;
+- version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
+- vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
+- "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
+- let.resources;version="[2.4, 3.0)",javax.xml.parsers,org.apache.commo
++Import-Package: javax.servlet;version="3.0",javax.servlet.http;
++ version="3.0",javax.servlet.jsp;version="2.2",javax.ser
++ vlet.jsp.el;version="2.2",javax.servlet.jsp.resources;version=
++ "2.2",javax.servlet.jsp.tagext;version="2.2",javax.serv
++ let.resources;version="3.0",javax.xml.parsers,org.apache.commo
+  ns.el;version="[1.0.0,2.0.0)",org.apache.commons.logging;version="[1.
+  0.0,2.0.0)",org.apache.tools.ant;resolution:=optional,org.apache.tool
+  s.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolu
+--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF~	Mon Dec 19 16:40:57 2011
++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF	Wed Feb 29 16:33:20 2012
+@@ -8,11 +8,11 @@
+  ns.el.parser;version="1.0.0"
+ Bundle-Version: 1.0.0.v201004212143
+ Bundle-ManifestVersion: 2
+-Import-Package: javax.servlet;version="[2.4, 3.0)",javax.servlet.http;
+- version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
+- vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
+- "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
+- let.resources;version="[2.4, 3.0)"
++Import-Package: javax.servlet;version="[2.5, 3.0]",javax.servlet.http;
++ version="[2.5, 3.0]",javax.servlet.jsp;version="2.2",javax.ser
++ vlet.jsp.el;version="2.2",javax.servlet.jsp.resources;version=
++ "2.2",javax.servlet.jsp.tagext;version="2.2",javax.serv
++ let.resources;version="[2.5, 3.0]"
+ 
+ Name: org/apache/commons/el/ImplicitObjects$6.class
+ SHA1-Digest: yk3eN531Co8H5mcmuI/jBgzMK7M=
diff --git a/java/eclipse/files/patch-eclipse-build b/java/eclipse/files/patch-eclipse-build
index f85e592a15f1..fd225a9ce180 100644
--- a/java/eclipse/files/patch-eclipse-build
+++ b/java/eclipse/files/patch-eclipse-build
@@ -1,48 +1,38 @@
 $FreeBSD$
 
---- eclipse-build-0.5.0.orig/ChangeLog	2009-11-11 07:59:07.000000000 -0500
-+++ eclipse-build-0.5.0/ChangeLog	2009-12-23 16:23:06.355139641 -0500
-@@ -1,7 +1,3 @@
--2009-11-11  Alexander Kurtakov  <akurtako@redhat.com>
--
--	* pdebuild/eclipse-pdebuild.sh: Do not escape $orbitDepsDir.
--
- 2009-11-05  Alexander Kurtakov  <akurtako@redhat.com>
- 	Fix for bug #294264.
- 	* build.xml: Use ${buildWorkspace} instead of $HOME/workspace.
 --- eclipse-build-0.5.0.orig/build.properties	2009-09-30 14:07:21.000000000 -0400
 +++ eclipse-build-0.5.0/build.properties	2009-12-23 16:23:06.355139641 -0500
-@@ -26,7 +26,7 @@
+@@ -28,7 +28,7 @@
  collectingFolder=eclipse
  archivePrefix=eclipse
  generateFeatureVersionSuffix=true
--bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
+-bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
 +bootclasspath=%%BOOTCLASSPATH%%
  build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
  JavaSE-1.6=${bootclasspath}
  CDC-1.0/Foundation-1.0=${bootclasspath}
-@@ -47,21 +47,21 @@
+@@ -49,21 +49,21 @@
  CDC-1.1/PersonalBasis-1.1=${bootclasspath}
  CDC-1.1/PersonalJava-1.1=${bootclasspath}
  # Somehow bootclasspath isn't expanded when used by antRunner
--JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.0/Foundation-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.1/Foundation-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--OSGi/Minimum-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--OSGi/Minimum-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--OSGi/Minimum-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--JRE-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.3=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.4=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.5=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--PersonalJava-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.0/PersonalBasis-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.0/PersonalJava-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.1/PersonalBasis-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.1/PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
+-JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.0/Foundation-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.1/Foundation-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-OSGi/Minimum-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-OSGi/Minimum-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-OSGi/Minimum-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-JRE-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.3=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.4=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.5=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-PersonalJava-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.0/PersonalBasis-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.0/PersonalJava-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.1/PersonalBasis-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.1/PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
 +JavaSE-1.6=%%BOOTCLASSPATH%%
 +CDC-1.0/Foundation-1.0=%%BOOTCLASSPATH%%
 +CDC-1.1/Foundation-1.1=%%BOOTCLASSPATH%%
@@ -63,7 +53,7 @@ $FreeBSD$
 +CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%%
 --- eclipse-build-0.5.0.orig/build.xml	2009-12-23 16:22:44.090824173 -0500
 +++ eclipse-build-0.5.0/build.xml	2009-12-23 16:23:06.357147407 -0500
-@@ -117,11 +117,11 @@
+@@ -118,11 +118,11 @@
  
  	<target name="setLibDir" depends="setLib64Dir">
  		<property name="libDir" value="lib" />
@@ -77,7 +67,7 @@ $FreeBSD$
  	</target>
  
  	<property name="doTests" value="true" />
-@@ -166,8 +166,7 @@
+@@ -167,8 +167,7 @@
  	<target name="copySource" unless="sdkSourcePresent">
  		<echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" />
  		<exec executable="cp" failonerror="true">
@@ -87,49 +77,70 @@ $FreeBSD$
  			<arg value="eclipse" />
  			<arg value="${buildDirectory}" />
  		</exec>
-@@ -292,8 +291,10 @@
- 	<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
- 		<!-- eclipse-build-only patches -->
- 		<patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" />
--		<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" />
+@@ -309,12 +308,18 @@
+ 		<!--
+ 		<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" />
+ 		-->
 -		<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
 + 		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
 + 			<arg value="-p1" />
-+ 			<arg value="-i${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" />
++ 			<arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" />
 + 		</exec>
  		<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
  		<patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" />
  		<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
-@@ -306,9 +307,15 @@
- 		<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
--		<patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}" strip="0" />
-+ 		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
-+ 			<arg value="-p0" />
-+ 			<arg value="-i${basedir}/patches/bz318912.patch" />
-+ 		</exec>
- 		<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
--		<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
-+ 		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
-+ 			<arg value="-p1" />
-+ 			<arg value="-i${basedir}/patches/eclipse-swt-compile-xpt.patch" />
-+ 		</exec>
- 		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
- 		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
- 		<!-- end eclipse-build-only patches -->
-@@ -321,6 +328,10 @@
- 			<replacefilter token="@build_os@" value="${buildOs}" />
+ 		<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
+-		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
++  		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
++  			<arg value="-p1" />
++  			<arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" />
++  		</exec>
+ 		<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="1" />
+ 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" />
+ 		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
+@@ -337,20 +342,30 @@
  		</replace>
- 		<patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
-+ 		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
-+ 			<arg value="-p2" />
-+ 			<arg value="-i${basedir}/patches/freebsd-support.patch" />
-+ 		</exec>
+ 		<patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" />
+ 		<patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" />
+-		<patch patchfile="${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" dir="${buildDirectory}/plugins" strip="2" />
++   		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins">
++   			<arg value="-p2" />
++   			<arg value="-i${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" />
++   		</exec>
+ 		<patch patchfile="${basedir}/patches/remove-lucene-dependency.patch" dir="${buildDirectory}" strip="1" />
+ 		<patch patchfile="${basedir}/patches/eclipse-equinox-jsp-jasper.patch" dir="${buildDirectory}" strip="0" />
+ 		<patch patchfile="${basedir}/patches/eclipse-equinox-http-jetty.patch" dir="${buildDirectory}" strip="0" />
+ 		<patch patchfile="${basedir}/patches/eclipse-equinox-http-servlet.patch" dir="${buildDirectory}" strip="0" />
+ 		<patch patchfile="${basedir}/patches/eclipse-help-feature.patch" dir="${buildDirectory}" strip="0" />
+ 		<patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" />
++   		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
++   			<arg value="-p2" />
++   			<arg value="-i${basedir}/patches/freebsd-support.patch" />
++   		</exec>
  		<echo file="patch-stamp" />
  	</target>
  
-@@ -804,7 +815,8 @@
+ 	<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
+ 		<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
+ 		<patch patchfile="${basedir}/patches/tests-noequinoxregiontests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
+-		<patch patchfile="${basedir}/patches/tests-BZ295666.patch" dir="${testsBuildDirectory}" strip="0" />
++   		<exec executable="${localbase}/bin/gpatch" dir="${testsBuildDirectory}">
++   			<arg value="-p0" />
++   			<arg value="-i${basedir}/patches/tests-BZ295666.patch" />
++   		</exec>
+ 		<patch patchfile="${basedir}/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.pde.ui.tests" strip="0" />
+ 		<patch patchfile="${basedir}/patches/tests-nop2discoverytests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
+ 		<patch patchfile="${basedir}/patches/tests-org.eclipse.ant.tests.core.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.ant.tests.core" strip="0" />
+@@ -725,7 +729,7 @@
+ 	<target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete">
+ 		<echo message="Installing into:  ${provisionDir}" />
+ 		<antcall target="provision">
+-			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
++			<param name="p2.director.installIU" value="org.eclipse.sdk.ide,org.eclipse.equinox.initializer" />
+ 			<param name="profileName" value="SDKProfile" />
+ 		</antcall>
+ 
+@@ -850,7 +854,8 @@
  		<!--
  		<echo message="Calling runtests with (debug, verbose) = (${testSwitches})" />
  		-->
@@ -139,24 +150,28 @@ $FreeBSD$
  			<arg value="-t${timestamp}" />
  			<arg value="-a${buildArch}" />
  			<arg value="-o${buildOs}" />
-@@ -906,26 +918,25 @@
- 
+@@ -1014,33 +1030,29 @@
  	<target name="installIntoDestDir">
  		<mkdir dir="${installationDir}" />
--		<exec executable="cp" failonerror="true">
--			<arg value="-rd" />
--			<arg value="--no-target-directory" />
--			<arg value="${provisionDir}" />
--			<arg value="${installationDir}" />
-+   		<exec executable="cp" failonerror="true">
-+  			<arg value="-RL" />
-+  			<arg value="${provisionDir}/" />
-+  			<arg value="${installationDir}" />
- 		</exec>
+                 <exec executable="rsync" failonerror="true">
+-                       <arg value="-vrpl" />
++                       <arg value="-vrpL" />
+                        <arg value="--exclude=dropins" />
+                        <arg value="${provisionDir}/" />
+                        <arg value="${installationDir}/" />
+                 </exec>
  
  		<!-- install desktop file -->
 -		<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
-+		<copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" />
+-		<!-- install Eclipse Java code formatter launcher -->
+-		<property name="efj" value="${destDir}${prefix}/bin/efj"/>
+-		<copy file="efj.sh" tofile="${efj}" />
++ 		<copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" />
+ 	    <fileset id="equinoxLauncher" dir="${installationDir}/plugins">
+ 	      <include name="org.eclipse.equinox.launcher_*.jar" />
+ 	    </fileset>
+ 	    <property name="launcherJar" refid="equinoxLauncher"/>
+-		<replace file="${efj}" token="@LAUNCHER@" value="${prefix}/${libDir}/eclipse/plugins/${launcherJar}"/>
  		<!-- install icons -->
 -		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" />
 -		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
@@ -165,28 +180,37 @@ $FreeBSD$
 +		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/%%PORTNAME%%.png" />
 +		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/%%PORTNAME%%.png" />
  		<mkdir dir="${destDir}${prefix}/share/pixmaps" />
--		<symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" />
-+		<symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/48x48/apps/%%PORTNAME%%.png" />
+-		<symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" overwrite="true"/>
++		<symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/48x48/apps/%%PORTNAME%%.png" overwrite="true"/>
  		<!--shared dropins folder for architecture-independent plugins-->
 -		<mkdir dir="${destDir}${prefix}/share/eclipse/dropins" />
 +		<mkdir dir="${destDir}${prefix}/share/%%PORTNAME%%/dropins" />
  		<!-- eclipse binary -->
  		<mkdir dir="${destDir}${prefix}/bin" />
--		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
-+		<symlink link="${destDir}${prefix}/bin/%%PORTNAME%%" resource="../${libDir}/%%PORTNAME%%/eclipse" />
- 		<!-- FIXME:  we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
- 		<!-- Create the "startup.jar" symlink -->
- 		<fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
-@@ -938,7 +949,7 @@
- 		<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" />
- 		<symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" />
+-		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/>
++		<symlink link="${destDir}${prefix}/bin/%%PORTNAME%%" resource="../${libDir}/%%PORTNAME%%/eclipse" overwrite="true"/>
+ 		<!-- Create the "swt.jar" and friends symlinks  -->
+ 		<fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" />
+ 		<property name="swtjarpath" refid="swtjar" />
+@@ -1013,7 +1015,7 @@
+ 		<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
+ 		<symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
  
 -		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
 +		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" />
  
  		<!-- Extract SWT JNI .so files -->
  		<java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
-@@ -990,8 +1001,8 @@
+@@ -1039,7 +1041,7 @@
+ 
+ 		<!-- copy PDE and JDT to dropins -->
+                 <exec executable="rsync" failonerror="true">
+-                       <arg value="-vrpl" />
++                       <arg value="-vrpL" />
+                        <arg value="${provisionDir}/dropins/" />
+                        <arg value="${installationDir}/dropins/" />
+                 </exec>
+@@ -1072,8 +1074,8 @@
  			<arg value="s@/@_@g" />
  		</exec>
  		<apply executable="sed" failonerror="true" verbose="true">
@@ -197,7 +221,7 @@ $FreeBSD$
  			<srcfile />
  			<fileset dir="${installationDir}">
  				<include name="metadata/content.xml" />
-@@ -1012,7 +1023,7 @@
+@@ -1094,7 +1096,7 @@
  			</fileset>
  		</apply>
  		<apply executable="sed" failonerror="true" verbose="true">
@@ -206,18 +230,57 @@ $FreeBSD$
  			<arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" />
  			<srcfile />
  			<fileset dir="${installationDir}/${profileDir}">
-@@ -1027,9 +1038,11 @@
+@@ -1109,9 +1111,11 @@
  		</apply>
  		
  		<!-- Move config file to /etc -->
 +		<!--
  		<mkdir dir="${destDir}/etc" />
  		<move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
- 		<symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" />
+ 		<symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" overwrite="true"/>
 +		-->
  
  	</target>
  
+@@ -1156,8 +1164,7 @@
+ 
+ 		<!-- make a copy of the clean platform+CVS installation -->
+ 		<exec executable="cp" failonerror="true">
+-			<arg value="-rd" />
+-			<arg value="--no-target-directory" />
++			<arg value="-R" />
+ 			<arg value="${provisionDir}" />
+ 			<arg value="${platformAndCVSInstallation}" />
+ 		</exec>
+@@ -1173,16 +1180,14 @@
+ 			tofile="${jdtInstallation}"/>
+ 		<!-- make a second copy of the clean JDT installation -->
+ 		<exec executable="cp" failonerror="true">
+-			<arg value="-rd" />
+-			<arg value="--no-target-directory" />
++			<arg value="-R" />
+ 			<arg value="${jdtInstallation}" />
+ 			<arg value="${jdtInstallation}.orig" />
+ 		</exec>
+ 		
+ 		<!-- restore clean platform+CVS installation -->
+ 		<exec executable="cp" failonerror="true">
+-			<arg value="-rd" />
+-			<arg value="--no-target-directory" />
++			<arg value="-R" />
+ 			<arg value="${platformAndCVSInstallation}" />
+ 			<arg value="${provisionDir}" />
+ 		</exec>
+@@ -1199,8 +1204,7 @@
+ 		
+ 		<!-- restore clean platform+CVS installation -->
+ 		<exec executable="cp" failonerror="true">
+-			<arg value="-rd" />
+-			<arg value="--no-target-directory" />
++			<arg value="-R" />
+ 			<arg value="${platformAndCVSInstallation}" />
+ 			<arg value="${provisionDir}" />
+ 		</exec>
 --- eclipse-build-0.5.0.orig/pdebuild/eclipse-pdebuild.sh	2009-11-11 07:59:07.000000000 -0500
 +++ eclipse-build-0.5.0/pdebuild/eclipse-pdebuild.sh	2009-12-23 16:23:06.357147407 -0500
 @@ -230,7 +230,7 @@
@@ -237,11 +300,10 @@ $FreeBSD$
 -os=linux
 +os=freebsd
  
- buildId=M20100211-1343
- buildTag=vM20100211-1343
--label=3.6.0
--bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
-+label=3.6.2
+ buildId=R3_7_1
+ buildTag=R3_7_1
+ label=3.7.1
+-bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
 +bootclasspath=%%BOOTCLASSPATH%%
  #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
  
@@ -250,25 +312,24 @@ $FreeBSD$
  CDC-1.1/PersonalBasis-1.1=${bootclasspath}
  CDC-1.1/PersonalJava-1.1=${bootclasspath}
  # Somehow bootclasspath isn't expanded when used by antRunner
--JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.0/Foundation-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.1/Foundation-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--OSGi/Minimum-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--OSGi/Minimum-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--OSGi/Minimum-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--JRE-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.3=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.4=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--J2SE-1.5=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--PersonalJava-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.0/PersonalBasis-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.0/PersonalJava-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.1/PersonalBasis-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
--CDC-1.1/PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
-\ No newline at end of file
+-JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.0/Foundation-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.1/Foundation-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-OSGi/Minimum-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-OSGi/Minimum-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-OSGi/Minimum-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-JRE-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.3=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.4=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-J2SE-1.5=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-JavaSE-1.6=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-PersonalJava-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.0/PersonalBasis-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.0/PersonalJava-1.0=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.1/PersonalBasis-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+-CDC-1.1/PersonalJava-1.1=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
 +JavaSE-1.6=%%BOOTCLASSPATH%%
 +CDC-1.0/Foundation-1.0=%%BOOTCLASSPATH%%
 +CDC-1.1/Foundation-1.1=%%BOOTCLASSPATH%%
@@ -289,10 +350,10 @@ $FreeBSD$
 +CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%%
 --- eclipse-build-0.5.0.orig/pdebuild.xml	2009-12-23 16:22:44.090824173 -0500
 +++ eclipse-build-0.5.0/pdebuild.xml	2009-12-23 16:24:47.491322864 -0500
-@@ -200,6 +200,7 @@
+@@ -206,6 +206,7 @@
  			<arg line="-DbuildOs=${buildOs} " />
  			<arg line="-DbuildId=${buildId} " />
- 			<arg line="-debug -consolelog " />
+ 			<arg line="-debug -consolelog" />
 +			<arg line="-vmargs -Xmx1024 " />
  		</java>
  		<taskdef name="eclipse.versionReplacer"
@@ -309,20 +370,50 @@ $FreeBSD$
 +Exec=%%PORTNAME%%
  Terminal=false
  Categories=Development;IDE;Java;
---- eclipse-build-0.6.1/dependencies.properties.orig	2010-08-11 22:29:29.000000000 +0200
-+++ eclipse-build-0.6.1/dependencies.properties	2011-04-28 09:23:04.000000000 +0200
-@@ -2,11 +2,11 @@
- com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
- javax.servlet_2.5.0.v200910301333.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
- javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar:/usr/share/java/jsp-api-2.0.jar
--org.apache.commons.codec_1.3.0.v20080530-1600.jar=/usr/share/java/commons-codec.jar
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties.orig	Thu Jun 30 16:45:54 2011
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties	Thu Jun 30 16:46:18 2011
+@@ -1,5 +1,5 @@
+ com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar:/usr/share/java/icu4j.jar
+-com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
++com.jcraft.jsch_0.1.41.v201101211617.jar=/usr/share/java/jsch.jar
+ javax.servlet_3.0.0.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar
+ javax.servlet.jsp_2.2.0.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar
+ javax.el_2.2.0.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar
+@@ -7,13 +7,13 @@
+ org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar
+ org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar
+ org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
 -org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
-+org.apache.commons.codec_1.3.0.v20100518-1140.jar=/usr/share/java/commons-codec.jar
-+org.apache.commons.el_1.0.0.v201004212143.jar=/usr/share/java/commons-el.jar
- org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar
- org.apache.commons.logging_1.0.4.v201005080501.jar=/usr/share/java/commons-logging.jar
--org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar
-+org.apache.jasper_5.5.17.v201004212143.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar
- org.apache.lucene_1.9.1.v20100518-1140.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
- org.apache.lucene.analysis_1.9.1.v20100518-1140.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
- org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
+-org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar
++org.apache.commons.el_1.0.0.v201101211617.jar=/usr/share/java/commons-el.jar
++org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar
+ org.apache.commons.logging_1.0.4.v201101211617.jar=/usr/share/java/commons-logging.jar
+ org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat/jasper.jar
+ org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
+ org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
+-org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
+-org.mortbay.jetty.server_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
++org.mortbay.jetty.util_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
++org.mortbay.jetty.server_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
+ org.sat4j.core_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
+ org.sat4j.pb_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties.orig	Fri Jul  1 20:12:45 2011
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties	Fri Jul  1 20:16:04 2011
+@@ -1,1 +1,1 @@
+-org.objectweb.asm_3.3.1.v201101071600.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
++org.objectweb.asm_3.3.1.v201105211655.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
+--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh~	Mon Dec 19 16:40:57 2011
++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh	Wed Feb 29 14:54:42 2012
+@@ -1,8 +1,8 @@
+-#! /bin/bash
++#! /bin/sh
+ label=$1
+ 
+ for f in `find ./build/eclipse-${label}-src/plugins -name build.xml`; do
+-        sed -i 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f}
+-        sed -i 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f}
+-        sed -i 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f}
++        sed -i .orig 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f}
++        sed -i .orig 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f}
++        sed -i .orig 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f}
+ done
diff --git a/java/eclipse/files/patch-generatedScripts b/java/eclipse/files/patch-generatedScripts
new file mode 100644
index 000000000000..02d05aae06d7
--- /dev/null
+++ b/java/eclipse/files/patch-generatedScripts
@@ -0,0 +1,80 @@
+$FreeBSD$
+
+diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml
+--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml	2011-09-09 09:31:10.000000000 +0200
++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml	2012-01-19 16:07:46.000000000 +0100
+@@ -105,7 +105,7 @@
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+-			<pathelement path="../org.apache.commons.httpclient_3.1.0.v201005080502.jar"/>
++			<pathelement path="../org.apache.commons.httpclient_3.1.0.v201012070820.jar"/>
+ 			<pathelement path="../org.apache.commons.codec_1.3.0.v201101211617.jar"/>
+ 			<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
+ 			<pathelement path="../org.eclipse.core.jobs/bin/"/>
+diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml
+--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml	2011-09-09 09:31:10.000000000 +0200
++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml	2012-01-19 16:07:59.000000000 +0100
+@@ -107,7 +107,7 @@
+ 		<path id="@dot.classpath">
+ 			<pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/bin/"/>
+ 			<pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/@dot"/>
+-			<pathelement path="../org.apache.commons.httpclient_3.1.0.v201005080502.jar"/>
++			<pathelement path="../org.apache.commons.httpclient_3.1.0.v201012070820.jar"/>
+ 			<pathelement path="../org.apache.commons.codec_1.3.0.v201101211617.jar"/>
+ 			<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
+ 			<pathelement path="../org.eclipse.core.jobs/bin/"/>
+diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml
+--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml	2011-09-09 09:31:10.000000000 +0200
++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml	2012-01-19 16:11:35.000000000 +0100
+@@ -99,11 +99,11 @@
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/>
+-			<pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/>
+-			<pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/>
++			<pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/>
++			<pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/>
++			<pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/>
+ 			<pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/>
+-			<pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/>
++			<pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/>
+ 			<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
+diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.help.base/build.xml
+--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml	2011-09-09 09:31:10.000000000 +0200
++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.help.base/build.xml	2012-01-19 16:12:03.000000000 +0100
+@@ -107,11 +107,11 @@
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/>
+-			<pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/>
+-			<pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/>
++			<pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/>
++			<pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/>
++			<pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/>
+ 			<pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/>
+-			<pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/>
++			<pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/>
+ 			<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
+@@ -238,11 +238,11 @@
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/>
+-			<pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/>
+-			<pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/>
++			<pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/>
++			<pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/>
++			<pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/>
+ 			<pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/>
+-			<pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/>
++			<pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/>
+ 			<pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
-- 
cgit v1.2.3