Update to 2.5.6.

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

10 files changed, 84 insertions, 176 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index bed377913..9accd9d5c 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.5.5
-PORTREVISION=	2
+PORTVERSION=	2.5.6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.5
@@ -40,9 +39,6 @@ EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.i
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
 WITH_CDPARANOIA=	yes
 .endif
-.if exists(${LOCALBASE}/lib/libfam.a)
-WITH_FAM=	yes
-.endif
 
 .if defined(WITH_CDPARANOIA)
 LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
@@ -50,14 +46,14 @@ PLIST_SUB+=	CDPARANOIA=""
 .else
 PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
-.if defined(WITH_FAM)
+.if !defined(WITHOUT_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in \
 		${WRKSRC}/libgnomevfs/xdgmime.c \
 		${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 24aa53bd0..ea5e2f26e 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.5.5.tar.bz2) = b24c07bf0ece5bd6ae0482867faeb0ce
+MD5 (gnome2/gnome-vfs-2.5.6.tar.bz2) = b0a1c88e684cff42d14bb93cf13645bf
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 9cad28559..8c07fab8e 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Mar 31 06:11:24 2003
-+++ configure	Mon Mar 31 18:06:17 2003
-@@ -8344,6 +8344,7 @@
+--- configure.orig	Fri Jan 30 06:09:41 2004
++++ configure	Fri Jan 30 15:33:43 2004
+@@ -20062,6 +20062,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,32 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -13091,8 +13092,8 @@
+@@ -22816,6 +22817,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  ac_check_lib_save_LIBS=$LIBS
++  LIBS="-lintl  $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22898,6 +22901,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -22905,6 +22909,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++ LIBS="-lintl $LIBS"
+  have_ngettext=yes
+ fi
+ done
+@@ -26396,8 +26401,8 @@
    done
  fi
  
@@ -19,7 +44,7 @@
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13112,11 +13113,11 @@
+@@ -26416,11 +26421,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -33,16 +58,16 @@
    ;
    return 0;
  }
-@@ -13858,7 +13859,7 @@
+@@ -27547,7 +27552,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
  		cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -13914,9 +13915,9 @@
+ _ACEOF
+@@ -27613,9 +27618,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +79,7 @@
                  fi
  
  
-@@ -15904,6 +15905,7 @@
+@@ -30543,6 +30548,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
deleted file mode 100644
index 21ce33515..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libgnomevfs/xdgmime.c.orig	Wed Jan  7 13:44:02 2004
-+++ libgnomevfs/xdgmime.c	Tue Jan 13 01:55:41 2004
-@@ -97,7 +97,7 @@
- 
-       xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-       if (xdg_data_dirs == NULL)
--	xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+	xdg_data_dirs = "%%LOCALBASE%%/share/:/usr/share/";
- 
-       ptr = xdg_data_dirs;
- 
-@@ -121,8 +121,9 @@
- 	    len = end_ptr - ptr;
- 	  else
- 	    len = end_ptr - ptr + 1;
--	  dir = malloc (len);
-+	  dir = malloc (len + 1);
- 	  strncpy (dir, ptr, len);
-+	  dir[len] = '\0';
- 	  _xdg_mime_init_from_directory (dir);
- 	  free (dir);
- 
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index a4f3671df..1f03b61ff 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -3,7 +3,6 @@ bin/gnomevfs-copy
 bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
-bin/vfs-daemon
 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
@@ -140,56 +139,10 @@ libdata/bonobo/servers/GNOME_VFS_Daemon.server
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
-share/doc/gnome-vfs-2.0/about.html
-share/doc/gnome-vfs-2.0/advanced-operations.html
-share/doc/gnome-vfs-2.0/ch08.html
-share/doc/gnome-vfs-2.0/data-types.html
-share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
-share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+libexec/gnome-vfs-daemon
+share/doc/gnome-vfs-2.0/core.3396
 share/doc/gnome-vfs-2.0/home.png
-share/doc/gnome-vfs-2.0/index.html
-share/doc/gnome-vfs-2.0/index.sgml
 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/up.png
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -262,9 +215,11 @@ 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
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index bed377913..9accd9d5c 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.5.5
-PORTREVISION=	2
+PORTVERSION=	2.5.6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.5
@@ -40,9 +39,6 @@ EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.i
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
 WITH_CDPARANOIA=	yes
 .endif
-.if exists(${LOCALBASE}/lib/libfam.a)
-WITH_FAM=	yes
-.endif
 
 .if defined(WITH_CDPARANOIA)
 LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
@@ -50,14 +46,14 @@ PLIST_SUB+=	CDPARANOIA=""
 .else
 PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
-.if defined(WITH_FAM)
+.if !defined(WITHOUT_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in \
 		${WRKSRC}/libgnomevfs/xdgmime.c \
 		${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 24aa53bd0..ea5e2f26e 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.5.5.tar.bz2) = b24c07bf0ece5bd6ae0482867faeb0ce
+MD5 (gnome2/gnome-vfs-2.5.6.tar.bz2) = b0a1c88e684cff42d14bb93cf13645bf
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 9cad28559..8c07fab8e 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Mar 31 06:11:24 2003
-+++ configure	Mon Mar 31 18:06:17 2003
-@@ -8344,6 +8344,7 @@
+--- configure.orig	Fri Jan 30 06:09:41 2004
++++ configure	Fri Jan 30 15:33:43 2004
+@@ -20062,6 +20062,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,32 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -13091,8 +13092,8 @@
+@@ -22816,6 +22817,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  ac_check_lib_save_LIBS=$LIBS
++  LIBS="-lintl  $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22898,6 +22901,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -22905,6 +22909,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++ LIBS="-lintl $LIBS"
+  have_ngettext=yes
+ fi
+ done
+@@ -26396,8 +26401,8 @@
    done
  fi
  
@@ -19,7 +44,7 @@
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13112,11 +13113,11 @@
+@@ -26416,11 +26421,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -33,16 +58,16 @@
    ;
    return 0;
  }
-@@ -13858,7 +13859,7 @@
+@@ -27547,7 +27552,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
  		cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -13914,9 +13915,9 @@
+ _ACEOF
+@@ -27613,9 +27618,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +79,7 @@
                  fi
  
  
-@@ -15904,6 +15905,7 @@
+@@ -30543,6 +30548,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
deleted file mode 100644
index 21ce33515..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libgnomevfs/xdgmime.c.orig	Wed Jan  7 13:44:02 2004
-+++ libgnomevfs/xdgmime.c	Tue Jan 13 01:55:41 2004
-@@ -97,7 +97,7 @@
- 
-       xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-       if (xdg_data_dirs == NULL)
--	xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+	xdg_data_dirs = "%%LOCALBASE%%/share/:/usr/share/";
- 
-       ptr = xdg_data_dirs;
- 
-@@ -121,8 +121,9 @@
- 	    len = end_ptr - ptr;
- 	  else
- 	    len = end_ptr - ptr + 1;
--	  dir = malloc (len);
-+	  dir = malloc (len + 1);
- 	  strncpy (dir, ptr, len);
-+	  dir[len] = '\0';
- 	  _xdg_mime_init_from_directory (dir);
- 	  free (dir);
- 
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index a4f3671df..1f03b61ff 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -3,7 +3,6 @@ bin/gnomevfs-copy
 bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
-bin/vfs-daemon
 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
@@ -140,56 +139,10 @@ libdata/bonobo/servers/GNOME_VFS_Daemon.server
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
-share/doc/gnome-vfs-2.0/about.html
-share/doc/gnome-vfs-2.0/advanced-operations.html
-share/doc/gnome-vfs-2.0/ch08.html
-share/doc/gnome-vfs-2.0/data-types.html
-share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
-share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+libexec/gnome-vfs-daemon
+share/doc/gnome-vfs-2.0/core.3396
 share/doc/gnome-vfs-2.0/home.png
-share/doc/gnome-vfs-2.0/index.html
-share/doc/gnome-vfs-2.0/index.sgml
 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/up.png
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -262,9 +215,11 @@ 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