fontforge: general fixes.

Some fixes for the Fontforge, pending the next imminent stable release.
Also bumping czmq and zeromq following a discussion [on
this](https://github.com/fontforge/fontforge/issues/1837) this morning,
during which I stumbled across a fix by removing the two and
reinstalling them afresh, so I’m recommending we do that for everyone
given the two libraries are tiny and it’ll flush out any configuration
or bottle issues that could be lingering.

3 files changed, 31 insertions, 36 deletions

diff --git a/Library/Formula/czmq.rb b/Library/Formula/czmq.rb
index b4c48c7ae..b545ee09b 100644
--- a/Library/Formula/czmq.rb
+++ b/Library/Formula/czmq.rb
@@ -1,29 +1,37 @@
-require 'formula'
+require "formula"
 
 class Czmq < Formula
-  homepage 'http://czmq.zeromq.org/'
-  url 'http://download.zeromq.org/czmq-2.2.0.tar.gz'
-  sha1 '2f4fd8de4cf04a68a8f6e88ea7657d8068f472d2'
+  homepage "http://czmq.zeromq.org/"
+  url "http://download.zeromq.org/czmq-2.2.0.tar.gz"
+  sha1 "2f4fd8de4cf04a68a8f6e88ea7657d8068f472d2"
+  revision 1
 
   head do
-    url 'https://github.com/zeromq/czmq.git'
+    url "https://github.com/zeromq/czmq.git"
 
-    depends_on 'autoconf' => :build
-    depends_on 'automake' => :build
-    depends_on 'libtool' => :build
-    depends_on 'pkg-config' => :build
+    depends_on "autoconf" => :build
+    depends_on "automake" => :build
+    depends_on "libtool" => :build
   end
 
   option :universal
 
-  depends_on 'zeromq'
+  depends_on "pkg-config" => :build
+  depends_on "zeromq"
+  depends_on "libsodium" => :recommended
 
   def install
     ENV.universal_binary if build.universal?
+
+    args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
+
+    if build.stable?
+      args << "--with-libsodium" if build.with? "libsodium"
+    end
+
     system "./autogen.sh" if build.head?
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
-    system "make install"
+    system "./configure", *args
+    system "make", "install"
     rm Dir["#{bin}/*.gsl"]
   end
 
diff --git a/Library/Formula/fontforge.rb b/Library/Formula/fontforge.rb
index 4bc2777d1..47d668547 100644
--- a/Library/Formula/fontforge.rb
+++ b/Library/Formula/fontforge.rb
@@ -21,7 +21,14 @@ class Fontforge < Formula
     sha1 "2e0b2ac9c7b6abbb0fd302b422e56a478c9492da" => :mountain_lion
   end
 
-  head "https://github.com/fontforge/fontforge.git"
+  head do
+    url "https://github.com/fontforge/fontforge.git"
+
+    # Remove this block after next stable release and make mandatory for all again.
+    # Several unique issues fixed in HEAD.
+    depends_on "zeromq"
+    depends_on "czmq"
+  end
 
   option "with-gif", "Build with GIF support"
   option "with-x", "Build with X11 support, building the app bundle"
@@ -33,7 +40,6 @@ class Fontforge < Formula
   depends_on "automake" => :build
   depends_on "pkg-config" => :build
   depends_on :libltdl
-  depends_on "ossp-uuid"
   depends_on "gettext"
   depends_on "pango"
   depends_on "libpng"   => :recommended
@@ -43,11 +49,6 @@ class Fontforge < Formula
   depends_on "giflib" if build.with? "gif"
   depends_on "libspiro" => :optional
   depends_on "fontconfig"
-  # The below two below dependencies are highly unrecommended for now
-  # https://github.com/fontforge/fontforge/issues/1837
-  # They should be made recommended again when functional.
-  depends_on "zeromq" => :optional
-  depends_on "czmq" if build.with? "zeromq"
   depends_on "cairo"
   depends_on :python if MacOS.version <= :snow_leopard
 
@@ -56,16 +57,6 @@ class Fontforge < Formula
     cause "Compiling cvexportdlg.c fails with error: initializer element is not constant"
   end
 
-  # Fix Fontforge collab tools causing folder to build inside bin
-  # That folder causes audit build failures
-  # https://github.com/fontforge/fontforge/pull/1838
-  if build.with? "zeromq"
-    patch do
-      url "https://github.com/fontforge/fontforge/pull/1838.diff"
-      sha1 "5e7a848fd035b5b2aa18e9398f755feeb0bfafbb"
-    end
-  end
-
   def install
     args = ["--prefix=#{prefix}"]
 
@@ -91,11 +82,6 @@ class Fontforge < Formula
     # Reset ARCHFLAGS to match how we build
     ENV["ARCHFLAGS"] = "-arch #{MacOS.preferred_arch}"
 
-    # Fontforge is *really* bad at finding the ossp-uuid dependency. Help it.
-    # It wildly ignores the uuid pkg-config file, so manually give it flags.
-    ENV.prepend "LIBUUID_CFLAGS", "-I#{Formula["ossp-uuid"].include}"
-    ENV.prepend "LIBUUID_LIBS", "-L#{Formula["ossp-uuid"].lib}"
-
     # Bootstrap in every build. See the link below.
     system "./bootstrap" #https://github.com/fontforge/fontforge/issues/1806
     system "./configure", *args
diff --git a/Library/Formula/zeromq.rb b/Library/Formula/zeromq.rb
index c588c532b..a473cd34b 100644
--- a/Library/Formula/zeromq.rb
+++ b/Library/Formula/zeromq.rb
@@ -1,9 +1,10 @@
-require 'formula'
+require "formula"
 
 class Zeromq < Formula
   homepage "http://www.zeromq.org/"
   url "http://download.zeromq.org/zeromq-4.0.5.tar.gz"
   sha1 "a664ec63661a848ef46114029156a0a6006feecd"
+  revision 1
 
   bottle do
     cellar :any