3 files changed, 4 insertions, 16 deletions

diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh
index a726246877b0..7a250e59de2a 100644
--- a/Mk/Scripts/check-stagedir.sh
+++ b/Mk/Scripts/check-stagedir.sh
@@ -173,11 +173,7 @@ parse_mtree() {
 		fi
 		listmtree "${PORTSDIR}/Templates/BSD.local.dist" "${LOCALBASE}"
 
-		if [ -n "${GNOME_MTREE_FILE}" ] && \
-		    [ -f "${GNOME_MTREE_FILE}" ]; then
-			listmtree "${GNOME_MTREE_FILE}" "${PREFIX}"
-		fi
-		unset MTREE_FILE GNOME_MTREE_FILE
+		unset MTREE_FILE
 
 		# Add LOCALBASE
 		a=${LOCALBASE}
@@ -361,7 +357,7 @@ esac
 
 # validate environment
 envfault=
-for i in STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE GNOME_MTREE_FILE \
+for i in STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE \
     TMPPLIST PLIST_SUB_SED SCRIPTSDIR \
     PORT_OPTIONS NO_PREFIX_RMDIR
 do
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index a10754dd3555..f189fd2436e5 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -69,7 +69,7 @@ Gnome_Pre_Include=			bsd.gnome.mk
 
 # non-version specific components
 _USE_GNOME_ALL= esound intlhack intltool introspection \
-		gnomehack referencehack gnomehier gnomemimedata \
+		gnomehack referencehack gnomemimedata \
 		gnomeprefix
 
 # GNOME 1 components
@@ -118,10 +118,6 @@ gnomehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${
 referencehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 				"s|test \"\$$\$$installfiles\" = '\$$(srcdir)/html/\*'|:|"
 
-GNOME_MTREE_FILE?=		${LOCALBASE}/etc/mtree/BSD.gnome.dist
-gnomehier_DETECT=	${GNOME_MTREE_FILE}
-gnomehier_RUN_DEPENDS=	${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
-
 GNOME_HTML_DIR?=	${PREFIX}/share/doc
 GCONF_CONFIG_OPTIONS?=	merged
 GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults
@@ -754,14 +750,11 @@ CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http://
 
 
 .if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) || defined(INSTALLS_ICONS) \
-	|| defined(GLIB_SCHEMAS) || (defined(_USE_GNOME) && ${_USE_GNOME:Mgnomehier}!="")
+	|| defined(GLIB_SCHEMAS)
 pre-su-install: gnome-pre-su-install
 post-install: gnome-post-install
 
 gnome-pre-su-install:
-.if defined(_USE_GNOME) && ${_USE_GNOME:Mgnomehier}!="" && !defined(NO_MTREE)
-	@${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${STAGEDIR}${PREFIX}/ >/dev/null
-.endif
 .if defined(GCONF_SCHEMAS)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gconf/gconf.xml.defaults/
 .else
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 216271b378e5..1782512ab8bf 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1085,7 +1085,6 @@ CO_ENV+=	STAGEDIR=${STAGEDIR} \
 			WRKDIR=${WRKDIR} \
 			WRKSRC=${WRKSRC} \
 			MTREE_FILE=${MTREE_FILE} \
-			GNOME_MTREE_FILE=${GNOME_MTREE_FILE} \
 			TMPPLIST=${TMPPLIST} \
 			SCRIPTSDIR=${SCRIPTSDIR} \
 			PLIST_SUB_SED="${PLIST_SUB_SED}" \