Date: Wed, 28 Sep 2005 00:04:22 +0300 From: "\"Panagiotis Astithas\" <Panagiotis Astithas" <past@ebs.gr> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/86649: Fix java/eclipse installation issues Message-ID: <1127855062.0@ajax.ebs.gr> Resent-Message-ID: <200509272110.j8RLAG1R012633@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 86649
>Category: ports
>Synopsis: Fix java/eclipse installation issues
>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 27 21:10:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Panagiotis Astithas
>Release: FreeBSD 6.0-BETA5 i386
>Organization:
EBS Ltd.
>Environment:
System: FreeBSD 6.0-BETA5 #5: Wed Sep 21 02:27:23 EEST 2005
past@ajax.ebs.gr:/usr/obj/usr/src/sys/GENERIC
>Description:
The current java/eclipse port fails to build if the WITH_MOZILLA option is set to the unusual value of "mozilla". This patch fixes it.
Also the current port installs an Eclipse menu entry for Gnome. This patch makes the entry visible to KDE as well, and calls update-desktop-database to make the entry appear at once. It also fixes the deinstall case.
>How-To-Repeat:
Try to build eclipse with WITH_MOZILLA=mozilla.
Try to uninstall eclipse.
>Fix:
--- eclipse.patch begins here ---
diff -ruN /usr/ports/java/eclipse/Makefile eclipse/Makefile
--- /usr/ports/java/eclipse/Makefile Sun Sep 25 12:55:29 2005
+++ eclipse/Makefile Tue Sep 27 20:51:01 2005
@@ -44,7 +44,7 @@
.else
ECLIPSE_WS= gtk
.if !defined(WITHOUT_MOZILLA)
-.if defined(WITH_MOZILLA)
+.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} != "mozilla"
BROWSER= ${WITH_MOZILLA}
MAKE_MOZILLA= make_mozilla
BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER}
@@ -66,10 +66,10 @@
.if defined(WITHOUT_GNOMEVFS)
MAKE_GNOME=
-USE_GNOME= gtk20 pkgconfig
+USE_GNOME= gtk20 pkgconfig desktopfileutils
.else
MAKE_GNOME= make_gnome
-USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig
+USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils
.endif
.include <bsd.port.pre.mk>
@@ -93,7 +93,7 @@
MACHINE_ARCH=${MACHINE_ARCH} \
MOTIF_HOME=${X11_HOME}
-PLIST_FILES= bin/eclipse share/gnome/applications/eclipse.desktop
+PLIST_FILES= bin/eclipse share/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
@@ -129,10 +129,13 @@
-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_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/eclipse.desktop
${INSTALL_PROGRAM} ${WRKSRC}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse
+ @-update-desktop-database
@(cd ${WRKSRC}; ${FIND} -s eclipse -not -type d) >> ${TMPPLIST}
+ @echo '@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
@(cd ${WRKSRC}; ${FIND} -s -d eclipse -type d) \
| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
+ @echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
.include <bsd.port.post.mk>
--- eclipse.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1127855062.0>