From dd9b0c8eedb914965aa372bf30bf71b002b7cb25 Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Sun, 10 Jul 2011 19:54:53 +0000
Subject: . Unbreak and update to 3.7.0.

Submitted by:	tg@
---
 .../files/eclipse-build-upstream.patch             |  38 +-
 java/eclipse-devel/files/freebsd-support.patch     | 277 ++----
 java/eclipse-devel/files/patch-eclipse-build       | 232 +++--
 java/eclipse-devel/files/patch-generatedScripts    | 938 +++++++++++++++++++++
 4 files changed, 1136 insertions(+), 349 deletions(-)
 create mode 100644 java/eclipse-devel/files/patch-generatedScripts

(limited to 'java/eclipse-devel/files')

diff --git a/java/eclipse-devel/files/eclipse-build-upstream.patch b/java/eclipse-devel/files/eclipse-build-upstream.patch
index d393f7447deb..69bee7f18dea 100644
--- a/java/eclipse-devel/files/eclipse-build-upstream.patch
+++ b/java/eclipse-devel/files/eclipse-build-upstream.patch
@@ -25,8 +25,8 @@ Index: build.xml
  		</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 +34,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 +117,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,6 +148,15 @@ 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}" />
+@@ -1023,7 +1027,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)
@@ -310,3 +328,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-devel/files/freebsd-support.patch b/java/eclipse-devel/files/freebsd-support.patch
index 06fae9851f59..c23dde56804a 100644
--- a/java/eclipse-devel/files/freebsd-support.patch
+++ b/java/eclipse-devel/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}" ]; 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.1.qualifier
++Bundle-Version: 3.7.0.qualifier
 +Bundle-ManifestVersion: 2
 +Bundle-Localization: fragment
 +Export-Package: 
@@ -5055,7 +4884,7 @@ $FreeBSD$
 +	<property name="swt.arch" value="x86" />
 +
 +	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
-+	<property name="version.suffix" value="3.6.1" />
++	<property name="version.suffix" value="3.7.0" />
 +
 +	<import file="../org.eclipse.swt/buildFragment.xml"/>
 +</project>
@@ -5113,7 +4942,7 @@ $FreeBSD$
 +Bundle-Name: %fragmentName
 +Bundle-Vendor: %providerName
 +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true
-+Bundle-Version: 3.5.0.qualifier
++Bundle-Version: 3.7.0.qualifier
 +Bundle-ManifestVersion: 2
 +Bundle-Localization: fragment
 +Export-Package: 
@@ -6936,7 +6765,7 @@ $FreeBSD$
 +	<property name="swt.arch" value="x86_64" />
 +
 +	<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
-+	<property name="version.suffix" value="3.6.1" />
++	<property name="version.suffix" value="3.7.0" />
 +
 +	<import file="../org.eclipse.swt/buildFragment.xml"/>
 +</project>
@@ -7504,19 +7333,19 @@ $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
-@@ -33,6 +33,7 @@
- org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20100810
- org.eclipse.equinox.http,0.0.0=v20100503
- org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3655c
-+org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3655c
- org.eclipse.swt.photon.qnx.x86,0.0.0=v3655c
- org.eclipse.equinox.p2.ui.admin,0.0.0=v20100503
- org.eclipse.equinox.weaving.caching.j9,0.0.0=v20100503
-@@ -244,6 +245,7 @@
- org.eclipse.swt.examples,0.0.0=v3655c
- org.eclipse.cvs,0.0.0=v20100414
- org.eclipse.swt.gtk.linux.x86,0.0.0=v3655c
-+org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3655c
- org.eclipse.equinox.log,0.0.0=v20100503
+@@ -34,6 +34,7 @@
+ 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=v3735b
++org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3735b
+ 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
+@@ -245,6 +246,7 @@
+ org.eclipse.swt.examples,0.0.0=v3735b
+ org.eclipse.cvs,0.0.0=v20110505-0800
+ org.eclipse.swt.gtk.linux.x86,0.0.0=v3735b
++org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3735b
+ 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
diff --git a/java/eclipse-devel/files/patch-eclipse-build b/java/eclipse-devel/files/patch-eclipse-build
index 38361393d3e3..ce7870555f70 100644
--- a/java/eclipse-devel/files/patch-eclipse-build
+++ b/java/eclipse-devel/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%%
@@ -87,48 +77,26 @@ $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" />
--		<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" />
-+ 		</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}" />
+@@ -319,6 +318,10 @@
  		</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" />
++		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
++			<arg value="-p2" />
++			<arg value="-i${basedir}/patches/freebsd-support.patch" />
++		</exec>
  		<echo file="patch-stamp" />
  	</target>
  
+@@ -704,7 +707,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>
+ 
 @@ -804,7 +815,8 @@
  		<!--
  		<echo message="Calling runtests with (debug, verbose) = (${testSwitches})" />
@@ -139,24 +107,18 @@ $FreeBSD$
  			<arg value="-t${timestamp}" />
  			<arg value="-a${buildArch}" />
  			<arg value="-o${buildOs}" />
-@@ -906,26 +918,25 @@
- 
- 	<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>
+@@ -965,7 +969,7 @@
+                 </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" todir="${efj}" />
+@@ -975,16 +979,16 @@
+ 	    <property name="launcherJar" refid="equinoxLauncher"/>
+ 		<replace file="${efj}/efj.sh" token="@LAUNCHER@" value="${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,21 +127,21 @@ $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" />
+@@ -992,7 +996,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" />
@@ -206,14 +168,14 @@ $FreeBSD$
  			<arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" />
  			<srcfile />
  			<fileset dir="${installationDir}/${profileDir}">
-@@ -1027,9 +1038,11 @@
+@@ -1101,9 +1105,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>
@@ -237,11 +199,11 @@ $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.1
+ buildId=3.7.0-I20110613-1736
+ buildTag=3.7.0-I20110613-1736
+-label=3.7.0-I20110613-1736
+-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
++label=3.7.0
 +bootclasspath=%%BOOTCLASSPATH%%
  #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
  
@@ -250,25 +212,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 +250,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,3 +270,32 @@ $FreeBSD$
 +Exec=%%PORTNAME%%
  Terminal=false
  Categories=Development;IDE;Java;
+--- 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,15 +1,15 @@
+ 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
+-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_2.5.0.v201103041518.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
+ javax.servlet.jsp_2.0.0.v201101211617.jar=/usr/share/java/tomcat6-jsp-2.1-api.jar:/usr/share/java/jsp-api-2.0.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.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_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.v201101211617.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.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
diff --git a/java/eclipse-devel/files/patch-generatedScripts b/java/eclipse-devel/files/patch-generatedScripts
new file mode 100644
index 000000000000..11827c20536a
--- /dev/null
+++ b/java/eclipse-devel/files/patch-generatedScripts
@@ -0,0 +1,938 @@
+$FreeBSD$
+
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ant.core/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ant.core/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ant.core/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ant.core/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -116,7 +114,7 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/>
+ 		</path>
+@@ -192,9 +188,9 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="${build.result.folder}/@dot"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.ant.core_3.2.300.v20110510/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.ant.core_3.2.300.v20110511/@dot"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/>
+ 		</path>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.expressions/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.expressions/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.expressions/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.expressions/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -142,7 +140,7 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 		</path>
+ 		<!-- compile the source code -->
+ 		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -123,7 +121,7 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 		</path>
+ 		<!-- compile the source code -->
+ 		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime.compatibility/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime.compatibility/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime.compatibility/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime.compatibility/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -142,7 +140,7 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.update.configurator/@dot"/>
+ 		</path>
+ 		<!-- compile the source code -->
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.variables/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.variables/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.variables/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.variables/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -115,7 +113,7 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 		</path>
+ 		<!-- compile the source code -->
+ 		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -95,28 +95,26 @@
+ 		<antcall target="gather.bin.parts">
+ 			<param name="destination.temp.folder" value="${temp.folder}/"/>
+ 		</antcall>
+-		<jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101" filesetmanifest="merge"/>
++		<jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201107041518.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201107041518" filesetmanifest="merge"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="@dot.nestedJars">
+-	</target>
+-	<target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient @dot.">
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient @dot.">
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+-			<pathelement path="../../../../../../../../../usr/share/java/jakarta-commons-httpclient-3.1.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/commons-codec.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
++			<pathelement path="../../../../bundles/org.apache.commons.httpclient_3.1.0.v201012070820.jar"/>
++			<pathelement path="../../../../bundles/org.apache.commons.codec_1.3.0.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/org.apache.commons.logging_1.0.4.v201101211617.jar"/>
+ 			<pathelement path="../org.eclipse.core.jobs/bin/"/>
+ 			<pathelement path="../org.eclipse.core.jobs/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.common/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.common/@dot"/>
+ 			<pathelement path="../org.eclipse.ecf.provider.filetransfer/bin/"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -95,30 +95,28 @@
+ 		<antcall target="gather.bin.parts">
+ 			<param name="destination.temp.folder" value="${temp.folder}/"/>
+ 		</antcall>
+-		<jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101" filesetmanifest="merge"/>
++		<jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201107041518.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201107041518" filesetmanifest="merge"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="@dot.nestedJars">
+-	</target>
+-	<target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient.ssl @dot.">
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient.ssl @dot.">
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+ 			<pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/bin/"/>
+ 			<pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/jakarta-commons-httpclient-3.1.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/commons-codec.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
++			<pathelement path="../../../../bundles/org.apache.commons.httpclient_3.1.0.v201012070820.jar"/>
++			<pathelement path="../../../../bundles/org.apache.commons.codec_1.3.0.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/org.apache.commons.logging_1.0.4.v201101211617.jar"/>
+ 			<pathelement path="../org.eclipse.core.jobs/bin/"/>
+ 			<pathelement path="../org.eclipse.core.jobs/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.common/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.common/@dot"/>
+ 			<pathelement path="../org.eclipse.ecf.provider.filetransfer/bin/"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.app/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.app/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.app/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.app/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -99,22 +99,20 @@
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="@dot.nestedJars">
+-	</target>
+-	<target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.app @dot.">
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.equinox.app @dot.">
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -81,30 +81,28 @@
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="@dot.nestedJars">
+-	</target>
+-	<target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.http.jetty @dot.">
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.equinox.http.jetty @dot.">
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.http.servlet/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.http.servlet/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-util-6.1.26.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-6.1.26.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-jsp-2.1-api.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-el-1.0.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
++			<pathelement path="../../../../bundles/org.mortbay.jetty.util_6.1.23.v201012071420.jar"/>
++			<pathelement path="../../../../bundles/org.mortbay.jetty.server_6.1.23.v201012071420.jar"/>
++			<pathelement path="../../../../bundles/org.apache.jasper_5.5.17.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet.jsp_2.0.0.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/org.apache.commons.el_1.0.0.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/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"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.servlet/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.servlet/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.servlet/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.servlet/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -90,20 +90,18 @@
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="@dot.nestedJars">
+-	</target>
+-	<target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.http.servlet @dot.">
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.equinox.http.servlet @dot.">
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+ 		</path>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.console/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.console/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.console/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.console/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -122,12 +120,12 @@
+ 			<pathelement path="../org.eclipse.equinox.security/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
++			<pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/>
+ 		</path>
+ 		<!-- compile the source code -->
+ 		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -120,12 +118,12 @@
+ 			<pathelement path="../org.eclipse.equinox.security/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
++			<pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/>
+ 		</path>
+ 		<!-- compile the source code -->
+ 		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director.app/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director.app/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director.app/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director.app/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -89,14 +87,14 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
+@@ -127,12 +125,12 @@
+ 			<pathelement path="../org.eclipse.equinox.security/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
++			<pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
+ 		</path>
+ 		<!-- compile the source code -->
+@@ -182,14 +178,14 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
+@@ -220,12 +216,12 @@
+ 			<pathelement path="../org.eclipse.equinox.security/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
++			<pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/>
+ 			<pathelement path="bin/"/>
+ 			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.director.app_1.0.300.v20110505/bin/"/>
+ 			<pathelement path="${build.result.folder}/@dot"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -108,7 +106,7 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -118,17 +116,17 @@
+ 			<pathelement path="../org.eclipse.equinox.security/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.app/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 		</path>
+ 		<!-- compile the source code -->
+ 		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -83,14 +81,14 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
+@@ -185,14 +181,14 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.repository.tools/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.repository.tools/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.repository.tools/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.repository.tools/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -89,14 +87,14 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
+@@ -135,8 +133,8 @@
+ 			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
+@@ -197,14 +193,14 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
+@@ -243,8 +239,8 @@
+ 			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -120,17 +118,17 @@
+ 			<pathelement path="../org.eclipse.equinox.security/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.garbagecollector/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.garbagecollector/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.app/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
+@@ -139,8 +137,8 @@
+ 			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.updatesite/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.updatesite/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.updatesite/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.updatesite/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -79,24 +79,22 @@
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="@dot.nestedJars">
+-	</target>
+-	<target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.updatesite @dot.">
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.equinox.p2.updatesite @dot.">
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.app/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -99,25 +99,18 @@
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="@dot.nestedJars">
+-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
+-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
+-			<patternset includes="icu-data.jar"/>
+-		</unzip>
+-	</target>
+-	<target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.help @dot.">
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.help @dot.">
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
+-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
++			<pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.common/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.common/@dot"/>
+@@ -140,7 +133,7 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.core.expressions/@dot"/>
+ 		</path>
+ 		<!-- compile the source code -->
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help.base/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help.base/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -77,42 +77,35 @@
+ 		<antcall target="gather.bin.parts">
+ 			<param name="destination.temp.folder" value="${temp.folder}/"/>
+ 		</antcall>
+-		<jar destfile="${plugin.destination}/org.eclipse.help.base_3.6.0.v20110506.jar" basedir="${temp.folder}/org.eclipse.help.base_3.6.0.v20110506" filesetmanifest="merge"/>
++		<jar destfile="${plugin.destination}/org.eclipse.help.base_3.6.0.v20110517.jar" basedir="${temp.folder}/org.eclipse.help.base_3.6.0.v20110517" filesetmanifest="merge"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="@dot.nestedJars">
+-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
+-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
+-			<patternset includes="icu-data.jar"/>
+-		</unzip>
+-	</target>
+-	<target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.help.base @dot.">
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.help.base @dot.">
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
+-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
++			<pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.http.servlet/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.http.servlet/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-util-6.1.26.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-6.1.26.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-jsp-2.1-api.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-el-1.0.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
++			<pathelement path="../../../../bundles/org.mortbay.jetty.util_6.1.23.v201012071420.jar"/>
++			<pathelement path="../../../../bundles/org.mortbay.jetty.server_6.1.23.v201012071420.jar"/>
++			<pathelement path="../../../../bundles/org.apache.jasper_5.5.17.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet.jsp_2.0.0.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/org.apache.commons.el_1.0.0.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/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"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/>
+@@ -137,8 +130,8 @@
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
+ 			<pathelement path="../org.apache.lucene"/>
+ 			<pathelement path="../org.apache.lucene/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/lucene.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/lucene-contrib/lucene-analyzers.jar"/>
++			<pathelement path="../../../../bundles/org.apache.lucene.core_2.9.1.v201101211721.jar"/>
++			<pathelement path="../../../../bundles/org.apache.lucene.analysis_2.9.1.v201101211721.jar"/>
+ 			<pathelement path="../org.eclipse.ant.core/@dot"/>
+ 			<pathelement path="../org.eclipse.core.variables/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime/@dot"/>
+@@ -212,38 +205,31 @@
+ 		</copy>
+ 	</target>
+ 
+-	<target name="ant_tasks/helpbase-ant.jar.nestedJars">
+-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
+-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
+-			<patternset includes="icu-data.jar"/>
+-		</unzip>
+-	</target>
+-	<target name="ant_tasks/helpbase-ant.jar" depends="init,ant_tasks/helpbase-ant.jar.nestedJars" unless="ant_tasks/helpbase-ant.jar" description="Create jar: org.eclipse.help.base ant_tasks/helpbase-ant.jar.">
++	<target name="ant_tasks/helpbase-ant.jar" depends="init" unless="ant_tasks/helpbase-ant.jar" description="Create jar: org.eclipse.help.base ant_tasks/helpbase-ant.jar.">
+ 		<delete dir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin"/>
+ 		<mkdir dir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin"/>
+ 		<path id="ant_tasks/helpbase-ant.jar.classpath">
+-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
+-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
++			<pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.http.servlet/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.http.servlet/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-util-6.1.26.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-6.1.26.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-jsp-2.1-api.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-el-1.0.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
++			<pathelement path="../../../../bundles/org.mortbay.jetty.util_6.1.23.v201012071420.jar"/>
++			<pathelement path="../../../../bundles/org.mortbay.jetty.server_6.1.23.v201012071420.jar"/>
++			<pathelement path="../../../../bundles/org.apache.jasper_5.5.17.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet.jsp_2.0.0.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/org.apache.commons.el_1.0.0.v201101211617.jar"/>
++			<pathelement path="../../../../bundles/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"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/>
+@@ -268,8 +254,8 @@
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
+ 			<pathelement path="../org.apache.lucene"/>
+ 			<pathelement path="../org.apache.lucene/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/lucene.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/lucene-contrib/lucene-analyzers.jar"/>
++			<pathelement path="../../../../bundles/org.apache.lucene.core_2.9.1.v201101211721.jar"/>
++			<pathelement path="../../../../bundles/org.apache.lucene.analysis_2.9.1.v201101211721.jar"/>
+ 			<pathelement path="../org.eclipse.ant.core/@dot"/>
+ 			<pathelement path="../org.eclipse.core.variables/@dot"/>
+ 			<pathelement path="../org.eclipse.core.runtime/@dot"/>
+@@ -294,7 +280,7 @@
+ 			<pathelement path="../org.eclipse.help/@dot"/>
+ 			<pathelement path="../org.eclipse.core.expressions/@dot"/>
+ 			<pathelement path="${build.result.folder}/@dot"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.help.base_3.6.0.v20110506/@dot"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.help.base_3.6.0.v20110517/@dot"/>
+ 		</path>
+ 		<!-- compile the source code -->
+ 		<javac destdir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.osgi.services/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.osgi.services/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.osgi.services/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.osgi.services/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -97,24 +97,22 @@
+ 		<antcall target="gather.bin.parts">
+ 			<param name="destination.temp.folder" value="${temp.folder}/"/>
+ 		</antcall>
+-		<jar destfile="${plugin.destination}/org.eclipse.osgi.services_3.3.0.v20110411.jar" basedir="${temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411" filesetmanifest="merge"/>
++		<jar destfile="${plugin.destination}/org.eclipse.osgi.services_3.3.0.v20110513.jar" basedir="${temp.folder}/org.eclipse.osgi.services_3.3.0.v20110513" filesetmanifest="merge"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="@dot.nestedJars">
+-	</target>
+-	<target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.osgi.services @dot.">
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.osgi.services @dot.">
+ 		<delete dir="${build.result.folder}/@dot"/>
+ 		<mkdir dir="${build.result.folder}/@dot"/>
+ 		<path id="@dot.classpath">
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 		</path>
+ 		<subant antfile="${customBuildCallbacks}" target="pre.@dot" failonerror="false" buildpath=".">
+ 			<property name="source.folder1" value="."/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.pde.build/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.pde.build/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.pde.build/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.pde.build/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -77,31 +77,24 @@
+ 		<antcall target="gather.bin.parts">
+ 			<param name="destination.temp.folder" value="${temp.folder}/"/>
+ 		</antcall>
+-		<jar destfile="${plugin.destination}/org.eclipse.pde.build_3.7.0.v20110509.jar" basedir="${temp.folder}/org.eclipse.pde.build_3.7.0.v20110509" filesetmanifest="merge"/>
++		<jar destfile="${plugin.destination}/org.eclipse.pde.build_3.7.0.v20110512-1320.jar" basedir="${temp.folder}/org.eclipse.pde.build_3.7.0.v20110512-1320" filesetmanifest="merge"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+-	<target name="pdebuild.jar.nestedJars">
+-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
+-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
+-			<patternset includes="icu-data.jar"/>
+-		</unzip>
+-	</target>
+-	<target name="pdebuild.jar" depends="init,pdebuild.jar.nestedJars" unless="pdebuild.jar" description="Create jar: org.eclipse.pde.build pdebuild.jar.">
++	<target name="pdebuild.jar" depends="init" unless="pdebuild.jar" description="Create jar: org.eclipse.pde.build pdebuild.jar.">
+ 		<delete dir="${temp.folder}/pdebuild.jar.bin"/>
+ 		<mkdir dir="${temp.folder}/pdebuild.jar.bin"/>
+ 		<path id="pdebuild.jar.classpath">
+-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
+-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
++			<pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.common/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.common/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
+@@ -144,7 +137,7 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
+@@ -166,8 +159,8 @@
+ 			<pathelement path="../org.eclipse.equinox.p2.repository.tools/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director.app/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director.app/@dot"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
+@@ -213,27 +206,20 @@
+ 		</copy>
+ 	</target>
+ 
+-	<target name="lib/pdebuild-ant.jar.nestedJars">
+-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
+-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
+-			<patternset includes="icu-data.jar"/>
+-		</unzip>
+-	</target>
+-	<target name="lib/pdebuild-ant.jar" depends="init,lib/pdebuild-ant.jar.nestedJars" unless="lib/pdebuild-ant.jar" description="Create jar: org.eclipse.pde.build lib/pdebuild-ant.jar.">
++	<target name="lib/pdebuild-ant.jar" depends="init" unless="lib/pdebuild-ant.jar" description="Create jar: org.eclipse.pde.build lib/pdebuild-ant.jar.">
+ 		<delete dir="${temp.folder}/lib/pdebuild-ant.jar.bin"/>
+ 		<mkdir dir="${temp.folder}/lib/pdebuild-ant.jar.bin"/>
+ 		<path id="lib/pdebuild-ant.jar.classpath">
+-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
+-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
++			<pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi/bin/"/>
+ 			<pathelement path="../org.eclipse.osgi/@dot"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
++			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.common/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.common/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
+@@ -276,7 +262,7 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
+@@ -298,14 +284,14 @@
+ 			<pathelement path="../org.eclipse.equinox.p2.repository.tools/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/>
++			<pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director.app/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.director.app/@dot"/>
+ 			<pathelement path="bin/"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110509/bin/"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110512-1320/bin/"/>
+ 			<pathelement path="${build.result.folder}/pdebuild.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110509/pdebuild.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110512-1320/pdebuild.jar"/>
+ 			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
+ 			<pathelement path="../org.eclipse.equinox.p2.repository.tools/lib/repository-tools-ant.jar"/>
+ 			<pathelement path="../org.apache.ant/ant.jar"/>
+diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.update.core/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.update.core/build.xml
+--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.update.core/build.xml	2011-06-15 18:11:43.000000000 +0200
++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.update.core/build.xml	2011-07-04 15:18:29.000000000 +0200
+@@ -126,22 +124,24 @@
+ 			<pathelement path="../org.eclipse.equinox.app/@dot"/>
+ 			<pathelement path="../org.eclipse.osgi.services"/>
+ 			<pathelement path="../org.eclipse.osgi.services/@dot"/>
+-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
++			<pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/>
+ 			<pathelement path="../org.eclipse.update.configurator/@dot"/>
+ 			<pathelement path="../org.eclipse.core.net/bin/"/>
+ 			<pathelement path="../org.eclipse.core.net/@dot"/>
+ 			<pathelement path="../org.eclipse.core.net.linux.x86_64/@dot"/>
+-			<pathelement path="../org.eclipse.core.net.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.core.net.linux.x86/@dot"/>
++			<pathelement path="../org.eclipse.core.net.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.core.net.win32.x86_64/@dot"/>
++			<pathelement path="../org.eclipse.core.net.freebsd.x86/@dot"/>
++			<pathelement path="../org.eclipse.core.net.freebsd.x86_64/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
+-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
+ 			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
++			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
+ 		</path>
+ 		<subant antfile="${customBuildCallbacks}" target="pre.@dot" failonerror="false" buildpath=".">
+ 			<property name="source.folder1" value="src/"/>
-- 
cgit v1.2.3