Index: Mk/Uses/desktop-file-utils.mk
===================================================================
--- Mk/Uses/desktop-file-utils.mk	(revision 0)
+++ Mk/Uses/desktop-file-utils.mk	(working copy)
@@ -0,0 +1,34 @@
+# $FreeBSD$
+#
+# handle dependency depends on desktop-file-info and package regen
+#
+# MAINTAINER: gnome@FreeBSD.org
+#
+# Feature:	desktop-file-info
+# Usage:	USES=desktop-file-info
+# Valid ARGS:	does not require args
+#
+#
+.if !defined(_INCLUDE_USES_DESKTOP_FILE_INFO_MK)
+_INCLUDE_USES_DESKTOP_FILE_INFO_MK=	yes
+
+.if defined(desktop-file-info_ARGS)
+IGNORE=	USES=desktop-file-info does not require args
+.endif
+
+BUILD_DEPENDS+=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
+RUN_DEPENDS+=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
+
+# bolt our post-install target to post-install
+post-install: desktop-file-post-install
+
+desktop-file-post-install:
+# run for port post-install
+	@-update-desktop-database
+# plist entries for packages.
+	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true" \
+		>> ${TMPPLIST}; \
+	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || /usr/bin/true" \
+		>> ${TMPPLIST}
+
+.endif
Index: Mk/Uses/shared-mime-info.mk
===================================================================
--- Mk/Uses/shared-mime-info.mk	(revision 0)
+++ Mk/Uses/shared-mime-info.mk	(working copy)
@@ -0,0 +1,35 @@
+# $FreeBSD$
+#
+# handle dependency depends on shared-mime-info and package regen
+#
+# MAINTAINER: gnome@FreeBSD.org
+#
+# Feature:	shared-mime-info
+# Usage:	USES=shared-mime-info
+# Valid ARGS:	does not require args
+#
+#
+.if !defined(_INCLUDE_USES_SHARED_MIME_INFO_MK)
+_INCLUDE_USES_SHARED_MIME_INFO_MK=	yes
+
+.if defined(shared-mime-info_ARGS)
+IGNORE=	USES=shared-mime-info does not require args
+.endif
+
+BUILD_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
+RUN_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
+
+# bolt our post-install target to post-install
+post-install: shared-mime-post-install
+
+shared-mime-post-install:
+# run for port post-install
+	@-update-desktop-database
+# plist entries for packages.
+# temp fix until I figure out of this is right or not.
+	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-mime-database %D/share/mime" \
+		>> ${TMPPLIST}; \
+	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-mime-database %D/share/mime" \
+		>> ${TMPPLIST}
+
+.endif
Index: x11-fm/nautilus/Makefile
===================================================================
--- x11-fm/nautilus/Makefile	(revision 315779)
+++ x11-fm/nautilus/Makefile	(working copy)
@@ -23,8 +23,9 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
+USES=		desktop-file-utils shared-mime-info
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
-		librsvg2 desktopfileutils ltverhack gvfs ltasneededhack
+		librsvg2 ltverhack gvfs ltasneededhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
@@ -43,9 +44,10 @@
 		${WRKSRC}/eel/eel-*.[ch] \
 		${WRKSRC}/libnautilus-private/*.[ch] \
 		${WRKSRC}/src/nautilus-zoom-control.c
+	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/configure ${WRKSRC}/eel/Makefile.in
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/nautilus/extensions-2.0
-	@-update-desktop-database
 
 .include <bsd.port.mk>
Index: x11-fm/nautilus/pkg-plist
===================================================================
--- x11-fm/nautilus/pkg-plist	(revision 315779)
+++ x11-fm/nautilus/pkg-plist	(working copy)
@@ -238,10 +238,6 @@
 @dirrmtry lib/nautilus
 @dirrm include/nautilus/libnautilus-extension
 @dirrm include/nautilus
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrm share/doc/libnautilus-extension
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu