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, 60 deletions

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