1 files changed, 14 insertions, 8 deletions
diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb
index 1cc3f3883..9cdfec54f 100644
--- a/Library/Formula/postgresql.rb
+++ b/Library/Formula/postgresql.rb
@@ -2,8 +2,18 @@ require 'formula'
 
 class Postgresql < Formula
   homepage 'http://www.postgresql.org/'
-  url 'http://ftp.postgresql.org/pub/source/v9.3.4/postgresql-9.3.4.tar.bz2'
-  sha256 '9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621'
+
+  stable do
+    url 'http://ftp.postgresql.org/pub/source/v9.3.4/postgresql-9.3.4.tar.bz2'
+    sha256 '9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621'
+
+    # ossp-uuid support cannot be compiled on 9.4beta1:
+    # http://thread.gmane.org/gmane.comp.db.postgresql.devel.general/229339
+    # Will keep it stable-only until the usptream issues are resolved.
+    depends_on 'ossp-uuid' => :recommended
+    # Fix uuid-ossp build issues: http://archives.postgresql.org/pgsql-general/2012-07/msg00654.php
+    patch :DATA
+  end
 
   bottle do
     revision 2
@@ -26,7 +36,6 @@ class Postgresql < Formula
   depends_on 'openssl'
   depends_on 'readline'
   depends_on 'libxml2' if MacOS.version <= :leopard # Leopard libxml is too old
-  depends_on 'ossp-uuid' => :recommended
   depends_on :python => :optional
 
   conflicts_with 'postgres-xc',
@@ -37,9 +46,6 @@ class Postgresql < Formula
     cause 'Miscompilation resulting in segfault on queries'
   end
 
-  # Fix uuid-ossp build issues: http://archives.postgresql.org/pgsql-general/2012-07/msg00654.php
-  patch :DATA
-
   def install
     ENV.libxml2 if MacOS.version >= :snow_leopard
 
@@ -58,13 +64,13 @@ class Postgresql < Formula
       --with-libxslt
     ]
 
-    args << "--with-ossp-uuid" if build.with? 'ossp-uuid'
     args << "--with-python" if build.with? 'python'
     args << "--with-perl" unless build.include? 'no-perl'
     args << "--with-tcl" unless build.include? 'no-tcl'
     args << "--enable-dtrace" if build.include? 'enable-dtrace'
 
-    if build.with? 'ossp-uuid'
+    if build.stable? && build.with?("ossp-uuid")
+      args << "--with-ossp-uuid"
       ENV.append 'CFLAGS', `uuid-config --cflags`.strip
       ENV.append 'LDFLAGS', `uuid-config --ldflags`.strip
       ENV.append 'LIBS', `uuid-config --libs`.strip