From 7a492ac2b5daaba7f244d452f3488dc5aaf9d8af Mon Sep 17 00:00:00 2001
From: John Marino <marino@FreeBSD.org>
Date: Thu, 26 Jun 2014 08:48:10 +0000
Subject: java/eclipse: Update version 3.7.1 => 4.3.2 and assign maintainer

At long last, eclipse has been updated to the latest release and is now
under the stewardship of Jimmy Kelly.  This version supports OpenJDK8
runtime environments.  A special thanks to Jonathan Chen for getting the
ball rolling after the PR stalled.

PR:		188659
Submitted by:	Jimmy Kelly
Distfiles by:	Jonathan Chen
Verified by:	F10/amd64 poudriere
---
 java/eclipse/files/patch-eclipse-build | 419 ---------------------------------
 1 file changed, 419 deletions(-)
 delete mode 100644 java/eclipse/files/patch-eclipse-build

(limited to 'java/eclipse/files/patch-eclipse-build')

diff --git a/java/eclipse/files/patch-eclipse-build b/java/eclipse/files/patch-eclipse-build
deleted file mode 100644
index fd225a9ce180..000000000000
--- a/java/eclipse/files/patch-eclipse-build
+++ /dev/null
@@ -1,419 +0,0 @@
-$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
-@@ -118,11 +118,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" />
-@@ -167,8 +167,7 @@
- 	<target name="copySource" unless="sdkSourcePresent">
- 		<echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" />
- 		<exec executable="cp" failonerror="true">
--			<arg value="-rd" />
--			<arg value="--no-target-directory" />
-+			<arg value="-R" />
- 			<arg value="eclipse" />
- 			<arg value="${buildDirectory}" />
- 		</exec>
-@@ -309,12 +308,18 @@
- 		<!--
- 		<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" />
- 		-->
--		<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
-+ 		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
-+ 			<arg value="-p1" />
-+ 			<arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" />
-+ 		</exec>
- 		<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
--		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
-+  		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
-+  			<arg value="-p1" />
-+  			<arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" />
-+  		</exec>
- 		<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
-@@ -337,20 +342,30 @@
- 		</replace>
- 		<patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" />
- 		<patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" />
--		<patch patchfile="${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" dir="${buildDirectory}/plugins" strip="2" />
-+   		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins">
-+   			<arg value="-p2" />
-+   			<arg value="-i${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" />
-+   		</exec>
- 		<patch patchfile="${basedir}/patches/remove-lucene-dependency.patch" dir="${buildDirectory}" strip="1" />
- 		<patch patchfile="${basedir}/patches/eclipse-equinox-jsp-jasper.patch" dir="${buildDirectory}" strip="0" />
- 		<patch patchfile="${basedir}/patches/eclipse-equinox-http-jetty.patch" dir="${buildDirectory}" strip="0" />
- 		<patch patchfile="${basedir}/patches/eclipse-equinox-http-servlet.patch" dir="${buildDirectory}" strip="0" />
- 		<patch patchfile="${basedir}/patches/eclipse-help-feature.patch" dir="${buildDirectory}" strip="0" />
- 		<patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" />
-+   		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
-+   			<arg value="-p2" />
-+   			<arg value="-i${basedir}/patches/freebsd-support.patch" />
-+   		</exec>
- 		<echo file="patch-stamp" />
- 	</target>
- 
- 	<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
- 		<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
- 		<patch patchfile="${basedir}/patches/tests-noequinoxregiontests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
--		<patch patchfile="${basedir}/patches/tests-BZ295666.patch" dir="${testsBuildDirectory}" strip="0" />
-+   		<exec executable="${localbase}/bin/gpatch" dir="${testsBuildDirectory}">
-+   			<arg value="-p0" />
-+   			<arg value="-i${basedir}/patches/tests-BZ295666.patch" />
-+   		</exec>
- 		<patch patchfile="${basedir}/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.pde.ui.tests" strip="0" />
- 		<patch patchfile="${basedir}/patches/tests-nop2discoverytests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
- 		<patch patchfile="${basedir}/patches/tests-org.eclipse.ant.tests.core.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.ant.tests.core" strip="0" />
-@@ -725,7 +729,7 @@
- 	<target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete">
- 		<echo message="Installing into:  ${provisionDir}" />
- 		<antcall target="provision">
--			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
-+			<param name="p2.director.installIU" value="org.eclipse.sdk.ide,org.eclipse.equinox.initializer" />
- 			<param name="profileName" value="SDKProfile" />
- 		</antcall>
- 
-@@ -850,7 +854,8 @@
- 		<!--
- 		<echo message="Calling runtests with (debug, verbose) = (${testSwitches})" />
- 		-->
--		<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}" />
-@@ -1014,33 +1030,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}" />
-+ 		<copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" />
- 	    <fileset id="equinoxLauncher" dir="${installationDir}/plugins">
- 	      <include name="org.eclipse.equinox.launcher_*.jar" />
- 	    </fileset>
- 	    <property name="launcherJar" refid="equinoxLauncher"/>
--		<replace file="${efj}" token="@LAUNCHER@" value="${prefix}/${libDir}/eclipse/plugins/${launcherJar}"/>
- 		<!-- install icons -->
--		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" />
--		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
--		<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" />
-@@ -1013,7 +1015,7 @@
- 		<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
- 		<symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
- 
--		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
-+		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" />
- 
- 		<!-- Extract SWT JNI .so files -->
- 		<java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
-@@ -1039,7 +1041,7 @@
- 
- 		<!-- copy PDE and JDT to dropins -->
-                 <exec executable="rsync" failonerror="true">
--                       <arg value="-vrpl" />
-+                       <arg value="-vrpL" />
-                        <arg value="${provisionDir}/dropins/" />
-                        <arg value="${installationDir}/dropins/" />
-                 </exec>
-@@ -1072,8 +1074,8 @@
- 			<arg value="s@/@_@g" />
- 		</exec>
- 		<apply executable="sed" failonerror="true" verbose="true">
--			<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" />
-@@ -1094,7 +1096,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}">
-@@ -1109,9 +1111,11 @@
- 		</apply>
- 		
- 		<!-- Move config file to /etc -->
-+		<!--
- 		<mkdir dir="${destDir}/etc" />
- 		<move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
- 		<symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" overwrite="true"/>
-+		-->
- 
- 	</target>
- 
-@@ -1156,8 +1164,7 @@
- 
- 		<!-- make a copy of the clean platform+CVS installation -->
- 		<exec executable="cp" failonerror="true">
--			<arg value="-rd" />
--			<arg value="--no-target-directory" />
-+			<arg value="-R" />
- 			<arg value="${provisionDir}" />
- 			<arg value="${platformAndCVSInstallation}" />
- 		</exec>
-@@ -1173,16 +1180,14 @@
- 			tofile="${jdtInstallation}"/>
- 		<!-- make a second copy of the clean JDT installation -->
- 		<exec executable="cp" failonerror="true">
--			<arg value="-rd" />
--			<arg value="--no-target-directory" />
-+			<arg value="-R" />
- 			<arg value="${jdtInstallation}" />
- 			<arg value="${jdtInstallation}.orig" />
- 		</exec>
- 		
- 		<!-- restore clean platform+CVS installation -->
- 		<exec executable="cp" failonerror="true">
--			<arg value="-rd" />
--			<arg value="--no-target-directory" />
-+			<arg value="-R" />
- 			<arg value="${platformAndCVSInstallation}" />
- 			<arg value="${provisionDir}" />
- 		</exec>
-@@ -1199,8 +1204,7 @@
- 		
- 		<!-- restore clean platform+CVS installation -->
- 		<exec executable="cp" failonerror="true">
--			<arg value="-rd" />
--			<arg value="--no-target-directory" />
-+			<arg value="-R" />
- 			<arg value="${platformAndCVSInstallation}" />
- 			<arg value="${provisionDir}" />
- 		</exec>
---- eclipse-build-0.5.0.orig/pdebuild/eclipse-pdebuild.sh	2009-11-11 07:59:07.000000000 -0500
-+++ eclipse-build-0.5.0/pdebuild/eclipse-pdebuild.sh	2009-12-23 16:23:06.357147407 -0500
-@@ -230,7 +230,7 @@
- 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=R3_7_1
- buildTag=R3_7_1
- label=3.7.1
--bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
-+bootclasspath=%%BOOTCLASSPATH%%
- #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
- 
- 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,5 +1,5 @@
- com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar:/usr/share/java/icu4j.jar
--com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
-+com.jcraft.jsch_0.1.41.v201101211617.jar=/usr/share/java/jsch.jar
- javax.servlet_3.0.0.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar
- javax.servlet.jsp_2.2.0.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar
- javax.el_2.2.0.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar
-@@ -7,13 +7,13 @@
- org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar
- org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar
- org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
--org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
--org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar
-+org.apache.commons.el_1.0.0.v201101211617.jar=/usr/share/java/commons-el.jar
-+org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar
- org.apache.commons.logging_1.0.4.v201101211617.jar=/usr/share/java/commons-logging.jar
- org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat/jasper.jar
- org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
- org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
--org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
--org.mortbay.jetty.server_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
-+org.mortbay.jetty.util_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
-+org.mortbay.jetty.server_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
- org.sat4j.core_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
- org.sat4j.pb_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties.orig	Fri Jul  1 20:12:45 2011
-+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties	Fri Jul  1 20:16:04 2011
-@@ -1,1 +1,1 @@
--org.objectweb.asm_3.3.1.v201101071600.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
-+org.objectweb.asm_3.3.1.v201105211655.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
---- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh~	Mon Dec 19 16:40:57 2011
-+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh	Wed Feb 29 14:54:42 2012
-@@ -1,8 +1,8 @@
--#! /bin/bash
-+#! /bin/sh
- label=$1
- 
- for f in `find ./build/eclipse-${label}-src/plugins -name build.xml`; do
--        sed -i 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f}
--        sed -i 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f}
--        sed -i 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f}
-+        sed -i .orig 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f}
-+        sed -i .orig 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f}
-+        sed -i .orig 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f}
- done
-- 
cgit v1.2.3