Index: editors/libreoffice/Makefile
===================================================================
--- editors/libreoffice/Makefile	(revision 322089)
+++ editors/libreoffice/Makefile	(working copy)
@@ -218,9 +218,13 @@
 			--disable-lockdown
 .endif
 
+.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK3}
+USES+=		desktop-file-utils
+INSTALLS_ICONS=	yes
+.endif
+
 .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
-USE_GNOME+=	gtk20 desktopfileutils
-INSTALLS_ICONS=	yes
+USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk
 .else
 CONFIGURE_ARGS+=	--disable-gtk
@@ -227,9 +231,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
-BROKEN=		requires GTK+ 3.2 and later
-USE_GNOME+=	gtk30 desktopfileutils
-INSTALLS_ICONS=	yes
+USE_GNOME+=	gtk30
 CONFIGURE_ARGS+=	--enable-gtk3
 .else
 CONFIGURE_ARGS+=	--disable-gtk3
@@ -413,11 +415,6 @@
 	    \( -type f -o -type l \) -print >> ${PLISTF}
 .endfor
 
-.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK3}
-	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database >/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database >/dev/null || ${TRUE}" >> ${TMPPLIST}
-.endif
-
 .if ${PORT_OPTIONS:MSDK}
 .for subdir in include share share/doc share/idl
 	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \
@@ -439,8 +436,4 @@
 	@${INSTALL_SCRIPT} ${LODESTDIR}/etc/bash_completion.d/libreoffice.sh \
 	    ${PREFIX}/etc/bash_completion.d
 
-.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
-	@${LOCALBASE}/bin/update-desktop-database 2>/dev/null || ${TRUE}
-.endif
-
 .include <bsd.port.post.mk>