Ticket #40840: s3fs_update

File s3fs_update, 2.3 KB (added by huets (Sylvain Huet), 7 years ago)

diff for s3fs update to 1.82, tested on macOS Sierra clang-802.0.38

Line 
1diff --git a/fuse/s3fs/Portfile b/fuse/s3fs/Portfile
2index 427becf..c40a8ca 100644
3--- a/fuse/s3fs/Portfile
4+++ b/fuse/s3fs/Portfile
5@@ -1,31 +1,38 @@
6 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
7 
8 PortSystem 1.0
9 
10 name                s3fs
11-version             1.61
12-revision        1
13+version             1.82
14+revision            0
15 categories          fuse
16 
17 platforms           darwin
18 maintainers         nomaintainer
19 description         Amazon S3 filesystem for FUSE
20 long_description    \
21     FUSE-based file system backed by Amazon S3. Mount a bucket as a \
22     local file system read/write. Store files/folders natively and \
23     transparently.
24 
25-homepage            https://code.google.com/p/s3fs/
26 
27-master_sites        googlecode:s3fs
28+homepage            https://github.com/s3fs-fuse/s3fs-fuse/archive/
29+distfiles           v${version}.tar.gz
30+master_sites        ${homepage}
31 license             GPL-2
32-checksums           rmd160  582c193888466341ecf0cc6472dd2a2b5e3eb803 \
33-                    sha256  47e6700c9ec65f85cc1eeb004dcf33b4533b3415466107f310fe167f49f35ec5
34+checksums           rmd160  c57169e56e3b5764cc6f88f9389777db877209c1 \
35+                    sha256  8a40f0b11b558b6d733eeff4fcc025cc416df37b6732001bb0c630f6d6d760dd
36 
37 depends_build       path:bin/pkg-config:pkgconfig
38 depends_lib         port:curl \
39                     port:libxml2 \
40-                    path:lib/pkgconfig/fuse.pc:fuse4x \
41+                    path:lib/pkgconfig/fuse.pc:osxfuse \
42                     bin:ssh:openssh
43 
44-# use_autoreconf      yes
45+patchfiles         patch-src_cache.cpp.diff         
46+
47+post-extract {
48+  file rename ${workpath}/s3fs-fuse-${version} ${workpath}/s3fs-${version}
49+}
50+
51+use_autoreconf      yes
52diff --git a/fuse/s3fs/files/patch-src_cache.cpp.diff b/fuse/s3fs/files/patch-src_cache.cpp.diff
53new file mode 100644
54index 0000000..1cc7907
55--- /dev/null
56+++ b/fuse/s3fs/files/patch-src_cache.cpp.diff
57@@ -0,0 +1,11 @@
58+--- src/cache.cpp
59++++ src/cache.cpp.new
60+@@ -59,7 +59,7 @@ using namespace std;
61+ #ifdef HAVE_CLOCK_GETTIME
62+ static int s3fs_clock_gettime(int clk_id, struct timespec* ts)
63+ {
64+-  return clock_gettime(clk_id, ts);
65++  return clock_gettime(static_cast<clockid_t>(clk_id), ts);
66+ }
67+ #else
68+ static int s3fs_clock_gettime(int clk_id, struct timespec* ts)