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

10 files changed, 20 insertions, 304 deletions

diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
index 0b260a5dbc6..914786a58cb 100644
--- a/net/ekiga/pkg-plist
+++ b/net/ekiga/pkg-plist
@@ -51,67 +51,9 @@ share/gnome/gnomemeeting/xdap/ils_nm_reg.xml
 share/gnome/gnomemeeting/xdap/ils_nm_unreg.xml
 share/gnome/gnomemeeting/xdap/ils_nm_mod.xml
 share/gnome/applications/gnomemeeting.desktop
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomemeeting.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnomemeeting.schemas
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/contacts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ports/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/contacts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ports/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view/%gconf.xml
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ports
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/contacts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ports
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/contacts
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomemeeting.schemas > /dev/null || /usr/bin/true
 @dirrm share/gnome/sounds/gnomemeeting
 @dirrm share/gnome/gnomemeeting/xdap
 @dirrm share/gnome/gnomemeeting
diff --git a/net/giftui/pkg-plist b/net/giftui/pkg-plist
index 06d76cdb471..dede66d2d19 100644
--- a/net/giftui/pkg-plist
+++ b/net/giftui/pkg-plist
@@ -1,13 +1,7 @@
 bin/giftui
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/giftui.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/giftui.schemas
-etc/gconf/gconf.xml.defaults/apps/giftui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/giftui/daemon/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/giftui/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/giftui/ui/transfers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/giftui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/giftui/daemon/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/giftui/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/giftui/ui/transfers/%gconf.xml
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/giftui.schemas > /dev/null || /usr/bin/true
 share/applications/giftui.desktop
 share/doc/giftui/AUTHORS
 share/doc/giftui/COPYING
@@ -35,11 +29,3 @@ share/pixmaps/giftui.png
 @dirrm share/giftui/icons
 @dirrm share/giftui
 @dirrm share/doc/giftui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/giftui/ui/transfers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/giftui/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/giftui/daemon
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/giftui
-@dirrm etc/gconf/gconf.xml.defaults/apps/giftui/ui/transfers
-@dirrm etc/gconf/gconf.xml.defaults/apps/giftui/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/giftui/daemon
-@dirrm etc/gconf/gconf.xml.defaults/apps/giftui
diff --git a/net/gnome-jabber/pkg-plist b/net/gnome-jabber/pkg-plist
index a6cd754656e..6bafed59f64 100644
--- a/net/gnome-jabber/pkg-plist
+++ b/net/gnome-jabber/pkg-plist
@@ -1,21 +1,7 @@
 bin/gnome-jabber
-etc/gconf/gconf.xml.defaults/apps/gnome-jabber/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-jabber/connection/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/chat/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/misc/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/notifications/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/presence/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/roster/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/connection/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/chat/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/misc/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/notifications/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/presence/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/roster/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-jabber.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-jabber.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-jabber.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-jabber.desktop
 share/gnome/gnome-jabber/contact.wav
 share/gnome/gnome-jabber/gj_emote_biggrin.png
@@ -69,19 +55,3 @@ share/locale/sr/LC_MESSAGES/gnome-jabber.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-jabber.mo
 share/locale/sv/LC_MESSAGES/gnome-jabber.mo
 @dirrm share/gnome/gnome-jabber
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/roster
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/presence
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/notifications
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/misc
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences/chat
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber/connection
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-jabber
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/roster
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/presence
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/notifications
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/misc
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences/chat
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-jabber/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-jabber/connection
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-jabber
diff --git a/net/gnome-mud/pkg-plist b/net/gnome-mud/pkg-plist
index 952cd2a8235..10169b1e1db 100644
--- a/net/gnome-mud/pkg-plist
+++ b/net/gnome-mud/pkg-plist
@@ -1,19 +1,7 @@
 bin/gnome-mud
-etc/gconf/gconf.xml.defaults/apps/gnome-mud/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-mud/connections/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-mud/functionality/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-mud/mapper/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-mud/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-mud/profiles/Default/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-mud/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/connections/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/functionality/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/mapper/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/profiles/Default/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/ui/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-mud.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnome-mud.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-mud.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-mud.desktop
 share/gnome/help/gnome-mud/C/figures/connections-window.png
 share/gnome/help/gnome-mud/C/figures/main-window.png
@@ -52,19 +40,5 @@ share/locale/tr/LC_MESSAGES/gnome-mud.mo
 @dirrm share/gnome/help/gnome-mud/C/figures
 @dirrm share/gnome/help/gnome-mud/C
 @dirrm share/gnome/help/gnome-mud
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/mapper
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/functionality
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud/connections
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-mud
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-mud/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-mud/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-mud/profiles
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-mud/mapper
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-mud/functionality
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-mud/connections
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-mud
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-mud/gnome-mud-manual-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-mud/gnome-mud-plugin-api-C.omf 2>/dev/null || /usr/bin/true
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index 6d5cab2731d..ac6ed0a828b 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -1,7 +1,6 @@
-etc/gconf/gconf.xml.defaults/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/netstatus.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/netstatus.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/netstatus.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
 libexec/gnome-netstatus-applet
 share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml
@@ -193,9 +192,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
 @dirrm share/gnome/help/gnome-netstatus/C
 @dirrm share/gnome/help/gnome-netstatus
 @dirrm share/gnome/gnome-netstatus
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/netstatus_applet
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true
diff --git a/net/gnomeicu/gnomeicu/pkg-plist b/net/gnomeicu/gnomeicu/pkg-plist
index 84142858de2..0ff7654b26d 100644
--- a/net/gnomeicu/gnomeicu/pkg-plist
+++ b/net/gnomeicu/gnomeicu/pkg-plist
@@ -1,28 +1,8 @@
 bin/gnomeicu
 bin/gnomeicu-client
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/connections/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/events/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/files/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/status/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/themes/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/color/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/network/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/connections/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/events/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/files/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/status/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/themes/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/color/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/network/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnomeicu.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
 etc/sound/events/GnomeICU.soundlist
 share/gnome/applications/GnomeICU.desktop
 share/gnome/gnomeicu/emoticons/AIM/angel.xpm
@@ -321,27 +301,5 @@ share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm share/gnome/gnomeicu/emoticons/AIM
 @dirrm share/gnome/gnomeicu/emoticons
 @dirrm share/gnome/gnomeicu
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/network
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/color
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/themes
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/status
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/files
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/events
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/connections
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/network
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/color
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/themes
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/status
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/files
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/events
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/connections
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
diff --git a/net/gnomeicu2/pkg-plist b/net/gnomeicu2/pkg-plist
index 84142858de2..0ff7654b26d 100644
--- a/net/gnomeicu2/pkg-plist
+++ b/net/gnomeicu2/pkg-plist
@@ -1,28 +1,8 @@
 bin/gnomeicu
 bin/gnomeicu-client
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/connections/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/events/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/files/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/status/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/themes/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/color/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/network/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/connections/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/events/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/files/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/status/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/themes/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/color/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/network/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnomeicu.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
 etc/sound/events/GnomeICU.soundlist
 share/gnome/applications/GnomeICU.desktop
 share/gnome/gnomeicu/emoticons/AIM/angel.xpm
@@ -321,27 +301,5 @@ share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm share/gnome/gnomeicu/emoticons/AIM
 @dirrm share/gnome/gnomeicu/emoticons
 @dirrm share/gnome/gnomeicu
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/network
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq/color
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/icq
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/themes
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/status
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/files
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/events
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general/connections
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomeicu
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/network
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq/color
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/icq
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/themes
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/status
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/files
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/events
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general/connections
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
diff --git a/net/gnomemeeting/pkg-plist b/net/gnomemeeting/pkg-plist
index 0b260a5dbc6..914786a58cb 100644
--- a/net/gnomemeeting/pkg-plist
+++ b/net/gnomemeeting/pkg-plist
@@ -51,67 +51,9 @@ share/gnome/gnomemeeting/xdap/ils_nm_reg.xml
 share/gnome/gnomemeeting/xdap/ils_nm_unreg.xml
 share/gnome/gnomemeeting/xdap/ils_nm_mod.xml
 share/gnome/applications/gnomemeeting.desktop
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomemeeting.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/gnomemeeting.schemas
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/contacts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ports/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/contacts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ports/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view/%gconf.xml
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/view
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/video_display
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ports
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/personal_data
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/ldap
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/history
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/gatekeeper
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/devices
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/contacts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/call_forwarding
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/audio_codecs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/view
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/video_display
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ports
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/personal_data
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/ldap
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/history
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/gatekeeper
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/devices
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/contacts
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/call_forwarding
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting/audio_codecs
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomemeeting
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomemeeting.schemas > /dev/null || /usr/bin/true
 @dirrm share/gnome/sounds/gnomemeeting
 @dirrm share/gnome/gnomemeeting/xdap
 @dirrm share/gnome/gnomemeeting
diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist
index 6d5cab2731d..ac6ed0a828b 100644
--- a/net/gnomenetstatus/pkg-plist
+++ b/net/gnomenetstatus/pkg-plist
@@ -1,7 +1,6 @@
-etc/gconf/gconf.xml.defaults/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/netstatus.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/netstatus.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/netstatus.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
 libexec/gnome-netstatus-applet
 share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml
@@ -193,9 +192,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
 @dirrm share/gnome/help/gnome-netstatus/C
 @dirrm share/gnome/help/gnome-netstatus
 @dirrm share/gnome/gnome-netstatus
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/netstatus_applet
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf 2>/dev/null || /usr/bin/true
diff --git a/net/grdesktop/pkg-plist b/net/grdesktop/pkg-plist
index 69219418f1a..98e286cc9ae 100644
--- a/net/grdesktop/pkg-plist
+++ b/net/grdesktop/pkg-plist
@@ -1,9 +1,7 @@
 bin/grdesktop
-etc/gconf/gconf.xml.defaults/apps/grdesktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/grdesktop/options/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/grdesktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/grdesktop/options/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/grdesktop.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/grdesktop.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/grdesktop.schemas > /dev/null || /usr/bin/true
 share/gnome/application-registry/grdesktop.applications
 share/gnome/applications/grdesktop.desktop
 share/gnome/help/grdesktop/C/grdesktop.xml
@@ -36,7 +34,3 @@ share/locale/fr/LC_MESSAGES/grdesktop.mo
 @dirrm share/gnome/omf/grdesktop
 @dirrm share/gnome/help/grdesktop/C
 @dirrm share/gnome/help/grdesktop
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/grdesktop/options
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/grdesktop
-@dirrm etc/gconf/gconf.xml.defaults/apps/grdesktop/options
-@dirrm etc/gconf/gconf.xml.defaults/apps/grdesktop