aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAdam Vandenberg2013-08-11 21:07:39 -0700
committerAdam Vandenberg2013-09-11 22:05:36 -0700
commit560dee54eab340a5c7f7d81bc58e710c38145012 (patch)
tree90d19ea9b8924dd483009300bcbe94a75997b31c /Library
parent4d7222edaed73cc0006ca6b155d14c3d87c37776 (diff)
downloadhomebrew-560dee54eab340a5c7f7d81bc58e710c38145012.tar.bz2
wine: use resources
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/wine.rb32
1 files changed, 15 insertions, 17 deletions
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 4a92c85e1..b7f122649 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -1,15 +1,5 @@
require 'formula'
-class WineGecko < Formula
- url 'http://downloads.sourceforge.net/wine/wine_gecko-2.21-x86.msi', :using => :nounzip
- sha1 'a514fc4d53783a586c7880a676c415695fe934a3'
-end
-
-class WineMono < Formula
- url 'http://downloads.sourceforge.net/wine/wine-mono-0.0.8.msi', :using => :nounzip
- sha1 'dd349e72249ce5ff981be0e9dae33ac4a46a9f60'
-end
-
# NOTE: When updating Wine, please check Wine-Gecko and Wine-Mono for updates too:
# http://wiki.winehq.org/Gecko
# http://wiki.winehq.org/Mono
@@ -50,6 +40,16 @@ class Wine < Formula
depends_on 'little-cms2'
end
+ resource 'gecko' do
+ url 'http://downloads.sourceforge.net/wine/wine_gecko-2.21-x86.msi', :using => :nounzip
+ sha1 'a514fc4d53783a586c7880a676c415695fe934a3'
+ end
+
+ resource 'mono do'
+ url 'http://downloads.sourceforge.net/wine/wine-mono-0.0.8.msi', :using => :nounzip
+ sha1 'dd349e72249ce5ff981be0e9dae33ac4a46a9f60'
+ end
+
fails_with :llvm do
build 2336
cause 'llvm-gcc does not respect force_align_arg_pointer'
@@ -123,18 +123,16 @@ class Wine < Formula
end
system "make install"
-
- # Don't need Gnome desktop support
- (share/'applications').rmtree
-
- # Download Gecko and Mono once so we don't need to redownload for each prefix
- WineGecko.new('winegecko').brew { (share+'wine/gecko').install Dir["*"] }
- WineMono.new('winemono').brew { (share+'wine/mono').install Dir["*"] }
+ (share/'wine/gecko').install resource('gecko')
+ (share/'wine/mono').install resource('mono')
# Use a wrapper script, so rename wine to wine.bin
# and name our startup script wine
mv bin/'wine', bin/'wine.bin'
(bin/'wine').write(wine_wrapper)
+
+ # Don't need Gnome desktop support
+ (share/'applications').rmtree
end
def caveats