$FreeBSD$

--- 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
@@ -11,7 +11,7 @@
 skipFetch=true
 individualSourceBundles=true
 ws=gtk
-os=linux
+os=freebsd
 includeLaunchers=true
 runPackager=true
 groupConfigurations=true
@@ -27,7 +27,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:/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}
@@ -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:/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%%
+OSGi/Minimum-1.0=%%BOOTCLASSPATH%%
+OSGi/Minimum-1.1=%%BOOTCLASSPATH%%
+OSGi/Minimum-1.2=%%BOOTCLASSPATH%%
+JRE-1.1=%%BOOTCLASSPATH%%
+J2SE-1.2=%%BOOTCLASSPATH%%
+J2SE-1.3=%%BOOTCLASSPATH%%
+J2SE-1.4=%%BOOTCLASSPATH%%
+J2SE-1.5=%%BOOTCLASSPATH%%
+JavaSE-1.6=%%BOOTCLASSPATH%%
+PersonalJava-1.1=%%BOOTCLASSPATH%%
+PersonalJava-1.2=%%BOOTCLASSPATH%%
+CDC-1.0/PersonalBasis-1.0=%%BOOTCLASSPATH%%
+CDC-1.0/PersonalJava-1.0=%%BOOTCLASSPATH%%
+CDC-1.1/PersonalBasis-1.1=%%BOOTCLASSPATH%%
+CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%%
--- eclipse-build-0.5.0.orig/build.xml	2009-12-23 16:22:44.090824173 -0500
+++ eclipse-build-0.5.0/build.xml	2009-12-23 16:23:06.357147407 -0500
@@ -121,11 +121,11 @@
 
 	<target name="setLibDir" depends="setLib64Dir">
 		<property name="libDir" value="lib" />
-		<property name="installationDir" value="${destDir}${prefix}/${libDir}/eclipse" />
+		<property name="installationDir" value="${destDir}${prefix}/${libDir}/%%PORTNAME%%" />
 	</target>
 
 	<target name="getInstallationDir" depends="setLibDir">
-		<echo message="Installation directory will be ${destDir}/${prefix}/${libDir}" />
+		<echo message="Installation directory will be ${destDir}/${prefix}/${libDir}/%%PORTNAME%%" />
 	</target>
 
 	<target name="bootstrap" unless="bootstrapped">
@@ -180,8 +180,7 @@
 	<target name="copySource" unless="sdkSourcePresent">
 		<echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" />
 		<exec executable="cp" failonerror="true">
-			<arg value="-rd" />
-			<arg value="--no-target-directory" />
+			<arg value="-R" />
 			<arg value="eclipse" />
 			<arg value="${buildDirectory}" />
 		</exec>
@@ -365,32 +364,38 @@
 
 	<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
 		
-		<patch patchfile="${basedir}/patches/stableUserHome.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/>
-		<patch patchfile="${basedir}/patches/doNotRunAsRoot.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/>
-		<patch patchfile="${basedir}/patches/pickUpRenamedJars.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/>
-		<patch patchfile="${basedir}/patches/populateUpdateSites.patch" dir="${buildDirectory}/plugins" strip="2" backups="true"/>
-		<patch patchfile="${basedir}/patches/eclipse-p2-uninstall-removed-content.patch" dir="${buildDirectory}/plugins" strip="2" backups="true"/>
+		<patch patchfile="${basedir}/patches/stableUserHome.patch" dir="${buildDirectory}/plugins" strip="1"/>
+		<patch patchfile="${basedir}/patches/doNotRunAsRoot.patch" dir="${buildDirectory}/plugins" strip="1"/>
+		<patch patchfile="${basedir}/patches/pickUpRenamedJars.patch" dir="${buildDirectory}/plugins" strip="1"/>
+		<patch patchfile="${basedir}/patches/populateUpdateSites.patch" dir="${buildDirectory}/plugins" strip="2"/>
+		<patch patchfile="${basedir}/patches/eclipse-p2-uninstall-removed-content.patch" dir="${buildDirectory}/plugins" strip="2"/>
 
 		<!-- eclipse-build-only patches -->
 		
 		<patch patchfile="${basedir}/patches/e4-remove-w3c-smil-and-use-geronimo.patch" dir="${buildDirectory}" strip="0" reverse="false"/>
-		<patch patchfile="${basedir}/patches/nocoreupdate.patch" dir="${buildDirectory}" strip="0" reverse="false" backups="true" />
+		<patch patchfile="${basedir}/patches/nocoreupdate.patch" dir="${buildDirectory}" strip="0" reverse="false" />
 
-		<patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" backups="true"/>
-		<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
+		<patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1"/>
+		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
+			<arg value="-p1" />
+			<arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" />
+		</exec>
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
-		<patch patchfile="${basedir}/patches/e4-add-archs-swt.patch" dir="${buildDirectory}" strip="2" backups="true"/>
+		<patch patchfile="${basedir}/patches/e4-add-archs-swt.patch" dir="${buildDirectory}" strip="2"/>
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
 		<patch patchfile="${basedir}/patches/s390-correctly-build-executable.patch" dir="${buildDirectory}" strip="1"/>
 		<patch patchfile="${basedir}/patches/eclipse-add-archs-net.patch" dir="${buildDirectory}" strip="1" />
 		<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
 		
 		<patch patchfile="${basedir}/patches/fix-gnomeproxy-includes.patch" dir="${buildDirectory}" strip="1" />
-		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
+ 		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
+ 			<arg value="-p1" />
+ 			<arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" />
+ 		</exec>
 
 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" />
 
-		<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="2" backups="true"/>
+		<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="2"/>
 
 		<patch patchfile="${basedir}/patches/eclipse-help-feature-adjust-dependencies.patch" dir="${buildDirectory}" strip="1" />
 		<patch patchfile="${basedir}/patches/eclipse-help-fix-webapp-jsp-compilation.patch" dir="${buildDirectory}/plugins" strip="1"/>
@@ -424,11 +429,16 @@
 		<!-- Point (2) implies that you cannot use PDE build.xml, because there is no source folder, so nothing will be compiled -->
 		<!-- Point (1) implies that developers will not create a source folder, because they want to ship binaries -->
 		<!-- So we have to live with those two patches -->
-		<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="0" backups="true"/>
+		<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="0"/>
 		<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="0" />
 
 		<patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" />
 
+  		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
+  			<arg value="-p2" />
+  			<arg value="-i${basedir}/patches/freebsd-support.patch" />
+  		</exec>
+
 		<!-- jsr14 is practically unusable with java7 -->
 		<antcall target="jsr14To15" />
 
@@ -952,34 +962,29 @@
 	<target name="installIntoDestDir">
 		<mkdir dir="${installationDir}" />
 		<exec executable="rsync" failonerror="true">
-			<arg value="-vrpl" />
+			<arg value="-vrpL" />
 			<arg value="--exclude=dropins" />
 			<arg value="${provisionDir}/" />
 			<arg value="${installationDir}/" />
 		</exec>
 
 		<!-- install desktop file -->
-		<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
-		<!-- install Eclipse Java code formatter launcher -->
-		<property name="efj" value="${destDir}${prefix}/bin/efj"/>
-		<copy file="efj.sh" tofile="${efj}" />
-		<chmod file="${efj}" perm="ugo+rx"/>
+		<copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" />
 		<fileset id="equinoxLauncher" dir="${installationDir}/plugins">
 			<include name="org.eclipse.equinox.launcher_*.jar" />
 		</fileset>
 		<property name="launcherJar" refid="equinoxLauncher"/>
-		<replace file="${efj}" token="@LAUNCHER@" value="${prefix}/${libDir}/eclipse/plugins/${launcherJar}"/>
 		<!-- install icons -->
-		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
-		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
-		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse256.png" tofile="${destDir}${prefix}/share/icons/hicolor/256x256/apps/eclipse.png" />
+		<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" />
+		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse256.png" tofile="${destDir}${prefix}/share/icons/hicolor/256x256/apps/%%PORTNAME%%.png" />
 		<mkdir dir="${destDir}${prefix}/share/pixmaps" />
-		<symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/256x256/apps/eclipse.png" overwrite="true"/>
+		<symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/256x256/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" 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" />
@@ -987,7 +992,7 @@
 		<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
 		<symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
 
-		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
+		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" />
 
 		<!-- Extract SWT JNI .so files -->
 		<antcall target="extractSos">
@@ -1008,7 +1013,7 @@
 
 		<!-- copy PDE and JDT to dropins -->
 		<exec executable="rsync" failonerror="true">
-			<arg value="-vrpl" />
+			<arg value="-vrpL" />
 			<arg value="${provisionDir}/dropins/" />
 			<arg value="${installationDir}/dropins/" />
 		</exec>
@@ -1041,8 +1046,8 @@
 			<arg value="s@/@_@g" />
 		</exec>
 		<apply executable="sed" failonerror="true" verbose="true">
-			<arg value="-i" />
-			<arg value="\@${destDir}@d;\@${destDirWithUnderscores}@d;\@${reposourceWithUnderscores}@d;\@${provisionDirWithUnderscores}@d" />
+			<arg value="-i.bak" />
+			<arg value="\@${reposourceWithUnderscores}@d;\@${provisionDirWithUnderscores}@d" />
 			<srcfile />
 			<fileset dir="${installationDir}">
 				<include name="metadata/content.xml" />
@@ -1063,7 +1068,7 @@
 			</fileset>
 		</apply>
 		<apply executable="sed" failonerror="true" verbose="true">
-			<arg value="-i" />
+			<arg value="-i.bak" />
 			<arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" />
 			<srcfile />
 			<fileset dir="${installationDir}/${profileDir}">
@@ -1078,9 +1083,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" overwrite="true"/>
+		-->
 
 	</target>
 
@@ -1095,8 +1102,7 @@
 
 		<!-- make a copy of the clean platform+CVS installation -->
 		<exec executable="cp" failonerror="true">
-			<arg value="-rd" />
-			<arg value="--no-target-directory" />
+			<arg value="-R" />
 			<arg value="${provisionDir}" />
 			<arg value="${platformAndCVSInstallation}" />
 		</exec>
@@ -1112,16 +1118,14 @@
 			tofile="${jdtInstallation}"/>
 		<!-- make a second copy of the clean JDT installation -->
 		<exec executable="cp" failonerror="true">
-			<arg value="-rd" />
-			<arg value="--no-target-directory" />
+			<arg value="-R" />
 			<arg value="${jdtInstallation}" />
 			<arg value="${jdtInstallation}.orig" />
 		</exec>
 
 		<!-- restore clean platform+CVS installation -->
 		<exec executable="cp" failonerror="true">
-			<arg value="-rd" />
-			<arg value="--no-target-directory" />
+			<arg value="-R" />
 			<arg value="${platformAndCVSInstallation}" />
 			<arg value="${provisionDir}" />
 		</exec>
@@ -1138,8 +1142,7 @@
 
 		<!-- restore clean platform+CVS installation -->
 		<exec executable="cp" failonerror="true">
-			<arg value="-rd" />
-			<arg value="--no-target-directory" />
+			<arg value="-R" />
 			<arg value="${platformAndCVSInstallation}" />
 			<arg value="${provisionDir}" />
 		</exec>
--- eclipse-build-0.5.0.orig/pdebuild/eclipse-pdebuild.sh	2009-11-11 07:59:07.000000000 -0500
+++ eclipse-build-0.5.0/pdebuild/eclipse-pdebuild.sh	2009-12-23 16:23:06.357147407 -0500
@@ -230,7 +230,7 @@
 fi
 
 if [ "x$orbitDepsDir" != "x" ]; then
-    orbitDeps="-DorbitDepsDir=$orbitDepsDir"
+    orbitDeps="-DorbitDepsDir=\"$orbitDepsDir\""
 fi
 
 if [ "x$zipDeps" != "x" ]; then
--- eclipse-build-0.5.0.orig/pdebuild.properties	2009-10-01 08:58:04.000000000 -0400
+++ eclipse-build-0.5.0/pdebuild.properties	2009-12-23 16:23:06.358151430 -0500
@@ -1,10 +1,10 @@
 buildArch=x86
 ws=gtk
-os=linux
+os=freebsd
 
 buildId=I20120608-1400
 label=4.2.0-I20120608-1400
-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
 
 javacFailOnError=true
@@ -29,21 +29,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:/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%%
+OSGi/Minimum-1.0=%%BOOTCLASSPATH%%
+OSGi/Minimum-1.1=%%BOOTCLASSPATH%%
+OSGi/Minimum-1.2=%%BOOTCLASSPATH%%
+JRE-1.1=%%BOOTCLASSPATH%%
+J2SE-1.2=%%BOOTCLASSPATH%%
+J2SE-1.3=%%BOOTCLASSPATH%%
+J2SE-1.4=%%BOOTCLASSPATH%%
+J2SE-1.5=%%BOOTCLASSPATH%%
+JavaSE-1.6=%%BOOTCLASSPATH%%
+PersonalJava-1.1=%%BOOTCLASSPATH%%
+PersonalJava-1.2=%%BOOTCLASSPATH%%
+CDC-1.0/PersonalBasis-1.0=%%BOOTCLASSPATH%%
+CDC-1.0/PersonalJava-1.0=%%BOOTCLASSPATH%%
+CDC-1.1/PersonalBasis-1.1=%%BOOTCLASSPATH%%
+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
@@ -206,6 +206,7 @@
 			<arg line="-DbuildOs=${buildOs} " />
 			<arg line="-DbuildId=${buildId} " />
 			<arg line="-debug -consolelog" />
+			<arg line="-vmargs -Xmx1024 " />
 		</java>
 		<taskdef name="eclipse.versionReplacer"
 		         classname="org.eclipse.pde.internal.build.tasks.GenericVersionReplacer"
--- eclipse-build-0.6.1/eclipse.desktop.orig	Tue Sep 29 23:34:41 2009
+++ eclipse-build-0.6.1/eclipse.desktop	Tue Oct 26 15:24:36 2010
@@ -2,7 +2,7 @@
 Type=Application
 Name=Eclipse
 Comment=Eclipse Integrated Development Environment
-Icon=eclipse
-Exec=eclipse
+Icon=%%PORTNAME%%
+Exec=%%PORTNAME%%
 Terminal=false
 Categories=Development;IDE;Java;
--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/dependencies.properties.orig	Thu Jun 30 16:45:54 2011
+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/dependencies.properties	Thu Jun 30 16:46:18 2011
@@ -10,7 +10,7 @@
 javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar
 javax.servlet.jsp_2.2.0.v201112011158.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar
 javax.el_2.2.0.v201108011116.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar
-javax.xml_1.0.1.v200903091627.jar=/usr/share/java/xml-commons-apis.jar
+javax.xml_1.3.4.v201005080400.jar=/usr/share/java/xml-commons-apis.jar
 org.apache.batik.css_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-css.jar
 org.apache.batik.util_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-util.jar
 org.apache.batik.util.gui_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-gui-util.jar
@@ -18,7 +18,7 @@
 org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar
 org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar
 org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
-org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
+org.apache.commons.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.felix.gogo.command_0.8.0.v201108120515.jar=/usr/share/java/felix/org.apache.felix.gogo.command.jar
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencies/nonosgidependencies.properties~	Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencies/nonosgidependencies.properties	Wed Jul 25 18:03:02 2012
@@ -20,10 +20,3 @@
 org.apache.ant_1.8.3.v20120321-1730/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
 org.apache.ant_1.8.3.v20120321-1730/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar
 org.apache.ant_1.8.3.v20120321-1730/lib/ant.jar=/usr/share/java/ant.jar
-#bin folder
-org.apache.ant_1.8.3.v20120321-1730/bin/ant=/usr/bin/ant
-org.apache.ant_1.8.3.v20120321-1730/bin/antRun=/usr/bin/antRun
-org.apache.ant_1.8.3.v20120321-1730/bin/antRun.pl=/usr/bin/antRun.pl
-org.apache.ant_1.8.3.v20120321-1730/bin/runant.pl=/usr/bin/runant.pl
-org.apache.ant_1.8.3.v20120321-1730/bin/runant.py=/usr/bin/runant.py
-org.apache.ant_1.8.3.v20120321-1730/bin/complete-ant-cmd.pl=/usr/bin/complete-ant-cmd.pl
--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/sdkdependencies.properties.orig	Fri Jul  1 20:12:45 2011
+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/sdkdependencies.properties	Fri Jul  1 20:16:04 2011
@@ -1,1 +1,1 @@
-org.objectweb.asm_3.3.1.v201101071600.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
+org.objectweb.asm_3.3.1.v201105211655.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh~	Mon Dec 19 16:40:57 2011
+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh	Wed Feb 29 14:54:42 2012
@@ -1,8 +1,8 @@
-#! /bin/bash
+#! /bin/sh
 label=$1
 
 for f in `find ./build/eclipse-${label}-src/plugins -name build.xml`; do
-        sed -i 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f}
-        sed -i 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f}
-        sed -i 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f}
+        sed -i .orig 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f}
+        sed -i .orig 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f}
+        sed -i .orig 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f}
 done
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/additionalArchs/rename.sh~	Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/additionalArchs/rename.sh	Fri Jun 29 15:04:36 2012
@@ -4,13 +4,13 @@
 newArch=$2
 
 moves(){
-for f in $(find -type d); do
+for f in $(find . -type d); do
       tofile=$(echo $f | sed "s/$baseArch/$newArch/")
       if [ $tofile != $f ]; then
         cp -pfr $f $tofile
       fi
     done
-for f in $(find -type f); do
+for f in $(find . -type f); do
       tofile=$(echo $f | sed "s/$baseArch/$newArch/")
       if [ $tofile != $f ]; then
         cp -pfr $f $tofile
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform/p2.inf~	Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform/p2.inf	Wed Aug  8 13:48:10 2012
@@ -56,3 +56,20 @@
 units.3.touchpoint.version=1.0.0
 units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
 units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
+
+requires.4.namespace=org.eclipse.equinox.p2.iu
+requires.4.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
+requires.4.range=[1.0.0,1.0.0]
+requires.4.greedy=true
+
+units.4.id=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+units.4.version=1.0.0
+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.4.provides.1.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+units.4.provides.1.version=1.0.0
+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
+units.4.touchpoint.id=org.eclipse.equinox.p2.osgi
+units.4.touchpoint.version=1.0.0
+units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
+units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform.sdk/p2.inf~	Thu Jun 28 12:02:14 2012
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform.sdk/p2.inf	Wed Aug  8 13:55:04 2012
@@ -56,3 +56,20 @@
 units.3.touchpoint.version=1.0.0
 units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
 units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
+
+requires.4.namespace=org.eclipse.equinox.p2.iu
+requires.4.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
+requires.4.range=[1.0.0,1.0.0]
+requires.4.greedy=true
+
+units.4.id=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+units.4.version=1.0.0
+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.4.provides.1.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
+units.4.provides.1.version=1.0.0
+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
+units.4.touchpoint.id=org.eclipse.equinox.p2.osgi
+units.4.touchpoint.version=1.0.0
+units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
+units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);