encfs --HEAD

Fixes #28814.
Closes #28883.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 38 insertions, 22 deletions

diff --git a/Library/Formula/encfs.rb b/Library/Formula/encfs.rb
index affdf11f7..f31b2522a 100644
--- a/Library/Formula/encfs.rb
+++ b/Library/Formula/encfs.rb
@@ -2,8 +2,6 @@ require 'formula'
 
 class Encfs < Formula
   homepage 'http://www.arg0.net/encfs'
-  url 'https://encfs.googlecode.com/files/encfs-1.7.4.tgz'
-  sha1 '3d824ba188dbaabdc9e36621afb72c651e6e2945'
 
   depends_on 'pkg-config' => :build
   depends_on 'gettext'
@@ -11,39 +9,57 @@ class Encfs < Formula
   depends_on 'rlog'
   depends_on 'osxfuse'
 
-  # Following patch and changes in install section,
-  # required for better compatibility with OSX, especially OSX 10.9.
-  # Changes are already in usptream and planned to be included in next stable release 1.75.
-  # For more details refer to:
-  # https://code.google.com/p/encfs/issues/detail?id=185#c10
-  # Fixes link times and xattr on links for OSX
-  patch :DATA
+  stable do
+    url 'https://encfs.googlecode.com/files/encfs-1.7.4.tgz'
+    sha1 '3d824ba188dbaabdc9e36621afb72c651e6e2945'
+
+    # Following patch and changes in install section,
+    # required for better compatibility with OSX, especially OSX 10.9.
+    # Changes are already in usptream and planned to be included in next stable release 1.75.
+    # For more details refer to:
+    # https://code.google.com/p/encfs/issues/detail?id=185#c10
+    # Fixes link times and xattr on links for OSX
+    patch :DATA
+  end
+
+  head do
+    url 'https://encfs.googlecode.com/svn/branches/1.x'
+
+    depends_on 'autoconf' => :build
+    depends_on 'automake' => :build
+    depends_on 'libtool' => :build
+  end
 
   def install
     # Add correct flags for linkage with {osx,}fuse and gettext libs
     gettext = Formula['gettext']
     ENV.append 'CPPFLAGS', %x[pkg-config fuse --cflags].chomp + "-I#{gettext.include}"
     ENV.append 'LDFLAGS', %x[pkg-config fuse --libs].chomp + "-L#{gettext.lib}"
-    inreplace "configure", "-lfuse", "-losxfuse"
+    if build.stable?
+      inreplace "configure", "-lfuse", "-losxfuse"
+    end
 
     # Adapt to changes in recent Xcode by making local copy of endian-ness definitions
     system "mkdir encfs/sys"
     system "cp \"$HOMEBREW_SDKROOT/usr/include/sys/_endian.h\" encfs/sys/endian.h"
 
-    # Fix runtime "dyld: Symbol not found" errors
-    # Following 3 ugly inreplaces come instead of big patch
-    inreplace ["encfs/Cipher.cpp", "encfs/CipherFileIO.cpp", "encfs/NullCipher.cpp",
-               "encfs/NullNameIO.cpp", "encfs/SSL_Cipher.cpp"], "using boost::shared_ptr;", ""
-
-    inreplace ["encfs/BlockNameIO.cpp", "encfs/Cipher.cpp", "encfs/CipherFileIO.cpp",
-               "encfs/Context.cpp", "encfs/DirNode.cpp", "encfs/encfs.cpp",
-               "encfs/encfsctl.cpp", "encfs/FileNode.cpp", "encfs/FileUtils.cpp",
-               "encfs/MACFileIO.cpp", "encfs/main.cpp", "encfs/makeKey.cpp",
-               "encfs/NameIO.cpp", "encfs/NullCipher.cpp", "encfs/NullNameIO.cpp",
-               "encfs/SSL_Cipher.cpp", "encfs/StreamNameIO.cpp", "encfs/test.cpp"], "shared_ptr<", "boost::shared_ptr<"
+    if build.stable?
+      # Fix runtime "dyld: Symbol not found" errors
+      # Following 3 ugly inreplaces come instead of big patch
+      inreplace ["encfs/Cipher.cpp", "encfs/CipherFileIO.cpp", "encfs/NullCipher.cpp",
+                 "encfs/NullNameIO.cpp", "encfs/SSL_Cipher.cpp"], "using boost::shared_ptr;", ""
 
-    inreplace ["encfs/Context.cpp", "encfs/encfsctl.cpp", "encfs/FileUtils.cpp"], "boost::boost::shared_ptr<", "boost::shared_ptr<"
+      inreplace ["encfs/BlockNameIO.cpp", "encfs/Cipher.cpp", "encfs/CipherFileIO.cpp",
+                 "encfs/Context.cpp", "encfs/DirNode.cpp", "encfs/encfs.cpp",
+                 "encfs/encfsctl.cpp", "encfs/FileNode.cpp", "encfs/FileUtils.cpp",
+                 "encfs/MACFileIO.cpp", "encfs/main.cpp", "encfs/makeKey.cpp",
+                 "encfs/NameIO.cpp", "encfs/NullCipher.cpp", "encfs/NullNameIO.cpp",
+                 "encfs/SSL_Cipher.cpp", "encfs/StreamNameIO.cpp", "encfs/test.cpp"], "shared_ptr<", "boost::shared_ptr<"
 
+      inreplace ["encfs/Context.cpp", "encfs/encfsctl.cpp", "encfs/FileUtils.cpp"], "boost::boost::shared_ptr<", "boost::shared_ptr<"
+    else
+      system "make", "-f", "Makefile.dist"
+    end
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--with-boost=#{HOMEBREW_PREFIX}"