Upgrade of eclipse-devel to 3.7.0

[Thomas Gellekum]

On 07/18/11 08:44, Thomas Gellekum wrote:
> On 07/17/11 22:46, Heiner Strauss wrote:
>> Am 07/12/11 17:33, schrieb Thomas Gellekum:
>>>
>>> Also: I noticed plugins installed as a normal user don't work. I have
>>> no clue yet where that regression comes from. Workaround: install
>>> additional plugins as root.
>   >
>> That problem apeared with 3.6 too. There was a solution.
>
> I think that was 3.5, when p2 was introduced; 3.6 works fine for me.

Apparently, the preferred way to install eclipse from the source build 
changed, and some of the targets that we've been using in the Ant 
build.xml are considered obsolete.

Please try the attached patch.

tg
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/eclipse-devel/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile	14 Jul 2011 07:05:14 -0000	1.39
+++ Makefile	25 Jul 2011 17:55:03 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	eclipse-devel
 PORTVERSION=	3.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/:1 \
 		http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins/:2 \
@@ -105,6 +105,8 @@
 FBSD_SUPPORT_SRCFILE=	freebsd-support.patch
 ECLIPSE_GENERATED_BUILDSCRIPTS=	eclipse-build-generatedScripts.tar.bz2
 
+ALL_TARGET=	provision.cvs
+INSTALL_TARGET=	installSDKinDropins
 MAKE_ARGS=	-DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION}
 MAKE_ENV+=	GRE_HOME=${PREFIX}/lib/${GECKO} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR}
 
Index: files/patch-eclipse-build
===================================================================
RCS file: /home/ncvs/ports/java/eclipse-devel/files/patch-eclipse-build,v
retrieving revision 1.5
diff -u -r1.5 patch-eclipse-build
--- files/patch-eclipse-build	14 Jul 2011 16:12:59 -0000	1.5
+++ files/patch-eclipse-build	25 Jul 2011 17:56:32 -0000
@@ -189,6 +203,45 @@
  
  	</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 @@