diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/mtools.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/multimarkdown.rb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Library/Formula/mtools.rb b/Library/Formula/mtools.rb index bcec17002..3bcdeefd4 100644 --- a/Library/Formula/mtools.rb +++ b/Library/Formula/mtools.rb @@ -6,6 +6,8 @@ class Mtools < Formula mirror 'http://ftp.gnu.org/gnu/mtools/mtools-4.0.17.tar.gz' sha1 'eebfab51148c4ab20a6aca3cea8057da5a11bdc8' + conflicts_with 'multimarkdown', :because => 'both install `mmd` binaries' + depends_on :x11 => :optional def install diff --git a/Library/Formula/multimarkdown.rb b/Library/Formula/multimarkdown.rb index af9bc9070..af9bdcc22 100644 --- a/Library/Formula/multimarkdown.rb +++ b/Library/Formula/multimarkdown.rb @@ -2,17 +2,16 @@ require 'formula' class Multimarkdown < Formula homepage 'http://fletcherpenney.net/multimarkdown/' - - # Use the tag instead of the tarball to get submodules + head 'https://github.com/fletcher/MultiMarkdown-4.git', :branch => 'master' + # Use git tag instead of the tarball to get submodules url 'https://github.com/fletcher/MultiMarkdown-4.git', :tag => '4.3.1' - head 'https://github.com/fletcher/MultiMarkdown-4.git', :branch => 'master' + conflicts_with 'mtools', :because => 'both install `mmd` binaries' def install ENV.append 'CFLAGS', '-g -O3 -include GLibFacade.h' system "make" - bin.install 'multimarkdown' - bin.install Dir['scripts/*'] + bin.install 'multimarkdown', Dir['scripts/*'] prefix.install 'Support' end |