Update gnome-vfs to 1.0.2 and while at it, buildlinkify. Changes include:

New APIs:

* New gnome_vfs_uri_resolve_relative call (Ian)
* New module callback API (Mike, Maciej)
* Authentication and proxy authentication callbacks (Mike)

New features:

* Start on an SSH module, disabled by default for now (Ian)
* Handle the IceCast/ShoutCast non-standard variant of the HTTP
  protocol (Maciej)
* SSL and https support (Ian, Seth, Maciej)
* Extensive API docs (Seth, Sri, Ian, Jonathan, Maciej, Glynn)
* New translation (Abel Cheung)

Bug fixes:

* Move headers for future parallel-install compatibility (Maciej)
* FTP directory loading fixes (Jacob)
* Fix detection of KOffice file mime types (Frederic)
* Ensure all headers are standalone-includable (Darin)
* Assorted code cleanup (Darin, Anders)
* Split type declarations in gnome-vfs-types.h into individual
  headers; gnome-vfs-types.h is stull around for compat (Seth, Darin)
* Header fixes (Darin)
* Random crash and leak fixes (Havoc, Anders, Maciej)
* Build fixes (Darin, Maciej, Ian, Robin, Carlos, Ramiro, Jonas)

Portability fixes:

* Fix module configuration files and parsing code to work on systems
  that don't use .so as the extension for shared libraries (Jacob)
* Add recorsive mutex wrappers for use on systems that don't provide
  recursive mutexes natively (Dan)
* Misc portability fixes (Laca, Frank Belew)

6 files changed, 177 insertions, 97 deletions

diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 51b89ddc1fb..a7ef40ba042 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/08/29 06:49:27 tron Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/05 06:56:45 rh Exp $
 
-DISTNAME=		gnome-vfs-1.0.1
+DISTNAME=		gnome-vfs-1.0.2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-vfs/}
-EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
@@ -11,12 +10,10 @@ COMMENT=		GNOME Virtual File System
 
 BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
-DEPENDS+=		GConf>=1.0.0:../../devel/GConf
 BUILD_USES_MSGFMT=	YES
 
 USE_X11BASE=		YES
 USE_GMAKE=		YES
-USE_LIBINTL=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
@@ -26,4 +23,6 @@ CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 pre-configure:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf && ${LOCALBASE}/bin/automake
 
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/GConf/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs/buildlink.mk b/sysutils/gnome-vfs/buildlink.mk
new file mode 100644
index 00000000000..0c8f5abbbbe
--- /dev/null
+++ b/sysutils/gnome-vfs/buildlink.mk
@@ -0,0 +1,53 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/10/05 06:56:45 rh Exp $
+#
+# This Makefile fragment is included by packages that use gnome-vfs.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.gnome-vfs to the dependency pattern
+#     for the version of gnome-vfs desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(GNOME_VFS_BUILDLINK_MK)
+GNOME_VFS_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.gnome-vfs?=	gnome-vfs>=1.0.2
+DEPENDS+=	${BUILDLINK_DEPENDS.gnome-vfs}:../../sysutils/gnome-vfs
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-vfs=gnome-vfs
+BUILDLINK_PREFIX.gnome-vfs_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gnome-vfs=	include/gnome-vfs-1.0/*
+BUILDLINK_FILES.gnome-vfs+=	lib/libgnomevfs*
+BUILDLINK_FILES.gnome-vfs+=	lib/vfsConf.sh
+
+BUILDLINK_CONFIG_WRAPPER_SED+=	-e "s|\(-I${BUILDLINK_PREFIX.gnome-vfs}/include/\)|\1 -I${BUILDLINK_DIR}/include/gnome-vfs-1.0/|g"
+
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/GConf/buildlink.mk"
+
+BUILDLINK_TARGETS.gnome-vfs=	gnome-vfs-buildlink
+BUILDLINK_TARGETS.gnome-vfs+=	gnome-vfs-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gnome-vfs}
+
+BUILDLINK_CONFIG.gnome-vfs=	\
+		${BUILDLINK_PREFIX.gnome-vfs}/bin/gnome-vfs-config
+BUILDLINK_CONFIG_WRAPPER.gnome-vfs=	\
+		${BUILDLINK_DIR}/bin/gnome-vfs-config
+
+.if defined(USE_CONFIG_WRAPPER)
+GNOME_VFS_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.gnome-vfs}
+CONFIGURE_ENV+=		GNOME_VFS_CONFIG="${GNOME_VFS_CONFIG}"
+MAKE_ENV+=		GNOME_VFS_CONFIG="${GNOME_VFS_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.gnome-vfs}
+gnome-vfs-buildlink: _BUILDLINK_USE
+gnome-vfs-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# GNOME_VFS_BUILDLINK_MK
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index c84f0fb2988..92f1e616be4 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2001/08/27 20:10:16 tron Exp $
+$NetBSD: distinfo,v 1.5 2001/10/05 06:56:45 rh Exp $
 
-SHA1 (gnome-vfs-1.0.1.tar.bz2) = 7d7cc6b7ee76792a5fa9818320fc54d39e00896e
-Size (gnome-vfs-1.0.1.tar.bz2) = 801601 bytes
-SHA1 (patch-aa) = 109e5a4284b246cfd0ae80441f6ef1dbd9fecf60
+SHA1 (gnome-vfs-1.0.2.tar.gz) = 047e9fa874ddaa6bf1b6dc750b92904db3f87530
+Size (gnome-vfs-1.0.2.tar.gz) = 1267925 bytes
+SHA1 (patch-aa) = f2a65e394aa18e0932139a2469b43bf1e5b9107e
 SHA1 (patch-ab) = 6d038601f881185f8a4c55a604f7baccb8693ffe
 SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
 SHA1 (patch-ad) = cf959c7d8eb70dba844ea01e887e7487111d9cbd
 SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
 SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
-SHA1 (patch-ag) = f37a54fdbe3a8141ed81ab8d03e055a3305afd44
+SHA1 (patch-ag) = f4d23a856cda63390f7fb9b1f5aae7d8f1f66bf0
diff --git a/sysutils/gnome-vfs/patches/patch-aa b/sysutils/gnome-vfs/patches/patch-aa
index 7649503b733..fca9db05daf 100644
--- a/sysutils/gnome-vfs/patches/patch-aa
+++ b/sysutils/gnome-vfs/patches/patch-aa
@@ -1,40 +1,64 @@
-$NetBSD: patch-aa,v 1.3 2001/08/27 20:10:16 tron Exp $
+$NetBSD: patch-aa,v 1.4 2001/10/05 06:56:46 rh Exp $
 
---- aclocal.m4.orig	Tue May  8 01:12:25 2001
-+++ aclocal.m4	Mon Aug 27 21:59:51 2001
-@@ -210,25 +210,16 @@
+--- aclocal.m4.orig	Tue Sep 11 09:27:38 2001
++++ aclocal.m4
+@@ -221,46 +221,37 @@
  dnl AC_SUBST itself to avoid automake putting 
  dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
- dnl in all the Makefile.in's
+ dnl in all the Makefile.in's, because that will blow up when substituted.
 -XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_OAF_RULE@%[$]XML_I18N_MERGE_OAF_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
-+AC_SUBST(XML_I18N_MERGE_OAF_RULE)
+-	$(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf'
++XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf'
+ HACK_SUBST(XML_I18N_MERGE_OAF_RULE)
+ 
+-XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server'
++XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server'
+ HACK_SUBST(XML_I18N_MERGE_SERVER_RULE)
  
  dnl same deal
 -XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_KEYS_RULE@%[$]XML_I18N_MERGE_KEYS_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
-+AC_SUBST(XML_I18N_MERGE_KEYS_RULE)@%[$]XML_I18N_MERGE_KEYS_RULE%g
- 
+-	$(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys'
++XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys'
+ HACK_SUBST(XML_I18N_MERGE_KEYS_RULE)
  dnl same deal
 -XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_DESKTOP_RULE@%[$]XML_I18N_MERGE_DESKTOP_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
-+AC_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
- 
- # Always use our own xml-i18n-tools.
- XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract'
-@@ -1460,17 +1451,6 @@
+-	$(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop'
++XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop'
+ HACK_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory'
++XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory'
+ HACK_SUBST(XML_I18N_MERGE_DIRECTORY_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist'
++XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist'
+ HACK_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong'
++XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong'
+ HACK_SUBST(XML_I18N_MERGE_PONG_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml'
++XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml'
+ HACK_SUBST(XML_I18N_MERGE_XML_RULE)
+ 
+ dnl same deal
+-XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+-	$(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet'
++XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet'
+ HACK_SUBST(XML_I18N_MERGE_SHEET_RULE)
+ 
+ 
+@@ -4556,17 +4547,6 @@
  dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
  dnl FIXME: Migrate into libit
  
@@ -52,7 +76,7 @@ $NetBSD: patch-aa,v 1.3 2001/08/27 20:10:16 tron Exp $
  dnl See whether we need a declaration for a function.
  dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
  AC_DEFUN([GCC_NEED_DECLARATION],
-@@ -1607,7 +1587,7 @@
+@@ -4706,7 +4686,7 @@
  		  [CATOBJEXT=.gmo
  		   DATADIRNAME=share],
  		  [CATOBJEXT=.mo
diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag
index ddb24613f03..27df2b06ebb 100644
--- a/sysutils/gnome-vfs/patches/patch-ag
+++ b/sysutils/gnome-vfs/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2001/08/27 20:10:17 tron Exp $
+$NetBSD: patch-ag,v 1.2 2001/10/05 06:56:46 rh Exp $
 
---- configure.in.orig	Fri May  4 03:35:41 2001
-+++ configure.in	Mon Aug 27 21:56:10 2001
-@@ -483,7 +483,6 @@
+--- configure.in.orig	Tue Sep 11 09:20:37 2001
++++ configure.in
+@@ -573,7 +573,6 @@
  data/Makefile
  data/mime/Makefile
  idl/Makefile
@@ -10,10 +10,10 @@ $NetBSD: patch-ag,v 1.1 2001/08/27 20:10:17 tron Exp $
  libgnomevfs-pthread/Makefile
  libgnomevfs/Makefile
  modules/Makefile
-@@ -503,7 +502,9 @@
- po/Makefile.in
+@@ -593,7 +592,9 @@
  test/Makefile
  test/vfs-run
+ doc/Makefile
 -macros/Makefile
 +xml-i18n-extract
 +xml-i18n-merge
diff --git a/sysutils/gnome-vfs/pkg/PLIST b/sysutils/gnome-vfs/pkg/PLIST
index 4dc8fd4e4d5..d44a4fad97f 100644
--- a/sysutils/gnome-vfs/pkg/PLIST
+++ b/sysutils/gnome-vfs/pkg/PLIST
@@ -1,49 +1,55 @@
-@comment $NetBSD: PLIST,v 1.5 2001/05/14 17:11:37 rh Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/10/05 06:56:46 rh Exp $
 bin/gnome-vfs-config
 etc/gnome-vfs-mime-magic
 etc/vfs/modules/default-modules.conf
-include/libgnomevfs/gnome-vfs-application-registry.h
-include/libgnomevfs/gnome-vfs-async-ops.h
-include/libgnomevfs/gnome-vfs-backend.h
-include/libgnomevfs/gnome-vfs-cancellable-ops.h
-include/libgnomevfs/gnome-vfs-cancellation.h
-include/libgnomevfs/gnome-vfs-configuration.h
-include/libgnomevfs/gnome-vfs-constants.h
-include/libgnomevfs/gnome-vfs-context.h
-include/libgnomevfs/gnome-vfs-directory-filter.h
-include/libgnomevfs/gnome-vfs-directory.h
-include/libgnomevfs/gnome-vfs-file-info.h
-include/libgnomevfs/gnome-vfs-file-size.h
-include/libgnomevfs/gnome-vfs-find-directory.h
-include/libgnomevfs/gnome-vfs-handle.h
-include/libgnomevfs/gnome-vfs-inet-connection.h
-include/libgnomevfs/gnome-vfs-init.h
-include/libgnomevfs/gnome-vfs-iobuf.h
-include/libgnomevfs/gnome-vfs-list-sort.h
-include/libgnomevfs/gnome-vfs-messages.h
-include/libgnomevfs/gnome-vfs-method.h
-include/libgnomevfs/gnome-vfs-mime-handlers.h
-include/libgnomevfs/gnome-vfs-mime-info.h
-include/libgnomevfs/gnome-vfs-mime-magic.h
-include/libgnomevfs/gnome-vfs-mime-monitor.h
-include/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
-include/libgnomevfs/gnome-vfs-mime.h
-include/libgnomevfs/gnome-vfs-module-shared.h
-include/libgnomevfs/gnome-vfs-module.h
-include/libgnomevfs/gnome-vfs-ops.h
-include/libgnomevfs/gnome-vfs-parse-ls.h
-include/libgnomevfs/gnome-vfs-private-types.h
-include/libgnomevfs/gnome-vfs-private-utils.h
-include/libgnomevfs/gnome-vfs-private.h
-include/libgnomevfs/gnome-vfs-regexp-filter.h
-include/libgnomevfs/gnome-vfs-result.h
-include/libgnomevfs/gnome-vfs-seekable.h
-include/libgnomevfs/gnome-vfs-shellpattern-filter.h
-include/libgnomevfs/gnome-vfs-types.h
-include/libgnomevfs/gnome-vfs-uri.h
-include/libgnomevfs/gnome-vfs-utils.h
-include/libgnomevfs/gnome-vfs-xfer.h
-include/libgnomevfs/gnome-vfs.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-application-registry.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-async-ops.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-backend.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellable-ops.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellation.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-configuration.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-context.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory-filter.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-info.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-size.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-find-directory.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-handle.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-inet-connection.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-init.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-iobuf.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-messages.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-method.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-handlers.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-info.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-magic.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-monitor.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-shared.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ops.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-parse-ls.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private-utils.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-regexp-filter.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-result.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-seekable.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-shellpattern-filter.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket-buffer.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl-private.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-standard-callbacks.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-transform.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-types.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-utils.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-xfer.h
+include/gnome-vfs-1.0/libgnomevfs/gnome-vfs.h
+lib/gnome-vfs-1.0/include/gnome-vfs-file-size.h
 lib/libgnomevfs-pthread.a
 lib/libgnomevfs-pthread.la
 lib/libgnomevfs-pthread.so
@@ -71,7 +77,6 @@ lib/vfs/extfs/tar
 lib/vfs/extfs/trpm
 lib/vfs/extfs/zip
 lib/vfs/extfs/zoo
-lib/vfs/include/gnome-vfs-file-size.h
 lib/vfs/modules/libbzip2.a
 lib/vfs/modules/libbzip2.la
 lib/vfs/modules/libbzip2.so
@@ -103,11 +108,8 @@ lib/vfs/modules/libvfs-translate.a
 lib/vfs/modules/libvfs-translate.la
 lib/vfs/modules/libvfs-translate.so
 lib/vfsConf.sh
-lib/vfspthreadConf.sh
 man/man5/gnome-vfs-mime.5
 share/application-registry/gnome-vfs.applications
-share/gnome/html/gnome-vfs-decl.txt
-share/gnome/html/gnome-vfs-sections.txt
 share/locale/az/LC_MESSAGES/gnome-vfs.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs.mo
 share/locale/da/LC_MESSAGES/gnome-vfs.mo
@@ -136,15 +138,17 @@ share/locale/sv/LC_MESSAGES/gnome-vfs.mo
 share/locale/tr/LC_MESSAGES/gnome-vfs.mo
 share/locale/uk/LC_MESSAGES/gnome-vfs.mo
 share/locale/wa/LC_MESSAGES/gnome-vfs.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-vfs.mo
 share/mime-info/gnome-vfs.keys
 share/mime-info/gnome-vfs.mime
-@exec mkdir -p %D/share/gnome/html/gnome-vfs
-@dirrm share/gnome/html/gnome-vfs
-@dirrm share/application-registry
+@exec /bin/mkdir -p /usr/X11R6/share/gtk-doc/html/gnome-vfs
+@dirrm share/gtk-doc/html/gnome-vfs
 @dirrm lib/vfs/modules
-@dirrm lib/vfs/include
 @dirrm lib/vfs/extfs
 @dirrm lib/vfs
-@dirrm include/libgnomevfs
+@dirrm lib/gnome-vfs-1.0/include
+@dirrm lib/gnome-vfs-1.0
+@dirrm include/gnome-vfs-1.0/libgnomevfs
+@dirrm include/gnome-vfs-1.0
 @dirrm etc/vfs/modules
 @dirrm etc/vfs