diff options
author | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-08-16 23:24:41 +0800 |
---|---|---|
committer | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-08-16 23:24:41 +0800 |
commit | a071214799c33d1f21d8f42a1825f7d082911bb1 (patch) | |
tree | 23f0fba2ce4e800bd49ec0e8cf02e80946186d79 /devel/gnome-vfs | |
parent | 301f96a5609d4f40cd54641a5cfa70d1b18254ef (diff) | |
download | marcuscom-ports-a071214799c33d1f21d8f42a1825f7d082911bb1.tar marcuscom-ports-a071214799c33d1f21d8f42a1825f7d082911bb1.tar.gz marcuscom-ports-a071214799c33d1f21d8f42a1825f7d082911bb1.tar.bz2 marcuscom-ports-a071214799c33d1f21d8f42a1825f7d082911bb1.tar.lz marcuscom-ports-a071214799c33d1f21d8f42a1825f7d082911bb1.tar.xz marcuscom-ports-a071214799c33d1f21d8f42a1825f7d082911bb1.tar.zst marcuscom-ports-a071214799c33d1f21d8f42a1825f7d082911bb1.zip |
Update to 2.7.91.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2669 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnome-vfs')
-rw-r--r-- | devel/gnome-vfs/Makefile | 3 | ||||
-rw-r--r-- | devel/gnome-vfs/distinfo | 4 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c | 35 | ||||
-rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c | 25 | ||||
-rw-r--r-- | devel/gnome-vfs/pkg-plist | 33 |
5 files changed, 16 insertions, 84 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 7dd9a9e3e..ec7cea855 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.7.90 -PORTREVISION= 2 +PORTVERSION= 2.7.91 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.7 diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index fa3e631ae..d674b94f1 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.7.90.tar.bz2) = 4961fe0112abc632f8486bcf8c94b909 -SIZE (gnome2/gnome-vfs-2.7.90.tar.bz2) = 1745846 +MD5 (gnome2/gnome-vfs-2.7.91.tar.bz2) = a73663344a2d8eab907ac598f364c62a +SIZE (gnome2/gnome-vfs-2.7.91.tar.bz2) = 1786932 diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c deleted file mode 100644 index 7028e5a91..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ /dev/null @@ -1,35 +0,0 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Feb 16 06:13:27 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sat Apr 17 00:45:01 2004 -@@ -141,9 +141,9 @@ - FD_ZERO(&read_fds); - FD_SET(pipes[0], &read_fds); - -- /* Wait max half a second */ -- tv.tv_sec = 0; -- tv.tv_usec = 500; -+ /* Wait max one second */ -+ tv.tv_sec = 1; -+ tv.tv_usec = 0; - - res = select(pipes[0] + 1, - &read_fds, NULL, NULL, &tv); -@@ -428,7 +428,7 @@ - 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); -- if (mntent[i].f_flags == MNT_RDONLY) { -+ if (mntent[i].f_flags & MNT_RDONLY) { - mount_entry->is_read_only = TRUE; - } - -@@ -857,8 +857,9 @@ - - #ifdef HAVE_SYS_SYSCTL_H - if (usermnt != 0) { -+ uid_t uid = getuid (); - if (stat (fstab->fs_file, &sb) == 0) { -- if (sb.st_uid != 0) { -+ if (uid == 0 || sb.st_uid == uid) { - mount_entry->is_user_mountable = TRUE; - } - } diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c index 303a83bc6..9788a89f0 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,25 +1,6 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Sat Jul 31 17:54:38 2004 -+++ libgnomevfs/gnome-vfs-utils.c Sat Jul 31 17:56:05 2004 -@@ -797,7 +797,9 @@ - - #if HAVE_STATVFS - statfs_result = statvfs (unescaped_path, &statfs_buffer); -+#define statfs_bsize f_frsize - #else -+#define statfs_bsize f_bsize - #if STATFS_ARGS == 2 - statfs_result = statfs (unescaped_path, &statfs_buffer); - #elif STATFS_ARGS == 4 -@@ -839,7 +841,7 @@ - #else - g_free (unescaped_path); - #endif -- block_size = statfs_buffer.f_bsize; -+ block_size = statfs_buffer.statfs_bsize; - free_blocks = statfs_buffer.f_bavail; - - *size = block_size * free_blocks; -@@ -867,7 +869,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 ++++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 +@@ -871,7 +871,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index c9a8bdcb1..2d587f3de 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -81,7 +81,6 @@ lib/gnome-vfs-2.0/modules/libbzip2.so %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so lib/gnome-vfs-2.0/modules/libcomputer.so lib/gnome-vfs-2.0/modules/libdns-sd.so -lib/gnome-vfs-2.0/modules/libextfs.so lib/gnome-vfs-2.0/modules/libfile.so lib/gnome-vfs-2.0/modules/libftp.so lib/gnome-vfs-2.0/modules/libgzip.so @@ -97,24 +96,7 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.790 -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 +lib/libgnomevfs-2.so.791 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc @@ -122,7 +104,6 @@ libdata/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/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 @@ -132,10 +113,13 @@ 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-resolve.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 @@ -159,9 +143,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 @@ -170,9 +156,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 @exec mkdir -p %D/share/gnome/vfolders %%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo @@ -218,6 +206,7 @@ share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo @@ -246,8 +235,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/gnome/vfolders @dirrm share/doc/gnome-vfs-2.0 -@dirrm lib/vfs/2.0/extfs -@dirrm lib/vfs/2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs |