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

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

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

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

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

3 files changed, 6 insertions, 120 deletions

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