. Update to 3.6.1.

Submitted by:	tg@

1 files changed, 130 insertions, 71 deletions

diff --git a/java/eclipse-devel/files/patch-eclipse-build b/java/eclipse-devel/files/patch-eclipse-build
index 4b087e24034f..38361393d3e3 100644
--- a/java/eclipse-devel/files/patch-eclipse-build
+++ b/java/eclipse-devel/files/patch-eclipse-build
@@ -63,7 +63,21 @@ $FreeBSD$
 +CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%%
 --- eclipse-build-0.5.0.orig/build.xml	2009-12-23 16:22:44.090824173 -0500
 +++ eclipse-build-0.5.0/build.xml	2009-12-23 16:23:06.357147407 -0500
-@@ -124,8 +124,7 @@
+@@ -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">
@@ -73,59 +87,73 @@ $FreeBSD$
  			<arg value="eclipse" />
  			<arg value="${buildDirectory}" />
  		</exec>
-@@ -243,8 +242,14 @@
+@@ -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="0" />
- 		<patch patchfile="${basedir}/patches/eclipse-jdt_launch-customBuild.patch" dir="${buildDirectory}" strip="0" />
--		<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="3" />
--		<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="6" />
-+		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library">
-+			<arg value="-p3" />
-+			<arg value="-i${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" />
-+		</exec>
-+		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library">
-+			<arg value="-p6" />
-+			<arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" />
-+		</exec>
- 		<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="0" />
- 		<patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="0" />
- 		<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}/features/org.eclipse.equinox.executable" strip="0" />
-@@ -269,6 +274,10 @@
- 			<replacefilter token="@build_arch@" value="${buildArch}" />
+ 		<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}" />
  		</replace>
-+		<exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
-+			<arg value="-p2" />
-+			<arg value="-i${basedir}/patches/freebsd-support.patch" />
-+		</exec>
+ 		<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>
  		<echo file="patch-stamp" />
  	</target>
  
-@@ -651,7 +660,8 @@
- 			<format property="timestamp" pattern="yyyyMMddHHmmss" />
- 		</tstamp>
- 		<chmod perm="ugo+rx" file="${basedir}/runtests.sh" />
+@@ -804,7 +815,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" />
++ 		<exec executable="${localbase}/bin/bash" dir="${basedir}">
++ 			<arg value="${basedir}/runtests.sh" />
  			<arg value="-t${timestamp}" />
  			<arg value="-a${buildArch}" />
  			<arg value="-o${buildOs}" />
-@@ -755,44 +765,42 @@
- 	</target>
+@@ -906,26 +918,25 @@
  
- 	<target name="install" depends="provision.sdk">
--		<mkdir dir="${destDir}${prefix}/${libDir}/eclipse" />
-+		<mkdir dir="${destDir}${prefix}/${libDir}/%%PORTNAME%%" />
- 		<exec executable="cp" failonerror="true">
+ 	<target name="installIntoDestDir">
+ 		<mkdir dir="${installationDir}" />
+-		<exec executable="cp" failonerror="true">
 -			<arg value="-rd" />
 -			<arg value="--no-target-directory" />
--			<arg value="${buildDirectory}/installation" />
--			<arg value="${destDir}${prefix}/${libDir}/eclipse" />
-+			<arg value="-R" />
-+			<arg value="${buildDirectory}/installation/" />
-+			<arg value="${destDir}${prefix}/${libDir}/%%PORTNAME%%" />
+-			<arg value="${provisionDir}" />
+-			<arg value="${installationDir}" />
++   		<exec executable="cp" failonerror="true">
++  			<arg value="-RL" />
++  			<arg value="${provisionDir}/" />
++  			<arg value="${installationDir}" />
  		</exec>
+ 
  		<!-- install desktop file -->
 -		<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
 +		<copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" />
@@ -139,44 +167,57 @@ $FreeBSD$
  		<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" />
- 		<!--shared dropins folder-->
+ 		<!--shared dropins folder for architecture-independent plugins-->
 -		<mkdir dir="${destDir}${prefix}/share/eclipse/dropins" />
--		<!-- eclipse binary -->
--		<mkdir dir="${destDir}${prefix}/bin" />
--		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
 +		<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="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
-+		<fileset dir="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
- 		<property name="startupjarpath" refid="startupjar" />
--		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
-+		<symlink link="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/startup.jar" resource="plugins/${startupjarpath}" />
- 		<!-- Create the "swt.jar" and friends symlinks  -->
--		<fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" />
-+		<fileset dir="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" />
- 		<property name="swtjarpath" refid="swtjar" />
--		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk-3.5.2.jar" resource="plugins/${swtjarpath}" />
--		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk.jar" resource="plugins/${swtjarpath}" />
--		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt.jar" resource="plugins/${swtjarpath}" />
--		
--		<echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
-+		<symlink link="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/swt-gtk-3.5.2.jar" resource="plugins/${swtjarpath}" />
-+		<symlink link="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/swt-gtk.jar" resource="plugins/${swtjarpath}" />
-+		<symlink link="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/swt.jar" resource="plugins/${swtjarpath}" />
-+
-+		<echo append="true" file="${destDir}${prefix}/${libDir}/%%PORTNAME%%/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" />
+ 		<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}" />
+ 
+-		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
++		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" />
  
+ 		<!-- Extract SWT JNI .so files -->
+ 		<java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
+@@ -990,8 +1001,8 @@
+ 			<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" />
+@@ -1012,7 +1023,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}">
+@@ -1027,9 +1038,11 @@
+ 		</apply>
+ 		
  		<!-- Move config file to /etc -->
 +		<!--
  		<mkdir dir="${destDir}/etc" />
- 		<move file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
- 		<symlink link="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" resource="/etc/eclipse.ini" />
--		
+ 		<move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
+ 		<symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" />
 +		-->
-+
+ 
  	</target>
  
- 	<target name="package.extract.swt">
 --- 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 @@
@@ -190,16 +231,22 @@ $FreeBSD$
  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
-@@ -5,7 +5,7 @@
+@@ -1,11 +1,11 @@
+ buildArch=x86
+ ws=gtk
+-os=linux
++os=freebsd
+ 
  buildId=M20100211-1343
  buildTag=vM20100211-1343
- label=3.5.2
+-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
 +bootclasspath=%%BOOTCLASSPATH%%
  #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
  
  javacFailOnError=true
-@@ -28,21 +28,21 @@
+@@ -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
@@ -250,3 +297,15 @@ $FreeBSD$
  		</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;