aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/gnopernicus/pkg-plist442
-rw-r--r--accessibility/gok/pkg-plist86
-rw-r--r--astro/glunarclock/pkg-plist6
-rw-r--r--audio/gnome-media/pkg-plist50
-rw-r--r--audio/gnomemedia2/pkg-plist50
-rw-r--r--audio/jamboree/pkg-plist18
-rw-r--r--audio/net-rhythmbox/pkg-plist30
-rw-r--r--audio/sound-juicer/pkg-plist6
-rw-r--r--databases/libgnomedb/pkg-plist14
-rw-r--r--deskutils/drivel/pkg-plist8
-rw-r--r--deskutils/gdesklets/pkg-plist6
-rw-r--r--deskutils/gnome-blog/pkg-plist6
-rw-r--r--deskutils/gnome-utils/pkg-plist22
-rw-r--r--deskutils/gnomeblog/pkg-plist6
-rw-r--r--deskutils/gnomeutils2/pkg-plist22
-rw-r--r--deskutils/goats/pkg-plist14
-rw-r--r--devel/bugbuddy2/pkg-plist6
-rw-r--r--devel/devhelp/pkg-plist10
-rw-r--r--devel/gnome-vfs/pkg-plist85
-rw-r--r--devel/gnomevfs2/pkg-plist85
-rw-r--r--editors/ghex2/pkg-plist6
-rw-r--r--editors/mlview/pkg-plist10
-rw-r--r--games/gnome-games/pkg-plist150
-rw-r--r--games/gnomegames2/pkg-plist150
-rw-r--r--games/gtetrinet/pkg-plist26
-rw-r--r--games/monster-masher/pkg-plist14
-rw-r--r--games/teg/pkg-plist6
-rw-r--r--graphics/eog2/pkg-plist14
-rw-r--r--graphics/gpdf/pkg-plist14
-rw-r--r--mail/evolution-exchange/pkg-plist6
-rw-r--r--mail/evolution/pkg-plist148
-rw-r--r--mail/ximian-connector/pkg-plist6
-rw-r--r--math/gcalctool/pkg-plist6
-rw-r--r--math/gretl/pkg-plist6
-rw-r--r--misc/gretl/pkg-plist6
-rw-r--r--misc/quick-lounge-applet/pkg-plist6
-rw-r--r--multimedia/gstreamer-player/pkg-plist6
-rw-r--r--multimedia/nautilus-media/pkg-plist34
-rw-r--r--multimedia/quark/pkg-plist16
-rw-r--r--multimedia/totem/pkg-plist84
-rw-r--r--net-im/gnome-jabber/pkg-plist34
-rw-r--r--net-im/gnomeicu/pkg-plist46
-rw-r--r--net-im/gnomeicu2/pkg-plist46
-rw-r--r--net-p2p/giftui/pkg-plist18
-rw-r--r--net/ekiga/pkg-plist62
-rw-r--r--net/giftui/pkg-plist18
-rw-r--r--net/gnome-jabber/pkg-plist34
-rw-r--r--net/gnome-mud/pkg-plist30
-rw-r--r--net/gnome-netstatus/pkg-plist8
-rw-r--r--net/gnomeicu/gnomeicu/pkg-plist46
-rw-r--r--net/gnomeicu2/pkg-plist46
-rw-r--r--net/gnomemeeting/pkg-plist62
-rw-r--r--net/gnomenetstatus/pkg-plist8
-rw-r--r--net/grdesktop/pkg-plist10
-rw-r--r--palm/gnome-pilot/pkg-plist6
-rw-r--r--palm/gnomepilot2/pkg-plist6
-rw-r--r--print/ggv2/pkg-plist26
-rw-r--r--security/seahorse/pkg-plist18
-rw-r--r--sysutils/battfink/pkg-plist6
-rw-r--r--sysutils/gnome-control-center/pkg-plist62
-rw-r--r--sysutils/gnome-pkgview/pkg-plist6
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist18
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-plist62
-rw-r--r--sysutils/gnomesystemmonitor/pkg-plist18
-rw-r--r--sysutils/nautilus-cd-burner/pkg-plist6
-rw-r--r--textproc/stardict2/pkg-plist30
-rw-r--r--textproc/stardict3/pkg-plist30
-rw-r--r--www/mozilla-bonobo/pkg-plist10
-rw-r--r--www/screem-devel/pkg-plist28
-rw-r--r--www/screem/pkg-plist28
-rw-r--r--x11-fm/nautilus2/pkg-plist30
-rw-r--r--x11-wm/expocity/pkg-plist26
-rw-r--r--x11-wm/metacity/pkg-plist26
-rw-r--r--x11/gnome-panel/pkg-plist160
-rw-r--r--x11/gnome-session/pkg-plist10
-rw-r--r--x11/gnome-terminal/pkg-plist22
-rw-r--r--x11/gnomepanel/pkg-plist160
-rw-r--r--x11/gnomesession/pkg-plist10
-rw-r--r--x11/gnometerminal/pkg-plist22
-rw-r--r--x11/libgnome/pkg-plist105
80 files changed, 354 insertions, 2731 deletions
diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist
index a3db8957545b..27bf9af40f8f 100644
--- a/accessibility/gnopernicus/pkg-plist
+++ b/accessibility/gnopernicus/pkg-plist
@@ -1,227 +1,15 @@
bin/brlmonitor
bin/gnopernicus
bin/srcore
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/braille/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/brlmon/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/braille_key/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/key_pad/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/ACS-S/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK00/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK01DK02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK05/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K11/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K12/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K13/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K14/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K15/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K12/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K11/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K12/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K13/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K11/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K13/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K13/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/user_key/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/brlmon/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/remote/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/magnifier/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/magnifier/schema1/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/magnifier/schema1/generic_zoomer/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/presentation/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/remote/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/speech/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/speech/dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/speech/settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/speech/voices_parameters/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/srcore/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/braille/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/brlmon/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/braille_key/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/key_pad/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/ACS-S/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK00/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK01DK02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK05/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K11/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K12/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K13/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K14/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K15/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K12/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K11/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K12/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K13/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K11/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K13/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K05/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K07/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K08/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K09/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K10/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K13/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K06/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K01/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K02/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K03/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/user_key/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/brlmon/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/remote/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/magnifier/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/magnifier/schema1/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/magnifier/schema1/generic_zoomer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/presentation/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/remote/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/speech/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/speech/dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/speech/settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/speech/voices_parameters/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/srcore/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/brlmonitor.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/brlmonitor.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/brlmonitor.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/gnopernicus.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnopernicus.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnopernicus.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/remote.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/remote.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/remote.schemas > /dev/null || /usr/bin/true
etc/gnopernicus-1.0/translation_tables/de.a2b
etc/gnopernicus-1.0/translation_tables/en_US.a2b
etc/gnopernicus-1.0/translation_tables/es.a2b
@@ -383,224 +171,6 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
@dirrm include/gnopernicus-1.0
@dirrm etc/gnopernicus-1.0/translation_tables
@dirrm etc/gnopernicus-1.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/srcore
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/speech/voices_parameters
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/speech/settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/speech/dictionary
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/speech
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/remote
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/presentation
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/magnifier/schema1/generic_zoomer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/magnifier/schema1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/magnifier
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/remote
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/brlmon
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/user_key
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K04
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K06
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K04
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L09K01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K13
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K10
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K09
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K08
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K07
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K06
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K05
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K04
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L08K01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K13
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K11
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K10
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K09
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K08
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K06
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K05
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K04
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L07K01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K13
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K12
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K11
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K10
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K09
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K08
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K07
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K06
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K05
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K04
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L06K01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K10
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K09
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K08
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K07
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K06
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K05
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K04
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L05K01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K10
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K07
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K06
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K05
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K04
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L03K01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K12
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L01K01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K15
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K14
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K13
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K12
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K11
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K10
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K09
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K08
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K07
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K06
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K05
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K04
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L00K01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK05
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK04
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK03
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK01DK02
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK01
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK00
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/ACS-S
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/key_pad
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/braille_key
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/brlmon
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/braille
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/srcore
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/speech/voices_parameters
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/speech/settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/speech/dictionary
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/speech
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/remote
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/presentation
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/magnifier/schema1/generic_zoomer
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/magnifier/schema1
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/magnifier
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/remote
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/brlmon
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/config
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/user_key
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K04
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K06
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K04
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L09K01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K13
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K10
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K09
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K08
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K07
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K06
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K05
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K04
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L08K01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K13
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K11
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K10
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K09
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K08
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K06
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K05
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K04
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L07K01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K13
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K12
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K11
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K10
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K09
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K08
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K07
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K06
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K05
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K04
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L06K01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K10
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K09
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K08
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K07
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K06
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K05
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K04
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L05K01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K10
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K07
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K06
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K05
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K04
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L03K01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K12
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L01K01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K15
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K14
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K13
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K12
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K11
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K10
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K09
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K08
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K07
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K06
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K05
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K04
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L00K01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK05
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK04
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK03
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK01DK02
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK01
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK00
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/ACS-S
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/key_pad
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/braille_key
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/brlmon
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/braille
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/brlmonitor-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/brlmonitor-es.omf 2>/dev/null || /usr/bin/true
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index a0f08e48db2e..40122da7c73c 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -1,47 +1,7 @@
bin/gok
-etc/gconf/gconf.xml.defaults/apps/gok/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/dwell/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton1/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton3/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton4/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton5/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/mousepointer/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/switch1/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/switch2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/switch3/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/switch4/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/actions/switch5/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound1/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/layout/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gok/spy/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton1/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton3/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton4/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton5/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousepointer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch1/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch3/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch4/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch5/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound1/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gok.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gok.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gok.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_Gok.server
libdata/pkgconfig/gok-1.0.pc
share/gnome/applications/gok.desktop
@@ -528,46 +488,4 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/gok/ar
@dirrm share/gnome/gok/am
@dirrm share/gnome/gok
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch5
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch4
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch3
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/switch1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousepointer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton5
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton4
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton3
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/mousebutton1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/spy
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/layout
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound1
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/switch5
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/switch4
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/switch3
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/switch2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/switch1
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/mousepointer
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton5
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton4
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton3
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/mousebutton1
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/dwell
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions
-@dirrm etc/gconf/gconf.xml.defaults/apps/gok
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true
diff --git a/astro/glunarclock/pkg-plist b/astro/glunarclock/pkg-plist
index debced6ae45d..747659debb64 100644
--- a/astro/glunarclock/pkg-plist
+++ b/astro/glunarclock/pkg-plist
@@ -1,6 +1,6 @@
-etc/gconf/gconf.xml.defaults/schemas/apps/glunarclock_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/glunarclock_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/glunarclock.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/glunarclock.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/glunarclock.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_GLunarclockApplet_Factory.server
libexec/glunarclock-applet-2
share/gnome/glunarclock/glunarclock.glade
@@ -37,6 +37,4 @@ share/locale/wa/LC_MESSAGES/glunarclock-0.30.mo
@dirrm share/gnome/help/glunarclock-applet-2/C
@dirrm share/gnome/help/glunarclock-applet-2
@dirrm share/gnome/glunarclock
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glunarclock_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glunarclock_applet
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/glunarclock-applet-2-C.omf 2>/dev/null || /usr/bin/true
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index eea8fa4ec340..e824ff31c257 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -5,32 +5,18 @@ bin/gnome-sound-recorder
bin/gnome-volume-control
bin/gstreamer-properties
bin/vumeter
-etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/CDDB-Slave2.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/CDDB-Slave2.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/CDDB-Slave2.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-audio-profiles.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-audio-profiles.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-audio-profiles.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-cd.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-cd.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-cd.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-sound-recorder.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-sound-recorder.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-sound-recorder.schemas > /dev/null || /usr/bin/true
include/cddb-slave2/cddb-slave-client.h
include/gnome-media/profiles/audio-profile-choose.h
include/gnome-media/profiles/audio-profile-edit.h
@@ -571,26 +557,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm include/gnome-media/profiles
@dirrm include/gnome-media
@dirrm include/cddb-slave2
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd
-@dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index eea8fa4ec340..e824ff31c257 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -5,32 +5,18 @@ bin/gnome-sound-recorder
bin/gnome-volume-control
bin/gstreamer-properties
bin/vumeter
-etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/CDDB-Slave2.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/CDDB-Slave2.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/CDDB-Slave2.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-audio-profiles.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-audio-profiles.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-audio-profiles.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-cd.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-cd.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-cd.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-sound-recorder.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-sound-recorder.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-sound-recorder.schemas > /dev/null || /usr/bin/true
include/cddb-slave2/cddb-slave-client.h
include/gnome-media/profiles/audio-profile-choose.h
include/gnome-media/profiles/audio-profile-edit.h
@@ -571,26 +557,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm include/gnome-media/profiles
@dirrm include/gnome-media
@dirrm include/cddb-slave2
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossy
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/cdlossless
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd
-@dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true
diff --git a/audio/jamboree/pkg-plist b/audio/jamboree/pkg-plist
index e04593152880..4b4f4af8d599 100644
--- a/audio/jamboree/pkg-plist
+++ b/audio/jamboree/pkg-plist
@@ -1,13 +1,7 @@
bin/jamboree
-etc/gconf/gconf.xml.defaults/apps/jamboree/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/jamboree/columns/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/jamboree/control/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/jamboree/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/columns/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/control/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/ui/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/jamboree.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/jamboree.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/jamboree.schemas > /dev/null || /usr/bin/true
share/gnome/applications/jamboree.desktop
share/gnome/jamboree/column-chooser.glade
share/gnome/jamboree/jamboree-next.png
@@ -44,12 +38,4 @@ share/locale/pt/LC_MESSAGES/jamboree.mo
share/locale/sr/LC_MESSAGES/jamboree.mo
share/locale/sr@Latn/LC_MESSAGES/jamboree.mo
share/locale/sv/LC_MESSAGES/jamboree.mo
-@dirrm etc/gconf/gconf.xml.defaults/apps/jamboree/columns
-@dirrm etc/gconf/gconf.xml.defaults/apps/jamboree/control
-@dirrm etc/gconf/gconf.xml.defaults/apps/jamboree/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/jamboree
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/columns
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/control
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/jamboree
@dirrm share/gnome/jamboree
diff --git a/audio/net-rhythmbox/pkg-plist b/audio/net-rhythmbox/pkg-plist
index f13e84904774..ed189650ca0e 100644
--- a/audio/net-rhythmbox/pkg-plist
+++ b/audio/net-rhythmbox/pkg-plist
@@ -1,19 +1,7 @@
bin/net-rhythmbox
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/library/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/net-rhythmbox.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/net-rhythmbox.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/net-rhythmbox.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_netRhythmbox_Shell.server
share/gnome/application-registry/net-rhythmbox.applications
share/gnome/applications/net-rhythmbox.desktop
@@ -129,18 +117,4 @@ share/locale/vi/LC_MESSAGES/netrhythmbox.mo
@dirrm share/gnome/help/net-rhythmbox/C/figures
@dirrm share/gnome/help/net-rhythmbox/C
@dirrm share/gnome/help/net-rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui/iradio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/net-rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui/iradio
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/apps/net-rhythmbox
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/net-rhythmbox/rhythmbox-C.omf 2>/dev/null || /usr/bin/true
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 90bd18bc1e2a..1c442da0ece4 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -1,7 +1,7 @@
bin/sound-juicer
-etc/gconf/gconf.xml.defaults/apps/sound-juicer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/sound-juicer/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/sound-juicer.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/sound-juicer.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/sound-juicer.schemas > /dev/null || /usr/bin/true
share/gnome/applications/sound-juicer.desktop
share/gnome/help/sound-juicer/C/fdl-appendix.xml
share/gnome/help/sound-juicer/C/figures/prefs.png
@@ -18,6 +18,4 @@ share/gnome/sound-juicer/sound-juicer.glade
@dirrm share/gnome/help/sound-juicer/C/figures
@dirrm share/gnome/help/sound-juicer/C
@dirrm share/gnome/help/sound-juicer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/sound-juicer
-@dirrm etc/gconf/gconf.xml.defaults/apps/sound-juicer
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf 2>/dev/null || /usr/bin/true
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index 329663501d50..d51a30d7d651 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -1,11 +1,7 @@
bin/gnome-database-properties
-etc/gconf/gconf.xml.defaults/apps/gnome-db/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-db/Editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-db/UI/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/Editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/UI/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/libgnomedb.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/libgnomedb.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/libgnomedb.schemas > /dev/null || /usr/bin/true
include/libgnomedb/gnome-db-browser.h
include/libgnomedb/gnome-db-combo.h
include/libgnomedb/gnome-db-config.h
@@ -173,10 +169,4 @@ share/locale/zh_TW/LC_MESSAGES/libgnomedb-2.mo
@dirrm share/gnome/gnome-db
@dirrm %%DOCSDIR%%
@dirrm include/libgnomedb
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/UI
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/Editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db/UI
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db/Editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/libgnomedb/libgnomedb-C.omf 2>/dev/null || /usr/bin/true
diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index 552d546ba528..dd26273d80ce 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -1,11 +1,7 @@
bin/drivel
-etc/gconf/gconf.xml.defaults/apps/drivel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/drivel/global_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/drivel/moods/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/drivel/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/drivel/global_settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/drivel/moods/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/drivel.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/drivel.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/drivel.schemas > /dev/null || /usr/bin/true
share/gnome/applications/drivel.desktop
share/gnome/pixmaps/drivel/community.png
share/gnome/pixmaps/drivel/doublearrow.png
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index c4d528224e5f..ce3deb105782 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -1,8 +1,8 @@
bin/gdesklets
bin/gdesklets-display-thumbnailer
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gdesklets-display/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gdesklets-display/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gdesklets-display-thumbnail.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gdesklets-display-thumbnail.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gdesklets-display-thumbnail.schemas > /dev/null || /usr/bin/true
libdata/pkgconfig/gdesklets-core.pc
share/gnome/application-registry/gdesklets.applications
share/gnome/applications/gdesklets.desktop
@@ -259,5 +259,3 @@ share/icons/gnome/48x48/mimetypes/x-gdesklets-display.png
@dirrm share/gnome/gdesklets/Sensors
@dirrm share/gnome/gdesklets/Displays
@dirrm share/gnome/gdesklets
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gdesklets-display
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gdesklets-display
diff --git a/deskutils/gnome-blog/pkg-plist b/deskutils/gnome-blog/pkg-plist
index 88436f96deb2..320b75052f86 100644
--- a/deskutils/gnome-blog/pkg-plist
+++ b/deskutils/gnome-blog/pkg-plist
@@ -1,8 +1,8 @@
bin/blog_applet.py
bin/gnome-blog-poster
-etc/gconf/gconf.xml.defaults/apps/gnome-blogger/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnomeblog.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
%%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.py
%%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyc
%%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyo
@@ -51,5 +51,3 @@ share/gnome/applications/gnome-blog.desktop
share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
share/gnome/pixmaps/gnome-blog.png
@dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-blogger
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 072632982414..1c3576516b47 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/gnomeblog/pkg-plist b/deskutils/gnomeblog/pkg-plist
index 88436f96deb2..320b75052f86 100644
--- a/deskutils/gnomeblog/pkg-plist
+++ b/deskutils/gnomeblog/pkg-plist
@@ -1,8 +1,8 @@
bin/blog_applet.py
bin/gnome-blog-poster
-etc/gconf/gconf.xml.defaults/apps/gnome-blogger/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnomeblog.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
%%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.py
%%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyc
%%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyo
@@ -51,5 +51,3 @@ share/gnome/applications/gnome-blog.desktop
share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
share/gnome/pixmaps/gnome-blog.png
@dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-blogger
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-blogger
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 072632982414..1c3576516b47 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/goats/pkg-plist b/deskutils/goats/pkg-plist
index 9fa31de3eac7..b9a3a55174f1 100644
--- a/deskutils/goats/pkg-plist
+++ b/deskutils/goats/pkg-plist
@@ -1,12 +1,8 @@
bin/goats-applet
bin/goat-create
-etc/gconf/gconf.xml.defaults/apps/goats/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/goats/defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/goats/settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/goats/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/goats/defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/goats/settings/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/goats.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/goats.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/goats.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_GoatsApplet.server
share/gnome/gnome-2.0/ui/GNOME_GoatsApplet.xml
share/gnome/goats/alarm.png
@@ -38,9 +34,3 @@ share/locale/ru/LC_MESSAGES/goats-2.0.mo
@dirrm share/gnome/help/goats/C
@dirrm share/gnome/help/goats
@dirrm share/gnome/goats
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/goats/settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/goats/defaults
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/goats
-@dirrm etc/gconf/gconf.xml.defaults/apps/goats/settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/goats/defaults
-@dirrm etc/gconf/gconf.xml.defaults/apps/goats
diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist
index f5031a5fd62b..47734bac3ca0 100644
--- a/devel/bugbuddy2/pkg-plist
+++ b/devel/bugbuddy2/pkg-plist
@@ -1,7 +1,7 @@
bin/bug-buddy
-etc/gconf/gconf.xml.defaults/apps/bug-buddy/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/bug-buddy/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/bug-buddy.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/bug-buddy.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/bug-buddy.schemas > /dev/null || /usr/bin/true
share/gnome/application-registry/bug-buddy.applications
share/gnome/applications/bug-buddy.desktop
share/gnome/bug-buddy/bug-buddy.glade
@@ -161,8 +161,6 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/bug-buddy/bugzilla/gnome
@dirrm share/gnome/bug-buddy/bugzilla
@dirrm share/gnome/bug-buddy
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/bug-buddy
-@dirrm etc/gconf/gconf.xml.defaults/apps/bug-buddy
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-es.omf 2>/dev/null || /usr/bin/true
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index c44a6f169607..8b7c0c2919ea 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,10 +1,8 @@
bin/devhelp
bin/devhelp-bin
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/devhelp.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/devhelp.schemas
-etc/gconf/gconf.xml.defaults/apps/devhelp/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/devhelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/devhelp/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/devhelp/%gconf.xml
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/devhelp.schemas > /dev/null || /usr/bin/true
include/devhelp-1.0/devhelp/dh-base.h
include/devhelp-1.0/devhelp/dh-book-tree.h
include/devhelp-1.0/devhelp/dh-error.h
@@ -69,10 +67,6 @@ share/locale/uk/LC_MESSAGES/devhelp.mo
share/locale/vi/LC_MESSAGES/devhelp.mo
share/locale/zh_CN/LC_MESSAGES/devhelp.mo
share/locale/zh_TW/LC_MESSAGES/devhelp.mo
-@dirrm etc/gconf/gconf.xml.defaults/apps/devhelp/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/devhelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/devhelp/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/devhelp
@dirrm share/gnome/devhelp/ui
@dirrm share/gnome/devhelp/images
@dirrm share/gnome/devhelp/dtd
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 67b5ac09bb5b..d1aeafab15f1 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -3,49 +3,18 @@ bin/gnomevfs-copy
bin/gnomevfs-info
bin/gnomevfs-ls
bin/gnomevfs-mkdir
-etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/proxy/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/smb/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/smb/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_default_applications.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_default_applications.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_url_handlers.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_url_handlers.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.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/system_http_proxy.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/system_http_proxy.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_http_proxy.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/system_smb.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/system_smb.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true
%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
etc/gnome-vfs-2.0/modules/default-modules.conf
%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
@@ -275,41 +244,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm include/gnome-vfs-2.0/include
@dirrm include/gnome-vfs-2.0
@dirrm etc/gnome-vfs-2.0/vfolders
-@dirrm etc/gconf/gconf.xml.defaults/system/smb
-@dirrm etc/gconf/gconf.xml.defaults/system/proxy
-@dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
-@dirrm etc/gconf/gconf.xml.defaults/system
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/smb
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/proxy
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto
-@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers 2>/dev/null || true
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto
-@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers 2>/dev/null || true
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome
-@dirrm etc/gconf/gconf.xml.defaults/desktop
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 67b5ac09bb5b..d1aeafab15f1 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -3,49 +3,18 @@ bin/gnomevfs-copy
bin/gnomevfs-info
bin/gnomevfs-ls
bin/gnomevfs-mkdir
-etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/proxy/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/smb/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/smb/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_default_applications.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_default_applications.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_default_applications.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_url_handlers.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_url_handlers.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_url_handlers.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/system_http_proxy.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/system_http_proxy.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_http_proxy.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/system_smb.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/system_smb.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_smb.schemas > /dev/null || /usr/bin/true
%%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
etc/gnome-vfs-2.0/modules/default-modules.conf
%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
@@ -275,41 +244,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm include/gnome-vfs-2.0/include
@dirrm include/gnome-vfs-2.0
@dirrm etc/gnome-vfs-2.0/vfolders
-@dirrm etc/gconf/gconf.xml.defaults/system/smb
-@dirrm etc/gconf/gconf.xml.defaults/system/proxy
-@dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
-@dirrm etc/gconf/gconf.xml.defaults/system
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/smb
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/proxy
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto
-@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers 2>/dev/null || true
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto
-@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers 2>/dev/null || true
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome
-@dirrm etc/gconf/gconf.xml.defaults/desktop
diff --git a/editors/ghex2/pkg-plist b/editors/ghex2/pkg-plist
index e0080d42706e..cc67a2c842bc 100644
--- a/editors/ghex2/pkg-plist
+++ b/editors/ghex2/pkg-plist
@@ -1,7 +1,7 @@
bin/ghex2
-etc/gconf/gconf.xml.defaults/apps/ghex2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ghex2/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/ghex2.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/ghex2.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/ghex2.schemas > /dev/null || /usr/bin/true
include/gtkhex/accessiblegtkhex.h
include/gtkhex/accessiblegtkhexfactory.h
include/gtkhex/gtkhex.h
@@ -143,8 +143,6 @@ share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo
@dirrm share/gnome/help/ghex2/C
@dirrm share/gnome/help/ghex2
@dirrm include/gtkhex
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ghex2
-@dirrm etc/gconf/gconf.xml.defaults/apps/ghex2
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ghex/ghex2-es.omf 2>/dev/null || /usr/bin/true
diff --git a/editors/mlview/pkg-plist b/editors/mlview/pkg-plist
index b6265f8dc816..664e30f146e1 100644
--- a/editors/mlview/pkg-plist
+++ b/editors/mlview/pkg-plist
@@ -1,9 +1,7 @@
bin/mlv
-etc/gconf/gconf.xml.defaults/apps/mlview/colours/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/mlview/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mlview/colours/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mlview/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mlview.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/mlview.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mlview.schemas > /dev/null || /usr/bin/true
lib/libmlview.a
lib/libmlview.so
lib/libmlview.so.4
@@ -39,7 +37,3 @@ share/locale/sr/LC_MESSAGES/mlview.mo
share/locale/sr@Latn/LC_MESSAGES/mlview.mo
share/locale/sv/LC_MESSAGES/mlview.mo
@dirrm share/gnome/mlview
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mlview/colours
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mlview
-@dirrm etc/gconf/gconf.xml.defaults/apps/mlview/colours
-@dirrm etc/gconf/gconf.xml.defaults/apps/mlview
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 355a66b6ae8a..02745dda6d61 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -14,81 +14,51 @@ bin/iagno
bin/mahjongg
bin/same-gnome
bin/sol
-etc/gconf/gconf.xml.defaults/apps/aisleriot/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/blackjack/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/blackjack/deck/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/blackjack/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/blackjack/settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gataxx/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/glines/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/glines/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/glines/saved/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnect/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnobots2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-stones/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnometris/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnometris/options/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomine/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomine/geometry/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnotravex/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gataxx/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/glines/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnect/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtali/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/iagno/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/aisleriot.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/aisleriot.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/blackjack.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/blackjack.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/blackjack.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/gataxx.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gataxx.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gataxx.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/glines.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/glines.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/glines.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/gnect.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnect.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnect.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/gnibbles.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnibbles.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnibbles.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/gnobots2.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnobots2.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnobots2.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-stones.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-stones.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-stones.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/gnometris.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnometris.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnometris.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/gnomine.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnomine.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomine.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/gnotravex.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnotravex.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnotravex.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/gtali.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gtali.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtali.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/iagno.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/iagno.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/iagno.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/mahjongg.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/mahjongg.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mahjongg.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/same-gnome.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/same-gnome.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true
etc/sound/events/gataxx.soundlist
etc/sound/events/gnect.soundlist
etc/sound/events/gnibbles.soundlist
@@ -830,66 +800,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/gnibbles
@dirrm share/gnome/gnect
@dirrm share/gnome/blackjack
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/iagno
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnect
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gataxx
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot
-@dirrm etc/gconf/gconf.xml.defaults/apps/same-gnome
-@dirrm etc/gconf/gconf.xml.defaults/apps/mahjongg
-@dirrm etc/gconf/gconf.xml.defaults/apps/iagno
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtali
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnotravex
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomine
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnometris/options
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnometris
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnect
-@dirrm etc/gconf/gconf.xml.defaults/apps/glines/saved
-@dirrm etc/gconf/gconf.xml.defaults/apps/glines/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/glines
-@dirrm etc/gconf/gconf.xml.defaults/apps/gataxx
-@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/global
-@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/deck
-@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack
-@dirrm etc/gconf/gconf.xml.defaults/apps/aisleriot
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 355a66b6ae8a..02745dda6d61 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -14,81 +14,51 @@ bin/iagno
bin/mahjongg
bin/same-gnome
bin/sol
-etc/gconf/gconf.xml.defaults/apps/aisleriot/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/blackjack/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/blackjack/deck/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/blackjack/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/blackjack/settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gataxx/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/glines/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/glines/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/glines/saved/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnect/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnobots2/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-stones/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnometris/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnometris/options/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomine/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnomine/geometry/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnotravex/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gataxx/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/glines/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnect/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtali/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/iagno/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/aisleriot.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/aisleriot.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/aisleriot.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/blackjack.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/blackjack.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/blackjack.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/gataxx.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gataxx.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gataxx.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/glines.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/glines.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/glines.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/gnect.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnect.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnect.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/gnibbles.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnibbles.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnibbles.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/gnobots2.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnobots2.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnobots2.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-stones.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-stones.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-stones.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/gnometris.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnometris.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnometris.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/gnomine.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnomine.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomine.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/gnotravex.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnotravex.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnotravex.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/gtali.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gtali.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtali.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/iagno.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/iagno.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/iagno.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/mahjongg.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/mahjongg.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mahjongg.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/same-gnome.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/same-gnome.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/same-gnome.schemas > /dev/null || /usr/bin/true
etc/sound/events/gataxx.soundlist
etc/sound/events/gnect.soundlist
etc/sound/events/gnibbles.soundlist
@@ -830,66 +800,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/gnibbles
@dirrm share/gnome/gnect
@dirrm share/gnome/blackjack
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/iagno
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnect
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gataxx
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot
-@dirrm etc/gconf/gconf.xml.defaults/apps/same-gnome
-@dirrm etc/gconf/gconf.xml.defaults/apps/mahjongg
-@dirrm etc/gconf/gconf.xml.defaults/apps/iagno
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtali
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnotravex
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnomine
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnometris/options
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnometris
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnect
-@dirrm etc/gconf/gconf.xml.defaults/apps/glines/saved
-@dirrm etc/gconf/gconf.xml.defaults/apps/glines/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/glines
-@dirrm etc/gconf/gconf.xml.defaults/apps/gataxx
-@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/settings
-@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/global
-@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/deck
-@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack
-@dirrm etc/gconf/gconf.xml.defaults/apps/aisleriot
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true
diff --git a/games/gtetrinet/pkg-plist b/games/gtetrinet/pkg-plist
index b87507fd3789..22bf1bb1baab 100644
--- a/games/gtetrinet/pkg-plist
+++ b/games/gtetrinet/pkg-plist
@@ -1,17 +1,7 @@
bin/gtetrinet
-etc/gconf/gconf.xml.defaults/apps/gtetrinet/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtetrinet/keys/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtetrinet/partyline/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtetrinet/player/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtetrinet/sound/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtetrinet/themes/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/keys/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/partyline/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/player/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/sound/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/themes/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtetrinet.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gtetrinet.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtetrinet.schemas > /dev/null || /usr/bin/true
share/gnome/applications/gtetrinet.desktop
share/gnome/gtetrinet/themes/default/blocks.png
share/gnome/gtetrinet/themes/default/theme.cfg
@@ -49,15 +39,3 @@ share/locale/zh_TW/LC_MESSAGES/gtetrinet.mo
@dirrm share/gnome/gtetrinet/themes
@dirrm share/gnome/gtetrinet
@dirrm share/gnome/pixmaps/gtetrinet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/themes
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/sound
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/partyline
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/player
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet/keys
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtetrinet
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtetrinet/themes
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtetrinet/sound
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtetrinet/partyline
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtetrinet/player
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtetrinet/keys
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtetrinet
diff --git a/games/monster-masher/pkg-plist b/games/monster-masher/pkg-plist
index 987ca6ce9f0c..0ab24d520632 100644
--- a/games/monster-masher/pkg-plist
+++ b/games/monster-masher/pkg-plist
@@ -1,11 +1,7 @@
bin/monster-masher
-etc/gconf/gconf.xml.defaults/apps/monster-masher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/monster-masher/player1/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/monster-masher/player2/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/monster-masher/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/monster-masher/player1/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/monster-masher/player2/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/monster-masher.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/monster-masher.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/monster-masher.schemas > /dev/null || /usr/bin/true
share/gnome/applications/monster-masher.desktop
share/gnome/monster-masher/glade/ui.glade
share/gnome/monster-masher/pixmaps/block-24.png
@@ -106,9 +102,3 @@ share/gnome/pixmaps/monster-masher.png
@dirrm share/gnome/monster-masher/pixmaps
@dirrm share/gnome/monster-masher/sounds
@dirrm share/gnome/monster-masher
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/monster-masher/player2
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/monster-masher/player1
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/monster-masher
-@dirrm etc/gconf/gconf.xml.defaults/apps/monster-masher/player2
-@dirrm etc/gconf/gconf.xml.defaults/apps/monster-masher/player1
-@dirrm etc/gconf/gconf.xml.defaults/apps/monster-masher
diff --git a/games/teg/pkg-plist b/games/teg/pkg-plist
index b8f040c562b4..b9f674b6bcd2 100644
--- a/games/teg/pkg-plist
+++ b/games/teg/pkg-plist
@@ -1,9 +1,9 @@
bin/tegclient
bin/tegrobot
bin/tegserver
-etc/gconf/gconf.xml.defaults/apps/teg/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/teg/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/teg.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/teg.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/teg.schemas > /dev/null || /usr/bin/true
share/gnome/apps/Games/teg.desktop
share/gnome/help/teg/C/figures/connect.png
share/gnome/help/teg/C/figures/dices.png
@@ -269,5 +269,3 @@ share/locale/pt_BR/LC_MESSAGES/teg.mo
@dirrm share/gnome/help/teg/C/figures
@dirrm share/gnome/help/teg/C
@dirrm share/gnome/help/teg
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/teg
-@dirrm etc/gconf/gconf.xml.defaults/apps/teg
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index b7bacd8b1591..ad367ab44cba 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -1,15 +1,7 @@
bin/eog
-etc/gconf/gconf.xml.defaults/apps/eog/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/eog/full_screen/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/eog/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/eog/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/eog/window/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/eog.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/eog.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/eog.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_EOG.server
libdata/bonobo/servers/GNOME_EOG_Collection.server
libexec/eog-collection-view
@@ -171,8 +163,6 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo
@dirrm share/gnome/help/eog/C/figures
@dirrm share/gnome/eog/glade
@dirrm share/gnome/eog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/eog/ui
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true
diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist
index 28ab37581abc..082964bf611a 100644
--- a/graphics/gpdf/pkg-plist
+++ b/graphics/gpdf/pkg-plist
@@ -1,11 +1,7 @@
bin/gpdf
-etc/gconf/gconf.xml.defaults/apps/gpdf/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gpdf/UI/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gpdf/UI/Windows/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/Windows/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gpdf.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gpdf.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gpdf.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_PDF.server
libexec/gnome-pdf-viewer
share/gnome/application-registry/gpdf.applications
@@ -111,12 +107,6 @@ share/locale/zh_TW/LC_MESSAGES/gpdf.mo
@dirrm share/gnome/help/gpdf
@dirrm share/gnome/gpdf/glade
@dirrm share/gnome/gpdf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/Windows
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf
-@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf/UI/Windows
-@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf/UI
-@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 4d9afd021282..2041a036ef58 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -1,7 +1,7 @@
bin/ximian-connector-setup
-etc/gconf/gconf.xml.defaults/apps/evolution/exchange/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/exchange/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_exchange.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/apps_evolution_exchange.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_exchange.schemas > /dev/null || /usr/bin/true
lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.so
lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.urls
libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage.server
@@ -19,5 +19,3 @@ share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
@dirrm share/gnome/ximian-connector/%%VERSION%%/glade
@dirrm share/gnome/ximian-connector/%%VERSION%%
@dirrm share/gnome/ximian-connector
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/exchange
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/exchange
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 54b2ff5fa67a..e1b995077643 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,79 +1,21 @@
bin/evolution
bin/evolution-%%VERSION%%
bin/evolution-addressbook-export
-etc/gconf/gconf.xml.defaults/apps/evolution/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/select_names/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/date_navigator/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/notify/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/other/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/prompts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/colors/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/fonts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/format/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/default_folders/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/offline/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/folder_bar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/shortcut_bar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/summary/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/summary/calendar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/summary/mail/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/summary/rdf/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/summary/tasks/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/evolution/summary/weather/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/completion/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/select_names/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/date_navigator/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/notify/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/other/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/prompts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/colors/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/fonts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/default_folders/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/offline/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults/folder_bar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults/shortcut_bar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/calendar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/mail/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/rdf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/tasks/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/weather/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/apps_evolution_addressbook.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_addressbook.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_evolution_calendar.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/apps_evolution_calendar.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_calendar.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_evolution_shell.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/apps_evolution_shell.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_shell.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_evolution_summary.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/apps_evolution_summary.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_summary.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/evolution-mail.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/evolution-mail.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/evolution-mail.schemas > /dev/null || /usr/bin/true
include/evolution-%%VERSION%%/cal-client/cal-client-multi.h
include/evolution-%%VERSION%%/cal-client/cal-client-types.h
include/evolution-%%VERSION%%/cal-client/cal-client.h
@@ -470,7 +412,9 @@ share/gnome/evolution/%%VERSION%%/etspec/mail-accounts.etspec
share/gnome/evolution/%%VERSION%%/etspec/meeting-page.etspec
share/gnome/evolution/%%VERSION%%/etspec/message-list.etspec
share/gnome/evolution/%%VERSION%%/etspec/subscribe-dialog.etspec
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/share/gnome/evolution/%%VERSION%%/evolutionperson.schema > /dev/null || /usr/bin/true
share/gnome/evolution/%%VERSION%%/evolutionperson.schema
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/share/gnome/evolution/%%VERSION%%/evolutionperson.schema > /dev/null || /usr/bin/true
share/gnome/evolution/%%VERSION%%/filtertypes.xml
share/gnome/evolution/%%VERSION%%/glade/alarm-notify.glade
share/gnome/evolution/%%VERSION%%/glade/alarm-options.glade
@@ -1334,72 +1278,4 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@dirrm include/evolution-%%VERSION%%/cal-util
@dirrm include/evolution-%%VERSION%%/cal-client
@dirrm include/evolution-%%VERSION%%
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/weather
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/tasks
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/rdf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/mail
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary/calendar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/summary
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults/shortcut_bar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults/folder_bar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/offline
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/default_folders
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/fonts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/view
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/colors
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/prompts
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/other
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/notify
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/display
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/date_navigator
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/select_names
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/completion
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/summary/weather
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/summary/tasks
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/summary/rdf
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/summary/mail
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/summary/calendar
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/summary
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/shortcut_bar
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/folder_bar
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/offline
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell/default_folders
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/shell
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/format
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/fonts
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/display
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/view
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/colors
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/prompts
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/other
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/notify
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/display
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar/date_navigator
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/calendar
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/select_names
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/addressbook
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf 2>/dev/null || /usr/bin/true
diff --git a/mail/ximian-connector/pkg-plist b/mail/ximian-connector/pkg-plist
index 4d9afd021282..2041a036ef58 100644
--- a/mail/ximian-connector/pkg-plist
+++ b/mail/ximian-connector/pkg-plist
@@ -1,7 +1,7 @@
bin/ximian-connector-setup
-etc/gconf/gconf.xml.defaults/apps/evolution/exchange/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/evolution/exchange/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_evolution_exchange.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/apps_evolution_exchange.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_evolution_exchange.schemas > /dev/null || /usr/bin/true
lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.so
lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.urls
libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage.server
@@ -19,5 +19,3 @@ share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo
@dirrm share/gnome/ximian-connector/%%VERSION%%/glade
@dirrm share/gnome/ximian-connector/%%VERSION%%
@dirrm share/gnome/ximian-connector
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/exchange
-@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/exchange
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 1200fad6a5aa..b89aba434cab 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -1,8 +1,8 @@
bin/gcalctool
bin/gnome-calculator
-etc/gconf/gconf.xml.defaults/apps/gcalctool/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gcalctool/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gcalctool.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gcalctool.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gcalctool.schemas > /dev/null || /usr/bin/true
share/gnome/applications/gcalctool.desktop
share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png
@@ -169,8 +169,6 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
@dirrm share/gnome/help/gcalctool/C/figures
@dirrm share/gnome/help/gcalctool/C
@dirrm share/gnome/help/gcalctool
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gcalctool
-@dirrm etc/gconf/gconf.xml.defaults/apps/gcalctool
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gcalctool/gcalctool-es.omf 2>/dev/null || /usr/bin/true
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index 31541fcf171a..c5f3f923fee6 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -1,9 +1,9 @@
bin/gretl
bin/gretl_x11
bin/gretlcli
-%%GNOME:%%etc/gconf/gconf.xml.defaults/apps/gretl/%gconf.xml
-%%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
+%%GNOME:%%@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/%%GNOME:%%etc/gconf/schemas/gretl.schemas > /dev/null || /usr/bin/true
%%GNOME:%%etc/gconf/schemas/gretl.schemas
+%%GNOME:%%@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/%%GNOME:%%etc/gconf/schemas/gretl.schemas > /dev/null || /usr/bin/true
include/gretl/bhhh_max.h
include/gretl/calendar.h
include/gretl/clapack_double.h
@@ -395,5 +395,3 @@ share/locale/ja/LC_MESSAGES/gretl.mo
@dirrm %%DATADIR%%
@dirrm lib/gretl-gtk2
@dirrm include/gretl
-%%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gretl
-%%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/apps/gretl
diff --git a/misc/gretl/pkg-plist b/misc/gretl/pkg-plist
index 31541fcf171a..c5f3f923fee6 100644
--- a/misc/gretl/pkg-plist
+++ b/misc/gretl/pkg-plist
@@ -1,9 +1,9 @@
bin/gretl
bin/gretl_x11
bin/gretlcli
-%%GNOME:%%etc/gconf/gconf.xml.defaults/apps/gretl/%gconf.xml
-%%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
+%%GNOME:%%@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/%%GNOME:%%etc/gconf/schemas/gretl.schemas > /dev/null || /usr/bin/true
%%GNOME:%%etc/gconf/schemas/gretl.schemas
+%%GNOME:%%@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/%%GNOME:%%etc/gconf/schemas/gretl.schemas > /dev/null || /usr/bin/true
include/gretl/bhhh_max.h
include/gretl/calendar.h
include/gretl/clapack_double.h
@@ -395,5 +395,3 @@ share/locale/ja/LC_MESSAGES/gretl.mo
@dirrm %%DATADIR%%
@dirrm lib/gretl-gtk2
@dirrm include/gretl
-%%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gretl
-%%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/apps/gretl
diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist
index 556710d1c280..95c2893039c6 100644
--- a/misc/quick-lounge-applet/pkg-plist
+++ b/misc/quick-lounge-applet/pkg-plist
@@ -1,6 +1,6 @@
-etc/gconf/gconf.xml.defaults/schemas/apps/quick-lounge-applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/quick-lounge-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/quick-lounge.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/quick-lounge.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/quick-lounge.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_QuickLoungeApplet_Factory.server
libexec/quick-lounge-applet
share/gnome/gnome-2.0/ui/GNOME_QuickLoungeApplet.xml
@@ -163,8 +163,6 @@ share/locale/zh_CN/LC_MESSAGES/quick-lounge-applet.mo
@dirrm share/gnome/help/quick-lounge/C/figures
@dirrm share/gnome/help/quick-lounge/C
@dirrm share/gnome/help/quick-lounge
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/quick-lounge-applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/quick-lounge-applet
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/quick-lounge-applet/quick-lounge-es.omf 2>/dev/null || /usr/bin/true
diff --git a/multimedia/gstreamer-player/pkg-plist b/multimedia/gstreamer-player/pkg-plist
index 0ee551a460a0..61d1974617fa 100644
--- a/multimedia/gstreamer-player/pkg-plist
+++ b/multimedia/gstreamer-player/pkg-plist
@@ -1,7 +1,7 @@
bin/gst-player
-etc/gconf/gconf.xml.defaults/apps/gst-player/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gst-player/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gst-player.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gst-player.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gst-player.schemas > /dev/null || /usr/bin/true
include/gst-player-%%VERSION%%/gst/gstvideowidget.h
include/gst-player-%%VERSION%%/gst/gtk-playlist.h
lib/libgstplayer.a
@@ -46,5 +46,3 @@ share/locale/no/LC_MESSAGES/gst-player.mo
@unexec rmdir %D/share/gnome/application-registry 2>/dev/null || true
@dirrm include/gst-player-%%VERSION%%/gst
@dirrm include/gst-player-%%VERSION%%
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gst-player
-@dirrm etc/gconf/gconf.xml.defaults/apps/gst-player
diff --git a/multimedia/nautilus-media/pkg-plist b/multimedia/nautilus-media/pkg-plist
index 907b600d85b3..bfd20679f3e4 100644
--- a/multimedia/nautilus-media/pkg-plist
+++ b/multimedia/nautilus-media/pkg-plist
@@ -1,21 +1,7 @@
bin/gst-thumbnail
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-shockwave-flash/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@mpeg/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@quicktime/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-avi/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-fli/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-asf/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-wmv/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-msvideo/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@mpeg/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@quicktime/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-avi/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-fli/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-asf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-wmv/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-msvideo/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gst-thumbnail.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gst-thumbnail.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gst-thumbnail.schemas > /dev/null || /usr/bin/true
lib/bonobo/libnautilus-audio-properties-view.so
libdata/bonobo/servers/Nautilus_View_audio.server
libdata/bonobo/servers/Nautilus_View_audio_properties.server
@@ -87,19 +73,3 @@ share/locale/vi/LC_MESSAGES/nautilus-media.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-media.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-media.mo
@dirrm share/gnome/pixmaps/nautilus-media
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-msvideo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-wmv
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-asf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-fli
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-avi
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@quicktime
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@mpeg
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-msvideo
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-wmv
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-asf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-fli
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-avi
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@quicktime
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@mpeg
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-shockwave-flash
diff --git a/multimedia/quark/pkg-plist b/multimedia/quark/pkg-plist
index ece1238715b4..e2b09b0b3b0a 100644
--- a/multimedia/quark/pkg-plist
+++ b/multimedia/quark/pkg-plist
@@ -1,14 +1,12 @@
bin/charm-quark
bin/quark
bin/strange-quark
-etc/gconf/gconf.xml.defaults/apps/quark/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/quark/playlist/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/quark/recent/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/quark/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/quark/playlist/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/quark/recent/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/quark.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/quark.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/quark.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/strange-quark.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/strange-quark.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/strange-quark.schemas > /dev/null || /usr/bin/true
%%PORTDOCS%%share/doc/quark/AUTHORS
%%PORTDOCS%%share/doc/quark/COPYING
%%PORTDOCS%%share/doc/quark/INSTALL
@@ -17,9 +15,3 @@ share/gnome/applications/quark.desktop
share/gnome/pixmaps/quark.png
share/locale/ko/LC_MESSAGES/quark.mo
@dirrm share/doc/quark
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/quark/recent
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/quark/playlist
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/quark
-@dirrm etc/gconf/gconf.xml.defaults/apps/quark/recent
-@dirrm etc/gconf/gconf.xml.defaults/apps/quark/playlist
-@dirrm etc/gconf/gconf.xml.defaults/apps/quark
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index f65903e95654..01d8dfb1d0a3 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -1,47 +1,11 @@
bin/totem
bin/totem-video-thumbnailer
-etc/gconf/gconf.xml.defaults/apps/totem/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@ogg/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@vnd.rn-realmedia/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-matroska/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-ogg/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-shockwave-flash/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/audio@x-pn-realaudio/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/misc@ultravox/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@dv/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@mpeg/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@msvideo/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@quicktime/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-anim/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-avi/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-flc/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-fli/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-asf/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-wmv/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-msvideo/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-nsv/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/totem/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@ogg/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@vnd.rn-realmedia/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-matroska/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-ogg/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/audio@x-pn-realaudio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/misc@ultravox/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@dv/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@mpeg/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@msvideo/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@quicktime/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-anim/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-avi/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-flc/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-fli/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-asf/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-wmv/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-msvideo/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-nsv/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/totem-video-thumbnail.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/totem-video-thumbnail.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/totem-video-thumbnail.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/totem.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/totem.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/totem.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/Totem_properties.server
libexec/totem-properties-page
share/gnome/application-registry/totem.applications
@@ -135,45 +99,5 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
@dirrm share/gnome/help/totem
@dirrm share/gnome/omf/totem
@dirrm share/gnome/totem
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-nsv
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-msvideo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-wmv
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-asf
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-fli
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-flc
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-avi
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-anim
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@quicktime
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@msvideo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@mpeg
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@dv
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/misc@ultravox
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/audio@x-pn-realaudio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-ogg
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-matroska
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@vnd.rn-realmedia
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@ogg
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/totem
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-nsv
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-msvideo
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-wmv
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-asf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-fli
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-flc
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-avi
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-anim
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@quicktime
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@msvideo
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@mpeg
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@dv
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/misc@ultravox
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/audio@x-pn-realaudio
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-shockwave-flash
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-ogg
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-matroska
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@vnd.rn-realmedia
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@ogg
-@dirrm etc/gconf/gconf.xml.defaults/apps/totem
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/totem/totem-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/totem/totem-C.omf 2>/dev/null || /usr/bin/true
diff --git a/net-im/gnome-jabber/pkg-plist b/net-im/gnome-jabber/pkg-plist
index a6cd754656ee..6bafed59f644 100644
--- a/net-im/gnome-jabber/pkg-plist
+++ b/net-im/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-im/gnomeicu/pkg-plist b/net-im/gnomeicu/pkg-plist
index 84142858de25..0ff7654b26d0 100644
--- a/net-im/gnomeicu/pkg-plist
+++ b/net-im/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-im/gnomeicu2/pkg-plist b/net-im/gnomeicu2/pkg-plist
index 84142858de25..0ff7654b26d0 100644
--- a/net-im/gnomeicu2/pkg-plist
+++ b/net-im/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-p2p/giftui/pkg-plist b/net-p2p/giftui/pkg-plist
index 06d76cdb471d..dede66d2d198 100644
--- a/net-p2p/giftui/pkg-plist
+++ b/net-p2p/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/ekiga/pkg-plist b/net/ekiga/pkg-plist
index 0b260a5dbc6b..914786a58cba 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 06d76cdb471d..dede66d2d198 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 a6cd754656ee..6bafed59f644 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 952cd2a82354..10169b1e1dbc 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 6d5cab2731d2..ac6ed0a828be 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 84142858de25..0ff7654b26d0 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 84142858de25..0ff7654b26d0 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 0b260a5dbc6b..914786a58cba 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 6d5cab2731d2..ac6ed0a828be 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 69219418f1a5..98e286cc9ae2 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
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index ff7627d27c12..9076d6b9de68 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -2,9 +2,9 @@ bin/gnome-pilot-make-password
bin/gpilot-install-file
bin/gpilotd-control-applet
bin/gpilotd-session-wrapper
-etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_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/pilot.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/pilot.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/pilot.schemas > /dev/null || /usr/bin/true
include/gpilotd/gnome-pilot-client.h
include/gpilotd/gnome-pilot-conduit-backup.h
include/gpilotd/gnome-pilot-conduit-file.h
@@ -88,6 +88,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
@dirrm share/gnome/gnome-pilot/glade
@dirrm include/libgpilotdCM
@dirrm include/gpilotd
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-pilot/gnome-pilot-C.omf 2>/dev/null || /usr/bin/true
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index ff7627d27c12..9076d6b9de68 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -2,9 +2,9 @@ bin/gnome-pilot-make-password
bin/gpilot-install-file
bin/gpilotd-control-applet
bin/gpilotd-session-wrapper
-etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_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/pilot.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/pilot.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/pilot.schemas > /dev/null || /usr/bin/true
include/gpilotd/gnome-pilot-client.h
include/gpilotd/gnome-pilot-conduit-backup.h
include/gpilotd/gnome-pilot-conduit-file.h
@@ -88,6 +88,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
@dirrm share/gnome/gnome-pilot/glade
@dirrm include/libgpilotdCM
@dirrm include/gpilotd
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-pilot/gnome-pilot-C.omf 2>/dev/null || /usr/bin/true
diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist
index 9428ef5d39a1..509569924cf2 100644
--- a/print/ggv2/pkg-plist
+++ b/print/ggv2/pkg-plist
@@ -1,17 +1,7 @@
bin/ggv
-etc/gconf/gconf.xml.defaults/apps/ggv/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/control/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/coordinates/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/gtkgs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/layout/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/printing/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/control/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/coordinates/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/gtkgs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/layout/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/printing/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/ggv.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/ggv.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/ggv.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_GGV.server
libexec/ggv-postscript-viewer
share/gnome/applications/ggv.desktop
@@ -166,18 +156,6 @@ share/locale/zh_TW/LC_MESSAGES/ggv.mo
@dirrm share/gnome/help/ggv/C/figures
@dirrm share/gnome/help/ggv/C
@dirrm share/gnome/help/ggv
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/printing
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/layout
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/gtkgs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/coordinates
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/control
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/printing
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/layout
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/gtkgs
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/coordinates
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/control
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ggv/ggv-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ggv/ggv-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/ggv/ggv-es.omf 2>/dev/null || /usr/bin/true
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 308ca19f11dc..59e40d26ab76 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,14 +1,8 @@
bin/seahorse
bin/seahorse-pgp-preferences
-etc/gconf/gconf.xml.defaults/apps/seahorse/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/seahorse/listing/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/seahorse/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/pgp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/listing/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/pgp/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/seahorse.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/seahorse.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/seahorse.schemas > /dev/null || /usr/bin/true
lib/bonobo/libseahorse-pgp-file-listener.so
libdata/bonobo/servers/Seahorse_PGP_File_Listener.server
share/gnome/applications/seahorse.desktop
@@ -71,12 +65,4 @@ share/locale/zh_CN/LC_MESSAGES/seahorse.mo
@dirrm share/gnome/omf/seahorse
@dirrm share/gnome/seahorse/glade
@dirrm share/gnome/seahorse
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/pgp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/listing
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse
-@dirrm etc/gconf/gconf.xml.defaults/desktop/pgp
-@dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/listing
-@dirrm etc/gconf/gconf.xml.defaults/apps/seahorse
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/seahorse/seahorse-C.omf 2>/dev/null || /usr/bin/true
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
diff --git a/textproc/stardict2/pkg-plist b/textproc/stardict2/pkg-plist
index be0143a637d6..6a4b131865e4 100644
--- a/textproc/stardict2/pkg-plist
+++ b/textproc/stardict2/pkg-plist
@@ -1,19 +1,7 @@
bin/stardict
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/stardict.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/stardict.schemas
-etc/gconf/gconf.xml.defaults/apps/stardict/manage_dictionaries/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/floating_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/main_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/notification_area_icon/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/manage_dictionaries/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/floating_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/main_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/notification_area_icon/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/%gconf.xml
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/stardict.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_Stardict.server
share/gnome/applications/stardict.desktop
share/gnome/help/stardict/C/figures/stardict_float_window.png
@@ -63,20 +51,6 @@ share/locale/de/LC_MESSAGES/stardict.mo
share/locale/mk/LC_MESSAGES/stardict.mo
share/locale/ru/LC_MESSAGES/stardict.mo
share/locale/zh_CN/LC_MESSAGES/stardict.mo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/notification_area_icon
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/main_window
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/floating_window
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/dictionary
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/manage_dictionaries
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/notification_area_icon
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/main_window
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/floating_window
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/dictionary
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/manage_dictionaries
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict
@dirrm share/gnome/stardict/sounds
@dirrm share/gnome/stardict/pixmaps
@dirrm share/gnome/stardict
diff --git a/textproc/stardict3/pkg-plist b/textproc/stardict3/pkg-plist
index be0143a637d6..6a4b131865e4 100644
--- a/textproc/stardict3/pkg-plist
+++ b/textproc/stardict3/pkg-plist
@@ -1,19 +1,7 @@
bin/stardict
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/stardict.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/stardict.schemas
-etc/gconf/gconf.xml.defaults/apps/stardict/manage_dictionaries/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/floating_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/main_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/notification_area_icon/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/stardict/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/manage_dictionaries/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/dictionary/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/floating_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/main_window/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/notification_area_icon/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/stardict/%gconf.xml
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/stardict.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_Stardict.server
share/gnome/applications/stardict.desktop
share/gnome/help/stardict/C/figures/stardict_float_window.png
@@ -63,20 +51,6 @@ share/locale/de/LC_MESSAGES/stardict.mo
share/locale/mk/LC_MESSAGES/stardict.mo
share/locale/ru/LC_MESSAGES/stardict.mo
share/locale/zh_CN/LC_MESSAGES/stardict.mo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/notification_area_icon
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/main_window
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/floating_window
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/dictionary
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/manage_dictionaries
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/notification_area_icon
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/main_window
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/floating_window
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/dictionary
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/manage_dictionaries
-@dirrm etc/gconf/gconf.xml.defaults/apps/stardict
@dirrm share/gnome/stardict/sounds
@dirrm share/gnome/stardict/pixmaps
@dirrm share/gnome/stardict
diff --git a/www/mozilla-bonobo/pkg-plist b/www/mozilla-bonobo/pkg-plist
index d40e48af9158..5fc178a0a285 100644
--- a/www/mozilla-bonobo/pkg-plist
+++ b/www/mozilla-bonobo/pkg-plist
@@ -1,17 +1,11 @@
bin/mozilla-bonobo-viewer
-etc/gconf/gconf.xml.defaults/apps/mozilla-bonobo/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/mozilla-bonobo/mime-types/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mozilla-bonobo/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mozilla-bonobo/mime-types/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mozilla-bonobo.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/mozilla-bonobo.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mozilla-bonobo.schemas > /dev/null || /usr/bin/true
lib/browser_plugins/libmozilla_bonobo.so
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/TODO
-@dirrm etc/gconf/gconf.xml.defaults/apps/mozilla-bonobo/mime-types
-@dirrm etc/gconf/gconf.xml.defaults/apps/mozilla-bonobo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mozilla-bonobo/mime-types
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mozilla-bonobo
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index ca1c59e5f74d..3363683c65d9 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -1,18 +1,7 @@
bin/screem
-etc/gconf/gconf.xml.defaults/apps/screem/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/editor/print/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/hint/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/linkview/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/print/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/hint/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/ui/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/screem.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true
lib/screem/plugins/colourWizard.so
lib/screem/plugins/cssWizard.so
lib/screem/plugins/css_wizard.so
@@ -174,17 +163,4 @@ share/locale/zh_CN/LC_MESSAGES/screem.mo
@dirrm share/gnome/help/screem
@dirrm lib/screem/plugins
@dirrm lib/screem
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/hint
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/print
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/linkview
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/hint
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor/print
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index ca1c59e5f74d..3363683c65d9 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -1,18 +1,7 @@
bin/screem
-etc/gconf/gconf.xml.defaults/apps/screem/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/editor/print/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/hint/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/linkview/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/screem/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/print/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/hint/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/screem/ui/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/screem.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true
lib/screem/plugins/colourWizard.so
lib/screem/plugins/cssWizard.so
lib/screem/plugins/css_wizard.so
@@ -174,17 +163,4 @@ share/locale/zh_CN/LC_MESSAGES/screem.mo
@dirrm share/gnome/help/screem
@dirrm lib/screem/plugins
@dirrm lib/screem
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/hint
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/print
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/linkview
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/hint
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor/print
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/screem
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index ff6c29c9aff3..b690ad973257 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -7,21 +7,9 @@ etc/X11/starthere/preferences.desktop
etc/X11/starthere/serverconfig.desktop
etc/X11/starthere/sysconfig.desktop
etc/X11/sysconfig/.directory
-etc/gconf/gconf.xml.defaults/apps/nautilus/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/nautilus/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_nautilus_preferences.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/apps_nautilus_preferences.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_nautilus_preferences.schemas > /dev/null || /usr/bin/true
include/libnautilus/libnautilus.h
include/libnautilus/nautilus-bonobo-ui.h
include/libnautilus/nautilus-clipboard.h
@@ -229,20 +217,6 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
@dirrm share/gnome/nautilus/glade
@dirrm include/nautilus/libnautilus-extension
@dirrm include/nautilus
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/desktop
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/list_view
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/desktop
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus
@exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0
@unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/lib/nautilus 2>/dev/null || /usr/bin/true
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
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 7069b741684d..ed0e5a07e039 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -3,87 +3,37 @@ bin/gnome-panel
bin/gnome-panel-preferences
bin/gnome-panel-screenshot
bin/panel-test-applets
-etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/clock/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/mixer/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/show_desktop_button/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_list/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_menu/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/workspace_switcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/menu_bar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/nautilus_launcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/terminal_launcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000002/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_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/clock.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/clock.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/clock.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/fish.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/fish.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fish.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-panel-screenshot.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-panel-screenshot.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-panel-screenshot.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/panel-compatibility.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-compatibility.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-default-setup.entries
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-general.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-general.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/panel-global.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-global.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-global.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/panel-object.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-object.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-object.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/panel-toplevel.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-toplevel.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-toplevel.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/window-list.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/window-list.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/window-list.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/workspace-switcher.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/workspace-switcher.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true
include/panel-2.0/GNOME_Panel.h
include/panel-2.0/panel-applet-enums.h
include/panel-2.0/panel-applet-gconf.h
@@ -551,76 +501,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/gnome-panel
@dirrm share/doc/panel-applet
@dirrm include/panel-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000002
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/background
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/background
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/terminal_launcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/nautilus_launcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/menu_bar
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/workspace_switcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_menu
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_list
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/show_desktop_button
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/mixer
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/clock
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/global
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/background
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/background
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-es.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 02016e85c72e..ae71556f4a43 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -4,11 +4,9 @@ bin/gnome-session-remove
bin/gnome-session-save
bin/gnome-smproxy
bin/gnome-wm
-etc/gconf/gconf.xml.defaults/apps/gnome-session/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-session/options/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-session.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
share/gnome/control-center-2.0/capplets/session-properties.desktop
share/gnome/default.session
share/gnome/default.wm
@@ -80,7 +78,3 @@ share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 50b0f08e2848..94a2c56928af 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,15 +1,7 @@
bin/gnome-terminal
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-terminal.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/gnome-terminal.server
share/gnome/application-registry/gnome-terminal.applications
share/gnome/applications/gnome-terminal.desktop
@@ -173,16 +165,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
@dirrm share/gnome/help/gnome-terminal/de/figures
@dirrm share/gnome/help/gnome-terminal/de
@dirrm share/gnome/help/gnome-terminal/C/figures
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-es.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 7069b741684d..ed0e5a07e039 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -3,87 +3,37 @@ bin/gnome-panel
bin/gnome-panel-preferences
bin/gnome-panel-screenshot
bin/panel-test-applets
-etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/clock/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/mixer/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/show_desktop_button/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_list/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_menu/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/workspace_switcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/menu_bar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/nautilus_launcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/terminal_launcher/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000002/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_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/clock.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/clock.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/clock.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/fish.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/fish.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fish.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-panel-screenshot.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-panel-screenshot.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-panel-screenshot.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/panel-compatibility.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-compatibility.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-default-setup.entries
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-general.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-general.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/panel-global.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-global.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-global.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/panel-object.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-object.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-object.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/panel-toplevel.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-toplevel.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-toplevel.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/window-list.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/window-list.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/window-list.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/workspace-switcher.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/workspace-switcher.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true
include/panel-2.0/GNOME_Panel.h
include/panel-2.0/panel-applet-enums.h
include/panel-2.0/panel-applet-gconf.h
@@ -551,76 +501,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/gnome-panel
@dirrm share/doc/panel-applet
@dirrm include/panel-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000002
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/background
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/background
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/terminal_launcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/nautilus_launcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/menu_bar
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/workspace_switcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_menu
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_list
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/show_desktop_button
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/mixer
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/clock
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/global
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/background
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/background
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/workspace_switcher
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_menu
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/window_list
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/show_desktop_button
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/mixer
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets/clock
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/applets
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup
-@dirrm etc/gconf/gconf.xml.defaults/apps/panel
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-es.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index 02016e85c72e..ae71556f4a43 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -4,11 +4,9 @@ bin/gnome-session-remove
bin/gnome-session-save
bin/gnome-smproxy
bin/gnome-wm
-etc/gconf/gconf.xml.defaults/apps/gnome-session/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-session/options/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-session.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
share/gnome/control-center-2.0/capplets/session-properties.desktop
share/gnome/default.session
share/gnome/default.wm
@@ -80,7 +78,3 @@ share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 50b0f08e2848..94a2c56928af 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -1,15 +1,7 @@
bin/gnome-terminal
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/gnome-terminal.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
libdata/bonobo/servers/gnome-terminal.server
share/gnome/application-registry/gnome-terminal.applications
share/gnome/applications/gnome-terminal.desktop
@@ -173,16 +165,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
@dirrm share/gnome/help/gnome-terminal/de/figures
@dirrm share/gnome/help/gnome-terminal/de
@dirrm share/gnome/help/gnome-terminal/C/figures
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-es.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index b57bbc70d402..9cf25eb3b727 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -1,56 +1,49 @@
bin/gnome-open
-etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/startup/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/file_views/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/interface/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/lockdown/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/startup/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/lockdown/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.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_accessibility_startup.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_startup.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_applications_browser.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_applications_browser.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_browser.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_applications_help_viewer.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_help_viewer.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_applications_terminal.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_terminal.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_applications_window_manager.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_window_manager.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_background.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_background.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_background.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_file_views.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_file_views.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_file_views.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_interface.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_interface.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_interface.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_lockdown.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_lockdown.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_lockdown.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.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_peripherals_keyboard.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.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_mouse.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_peripherals_mouse.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_mouse.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_sound.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_sound.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_sound.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_thumbnailers.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_thumbnailers.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_thumbnailers.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_typing_break.schemas > /dev/null || /usr/bin/true
etc/gconf/schemas/desktop_gnome_typing_break.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_typing_break.schemas > /dev/null || /usr/bin/true
etc/sound/events/gnome-2.soundlist
etc/sound/events/gtk-events-2.soundlist
include/libgnome-2.0/libgnome/gnome-config.h
@@ -166,41 +159,3 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm share/doc/libgnome
@dirrm include/libgnome-2.0/libgnome
@dirrm include/libgnome-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/lockdown
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/startup
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/lockdown
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/interface
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/file_views
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/background
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/startup
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility
-etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/%gconf.xml