ports/86086: fix java/eclipse when building with WITH_MOTIF

["Panagiotis Astithas" <Panagiotis Astithas]

>Number:         86086
>Category:       ports
>Synopsis:       fix java/eclipse when building with WITH_MOTIF
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 13 18:40:08 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Panagiotis Astithas
>Release:        FreeBSD 6.0-BETA4 i386
>Organization:
EBS Ltd. 
>Environment:


System: FreeBSD 6.0-BETA4 #4: Wed Sep  7 23:21:08 EEST 2005
    past at ajax.ebs.gr:/usr/obj/usr/src/sys/GENERIC



>Description:


This is a one-liner fix for the build with WITH_MOTIF=yes, plus another patch that creates a desktop menu entry under GNOME.


>How-To-Repeat:


Try to build eclipse with WITH_MOTIF=yes.


>Fix:


--- eclipse.patch begins here ---
diff -ruN /usr/ports/java/eclipse/Makefile eclipse/Makefile
--- /usr/ports/java/eclipse/Makefile	Thu Sep  8 21:11:41 2005
+++ eclipse/Makefile	Tue Sep 13 21:24:36 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	eclipse
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200506271435
@@ -90,9 +90,10 @@
 		MAKE_GNOME=${MAKE_GNOME} \
 		MAKE_MOZILLA=${MAKE_MOZILLA} \
 		MAKE_CAIRO=${MAKE_CAIRO} \
+		MACHINE_ARCH=${MACHINE_ARCH} \
 		MOTIF_HOME=${X11_HOME}
 
-PLIST_FILES=	bin/eclipse
+PLIST_FILES=	bin/eclipse share/gnome/applications/eclipse.desktop
 
 SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library
 SWTMOTIF=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/motif/library
@@ -122,6 +123,11 @@
 	  -e "s+%%BROWSER%%+${BROWSER}+g" \
 	${FILESDIR}/eclipse.in > ${WRKSRC}/eclipse.tmp
 	${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/eclipse
+	@${SED} \
+	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
+	  -e "s+%%PREFIX%%+${PREFIX}+g" \
+	${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp
+	${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${X11BASE}/share/gnome/applications/eclipse.desktop
 	${INSTALL_PROGRAM} ${WRKSRC}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse
 	@(cd ${WRKSRC}; ${FIND} -s eclipse -not -type d) >> ${TMPPLIST}
 	@(cd ${WRKSRC}; ${FIND} -s -d eclipse -type d) \
diff -ruN /usr/ports/java/eclipse/files/eclipse.desktop eclipse/files/eclipse.desktop
--- /usr/ports/java/eclipse/files/eclipse.desktop	Thu Jan  1 02:00:00 1970
+++ eclipse/files/eclipse.desktop	Tue Sep 13 21:20:03 2005
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Comment=Eclipse IDE
+Name=Eclipse
+Exec=%%PREFIX%%/bin/eclipse
+Encoding=UTF-8
+Terminal=false
+Type=Application
+Icon=%%ECLIPSE_HOME%%/icon.xpm
+Categories=Application;Development;
+
--- eclipse.patch ends here ---



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