Index: Mk/bsd.gnome.mk
===================================================================
--- Mk/bsd.gnome.mk
+++ Mk/bsd.gnome.mk
@@ -69,14 +69,14 @@
 
 # non-version specific components
 _USE_GNOME_ALL= esound intlhack intltool introspection \
-		gnomehack referencehack gnomemimedata \
+		referencehack gnomemimedata \
 		gnomeprefix
 
 # GNOME 1 components
 _USE_GNOME_ALL+= gdkpixbuf glib12 gtk12 imlib
 
 # GNOME 2 components
-_USE_GNOME_ALL+= atk atspi cairo desktopfileutils gal2 \
+_USE_GNOME_ALL+= atk atspi cairo gal2 \
 		gdkpixbuf2 gconf2 glib20 \
 		gnomedocutils gnomesharp20 \
 		gnomespeech gnomevfs2 gtk-update-icon-cache gtk20 gtkhtml3 gtksharp10 \
@@ -102,18 +102,6 @@
 
 GNOME_MAKEFILEIN?=	Makefile.in
 SCROLLKEEPER_DIR=	/var/db/rarian
-gnomehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${XARGS} ${REINPLACE_CMD} -e \
-				's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
-				 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
-				 s|{libdir}/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
-				 s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
-				 s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
-				 s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
-				 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
-			${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
-				's|-lpthread|${PTHREAD_LIBS}|g ; \
-				 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-				 s|{libdir}/locale|{prefix}/share/locale|g'
 
 referencehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 				"s|test \"\$$\$$installfiles\" = '\$$(srcdir)/html/\*'|:|"
@@ -475,11 +463,6 @@
 evolutiondataserver3_USE_GNOME_IMPL=	libxml2 gtk30
 evolutiondataserver3_GNOME_DESKTOP_VERSION=3
 
-desktopfileutils_BUILD_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
-desktopfileutils_RUN_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
-desktopfileutils_DETECT=	${LOCALBASE}/bin/update-desktop-database
-desktopfileutils_USE_GNOME_IMPL=glib20
-
 gnomemenus3_BUILD_DEPENDS=	gnome-menus>=3.2.0:${PORTSDIR}/x11/gnome-menus
 gnomemenus3_RUN_DEPENDS=	gnome-menus>=3.2.0:${PORTSDIR}/x11/gnome-menus
 gnomemenus3_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnome-menu-3.0.pc