sshfs 2.4.1, and switch to osxfuse

1 files changed, 19 insertions, 12 deletions

diff --git a/Library/Formula/sshfs.rb b/Library/Formula/sshfs.rb
index c2a942392..2617d23b8 100644
--- a/Library/Formula/sshfs.rb
+++ b/Library/Formula/sshfs.rb
@@ -1,38 +1,45 @@
 require 'formula'
 
 class Sshfs < Formula
-  homepage 'http://fuse.sourceforge.net/sshfs.html'
-  url 'https://github.com/fuse4x/sshfs/archive/sshfs_2_4_0.tar.gz'
-  sha1 '30b81ac7f32125088652937568d8886e3bb3f6e2'
+  homepage 'http://osxfuse.github.io/'
+  url 'https://github.com/osxfuse/sshfs/archive/osxfuse-sshfs-2.4.1.tar.gz'
+  sha1 'cf614508db850a719529dec845ae59309f8a79c2'
+
+  option 'without-sshnodelay', "Don't compile NODELAY workaround for ssh"
 
   depends_on 'autoconf' => :build
   depends_on 'automake' => :build
   depends_on :libtool
 
   depends_on 'pkg-config' => :build
-  depends_on 'fuse4x'
+  depends_on 'osxfuse'
   depends_on 'glib'
   depends_on :xcode
 
-  bottle do
-    cellar :any
-    sha1 '9a227c8c85f410c48c95e766599d04fafd6c42b7' => :mavericks
-    sha1 '9f40f3614b424be69c19b13a5cc0b22fe9566faf' => :mountain_lion
-    sha1 '78164b5d1f374f9177017ccef88734d4af19d390' => :lion
+  def patches
+    # Fixes issue with semaphore type
+    # Reported upstream: https://github.com/osxfuse/sshfs/issues/6
+    "https://gist.github.com/denji/ce3c628d7def7f6ea490/raw/c441e0426dfb83decc0031ee54c48a8c22a35201/sshfs-fix.patch"
   end
 
   def install
+    args = %W[
+      --disable-dependency-tracking
+      --prefix=#{prefix}
+    ]
+    args << "--disable-sshnodelay" if build.without? 'sshnodelay'
+
     # Compatibility with Automake 1.13 and newer.
     inreplace 'configure.ac', 'AM_CONFIG_HEADER', 'AC_CONFIG_HEADERS'
+    inreplace 'configure.ac', 'AM_INIT_AUTOMAKE', 'AM_INIT_AUTOMAKE([subdir-objects])'
 
     system "autoreconf", "--force", "--install"
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
+    system "./configure", *args
     system "make install"
   end
 
   def caveats; <<-EOS.undent
-    Make sure to follow the directions given by `brew info fuse4x-kext`
+    Make sure to follow the directions given by `brew info osxfuse`
     before trying to use a FUSE-based filesystem.
     EOS
   end