From d7260ae4aefbb8b4e165c55a712a4be711778f8f Mon Sep 17 00:00:00 2001 From: Chad Catlett Date: Thu, 3 Jan 2013 12:06:11 -0600 Subject: postgresql: fix conflict Closes #16873. Signed-off-by: Adam Vandenberg --- Library/Formula/postgresql.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb index ba68834f8..9cef12506 100644 --- a/Library/Formula/postgresql.rb +++ b/Library/Formula/postgresql.rb @@ -9,8 +9,8 @@ class Postgresql < Formula depends_on 'libxml2' if MacOS.version == :leopard # Leopard libxml is too old depends_on 'ossp-uuid' unless build.include? 'without-ossp-uuid' - conflicts_with 'postgresql-xc', - :because => 'postgresql and postgresql-xc install the same binaries.' + conflicts_with 'postgres-xc', + :because => 'postgresql and postgres-xc install the same binaries.' option '32-bit' option 'without-ossp-uuid', 'Build without OSSP uuid' -- cgit v1.2.3