Permalink
Browse files

formulae: fix with/without usage.

Closes Homebrew/legacy-homebrew#27275.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
  • Loading branch information...
MikeMcQuaid committed Mar 6, 2014
1 parent 7f000e4 commit eefdf6b3f338f0212906515307b16b81098d736a
Showing with 267 additions and 270 deletions.
  1. +1 βˆ’1 Formula/apple-gcc42.rb
  2. +2 βˆ’2 Formula/atari++.rb
  3. +1 βˆ’1 Formula/berkeley-db.rb
  4. +7 βˆ’7 Formula/boost.rb
  5. +1 βˆ’1 Formula/cairomm.rb
  6. +3 βˆ’3 Formula/cgal.rb
  7. +2 βˆ’3 Formula/chromaprint.rb
  8. +3 βˆ’3 Formula/clasp.rb
  9. +1 βˆ’1 Formula/clutter.rb
  10. +3 βˆ’4 Formula/cogl.rb
  11. +2 βˆ’2 Formula/cppcheck.rb
  12. +3 βˆ’3 Formula/dcmtk.rb
  13. +2 βˆ’2 Formula/dnsmasq.rb
  14. +1 βˆ’1 Formula/ejabberd.rb
  15. +1 βˆ’1 Formula/emacs-clang-complete-async.rb
  16. +2 βˆ’2 Formula/emacs.rb
  17. +3 βˆ’3 Formula/evas.rb
  18. +5 βˆ’5 Formula/fantom.rb
  19. +4 βˆ’4 Formula/ffmbc.rb
  20. +3 βˆ’3 Formula/ffmpeg.rb
  21. +1 βˆ’1 Formula/fftw.rb
  22. +1 βˆ’1 Formula/fontforge.rb
  23. +2 βˆ’2 Formula/freediameter.rb
  24. +1 βˆ’1 Formula/freetds.rb
  25. +1 βˆ’1 Formula/gambit-scheme.rb
  26. +1 βˆ’1 Formula/gearman.rb
  27. +4 βˆ’4 Formula/ghostscript.rb
  28. +2 βˆ’2 Formula/git-cola.rb
  29. +2 βˆ’2 Formula/git.rb
  30. +2 βˆ’2 Formula/gnuplot.rb
  31. +9 βˆ’9 Formula/gocr.rb
  32. +8 βˆ’8 Formula/graphicsmagick.rb
  33. +10 βˆ’10 Formula/graphviz.rb
  34. +3 βˆ’3 Formula/grass.rb
  35. +3 βˆ’3 Formula/gromacs.rb
  36. +4 βˆ’4 Formula/imagemagick.rb
  37. +2 βˆ’2 Formula/imlib2.rb
  38. +1 βˆ’1 Formula/inkscape.rb
  39. +2 βˆ’2 Formula/io.rb
  40. +1 βˆ’1 Formula/jbigkit.rb
  41. +3 βˆ’3 Formula/libcaca.rb
  42. +1 βˆ’1 Formula/libcppa.rb
  43. +1 βˆ’1 Formula/libgetdata.rb
  44. +1 βˆ’1 Formula/liblas.rb
  45. +1 βˆ’1 Formula/liblunar.rb
  46. +1 βˆ’1 Formula/libqxt.rb
  47. +3 βˆ’3 Formula/libspatialite.rb
  48. +1 βˆ’1 Formula/libusb.rb
  49. +1 βˆ’1 Formula/libvirt.rb
  50. +2 βˆ’2 Formula/libxmlsec1.rb
  51. +3 βˆ’3 Formula/lilypond.rb
  52. +5 βˆ’5 Formula/lldpd.rb
  53. +9 βˆ’10 Formula/lua.rb
  54. +3 βˆ’3 Formula/luarocks.rb
  55. +1 βˆ’1 Formula/mal4s.rb
  56. +4 βˆ’4 Formula/mapserver.rb
  57. +4 βˆ’4 Formula/mariadb.rb
  58. +2 βˆ’2 Formula/mdbtools.rb
  59. +4 βˆ’4 Formula/mplayer.rb
  60. +1 βˆ’1 Formula/mu.rb
  61. +5 βˆ’5 Formula/mysql-cluster.rb
  62. +5 βˆ’5 Formula/nginx.rb
  63. +3 βˆ’3 Formula/ngspice.rb
  64. +1 βˆ’1 Formula/open-scene-graph.rb
  65. +1 βˆ’1 Formula/opensc.rb
  66. +2 βˆ’2 Formula/pango.rb
  67. +3 βˆ’3 Formula/pcb.rb
  68. +1 βˆ’1 Formula/pdnsrec.rb
  69. +1 βˆ’1 Formula/pdsh.rb
  70. +9 βˆ’9 Formula/pike.rb
  71. +1 βˆ’1 Formula/plplot.rb
  72. +1 βˆ’1 Formula/portmidi.rb
  73. +2 βˆ’2 Formula/postgis.rb
  74. +2 βˆ’2 Formula/postgres-xc.rb
  75. +2 βˆ’2 Formula/proof-general.rb
  76. +1 βˆ’1 Formula/pulseaudio.rb
  77. +5 βˆ’5 Formula/python.rb
  78. +1 βˆ’1 Formula/python3.rb
  79. +1 βˆ’1 Formula/qd.rb
  80. +3 βˆ’3 Formula/qt.rb
  81. +3 βˆ’3 Formula/qt5.rb
  82. +6 βˆ’6 Formula/ruby.rb
  83. +3 βˆ’3 Formula/sbcl.rb
  84. +3 βˆ’3 Formula/shmcat.rb
  85. +1 βˆ’1 Formula/slicot.rb
  86. +1 βˆ’1 Formula/snownews.rb
  87. +1 βˆ’1 Formula/sqlite.rb
  88. +3 βˆ’3 Formula/ssreflect.rb
  89. +2 βˆ’2 Formula/strongswan.rb
  90. +3 βˆ’3 Formula/swi-prolog.rb
  91. +6 βˆ’6 Formula/thrift.rb
  92. +1 βˆ’1 Formula/transmission.rb
  93. +1 βˆ’1 Formula/vim.rb
  94. +1 βˆ’1 Formula/vorbis-tools.rb
  95. +6 βˆ’6 Formula/weechat.rb
  96. +3 βˆ’3 Formula/wine.rb
  97. +3 βˆ’3 Formula/wireshark.rb
  98. +4 βˆ’4 Formula/x3270.rb
  99. +1 βˆ’1 Formula/xplanet.rb
  100. +1 βˆ’1 Formula/yaws.rb
  101. +1 βˆ’1 Formula/zabbix.rb
  102. +2 βˆ’2 Formula/zeromq.rb
View
@@ -36,7 +36,7 @@ class AppleGcc42 < Formula
def install
safe_system "pax --insecure -rz -f Payload.gz -s ',./usr,#{prefix},'"
if build.include? 'with-gfortran-symlink'
if build.with? "gfortran-symlink"
safe_system "ln -sf #{bin}/gfortran-4.2 #{bin}/gfortran"
safe_system "ln -sf #{man1}/gfortran-4.2.1 #{man1}/gfortran.1"
end
View
@@ -12,8 +12,8 @@ class Atarixx < Formula
def install
args = ["--prefix=#{prefix}"]
args << "--disable-CURSES" unless build.include? 'with-curses'
args << "--disable-SDL" unless build.include? 'with-sdl'
args << "--disable-CURSES" if build.without? "curses"
args << "--disable-SDL" if build.without? "sdl"
system "./configure", *args
system "make"
View
@@ -32,7 +32,7 @@ def install
--enable-cxx
--enable-compat185
]
args << "--enable-java" if build.include? "with-java"
args << "--enable-java" if build.with? "java"
args << "--enable-sql" if build.include? "enable-sql"
# BerkeleyDB requires you to build everything from the build_unix subdirectory
View
@@ -64,7 +64,7 @@ class Boost < Formula
def install
# https://svn.boost.org/trac/boost/ticket/8841
if build.with? 'mpi' and not build.without? 'single'
if build.with? 'mpi' and build.with? 'single'
raise <<-EOS.undent
Building MPI support for both single and multi-threaded flavors
is not supported. Please use '--with-mpi' together with
@@ -150,16 +150,16 @@ def install
"--user-config=user-config.jam",
"install"]
if build.include? 'without-single'
args << "threading=multi"
else
if build.with? "single"
args << "threading=multi,single"
else
args << "threading=multi"
end
if build.include? 'without-static'
args << "link=shared"
else
if build.with? "static"
args << "link=shared,static"
else
args << "link=shared"
end
args << "address-model=32_64" << "architecture=x86" << "pch=off" if build.universal?
View
@@ -21,7 +21,7 @@ class Cairomm < Formula
depends_on 'libsigc++'
end
depends_on 'cairo'
depends_on :x11 unless build.include? 'without-x'
depends_on :x11 if build.with? "x"
def install
ENV.cxx11 if build.cxx11?
View
@@ -22,7 +22,7 @@ class Cgal < Formula
depends_on 'mpfr'
depends_on 'qt' if build.include? 'imaging'
depends_on 'eigen' if build.include? 'with-eigen3'
depends_on 'eigen' if build.with? "eigen3"
def patches
# Allows to compile with clang 425: http://goo.gl/y9Dg2y
@@ -38,10 +38,10 @@ def install
unless build.include? 'imaging'
args << "-DWITH_CGAL_Qt3=OFF" << "-DWITH_CGAL_Qt4=OFF" << "-DWITH_CGAL_ImageIO=OFF"
end
if build.include? 'with-eigen3'
if build.with? "eigen3"
args << "-DWITH_Eigen3=ON"
end
if build.include? 'with-lapack'
if build.with? "lapack"
args << "-DWITH_LAPACK=ON"
end
args << '.'
View
@@ -8,15 +8,15 @@ class Chromaprint < Formula
option 'without-examples', "Don't build examples (including fpcalc)"
depends_on 'cmake' => :build
depends_on 'ffmpeg' unless build.include? 'without-examples'
depends_on 'ffmpeg' if build.with? "examples"
# Upstream patch:
# https://bitbucket.org/acoustid/chromaprint/commits/d0a8d8bc7c1ad5bda3294836f49184fe34a92454
def patches; DATA; end
def install
args = std_cmake_args
args << '-DBUILD_EXAMPLES=ON' unless build.include? 'without-examples'
args << '-DBUILD_EXAMPLES=ON' if build.with? "examples"
system "cmake", ".", *args
system "make install"
end
@@ -34,4 +34,3 @@ def install
+#include <algorithm>
#include <limits>
#include <iterator>
View
@@ -7,10 +7,10 @@ class Clasp < Formula
option 'with-mt', 'Enable multi-thread support'
depends_on 'tbb' if build.include? 'with-mt'
depends_on 'tbb' if build.with? "mt"
def install
if build.include? 'with-mt'
if build.with? "mt"
ENV['TBB30_INSTALL_DIR'] = Formula["tbb"].opt_prefix
build_dir = 'build/release_mt'
else
@@ -21,7 +21,7 @@ def install
--config=release
--prefix=#{prefix}
]
args << "--with-mt" if build.include? 'with-mt'
args << "--with-mt" if build.with? "mt"
bin.mkpath
system "./configure.sh", *args
View
@@ -16,7 +16,7 @@ class Clutter < Formula
depends_on 'atk'
depends_on 'pango'
depends_on 'json-glib'
depends_on :x11 => '2.5.1' unless build.without? 'x'
depends_on :x11 => '2.5.1' if build.with? 'x'
def install
args = %W[
View
@@ -13,7 +13,7 @@ class Cogl < Formula
depends_on 'cairo'
depends_on 'glib'
depends_on 'pango'
depends_on :x11 => '2.5.1' unless build.without? 'x'
depends_on :x11 => '2.5.1' if build.with? 'x'
def patches
# Patch from MacPorts, reported upstream at https://bugzilla.gnome.org/show_bug.cgi?id=708825
@@ -48,7 +48,7 @@ def install
+#include <mach/mach_time.h>
+#define CLOCK_REALTIME 0
+#define CLOCK_MONOTONIC 0
+static int
+static int
+clock_gettime(int clk_id, struct timespec *t){
+ mach_timebase_info_data_t timebase;
+ mach_timebase_info(&timebase);
@@ -63,6 +63,5 @@ def install
+#else
#include <time.h>
+#endif
#include <glib/gi18n-lib.h>
View
@@ -11,7 +11,7 @@ class Cppcheck < Formula
option 'with-gui', "Build the cppcheck gui (requires Qt)"
depends_on 'pcre' unless build.include? 'no-rules'
depends_on 'qt' if build.include? 'with-gui'
depends_on 'qt' if build.with? "gui"
def install
# Man pages aren't installed as they require docbook schemas.
@@ -26,7 +26,7 @@ def install
system "make", "DESTDIR=#{prefix}", "BIN=#{bin}", "CFGDIR=#{prefix}/cfg", "install"
prefix.install "cfg"
if build.include? 'with-gui'
if build.with? "gui"
cd "gui" do
if build.include? 'no-rules'
system "qmake", "HAVE_RULES=no"
View
@@ -10,7 +10,7 @@ class Dcmtk < Formula
depends_on 'cmake' => :build
depends_on "libpng"
depends_on 'libtiff'
depends_on 'doxygen' if build.include? 'with-docs'
depends_on 'doxygen' if build.with? "docs"
# This roughly corresponds to thefollowing upstream patch:
#
@@ -31,12 +31,12 @@ def install
ENV.m64 if MacOS.prefer_64_bit?
args = std_cmake_args
args << '-DDCMTK_WITH_DOXYGEN=YES' if build.include? 'with-docs'
args << '-DDCMTK_WITH_DOXYGEN=YES' if build.with? "docs"
args << '..'
mkdir 'build' do
system 'cmake', *args
system 'make DOXYGEN' if build.include? 'with-docs'
system 'make DOXYGEN' if build.with? "docs"
system 'make install'
end
end
View
@@ -13,7 +13,7 @@ class Dnsmasq < Formula
option 'with-idn', 'Compile with IDN support'
depends_on "libidn" if build.include? 'with-idn'
depends_on "libidn" if build.with? "idn"
depends_on 'pkg-config' => :build
def install
@@ -23,7 +23,7 @@ def install
inreplace "src/config.h", "/etc/dnsmasq.conf", "#{etc}/dnsmasq.conf"
# Optional IDN support
if build.include? 'with-idn'
if build.with? "idn"
inreplace "src/config.h", "/* #define HAVE_IDN */", "#define HAVE_IDN"
end
View
@@ -33,7 +33,7 @@ def install
args << "--with-openssl=#{openssl.prefix}"
end
args << "--enable-odbc" if build.include? 'with-odbc'
args << "--enable-odbc" if build.with? "odbc"
system "./configure", *args
system "make"
@@ -17,7 +17,7 @@ def patches; DATA; end
def install
system "make"
bin.install "clang-complete"
share.install "auto-complete-clang-async.el" if build.include? 'with-elisp'
share.install "auto-complete-clang-async.el" if build.with? "elisp"
end
end
View
@@ -34,7 +34,7 @@ class Emacs < Formula
end
depends_on 'pkg-config' => :build
depends_on :x11 if build.include? "with-x"
depends_on :x11 if build.with? "x"
depends_on 'gnutls' => :optional
fails_with :llvm do
@@ -114,7 +114,7 @@ def install
#{prefix}/Emacs.app/Contents/MacOS/Emacs -nw "$@"
EOS
else
if build.include? "with-x"
if build.with? "x"
# These libs are not specified in xft's .pc. See:
# https://trac.macports.org/browser/trunk/dports/editors/emacs/Portfile#L74
# https://github.com/Homebrew/homebrew/issues/8156
View
@@ -14,15 +14,15 @@ class Evas < Formula
depends_on :fontconfig
depends_on 'fribidi'
depends_on 'harfbuzz'
depends_on 'doxygen' if build.include? 'with-docs'
depends_on 'doxygen' if build.with? "docs"
def install
args = ["--prefix=#{prefix}", "--disable-dependency-tracking"]
args << "--with-doxygen-file=#{HOMEBREW_PREFIX}/bin/doxygen" if build.include? 'with-docs'
args << "--with-doxygen-file=#{HOMEBREW_PREFIX}/bin/doxygen" if build.with? "docs"
system "./configure", *args
system "make install"
system "make install-doc" if build.include? 'with-docs'
system "make install-doc" if build.with? "docs"
end
end
View
@@ -13,8 +13,8 @@ def patches; DATA; end
def install
rm_f Dir["bin/*.exe", "lib/dotnet/*"]
rm_rf "examples" unless build.include? 'with-examples'
rm_rf "src" unless build.include? 'with-src'
rm_rf "examples" if build.without? "examples"
rm_rf "src" if build.without? "src"
libexec.install Dir['*']
system "chmod 0755 #{libexec}/bin/*"
@@ -26,16 +26,16 @@ def install
diff --git a/etc/build/config.props b/etc/build/config.props
index 368bce3..ebbff42 100755
--- a/etc/build/config.props
+++ b/etc/build/config.props
+++ b/etc/build/config.props
@@ -22,8 +22,8 @@ buildVersion=1.0.65
javacParams=-target 1.5
// Windows setup
-jdkHome=/C:/Program Files/Java/jdk1.6/
-dotnetHome=/C:/WINDOWS/Microsoft.NET/Framework/v2.0.50727/
+//jdkHome=/C:/Program Files/Java/jdk1.6/
+//dotnetHome=/C:/WINDOWS/Microsoft.NET/Framework/v2.0.50727/
// Mac setup
-//jdkHome=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home/
\ No newline at end of file
View
@@ -32,10 +32,10 @@ def install
"--enable-nonfree",
"--cc=#{ENV.cc}"]
args << "--enable-libx264" unless build.without? 'x264'
args << "--enable-libfaac" unless build.without? 'faac'
args << "--enable-libmp3lame" unless build.without? 'lame'
args << "--enable-libxvid" unless build.without? 'xvid'
args << "--enable-libx264" if build.with? 'x264'
args << "--enable-libfaac" if build.with? 'faac'
args << "--enable-libmp3lame" if build.with? 'lame'
args << "--enable-libxvid" if build.with? 'xvid'
args << "--enable-libfreetype" if build.with? 'freetype'
args << "--enable-libtheora" if build.with? 'theora'
View
@@ -46,7 +46,7 @@ class Ffmpeg < Formula
depends_on 'libvo-aacenc' => :optional
depends_on 'libass' => :optional
depends_on 'openjpeg' => :optional
depends_on 'sdl' if build.include? 'with-ffplay'
depends_on 'sdl' if build.with? "ffplay"
depends_on 'speex' => :optional
depends_on 'schroedinger' => :optional
depends_on 'fdk-aac' => :optional
@@ -84,7 +84,7 @@ def install
args << "--enable-libopencore-amrnb" << "--enable-libopencore-amrwb" if build.with? 'opencore-amr'
args << "--enable-libvo-aacenc" if build.with? 'libvo-aacenc'
args << "--enable-libass" if build.with? 'libass'
args << "--enable-ffplay" if build.include? 'with-ffplay'
args << "--enable-ffplay" if build.with? "ffplay"
args << "--enable-libspeex" if build.with? 'speex'
args << '--enable-libschroedinger' if build.with? 'schroedinger'
args << "--enable-libfdk-aac" if build.with? 'fdk-aac'
@@ -116,7 +116,7 @@ def install
system "make install"
if build.include? 'with-tools'
if build.with? "tools"
system "make alltools"
bin.install Dir['tools/*'].select {|f| File.executable? f}
end
View
@@ -26,7 +26,7 @@ def install
simd_args = ["--enable-sse2"]
simd_args << "--enable-avx" if ENV.compiler == :clang and Hardware::CPU.avx? and !build.bottle?
args << "--disable-fortran" unless build.with? "fortran"
args << "--disable-fortran" if build.without? "fortran"
ENV.universal_binary if build.universal?
View
@@ -61,7 +61,7 @@ def install
args << "--without-cairo" if build.without? "cairo"
args << "--without-pango" if build.without? "pango"
end
args << "--without-x" unless build.with? 'x'
args << "--without-x" if build.without? 'x'
# To avoid "dlopen(/opt/local/lib/libpng.2.dylib, 1): image not found"
args << "--with-static-imagelibs"
View
@@ -15,7 +15,7 @@ class Freediameter < Formula
depends_on 'libgcrypt'
depends_on 'libidn'
if build.include? 'with-all-extensions'
if build.with? "all-extensions"
depends_on :postgresql
depends_on :mysql
depends_on 'swig' => :build
@@ -28,7 +28,7 @@ def install
-DDISABLE_SCTP=ON
]
args << '-DALL_EXTENSIONS=ON' if build.include? 'with-all-extensions'
args << '-DALL_EXTENSIONS=ON' if build.with? "all-extensions"
args << '..'
mkdir 'build' do
Oops, something went wrong.

0 comments on commit eefdf6b

Please sign in to comment.