From f1e1e9995fe10bd9e7419c0d179523d37ce9517e Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 15 Sep 2006 15:07:40 +0000 Subject: Update gnome-vfs2* to 2.16.0: gnome-vfs 2.16.0 * http: Fix crash on some redirects * http: Ignore fragment identifiers in URIs * support --disable-selinux * Fix gnome_vfs_mime_type_is_equal * inotify monitoring fixes gnome-vfs 2.15.92 * Remove old unused code * Better sniffing of text files * Tweak xfer callbacks for better performance gnome-vfs 2.15.91 * Avoid slow I/O looking for trash on remote shares * Inotify updates to avoid polling as much. * Build fix gnome-vfs 2.15.90 * Don't use deprectated dbus calls * Always dispatch monitor events * Add gnome_vfs_drive_needs_eject function. * Add support for compile time version checking. * Add GNOME_VFS_ERROR_INVALID_FILENAME error * Handle ENAMETOOLONG when converting from errno * Initialize SSL lazily * Fix error reporting in dns resolver code * Robustness fixes * Clean up code and fix warnings * dav fixes * ftp: fixes for IIS virtual directories * sftp: Support setting symlinks gnome-vfs 2.15.3 'Kill the monkeys' Note: The moniker code was moved to a seperate module called gnome-vfs-monikers. We need to keep that in the platform to be API/ABI compatible. Also note that bonobo mime related functions have been moved to libbonobo. This relase is free of Bonobos :) * Replace bonobo by DBus as IPC mechanism between clients and the daemon: Remove all references and dependencies on bonobo. (Initial work done by Richard Hult and Mikael Hallendal from Imendio) * Massive API documentation update. * INotify: fixes for remote (i.e. NFS) filesystems * INotify: Updates to the timers used (see ChangeLog) * Convert all use of pop to GOption * Fix non ACL file method build * OSX fix for GnomeVFSAddress * Handle %% escaping % in desktop files. (#343632) * Check for later version of libselinux. (#344349) gnome-vfs 2.15.2 * win32 fixes * Don't hide smb shares that end with $ * ACL support * Support for reading selinux context * Fix bug in gnome_vfs_uri_hash gnome-vfs 2.15.1 * Fix sftp symlink support * Fix smb connecting many times to the server * Add authentication to command line utils * Escape "?" in paths, as this is a special char in uris * Fix up symlink resolving in some cases * Portability fixes for the cdda method * Fix up locking around the xdg mime code where missing * Better handling of existing files in create/makedir for ftp * Shut down vfs backends on shutdown * Handle ftp anon login failure better * Handle more % expansions in Exec lines in desktop files * Make GnomeVFSDrive user_visible only if it supports media check * Fix ftp handling of large files --- sysutils/gnome-vfs2/Makefile | 10 +-- sysutils/gnome-vfs2/Makefile.common | 13 +++- sysutils/gnome-vfs2/PLIST | 141 ++++++++++++++++++----------------- sysutils/gnome-vfs2/buildlink3.mk | 13 +--- sysutils/gnome-vfs2/distinfo | 24 ++---- sysutils/gnome-vfs2/patches/patch-ac | 65 ---------------- sysutils/gnome-vfs2/patches/patch-ad | 34 --------- sysutils/gnome-vfs2/patches/patch-ae | 58 +++++++------- sysutils/gnome-vfs2/patches/patch-ag | 84 --------------------- sysutils/gnome-vfs2/patches/patch-ah | 15 ---- sysutils/gnome-vfs2/patches/patch-aj | 12 --- sysutils/gnome-vfs2/patches/patch-ak | 33 -------- sysutils/gnome-vfs2/patches/patch-al | 70 ----------------- sysutils/gnome-vfs2/patches/patch-as | 33 -------- sysutils/gnome-vfs2/patches/patch-at | 25 ------- sysutils/gnome-vfs2/patches/patch-av | 114 ---------------------------- sysutils/gnome-vfs2/patches/patch-aw | 14 ---- sysutils/gnome-vfs2/patches/patch-ax | 26 +++---- sysutils/gnome-vfs2/patches/patch-az | 38 ---------- 19 files changed, 133 insertions(+), 689 deletions(-) delete mode 100644 sysutils/gnome-vfs2/patches/patch-ac delete mode 100644 sysutils/gnome-vfs2/patches/patch-ad delete mode 100644 sysutils/gnome-vfs2/patches/patch-ag delete mode 100644 sysutils/gnome-vfs2/patches/patch-ah delete mode 100644 sysutils/gnome-vfs2/patches/patch-aj delete mode 100644 sysutils/gnome-vfs2/patches/patch-ak delete mode 100644 sysutils/gnome-vfs2/patches/patch-al delete mode 100644 sysutils/gnome-vfs2/patches/patch-as delete mode 100644 sysutils/gnome-vfs2/patches/patch-at delete mode 100644 sysutils/gnome-vfs2/patches/patch-av delete mode 100644 sysutils/gnome-vfs2/patches/patch-aw delete mode 100644 sysutils/gnome-vfs2/patches/patch-az (limited to 'sysutils') diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index 8ba076eb003..f3769847827 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2006/04/27 21:14:34 drochner Exp $ +# $NetBSD: Makefile,v 1.65 2006/09/15 15:07:40 jmmv Exp $ PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in @@ -25,15 +25,7 @@ CONFIGURE_ARGS+= --enable-fam .include "../../devel/GConf2/schemas.mk" .include "../../archivers/bzip2/buildlink3.mk" -.include "../../databases/shared-mime-info/buildlink3.mk" -.include "../../devel/GConf2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/popt/buildlink3.mk" -.include "../../net/ORBit2/buildlink3.mk" -.include "../../security/gnutls/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/fam.buildlink3.mk" .include "../../mk/krb5.buildlink3.mk" diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index f3a8e28d99d..97407ae18b2 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,13 +1,13 @@ -# $NetBSD: Makefile.common,v 1.37 2006/07/05 05:37:44 jlam Exp $ +# $NetBSD: Makefile.common,v 1.38 2006/09/15 15:07:40 jmmv Exp $ # -GNOME_VFS2_VERSION= 2.14.2 +GNOME_VFS2_VERSION= 2.16.0 DISTNAME= gnome-vfs-${GNOME_VFS2_VERSION} PKGNAME= ${DISTNAME:S/vfs/vfs2/} CATEGORIES?= sysutils CATEGORIES+= gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.14/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.16/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -31,7 +31,6 @@ CONFIGURE_ARGS+= --disable-samba CONFIGURE_ARGS+= --enable-gnutls CONFIGURE_ARGS+= --enable-platform-gnome-2 CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" @@ -101,3 +100,9 @@ do-install: cd ${WRKSRC}/modules && ${LIBTOOL} --mode=finish \ ${PREFIX}/lib/gnome-vfs-2.0/modules .endif + +.include "../../devel/GConf2/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../security/gnutls/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST index ee2919039ac..9d92d3f28f6 100644 --- a/sysutils/gnome-vfs2/PLIST +++ b/sysutils/gnome-vfs2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2006/04/27 21:14:34 drochner Exp $ +@comment $NetBSD: PLIST,v 1.23 2006/09/15 15:07:40 jmmv Exp $ bin/gnomevfs-cat bin/gnomevfs-copy bin/gnomevfs-df @@ -8,6 +8,8 @@ bin/gnomevfs-mkdir bin/gnomevfs-monitor bin/gnomevfs-mv bin/gnomevfs-rm +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 @@ -28,6 +30,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 @@ -37,6 +40,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 @@ -45,7 +49,6 @@ 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 @@ -55,9 +58,6 @@ 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/monikers/libmoniker_gnome_vfs_std.la -lib/bonobo/servers/GNOME_VFS_Daemon.server -lib/bonobo/servers/GNOME_VFS_Moniker_std.server lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h lib/gnome-vfs-2.0/modules/libbzip2.la lib/gnome-vfs-2.0/modules/libcomputer.la @@ -75,67 +75,7 @@ lib/libgnomevfs-2.la lib/pkgconfig/gnome-vfs-2.0.pc lib/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon -share/doc/gnome-vfs-2.0/about.html -share/doc/gnome-vfs-2.0/advanced-operations.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-2.0.devhelp2 -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-dns-sd.html -share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.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-deprecated.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-resolve.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-volume-monitor.html -share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.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-and-dirs-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html -share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html -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/networking.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 -share/doc/gnome-vfs-2.0/volumes.html +share/dbus-1/services/gnome-vfs-daemon.service share/examples/gnome-vfs-2.0/modules/default-modules.conf share/examples/gnome-vfs-2.0/modules/ssl-modules.conf share/gconf/schemas/desktop_default_applications.schemas @@ -143,6 +83,69 @@ share/gconf/schemas/desktop_gnome_url_handlers.schemas share/gconf/schemas/system_dns_sd.schemas share/gconf/schemas/system_http_proxy.schemas share/gconf/schemas/system_smb.schemas +share/gtk-doc/html/gnome-vfs-2.0/about.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 +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +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 +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +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-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 +share/gtk-doc/html/gnome-vfs-2.0/index.html +share/gtk-doc/html/gnome-vfs-2.0/index.sgml +share/gtk-doc/html/gnome-vfs-2.0/left.png +share/gtk-doc/html/gnome-vfs-2.0/mime-registry.html +share/gtk-doc/html/gnome-vfs-2.0/modules.html +share/gtk-doc/html/gnome-vfs-2.0/networking.html +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/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo @@ -150,6 +153,7 @@ 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/LC_MESSAGES/gnome-vfs-2.0.mo +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 @@ -219,15 +223,14 @@ 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/LC_MESSAGES/gnome-vfs-2.0.mo +@dirrm share/gtk-doc/html/gnome-vfs-2.0 @comment in GConf2: @dirrm share/gconf/schemas @dirrm share/examples/gnome-vfs-2.0/modules @dirrm share/examples/gnome-vfs-2.0 -@dirrm share/doc/gnome-vfs-2.0 +@comment in dbus: @dirrm share/dbus-1/services @dirrm lib/gnome-vfs-2.0/modules @dirrm lib/gnome-vfs-2.0/include @dirrm lib/gnome-vfs-2.0 -@comment in libbonobo: @dirrm lib/bonobo/servers -@comment in libbonobo: @dirrm lib/bonobo/monikers @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk index fed5191314a..74bb98f5aac 100644 --- a/sysutils/gnome-vfs2/buildlink3.mk +++ b/sysutils/gnome-vfs2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2006/07/08 23:11:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2006/09/15 15:07:40 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_VFS2_BUILDLINK3_MK:= ${GNOME_VFS2_BUILDLINK3_MK}+ @@ -20,16 +20,11 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules/ \ { print "@comment in gnome-vfs2: " $$0; next; } .endif # GNOME_VFS2_BUILDLINK3_MK -.include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/GConf2/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/popt/buildlink3.mk" -.include "../../mk/fam.buildlink3.mk" -.include "../../mk/krb5.buildlink3.mk" -.include "../../net/ORBit2/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/fam/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index 947793db43a..92e361d5dfd 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,30 +1,18 @@ -$NetBSD: distinfo,v 1.57 2006/07/07 00:47:39 minskim Exp $ +$NetBSD: distinfo,v 1.58 2006/09/15 15:07:40 jmmv Exp $ -SHA1 (gnome-vfs-2.14.2.tar.bz2) = ffd2e5f229495f55587d8499e5f2b8b8a76e5448 -RMD160 (gnome-vfs-2.14.2.tar.bz2) = e0a67e3576d72a86c898208a93ad8ee52f72f870 -Size (gnome-vfs-2.14.2.tar.bz2) = 1816194 bytes +SHA1 (gnome-vfs-2.16.0.tar.bz2) = 4f0f6e7288c5cd2bc667f11729596e8be92376a0 +RMD160 (gnome-vfs-2.16.0.tar.bz2) = 9f4008c0e8cae26513006e4c1f1c1c126116d8ef +Size (gnome-vfs-2.16.0.tar.bz2) = 1890562 bytes SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 -SHA1 (patch-ac) = 515faadbf5ad3eb65fb7fbaf6eb35ae8db3d133e -SHA1 (patch-ad) = 5df81a0bf979f710912b42883658c10d198cca87 -SHA1 (patch-ae) = b84609561dfedd1f1b55f93298f02ea841eec407 +SHA1 (patch-ae) = 87fc8b003122d386f4adbeba436fc6ffc47cd0b0 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56 -SHA1 (patch-ag) = 62c6b37f79abe8bb6b1e2e29e4071e32e4684900 -SHA1 (patch-ah) = 0927ade189c14472e5768b7e4775854de519f19c SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2 -SHA1 (patch-aj) = 0159ed71a69f4f15a4353d0bb9400e9341b59b9d -SHA1 (patch-ak) = 48574a70c117cd7327eb2dab9d7b8fa924f589b8 -SHA1 (patch-al) = 4eae29462d28f0de365266e4b5f78a0fda6ca8d2 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9 SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390 SHA1 (patch-ap) = 98ad7700d01007510467e2ae4ee8554f54f15320 SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4 -SHA1 (patch-as) = 473d0980fe9b515d59deda2e43f1ce8731c4dcc7 -SHA1 (patch-at) = d4db07273901d9b45cac8ce0796aaab08e25e297 SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c -SHA1 (patch-av) = fd25b531deea0d53f4ddb2e62d5cdb476e599fb4 -SHA1 (patch-aw) = 22801eb932f8f7e7256be3863fcd5273a7a5213e -SHA1 (patch-ax) = 06a104c8ae3caf01a2bf6899cd2b85980c0bb26d -SHA1 (patch-az) = 50d74fbf4973a5f6366a20b89e17bab450e73784 +SHA1 (patch-ax) = 6b9b11df5d530b7b3aa6a3997feb7c1c93e7b2db SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51 diff --git a/sysutils/gnome-vfs2/patches/patch-ac b/sysutils/gnome-vfs2/patches/patch-ac deleted file mode 100644 index 1391b7362fa..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ac +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-ac,v 1.12 2006/07/07 00:24:43 minskim Exp $ - ---- imported/neon/Makefile.in.orig 2006-05-30 03:21:19.000000000 -0700 -+++ imported/neon/Makefile.in -@@ -56,10 +56,13 @@ am__objects_2 = $(am__objects_1) - am__objects_3 = ne_request.lo ne_session.lo ne_basic.lo ne_string.lo \ - ne_uri.lo ne_dates.lo ne_alloc.lo ne_md5.lo ne_utils.lo \ - ne_auth.lo ne_redirect.lo ne_compress.lo --am__objects_4 = ne_207.lo ne_xml.lo ne_props.lo ne_locks.lo --am__objects_5 = ne_acl.lo ne_gnomevfs.lo -+am__objects_4 = ne_gnutls.lo -+am__objects_5 = ne_207.lo ne_xml.lo ne_props.lo ne_locks.lo \ -+ ne_xmlreq.lo -+am__objects_6 = ne_acl.lo ne_gnomevfs.lo - am_libneon_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ -- $(am__objects_4) $(am__objects_5) $(am__objects_1) -+ $(am__objects_4) $(am__objects_5) $(am__objects_6) \ -+ $(am__objects_1) - libneon_la_OBJECTS = $(am_libneon_la_OBJECTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -372,6 +375,7 @@ NEON_INCLUDES = \ - ne_locks.h \ - ne_md5.h \ - ne_private.h \ -+ ne_privssl.h \ - ne_props.h \ - ne_redirect.h \ - ne_request.h \ -@@ -394,9 +398,10 @@ NEON_BASE_SOURCES = ne_request.c ne_sess - ne_redirect.c \ - ne_compress.c - -+NEON_SSL_SOURCES = ne_gnutls.c - NEON_DAV_SOURCES = \ - ne_207.c ne_xml.c \ -- ne_props.c ne_locks.c -+ ne_props.c ne_locks.c ne_xmlreq.c - - NEON_EXTRA_SOURCES = ne_acl.c ne_gnomevfs.c - libneon_la_LIBADD = \ -@@ -410,6 +415,7 @@ libneon_la_LDFLAGS = \ - libneon_la_SOURCES = \ - $(NEON_INCLUDES) \ - $(NEON_BASE_SOURCES) \ -+ $(NEON_SSL_SOURCES) \ - $(NEON_DAV_SOURCES) \ - $(NEON_EXTRA_SOURCES) \ - $(NULL) -@@ -473,6 +479,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_compress.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_dates.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_gnomevfs.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_gnutls.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_locks.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_md5.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_props.Plo@am__quote@ -@@ -483,6 +490,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_uri.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_utils.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_xml.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_xmlreq.Plo@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ diff --git a/sysutils/gnome-vfs2/patches/patch-ad b/sysutils/gnome-vfs2/patches/patch-ad deleted file mode 100644 index d7db8b5684b..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ad +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2006/03/31 10:02:24 jmmv Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=134276 - ---- modules/cdda-method.c.orig 2005-05-08 15:40:13.000000000 +0200 -+++ modules/cdda-method.c -@@ -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__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - 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__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - 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); diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae index 13f100e6c88..daebeb76379 100644 --- a/sysutils/gnome-vfs2/patches/patch-ae +++ b/sysutils/gnome-vfs2/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.12 2006/06/23 17:27:50 drochner Exp $ +$NetBSD: patch-ae,v 1.13 2006/09/15 15:07:40 jmmv Exp $ ---- configure.orig 2006-05-30 12:06:32.000000000 +0200 +--- configure.orig 2006-09-04 10:40:11.000000000 +0200 +++ configure -@@ -24466,7 +24466,7 @@ fi +@@ -24331,7 +24331,7 @@ fi @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.12 2006/06/23 17:27:50 drochner Exp $ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -25746,9 +25746,11 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -25611,9 +25611,11 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { @@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.12 2006/06/23 17:27:50 drochner Exp $ return 0; } _ACEOF -@@ -33041,7 +33043,7 @@ _ACEOF +@@ -32942,7 +32944,7 @@ _ACEOF msg_samba="yes" if test x$with_samba_libs != x/usr/lib; then @@ -32,62 +32,62 @@ $NetBSD: patch-ae,v 1.12 2006/06/23 17:27:50 drochner Exp $ else SAMBA_LIBS="-lsmbclient" fi -@@ -36078,12 +36080,12 @@ if test -n "$PKG_CONFIG"; then +@@ -35979,12 +35981,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS" else if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED bonobo-activation-2.0 >= \$BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= \$BONOBO_REQUIRED ORBit-2.0 >= \$ORBIT_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED bonobo-activation-2.0 >= \$BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= \$BONOBO_REQUIRED ORBit-2.0 >= \$ORBIT_REQUIRED libxml-2.0 >= \$XML_REQUIRED\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED") 2>&5 +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED dbus-glib-1 >= 0.60\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then -- pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0" 2>/dev/null` -+ pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED" 2>/dev/null` +- pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60" 2>/dev/null` ++ pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60" 2>/dev/null` else pkg_failed=yes fi -@@ -36096,12 +36098,12 @@ if test -n "$PKG_CONFIG"; then +@@ -35997,12 +35999,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS" else if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED bonobo-activation-2.0 >= \$BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= \$BONOBO_REQUIRED ORBit-2.0 >= \$ORBIT_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED bonobo-activation-2.0 >= \$BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= \$BONOBO_REQUIRED ORBit-2.0 >= \$ORBIT_REQUIRED libxml-2.0 >= \$XML_REQUIRED\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED") 2>&5 +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED dbus-glib-1 >= 0.60\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then -- pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0" 2>/dev/null` -+ pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED" 2>/dev/null` +- pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60" 2>/dev/null` ++ pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60" 2>/dev/null` else pkg_failed=yes fi -@@ -36120,14 +36122,14 @@ else +@@ -36021,14 +36023,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then -- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0"` -+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED"` +- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60"` ++ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60"` else -- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0"` -+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED"` +- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60"` ++ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60"` fi # Put the nasty error message in config.log where it belongs echo "$LIBGNOMEVFS_PKG_ERRORS" >&5 -- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0) were not met: -+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED) were not met: +- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60) were not met: $LIBGNOMEVFS_PKG_ERRORS -@@ -36138,7 +36140,7 @@ Alternatively, you may set the environme +@@ -36039,7 +36041,7 @@ Alternatively, you may set the environme and LIBGNOMEVFS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 --echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0) were not met: -+echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED) were not met: +-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 dbus-glib-1 >= 0.60) were not met: ++echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED dbus-glib-1 >= 0.60) were not met: $LIBGNOMEVFS_PKG_ERRORS diff --git a/sysutils/gnome-vfs2/patches/patch-ag b/sysutils/gnome-vfs2/patches/patch-ag deleted file mode 100644 index 4787217f075..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ag +++ /dev/null @@ -1,84 +0,0 @@ -$NetBSD: patch-ag,v 1.10 2006/07/06 23:35:15 minskim Exp $ - ---- imported/neon/ne_xmlreq.c.orig 2006-05-01 15:28:52.000000000 -0700 -+++ imported/neon/ne_xmlreq.c -@@ -0,0 +1,79 @@ -+/* -+ XML/HTTP response handling -+ Copyright (C) 2004-2005, Joe Orton -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+ MA 02111-1307, USA -+ -+*/ -+ -+#include "config.h" -+ -+#include "ne_xmlreq.h" -+#include "ne_i18n.h" -+ -+/* Handle an XML response parse error, setting session error string -+ * and closing the connection. */ -+static int parse_error(ne_session *sess, ne_xml_parser *parser) -+{ -+ ne_set_error(sess, _("Could not parse response: %s"), -+ ne_xml_get_error(parser)); -+ ne_close_connection(sess); -+ return NE_ERROR; -+} -+ -+int ne_xml_parse_response(ne_request *req, ne_xml_parser *parser) -+{ -+ char buf[8000]; -+ ssize_t bytes; -+ int ret = 0; -+ -+ while ((bytes = ne_read_response_block(req, buf, sizeof buf)) > 0) { -+ ret = ne_xml_parse(parser, buf, bytes); -+ if (ret) -+ return parse_error(ne_get_session(req), parser); -+ } -+ -+ if (bytes == 0) { -+ /* Tell the parser that end of document was reached: */ -+ if (ne_xml_parse(parser, NULL, 0) == 0) -+ return NE_OK; -+ else -+ return parse_error(ne_get_session(req), parser); -+ } else { -+ return NE_ERROR; -+ } -+} -+ -+int ne_xml_dispatch_request(ne_request *req, ne_xml_parser *parser) -+{ -+ int ret; -+ -+ do { -+ ret = ne_begin_request(req); -+ if (ret) break; -+ -+ if (ne_get_status(req)->klass == 2) -+ ret = ne_xml_parse_response(req, parser); -+ else -+ ret = ne_discard_response(req); -+ -+ if (ret == NE_OK) -+ ret = ne_end_request(req); -+ } while (ret == NE_RETRY); -+ -+ return ret; -+} -+ diff --git a/sysutils/gnome-vfs2/patches/patch-ah b/sysutils/gnome-vfs2/patches/patch-ah deleted file mode 100644 index 11d99bb004c..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.7 2006/03/30 21:07:48 jmmv Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=336391 - ---- libgnomevfs/gnome-vfs-resolve.c.orig 2005-12-02 19:00:26.000000000 +0100 -+++ libgnomevfs/gnome-vfs-resolve.c -@@ -172,7 +172,7 @@ _gnome_vfs_result_from_gai_error (int er - - case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; - #ifdef EAI_ADDRFAMILY -- case EAI_ADDRFAMILY: -+ case EAI_ADDRFAMILY: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; - #endif - #ifdef EAI_NODATA - case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; diff --git a/sysutils/gnome-vfs2/patches/patch-aj b/sysutils/gnome-vfs2/patches/patch-aj deleted file mode 100644 index 004f0c97fd6..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.6 2006/03/30 21:07:48 jmmv Exp $ - ---- libgnomevfs/gnome-vfs-volume-ops.c.orig 2006-03-06 10:09:51.000000000 +0100 -+++ libgnomevfs/gnome-vfs-volume-ops.c -@@ -25,6 +25,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/sysutils/gnome-vfs2/patches/patch-ak b/sysutils/gnome-vfs2/patches/patch-ak deleted file mode 100644 index 75c0c9499ec..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ak +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ak,v 1.8 2006/07/07 00:24:43 minskim Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=337993 - ---- imported/neon/ne_gnutls.c.orig 2006-06-26 16:17:37.000000000 -0700 -+++ imported/neon/ne_gnutls.c -@@ -0,0 +1,26 @@ -+#include "config.h" -+ -+#include -+ -+#include "ne_ssl.h" -+ -+#include "ne_private.h" -+#include "ne_privssl.h" -+ -+struct ne_ssl_dname_s { -+ int subject; /* non-zero if this is the subject DN object */ -+ gnutls_x509_crt cert; -+}; -+ -+struct ne_ssl_certificate_s { -+ ne_ssl_dname subj_dn, issuer_dn; -+ gnutls_x509_crt subject; -+ ne_ssl_certificate *issuer; -+ char *identity; -+}; -+ -+void ne_ssl_context_trustcert(ne_ssl_context *ctx, const ne_ssl_certificate *cert) -+{ -+ gnutls_x509_crt certs = cert->subject; -+ gnutls_certificate_set_x509_trust(ctx->cred, &certs, 1); -+} diff --git a/sysutils/gnome-vfs2/patches/patch-al b/sysutils/gnome-vfs2/patches/patch-al deleted file mode 100644 index da4a663ca97..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-al +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-al,v 1.8 2006/07/07 00:24:43 minskim Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=337993 - ---- imported/neon/ne_privssl.h.orig 2006-06-26 16:32:19.000000000 -0700 -+++ imported/neon/ne_privssl.h -@@ -0,0 +1,63 @@ -+/* -+ SSL interface definitions internal to neon. -+ Copyright (C) 2003, 2004, Joe Orton -+ Copyright (C) 2004, Aleix Conchillo Flaque -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with this library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -+ MA 02111-1307, USA -+ -+*/ -+ -+/* THIS IS NOT A PUBLIC INTERFACE. You CANNOT include this header file -+ * from an application. */ -+ -+#ifndef NE_PRIVSSL_H -+#define NE_PRIVSSL_H -+ -+/* This is the private interface between ne_socket, ne_gnutls and -+ * ne_openssl. */ -+ -+#include "ne_ssl.h" -+#include "ne_socket.h" -+ -+#ifdef HAVE_OPENSSL -+ -+#include -+ -+struct ne_ssl_context_s { -+ SSL_CTX *ctx; -+ SSL_SESSION *sess; -+}; -+ -+typedef SSL *ne_ssl_socket; -+ -+#endif /* HAVE_OPENSSL */ -+ -+#ifdef HAVE_GNUTLS -+ -+#include -+ -+struct ne_ssl_context_s { -+ gnutls_certificate_credentials cred; -+ /* TODO: store session here too */ -+}; -+ -+typedef gnutls_session ne_ssl_socket; -+ -+#endif /* HAVE_GNUTLS */ -+ -+ne_ssl_socket ne__sock_sslsock(ne_socket *sock); -+ -+#endif /* NE_PRIVSSL_H */ diff --git a/sysutils/gnome-vfs2/patches/patch-as b/sysutils/gnome-vfs2/patches/patch-as deleted file mode 100644 index 353aecec56a..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-as +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-as,v 1.4 2006/07/07 00:24:43 minskim Exp $ - ---- imported/neon/Makefile.am.orig 2006-01-08 08:53:09.000000000 -0800 -+++ imported/neon/Makefile.am -@@ -33,6 +33,7 @@ NEON_INCLUDES = \ - ne_locks.h \ - ne_md5.h \ - ne_private.h \ -+ ne_privssl.h \ - ne_props.h \ - ne_redirect.h \ - ne_request.h \ -@@ -56,9 +57,11 @@ NEON_BASE_SOURCES = ne_request.c ne_sess - ne_redirect.c \ - ne_compress.c - -+NEON_SSL_SOURCES = ne_gnutls.c -+ - NEON_DAV_SOURCES = \ - ne_207.c ne_xml.c \ -- ne_props.c ne_locks.c -+ ne_props.c ne_locks.c ne_xmlreq.c - - NEON_EXTRA_SOURCES = ne_acl.c ne_gnomevfs.c - -@@ -73,6 +76,7 @@ libneon_la_LDFLAGS = \ - libneon_la_SOURCES = \ - $(NEON_INCLUDES) \ - $(NEON_BASE_SOURCES) \ -+ $(NEON_SSL_SOURCES) \ - $(NEON_DAV_SOURCES) \ - $(NEON_EXTRA_SOURCES) \ - $(NULL) diff --git a/sysutils/gnome-vfs2/patches/patch-at b/sysutils/gnome-vfs2/patches/patch-at deleted file mode 100644 index cf3a8438156..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-at +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-at,v 1.3 2006/07/07 00:47:40 minskim Exp $ - ---- daemon/Makefile.am.orig 2005-09-06 08:06:06.000000000 -0700 -+++ daemon/Makefile.am -@@ -29,11 +29,7 @@ endif - gnome_vfs_daemon_LDADD=$(MONIKERS_LIBS) $(LIBGNOMEVFSDAEMON_LIBS) $(top_builddir)/libgnomevfs/libgnomevfs-2.la $(top_builddir)/libgnomevfs/libgnomevfsdaemon-2.la - - CORBA_SOURCE = \ -- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon.h \ -- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c \ -- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c \ -- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c -- -+ $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon.h - - gnome_vfs_daemon_SOURCES = \ - gnome-vfs-daemon.c \ -@@ -44,6 +40,7 @@ gnome_vfs_daemon_SOURCES = \ - gnome-vfs-daemon-dir-handle.c \ - gnome-vfs-daemon-handle.h \ - gnome-vfs-daemon-handle.c \ -+ $(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c \ - $(CORBA_SOURCE) - - BUILT_SOURCES = $(CORBA_SOURCE) diff --git a/sysutils/gnome-vfs2/patches/patch-av b/sysutils/gnome-vfs2/patches/patch-av deleted file mode 100644 index 02962deace7..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-av +++ /dev/null @@ -1,114 +0,0 @@ -$NetBSD: patch-av,v 1.5 2006/07/07 00:47:40 minskim Exp $ - ---- daemon/Makefile.in.orig 2006-06-26 18:45:33.000000000 -0700 -+++ daemon/Makefile.in -@@ -50,13 +50,12 @@ CONFIG_CLEAN_FILES = - am__installdirs = "$(DESTDIR)$(libexecdir)" - libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(libexec_PROGRAMS) --am__objects_1 = GNOME_VFS_Daemon-common.$(OBJEXT) \ -- GNOME_VFS_Daemon-stubs.$(OBJEXT) \ -- GNOME_VFS_Daemon-skels.$(OBJEXT) -+am__objects_1 = - am_gnome_vfs_daemon_OBJECTS = gnome-vfs-daemon.$(OBJEXT) \ - gnome-vfs-async-daemon.$(OBJEXT) \ - gnome-vfs-daemon-dir-handle.$(OBJEXT) \ -- gnome-vfs-daemon-handle.$(OBJEXT) $(am__objects_1) -+ gnome-vfs-daemon-handle.$(OBJEXT) \ -+ gnome-vfs-volume-monitor.$(OBJEXT) $(am__objects_1) - gnome_vfs_daemon_OBJECTS = $(am_gnome_vfs_daemon_OBJECTS) - am__DEPENDENCIES_1 = - gnome_vfs_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@@ -370,10 +369,7 @@ INCLUDES = \ - - gnome_vfs_daemon_LDADD = $(MONIKERS_LIBS) $(LIBGNOMEVFSDAEMON_LIBS) $(top_builddir)/libgnomevfs/libgnomevfs-2.la $(top_builddir)/libgnomevfs/libgnomevfsdaemon-2.la - CORBA_SOURCE = \ -- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon.h \ -- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c \ -- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c \ -- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c -+ $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon.h - - gnome_vfs_daemon_SOURCES = \ - gnome-vfs-daemon.c \ -@@ -384,6 +380,7 @@ gnome_vfs_daemon_SOURCES = \ - gnome-vfs-daemon-dir-handle.c \ - gnome-vfs-daemon-handle.h \ - gnome-vfs-daemon-handle.c \ -+ $(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c \ - $(CORBA_SOURCE) - - BUILT_SOURCES = $(CORBA_SOURCE) -@@ -462,13 +459,11 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GNOME_VFS_Daemon-common.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GNOME_VFS_Daemon-skels.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GNOME_VFS_Daemon-stubs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-vfs-async-daemon.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-vfs-daemon-dir-handle.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-vfs-daemon-handle.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-vfs-daemon.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-vfs-volume-monitor.Po@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@@ -491,47 +486,19 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - --GNOME_VFS_Daemon-common.o: $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT GNOME_VFS_Daemon-common.o -MD -MP -MF "$(DEPDIR)/GNOME_VFS_Daemon-common.Tpo" -c -o GNOME_VFS_Daemon-common.o `test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c' || echo '$(srcdir)/'`$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/GNOME_VFS_Daemon-common.Tpo" "$(DEPDIR)/GNOME_VFS_Daemon-common.Po"; else rm -f "$(DEPDIR)/GNOME_VFS_Daemon-common.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c' object='GNOME_VFS_Daemon-common.o' libtool=no @AMDEPBACKSLASH@ -+gnome-vfs-volume-monitor.o: $(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c -+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome-vfs-volume-monitor.o -MD -MP -MF "$(DEPDIR)/gnome-vfs-volume-monitor.Tpo" -c -o gnome-vfs-volume-monitor.o `test -f '$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c' || echo '$(srcdir)/'`$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome-vfs-volume-monitor.Tpo" "$(DEPDIR)/gnome-vfs-volume-monitor.Po"; else rm -f "$(DEPDIR)/gnome-vfs-volume-monitor.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c' object='gnome-vfs-volume-monitor.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o GNOME_VFS_Daemon-common.o `test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c' || echo '$(srcdir)/'`$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome-vfs-volume-monitor.o `test -f '$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c' || echo '$(srcdir)/'`$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c - --GNOME_VFS_Daemon-common.obj: $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT GNOME_VFS_Daemon-common.obj -MD -MP -MF "$(DEPDIR)/GNOME_VFS_Daemon-common.Tpo" -c -o GNOME_VFS_Daemon-common.obj `if test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c'; then $(CYGPATH_W) '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/GNOME_VFS_Daemon-common.Tpo" "$(DEPDIR)/GNOME_VFS_Daemon-common.Po"; else rm -f "$(DEPDIR)/GNOME_VFS_Daemon-common.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c' object='GNOME_VFS_Daemon-common.obj' libtool=no @AMDEPBACKSLASH@ -+gnome-vfs-volume-monitor.obj: $(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c -+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome-vfs-volume-monitor.obj -MD -MP -MF "$(DEPDIR)/gnome-vfs-volume-monitor.Tpo" -c -o gnome-vfs-volume-monitor.obj `if test -f '$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c'; then $(CYGPATH_W) '$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c'; fi`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome-vfs-volume-monitor.Tpo" "$(DEPDIR)/gnome-vfs-volume-monitor.Po"; else rm -f "$(DEPDIR)/gnome-vfs-volume-monitor.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c' object='gnome-vfs-volume-monitor.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o GNOME_VFS_Daemon-common.obj `if test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c'; then $(CYGPATH_W) '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c'; fi` -- --GNOME_VFS_Daemon-stubs.o: $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT GNOME_VFS_Daemon-stubs.o -MD -MP -MF "$(DEPDIR)/GNOME_VFS_Daemon-stubs.Tpo" -c -o GNOME_VFS_Daemon-stubs.o `test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c' || echo '$(srcdir)/'`$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/GNOME_VFS_Daemon-stubs.Tpo" "$(DEPDIR)/GNOME_VFS_Daemon-stubs.Po"; else rm -f "$(DEPDIR)/GNOME_VFS_Daemon-stubs.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c' object='GNOME_VFS_Daemon-stubs.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o GNOME_VFS_Daemon-stubs.o `test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c' || echo '$(srcdir)/'`$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c -- --GNOME_VFS_Daemon-stubs.obj: $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT GNOME_VFS_Daemon-stubs.obj -MD -MP -MF "$(DEPDIR)/GNOME_VFS_Daemon-stubs.Tpo" -c -o GNOME_VFS_Daemon-stubs.obj `if test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c'; then $(CYGPATH_W) '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/GNOME_VFS_Daemon-stubs.Tpo" "$(DEPDIR)/GNOME_VFS_Daemon-stubs.Po"; else rm -f "$(DEPDIR)/GNOME_VFS_Daemon-stubs.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c' object='GNOME_VFS_Daemon-stubs.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o GNOME_VFS_Daemon-stubs.obj `if test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c'; then $(CYGPATH_W) '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-stubs.c'; fi` -- --GNOME_VFS_Daemon-skels.o: $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT GNOME_VFS_Daemon-skels.o -MD -MP -MF "$(DEPDIR)/GNOME_VFS_Daemon-skels.Tpo" -c -o GNOME_VFS_Daemon-skels.o `test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c' || echo '$(srcdir)/'`$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/GNOME_VFS_Daemon-skels.Tpo" "$(DEPDIR)/GNOME_VFS_Daemon-skels.Po"; else rm -f "$(DEPDIR)/GNOME_VFS_Daemon-skels.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c' object='GNOME_VFS_Daemon-skels.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o GNOME_VFS_Daemon-skels.o `test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c' || echo '$(srcdir)/'`$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c -- --GNOME_VFS_Daemon-skels.obj: $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT GNOME_VFS_Daemon-skels.obj -MD -MP -MF "$(DEPDIR)/GNOME_VFS_Daemon-skels.Tpo" -c -o GNOME_VFS_Daemon-skels.obj `if test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c'; then $(CYGPATH_W) '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/GNOME_VFS_Daemon-skels.Tpo" "$(DEPDIR)/GNOME_VFS_Daemon-skels.Po"; else rm -f "$(DEPDIR)/GNOME_VFS_Daemon-skels.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c' object='GNOME_VFS_Daemon-skels.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o GNOME_VFS_Daemon-skels.obj `if test -f '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c'; then $(CYGPATH_W) '$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-skels.c'; fi` -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome-vfs-volume-monitor.obj `if test -f '$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c'; then $(CYGPATH_W) '$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libgnomevfs/gnome-vfs-volume-monitor.c'; fi` - - mostlyclean-libtool: - -rm -f *.lo diff --git a/sysutils/gnome-vfs2/patches/patch-aw b/sysutils/gnome-vfs2/patches/patch-aw deleted file mode 100644 index b4df0569da0..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-aw +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aw,v 1.3 2005/05/31 18:28:44 jmmv Exp $ - ---- libgnomevfs/xdgmimemagic.c.orig 2005-05-31 10:38:15.000000000 +0200 -+++ libgnomevfs/xdgmimemagic.c -@@ -47,7 +47,9 @@ - #define TRUE (!FALSE) - #endif - -+#ifndef errno - extern int errno; -+#endif - - typedef struct XdgMimeMagicMatch XdgMimeMagicMatch; - typedef struct XdgMimeMagicMatchlet XdgMimeMagicMatchlet; diff --git a/sysutils/gnome-vfs2/patches/patch-ax b/sysutils/gnome-vfs2/patches/patch-ax index 1a40afa55ce..57c2cb63924 100644 --- a/sysutils/gnome-vfs2/patches/patch-ax +++ b/sysutils/gnome-vfs2/patches/patch-ax @@ -1,15 +1,13 @@ -$NetBSD: patch-ax,v 1.2 2006/03/30 21:07:48 jmmv Exp $ +$NetBSD: patch-ax,v 1.3 2006/09/15 15:07:40 jmmv Exp $ ---- libgnomevfs/gnome-vfs-mime-handlers.c.orig 2006-02-06 11:11:51.000000000 +0100 -+++ libgnomevfs/gnome-vfs-mime-handlers.c -@@ -40,6 +40,10 @@ - - #define GCONF_DEFAULT_VIEWER_EXEC_PATH "/desktop/gnome/applications/component_viewer/exec" - -+#ifdef __SUNPRO_C -+#define __FUNCTION__ __func__ -+#endif -+ - #define MIXED_API_WARNING "Cannot call %s with a GNOMEVFSMimeApplication structure "\ - "constructed by the deprecated application registry", \ - G_GNUC_FUNCTION +--- libgnomevfs/gnome-vfs-job.h.orig 2006-08-21 14:58:06.000000000 +0200 ++++ libgnomevfs/gnome-vfs-job.h +@@ -56,7 +56,7 @@ G_STMT_START{ \ + gettimeofday(&_tt, NULL); \ + printf ("%ld:%6.ld ", _tt.tv_sec, _tt.tv_usec); \ + g_static_mutex_lock (&debug_mutex); \ +- fputs (__FUNCTION__, stdout); \ ++ fputs (G_GNUC_FUNCTION, stdout); \ + printf (": %d ", __LINE__); \ + printf x; \ + fputc ('\n', stdout); \ diff --git a/sysutils/gnome-vfs2/patches/patch-az b/sysutils/gnome-vfs2/patches/patch-az deleted file mode 100644 index 21b26984b56..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-az +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-az,v 1.1 2006/03/29 20:41:12 jmmv Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=336533 - ---- libgnomevfs/gnome-vfs-filesystem-type.c 18 Jul 2005 12:29:56 -0000 1.7 -+++ libgnomevfs/gnome-vfs-filesystem-type.c 29 Mar 2006 19:36:18 -0000 -@@ -45,12 +45,15 @@ static struct FSInfo fs_data[] = { - { "ext2fs" , N_("Ext2 Linux Volume"), 1 }, - { "ext3" , N_("Ext3 Linux Volume"), 1 }, - { "fat" , N_("MSDOS Volume"), 1 }, -+ { "ffs" , N_("BSD Volume"), 1 }, - { "hfs" , N_("MacOS Volume"), 1 }, - { "hfsplus" , N_("MacOS Volume"), 0 }, - { "iso9660" , N_("CDROM Volume"), 0 }, - { "hsfs" , N_("Hsfs CDROM Volume"), 0 }, - { "jfs" , N_("JFS Volume"), 1 }, - { "hpfs" , N_("Windows NT Volume"), 0 }, -+ { "kernfs" , N_("System Volume"), 0 }, -+ { "lfs" , N_("BSD Volume"), 1 }, - { "linprocfs", N_("System Volume"), 0 }, - { "mfs" , N_("Memory Volume"), 1 }, - { "minix" , N_("Minix Volume"), 0 }, -@@ -61,6 +64,7 @@ static struct FSInfo fs_data[] = { - { "nwfs" , N_("Netware Volume"), 0 }, - { "proc" , N_("System Volume"), 0 }, - { "procfs" , N_("System Volume"), 0 }, -+ { "ptyfs" , N_("System Volume"), 0 }, - { "reiser4" , N_("Reiser4 Linux Volume"), 1 }, - { "reiserfs" , N_("ReiserFS Linux Volume"), 1 }, - { "smbfs" , N_("Windows Shared Volume"), 1 }, -@@ -70,6 +74,7 @@ static struct FSInfo fs_data[] = { - { "udfs" , N_("Udfs Solaris Volume"), 1 }, - { "pcfs" , N_("Pcfs Solaris Volume"), 1 }, - { "samfs" , N_("Sun SAM-QFS Volume"), 1 }, -+ { "tmpfs" , N_("Temporary Volume"), 1 }, - { "umsdos" , N_("Enhanced DOS Volume"), 0 }, - { "vfat" , N_("Windows VFAT Volume"), 1 }, - { "xenix" , N_("Xenix Volume"), 0 }, -- cgit v1.2.3