From owner-freebsd-eclipse@FreeBSD.ORG  Wed Jul 27 09:26:58 2011
Return-Path: <owner-freebsd-eclipse@FreeBSD.ORG>
Delivered-To: freebsd-eclipse@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 85E201065672
	for <freebsd-eclipse@freebsd.org>; Wed, 27 Jul 2011 09:26:58 +0000 (UTC)
	(envelope-from Thomas.Gellekum@gmx.de)
Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23])
	by mx1.freebsd.org (Postfix) with SMTP id 07A528FC19
	for <freebsd-eclipse@freebsd.org>; Wed, 27 Jul 2011 09:26:57 +0000 (UTC)
Received: (qmail invoked by alias); 27 Jul 2011 09:26:56 -0000
Received: from xdsl-78-34-97-148.netcologne.de (EHLO siegel.tg.intern)
	[78.34.97.148]
	by mail.gmx.net (mp031) with SMTP; 27 Jul 2011 11:26:56 +0200
X-Authenticated: #18235045
X-Provags-ID: V01U2FsdGVkX185NSkgP7M5dfnnMFnTZTj1yKgveCJ4IYzuXDcNJ2
	2YrwdyowJqxxj1
Message-ID: <4E2FD9DF.4020405@gmx.de>
Date: Wed, 27 Jul 2011 11:26:55 +0200
From: Thomas Gellekum <Thomas.Gellekum@gmx.de>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:5.0) Gecko/20110701 Thunderbird/5.0
MIME-Version: 1.0
To: Pav Lucistnik <pav@FreeBSD.org>
References: <201107261953.p6QJrFML022389@repoman.freebsd.org>
In-Reply-To: <201107261953.p6QJrFML022389@repoman.freebsd.org>
Content-Type: multipart/mixed; boundary="------------040306080801040800070005"
X-Y-GMX-Trusted: 0
Cc: freebsd-eclipse@freebsd.org
Subject: Re: cvs commit: ports/java/eclipse-devel Makefile
X-BeenThere: freebsd-eclipse@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps &amp;
	ports." <freebsd-eclipse.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-eclipse>, 
	<mailto:freebsd-eclipse-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-eclipse>
List-Post: <mailto:freebsd-eclipse@freebsd.org>
List-Help: <mailto:freebsd-eclipse-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-eclipse>,
	<mailto:freebsd-eclipse-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jul 2011 09:26:58 -0000

This is a multi-part message in MIME format.
--------------040306080801040800070005
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

On 07/26/11 21:53, Pav Lucistnik wrote:
> pav         2011-07-26 19:53:15 UTC
>
>    FreeBSD ports repository
>
>    Modified files:
>      java/eclipse-devel   Makefile
>    Log:
>    - Mark BROKEN: does not package
>      tar: share/applications/eclipse-devel.desktop: Cannot stat: No such file or directory

Please commit the attached patch to fix this.

tg

--------------040306080801040800070005
Content-Type: text/plain;
 name="eclipse-devel.20110727.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="eclipse-devel.20110727.diff"

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/eclipse-devel/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile	26 Jul 2011 19:53:15 -0000	1.40
+++ Makefile	27 Jul 2011 09:21:54 -0000
@@ -36,8 +36,6 @@
 		zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
-BROKEN=		fails to package
-
 OPTIONS=	TESTS	"Build SDK test suite"	off
 
 ONLY_FOR_ARCHS=	i386 amd64
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	27 Jul 2011 09:22:57 -0000
@@ -97,7 +111,7 @@
  			<param name="profileName" value="SDKProfile" />
  		</antcall>
  
-@@ -804,7 +815,8 @@
+@@ -829,7 +833,8 @@
  		<!--
  		<echo message="Calling runtests with (debug, verbose) = (${testSwitches})" />
  		-->
@@ -107,7 +121,7 @@
  			<arg value="-t${timestamp}" />
  			<arg value="-a${buildArch}" />
  			<arg value="-o${buildOs}" />
-@@ -958,7 +962,7 @@
+@@ -958,33 +963,29 @@
  	<target name="installIntoDestDir">
  		<mkdir dir="${installationDir}" />
                  <exec executable="rsync" failonerror="true">
@@ -116,13 +130,14 @@
                         <arg value="--exclude=dropins" />
                         <arg value="${provisionDir}/" />
                         <arg value="${installationDir}/" />
-@@ -966,25 +970,21 @@
+                 </exec>
  
  		<!-- install desktop file -->
- 		<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
+-		<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>
@@ -148,7 +163,7 @@
  		<!-- 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 +996,7 @@
+@@ -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"/>
  
@@ -157,7 +172,7 @@
  
  		<!-- Extract SWT JNI .so files -->
  		<java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
-@@ -990,8 +1001,8 @@
+@@ -1064,8 +1065,8 @@
  			<arg value="s@/@_@g" />
  		</exec>
  		<apply executable="sed" failonerror="true" verbose="true">
@@ -168,7 +183,7 @@
  			<srcfile />
  			<fileset dir="${installationDir}">
  				<include name="metadata/content.xml" />
-@@ -1012,7 +1023,7 @@
+@@ -1086,7 +1087,7 @@
  			</fileset>
  		</apply>
  		<apply executable="sed" failonerror="true" verbose="true">

--------------040306080801040800070005--