Use the new GConf handling policy, this will be required for GNOME 2.7/2.8 or

those ports will not work. Please see the more detail about this:

http://lists.freebsd.org/pipermail/freebsd-gnome/2004-June/007253.html

Also, please check http://www.freebsd.org/gnome/docs/porting.html for the
update about gconf, gconf.pl script and etc.

Approved by:	marcus (portmgr hat)
Reviewed by:	My team, FreeBSD GNOME Team

2 files changed, 4 insertions, 48 deletions

diff --git a/x11-wm/expocity/pkg-plist b/x11-wm/expocity/pkg-plist
index 664209a39d14..d292cd03dc73 100644
--- a/x11-wm/expocity/pkg-plist
+++ b/x11-wm/expocity/pkg-plist
@@ -2,19 +2,9 @@ bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
 bin/metacity-window-demo
-etc/gconf/gconf.xml.defaults/apps/metacity/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/global_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/keybinding_commands/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/window_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/workspace_names/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/global_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/keybinding_commands/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/window_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/workspace_names/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/metacity.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/metacity.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/metacity.schemas > /dev/null || /usr/bin/true
 include/metacity-1/metacity-private/common.h
 include/metacity-1/metacity-private/gradient.h
 include/metacity-1/metacity-private/preview-widget.h
@@ -191,15 +181,3 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo
 @dirrm share/gnome/expocity
 @dirrm include/metacity-1/metacity-private
 @dirrm include/metacity-1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/workspace_names
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/window_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/keybinding_commands
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/global_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/workspace_names
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/window_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/keybinding_commands
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/global_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index ea5c31d5c2f3..059778ca2e3d 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -2,19 +2,9 @@ bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
 bin/metacity-window-demo
-etc/gconf/gconf.xml.defaults/apps/metacity/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/global_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/keybinding_commands/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/window_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/workspace_names/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/global_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/keybinding_commands/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/window_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/workspace_names/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/metacity.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/metacity.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/metacity.schemas > /dev/null || /usr/bin/true
 include/metacity-1/metacity-private/common.h
 include/metacity-1/metacity-private/gradient.h
 include/metacity-1/metacity-private/preview-widget.h
@@ -198,15 +188,3 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo
 @dirrm share/gnome/metacity
 @dirrm include/metacity-1/metacity-private
 @dirrm include/metacity-1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/workspace_names
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/window_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/keybinding_commands
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/global_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/workspace_names
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/window_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/keybinding_commands
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/global_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity