diff options
Diffstat (limited to 'sysutils/gnome-vfs2')
-rw-r--r-- | sysutils/gnome-vfs2/Makefile | 11 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/Makefile.common | 8 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/PLIST | 53 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/buildlink3.mk | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/distinfo | 15 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-aa | 16 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ac | 12 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ae | 79 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ak | 20 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-am | 16 |
10 files changed, 62 insertions, 172 deletions
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index 73c5e9dcc61..911640f90c9 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.36 2004/05/03 15:39:47 jmmv Exp $ +# $NetBSD: Makefile,v 1.37 2004/09/21 16:45:47 jmmv Exp $ # -DEPENDS+= shared-mime-info>=0.13:../../databases/shared-mime-info - PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in @@ -20,14 +18,10 @@ EGFILES+= vfolders/system-settings.vfolder-info GCONF2_SCHEMAS= desktop_default_applications.schemas GCONF2_SCHEMAS+= desktop_gnome_url_handlers.schemas +GCONF2_SCHEMAS+= system_dns_sd.schemas GCONF2_SCHEMAS+= system_http_proxy.schemas GCONF2_SCHEMAS+= system_smb.schemas -# lib/vfs is shared with gnome-vfs. -PRINT_PLIST_AWK+= /^@dirrm lib\/vfs$$/ \ - { print "@unexec $${RMDIR} %D/" $$2 \ - " 2>/dev/null || $${TRUE}"; next; } - .include "Makefile.common" .include "../../devel/GConf2/schemas.mk" @@ -35,6 +29,7 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/vfs$$/ \ .include "../../archivers/bzip2/buildlink3.mk" .include "../../databases/gnome-mime-data/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" diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index 9d288669da2..2723ac44fa8 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.3 2004/05/03 15:39:47 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.4 2004/09/21 16:45:47 jmmv Exp $ # -DISTNAME= gnome-vfs-2.6.1.1 +DISTNAME= gnome-vfs-2.8.0 PKGNAME= ${DISTNAME:S/vfs/vfs2/} CATEGORIES?= sysutils CATEGORIES+= gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.6/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.8/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -70,7 +70,7 @@ SUBST_STAGE.libs= pre-configure SUBST_FILES.libs= modules/Makefile.in SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g' -BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.6.1.1 +BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.0 .include "../../sysutils/gnome-vfs2/buildlink3.mk" PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \ diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST index 5f0d5a42f19..deebb21a910 100644 --- a/sysutils/gnome-vfs2/PLIST +++ b/sysutils/gnome-vfs2/PLIST @@ -1,14 +1,17 @@ -@comment $NetBSD: PLIST,v 1.11 2004/05/03 15:39:47 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.12 2004/09/21 16:45:47 jmmv Exp $ bin/gnomevfs-cat bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir +bin/gnomevfs-rm +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 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h @@ -18,11 +21,13 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h 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-module-callback.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h @@ -57,9 +62,9 @@ lib/gnome-vfs-2.0/modules/libbzip2.so lib/gnome-vfs-2.0/modules/libcomputer.a lib/gnome-vfs-2.0/modules/libcomputer.la lib/gnome-vfs-2.0/modules/libcomputer.so -lib/gnome-vfs-2.0/modules/libextfs.a -lib/gnome-vfs-2.0/modules/libextfs.la -lib/gnome-vfs-2.0/modules/libextfs.so +lib/gnome-vfs-2.0/modules/libdns-sd.a +lib/gnome-vfs-2.0/modules/libdns-sd.la +lib/gnome-vfs-2.0/modules/libdns-sd.so lib/gnome-vfs-2.0/modules/libfile.a lib/gnome-vfs-2.0/modules/libfile.la lib/gnome-vfs-2.0/modules/libfile.so @@ -81,9 +86,6 @@ lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.a lib/gnome-vfs-2.0/modules/libsftp.la lib/gnome-vfs-2.0/modules/libsftp.so -lib/gnome-vfs-2.0/modules/libssh.a -lib/gnome-vfs-2.0/modules/libssh.la -lib/gnome-vfs-2.0/modules/libssh.so lib/gnome-vfs-2.0/modules/libtar.a lib/gnome-vfs-2.0/modules/libtar.la lib/gnome-vfs-2.0/modules/libtar.so @@ -102,31 +104,13 @@ lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.la lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.600 -lib/libgnomevfs-2.so.600.1 +lib/libgnomevfs-2.so.800 +lib/libgnomevfs-2.so.800.0 lib/pkgconfig/gnome-vfs-2.0.pc lib/pkgconfig/gnome-vfs-module-2.0.pc -lib/vfs/2.0/extfs/README -lib/vfs/2.0/extfs/a -lib/vfs/2.0/extfs/ar -lib/vfs/2.0/extfs/arj -lib/vfs/2.0/extfs/cpio -lib/vfs/2.0/extfs/deb -lib/vfs/2.0/extfs/hp48 -lib/vfs/2.0/extfs/lha -lib/vfs/2.0/extfs/mailfs -lib/vfs/2.0/extfs/patchfs -lib/vfs/2.0/extfs/rar -lib/vfs/2.0/extfs/rpm -lib/vfs/2.0/extfs/rpms -lib/vfs/2.0/extfs/tar -lib/vfs/2.0/extfs/trpm -lib/vfs/2.0/extfs/zip -lib/vfs/2.0/extfs/zoo 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/ch08.html share/doc/gnome-vfs-2.0/data-types.html share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html @@ -136,6 +120,8 @@ 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 @@ -155,6 +141,7 @@ 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 @@ -163,9 +150,11 @@ 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-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 @@ -174,8 +163,11 @@ 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/examples/gnome-vfs-2.0/modules/default-modules.conf share/examples/gnome-vfs-2.0/modules/ssl-modules.conf share/examples/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info @@ -187,6 +179,7 @@ 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/desktop_default_applications.schemas 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 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo @@ -232,6 +225,7 @@ ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ne/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 @@ -263,9 +257,6 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/examples/gnome-vfs-2.0/modules @dirrm share/examples/gnome-vfs-2.0 @dirrm share/doc/gnome-vfs-2.0 -@dirrm lib/vfs/2.0/extfs -@dirrm lib/vfs/2.0 -@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 diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk index 6948bef7afc..98bdffd39ef 100644 --- a/sysutils/gnome-vfs2/buildlink3.mk +++ b/sysutils/gnome-vfs2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2004/05/15 14:57:04 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2004/09/21 16:45:47 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_VFS2_BUILDLINK3_MK:= ${GNOME_VFS2_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfs2} BUILDLINK_PACKAGES+= gnome-vfs2 .if !empty(GNOME_VFS2_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.6.0 +BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.0 BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2 PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules/ \ diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index 7097f26b3b9..df4bc297eac 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.22 2004/05/04 16:35:57 minskim Exp $ +$NetBSD: distinfo,v 1.23 2004/09/21 16:45:47 jmmv Exp $ -SHA1 (gnome-vfs-2.6.1.1.tar.bz2) = 6d89edf1d7720ce98b78035fa4b833d559c6f34c -Size (gnome-vfs-2.6.1.1.tar.bz2) = 1482056 bytes -SHA1 (patch-aa) = 3a8113f861efeb12bec86bff06df1c7d44e7131b +SHA1 (gnome-vfs-2.8.0.tar.bz2) = 849b8ffeae6e1595f080b4d56104ffa53e3c9aaf +Size (gnome-vfs-2.8.0.tar.bz2) = 1860847 bytes +SHA1 (patch-aa) = 5bddba16ab0d57c48234ca427417ebf2cd563aab SHA1 (patch-ab) = 9fc885b1ef1e9dd05f4b3041963df298dbfba582 -SHA1 (patch-ac) = 6790f1ee67f12690bd648d258e87456c2639b560 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06 -SHA1 (patch-ae) = 6243b56ead37a0bd82a5cbd655dfbc7eabb53b14 +SHA1 (patch-ae) = 68d455dce03aac6d5372ae193c7cdaea3fceddbf SHA1 (patch-af) = 4273d773f8f9701262ab541efc43e9f7eb126001 SHA1 (patch-ag) = 0bec8918c71b2aa470c96c4512b11f42550484c4 SHA1 (patch-ai) = 3a45cd84dfa025a52c7db3aab2cca85b540078a6 -SHA1 (patch-ak) = 83694081f9484c3f71fd1867007652eff6e26f93 -SHA1 (patch-am) = 0f55b4d520893c8349bacc682f0429f26f7b38f1 +SHA1 (patch-ak) = 08e02621ff3d619205e0ff19bfa2dcb76aeb2f09 +SHA1 (patch-am) = ce6f779e0d6eaae25fae32a6ae41914dfef0fdf2 diff --git a/sysutils/gnome-vfs2/patches/patch-aa b/sysutils/gnome-vfs2/patches/patch-aa index 8871c6b3f0e..c2804f85e6c 100644 --- a/sysutils/gnome-vfs2/patches/patch-aa +++ b/sysutils/gnome-vfs2/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.9 2004/04/01 18:21:20 jmmv Exp $ +$NetBSD: patch-aa,v 1.10 2004/09/21 16:45:47 jmmv Exp $ ---- libgnomevfs/xdgmime.c.orig 2004-01-20 22:44:22.000000000 +0100 +--- libgnomevfs/xdgmime.c.orig 2004-07-24 16:39:43.000000000 +0200 +++ libgnomevfs/xdgmime.c -@@ -97,7 +97,7 @@ xdg_mime_init (void) +@@ -189,7 +189,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = PREFIX "/share/:/usr/local/share/:/usr/share/"; + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = PREFIX "/share/:/usr/local/share/:/usr/share/"; - ptr = xdg_data_dirs; + ptr = xdg_data_dirs; diff --git a/sysutils/gnome-vfs2/patches/patch-ac b/sysutils/gnome-vfs2/patches/patch-ac deleted file mode 100644 index 2a085d3f5c1..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2004/04/01 18:21:20 jmmv Exp $ - ---- libgnomevfs/gnome-vfs-i18n.c.orig 2003-04-14 19:53:02.000000000 +0200 -+++ libgnomevfs/gnome-vfs-i18n.c -@@ -104,6 +104,7 @@ unalias_lang (char *lang) - - if (!alias_table) - { -+ read_aliases (PREFIX "/" PKGLOCALEDIR "/locale/locale.alias"); - read_aliases ("/usr/share/locale/locale.alias"); - read_aliases ("/usr/local/share/locale/locale.alias"); - read_aliases ("/usr/lib/X11/locale/locale.alias"); diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae index 11b7f6c5f05..1a33c9f0578 100644 --- a/sysutils/gnome-vfs2/patches/patch-ae +++ b/sysutils/gnome-vfs2/patches/patch-ae @@ -1,85 +1,14 @@ -$NetBSD: patch-ae,v 1.5 2004/05/04 16:35:57 minskim Exp $ +$NetBSD: patch-ae,v 1.6 2004/09/21 16:45:47 jmmv Exp $ -http://bugzilla.gnome.org/show_bug.cgi?id=141736 - ---- configure.orig 2004-04-20 04:54:46.000000000 -0500 +--- configure.orig 2004-08-30 15:04:08.000000000 +0200 +++ configure -@@ -20202,7 +20202,7 @@ if test -z "`$INTLTOOL_PERL -v | fgrep ' - echo "$as_me: error: perl 5.x required for intltool" >&2;} - { (exit 1); exit 1; }; } - fi --if `perl -e "require XML::Parser" 2>/dev/null`; then -+if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - : - else - { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -@@ -25463,6 +25463,9 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -25516,6 +25519,9 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -25591,6 +25597,9 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -25644,6 +25653,9 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -25720,6 +25732,9 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <unistd.h> -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -25780,6 +25795,9 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <unistd.h> -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -25792,9 +25810,11 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -25969,9 +25969,11 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { +#ifndef HAVE_STATVFS struct statfs st; - statfs(NULL, &st, sizeof (st), 0); + statfs(NULL, &st); ; +#endif return 0; diff --git a/sysutils/gnome-vfs2/patches/patch-ak b/sysutils/gnome-vfs2/patches/patch-ak index 6dc3b084531..f3b9b0427c6 100644 --- a/sysutils/gnome-vfs2/patches/patch-ak +++ b/sysutils/gnome-vfs2/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.5 2004/04/24 21:00:07 danw Exp $ +$NetBSD: patch-ak,v 1.6 2004/09/21 16:45:47 jmmv Exp $ ---- libgnomevfs/gnome-vfs-cdrom.c.orig Sun Apr 11 09:43:13 2004 +--- libgnomevfs/gnome-vfs-cdrom.c.orig 2004-09-02 14:34:00.000000000 +0200 +++ libgnomevfs/gnome-vfs-cdrom.c -@@ -87,8 +87,9 @@ _gnome_vfs_get_cdrom_type (const char *v +@@ -89,8 +89,9 @@ _gnome_vfs_get_cdrom_type (const char *v } return type; @@ -11,16 +11,6 @@ $NetBSD: patch-ak,v 1.5 2004/04/24 21:00:07 danw Exp $ +#elif defined(__linux__) + *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); + return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT); - #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) + #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) struct ioc_toc_header header; - #if defined(__FreeBSD__) -@@ -143,8 +144,7 @@ _gnome_vfs_get_cdrom_type (const char *v - #endif /* defined(__FreeBSD__) */ - return type; - #else -- *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); -- return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT); -+ return CDS_NO_INFO; - #endif - } - + #if defined(__FreeBSD__) || defined(__DragonFly__) diff --git a/sysutils/gnome-vfs2/patches/patch-am b/sysutils/gnome-vfs2/patches/patch-am index 2656dbf01fb..89176769f0a 100644 --- a/sysutils/gnome-vfs2/patches/patch-am +++ b/sysutils/gnome-vfs2/patches/patch-am @@ -1,10 +1,8 @@ -$NetBSD: patch-am,v 1.7 2004/05/03 15:39:47 jmmv Exp $ +$NetBSD: patch-am,v 1.8 2004/09/21 16:45:47 jmmv Exp $ -http://bugzilla.gnome.org/show_bug.cgi?id=141739 - ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig 2004-04-29 16:11:52.000000000 +0200 -+++ libgnomevfs/gnome-vfs-unix-mounts.c 2004-04-29 16:13:57.000000000 +0200 -@@ -411,7 +411,11 @@ +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig 2004-08-25 09:37:37.000000000 +0200 ++++ libgnomevfs/gnome-vfs-unix-mounts.c +@@ -452,7 +455,11 @@ get_mtab_monitor_file (void) gboolean _gnome_vfs_get_current_unix_mounts (GList **return_list) { @@ -16,14 +14,14 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141739 int num_mounts, i; GnomeVFSUnixMount *mount_entry; -@@ -428,7 +432,11 @@ +@@ -469,7 +476,11 @@ _gnome_vfs_get_current_unix_mounts (GLis mount_entry->mount_path = g_strdup (mntent[i].f_mntonname); mount_entry->device_path = g_strdup (mntent[i].f_mntfromname); mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename); +#ifdef HAVE_STATVFS -+ if (mntent[i].f_flag == MNT_RDONLY) { ++ if (mntent[i].f_flag & MNT_RDONLY) { +#else - if (mntent[i].f_flags == MNT_RDONLY) { + if (mntent[i].f_flags & MNT_RDONLY) { +#endif mount_entry->is_read_only = TRUE; } |