diff options
35 files changed, 42 insertions, 41 deletions
diff --git a/Library/Formula/aria2.rb b/Library/Formula/aria2.rb index 4cb9d6f98..41ce628f2 100644 --- a/Library/Formula/aria2.rb +++ b/Library/Formula/aria2.rb @@ -12,7 +12,7 @@ class Aria2 < Formula depends_on 'curl-ca-bundle' => :recommended # Leopard's libxml2 is too old. - depends_on 'libxml2' if MacOS.version == :leopard + depends_on 'libxml2' if MacOS.version <= :leopard def install args = %W[--disable-dependency-tracking --prefix=#{prefix}] diff --git a/Library/Formula/avidemux.rb b/Library/Formula/avidemux.rb index 4ae6e612c..2e73c7227 100644 --- a/Library/Formula/avidemux.rb +++ b/Library/Formula/avidemux.rb @@ -62,7 +62,7 @@ class Avidemux < Formula # For 32-bit compilation under gcc 4.2, see: # http://trac.macports.org/ticket/20938#comment:22 - if MacOS.version == :leopard or Hardware.is_32_bit? + if MacOS.version <= :leopard or Hardware.is_32_bit? inreplace 'cmake/admFFmpegBuild.cmake', '${CMAKE_INSTALL_PREFIX})', '${CMAKE_INSTALL_PREFIX} --extra-cflags=-mdynamic-no-pic)' diff --git a/Library/Formula/bind.rb b/Library/Formula/bind.rb index d17c015c6..220581af8 100644 --- a/Library/Formula/bind.rb +++ b/Library/Formula/bind.rb @@ -6,7 +6,7 @@ class Bind < Formula sha1 '9e1a9e5e45685befce6b93d4fcfd63e50eaeb2cf' version '9.9.3-P1' - depends_on "openssl" if MacOS.version == :leopard + depends_on "openssl" if MacOS.version <= :leopard def install ENV.libxml2 @@ -23,7 +23,7 @@ class Bind < Formula # For Xcode-only systems we help a bit to find openssl. # If CLT.installed?, it evaluates to "/usr", which works. - args << "--with-openssl=#{MacOS.sdk_path}/usr" unless MacOS.version == :leopard + args << "--with-openssl=#{MacOS.sdk_path}/usr" unless MacOS.version <= :leopard system "./configure", *args diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb index d8a1e4690..bb80e7c1d 100644 --- a/Library/Formula/cairo.rb +++ b/Library/Formula/cairo.rb @@ -45,7 +45,7 @@ class Cairo < Formula args << '--enable-gobject=no' end - args << '--enable-xcb=no' if MacOS.version == :leopard + args << '--enable-xcb=no' if MacOS.version <= :leopard system "./configure", *args system "make install" diff --git a/Library/Formula/collectd.rb b/Library/Formula/collectd.rb index 85a030463..6f24745b1 100644 --- a/Library/Formula/collectd.rb +++ b/Library/Formula/collectd.rb @@ -30,7 +30,7 @@ class Collectd < Formula --localstatedir=#{var} --with-python=#{python}] - args << "--disable-embedded-perl" if MacOS.version == :leopard + args << "--disable-embedded-perl" if MacOS.version <= :leopard args << "--disable-java" unless build.include? "java" args << "--enable-debug" if build.include? "debug" diff --git a/Library/Formula/couchdb.rb b/Library/Formula/couchdb.rb index fb9978668..f9bbf548d 100644 --- a/Library/Formula/couchdb.rb +++ b/Library/Formula/couchdb.rb @@ -19,7 +19,7 @@ class Couchdb < Formula depends_on 'spidermonkey' depends_on 'icu4c' depends_on 'erlang' - depends_on 'curl' if MacOS.version == :leopard + depends_on 'curl' if MacOS.version <= :leopard def install # couchdb 1.3.0 supports vendor names and versioning diff --git a/Library/Formula/disco.rb b/Library/Formula/disco.rb index 1d077194a..1f16238fe 100644 --- a/Library/Formula/disco.rb +++ b/Library/Formula/disco.rb @@ -9,7 +9,7 @@ class Disco < Formula depends_on :python depends_on 'erlang' - depends_on 'simplejson' => :python if MacOS.version == :leopard + depends_on 'simplejson' => :python if MacOS.version <= :leopard depends_on 'libcmph' def patches diff --git a/Library/Formula/ejabberd.rb b/Library/Formula/ejabberd.rb index e3d619143..3f1f74937 100644 --- a/Library/Formula/ejabberd.rb +++ b/Library/Formula/ejabberd.rb @@ -5,7 +5,7 @@ class Ejabberd < Formula url "http://www.process-one.net/downloads/ejabberd/2.1.13/ejabberd-2.1.13.tgz" sha1 '6343186be2e84824d2da32e36110b72d6673730e' - depends_on "openssl" if MacOS.version == :leopard + depends_on "openssl" if MacOS.version <= :leopard depends_on "erlang" option "32-bit" @@ -28,7 +28,7 @@ class Ejabberd < Formula "--sysconfdir=#{etc}", "--localstatedir=#{var}"] - if MacOS.version == :leopard + if MacOS.version <= :leopard openssl = Formula.factory('openssl') args << "--with-openssl=#{openssl.prefix}" end diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb index feb859153..cb77a041d 100644 --- a/Library/Formula/erlang.rb +++ b/Library/Formula/erlang.rb @@ -68,7 +68,7 @@ class Erlang < Formula "--enable-shared-zlib", "--enable-smp-support"] - args << "--with-dynamic-trace=dtrace" unless MacOS.version == :leopard or not MacOS::CLT.installed? + args << "--with-dynamic-trace=dtrace" unless MacOS.version <= :leopard or not MacOS::CLT.installed? unless build.include? 'disable-hipe' # HIPE doesn't strike me as that reliable on OS X diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index 057fafb04..c53388003 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -50,7 +50,7 @@ class Graphicsmagick < Formula "--prefix=#{prefix}", "--enable-shared", "--disable-static"] args << "--without-magick-plus-plus" if build.include? 'without-magick-plus-plus' - args << "--disable-openmp" if MacOS.version == :leopard or not ENV.compiler == :gcc # libgomp unavailable + args << "--disable-openmp" if MacOS.version <= :leopard or not ENV.compiler == :gcc # libgomp unavailable args << "--with-gslib" if build.include? 'with-ghostscript' args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" \ unless ghostscript_fonts? diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb index 6a5c3ace7..461a86258 100644 --- a/Library/Formula/grass.rb +++ b/Library/Formula/grass.rb @@ -20,7 +20,7 @@ class Grass < Formula depends_on 'wxmac' => :recommended # prefer over OS X's version because of 64bit depends_on :postgresql => :optional depends_on :mysql => :optional - depends_on "cairo" if MacOS.version == :leopard + depends_on "cairo" if MacOS.version <= :leopard depends_on :x11 # needs to find at least X11/include/GL/gl.h # Patches that files are not installed outside of the prefix. @@ -83,7 +83,7 @@ class Grass < Formula end # Deal with Cairo support - if MacOS.version == :leopard + if MacOS.version <= :leopard cairo = Formula.factory('cairo') args << "--with-cairo-includes=#{cairo.include}/cairo" args << "--with-cairo-libs=#{cairo.lib}" diff --git a/Library/Formula/lftp.rb b/Library/Formula/lftp.rb index cb01cb8e2..2a02c380d 100644 --- a/Library/Formula/lftp.rb +++ b/Library/Formula/lftp.rb @@ -22,7 +22,8 @@ class Lftp < Formula def install # Bus error - ENV.no_optimization if MacOS.version == :leopard + # TODO what are the more specific circumstances? + ENV.no_optimization if MacOS.version <= :leopard system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" diff --git a/Library/Formula/libmemcached.rb b/Library/Formula/libmemcached.rb index 821151753..42d69a025 100644 --- a/Library/Formula/libmemcached.rb +++ b/Library/Formula/libmemcached.rb @@ -8,7 +8,7 @@ class Libmemcached < Formula depends_on 'memcached' def install - ENV.append_to_cflags "-undefined dynamic_lookup" if MacOS.version == :leopard + ENV.append_to_cflags "-undefined dynamic_lookup" if MacOS.version <= :leopard system "./configure", "--prefix=#{prefix}" system "make install" diff --git a/Library/Formula/libmms.rb b/Library/Formula/libmms.rb index b12b06c63..4a07e0941 100644 --- a/Library/Formula/libmms.rb +++ b/Library/Formula/libmms.rb @@ -10,7 +10,7 @@ class Libmms < Formula def patches # see https://trac.macports.org/ticket/27988 - if MacOS.version == :leopard + if MacOS.version <= :leopard { :p0 => "https://trac.macports.org/export/87883/trunk/dports/multimedia/libmms/files/src_mms-common.h.patch" } end end diff --git a/Library/Formula/libvirt.rb b/Library/Formula/libvirt.rb index ec70e4628..ecad6c587 100644 --- a/Library/Formula/libvirt.rb +++ b/Library/Formula/libvirt.rb @@ -13,7 +13,7 @@ class Libvirt < Formula depends_on 'yajl' depends_on :python => :recommended - if MacOS.version == :leopard + if MacOS.version <= :leopard # Definitely needed on Leopard, but not on Snow Leopard. depends_on "readline" depends_on "libxml2" diff --git a/Library/Formula/libxml++.rb b/Library/Formula/libxml++.rb index a132b58e7..3a5b295fb 100644 --- a/Library/Formula/libxml++.rb +++ b/Library/Formula/libxml++.rb @@ -8,7 +8,7 @@ class Libxmlxx < Formula depends_on 'pkg-config' => :build depends_on 'glibmm' # LibXML++ can't compile agains the version of LibXML shipped with Leopard - depends_on 'libxml2' if MacOS.version == :leopard + depends_on 'libxml2' if MacOS.version <= :leopard def install system "./configure", "--disable-dependency-tracking", diff --git a/Library/Formula/mpd.rb b/Library/Formula/mpd.rb index e7159b183..735aa46ce 100644 --- a/Library/Formula/mpd.rb +++ b/Library/Formula/mpd.rb @@ -63,7 +63,7 @@ class Mpd < Formula ] args << '--disable-mad' - args << '--disable-curl' if MacOS.version == :leopard + args << '--disable-curl' if MacOS.version <= :leopard args << "--with-faad=#{Formula.factory('faad2').opt_prefix}" args << '--enable-zzip' if build.with? 'libzzip' diff --git a/Library/Formula/nmap.rb b/Library/Formula/nmap.rb index ffb7f6ca0..673e4628e 100644 --- a/Library/Formula/nmap.rb +++ b/Library/Formula/nmap.rb @@ -8,7 +8,7 @@ class Nmap < Formula head 'https://guest:@svn.nmap.org/nmap/', :using => :svn # Leopard's version of OpenSSL isn't new enough - depends_on "openssl" if MacOS.version == :leopard + depends_on "openssl" if MacOS.version <= :leopard fails_with :llvm do build 2334 @@ -23,7 +23,7 @@ class Nmap < Formula --without-zenmap --disable-universal] - if MacOS.version == :leopard + if MacOS.version <= :leopard openssl = Formula.factory('openssl') args << "--with-openssl=#{openssl.prefix}" end diff --git a/Library/Formula/nspr.rb b/Library/Formula/nspr.rb index e654bc0e6..1b0781f88 100644 --- a/Library/Formula/nspr.rb +++ b/Library/Formula/nspr.rb @@ -10,7 +10,7 @@ class Nspr < Formula cd "mozilla/nsprpub" do # Fixes a bug with linking against CoreFoundation, needed to work with SpiderMonkey # See: http://openradar.appspot.com/7209349 - target_frameworks = (Hardware.is_32_bit? or MacOS.version == :leopard) ? "-framework Carbon" : "" + target_frameworks = (Hardware.is_32_bit? or MacOS.version <= :leopard) ? "-framework Carbon" : "" inreplace "pr/src/Makefile.in", "-framework CoreServices -framework CoreFoundation", target_frameworks args = %W[ diff --git a/Library/Formula/postgres-xc.rb b/Library/Formula/postgres-xc.rb index 98a79e4b1..1fb3fc85f 100644 --- a/Library/Formula/postgres-xc.rb +++ b/Library/Formula/postgres-xc.rb @@ -8,7 +8,7 @@ class PostgresXc < Formula depends_on :arch => :x86_64 depends_on :python => :recommended depends_on 'readline' - depends_on 'libxml2' if MacOS.version == :leopard # Leopard libxml is too old + depends_on 'libxml2' if MacOS.version <= :leopard # Leopard libxml is too old depends_on 'ossp-uuid' => :recommended conflicts_with 'postgresql', diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb index 13ce130b7..e44db834b 100644 --- a/Library/Formula/postgresql.rb +++ b/Library/Formula/postgresql.rb @@ -6,7 +6,7 @@ class Postgresql < Formula sha1 '75b53c884cb10ed9404747b51677358f12082152' depends_on 'readline' - depends_on 'libxml2' if MacOS.version == :leopard # Leopard libxml is too old + depends_on 'libxml2' if MacOS.version <= :leopard # Leopard libxml is too old depends_on 'ossp-uuid' => :recommended depends_on :python => :recommended diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb index e55d6762b..78562f7d9 100644 --- a/Library/Formula/qt.rb +++ b/Library/Formula/qt.rb @@ -25,12 +25,12 @@ class Qt < Formula depends_on "d-bus" if build.with? 'qtdbus' depends_on "mysql" => :optional - depends_on 'sqlite' if MacOS.version == :leopard + depends_on 'sqlite' if MacOS.version <= :leopard def patches # Fixes compilation failure on Leopard. # https://bugreports.qt-project.org/browse/QTBUG-23258 - if MacOS.version == :leopard + if MacOS.version <= :leopard "http://bugreports.qt-project.org/secure/attachment/26712/Patch-Qt-4.8-for-10.5" end end @@ -64,7 +64,7 @@ class Qt < Formula args << "-platform" << "unsupported/macx-clang" if ENV.compiler == :clang # See: https://github.com/mxcl/homebrew/issues/issue/744 - args << "-system-sqlite" if MacOS.version == :leopard + args << "-system-sqlite" if MacOS.version <= :leopard args << "-plugin-sql-mysql" if build.with? 'mysql' diff --git a/Library/Formula/rabbitmq-c.rb b/Library/Formula/rabbitmq-c.rb index 09c71af24..c65f54fab 100644 --- a/Library/Formula/rabbitmq-c.rb +++ b/Library/Formula/rabbitmq-c.rb @@ -18,7 +18,7 @@ class RabbitmqC < Formula depends_on :automake depends_on :libtool depends_on 'rabbitmq' - depends_on 'simplejson' => :python if MacOS.version == :leopard + depends_on 'simplejson' => :python if MacOS.version <= :leopard def install ENV.universal_binary if build.universal? diff --git a/Library/Formula/rabbitmq.rb b/Library/Formula/rabbitmq.rb index ff2945696..afd23d164 100644 --- a/Library/Formula/rabbitmq.rb +++ b/Library/Formula/rabbitmq.rb @@ -5,7 +5,7 @@ class Rabbitmq < Formula url 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.1.3/rabbitmq-server-mac-standalone-3.1.3.tar.gz' sha1 '631b9e46e046db9f591d6027ee690ffaaab20a45' - depends_on 'simplejson' => :python if MacOS.version == :leopard + depends_on 'simplejson' => :python if MacOS.version <= :leopard def install # Install the base files diff --git a/Library/Formula/recode.rb b/Library/Formula/recode.rb index 1fee93130..5d207edde 100644 --- a/Library/Formula/recode.rb +++ b/Library/Formula/recode.rb @@ -14,7 +14,7 @@ class Recode < Formula s = Formula.factory('libtool').share d = "#{s}/libtool/config" cp ["#{d}/config.guess", "#{d}/config.sub"], "." - elsif MacOS.version == :leopard + elsif MacOS.version <= :leopard cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config.*"], "." else cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config/config.*"], "." diff --git a/Library/Formula/rtmpdump.rb b/Library/Formula/rtmpdump.rb index 6a54454e1..f51cd5d08 100644 --- a/Library/Formula/rtmpdump.rb +++ b/Library/Formula/rtmpdump.rb @@ -7,7 +7,7 @@ class Rtmpdump < Formula head 'git://git.ffmpeg.org/rtmpdump' - depends_on 'openssl' if MacOS.version == :leopard + depends_on 'openssl' if MacOS.version <= :leopard fails_with :llvm do build '2336' diff --git a/Library/Formula/rtorrent.rb b/Library/Formula/rtorrent.rb index 1f7126b1a..5017720e3 100644 --- a/Library/Formula/rtorrent.rb +++ b/Library/Formula/rtorrent.rb @@ -13,7 +13,7 @@ class Rtorrent < Formula def install args = ["--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"] args << "--with-xmlrpc-c" if build.with? "xmlrpc-c" - if MacOS.version == :leopard + if MacOS.version <= :leopard inreplace 'configure' do |s| s.gsub! ' pkg_cv_libcurl_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.15.4" 2>/dev/null`', ' pkg_cv_libcurl_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.15.4" | sed -e "s/-arch [^-]*/-arch $(uname -m) /" 2>/dev/null`' diff --git a/Library/Formula/spidermonkey.rb b/Library/Formula/spidermonkey.rb index 7995f8d31..be89ef5cb 100644 --- a/Library/Formula/spidermonkey.rb +++ b/Library/Formula/spidermonkey.rb @@ -14,7 +14,7 @@ class Spidermonkey < Formula def install # aparently this flag causes the build to fail for ivanvc on 10.5 with a # penryn (core 2 duo) CPU. So lets be cautious here and remove it. - ENV['CFLAGS'] = ENV['CFLAGS'].gsub(/-msse[^\s]+/, '') if MacOS.version == :leopard + ENV['CFLAGS'] = ENV['CFLAGS'].gsub(/-msse[^\s]+/, '') if MacOS.version <= :leopard cd "js/src" do # Remove the broken *(for anyone but FF) install_name diff --git a/Library/Formula/stormfs.rb b/Library/Formula/stormfs.rb index 2497dad99..04420de34 100644 --- a/Library/Formula/stormfs.rb +++ b/Library/Formula/stormfs.rb @@ -8,7 +8,7 @@ class Stormfs < Formula depends_on 'pkg-config' => :build depends_on 'glib' depends_on 'fuse4x' - depends_on 'curl' if MacOS.version == :leopard + depends_on 'curl' if MacOS.version <= :leopard def install system "./configure", "--disable-debug", "--disable-dependency-tracking", diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb index 389d27759..af4a8847a 100644 --- a/Library/Formula/subversion.rb +++ b/Library/Formula/subversion.rb @@ -131,7 +131,7 @@ class Subversion < Formula # Remove hard-coded ppc target, add appropriate ones if build.universal? arches = "-arch x86_64 -arch i386" - elsif MacOS.version == :leopard + elsif MacOS.version <= :leopard arches = "-arch i386" else arches = "-arch x86_64" diff --git a/Library/Formula/swi-prolog.rb b/Library/Formula/swi-prolog.rb index e22401db9..37a5fc432 100644 --- a/Library/Formula/swi-prolog.rb +++ b/Library/Formula/swi-prolog.rb @@ -26,7 +26,7 @@ class SwiProlog < Formula end # 10.5 versions of these are too old - if MacOS.version == :leopard + if MacOS.version <= :leopard depends_on 'fontconfig' depends_on 'expat' end diff --git a/Library/Formula/tcpflow.rb b/Library/Formula/tcpflow.rb index 71b53ee4b..7a8f4239e 100644 --- a/Library/Formula/tcpflow.rb +++ b/Library/Formula/tcpflow.rb @@ -14,7 +14,7 @@ class Tcpflow < Formula s = Formula.factory('libtool').share d = "#{s}/libtool/config" cp ["#{d}/config.guess", "#{d}/config.sub"], "." - elsif MacOS.version == :leopard + elsif MacOS.version <= :leopard cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config.*"], "." else cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config/config.*"], "." diff --git a/Library/Formula/trafshow.rb b/Library/Formula/trafshow.rb index cf8322cac..ce15e46ea 100644 --- a/Library/Formula/trafshow.rb +++ b/Library/Formula/trafshow.rb @@ -20,7 +20,7 @@ class Trafshow < Formula s = Formula.factory('libtool').share d = "#{s}/libtool/config" cp ["#{d}/config.guess", "#{d}/config.sub"], "." - elsif MacOS.version == :leopard + elsif MacOS.version <= :leopard cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config.*"], "." else cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config/config.*"], "." diff --git a/Library/Formula/wget.rb b/Library/Formula/wget.rb index 6dbbf7115..fe8697dbf 100644 --- a/Library/Formula/wget.rb +++ b/Library/Formula/wget.rb @@ -14,7 +14,7 @@ class Wget < Formula option "enable-iri", "Enable iri support" option "enable-debug", "Build with debug support" - depends_on "openssl" if MacOS.version == :leopard + depends_on "openssl" if MacOS.version <= :leopard depends_on "libidn" if build.include? "enable-iri" if build.head? diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb index 14540c6ef..b4e06d3a6 100644 --- a/Library/Formula/wine.rb +++ b/Library/Formula/wine.rb @@ -106,7 +106,7 @@ class Wine < Formula --with-x --x-include=#{MacOS::X11.include} --x-lib=#{MacOS::X11.lib}] - args << "--disable-win16" if MacOS.version == :leopard or ENV.compiler == :clang + args << "--disable-win16" if MacOS.version <= :leopard or ENV.compiler == :clang # 64-bit builds of mpg123 are incompatible with 32-bit builds of Wine args << "--without-mpg123" if Hardware.is_64_bit? |