From e1843490cc7848ecaac4e9421ff0e1dfd98eac04 Mon Sep 17 00:00:00 2001
From: gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Wed, 9 Oct 2013 09:26:26 +0000
Subject: Add staging support to bsd.gnome.mk:

	- Prefix with ${STAGEDIR} the ${PREFIX} knobs in [pre|post]-su-install
	- Remove the gtk-update-icon-cache in gnome-post-install. It is already in the pkg-plist
	- Keep the order of the exec/unexec in the other targets. They don't deal with the installation of new files so they don't need to be resorted

Reviewed by:	kwm


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18782 df743ca5-7f9a-e211-a948-0013205c9059
---
 Mk/bsd.gnome.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Mk')

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 789135887..66fa6f3a5 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -970,10 +970,10 @@ 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}/} ${PREFIX}/ >/dev/null
+	@${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${STAGEDIR}${PREFIX}/ >/dev/null
 .endif
 .if defined(GCONF_SCHEMAS)
-	@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gconf/gconf.xml.defaults/
 .else
 	@${DO_NADA}
 .endif
@@ -1019,7 +1019,6 @@ gnome-post-install:
 			>> ${TMPPLIST}; \
 		${ECHO_CMD} "@unexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \
 			>> ${TMPPLIST}; \
-		${LOCALBASE}/bin/gtk-update-icon-cache -q -f ${PREFIX}/$${i} 2>/dev/null || ${TRUE}; \
 	done
 	@if test -f ${TMPPLIST}.icons1; then \
 		${CAT} ${TMPPLIST}.icons1 ${TMPPLIST} > ${TMPPLIST}.icons2; \
-- 
cgit v1.2.3