Skip to content
This repository
Browse code

Merge remote-tracking branch 'Homebrew/master'

Conflicts:
	Library/Contributions/cmd/brew-pull.rb
	Library/Formula/git.rb
	Library/Formula/qpdf.rb
	Library/Formula/uwsgi.rb
	Library/Homebrew/cmd/doctor.rb
	Library/Homebrew/cmd/info.rb
	Library/Homebrew/cmd/tap.rb
	Library/Homebrew/cmd/update.rb
	Library/Homebrew/keg.rb
	Library/Homebrew/os/mac/xcode.rb
commit daed778cb377105416494b7dd0dc801a643f9a2c 2 parents b02930b + 54ab53b
Misty De Meo authored

Showing 675 changed files with 2,630 additions and 1,274 deletions. Show diff stats Hide diff stats

  1. +1 0  Library/Aliases/boot2docker-cli
  2. +0 1  Library/Contributions/brew_fish_completion.fish
  3. +15 15 Library/Contributions/cmd/brew-aspell-dictionaries.rb
  4. +10 1 Library/Contributions/cmd/brew-gist-logs.rb
  5. +27 12 Library/Contributions/cmd/brew-pull.rb
  6. +17 14 Library/Contributions/cmd/brew-test-bot.rb
  7. +18 0 Library/Contributions/cmd/brew-versions.rb
  8. +15 2 Library/Contributions/cmd/brew-which.rb
  9. +1 1  Library/Contributions/example-formula.rb
  10. +0 7 Library/Contributions/manpages/brew.1.md
  11. +7 0 Library/Formula/aalib.rb
  12. +10 4 Library/Formula/abcm2ps.rb
  13. +3 3 Library/Formula/abcmidi.rb
  14. +8 2 Library/Formula/ace.rb
  15. +9 2 Library/Formula/acpica.rb
  16. +2 2 Library/Formula/activemq.rb
  17. +5 5 Library/Formula/adobe-air-sdk.rb
  18. +9 4 Library/Formula/advancecomp.rb
  19. +7 0 Library/Formula/afflib.rb
  20. +10 1 Library/Formula/afio.rb
  21. +10 1 Library/Formula/aggregate.rb
  22. +2 2 Library/Formula/aha.rb
  23. +9 2 Library/Formula/align.rb
  24. +4 2 Library/Formula/alure.rb
  25. +14 0 Library/Formula/amtterm.rb
  26. +8 2 Library/Formula/android-ndk.rb
  27. +23 7 Library/Formula/android-sdk.rb
  28. +5 5 Library/Formula/ansible.rb
  29. +9 2 Library/Formula/ansifilter.rb
  30. +12 0 Library/Formula/ant.rb
  31. +2 2 Library/Formula/antlr.rb
  32. +3 2 Library/Formula/apache-forrest.rb
  33. +3 3 Library/Formula/apache-spark.rb
  34. +9 1 Library/Formula/apachetop.rb
  35. +0 131 Library/Formula/aplus.rb
  36. +1 0  Library/Formula/apollo.rb
  37. +46 45 Library/Formula/appscale-tools.rb
  38. +8 2 Library/Formula/apt-cacher-ng.rb
  39. +20 4 Library/Formula/aqbanking.rb
  40. +5 5 Library/Formula/arangodb.rb
  41. +8 2 Library/Formula/arp-scan.rb
  42. +15 5 Library/Formula/arping.rb
  43. +9 2 Library/Formula/arpoison.rb
  44. +3 46 Library/Formula/assimp.rb
  45. +36 239 Library/Formula/aubio.rb
  46. +15 3 Library/Formula/autogen.rb
  47. +3 3 Library/Formula/basex.rb
  48. +2 21 Library/Formula/bbcp.rb
  49. +10 8 Library/Formula/bdw-gc.rb
  50. +2 2 Library/Formula/bear.rb
  51. +2 2 Library/Formula/betty.rb
  52. +4 5 Library/Formula/bind.rb
  53. +1 1  Library/Formula/binwalk.rb
  54. +28 0 Library/Formula/blink1.rb
  55. +45 6 Library/Formula/boost.rb
  56. +25 5 Library/Formula/boot2docker.rb
  57. +8 3 Library/Formula/bro.rb
  58. +3 3 Library/Formula/calc.rb
  59. +2 2 Library/Formula/cassandra.rb
  60. +36 8 Library/Formula/cdrtools.rb
  61. +2 10 Library/Formula/cfengine.rb
  62. +15 15 Library/Formula/cfitsio.rb
  63. +41 0 Library/Formula/cgrep.rb
  64. +4 4 Library/Formula/check.rb
  65. +35 0 Library/Formula/check_postgres.rb
  66. +87 2 Library/Formula/chibi-scheme.rb
  67. +8 2 Library/Formula/chicken.rb
  68. +7 0 Library/Formula/chmlib.rb
  69. +8 3 Library/Formula/clamav.rb
  70. +5 5 Library/Formula/clib.rb
  71. +7 0 Library/Formula/cln.rb
  72. +7 7 Library/Formula/clojurescript.rb
  73. +5 6 Library/Formula/cmake.rb
  74. +0 13 Library/Formula/connect.rb
  75. +7 0 Library/Formula/cpptest.rb
  76. +6 0 Library/Formula/cracklib.rb
  77. +4 4 Library/Formula/crunch.rb
  78. +1 1  Library/Formula/csv-fix.rb
  79. +35 7 Library/Formula/cuetools.rb
  80. +8 8 Library/Formula/cutter.rb
  81. +11 11 Library/Formula/cyassl.rb
  82. +9 6 Library/Formula/czmq.rb
  83. +5 5 Library/Formula/d-bus.rb
  84. +5 5 Library/Formula/dar.rb
  85. +5 5 Library/Formula/dart.rb
  86. +1 1  Library/Formula/dcraw.rb
  87. +1 1  Library/Formula/ddar.rb
  88. +18 5 Library/Formula/ddate.rb
  89. +2 2 Library/Formula/direnv.rb
  90. +7 0 Library/Formula/dirmngr.rb
  91. +37 2 Library/Formula/djvulibre.rb
  92. +8 1 Library/Formula/dmenu.rb
  93. +4 5 Library/Formula/docker.rb
  94. +2 2 Library/Formula/drush.rb
  95. +9 1 Library/Formula/dwm.rb
  96. +7 0 Library/Formula/dxflib.rb
  97. +7 0 Library/Formula/dylibbundler.rb
  98. +3 2 Library/Formula/e2fsprogs.rb
  99. +17 0 Library/Formula/elixir-build.rb
  100. +9 3 Library/Formula/elixir.rb
  101. +5 6 Library/Formula/emscripten.rb
  102. +9 9 Library/Formula/erlang.rb
  103. +5 5 Library/Formula/esniper.rb
  104. +5 5 Library/Formula/etcd.rb
  105. +5 5 Library/Formula/etcdctl.rb
  106. +2 2 Library/Formula/euca2ools.rb
  107. +2 2 Library/Formula/exiftool.rb
  108. +2 2 Library/Formula/exim.rb
  109. +5 5 Library/Formula/f3.rb
  110. +14 14 Library/Formula/fail2ban.rb
  111. +5 5 Library/Formula/ffmpeg.rb
  112. +5 5 Library/Formula/fleetctl.rb
  113. +7 6 Library/Formula/freeipmi.rb
  114. +1 1  Library/Formula/frescobaldi.rb
  115. +7 0 Library/Formula/fribidi.rb
  116. +5 5 Library/Formula/fswatch.rb
  117. +3 3 Library/Formula/fuseki.rb
  118. +3 3 Library/Formula/fzf.rb
  119. +2 2 Library/Formula/gcutil.rb
  120. +8 8 Library/Formula/ghostscript.rb
  121. +8 0 Library/Formula/giblib.rb
  122. +2 2 Library/Formula/gifsicle.rb
  123. +18 13 Library/Formula/git.rb
  124. +27 0 Library/Formula/github-release.rb
  125. +2 0  Library/Formula/glib-networking.rb
  126. +6 6 Library/Formula/glm.rb
  127. +2 1  Library/Formula/gnunet.rb
  128. +11 11 Library/Formula/gnupg.rb
  129. +16 9 Library/Formula/gnupg2.rb
  130. +6 0 Library/Formula/gnuplot.rb
  131. +1 0  Library/Formula/gnutls.rb
  132. +6 12 Library/Formula/go.rb
  133. +11 11 Library/Formula/goaccess.rb
  134. +12 5 Library/Formula/gpg-agent.rb
  135. +2 2 Library/Formula/gpm.rb
  136. +4 4 Library/Formula/gputils.rb
  137. +2 8 Library/Formula/gradle.rb
  138. +2 2 Library/Formula/grails.rb
  139. +8 2 Library/Formula/grib-api.rb
  140. +8 2 Library/Formula/groovy.rb
  141. +6 0 Library/Formula/gsettings-desktop-schemas.rb
  142. +2 2 Library/Formula/gssdp.rb
  143. +6 0 Library/Formula/gst-libav.rb
  144. +5 6 Library/Formula/gtk+.rb
  145. +5 2 Library/Formula/gwenhywfar.rb
  146. +2 19 Library/Formula/gwyddion.rb
  147. +7 0 Library/Formula/halibut.rb
  148. +7 1 Library/Formula/hamlib.rb
  149. +10 25 Library/Formula/haproxy.rb
  150. +2 2 Library/Formula/hashpump.rb
  151. +0 42 Library/Formula/hllib.rb
  152. +5 5 Library/Formula/homebank.rb
  153. +46 0 Library/Formula/httpie.rb
  154. +6 6 Library/Formula/httpry.rb
  155. +5 5 Library/Formula/hunspell.rb
  156. +26 0 Library/Formula/ibeacon.rb
  157. +7 0 Library/Formula/id3lib.rb
  158. +2 2 Library/Formula/ievms.rb
  159. +11 2 Library/Formula/ii.rb
  160. +8 0 Library/Formula/imagemagick.rb
  161. +6 0 Library/Formula/imlib2.rb
  162. +16 7 Library/Formula/inkscape.rb
  163. +23 0 Library/Formula/ino.rb
  164. +5 5 Library/Formula/iperf3.rb
  165. +5 5 Library/Formula/ircd-hybrid.rb
  166. +10 1 Library/Formula/ircd-irc2.rb
  167. +5 5 Library/Formula/iso-codes.rb
  168. +2 2 Library/Formula/isync.rb
  169. +3 3 Library/Formula/jboss-forge.rb
  170. +2 2 Library/Formula/jenkins.rb
  171. +1 0  Library/Formula/jq.rb
  172. +2 2 Library/Formula/jruby.rb
  173. +5 5 Library/Formula/juju-quickstart.rb
  174. +7 12 Library/Formula/juju.rb
  175. +8 2 Library/Formula/knot.rb
  176. +6 0 Library/Formula/kytea.rb
  177. +5 5 Library/Formula/l-smash.rb
  178. +7 0 Library/Formula/lastfmlib.rb
  179. +5 5 Library/Formula/lcdf-typetools.rb
  180. +10 3 Library/Formula/leptonica.rb
  181. +5 3 Library/Formula/leveldb.rb
  182. +5 5 Library/Formula/lftp.rb
  183. +7 0 Library/Formula/lib3ds.rb
  184. +7 0 Library/Formula/libaacs.rb
  185. +7 0 Library/Formula/libagg.rb
  186. +7 0 Library/Formula/libantlr3c.rb
  187. +7 0 Library/Formula/libart.rb
  188. +7 0 Library/Formula/libass.rb
  189. +11 4 Library/Formula/libatomic_ops.rb
  190. +56 56 Library/Formula/libav.rb
  191. +7 0 Library/Formula/libbind.rb
  192. +9 2 Library/Formula/libbluray.rb
  193. +7 0 Library/Formula/libbs2b.rb
  194. +11 4 Library/Formula/libbson.rb
  195. +7 0 Library/Formula/libbtbb.rb
  196. +7 0 Library/Formula/libcapn.rb
  197. +7 0 Library/Formula/libcddb.rb
  198. +7 0 Library/Formula/libcdio.rb
  199. +7 0 Library/Formula/libcec.rb
  200. +7 0 Library/Formula/libcello.rb
  201. +7 0 Library/Formula/libcoap.rb
  202. +7 0 Library/Formula/libconfig.rb
  203. +6 0 Library/Formula/libcouchbase.rb
  204. +7 0 Library/Formula/libcroco.rb
  205. +7 0 Library/Formula/libcsv.rb
  206. +7 0 Library/Formula/libcue.rb
  207. +7 0 Library/Formula/libcuefile.rb
  208. +6 0 Library/Formula/libdaemon.rb
  209. +6 0 Library/Formula/libdap.rb
  210. +7 0 Library/Formula/libdc1394.rb
  211. +7 0 Library/Formula/libdiscid.rb
  212. +7 0 Library/Formula/libdlna.rb
  213. +7 0 Library/Formula/libdmtx.rb
  214. +7 0 Library/Formula/libdrawtext.rb
  215. +7 0 Library/Formula/libdshconfig.rb
  216. +6 0 Library/Formula/libdsk.rb
  217. +7 0 Library/Formula/libdv.rb
  218. +7 0 Library/Formula/libdvbpsi.rb
  219. +7 0 Library/Formula/libdvdnav.rb
  220. +7 0 Library/Formula/libechonest.rb
  221. +9 2 Library/Formula/libestr.rb
  222. +42 0 Library/Formula/libetonyek.rb
  223. +7 0 Library/Formula/libev.rb
  224. +2 2 Library/Formula/libevent.rb
  225. +7 0 Library/Formula/libewf.rb
  226. +7 0 Library/Formula/libextractor.rb
  227. +6 0 Library/Formula/libfaketime.rb
  228. +7 0 Library/Formula/libfishsound.rb
  229. +13 6 Library/Formula/libfixbuf.rb
  230. +7 0 Library/Formula/libflowmanager.rb
  231. +7 0 Library/Formula/libfreefare.rb
  232. +7 0 Library/Formula/libfreenect.rb
  233. +6 0 Library/Formula/libftdi.rb
  234. +7 0 Library/Formula/libgee.rb
  235. +6 0 Library/Formula/libgetdata.rb
  236. +7 0 Library/Formula/libgfshare.rb
  237. +9 2 Library/Formula/libgit2.rb
  238. +6 0 Library/Formula/libglade.rb
  239. +7 0 Library/Formula/libglademm.rb
  240. +7 0 Library/Formula/libgnomecanvas.rb
  241. +7 0 Library/Formula/libgnomecanvasmm.rb
  242. +7 0 Library/Formula/libgsm.rb
  243. +6 0 Library/Formula/libgtop.rb
  244. +7 0 Library/Formula/libhid.rb
  245. +6 0 Library/Formula/libical.rb
  246. +7 0 Library/Formula/libicns.rb
  247. +7 0 Library/Formula/libident.rb
  248. +7 0 Library/Formula/libidl.rb
  249. +6 0 Library/Formula/libinfinity.rb
  250. +6 0 Library/Formula/libiptcdata.rb
  251. +7 0 Library/Formula/libiscsi.rb
  252. +6 0 Library/Formula/libkate.rb
  253. +6 0 Library/Formula/libkml.rb
  254. +7 0 Library/Formula/libksba.rb
  255. +15 0 Library/Formula/liblas.rb
  256. +6 0 Library/Formula/liblastfm.rb
  257. +7 0 Library/Formula/liblinear.rb
  258. +6 0 Library/Formula/liblockfile.rb
  259. +7 0 Library/Formula/liblqr.rb
  260. +7 0 Library/Formula/libltc.rb
  261. +6 0 Library/Formula/liblunar.rb
  262. +7 0 Library/Formula/libmaa.rb
  263. +6 15 Library/Formula/libmagic.rb
  264. +7 0 Library/Formula/libmaxminddb.rb
  265. +7 0 Library/Formula/libmetalink.rb
  266. +7 0 Library/Formula/libmikmod.rb
  267. +7 0 Library/Formula/libming.rb
  268. +7 0 Library/Formula/libmms.rb
  269. +7 0 Library/Formula/libmodbus.rb
  270. +6 0 Library/Formula/libmongoclient.rb
  271. +6 0 Library/Formula/libmonome.rb
  272. +7 0 Library/Formula/libmowgli.rb
  273. +6 0 Library/Formula/libmp3splt.rb
  274. +7 0 Library/Formula/libmpd.rb
  275. +7 0 Library/Formula/libmpeg2.rb
  276. +7 0 Library/Formula/libmrss.rb
  277. +47 0 Library/Formula/libmspub.rb
  278. +7 0 Library/Formula/libmtp.rb
  279. +7 0 Library/Formula/libmusicbrainz.rb
  280. +7 0 Library/Formula/libnatpmp.rb
  281. +7 0 Library/Formula/libnids.rb
  282. +7 0 Library/Formula/libntlm.rb
  283. +7 0 Library/Formula/libnxml.rb
  284. +7 0 Library/Formula/liboauth.rb
  285. +44 0 Library/Formula/libodfgen.rb
  286. +6 0 Library/Formula/libofx.rb
  287. +7 0 Library/Formula/liboil.rb
  288. +6 0 Library/Formula/libopendkim.rb
  289. +6 0 Library/Formula/liboping.rb
  290. +7 0 Library/Formula/libosip.rb
  291. +7 0 Library/Formula/libotr.rb
  292. +7 0 Library/Formula/libowfat.rb
  293. +7 0 Library/Formula/libp11.rb
  294. +3 3 Library/Formula/libpano.rb
  295. +7 0 Library/Formula/libpcl.rb
  296. +7 0 Library/Formula/libpgm.rb
  297. +7 0 Library/Formula/libpoker-eval.rb
  298. +7 0 Library/Formula/libpqxx.rb
  299. +7 0 Library/Formula/libpst.rb
  300. +7 0 Library/Formula/libpuzzle.rb
Sorry, we could not display the entire diff because too many files (675) changed.
1  Library/Aliases/boot2docker-cli
1  Library/Contributions/brew_fish_completion.fish
@@ -131,7 +131,6 @@ complete -c brew -s d -l debug -n '__fish_complete_brew_command install' -d "Ope
131 131 complete -c brew -s f -l force -n '__fish_complete_brew_command force' -d "Install formula even if blacklisted"
132 132 complete -c brew -s i -l interactive -n '__fish_complete_brew_command install' -d "Open a subshell to install manually"
133 133 complete -c brew -l git -n '__fish_complete_brew_command install' -d 'Create a git repo (useful for making patches)'
134   -complete -c brew -l fresh -n '__fish_complete_brew_command install' -d "Do not reuse options from previous installs"
135 134 complete -c brew -l build-from-source -n '__fish_complete_brew_command install' -d "Compile from source even if a bottle is provided"
136 135 complete -c brew -l devel -n '__fish_complete_brew_command install' -d "Install the development version"
137 136 complete -c brew -l HEAD -n '__fish_complete_brew_command install' -d "Install the HEAD version"
30 Library/Contributions/cmd/brew-aspell-dictionaries.rb
@@ -4,8 +4,7 @@
4 4
5 5 dict_url = "http://ftpmirror.gnu.org/aspell/dict"
6 6 dict_mirror = "http://ftp.gnu.org/gnu/aspell/dict"
7   -
8   -resources = {}
  7 +languages = {}
9 8
10 9 open("#{dict_url}/0index.html") do |content|
11 10 content.each_line do |line|
@@ -15,22 +14,23 @@
15 14 fields = line.split('"')
16 15 lang, path = fields[1], fields[3]
17 16 lang.gsub!("-", "_")
18   - resources[lang] = path
  17 + languages[lang] = path
19 18 end
20 19 end
21 20
22   -resources.each_pair do |lang, path|
23   - r = Resource.new(lang, "#{dict_url}/#{path}")
24   - r.owner = Formula.factory('aspell')
25   -
26   - nostdout { r.fetch }
27   -
  21 +languages.inject([]) do |resources, (lang, path)|
  22 + r = Resource.new(lang)
  23 + r.owner = Formulary.factory("aspell")
  24 + r.url "#{dict_url}/#{path}"
  25 + r.mirror "#{dict_mirror}/#{path}"
  26 + resources << r
  27 +end.each(&:fetch).each do |r|
28 28 puts <<-EOS
29   - resource '#{lang}' do
30   - url '#{dict_url}/#{path}'
31   - mirror '#{dict_mirror}/#{path}'
32   - sha1 '#{r.cached_download.sha1}'
33   - end
  29 + resource "#{r.name}" do
  30 + url "#{r.url}"
  31 + mirror "#{r.mirrors.first}"
  32 + sha1 "#{r.cached_download.sha1}"
  33 + end
34 34
35   -EOS
  35 + EOS
36 36 end
11 Library/Contributions/cmd/brew-gist-logs.rb
@@ -76,7 +76,16 @@ def post path, data
76 76 request.body = Utils::JSON.dump(data)
77 77 response = http.request(request)
78 78 raise HTTP_Error, response if response.code != '201'
79   - Utils::JSON.load(response.body)
  79 +
  80 + if !response.body.respond_to?(:force_encoding)
  81 + body = response.body
  82 + elsif response["Content-Type"].downcase == "application/json; charset=utf-8"
  83 + body = response.body.dup.force_encoding(Encoding::UTF_8)
  84 + else
  85 + body = response.body.encode(Encoding::UTF_8, :undef => :replace)
  86 + end
  87 +
  88 + Utils::JSON.load(body)
80 89 end
81 90
82 91 class HTTP_Error < RuntimeError
39 Library/Contributions/cmd/brew-pull.rb
@@ -20,6 +20,7 @@ def tap arg
20 20 ARGV.named.each do |arg|
21 21 if arg.to_i > 0
22 22 url = 'https://github.com/mistydemeo/tigerbrew/pull/' + arg
  23 + issue = arg
23 24 else
24 25 url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX
25 26 unless url_match
@@ -28,6 +29,7 @@ def tap arg
28 29 end
29 30
30 31 url = url_match[0]
  32 + issue = url_match[4]
31 33 end
32 34
33 35 if tap_name = tap(url)
@@ -39,8 +41,6 @@ def tap arg
39 41 Dir.chdir HOMEBREW_REPOSITORY
40 42 end
41 43
42   - issue = arg.to_i > 0 ? arg.to_i : url_match[4]
43   -
44 44 if ARGV.include? '--bottle'
45 45 raise 'No pull request detected!' unless issue
46 46 url = "https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"
@@ -66,25 +66,40 @@ def tap arg
66 66 else
67 67 patch_args << '--whitespace=fix'
68 68 end
  69 +
  70 + # Fall back to three-way merge if patch does not apply cleanly
  71 + patch_args << "-3"
69 72 patch_args << patchpath
70 73
71 74 begin
72 75 safe_system 'git', 'am', *patch_args
73   - rescue => e
  76 + rescue ErrorDuringExecution
74 77 system 'git', 'am', '--abort'
75 78 odie 'Patch failed to apply: aborted.'
76 79 end
77 80
78 81 changed_formulae = []
79 82
80   - `git diff #{revision}.. --name-status`.each_line do |line|
  83 + if tap_dir
  84 + formula_dir = %w[Formula HomebrewFormula].find { |d| tap_dir.join(d).directory? } || ""
  85 + else
  86 + formula_dir = "Library/Formula"
  87 + end
  88 +
  89 + Utils.popen_read(
  90 + "git", "diff-tree", "-r", "--name-status",
  91 + revision, "HEAD", "--", formula_dir, &:read
  92 + ).each_line do |line|
81 93 status, filename = line.split
82 94 # Don't try and do anything to removed files.
83   - if (status =~ /A|M/) && (filename =~ %r{Formula/.+\.rb$}) || tap(url)
84   - formula_name = File.basename(filename, '.rb')
85   - formula = Formula[formula_name] rescue nil
86   - next unless formula
87   - changed_formulae << formula
  95 + if status == "A" || status == "M"
  96 + name = File.basename(filename, ".rb")
  97 +
  98 + begin
  99 + changed_formulae << Formula[name]
  100 + rescue FormulaUnavailableError
  101 + next
  102 + end
88 103 end
89 104 end
90 105
@@ -115,13 +130,13 @@ def tap arg
115 130 end
116 131
117 132 ohai 'Patch changed:'
118   - safe_system 'git', '--no-pager', 'diff', "#{revision}..", '--stat'
  133 + safe_system "git", "diff-tree", "-r", "--stat", revision, "HEAD"
119 134
120 135 if ARGV.include? '--install'
121 136 changed_formulae.each do |f|
122   - ohai "Installing #{formula}"
  137 + ohai "Installing #{f.name}"
123 138 install = f.installed? ? 'upgrade' : 'install'
124   - safe_system 'brew', install, '--debug', '--fresh', formula
  139 + safe_system 'brew', install, '--debug', f.name
125 140 end
126 141 end
127 142 end
31 Library/Contributions/cmd/brew-test-bot.rb
@@ -304,7 +304,7 @@ def formula formula
304 304 test "brew", "uses", formula
305 305 dependencies = `brew deps #{formula}`.split("\n")
306 306 dependencies -= `brew list`.split("\n")
307   - formula_object = Formula.factory(formula)
  307 + formula_object = Formulary.factory(formula)
308 308 return unless satisfied_requirements? formula_object
309 309
310 310 installed_gcc = false
@@ -326,7 +326,7 @@ def formula formula
326 326 formula_fetch_options << "--build-bottle" unless ARGV.include? "--no-bottle"
327 327 formula_fetch_options << "--force" if ARGV.include? "--cleanup"
328 328 formula_fetch_options << formula
329   - test "brew", "fetch", formula, "--retry", *formula_fetch_options
  329 + test "brew", "fetch", "--retry", *formula_fetch_options
330 330 test "brew", "uninstall", "--force", formula if formula_object.installed?
331 331 install_args = %w[--verbose]
332 332 install_args << "--build-bottle" unless ARGV.include? "--no-bottle"
@@ -471,8 +471,8 @@ def run
471 471 raise "Missing Jenkins variables!" unless jenkins and job and id
472 472
473 473 ARGV << '--verbose'
474   - copied = system "cp #{jenkins}/jobs/\"#{job}\"/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.* ."
475   - exit unless copied
  474 + cp_args = Dir["#{jenkins}/jobs/#{job}/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.*"] + ["."]
  475 + exit unless system "cp", *cp_args
476 476
477 477 ENV["GIT_COMMITTER_NAME"] = "BrewTestBot"
478 478 ENV["GIT_COMMITTER_EMAIL"] = "brew-test-bot@googlegroups.com"
@@ -482,28 +482,31 @@ def run
482 482
483 483 system "git am --abort 2>/dev/null"
484 484 system "git rebase --abort 2>/dev/null"
485   - safe_system "git checkout -f master"
486   - safe_system "git reset --hard origin/master"
487   - safe_system "brew update"
  485 + safe_system "git", "checkout", "-f", "master"
  486 + safe_system "git", "reset", "--hard", "origin/master"
  487 + safe_system "brew", "update"
488 488
489 489 if ARGV.include? '--ci-pr-upload'
490   - safe_system "brew pull --clean #{pr}"
  490 + safe_system "brew", "pull", "--clean", pr
491 491 end
492 492
493 493 ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"]
494 494 ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"]
495   - safe_system "brew bottle --merge --write *.bottle*.rb"
  495 + safe_system "brew", "bottle", "--merge", "--write", *Dir["*.bottle*.rb"]
496 496
497 497 remote = "git@github.com:BrewTestBot/homebrew.git"
498 498 tag = pr ? "pr-#{pr}" : "testing-#{number}"
499   - safe_system "git push --force #{remote} master:master :refs/tags/#{tag}"
  499 + safe_system "git", "push", "--force", remote, "master:master", ":refs/tags/#{tag}"
500 500
501 501 path = "/home/frs/project/m/ma/machomebrew/Bottles/"
502 502 url = "BrewTestBot,machomebrew@frs.sourceforge.net:#{path}"
503   - options = "--partial --progress --human-readable --compress"
504   - safe_system "rsync #{options} *.bottle*.tar.gz #{url}"
505   - safe_system "git tag --force #{tag}"
506   - safe_system "git push --force #{remote} refs/tags/#{tag}"
  503 +
  504 + rsync_args = %w[--partial --progress --human-readable --compress]
  505 + rsync_args += Dir["*.bottle*.tar.gz"] + [url]
  506 +
  507 + safe_system "rsync", *rsync_args
  508 + safe_system "git", "tag", "--force", tag
  509 + safe_system "git", "push", "--force", remote, "refs/tags/#{tag}"
507 510 exit
508 511 end
509 512
18 Library/Contributions/cmd/brew-versions.rb
... ... @@ -0,0 +1,18 @@
  1 +require "formula_versions"
  2 +
  3 +raise "Please `brew update` first" unless (HOMEBREW_REPOSITORY/".git").directory?
  4 +raise FormulaUnspecifiedError if ARGV.named.empty?
  5 +
  6 +opoo <<-EOS.undent
  7 + brew-versions is unsupported and may be removed soon.
  8 + Please use the homebrew-versions tap instead:
  9 + https://github.com/Homebrew/homebrew-versions
  10 +EOS
  11 +ARGV.formulae.each do |f|
  12 + versions = FormulaVersions.new(f)
  13 + path = versions.repository_path
  14 + versions.each do |version, rev|
  15 + print "#{Tty.white}#{version.to_s.ljust(8)}#{Tty.reset} "
  16 + puts "git checkout #{rev} #{path}"
  17 + end
  18 +end
17 Library/Contributions/cmd/brew-which.rb
... ... @@ -1,8 +1,21 @@
1 1 require 'extend/pathname'
2 2
3   -
4   -module Homebrew extend self
  3 +module Homebrew
5 4 def which_versions which_brews=nil
  5 + opoo <<-EOS.undent
  6 + brew-which is unsupported and may be removed soon.
  7 +
  8 + To see which versions are installed:
  9 + brew list --versions
  10 +
  11 + To query formula information see:
  12 + https://github.com/Homebrew/homebrew/wiki/Querying-Brew
  13 +
  14 + For other uses please send a message to the mailing list describing
  15 + your use of this command, so a suggestion can be recommended or
  16 + implemented.
  17 + EOS
  18 +
6 19 brew_links = Array.new
7 20 version_map = Hash.new
8 21
2  Library/Contributions/example-formula.rb
@@ -250,7 +250,7 @@ def install
250 250 # patch you have to resort to `inreplace`, because in the patch
251 251 # you don't have access to any var defined by the formula. Only
252 252 # HOMEBREW_PREFIX is available in the embedded patch.
253   - # inreplace supports reg. exes.
  253 + # inreplace supports regular expressions.
254 254 inreplace "somefile.cfg", /look[for]what?/, "replace by #{bin}/tool"
255 255
256 256 # To call out to the system, we use the `system` method and we prefer
7 Library/Contributions/manpages/brew.1.md
Source Rendered
@@ -397,13 +397,6 @@ Note that these flags should only appear after a command.
397 397 cases where `formula` is used by development or HEAD build, pass
398 398 `--devel` or `--HEAD`.
399 399
400   - * `versions [--compact]` <formulae>:
401   - List previous versions of <formulae>, along with a command to checkout
402   - each version.
403   -
404   - If `--compact` is passed, show all options on a single line separated by
405   - spaces.
406   -
407 400 * `--cache`:
408 401 Display Homebrew's download cache. See also `HOMEBREW_CACHE`.
409 402
7 Library/Formula/aalib.rb
@@ -5,6 +5,13 @@ class Aalib < Formula
5 5 url 'https://downloads.sourceforge.net/aa-project/aalib-1.4rc5.tar.gz'
6 6 sha1 'a23269e950a249d2ef93625837cace45ddbce03b'
7 7
  8 + bottle do
  9 + cellar :any
  10 + sha1 "91868f0ce9e9bbcd9a81206ad925a571144ac866" => :mavericks
  11 + sha1 "0e5d656547a69220d3f146e00ea82747d0f33aee" => :mountain_lion
  12 + sha1 "3e46ae8165db31c9c87a7bb344c09211c800153e" => :lion
  13 + end
  14 +
8 15 # Fix malloc/stdlib issue on OS X
9 16 # Fix underquoted definition of AM_PATH_AALIB in aalib.m4
10 17 patch :DATA
14 Library/Formula/abcm2ps.rb
@@ -4,13 +4,19 @@ class Abcm2ps < Formula
4 4 homepage "http://moinejf.free.fr"
5 5
6 6 stable do
7   - url "http://moinejf.free.fr/abcm2ps-7.8.2.tar.gz"
8   - sha1 "88b18e5077e03c141ef3269941e09d5fd09ee630"
  7 + url "http://moinejf.free.fr/abcm2ps-7.8.4.tar.gz"
  8 + bottle do
  9 + sha1 "ef6a4248ccf543f3394561d056ef8c7941e1cf59" => :mavericks
  10 + sha1 "3125f3f4c279ff6233330153a166905c22be78b6" => :mountain_lion
  11 + sha1 "e87ee5016f2b2773b02664fbee362c3a557966a7" => :lion
  12 + end
  13 +
  14 + sha1 "b910a048fe94500d3da52e9fe250d2835dc5343c"
9 15 end
10 16
11 17 devel do
12   - url "http://moinejf.free.fr/abcm2ps-8.0.3.tar.gz"
13   - sha1 "eee71d87acdc62ba0e1c74b75adb6ae092b776be"
  18 + url "http://moinejf.free.fr/abcm2ps-8.1.2.tar.gz"
  19 + sha1 "b60626ef21b269fa18ec3dc8ba11354d798ddded"
14 20 end
15 21
16 22 depends_on "pango" => :optional
6 Library/Formula/abcmidi.rb
@@ -2,9 +2,9 @@
2 2
3 3 class Abcmidi < Formula
4 4 homepage 'http://www.ifdo.ca/~seymour/runabc/top.html'
5   - url 'http://www.ifdo.ca/~seymour/runabc/abcMIDI-2013-11-26.zip'
6   - version '2013-11-26'
7   - sha1 '3e743b2a89404ad5a7d7f51c48cc2a32ba50654b'
  5 + url 'http://www.ifdo.ca/~seymour/runabc/abcMIDI-2014-04-24.zip'
  6 + version '2014-04-24'
  7 + sha1 'be1922399afacb85a2f61296d86fbec5faab993b'
8 8
9 9 def install
10 10 # configure creates a "Makefile" file. A "makefile" file already exist in
10 Library/Formula/ace.rb
@@ -2,8 +2,14 @@
2 2
3 3 class Ace < Formula
4 4 homepage "http://www.cse.wustl.edu/~schmidt/ACE.html"
5   - url "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.6.tar.bz2"
6   - sha1 "245cf37f60a92bf912ae2a008d73587a8d19462e"
  5 + url "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.2.7.tar.bz2"
  6 + sha1 "b2be560c84d87f3bb8577caf581e519d0c76ceae"
  7 +
  8 + bottle do
  9 + sha1 "adadd2939fb8f973aff0e96e97d82cf76ddb490e" => :mavericks
  10 + sha1 "f1b7a5454d4e1b0b8cc9eb8099b059532507730d" => :mountain_lion
  11 + sha1 "1b9dbe41211d0a96ee7634c2d05ab5a816029f74" => :lion
  12 + end
7 13
8 14 def install
9 15 # ACE has two methods of compilation, "traditional" and ./configure.
11 Library/Formula/acpica.rb
@@ -3,8 +3,15 @@
3 3 class Acpica < Formula
4 4 homepage "https://www.acpica.org/"
5 5 head "https://github.com/acpica/acpica.git"
6   - url "https://acpica.org/sites/acpica/files/acpica-unix2-20140424.tar.gz"
7   - sha1 "6ed59f9099b73dfe901a811c4d5bf333da6fb53f"
  6 + url "https://acpica.org/sites/acpica/files/acpica-unix2-20140627.tar.gz"
  7 + sha1 "091660ae47067b28b68ac843f06909f5183d15cc"
  8 +
  9 + bottle do
  10 + cellar :any
  11 + sha1 "355fadcc05a553d6ce9e07ff3093c6656e9b3270" => :mavericks
  12 + sha1 "fd2dfabd50acb1952273d7d8981737f65112359e" => :mountain_lion
  13 + sha1 "f9969f8a4c60c82de1c1f51b96d32146e4f94a22" => :lion
  14 + end
8 15
9 16 def install
10 17 ENV.deparallelize
4 Library/Formula/activemq.rb
@@ -2,8 +2,8 @@
2 2
3 3 class Activemq < Formula
4 4 homepage 'http://activemq.apache.org/'
5   - url 'http://www.apache.org/dyn/closer.cgi?path=/activemq/5.9.1/apache-activemq-5.9.1-bin.tar.gz'
6   - sha1 '03c0730e8de406ad8dc243f5834bf5b74492c5e8'
  5 + url 'http://www.apache.org/dyn/closer.cgi?path=/activemq/5.10.0/apache-activemq-5.10.0-bin.tar.gz'
  6 + sha1 'e08179216b4c7cbcd2024716c62c51434481fabf'
7 7
8 8 skip_clean 'libexec/webapps/admin/WEB-INF/jsp'
9 9
10 Library/Formula/adobe-air-sdk.rb
@@ -4,16 +4,16 @@
4 4 # https://helpx.adobe.com/air/kb/archived-air-sdk-version.html
5 5 class AdobeAirSdk < Formula
6 6 homepage "http://adobe.com/products/air/sdk"
7   - version "13.0"
  7 + version "14.0"
8 8
9 9 option "with-flex-support", "Do not download the new compiler with the SDK."
10 10
11 11 if build.without? "flex-support"
12   - url "http://airdownload.adobe.com/air/mac/download/13.0/AIRSDK_Compiler.tbz2"
13   - sha1 "b3f15e01bb4f2ec4d82151257672156aa49f3ba8"
  12 + url "http://airdownload.adobe.com/air/mac/download/14.0/AIRSDK_Compiler.tbz2"
  13 + sha1 "e88f65c5c813f8000cb170cec1a7689695d2e797"
14 14 else
15   - url "http://airdownload.adobe.com/air/mac/download/13.0/AdobeAIRSDK.tbz2"
16   - sha1 "dfbdde7e7de31804ad3d74df9f0ba71c5cf5c2ad"
  15 + url "http://airdownload.adobe.com/air/mac/download/14.0/AdobeAIRSDK.tbz2"
  16 + sha1 "ffc5f4093feb5a1cf2efcb8854f2328593db828c"
17 17 end
18 18
19 19 def install
13 Library/Formula/advancecomp.rb
... ... @@ -1,13 +1,18 @@
1   -require 'formula'
  1 +require "formula"
2 2
3 3 class Advancecomp < Formula
4   - homepage 'http://advancemame.sourceforge.net/comp-readme.html'
5   - url 'https://downloads.sourceforge.net/advancemame/advancecomp-1.18.tar.gz'
6   - sha1 'e5b00dc75cd6db4dfb1886968baf26a3a450ef7e'
  4 + homepage "http://advancemame.sourceforge.net/comp-readme.html"
  5 + url "https://downloads.sourceforge.net/project/advancemame/advancecomp/1.19/advancecomp-1.19.tar.gz"
  6 + sha256 "d594c50c3da356aa961f75b00e958a4ed1e142c6530b42926092e46419af3047"
7 7
8 8 def install
9 9 system "./configure", "--disable-debug", "--disable-dependency-tracking",
10 10 "--prefix=#{prefix}", "--mandir=#{man}"
11 11 system "make install"
12 12 end
  13 +
  14 + test do
  15 + system bin/"advdef", "--version"
  16 + system bin/"advpng", "--version"
  17 + end
13 18 end
7 Library/Formula/afflib.rb
@@ -5,6 +5,13 @@ class Afflib < Formula
5 5 url 'https://github.com/simsong/AFFLIBv3/archive/v3.7.4.tar.gz'
6 6 sha1 '589dae6f8439e97ab080026701cd0caa0636ac22'
7 7
  8 + bottle do
  9 + cellar :any
  10 + sha1 "c72b3fd14e5d7d5095c4d46c6c77619315112a20" => :mavericks
  11 + sha1 "28b07c6caae8ef85348b51ce80561fe10392ad8b" => :mountain_lion
  12 + sha1 "3af09ce1f21443b5a072979d97f7cc41035c3643" => :lion
  13 + end
  14 +
8 15 depends_on "autoconf" => :build
9 16 depends_on "automake" => :build
10 17 depends_on "libtool" => :build
11 Library/Formula/afio.rb
... ... @@ -1,10 +1,19 @@
1 1 require 'formula'
2 2
3 3 class Afio < Formula
4   - homepage 'http://freecode.com/projects/afio/'
  4 + homepage 'http://members.chello.nl/~k.holtman/afio.html'
5 5 url 'http://members.chello.nl/~k.holtman/afio-2.5.1.tgz'
6 6 sha1 'bff6b9a147dc5b0e6bd7f1a76f0b84e4dd9a7dc9'
7 7
  8 + bottle do
  9 + cellar :any
  10 + sha1 "1a3bbc0e6d6ff0926a75141af4204a6f167af533" => :mavericks
  11 + sha1 "ffda2ae983cf6e1212aff8f4933799f124ec136f" => :mountain_lion
  12 + sha1 "68ecadc2fc7e8dd268ac9e6a63fc12927d60f897" => :lion
  13 + end
  14 +
  15 + #Note - The Freecode website is being no longer being updated and alternative links should be found from now on.
  16 +
8 17 option "bzip2", "Use bzip2(1) instead of gzip(1) for compression/decompression"
9 18
10 19 def install
11 Library/Formula/aggregate.rb
... ... @@ -1,10 +1,19 @@
1 1 require 'formula'
2 2
3 3 class Aggregate < Formula
4   - homepage 'http://freshmeat.net/projects/aggregate/'
  4 + homepage 'http://freecode.com/projects/aggregate/'
5 5 url 'ftp://ftp.isc.org/isc/aggregate/aggregate-1.6.tar.gz'
6 6 sha1 '13420baf4f3f93dbed3c380ab6cca175609c5d7d'
7 7
  8 + bottle do
  9 + cellar :any
  10 + sha1 "94eb9307d2f12e20663b6c47e3a60317ab7ac6e6" => :mavericks
  11 + sha1 "b2f030ab1484299fa1fffbcfbcd4e84e8726e1bc" => :mountain_lion
  12 + sha1 "c2a27bf04eb3efcafbf4b271e7cfb7b520eac7f4" => :lion
  13 + end
  14 +
  15 + # Note - Freecode is no longer being updated & an alternative homepage should be found if possible.
  16 +
8 17 conflicts_with 'crush-tools', :because => 'both install an `aggregate` binary'
9 18
10 19 def install
4 Library/Formula/aha.rb
@@ -2,8 +2,8 @@
2 2
3 3 class Aha < Formula
4 4 homepage "https://github.com/theZiz/aha"
5   - url "https://github.com/theZiz/aha/archive/0.4.7.1.tar.gz"
6   - sha1 "d428499b5e27bd514ca0ae6826a348b233534f59"
  5 + url "https://github.com/theZiz/aha/archive/0.4.7.2.tar.gz"
  6 + sha1 "09933fddb02b3129a690eb3d7d140edb97ac0627"
7 7
8 8 def install
9 9 system "make"
11 Library/Formula/align.rb
@@ -2,8 +2,15 @@
2 2
3 3 class Align < Formula
4 4 homepage 'http://www.cs.indiana.edu/~kinzler/align/'
5   - url 'http://www.cs.indiana.edu/~kinzler/align/align-1.7.2.tgz'
6   - sha1 '6cae78d7df4d0a4aae654c37d68b9501810d9bf0'
  5 + url 'http://www.cs.indiana.edu/~kinzler/align/align-1.7.3.tgz'
  6 + sha1 'fca5e53a7a3a95e740e7d12941f4edbee78ca084'
  7 +
  8 + bottle do
  9 + cellar :any
  10 + sha1 "6883eab5710385e8890fb52a8a6ac248f6bb29b7" => :mavericks
  11 + sha1 "12b51ccae39d06623f7475e289fd6eb6dbb89d7f" => :mountain_lion
  12 + sha1 "58e739c1df5c04ef37303c822fd4c859bf9e89eb" => :lion
  13 + end
7 14
8 15 def install
9 16 system 'make', 'install', "BINDIR=#{bin}"
6 Library/Formula/alure.rb
@@ -18,8 +18,10 @@ def install
18 18 # fix a broken include flags line, which fixes a build error.
19 19 # Not reported upstream.
20 20 # https://github.com/Homebrew/homebrew/pull/6368
21   - inreplace 'CMakeLists.txt', '${VORBISFILE_CFLAGS}',
22   - %x[pkg-config --cflags vorbisfile].chomp
  21 + if build.with? "libvorbis"
  22 + inreplace "CMakeLists.txt", "${VORBISFILE_CFLAGS}",
  23 + %x[pkg-config --cflags vorbisfile].chomp
  24 + end
23 25
24 26 cd "build" do
25 27 system "cmake", "..", *std_cmake_args
14 Library/Formula/amtterm.rb
@@ -6,7 +6,21 @@ class Amtterm < Formula
6 6 url 'http://www.kraxel.org/releases/amtterm/amtterm-1.3.tar.gz'
7 7 sha1 'cfd199cc870f48a59caa89408b039239eab85322'
8 8
  9 + resource "SOAP::Lite" do
  10 + url "http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/SOAP-Lite-1.11.tar.gz"
  11 + sha1 "b9e22c82a240737e87d6c720998feadcfb583768"
  12 + end
  13 +
9 14 def install
  15 + ENV.prepend_create_path "PERL5LIB", libexec+"lib/perl5"
  16 +
  17 + resource("SOAP::Lite").stage do
  18 + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}"
  19 + system "make"
  20 + system "make", "install"
  21 + end
  22 +
10 23 system "make","prefix=#{prefix}", "install"
  24 + bin.env_script_all_files(libexec+"bin", :PERL5LIB => ENV["PERL5LIB"])
11 25 end
12 26 end
10 Library/Formula/android-ndk.rb
@@ -2,9 +2,15 @@
2 2
3 3 class AndroidNdk < Formula
4 4 homepage 'http://developer.android.com/sdk/ndk/index.html'
5   - url 'http://dl.google.com/android/ndk/android-ndk-r9d-darwin-x86.tar.bz2'
6 5 version 'r9d'
7   - sha1 '91ac410a24ad6d1fc67b5161294a4a5cb78b2975'
  6 +
  7 + if MacOS.prefer_64_bit?
  8 + url "http://dl.google.com/android/ndk/android-ndk-r9d-darwin-x86_64.tar.bz2"
  9 + sha1 'd0a8471555be57899c67aa6b61db5bca9db2e8ea'
  10 + else
  11 + url "http://dl.google.com/android/ndk/android-ndk-r9d-darwin-x86.tar.bz2"
  12 + sha1 '91ac410a24ad6d1fc67b5161294a4a5cb78b2975'
  13 + end
8 14
9 15 depends_on 'android-sdk'
10 16
30 Library/Formula/android-sdk.rb
@@ -2,9 +2,9 @@
2 2
3 3 class AndroidSdk < Formula
4 4 homepage 'http://developer.android.com/index.html'
5   - url 'http://dl.google.com/android/android-sdk_r22.6.2-macosx.zip'
6   - version '22.6.2'
7   - sha1 '6abb9cf56529a40ac29fa70a95f5741fa1ae0f86'
  5 + url 'http://dl.google.com/android/android-sdk_r23.0.2-macosx.zip'
  6 + version '23.0.2'
  7 + sha1 '1ef502577ca4403ae81f3d68c1813995cb412354'
8 8
9 9 conflicts_with 'android-platform-tools',
10 10 :because => "The Android Platform-Tools need to be installed as part of the SDK."
@@ -16,15 +16,15 @@ class AndroidSdk < Formula
16 16
17 17 # Version of the android-build-tools the wrapper scripts reference.
18 18 def build_tools_version
19   - "19.0.3"
  19 + "20.0.0"
20 20 end
21 21
22 22 def install
23 23 prefix.install 'tools', 'SDK Readme.txt' => 'README'
24 24
25   - %w[android apkbuilder ddms dmtracedump draw9patch etc1tool emulator
26   - emulator-arm emulator-x86 hierarchyviewer hprof-conv lint mksdcard
27   - monitor monkeyrunner traceview zipalign].each do |tool|
  25 + %w[android ddms draw9patch emulator
  26 + emulator-arm emulator-x86 hierarchyviewer lint mksdcard
  27 + monitor monkeyrunner traceview].each do |tool|
28 28 (bin/tool).write <<-EOS.undent
29 29 #!/bin/bash
30 30 TOOL="#{prefix}/tools/#{tool}"
@@ -32,6 +32,22 @@ def install
32 32 EOS
33 33 end
34 34
  35 + %w[zipalign].each do |tool|
  36 + (bin/tool).write <<-EOS.undent
  37 + #!/bin/bash
  38 + TOOL="#{prefix}/build-tools/#{build_tools_version}/#{tool}"
  39 + exec "$TOOL" "$@"
  40 + EOS
  41 + end
  42 +
  43 + %w[dmtracedump etc1tool hprof-conv].each do |tool|
  44 + (bin/tool).write <<-EOS.undent
  45 + #!/bin/bash
  46 + TOOL="#{prefix}/platform-tools/#{tool}"
  47 + exec "$TOOL" "$@"
  48 + EOS
  49 + end
  50 +
35 51 # this is data that should be preserved across upgrades, but the Android
36 52 # SDK isn't too smart, so we still have to symlink it back into its tree.
37 53 %w[platforms samples temp add-ons sources system-images extras].each do |d|
10 Library/Formula/ansible.rb
@@ -2,15 +2,15 @@
2 2
3 3 class Ansible < Formula
4 4 homepage 'http://www.ansible.com/home'
5   - url 'http://releases.ansible.com/ansible/ansible-1.6.3.tar.gz'
6   - sha1 '9cac9de1357460a9692c015735c899519c85d0da'
  5 + url 'http://releases.ansible.com/ansible/ansible-1.6.6.tar.gz'
  6 + sha1 '1795487608ab858ad9560de1f9732d5380007715'
7 7
8 8 head 'https://github.com/ansible/ansible.git', :branch => 'devel'
9 9
10 10 bottle do
11   - sha1 "55c8739229115a11701bccba801c5a6d42c7bc14" => :mavericks
12   - sha1 "46fbdea2eff0749876a1b42f73566b1a2563931a" => :mountain_lion
13   - sha1 "3ef7c49039c360bae79b5a97b2d90cc29f39c4e0" => :lion
  11 + sha1 "f23c9c0a2fa4d885b5b77d20be64183ddb436150" => :mavericks
  12 + sha1 "51565788e9a75a55debe9ea468c008406b3b2b6a" => :mountain_lion
  13 + sha1 "b7b5362938b0533c2e4b19af7ab9f41dc4a2e7f6" => :lion
14 14 end
15 15
16 16 depends_on :python if MacOS.version <= :snow_leopard
11 Library/Formula/ansifilter.rb
@@ -2,8 +2,15 @@
2 2
3 3 class Ansifilter < Formula
4 4 homepage 'http://www.andre-simon.de/doku/ansifilter/ansifilter.html'
5   - url 'http://www.andre-simon.de/zip/ansifilter-1.7.tar.bz2'
6   - sha1 '5b88db508ea100f327bf6b621c959742694fe2d8'
  5 + url 'http://www.andre-simon.de/zip/ansifilter-1.8.tar.gz'
  6 + sha1 '805bc0227c5972a971a82d3db749fb2431c107c1'
  7 +
  8 + bottle do
  9 + cellar :any
  10 + sha1 "e28d7cd8ef0c42040b216d9eb6087ddc90cba855" => :mavericks
  11 + sha1 "6110cc501ebfe6a7d402b778880651314310ce3b" => :mountain_lion
  12 + sha1 "2ab9271e360293e599926909da601e511c270152" => :lion
  13 + end
7 14
8 15 def install
9 16 # both steps required and with PREFIX, last checked v1.7
12 Library/Formula/ant.rb
@@ -14,10 +14,22 @@ class Ant < Formula
14 14
15 15 keg_only :provided_by_osx if MacOS.version < :mavericks
16 16
  17 + option "with-ivy", "Install ivy dependency manager"
  18 +
  19 + resource "ivy" do
  20 + url "http://www.apache.org/dyn/closer.cgi?path=ant/ivy/2.3.0/apache-ivy-2.3.0-bin.tar.gz"
  21 + sha1 "878fab43ee9c70486a9ecec1ec44a2f034401687"
  22 + end
  23 +
17 24 def install
18 25 rm Dir['bin/*.{bat,cmd,dll,exe}']
19 26 libexec.install Dir['*']
20 27 bin.install_symlink Dir["#{libexec}/bin/*"]
  28 + if build.with? "ivy"
  29 + resource("ivy").stage do
  30 + (libexec/"lib").install Dir["ivy-*.jar"]
  31 + end
  32 + end
21 33 end
22 34
23 35 test do
4 Library/Formula/antlr.rb
@@ -2,8 +2,8 @@
2 2
3 3 class Antlr < Formula
4 4 homepage "http://www.antlr.org/"
5   - url "http://www.antlr.org/download/antlr-4.2.2-complete.jar"
6   - sha1 "97b3117463b6beda300ee7a297a31b71db9aea2b"
  5 + url "http://www.antlr.org/download/antlr-4.3-complete.jar"
  6 + sha1 "173cf3165fdc54dcb9d2c6bc30c9d2c178f348bc"
7 7
8 8 def install
9 9 prefix.install "antlr-#{version}-complete.jar"
5 Library/Formula/apache-forrest.rb
@@ -12,8 +12,9 @@ class ApacheForrest < Formula
12 12
13 13 # Prevent deletion of intentionally-empty subdirs inside of
14 14 # template directories:
15   - skip_clean ["libexec/main/template-sites", "libexec/main/fresh-site",
16   - "libexec/plugins/pluginTemplate"]
  15 + skip_clean "libexec/main/template-sites",
  16 + "libexec/main/fresh-site",
  17 + "libexec/plugins/pluginTemplate"
17 18
18 19 def install
19 20 libexec.install Dir['*']
6 Library/Formula/apache-spark.rb
@@ -3,9 +3,9 @@
3 3 class ApacheSpark < Formula
4 4 homepage "http://spark.apache.org/"
5 5 head "https://github.com/apache/spark.git"
6   - url "http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop2.tgz"
7   - version "0.9.1"
8   - sha1 "953cd042a8cc44d297af46cc6714e30d20554c4b"
  6 + url "http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop2.tgz"
  7 + version "1.0.0"
  8 + sha1 "804fe9a0caff941fb791e15ea1cda45a7c2b7608"
9 9
10 10 def install
11 11 rm_f Dir["bin/*.cmd"]
10 Library/Formula/apachetop.rb
@@ -2,9 +2,17 @@
2 2
3 3 class Apachetop < Formula
4 4 homepage 'http://freecode.com/projects/apachetop'
5   - url 'http://www.webta.org/apachetop/apachetop-0.12.6.tar.gz'
  5 + url 'http://ftp.debian.org/debian/pool/main/a/apachetop/apachetop_0.12.6.orig.tar.gz'
6 6 sha1 '005c9479800a418ee7febe5027478ca8cbf3c51b'
7 7
  8 + bottle do
  9 + cellar :any
  10 + sha1 "5d9cac60ff10e36bcf346a7cd333c2d16eed3ecf" => :mavericks
  11 + sha1 "a70bbfb92d902f89032f83fb1072deb0787836a4" => :mountain_lion
  12 + sha1 "7743bd957fb2e9da0337f9674ff2d281bd4c3ff5" => :lion
  13 + end
  14 +
  15 + # Freecode is officially static from this point forwards. Do not rely on it for up-to-date package information.
8 16 # Upstream hasn't had activity in years, patch from MacPorts
9 17 patch :p0, :DATA
10 18
131 Library/Formula/aplus.rb
... ... @@ -1,131 +0,0 @@
1   -require 'formula'
2   -
3   -class Aplus < Formula
4   - homepage 'http://www.aplusdev.org/'
5   - url 'http://mirrors.kernel.org/debian/pool/main/a/aplus-fsf/aplus-fsf_4.22.1.orig.tar.gz'
6   - mirror 'http://ftp.us.debian.org/debian/pool/main/a/aplus-fsf/aplus-fsf_4.22.1.orig.tar.gz'
7   - sha1 'e757cc7654cf35dba15a6a5d6cac5320146558fc'
8   -
9   - depends_on :x11
10   -
11   - # Fix the missing CoreServices include (via Fink version of aplus)
12   - # Fix C++ syntax errors for clang
13   - patch :DATA
14   -
15   - def install
16   - # replace placeholder w/ actual prefix
17   - ["src/lisp.0/aplus.el", "src/lisp.1/aplus.el"].each do |path|
18   - chmod 0644, path
19   - inreplace path, "/usr/local/aplus-fsf-4.20", prefix
20   - end
21   -
22   - system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
23   - system "make"
24   - ENV.j1 # make install breaks with -j option
25   - system "make", "install"
26   - end
27   -
28   - def caveats; <<-EOS.undent
29   - This package contains a custom APL font; it doesn't display APL characters
30   - using the usual Unicode codepoints. Install it by running
31   - open #{opt_prefix}/fonts/TrueType/KAPL.TTF
32   - and clicking on the "Install Font" button.
33   - EOS
34   - end
35   -end
36   -
37   -
38   -__END__
39   ---- a/src/AplusGUI/AplusApplication.C 2010-11-28 17:06:58.000000000 -0800
40   -+++ b/src/AplusGUI/AplusApplication.C 2010-11-28 17:06:31.000000000 -0800
41   -@@ -5,6 +5,7 @@
42   - //
43   - //
44   - ///////////////////////////////////////////////////////////////////////////////
45   -+#include <CoreServices/CoreServices.h>
46   - #include <MSGUI/MSTextField.H>
47   - #include <MSGUI/MSWidget.H>
48   - #include <MSIPC/MSTv.H>
49   -diff --git a/src/MSTypes/MSBuiltinTypeVectorInlines.C b/src/MSTypes/MSBuiltinTypeVectorInlines.C
50   -index 051f4e9..9be8070 100644
51   ---- a/src/MSTypes/MSBuiltinTypeVectorInlines.C
52   -+++ b/src/MSTypes/MSBuiltinTypeVectorInlines.C
53   -@@ -77,7 +77,7 @@ INLINELINKAGE MSBuiltinVector<Type> MSBuiltinVector<Type>::operator[] (const MSI
54   - template <class Type>
55   - INLINELINKAGE MSBuiltinVector<Type> MSBuiltinVector<Type>::operator[] (const MSBinaryVector & bVect_) const
56   - {
57   -- return compress (*this, bVect_);
58   -+ return this->compress (*this, bVect_);
59   - }
60   -
61   -
62   -diff --git a/src/MSTypes/MSFloatMatrix.H b/src/MSTypes/MSFloatMatrix.H
63   -index b8545bc..1bb6351 100644
64   ---- a/src/MSTypes/MSFloatMatrix.H
65   -+++ b/src/MSTypes/MSFloatMatrix.H
66   -@@ -27,7 +27,7 @@ template<class Type> class MSTypeVector;
67   - template<class Type> class MSMatrixSTypePick; // MSTypeMatrix indexed by an unsigned int
68   -
69   - #if !defined(MS_NO_PREDECLARE_SPECIALIZATION)
70   --class MSMatrixSTypePick<double>;
71   -+template<> class MSMatrixSTypePick<double>;
72   - #endif
73   -
74   -
75   -diff --git a/src/MSTypes/MSObjectTypeVectorInlines.C b/src/MSTypes/MSObjectTypeVectorInlines.C
76   -index d5d6aa4..43fb49e 100644
77   ---- a/src/MSTypes/MSObjectTypeVectorInlines.C
78   -+++ b/src/MSTypes/MSObjectTypeVectorInlines.C
79   -@@ -87,7 +87,7 @@ INLINELINKAGE MSObjectVector<Type> MSObjectVector<Type>::operator[] (const MSInd
80   - template <class Type>
81   - INLINELINKAGE MSObjectVector<Type> MSObjectVector<Type>::operator[] (const MSBinaryVector & bVect_) const
82   - {
83   -- return compress (*this, bVect_);
84   -+ return this->compress (*this, bVect_);
85   - }
86   -
87   -
88   -diff --git a/src/MSTypes/MSObservableTree.C b/src/MSTypes/MSObservableTree.C
89   -index 5fb769b..0c2e442 100644
90   ---- a/src/MSTypes/MSObservableTree.C
91   -+++ b/src/MSTypes/MSObservableTree.C
92   -@@ -94,7 +94,7 @@ template <class Element>
93   - void MSObservableTree<Element>::removeSubtree(const MSTabularTreeCursor<Element>& cursor_)
94   - {
95   - MSTabularTreeCursor<Element> cursor2(cursor_);
96   -- unsigned long pos=position(cursor2);
97   -+ unsigned long pos=this->position(cursor2);
98   - cursor2.setToParent();
99   - MSTabularTree<Element>::removeSubtree(cursor_);
100   - if (cursor2.isValid()) changed(cursor2,pos,MSObservableTreeDelete);
101   -@@ -162,7 +162,7 @@ template <class Element>