7 files changed, 38 insertions, 140 deletions

diff --git a/sysutils/battfink/pkg-plist b/sysutils/battfink/pkg-plist
index 4ce281e429a8..bcec08856ec2 100644
--- a/sysutils/battfink/pkg-plist
+++ b/sysutils/battfink/pkg-plist
@@ -1,7 +1,7 @@
 bin/battfink
-etc/gconf/gconf.xml.defaults/apps/battfink/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/battfink/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/battfink.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/battfink.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/battfink.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_Battfink.server
 share/gnome/battfink/battfink.glade
 share/gnome/battfink/help/C/battfink.xml
@@ -41,6 +41,4 @@ share/locale/zh_TW/LC_MESSAGES/battfink-0.1.mo
 @dirrm share/gnome/battfink/help/C
 @dirrm share/gnome/battfink/help
 @dirrm share/gnome/battfink
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battfink
-@dirrm etc/gconf/gconf.xml.defaults/apps/battfink
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/battfink/battfink-C.omf 2>/dev/null || /usr/bin/true
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 01a008e96232..6676dfd5a3fa 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -19,37 +19,27 @@ bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
 bin/gnome-ui-properties
 bin/gnome-window-properties
-etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/fontilus.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/themus.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
 etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
 include/gnome-window-settings-2.0/gnome-window-manager.h
@@ -238,27 +228,3 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon
diff --git a/sysutils/gnome-pkgview/pkg-plist b/sysutils/gnome-pkgview/pkg-plist
index 891c596dc9d7..46bc8ef21a3d 100644
--- a/sysutils/gnome-pkgview/pkg-plist
+++ b/sysutils/gnome-pkgview/pkg-plist
@@ -1,7 +1,7 @@
 bin/gnome-pkgview
-etc/gconf/gconf.xml.defaults/apps/gnome-pkgview/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-pkgview/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-pkgview.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-pkgview.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-pkgview.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-pkgview.desktop
 share/gnome/pixmaps/gnome-pkgview/debian.png
 share/gnome/pixmaps/gnome-pkgview/fedora.png
@@ -48,5 +48,3 @@ share/locale/vi/LC_MESSAGES/gnome-pkgview.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pkgview.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pkgview.mo
 @dirrm share/gnome/pixmaps/gnome-pkgview
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-pkgview
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-pkgview
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index bf559c2732a3..96505c1e463e 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -1,13 +1,7 @@
 bin/gnome-system-monitor
-etc/gconf/gconf.xml.defaults/apps/procman/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/procman/disktree/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/procman/memmapstree/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/procman/proctree/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/procman/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/procman/disktree/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-system-monitor.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-system-monitor.desktop
 share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
@@ -84,12 +78,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 @dirrm share/gnome/help/gnome-system-monitor/C/figures
 @dirrm share/gnome/help/gnome-system-monitor/C
 @dirrm share/gnome/help/gnome-system-monitor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/disktree
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman
-@dirrm etc/gconf/gconf.xml.defaults/apps/procman/proctree
-@dirrm etc/gconf/gconf.xml.defaults/apps/procman/memmapstree
-@dirrm etc/gconf/gconf.xml.defaults/apps/procman/disktree
-@dirrm etc/gconf/gconf.xml.defaults/apps/procman
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 01a008e96232..6676dfd5a3fa 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -19,37 +19,27 @@ bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
 bin/gnome-ui-properties
 bin/gnome-window-properties
-etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/fontilus.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/themus.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
 etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
 include/gnome-window-settings-2.0/gnome-window-manager.h
@@ -238,27 +228,3 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index bf559c2732a3..96505c1e463e 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -1,13 +1,7 @@
 bin/gnome-system-monitor
-etc/gconf/gconf.xml.defaults/apps/procman/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/procman/disktree/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/procman/memmapstree/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/procman/proctree/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/procman/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/procman/disktree/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-system-monitor.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-system-monitor.desktop
 share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
@@ -84,12 +78,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 @dirrm share/gnome/help/gnome-system-monitor/C/figures
 @dirrm share/gnome/help/gnome-system-monitor/C
 @dirrm share/gnome/help/gnome-system-monitor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/proctree
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/memmapstree
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman/disktree
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/procman
-@dirrm etc/gconf/gconf.xml.defaults/apps/procman/proctree
-@dirrm etc/gconf/gconf.xml.defaults/apps/procman/memmapstree
-@dirrm etc/gconf/gconf.xml.defaults/apps/procman/disktree
-@dirrm etc/gconf/gconf.xml.defaults/apps/procman
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 8c060323f0ae..c568590ce43b 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,7 +1,7 @@
 bin/nautilus-cd-burner
-etc/gconf/gconf.xml.defaults/apps/nautilus-cd-burner/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus-cd-burner/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/ncb.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/ncb.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/ncb.schemas > /dev/null || /usr/bin/true
 etc/gnome-vfs-2.0/modules/mapping-modules.conf
 lib/gnome-vfs-2.0/modules/libmapping.so
 lib/nautilus/extensions-1.0/libnautilus-burn.a
@@ -72,5 +72,3 @@ share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 @dirrm share/gnome/nautilus-cd-burner
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus-cd-burner
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus-cd-burner