update gnome-vfs2 to 2.18.1

based on diffs by alek@
testing by Mikolaj Kucharski

ok martynas@

x11/gnome/vfs2/Makefile

@@ -1,60 +1,62 @@
-# $OpenBSD: Makefile,v 1.20 2006/12/16 12:22:36 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2007/04/27 22:06:37 jasper Exp $
+
+SHARED_ONLY=		Yes
 
 COMMENT=		"GNOME Virtual File System"
 
-VERSION=		2.10.1
+VERSION=		2.18.1
 DISTNAME=		gnome-vfs-${VERSION}
-PKGNAME=		gnome-vfs2-${VERSION}p0
-SHARED_LIBS=		gnomevfs-2 1000.1
-CATEGORIES=		devel x11/gnome
+PKGNAME=		gnome-vfs2-${VERSION}
+SHARED_LIBS +=	gnomevfs-2       1800.1       # .1800.1
+CATEGORIES=		x11/gnome
+
 HOMEPAGE=		http://www.gnome.org/
 
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.10/}
-
-MODULES=		devel/gettext
-
-LIB_DEPENDS=		bonobo-2,bonobo-activation::x11/gnome/libbonobo \
-			bz2::archivers/bzip2 \
-			cdda_paranoia,cdda_interface::audio/cdparanoia \
-			gconf-2::devel/gconf2
-
-BUILD_DEPENDS=		:p5-XML-Parser-*:textproc/p5-XML-Parser \
-			:gnome-mime-data->=2.0.0:x11/gnome/mime-data
-RUN_DEPENDS=		:gnome-mime-data->=2.0.0:x11/gnome/mime-data \
-			:shared-mime-info-*:misc/shared-mime-info
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ORBit-2 ORBitCosNaming-2 glib-2.0 \
-			gmodule-2.0 gobject-2.0 gthread-2.0 popt \
-			xml2 c crypto m pthread ssl z
+WANTLIB += c crypto dbus-1 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += m pthread rpcsvc ssl stdc++ util z
+
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.18/}
+EXTRACT_SUFX=		.tar.bz2
+
+MODULES=		devel/gettext
+BUILD_DEPENDS=		:p5-XML-Parser-*:textproc/p5-XML-Parser \
+			:gnome-mime-data->=2.0.0:x11/gnome/mime-data
+LIB_DEPENDS=		dbus-glib-1.>=3::x11/dbus-glib \
+			fam::sysutils/fam \
+			xml2.>=9::textproc/libxml \
+			gconf-2.>=5::devel/gconf2 \
+			cdda_interface,cdda_paranoia::audio/cdparanoia \
+			bz2.>=10::archivers/bzip2 \
+			ORBit-2.>=2::devel/ORBit2
+RUN_DEPENDS=		:gnome-mime-data->=2.0.0:x11/gnome/mime-data
 
 USE_X11=		Yes
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
-CONFIGURE_STYLE= 	gnu old
-CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
-CONFIGURE_ARGS+=	--sysconfdir="${SYSCONFDIR}/gnome"
-CONFIGURE_ARGS+=	--disable-gtk-doc
-CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-vfs2
-CONFIGURE_ARGS+=	--disable-ipv6 \
+CONFIGURE_STYLE= 	gnu
+CONFIGURE_ARGS+= 	${CONFIGURE_SHARED} \
+			--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-vfs2 \
+			--disable-schemas-install \
+			--enable-openssl \
+			--enable-cdda \
+			--disable-avahi \
 			--disable-howl \
 			--disable-samba
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
-# This port has "/usr/local" hardcoded, we prefer ${LOCALBASE}
 pre-build:
-	for i in gnome-vfs-mime-info.c xdgmime.c; do \
-		perl -pi -e "s,/usr/local,${LOCALBASE},g" \
-			${WRKSRC}/libgnomevfs/$$i; \
-	done
+	perl -pi -e "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/libgnomevfs/xdgmime.c
 
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-vfs2; \
 	cp -Rp ${WRKINST}/${SYSCONFDIR}/gnome/* ${PREFIX}/share/examples/gnome-vfs2/
 
 .include <bsd.port.mk>
+
+CONFIGURE_ARGS+=	--sysconfdir="${SYSCONFDIR}/gnome"

x11/gnome/vfs2/distinfo

@@ -1,5 +1,5 @@
-MD5 (gnome-vfs-2.10.1.tar.gz) = hKAUj5LYzTyLc2Mp/j2s+Q==
-RMD160 (gnome-vfs-2.10.1.tar.gz) = 4dRXsyIlpC3W9xcZbKTGAatyeVo=
-SHA1 (gnome-vfs-2.10.1.tar.gz) = Pi4Pcdqv5LoyEdUDf6eWzC/pq0Q=
-SHA256 (gnome-vfs-2.10.1.tar.gz) = TjtKiGWJgyS6N95EyfWFavntN/XkMO430FuToHnGUMo=
-SIZE (gnome-vfs-2.10.1.tar.gz) = 2864322
+MD5 (gnome-vfs-2.18.1.tar.bz2) = v0ptlRgNBZgYk+XQIcZpXA==
+RMD160 (gnome-vfs-2.18.1.tar.bz2) = /y/Hp8R7haA9ZZZKitHX1YVpjz0=
+SHA1 (gnome-vfs-2.18.1.tar.bz2) = 6Tn+T+LnVRaubE1Hb4+0T1nsi9w=
+SHA256 (gnome-vfs-2.18.1.tar.bz2) = CY2SDLfUpQ4kXeqvq/2OBrhsiHcdVr5WdZfAnAkgf14=
+SIZE (gnome-vfs-2.18.1.tar.bz2) = 1916897

x11/gnome/vfs2/patches/patch-configure

@@ -1,32 +1,7 @@
-$OpenBSD: patch-configure,v 1.9 2005/05/24 21:50:12 marcm Exp $
---- configure.orig	Mon Mar  7 00:15:59 2005
-+++ configure	Mon Apr  4 23:33:26 2005
-@@ -9087,7 +9087,7 @@ nto-qnx*)
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -23359,6 +23359,7 @@ echo "${ECHO_T}$LINGUAS" >&6
- 
- 
- 
-+LIBS="$LIBS $INTLLIBS"
- for ac_func in ngettext
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-@@ -26284,6 +26285,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <sys/vfs.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
-+#include <sys/param.h>
- #include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_STATFS_H
-@@ -33918,7 +33920,7 @@ if test "${openssl_libs+set}" = set; the
+$OpenBSD: patch-configure,v 1.10 2007/04/27 22:06:38 jasper Exp $
+--- configure.orig	Thu Apr 19 21:09:55 2007
++++ configure	Thu Apr 19 21:11:28 2007
+@@ -33402,7 +33402,7 @@ if test "${openssl_libs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -35,19 +10,21 @@ $OpenBSD: patch-configure,v 1.9 2005/05/24 21:50:12 marcm Exp $
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37241,6 +37243,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #include <sys/mount.h>
+@@ -33700,7 +33700,7 @@ if test "${openssl_libs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
  
+-		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
++		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
+ 		cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
  _ACEOF
-@@ -37262,6 +37265,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #include <sys/mount.h>
- #include <sys/fs_types.h>
+@@ -38563,7 +38563,7 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfam  $LIBS"
++LIBS="-lfam  -lm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
  _ACEOF

x11/gnome/vfs2/patches/patch-libgnomevfs-gnome-vfs-dns-sd_c

@@ -1,127 +0,0 @@
---- libgnomevfs/gnome-vfs-dns-sd.c.orig	Mon Jan 10 10:52:39 2005
-+++ libgnomevfs/gnome-vfs-dns-sd.c	Mon Apr  4 22:37:37 2005
-@@ -76,7 +76,7 @@ typedef struct {
- } dns_message_header;
- 
- typedef struct {
--	char name[NS_MAXDNAME];
-+       char name[MAXDNAME];
- 	guint16 type;
- 	guint16 class;
- 	guint32 ttl;
-@@ -241,7 +241,7 @@ parse_header (char *reply, int reply_len
- 	      unsigned char *p,
- 	      dns_message_header *header)
- {
--	if (reply_len < NS_HFIXEDSZ)
-+       if (reply_len < HFIXEDSZ)
- 		return -1;
- 
- 	header->id = decode_16 (p); p += 2;
-@@ -251,7 +251,7 @@ parse_header (char *reply, int reply_len
- 	header->nscount = decode_16 (p); p += 2;
- 	header->arcount = decode_16 (p); p += 2;
- 
--	return NS_HFIXEDSZ;
-+	return HFIXEDSZ;
- }
- 
- 
-@@ -324,7 +324,7 @@ unicast_list_domains_sync (const char *d
- 	unsigned char reply[DNS_REPLY_SIZE];
- 	unsigned char *p;
- 	char *searchdomain;
--	char name[NS_MAXDNAME];
-+	char name[MAXDNAME];
- 	dns_message_header header;
- 	dns_message_rr rr;
- 	int res;
-@@ -340,7 +340,7 @@ unicast_list_domains_sync (const char *d
- 	/* Use TCP to support large queries */
- 	_res.options |= RES_USEVC;
- 	searchdomain = g_strconcat ("_browse._dns-sd._udp.", domain, NULL);
--	reply_len = res_search (searchdomain, ns_c_in, ns_t_ptr,
-+	reply_len = res_search (searchdomain, C_IN, T_PTR,
- 				reply, sizeof (reply));
- 	g_free (searchdomain);
- 	if (reply_len == -1) {
-@@ -384,7 +384,7 @@ unicast_list_domains_sync (const char *d
- 			goto error;
- 		p += len;
- 		
--		if (rr.type == ns_t_ptr) {
-+		if (rr.type == T_PTR) {
- 			len = dn_expand (reply, reply + reply_len, p, name, sizeof(name));
- 			if (len < 0) 
- 				goto error;
-@@ -435,7 +435,7 @@ unicast_browse_sync (const char *domain,
- 	unsigned char reply[DNS_REPLY_SIZE];
- 	unsigned char *p;
- 	char *searchdomain;
--	char name[NS_MAXDNAME];
-+	char name[MAXDNAME];
- 	dns_message_header header;
- 	dns_message_rr rr;
- 	GArray *array;
-@@ -452,7 +452,7 @@ unicast_browse_sync (const char *domain,
- 	/* Use TCP to support large queries */
- 	_res.options |= RES_USEVC;
- 	searchdomain = g_strconcat (type, ".", domain, NULL);
--	reply_len = res_search (searchdomain, ns_c_in, ns_t_ptr,
-+	reply_len = res_search (searchdomain, C_IN, T_PTR,
- 				reply, sizeof (reply));
- 	g_free (searchdomain);
- 	if (reply_len == -1) {
-@@ -498,11 +498,12 @@ unicast_browse_sync (const char *domain,
- 			goto error;
- 		p += len;
- 		
--		if (rr.type == ns_t_ptr) {
-+		if (rr.type == T_PTR) {
- 			GnomeVFSDNSSDService service;
--			char ptr_service[NS_MAXDNAME];
--			char ptr_type[NS_MAXDNAME];
--			char ptr_domain[NS_MAXDNAME];
-+
-+			char ptr_service[MAXDNAME];
-+			char ptr_type[MAXDNAME];
-+			char ptr_domain[MAXDNAME];
- 			
- 			len = dn_expand (reply, reply + reply_len, p, name, sizeof(name));
- 			if (len < 0) 
-@@ -596,7 +597,7 @@ unicast_resolve_sync (const char *name,
- 	int reply_len, len, i;
- 	unsigned char reply[DNS_REPLY_SIZE];
- 	unsigned char *p;
--	char dnsname[NS_MAXDNAME];
-+	char dnsname[MAXDNAME];
- 	dns_message_header header;
- 	dns_message_rr rr;
- 	char *full_name;
-@@ -616,7 +617,7 @@ unicast_resolve_sync (const char *name,
- 	_res.options |= RES_USEVC;
-   
- 	full_name = service_to_dns_name (name, type, domain);
--	reply_len = res_search (full_name, ns_c_in, ns_t_any,
-+	reply_len = res_search (full_name, C_IN, T_ANY,
- 				reply, sizeof (reply));
- 	g_free (full_name);
- 	if (reply_len == -1) {
-@@ -660,7 +661,7 @@ unicast_resolve_sync (const char *name,
- 			goto error;
- 		p += len;
- 		
--		if (rr.type == ns_t_srv) {
-+		if (rr.type == T_SRV) {
- 			unsigned char *pp;
- 			int priority, weight, port;
- 			
-@@ -681,7 +682,7 @@ unicast_resolve_sync (const char *name,
- 			}
- 		}
- 		
--		if (rr.type == ns_t_txt) {
-+		if (rr.type == T_TXT) {
- 			*text_raw_out = g_memdup (p, rr.rdlength);
- 			*text_raw_len_out = rr.rdlength;
- 		}

x11/gnome/vfs2/patches/patch-libgnomevfs_gnome-vfs-mime-info_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-libgnomevfs_gnome-vfs-mime-info_c,v 1.1 2005/05/24 21:50:12 marcm Exp $
---- libgnomevfs/gnome-vfs-mime-info.c.orig	Tue Dec 14 07:30:29 2004
-+++ libgnomevfs/gnome-vfs-mime-info.c	Mon Apr  4 22:37:37 2005
-@@ -150,7 +150,7 @@ gnome_vfs_mime_init (void)
- 
- 	xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
- 	if (!xdg_data_dirs) {
--		xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+		xdg_data_dirs = "/var/db/gnome/:/usr/local/share/";
- 	}
- 	
- 	split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0);

x11/gnome/vfs2/patches/patch-libgnomevfs_xdgmime_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-libgnomevfs_xdgmime_c,v 1.1 2005/05/24 21:50:12 marcm Exp $
---- libgnomevfs/xdgmime.c.orig	Tue Dec 14 07:30:30 2004
-+++ libgnomevfs/xdgmime.c	Mon Apr  4 22:37:37 2005
-@@ -207,7 +207,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
+$OpenBSD: patch-libgnomevfs_xdgmime_c,v 1.2 2007/04/27 22:06:38 jasper Exp $
+--- libgnomevfs/xdgmime.c.orig	Tue Apr 10 14:03:59 2007
++++ libgnomevfs/xdgmime.c	Thu Apr 19 21:20:04 2007
+@@ -236,7 +236,7 @@ xdg_run_command_on_dirs (XdgDirectoryFunc  func,
  
    xdg_data_dirs = getenv ("XDG_DATA_DIRS");
    if (xdg_data_dirs == NULL)

x11/gnome/vfs2/patches/patch-modules_cdda-method_c

@@ -1,31 +0,0 @@
-$OpenBSD: patch-modules_cdda-method_c,v 1.1 2004/06/23 03:26:21 marcm Exp $
---- modules/cdda-method.c.orig	2004-01-22 05:29:10.000000000 -0700
-+++ modules/cdda-method.c	2004-06-20 10:34:38.000000000 -0600
-@@ -623,10 +623,10 @@ do_get_file_info (GnomeVFSMethod *method
- 	/* Check and see if we already have opened and stashed this drive */
- 	if (!use_base) {
- 		if (global_context != NULL) {
--#ifdef __linux__
--			if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
--#elif defined(__FreeBSD__)
-+#if defined(__FreeBSD__)
- 			if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
-+#else
-+			if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
- #endif
- 				use_cache = TRUE;
- 				cdda_close (drive);
-@@ -713,10 +713,10 @@ do_open_directory (GnomeVFSMethod *metho
- 	if (!use_base) {
- 		/* Check for cache */
- 		if (global_context != NULL) {
--#ifdef __linux__
--				if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
--#elif defined(__FreeBSD__)
-+#if defined(__FreeBSD__)
- 				if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
-+#else
-+				if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
- #endif
- 					/*	Clear old cache */
- 					cdda_context_free (global_context);

x11/gnome/vfs2/pkg/PFRAG.shared

@@ -1,18 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.10 2006/01/08 15:25:49 alek Exp $
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
-lib/gnome-vfs-2.0/modules/libbzip2.so
-lib/gnome-vfs-2.0/modules/libcdda.so
-lib/gnome-vfs-2.0/modules/libcomputer.so
-lib/gnome-vfs-2.0/modules/libdns-sd.so
-lib/gnome-vfs-2.0/modules/libfile.so
-lib/gnome-vfs-2.0/modules/libftp.so
-lib/gnome-vfs-2.0/modules/libgzip.so
-lib/gnome-vfs-2.0/modules/libhttp.so
-lib/gnome-vfs-2.0/modules/libnetwork.so
-lib/gnome-vfs-2.0/modules/libnntp.so
-lib/gnome-vfs-2.0/modules/libsftp.so
-lib/gnome-vfs-2.0/modules/libtar.so
-lib/gnome-vfs-2.0/modules/libvfs-pipe.so
-lib/gnome-vfs-2.0/modules/libvfs-test.so
-lib/gnome-vfs-2.0/modules/libvfs-translate.so
-@lib lib/libgnomevfs-2.so.${LIBgnomevfs-2_VERSION}

x11/gnome/vfs2/pkg/PLIST

@@ -1,14 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.15 2006/01/08 15:25:49 alek Exp $
+@comment $OpenBSD: PLIST,v 1.16 2007/04/27 22:06:38 jasper Exp $
 bin/gnomevfs-cat
 bin/gnomevfs-copy
+bin/gnomevfs-df
 bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
+bin/gnomevfs-monitor
 bin/gnomevfs-mv
 bin/gnomevfs-rm
-doc/
 include/gnome-vfs-2.0/
 include/gnome-vfs-2.0/libgnomevfs/
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
@@ -29,6 +32,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h
@@ -38,6 +42,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-version.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
@@ -48,61 +53,65 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-pty.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
-lib/bonobo/
-lib/bonobo/monikers/
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.a
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
-lib/bonobo/servers/
-lib/bonobo/servers/GNOME_VFS_Daemon.server
-lib/bonobo/servers/GNOME_VFS_Moniker_std.server
 lib/gnome-vfs-2.0/
 lib/gnome-vfs-2.0/include/
 lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h
 lib/gnome-vfs-2.0/modules/
 lib/gnome-vfs-2.0/modules/libbzip2.a
 lib/gnome-vfs-2.0/modules/libbzip2.la
+lib/gnome-vfs-2.0/modules/libbzip2.so
 lib/gnome-vfs-2.0/modules/libcdda.a
 lib/gnome-vfs-2.0/modules/libcdda.la
+lib/gnome-vfs-2.0/modules/libcdda.so
 lib/gnome-vfs-2.0/modules/libcomputer.a
 lib/gnome-vfs-2.0/modules/libcomputer.la
+lib/gnome-vfs-2.0/modules/libcomputer.so
 lib/gnome-vfs-2.0/modules/libdns-sd.a
 lib/gnome-vfs-2.0/modules/libdns-sd.la
+lib/gnome-vfs-2.0/modules/libdns-sd.so
 lib/gnome-vfs-2.0/modules/libfile.a
 lib/gnome-vfs-2.0/modules/libfile.la
+lib/gnome-vfs-2.0/modules/libfile.so
 lib/gnome-vfs-2.0/modules/libftp.a
 lib/gnome-vfs-2.0/modules/libftp.la
+lib/gnome-vfs-2.0/modules/libftp.so
 lib/gnome-vfs-2.0/modules/libgzip.a
 lib/gnome-vfs-2.0/modules/libgzip.la
+lib/gnome-vfs-2.0/modules/libgzip.so
 lib/gnome-vfs-2.0/modules/libhttp.a
 lib/gnome-vfs-2.0/modules/libhttp.la
+lib/gnome-vfs-2.0/modules/libhttp.so
 lib/gnome-vfs-2.0/modules/libnetwork.a
 lib/gnome-vfs-2.0/modules/libnetwork.la
+lib/gnome-vfs-2.0/modules/libnetwork.so
 lib/gnome-vfs-2.0/modules/libnntp.a
 lib/gnome-vfs-2.0/modules/libnntp.la
+lib/gnome-vfs-2.0/modules/libnntp.so
 lib/gnome-vfs-2.0/modules/libsftp.a
 lib/gnome-vfs-2.0/modules/libsftp.la
+lib/gnome-vfs-2.0/modules/libsftp.so
 lib/gnome-vfs-2.0/modules/libtar.a
 lib/gnome-vfs-2.0/modules/libtar.la
-lib/gnome-vfs-2.0/modules/libvfs-pipe.a
-lib/gnome-vfs-2.0/modules/libvfs-pipe.la
+lib/gnome-vfs-2.0/modules/libtar.so
 lib/gnome-vfs-2.0/modules/libvfs-test.a
 lib/gnome-vfs-2.0/modules/libvfs-test.la
-lib/gnome-vfs-2.0/modules/libvfs-translate.a
-lib/gnome-vfs-2.0/modules/libvfs-translate.la
+lib/gnome-vfs-2.0/modules/libvfs-test.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.la
+@lib lib/libgnomevfs-2.so.${LIBgnomevfs-2_VERSION}
 lib/pkgconfig/gnome-vfs-2.0.pc
 lib/pkgconfig/gnome-vfs-module-2.0.pc
 libexec/gnome-vfs-daemon
+share/dbus-1/services/gnome-vfs-daemon.service
 share/examples/gnome-vfs2/
 @sample ${SYSCONFDIR}/gnome/
 share/examples/gnome-vfs2/gnome-vfs-2.0/
@@ -115,13 +124,11 @@ share/examples/gnome-vfs2/gnome-vfs-2.0/modules/default-modules.conf
 @sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/default-modules.conf
 share/examples/gnome-vfs2/gnome-vfs-2.0/modules/ssl-modules.conf
 @sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/ssl-modules.conf
-share/gtk-doc/
-share/gtk-doc/html/
 share/gtk-doc/html/gnome-vfs-2.0/
 share/gtk-doc/html/gnome-vfs-2.0/about.html
-share/gtk-doc/html/gnome-vfs-2.0/advanced-operations.html
 share/gtk-doc/html/gnome-vfs-2.0/data-types.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
+share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-2.0.devhelp2
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
@@ -144,6 +151,7 @@ share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
+share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-utils.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
@@ -163,8 +171,10 @@ share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
-share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-directory-operations.html
+share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-basic-file-ops.html
+share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-directory-ops.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html
+share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-file-async-ops.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-first-steps.html
 share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-writing-modules.html
 share/gtk-doc/html/gnome-vfs-2.0/home.png
@@ -178,148 +188,90 @@ share/gtk-doc/html/gnome-vfs-2.0/right.png
 share/gtk-doc/html/gnome-vfs-2.0/style.css
 share/gtk-doc/html/gnome-vfs-2.0/up.png
 share/gtk-doc/html/gnome-vfs-2.0/volumes.html
-share/locale/af/
-share/locale/af/LC_MESSAGES/
 share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/am/
-share/locale/am/LC_MESSAGES/
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ar/
-share/locale/ar/LC_MESSAGES/
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/az/
-share/locale/az/LC_MESSAGES/
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/bn/
-share/locale/bn/LC_MESSAGES/
 share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/bs/
-share/locale/bs/LC_MESSAGES/
+share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/cy/
-share/locale/cy/LC_MESSAGES/
 share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/en_CA/
-share/locale/en_CA/LC_MESSAGES/
 share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/en_GB/
-share/locale/en_GB/LC_MESSAGES/
 share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/fa/
-share/locale/fa/LC_MESSAGES/
 share/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/gu/
-share/locale/gu/LC_MESSAGES/
 share/locale/gu/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/hi/
-share/locale/hi/LC_MESSAGES/
 share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/is/
-share/locale/is/LC_MESSAGES/
 share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/li/
-share/locale/li/LC_MESSAGES/
+share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/lt/
-share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mk/
-share/locale/mk/LC_MESSAGES/
+share/locale/mg/
+share/locale/mg/LC_MESSAGES/
+share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ml/
-share/locale/ml/LC_MESSAGES/
 share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mn/
-share/locale/mn/LC_MESSAGES/
 share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mr/
 share/locale/mr/LC_MESSAGES/
 share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ms/
-share/locale/ms/LC_MESSAGES/
 share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ne/
-share/locale/ne/LC_MESSAGES/
 share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/nso/
-share/locale/nso/LC_MESSAGES/
 share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/pa/
-share/locale/pa/LC_MESSAGES/
+share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/rw/
-share/locale/rw/LC_MESSAGES/
 share/locale/rw/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/sq/
-share/locale/sq/LC_MESSAGES/
 share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/sr@Latn/
-share/locale/sr@Latn/LC_MESSAGES/
 share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/sr@ije/
-share/locale/sr@ije/LC_MESSAGES/
 share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ta/
-share/locale/ta/LC_MESSAGES/
 share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/th/
-share/locale/th/LC_MESSAGES/
 share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/wa/
-share/locale/wa/LC_MESSAGES/
 share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/xh/
-share/locale/xh/LC_MESSAGES/
 share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/yi/
-share/locale/yi/LC_MESSAGES/
 share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/zu/
-share/locale/zu/LC_MESSAGES/
 share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gnome-vfs2/*.schemas > /dev/null
 share/schemas/
 share/schemas/gnome-vfs2/
 share/schemas/gnome-vfs2/desktop_default_applications.schemas
@@ -328,4 +280,3 @@ share/schemas/gnome-vfs2/system_dns_sd.schemas
 share/schemas/gnome-vfs2/system_http_proxy.schemas
 share/schemas/gnome-vfs2/system_smb.schemas
 @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-vfs2/*.schemas > /dev/null
-%%SHARED%%