ports/java/eclipse-devel/files/patch-eclipse-build
Greg Lewis 80054fb31e . Fix bogus symlinks being installed as plugins rather than the actual
JARs by passing -L to rsync rather than -l.
. Bump PORTREVISION since this can cause plugin installation to fail.

Submitted by:	Wayne Sierke <ws@au.dyndns.ws>
Feature safe:	yes
2011-12-07 22:14:19 +00:00

359 lines
24 KiB
Text

$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
@@ -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:/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
@@ -117,11 +117,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>
<property name="doTests" value="true" />
@@ -166,8 +166,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>
@@ -319,6 +318,10 @@
</replace>
<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>
@@ -829,7 +833,8 @@
<!--
<echo message="Calling runtests with (debug, verbose) = (${testSwitches})" />
-->
- <exec executable="${basedir}/runtests.sh" dir="${basedir}">
+ <exec executable="${localbase}/bin/bash" dir="${basedir}">
+ <arg value="${basedir}/runtests.sh" />
<arg value="-t${timestamp}" />
<arg value="-a${buildArch}" />
<arg value="-o${buildOs}" />
@@ -958,33 +963,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" todir="${efj}" />
+ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" />
<fileset id="equinoxLauncher" dir="${installationDir}/plugins">
<include name="org.eclipse.equinox.launcher_*.jar" />
</fileset>
<property name="launcherJar" refid="equinoxLauncher"/>
- <replace file="${efj}/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" />
- <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/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/%%PORTNAME%%.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" />
<mkdir dir="${destDir}${prefix}/share/pixmaps" />
- <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" 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 +993,7 @@
<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
<symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
- <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
+ <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" />
<!-- Extract SWT JNI .so files -->
<java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
@@ -1031,7 +1032,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>
@@ -1064,8 +1065,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" />
@@ -1086,7 +1087,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}">
@@ -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" overwrite="true"/>
+ -->
</target>
@@ -1126,8 +1129,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>
@@ -1143,16 +1145,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>
@@ -1169,8 +1169,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,11 +1,11 @@
buildArch=x86
ws=gtk
-os=linux
+os=freebsd
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
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.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