Use the new GConf handling policy.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2457 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 14 insertions, 40 deletions

diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 072632982..1c3576516 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,17 +1,15 @@
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
-etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gdict.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gdict.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/gnome-search-tool.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-search-tool.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-search-tool.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/logview.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/logview.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_GDictApplet.server
 libexec/gdict-applet
 share/gnome/applications/gnome-dictionary.desktop
@@ -241,14 +239,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
 @dirrm share/gnome/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 072632982..1c3576516 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -1,17 +1,15 @@
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
-etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gdict.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gdict.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gdict.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/gnome-search-tool.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-search-tool.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-search-tool.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/logview.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/logview.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/logview.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_GDictApplet.server
 libexec/gdict-applet
 share/gnome/applications/gnome-dictionary.desktop
@@ -241,14 +239,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
 @dirrm share/gnome/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-system-log
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
diff --git a/deskutils/gnotime/pkg-plist b/deskutils/gnotime/pkg-plist
index 4456c6e22..7a6e06fd9 100644
--- a/deskutils/gnotime/pkg-plist
+++ b/deskutils/gnotime/pkg-plist
@@ -1,9 +1,7 @@
 bin/gnotime
-etc/gconf/gconf.xml.defaults/apps/gnotime/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnotime/Display/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnotime/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnotime/Display/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnotime.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnotime.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnotime.schemas > /dev/null || /usr/bin/true
 include/gnotime/gnc-date.h
 include/gnotime/gnc-engine-util.h
 include/gnotime/gnc-event.h
@@ -127,10 +125,6 @@ share/locale/zh_TW/LC_MESSAGES/gnotime-2.0.mo
 @dirrm share/gnome/gnotime/ghtml
 @dirrm share/gnome/gnotime
 @dirrm include/gnotime
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnotime/Display
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnotime
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnotime/Display
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnotime
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnotime/gnotime-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnotime/gnotime-es.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnotime/gnotime-eu.omf 2>/dev/null || /usr/bin/true