diff options
| author | Adam Vandenberg | 2012-08-23 15:14:08 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2012-08-23 15:14:08 -0700 |
| commit | 3ff7c481bb690495df5d11843870a48f93a3b7ce (patch) | |
| tree | 4e6f316bea22d2b1e8d80d659dfe5e82fc5efb0f /Library/Formula | |
| parent | 37bfe95603993ec19c99aa5f98c0eac9d091d257 (diff) | |
| download | homebrew-3ff7c481bb690495df5d11843870a48f93a3b7ce.tar.bz2 | |
wxmac: use new dsl
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/wxmac.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Library/Formula/wxmac.rb b/Library/Formula/wxmac.rb index 0410813f1..ea984de09 100644 --- a/Library/Formula/wxmac.rb +++ b/Library/Formula/wxmac.rb @@ -17,11 +17,9 @@ class Wxmac < Formula url 'http://sourceforge.net/projects/wxpython/files/wxPython/2.9.4.0/wxPython-src-2.9.4.0.tar.bz2' sha1 'c292cd45b51e29c558c4d9cacf93c4616ed738b9' - def options - [['--no-python', 'Do not build Python bindings']] - end + option 'no-python', 'Do not build Python bindings' - depends_on FrameworkPython.new unless ARGV.include? "--no-python" + depends_on FrameworkPython.new unless build.include? "no-python" def install_wx_python args = [ @@ -52,6 +50,7 @@ class Wxmac < Formula end def install + # need to set with-macosx-version-min to avoid configure defaulting to 10.5 args = [ "--disable-debug", "--prefix=#{prefix}", @@ -69,13 +68,13 @@ class Wxmac < Formula "--enable-webkit", "--enable-svg", "--with-expat", - "--with-macosx-version-min=#{MacOS.version}" # need to set this, to avoid configure defaulting to 10.5 + "--with-macosx-version-min=#{MacOS.version}" ] system "./configure", *args system "make install" - unless ARGV.include? "--no-python" + unless build.include? "no-python" ENV['WXWIN'] = Dir.getwd # We have already downloaded wxPython in a bundle with wxWidgets install_wx_python @@ -85,7 +84,7 @@ class Wxmac < Formula def caveats s = '' fp = FrameworkPython.new - unless ARGV.include? '--no-python' or fp.satisfied? + unless build.include? 'no-python' or fp.satisfied? s += fp.message end |
