Update to 2.7.3.

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

10 files changed, 34 insertions, 216 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 11566a432..bbf927cc9 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.7.2
-PORTREVISION=	1
+PORTVERSION=	2.7.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.7
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index aca553826..5f6ace485 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.7.2.tar.bz2) = 6a2381f341f315f893540adf3b641907
-SIZE (gnome2/gnome-vfs-2.7.2.tar.bz2) = 1512798
+MD5 (gnome2/gnome-vfs-2.7.3.tar.bz2) = 5d7d6dcf7fe1cddb45938453df21651e
+SIZE (gnome2/gnome-vfs-2.7.3.tar.bz2) = 1651255
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
index 91b4a442e..baf69fb57 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
@@ -1,16 +1,6 @@
---- libgnomevfs/gnome-vfs-dns-sd.c.orig	Fri Jun 18 05:20:48 2004
-+++ libgnomevfs/gnome-vfs-dns-sd.c	Thu Jul  1 02:39:34 2004
-@@ -24,6 +24,9 @@
- #include <config.h>
- 
- #include <sys/time.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
- #include <resolv.h>
- #include <string.h>
- #include "gnome-vfs-dns-sd.h"
-@@ -684,8 +687,8 @@
+--- libgnomevfs/gnome-vfs-dns-sd.c.orig	Mon Jul  5 16:39:19 2004
++++ libgnomevfs/gnome-vfs-dns-sd.c	Mon Jul  5 16:39:33 2004
+@@ -694,8 +694,8 @@
  	    gpointer     callback_data)
  {
  	sw_discovery session;
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.h b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.h
deleted file mode 100644
index 0c785453b..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-dns-sd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-dns-sd.h.orig	Fri Jun 18 13:26:28 2004
-+++ libgnomevfs/gnome-vfs-dns-sd.h	Fri Jun 18 13:26:45 2004
-@@ -24,6 +24,7 @@
- #ifndef GNOME_VFS_DNS_SD_H
- #define GNOME_VFS_DSN_SD_H
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <glib.h>
- #include <libgnomevfs/gnome-vfs-result.h>
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index ffb567fda..3a22c47d9 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -4,52 +4,21 @@ bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
 bin/gnomevfs-rm
-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/dns_sd/%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/dns_sd/%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_dns_sd.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/system_dns_sd.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_dns_sd.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
@@ -198,6 +167,7 @@ share/doc/gnome-vfs-2.0/left.png
 share/doc/gnome-vfs-2.0/mime-registry.html
 share/doc/gnome-vfs-2.0/modules.html
 share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
 share/doc/gnome-vfs-2.0/up.png
 @exec mkdir -p %D/share/gnome/vfolders
 %%KDEMENUS%%share/gnome/vfolders/KDE.directory
@@ -280,43 +250,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/dns_sd
-@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/dns_sd
-@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/Makefile b/devel/gnomevfs2/Makefile
index 11566a432..bbf927cc9 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.7.2
-PORTREVISION=	1
+PORTVERSION=	2.7.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.7
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index aca553826..5f6ace485 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.7.2.tar.bz2) = 6a2381f341f315f893540adf3b641907
-SIZE (gnome2/gnome-vfs-2.7.2.tar.bz2) = 1512798
+MD5 (gnome2/gnome-vfs-2.7.3.tar.bz2) = 5d7d6dcf7fe1cddb45938453df21651e
+SIZE (gnome2/gnome-vfs-2.7.3.tar.bz2) = 1651255
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
index 91b4a442e..baf69fb57 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.c
@@ -1,16 +1,6 @@
---- libgnomevfs/gnome-vfs-dns-sd.c.orig	Fri Jun 18 05:20:48 2004
-+++ libgnomevfs/gnome-vfs-dns-sd.c	Thu Jul  1 02:39:34 2004
-@@ -24,6 +24,9 @@
- #include <config.h>
- 
- #include <sys/time.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
- #include <resolv.h>
- #include <string.h>
- #include "gnome-vfs-dns-sd.h"
-@@ -684,8 +687,8 @@
+--- libgnomevfs/gnome-vfs-dns-sd.c.orig	Mon Jul  5 16:39:19 2004
++++ libgnomevfs/gnome-vfs-dns-sd.c	Mon Jul  5 16:39:33 2004
+@@ -694,8 +694,8 @@
  	    gpointer     callback_data)
  {
  	sw_discovery session;
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.h b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.h
deleted file mode 100644
index 0c785453b..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-dns-sd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-dns-sd.h.orig	Fri Jun 18 13:26:28 2004
-+++ libgnomevfs/gnome-vfs-dns-sd.h	Fri Jun 18 13:26:45 2004
-@@ -24,6 +24,7 @@
- #ifndef GNOME_VFS_DNS_SD_H
- #define GNOME_VFS_DSN_SD_H
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <glib.h>
- #include <libgnomevfs/gnome-vfs-result.h>
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index ffb567fda..3a22c47d9 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -4,52 +4,21 @@ bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
 bin/gnomevfs-rm
-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/dns_sd/%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/dns_sd/%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_dns_sd.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/system_dns_sd.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/system_dns_sd.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
@@ -198,6 +167,7 @@ share/doc/gnome-vfs-2.0/left.png
 share/doc/gnome-vfs-2.0/mime-registry.html
 share/doc/gnome-vfs-2.0/modules.html
 share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
 share/doc/gnome-vfs-2.0/up.png
 @exec mkdir -p %D/share/gnome/vfolders
 %%KDEMENUS%%share/gnome/vfolders/KDE.directory
@@ -280,43 +250,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/dns_sd
-@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/dns_sd
-@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