java/118088: The path of Variable Exec= in files/eclipse.desktop in not good

[Sofian Brabez]

>Number:         118088
>Category:       java
>Synopsis:       The path of Variable  Exec= in files/eclipse.desktop in not good
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-java
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 16 18:50:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Sofian Brabez
>Release:        7.0-BETA2
>Organization:
>Environment:
FreeBSD atemi 7.0-BETA2 FreeBSD 7.0-BETA2 #0: Fri Nov  2 16:47:33 UTC 2007     root at atemi:/usr/obj/usr/src/sys/ATEMI  i386
>Description:
I send this report to fix the problem of gnome desktop integration for java/eclipse-devel port.

Indeed, the value of variable Exec= in files/eclipse.desktop is not good, the current value is :

% cat /usr/local/share/applications/eclipse-devel.desktop | grep Exec=
Exec=/usr/local/bin/eclipse

I write a little script to test if i can fix it :

#!/bin/sh
#
# Author <sbz at gcu.info> , <sbrabez at gmail.com>
#
# Script test to validate my report problem on java/eclipse-devel
# port before port integration. Fix the Exec= value in file 
# eclipse.desktop
#

PREFIX="/usr/local"
PORTNAME="eclipse"
ECLIPSE_SUFX="-devel"
ECLIPSE_DESKTOP_NEW="eclipse.desktop.new"
ECLIPSE_DESKTOP_TMP="eclipse.desktop.tmp"
PORTDESTDIR="/usr/local/${PORTNAME}${ECLIPSE_SUFX}"
SED="sed"

${SED} \
        -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
        -e "s+%%PREFIX%%+${PREFIX}+g" \
        -e "s+%%SUFFIX%%+${ECLIPSE_SUFX}+g" \
        -e "s+%%PORTNAME%%+${PORTNAME}+g" \
${ECLIPSE_DESKTOP_NEW} > ${ECLIPSE_DESKTOP_TMP} 

My test will work good, so i decided but send diff to fix this problem.

After fix it, the new value must be :
% cat files/eclipse.desktop.tmp | grep Exec=
Exec=/usr/local/eclipse-devel/eclipse
>How-To-Repeat:
Just install port java/eclipse-devel.
>Fix:
To fix it, you can apply my diff file named eclipse-devel.desktopintegration.diff in root directory of port.

Patch attached with submission follows:

--- Makefile.new	2007-11-16 19:24:46.000000000 +0100
+++ Makefile	2007-11-16 19:21:27.000000000 +0100
@@ -132,8 +132,6 @@
 	@${SED} \
 	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
 	  -e "s+%%PREFIX%%+${PREFIX}+g" \
-		-e "s+%%SUFFIX%%+${ECLIPSE_SUFX}+g" \
-		-e "s+%%PORTNAME%%+${PORTNAME}+g" \
 	${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp
 	${MKDIR} ${PREFIX}/share/applications/ || ${TRUE}
 	${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/${ECLIPSE}.desktop
--- files/eclipse.desktop.new	2007-11-16 18:56:37.000000000 +0100
+++ files/eclipse.desktop	2007-11-16 18:23:07.000000000 +0100
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Eclipse IDE
 Name=Eclipse
-Exec=%%PREFIX%%/%%PORTNAME%%%%SUFFIX%%/%%PORTNAME%%
+Exec=%%PREFIX%%/bin/eclipse
 Encoding=UTF-8
 Terminal=false
 Type=Application


>Release-Note:
>Audit-Trail:
>Unformatted: