aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Vandenberg2010-09-13 15:16:09 -0700
committerAdam Vandenberg2010-09-13 15:16:09 -0700
commit931e7d23db4c0172bc36bf5224d852db53f85a07 (patch)
treeef4fc5658c57287e13114cf0336c9b53222b21e6
parente165b3ca47e843e9840a17023b8e3d2625118ffb (diff)
downloadhomebrew-931e7d23db4c0172bc36bf5224d852db53f85a07.tar.bz2
brew-audit - check for commented-out dependencies
"brew audit" will now warn about commented-out dependencies. Updated formulae that had these to either take them out or rewrite the comments around them.
-rwxr-xr-xLibrary/Contributions/examples/brew-audit.rb5
-rw-r--r--Library/Formula/gnu-smalltalk.rb3
-rw-r--r--Library/Formula/luarocks.rb4
-rw-r--r--Library/Formula/opencv.rb6
-rw-r--r--Library/Formula/openimageio.rb6
-rw-r--r--Library/Formula/redcar.rb3
-rw-r--r--Library/Formula/vorbis-tools.rb8
7 files changed, 19 insertions, 16 deletions
diff --git a/Library/Contributions/examples/brew-audit.rb b/Library/Contributions/examples/brew-audit.rb
index 1790bde1f..7faec98cb 100755
--- a/Library/Contributions/examples/brew-audit.rb
+++ b/Library/Contributions/examples/brew-audit.rb
@@ -70,6 +70,11 @@ def audit_formula_text text
problems << " * md5 is empty"
end
+ # Commented-out depends_on
+ if text =~ /#\s*depends_on\s+(.+)\s*$/
+ problems << " * Commented-out dep #{$1}."
+ end
+
# No trailing whitespace, please
if text =~ /[ ]+$/
problems << " * Trailing whitespace was found."
diff --git a/Library/Formula/gnu-smalltalk.rb b/Library/Formula/gnu-smalltalk.rb
index b883f5e37..84f7131d8 100644
--- a/Library/Formula/gnu-smalltalk.rb
+++ b/Library/Formula/gnu-smalltalk.rb
@@ -14,7 +14,8 @@ class GnuSmalltalk <Formula
homepage 'http://smalltalk.gnu.org/'
sha1 'a985d69e4760420614c9dfe4d3605e47c5eb8faa'
- # depends_on 'gmp' => :optional # 32/64 built build problems
+ # 'gmp' is an optional dep, it is built 64-bit on Snow Leopard
+ # (and this brew is forced to build in 32-bit mode.)
def install
fails_with_llvm "Codegen problems with LLVM"
diff --git a/Library/Formula/luarocks.rb b/Library/Formula/luarocks.rb
index e136ad1cf..ca8c4bca3 100644
--- a/Library/Formula/luarocks.rb
+++ b/Library/Formula/luarocks.rb
@@ -6,11 +6,11 @@ class Luarocks <Formula
md5 'f8b13b642f8bf16740cac009580cda48'
depends_on 'lua'
- # wget or curl can be used as the downloader...
- # depends_on 'wget' => :optional
def install
# Install to the Cellar, but direct modules to HOMEBREW_PREFIX
+ # Configure can detect 'wget' to use as a downloader, but we don't
+ # require it since curl works too and comes with OS X.
system "./configure", "--prefix=#{prefix}",
"--rocks-tree=#{HOMEBREW_PREFIX}/lib/luarocks",
"--sysconfdir=#{etc}/luarocks"
diff --git a/Library/Formula/opencv.rb b/Library/Formula/opencv.rb
index 1c317ff4c..0697ad7d3 100644
--- a/Library/Formula/opencv.rb
+++ b/Library/Formula/opencv.rb
@@ -17,9 +17,9 @@ class Opencv <Formula
depends_on 'jasper' => :optional
depends_on 'tbb' => :optional
- # Can also depend on ffmpeg, but this pulls in a lot of extra stuff that you don't
- # need unless you're doing video analysis, and some of it isn't in Homebrew anyway.
- # depends_on 'ffmpeg'
+ # Can also depend on ffmpeg, but this pulls in a lot of extra stuff that
+ # you don't need unless you're doing video analysis, and some of it isn't
+ # in Homebrew anyway.
def install
system "cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX:PATH=#{prefix} ."
diff --git a/Library/Formula/openimageio.rb b/Library/Formula/openimageio.rb
index 7278afd10..3164ec0c8 100644
--- a/Library/Formula/openimageio.rb
+++ b/Library/Formula/openimageio.rb
@@ -17,10 +17,8 @@ class Openimageio <Formula
depends_on 'jpeg' => :optional
depends_on 'jasper' => :optional
- # Qt linking not currently working.
- # # build iv
- # depends_on 'qt' => :optional
- # depends_on 'glew' => :optional
+ # Qt linking, to build iv, is not currently working.
+ # Would need qt and glew as deps for this.
depends_on 'tbb' => :optional
diff --git a/Library/Formula/redcar.rb b/Library/Formula/redcar.rb
index cbe9cf4c9..3ee5ae39e 100644
--- a/Library/Formula/redcar.rb
+++ b/Library/Formula/redcar.rb
@@ -5,9 +5,6 @@ class Redcar <Formula
homepage 'http://github.com/danlucraft/redcar'
depends_on 'jruby'
-
- # rspec doesn't provide an 'rspec' module, so our test fails.
- # depends_on 'rspec' => :jruby
depends_on 'cucumber' => :jruby
def install
diff --git a/Library/Formula/vorbis-tools.rb b/Library/Formula/vorbis-tools.rb
index 2136d13f4..f8b22627f 100644
--- a/Library/Formula/vorbis-tools.rb
+++ b/Library/Formula/vorbis-tools.rb
@@ -7,12 +7,14 @@ class VorbisTools <Formula
depends_on 'libogg'
depends_on 'libvorbis'
- #depends_on 'ao' => :optional
- #depends_on 'ogg123' => :optional
+
+ # ao and ogg123 are optional deps
+ # Not sure why we don't just require them. - Adam V.
def install
system "./configure", "--disable-debug", "--disable-dependency-tracking",
- "--disable-nls", "--prefix=#{prefix}"
+ "--disable-nls",
+ "--prefix=#{prefix}"
system "make install"
end
end