From 67991aceb0ddc84c90625b0b8cfc7b7f8106c21e Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 14 Feb 2003 20:10:02 +0000 Subject: Updated to 2.2.2. Changes since 2.0.4: gnome-vfs 2.2.2 * Bugs fixed: + fixed memleak in monitors + fixed some ssh method problems + fixed some vfs moniker bugs gnome-vfs 2.2.1 * Bugs fixed: + Fixed deadlock wrt fam while adding many monitors + fixed memleak gnome-vfs 2.2.0 * Bugs fixed: + races and bugs in the GIOChannel support (Josh Parsons) * Featurelets + Added (disabled for now) gnutls ssl lib (Andrew McDonald) This will be enabled later when its been tested more. gnome-vfs 2.1.91 * Bugs fixed: + gzip header creation time + gnome_vfs_uri_extract_dirname crash + gnome_vfs_socket_buffer_peekc corrected gnome-vfs 2.1.6 * Bugs fixed: + fixed -lpthreads build failure (Owen Taylor) + Handle directory moves overwriting themselves (Alex Larsson) + Correct libdir handling (Frederic Crozat) * Featurelets + Deprecated gnome_vfs_mime_shutdown, gnome_vfs_loadinit, gnome_vfs_preinit and gnome_vfs_postinit. (Alex Larsson) + Lots of docs updates (Diego Gonzalez) + _ prefix internal functions. (Tim Janik) gnome-vfs 2.1.5 * Featurelets + Added GNOME_VFS_ERROR_NO_MASTER_BROWSER to GnomeVFSResult gnome-vfs 2.1.4 * Featurelets + gnome_vfs_open_fd() replaced console: method (Giovanni Corriga) Changes in the package: - Honor PKG_SYSCONFDIR. - Use GConf2's schemas.mk framework to register schemas. --- sysutils/gnome-vfs2/Makefile | 38 +++++-- sysutils/gnome-vfs2/PLIST | 190 +++++++++++++++++++++++------------ sysutils/gnome-vfs2/buildlink2.mk | 4 +- sysutils/gnome-vfs2/distinfo | 21 ++-- sysutils/gnome-vfs2/patches/patch-ab | 33 ++---- sysutils/gnome-vfs2/patches/patch-ac | 24 ----- sysutils/gnome-vfs2/patches/patch-af | 13 --- sysutils/gnome-vfs2/patches/patch-ag | 19 +++- sysutils/gnome-vfs2/patches/patch-ah | 13 --- sysutils/gnome-vfs2/patches/patch-ai | 19 +++- sysutils/gnome-vfs2/patches/patch-aj | 21 ++-- sysutils/gnome-vfs2/patches/patch-ak | 18 +++- sysutils/gnome-vfs2/patches/patch-am | 21 ++-- 13 files changed, 249 insertions(+), 185 deletions(-) delete mode 100644 sysutils/gnome-vfs2/patches/patch-ac delete mode 100644 sysutils/gnome-vfs2/patches/patch-af delete mode 100644 sysutils/gnome-vfs2/patches/patch-ah (limited to 'sysutils/gnome-vfs2') diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index 1b9db2ec60c..34cd533e2eb 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,36 +1,58 @@ -# $NetBSD: Makefile,v 1.7 2003/01/10 07:51:35 cjep Exp $ +# $NetBSD: Makefile,v 1.8 2003/02/14 20:10:02 jmmv Exp $ # -DISTNAME= gnome-vfs-2.0.4 +DISTNAME= gnome-vfs-2.2.2 PKGNAME= ${DISTNAME:S/vfs/vfs2/} -PKGREVISION= 3 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.0/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.2/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME Virtual File System (v2) -BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_GMAKE= YES -USE_GNU_GETTEXT= YES - USE_LIBTOOL= YES +USE_PKGINSTALL= YES + LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-vfs-2.0.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-vfs-module-2.0.pc.in +CONFIGURE_ARGS= --enable-gtk-doc=no CONFIGURE_ARGS+= --enable-platform-gnome-2 +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html + +PKG_SYSCONFSUBDIR= gnome-vfs-2.0 +OWN_DIRS= ${PKG_SYSCONFDIR}/modules ${PKG_SYSCONFDIR}/vfolders + +EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0 +EGFILES= modules/default-modules.conf +EGFILES+= vfolders/applications-all-users.vfolder-info +EGFILES+= vfolders/favorites.vfolder-info +EGFILES+= vfolders/network.vfolder-info +EGFILES+= vfolders/preferences-all-users.vfolder-info +EGFILES+= vfolders/server-settings.vfolder-info +EGFILES+= vfolders/start-here.vfolder-info +EGFILES+= vfolders/system-settings.vfolder-info +.for f in ${EGFILES} +CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f +.endfor +.undef f + +GCONF2_SCHEMAS= system_http_proxy.schemas .include "../../archivers/bzip2/buildlink2.mk" .include "../../audio/cdparanoia/buildlink2.mk" .include "../../databases/gnome-mime-data/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/GConf2/buildlink2.mk" +.include "../../devel/GConf2/schemas.mk" .include "../../devel/glib2/buildlink2.mk" .include "../../devel/libbonobo/buildlink2.mk" .include "../../devel/bonobo-activation/buildlink2.mk" diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST index f420311f117..66a86001ef7 100644 --- a/sysutils/gnome-vfs2/PLIST +++ b/sysutils/gnome-vfs2/PLIST @@ -1,12 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:43 tron Exp $ -etc/gnome-vfs-2.0/modules/default-modules.conf -etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info -etc/gnome-vfs-2.0/vfolders/applications.vfolder-info-default -etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info -etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info -etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info -etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info -etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info +@comment $NetBSD: PLIST,v 1.4 2003/02/14 20:10:02 jmmv Exp $ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h @@ -33,11 +25,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h 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-iobuf.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-magic.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.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 @@ -47,6 +36,9 @@ 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.a +lib/bonobo/monikers/libmoniker_gnome_vfs_std.la +lib/bonobo/monikers/libmoniker_gnome_vfs_std.so 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.a @@ -112,51 +104,113 @@ lib/vfs/2.0/extfs/tar lib/vfs/2.0/extfs/trpm lib/vfs/2.0/extfs/zip lib/vfs/2.0/extfs/zoo -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/everything-else.html -share/gtk-doc/html/gnome-vfs-2.0/file-operations.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-application-registry.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-cancellation.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-configuration.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-context.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-directory.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-file-info.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-file-size.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-inet-connection.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-initialization.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-iobuf.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-method.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-mime-handlers.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-mime-info.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-mime-magic.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-mime-monitor.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-mime.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-module-callbacks.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-module-shared.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-module.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-parse-ls.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-process.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-result.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-ssl.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-types.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-uri.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-utils.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-xfer.html -share/gtk-doc/html/gnome-vfs-2.0/index.html -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/writing-modules.html -share/gtk-doc/html/gnome-vfs-2.0/x27.html +share/doc/html/gnome-vfs-2.0/about.html +share/doc/html/gnome-vfs-2.0/advanced-operations.html +share/doc/html/gnome-vfs-2.0/c9456.html +share/doc/html/gnome-vfs-2.0/c9466.html +share/doc/html/gnome-vfs-2.0/ch08.html +share/doc/html/gnome-vfs-2.0/data-types.html +share/doc/html/gnome-vfs-2.0/directory-operations.html +share/doc/html/gnome-vfs-2.0/everything-else.html +share/doc/html/gnome-vfs-2.0/file-operations.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-application-registry.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-cancellation.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-configuration.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-context.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-directory.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-file-info.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-file-size.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-cancellation.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-database.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-monitor.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback-module-api.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ssl.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-standard-callbacks.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-inet-connection.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-initialization.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-iobuf.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-method.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-handlers.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-info.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-magic.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-monitor.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-mime.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-module-callbacks.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-module-shared.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-module.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-ops.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-parse-ls.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-process.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-result.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-ssl.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-types.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-uri.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-utils.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/html/gnome-vfs-2.0/gnome-vfs-xfer.html +share/doc/html/gnome-vfs-2.0/index.html +share/doc/html/gnome-vfs-2.0/index.sgml +share/doc/html/gnome-vfs-2.0/mime-registry.html +share/doc/html/gnome-vfs-2.0/modules.html +share/doc/html/gnome-vfs-2.0/writing-modules.html +share/doc/html/gnome-vfs-2.0/x27.html +share/examples/gnome-vfs-2.0/modules/default-modules.conf +share/examples/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info +share/examples/gnome-vfs-2.0/vfolders/favorites.vfolder-info +share/examples/gnome-vfs-2.0/vfolders/network.vfolder-info +share/examples/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info +share/examples/gnome-vfs-2.0/vfolders/server-settings.vfolder-info +share/examples/gnome-vfs-2.0/vfolders/start-here.vfolder-info +share/examples/gnome-vfs-2.0/vfolders/system-settings.vfolder-info +share/gconf/schemas/system_http_proxy.schemas +${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo @@ -169,13 +223,17 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo @@ -187,6 +245,7 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo @@ -194,20 +253,21 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo -@dirrm share/gtk-doc/html/gnome-vfs-2.0 -@unexec ${RMDIR} -p %D/share/gtk-doc/html 2>/dev/null || ${TRUE} +@comment in GConf2: @dirrm share/gconf/schemas +@comment in GConf2: @dirrm share/gconf +@dirrm share/examples/gnome-vfs-2.0/vfolders +@dirrm share/examples/gnome-vfs-2.0/modules +@dirrm share/examples/gnome-vfs-2.0 +@dirrm share/doc/html/gnome-vfs-2.0 @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 -@unexec ${RMDIR} %D/lib/vfs >/dev/null 2>/dev/null || ${TRUE} -@dirrm lib/gnome-vfs-2.0/include -@exec ${MKDIR} %D/lib/gnome-vfs-2.0/modules +@unexec ${RMDIR} %D/lib/vfs 2>/dev/null || ${TRUE} @dirrm lib/gnome-vfs-2.0/modules +@dirrm lib/gnome-vfs-2.0/include @dirrm lib/gnome-vfs-2.0 -@unexec ${RMDIR} -p %D/lib/bonobo/servers 2>/dev/null || ${TRUE} +@comment in bonobo-activation: @dirrm lib/bonobo/servers +@comment in bonobo-activation: @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 -@unexec ${RMDIR} -p %D/include/gnome-vfs-module-2.0 2>/dev/null || ${TRUE} -@unexec ${RMDIR} -p %D/include/gnome-vfs-2.0 2>/dev/null || ${TRUE} -@dirrm etc/gnome-vfs-2.0/vfolders -@dirrm etc/gnome-vfs-2.0/modules -@dirrm etc/gnome-vfs-2.0 +@dirrm include/gnome-vfs-2.0 diff --git a/sysutils/gnome-vfs2/buildlink2.mk b/sysutils/gnome-vfs2/buildlink2.mk index 44c4a744a05..a7684627b04 100644 --- a/sysutils/gnome-vfs2/buildlink2.mk +++ b/sysutils/gnome-vfs2/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.5 2002/12/24 06:10:25 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2003/02/14 20:10:02 jmmv Exp $ .if !defined(GNOME_VFS2_BUILDLINK2_MK) GNOME_VFS2_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= gnome-vfs2 -BUILDLINK_DEPENDS.gnome-vfs2?= gnome-vfs2>=2.0.4nb3 +BUILDLINK_DEPENDS.gnome-vfs2?= gnome-vfs2>=2.2.2 BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2 EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-vfs2=gnome-vfs2 diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index d5897384af3..9a5b8922f63 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,17 +1,14 @@ -$NetBSD: distinfo,v 1.2 2002/09/11 23:07:50 rh Exp $ +$NetBSD: distinfo,v 1.3 2003/02/14 20:10:02 jmmv Exp $ -SHA1 (gnome-vfs-2.0.4.tar.bz2) = 50c103fda5789cdc1f8af42f2fd4e15c266d0ecd -Size (gnome-vfs-2.0.4.tar.bz2) = 892634 bytes +SHA1 (gnome-vfs-2.2.2.tar.bz2) = 98c87820f17bd1b7fa75162f079e25ae515378b0 +Size (gnome-vfs-2.2.2.tar.bz2) = 988477 bytes SHA1 (patch-aa) = 7b55f951a970c40e1eb3cf14fabe391e096f7a80 -SHA1 (patch-ab) = d3790bd41ed17bb8afbdd424ded9e240d2108598 -SHA1 (patch-ac) = 3ca82545745654a85307bdbc4611a820145bb064 +SHA1 (patch-ab) = 8ecedea0b7208300699b69eebc6225426316020c SHA1 (patch-ad) = 674e29f933c284fdd33766690b1f45fc32a3d9d9 SHA1 (patch-ae) = fbe0fa8e2def2fec2cc55317a35638d8314287d2 -SHA1 (patch-af) = a41b6590adc94caae8c3b1369f0e5d0882fab133 -SHA1 (patch-ag) = d69b0a70b067b82136867ca5afd0fa8ef72df145 -SHA1 (patch-ah) = 7912dafc386c41aa3e220b1e0e4073564406962b -SHA1 (patch-ai) = 78cdf8b8f690a40d247b68fa72558f834d604144 -SHA1 (patch-aj) = 6d53906571c7b638ec71282666dc4935bd9e4477 -SHA1 (patch-ak) = a10d9993e67615e06b4dc056854ef2e07f045dc2 +SHA1 (patch-ag) = cb907a0a654032252c63493c3ab9f2566d4980d6 +SHA1 (patch-ai) = f4f49339cd357b702ab619b0ff0bb1c5551ae170 +SHA1 (patch-aj) = 4b0eccb280f14ffe34bc6843f1d9e0889f853895 +SHA1 (patch-ak) = dab3409128ca9f35c017488abb2a95301dfbfd89 SHA1 (patch-al) = 2e90dfb8eb2eeb900558a578f9e774fc5990d505 -SHA1 (patch-am) = 7d45e36fc701e07d7380b4d6880ecac79779f868 +SHA1 (patch-am) = fbe546eb296a0e6a38c1c851a322b34c33e49283 diff --git a/sysutils/gnome-vfs2/patches/patch-ab b/sysutils/gnome-vfs2/patches/patch-ab index 2f81f9478e2..eac6bb2b548 100644 --- a/sysutils/gnome-vfs2/patches/patch-ab +++ b/sysutils/gnome-vfs2/patches/patch-ab @@ -1,24 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/09/07 03:04:06 rh Exp $ +$NetBSD: patch-ab,v 1.2 2003/02/14 20:10:03 jmmv Exp $ ---- doc/Makefile.am.orig Thu Sep 5 20:08:27 2002 -+++ doc/Makefile.am Thu Sep 5 20:08:59 2002 -@@ -166,8 +166,8 @@ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- echo '-- Installing $(srcdir)/html/index.sgml' ; \ -- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ -+ echo '-- Installing $(srcdir)/html/index.html' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \ - fi) +--- schemas/Makefile.in.orig Mon Jan 20 20:46:20 2003 ++++ schemas/Makefile.in +@@ -303,7 +303,7 @@ maintainer-clean - # -@@ -187,7 +187,7 @@ - test -d $(distdir)/html || mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -- -cp $(srcdir)/html/index.sgml $(distdir)/html -+ -cp $(srcdir)/html/index.html $(distdir)/html - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html - - images=$(HTML_IMAGES) ; \ + # don't do this if we are building in eg. rpm + install-data-local: +- if test -z "$(DESTDIR)" ; then \ ++ if false ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \ + done \ diff --git a/sysutils/gnome-vfs2/patches/patch-ac b/sysutils/gnome-vfs2/patches/patch-ac deleted file mode 100644 index 0f1d7a19c9f..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/09/07 03:04:06 rh Exp $ - ---- doc/Makefile.in.orig Thu Sep 5 20:09:06 2002 -+++ doc/Makefile.in Thu Sep 5 20:09:21 2002 -@@ -477,8 +477,8 @@ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- echo '-- Installing $(srcdir)/html/index.sgml' ; \ -- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ -+ echo '-- Installing $(srcdir)/html/index.html' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \ - fi) - - # -@@ -495,7 +495,7 @@ - test -d $(distdir)/html || mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -- -cp $(srcdir)/html/index.sgml $(distdir)/html -+ -cp $(srcdir)/html/index.html $(distdir)/html - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html - - images=$(HTML_IMAGES) ; \ diff --git a/sysutils/gnome-vfs2/patches/patch-af b/sysutils/gnome-vfs2/patches/patch-af deleted file mode 100644 index 0fb321358ca..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2002/09/11 23:07:51 rh Exp $ - ---- modules/Makefile.am.orig Sat Sep 7 18:19:01 2002 -+++ modules/Makefile.am Sat Sep 7 18:20:15 2002 -@@ -40,7 +40,7 @@ - CDEMENU_LTLIBS = - endif - --module_flags = -export_dynamic -avoid-version -module -+module_flags = -export_dynamic -avoid-version -module -L../libgnomevfs/.libs - modulesdir = $(libdir)/gnome-vfs-2.0/modules - - modules_LTLIBRARIES = \ diff --git a/sysutils/gnome-vfs2/patches/patch-ag b/sysutils/gnome-vfs2/patches/patch-ag index acc761955f7..87f14c2681a 100644 --- a/sysutils/gnome-vfs2/patches/patch-ag +++ b/sysutils/gnome-vfs2/patches/patch-ag @@ -1,9 +1,9 @@ -$NetBSD: patch-ag,v 1.1 2002/09/11 23:07:51 rh Exp $ +$NetBSD: patch-ag,v 1.2 2003/02/14 20:10:05 jmmv Exp $ ---- modules/Makefile.in.orig Sat Sep 7 18:20:24 2002 -+++ modules/Makefile.in Sat Sep 7 18:24:03 2002 -@@ -213,7 +213,7 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la +--- modules/Makefile.in.orig Mon Jan 20 20:46:17 2003 ++++ modules/Makefile.in +@@ -208,7 +208,7 @@ EXTRA_DIST = \ + @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = -module_flags = -export_dynamic -avoid-version -module @@ -11,3 +11,12 @@ $NetBSD: patch-ag,v 1.1 2002/09/11 23:07:51 rh Exp $ modulesdir = $(libdir)/gnome-vfs-2.0/modules modules_LTLIBRARIES = \ +@@ -232,7 +232,7 @@ modules_LTLIBRARIES = \ + # Not currently supported + # libnfs.la + +-modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules ++modulesconfdir = $(datadir)/examples/gnome-vfs-2.0/modules + @HAVE_CDDA_TRUE@CDDA_CONF = @HAVE_CDDA_TRUE@cdda-module.conf + @HAVE_SSL_TRUE@SSL_CONF = @HAVE_SSL_TRUE@ssl-modules.conf + @BUILD_CDEMENU_MODULE_TRUE@CDE_CONF = @BUILD_CDEMENU_MODULE_TRUE@cdemenu-module.conf diff --git a/sysutils/gnome-vfs2/patches/patch-ah b/sysutils/gnome-vfs2/patches/patch-ah deleted file mode 100644 index 56632f325ed..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2002/09/11 23:07:52 rh Exp $ - ---- modules/vfolder/Makefile.am.orig Sat Sep 7 18:20:46 2002 -+++ modules/vfolder/Makefile.am Sat Sep 7 18:21:24 2002 -@@ -36,7 +36,7 @@ - - ### Module setup - --module_flags = -export_dynamic -avoid-version -+module_flags = -export_dynamic -avoid-version -L$(top_builddir)/libgnomevfs/.libs - modulesdir = $(libdir)/gnome-vfs-2.0/modules - - modules_LTLIBRARIES = libvfolder-desktop.la diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai index 70b401762b3..2a6f2a28909 100644 --- a/sysutils/gnome-vfs2/patches/patch-ai +++ b/sysutils/gnome-vfs2/patches/patch-ai @@ -1,13 +1,22 @@ -$NetBSD: patch-ai,v 1.1 2002/09/11 23:07:52 rh Exp $ +$NetBSD: patch-ai,v 1.2 2003/02/14 20:10:06 jmmv Exp $ ---- modules/vfolder/Makefile.in.orig Sat Sep 7 18:20:48 2002 -+++ modules/vfolder/Makefile.in Sat Sep 7 18:24:03 2002 -@@ -215,7 +215,7 @@ - +--- modules/vfolder/Makefile.in.orig Mon Jan 20 20:46:19 2003 ++++ modules/vfolder/Makefile.in +@@ -211,7 +211,7 @@ EXTRA_DIST = \ ### Module setup + -module_flags = -export_dynamic -avoid-version +module_flags = -export_dynamic -avoid-version -L$(top_builddir)/libgnomevfs/.libs modulesdir = $(libdir)/gnome-vfs-2.0/modules modules_LTLIBRARIES = libvfolder-desktop.la +@@ -231,7 +231,7 @@ libvfolder_desktop_la_LIBADD = $(top_bui + + ### Default .vfolder-info files + +-vfolderdir = $(sysconfdir)/gnome-vfs-2.0/vfolders ++vfolderdir = $(datadir)/examples/gnome-vfs-2.0/vfolders + vfolder_DATA = \ + applications-all-users.vfolder-info \ + network.vfolder-info \ diff --git a/sysutils/gnome-vfs2/patches/patch-aj b/sysutils/gnome-vfs2/patches/patch-aj index e503b82fb75..00c80288b27 100644 --- a/sysutils/gnome-vfs2/patches/patch-aj +++ b/sysutils/gnome-vfs2/patches/patch-aj @@ -1,13 +1,22 @@ -$NetBSD: patch-aj,v 1.1 2002/09/11 23:07:52 rh Exp $ +$NetBSD: patch-aj,v 1.2 2003/02/14 20:10:06 jmmv Exp $ ---- configure.in.orig Mon Sep 9 12:25:15 2002 -+++ configure.in Mon Sep 9 12:25:30 2002 -@@ -85,7 +85,7 @@ +--- configure.in.orig Mon Jan 20 20:24:43 2003 ++++ configure.in +@@ -88,7 +88,7 @@ ALL_LINGUAS="ar az be bg ca cs da de el AM_GLIB_GNU_GETTEXT AC_FUNC_ALLOCA --AC_CHECK_FUNCS(getdtablesize open64 lseek64 statvfs) -+AC_CHECK_FUNCS(getdtablesize open64 lseek64 statvfs readdir_r) +-AC_CHECK_FUNCS(getdtablesize open64 lseek64 statvfs seteuid setegid setresuid setresgid) ++AC_CHECK_FUNCS(getdtablesize open64 lseek64 statvfs seteuid setegid setresuid setresgid readdir_r) AC_REPLACE_FUNCS(getdelim) dnl Specify the gconf configuration source, +@@ -151,7 +151,7 @@ AC_SUBST(VFS_OFFSET_IS) + AC_SUBST(VFS_SIZE_PRINTF) + AC_SUBST(VFS_OFFSET_PRINTF) + +-AC_CHECK_HEADERS(sys/resource.h sys/vfs.h sys/mount.h sys/statvfs.h) ++AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statvfs.h) + + dnl ==================================== + dnl = diff --git a/sysutils/gnome-vfs2/patches/patch-ak b/sysutils/gnome-vfs2/patches/patch-ak index 19583d06bb5..876b1bb52e0 100644 --- a/sysutils/gnome-vfs2/patches/patch-ak +++ b/sysutils/gnome-vfs2/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1 2002/09/11 23:07:52 rh Exp $ +$NetBSD: patch-ak,v 1.2 2003/02/14 20:10:07 jmmv Exp $ ---- config.h.in.orig Mon Sep 9 12:25:36 2002 -+++ config.h.in Mon Sep 9 12:26:02 2002 -@@ -157,6 +157,9 @@ +--- config.h.in.orig Thu Jan 16 18:21:17 2003 ++++ config.h.in +@@ -140,6 +140,9 @@ /* Define to 1 if you have the `statvfs' function. */ #undef HAVE_STATVFS @@ -12,3 +12,13 @@ $NetBSD: patch-ak,v 1.1 2002/09/11 23:07:52 rh Exp $ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +@@ -154,6 +157,9 @@ + + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_MOUNT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_PARAM_H + + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_RESOURCE_H diff --git a/sysutils/gnome-vfs2/patches/patch-am b/sysutils/gnome-vfs2/patches/patch-am index 55cfc64768d..2f9869c7f54 100644 --- a/sysutils/gnome-vfs2/patches/patch-am +++ b/sysutils/gnome-vfs2/patches/patch-am @@ -1,13 +1,22 @@ -$NetBSD: patch-am,v 1.1 2002/09/11 23:07:53 rh Exp $ +$NetBSD: patch-am,v 1.2 2003/02/14 20:10:07 jmmv Exp $ ---- configure.orig Tue Sep 10 16:52:04 2002 -+++ configure Tue Sep 10 16:52:47 2002 -@@ -12159,7 +12159,7 @@ +--- configure.orig Mon Jan 20 20:32:45 2003 ++++ configure +@@ -10809,7 +10809,7 @@ fi --for ac_func in getdtablesize open64 lseek64 statvfs -+for ac_func in getdtablesize open64 lseek64 statvfs readdir_r +-for ac_func in getdtablesize open64 lseek64 statvfs seteuid setegid setresuid setresgid ++for ac_func in getdtablesize open64 lseek64 statvfs seteuid setegid setresuid setresgid readdir_r do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -12060,7 +12060,7 @@ esac + + + +-for ac_header in sys/resource.h sys/vfs.h sys/mount.h sys/statvfs.h ++for ac_header in sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statvfs.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then -- cgit v1.2.3