diff options
| author | Mike McQuaid | 2014-03-06 20:40:26 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-03-08 00:54:35 +0000 |
| commit | 9de9f8d10e8e6d8c2d7cf7b74e6085038fc728d9 (patch) | |
| tree | 2c9f666ed5bda1fdf28f56b4637fb4d6c5ccc0a1 | |
| parent | e6dd316f1e5988f50f524c627c38ce5473097cc1 (diff) | |
| download | homebrew-9de9f8d10e8e6d8c2d7cf7b74e6085038fc728d9.tar.bz2 | |
formulae: fix with/without usage.
Closes #27275.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
102 files changed, 267 insertions, 270 deletions
diff --git a/Library/Formula/apple-gcc42.rb b/Library/Formula/apple-gcc42.rb index 35bbfaf20..6934fa87d 100644 --- a/Library/Formula/apple-gcc42.rb +++ b/Library/Formula/apple-gcc42.rb @@ -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 diff --git a/Library/Formula/atari++.rb b/Library/Formula/atari++.rb index 72cff14c0..905b6dfff 100644 --- a/Library/Formula/atari++.rb +++ b/Library/Formula/atari++.rb @@ -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" diff --git a/Library/Formula/berkeley-db.rb b/Library/Formula/berkeley-db.rb index 09ded3874..fdaf99581 100644 --- a/Library/Formula/berkeley-db.rb +++ b/Library/Formula/berkeley-db.rb @@ -32,7 +32,7 @@ class BerkeleyDb < Formula --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 diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb index dbf8448ef..01bfc017f 100644 --- a/Library/Formula/boost.rb +++ b/Library/Formula/boost.rb @@ -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 @@ class Boost < Formula "--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? diff --git a/Library/Formula/cairomm.rb b/Library/Formula/cairomm.rb index 02cfd75c5..877f24ed5 100644 --- a/Library/Formula/cairomm.rb +++ b/Library/Formula/cairomm.rb @@ -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? diff --git a/Library/Formula/cgal.rb b/Library/Formula/cgal.rb index aef08c0cc..312357260 100644 --- a/Library/Formula/cgal.rb +++ b/Library/Formula/cgal.rb @@ -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 @@ class Cgal < Formula 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 << '.' diff --git a/Library/Formula/chromaprint.rb b/Library/Formula/chromaprint.rb index b71067d82..a39af1bb1 100644 --- a/Library/Formula/chromaprint.rb +++ b/Library/Formula/chromaprint.rb @@ -8,7 +8,7 @@ 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 @@ -16,7 +16,7 @@ class Chromaprint < Formula 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 @@ index 47c6b98..76fb240 100644 +#include <algorithm> #include <limits> #include <iterator> - diff --git a/Library/Formula/clasp.rb b/Library/Formula/clasp.rb index c020c2981..ff6b58ece 100644 --- a/Library/Formula/clasp.rb +++ b/Library/Formula/clasp.rb @@ -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 @@ class Clasp < Formula --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 diff --git a/Library/Formula/clutter.rb b/Library/Formula/clutter.rb index 78e1149a3..6d7a994be 100644 --- a/Library/Formula/clutter.rb +++ b/Library/Formula/clutter.rb @@ -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[ diff --git a/Library/Formula/cogl.rb b/Library/Formula/cogl.rb index 7131a0440..0eaba9159 100644 --- a/Library/Formula/cogl.rb +++ b/Library/Formula/cogl.rb @@ -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 @@ diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c +#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 @@ diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c +#else #include <time.h> +#endif - + #include <glib/gi18n-lib.h> - diff --git a/Library/Formula/cppcheck.rb b/Library/Formula/cppcheck.rb index 075e115a2..9a83904d4 100644 --- a/Library/Formula/cppcheck.rb +++ b/Library/Formula/cppcheck.rb @@ -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 @@ class Cppcheck < Formula 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" diff --git a/Library/Formula/dcmtk.rb b/Library/Formula/dcmtk.rb index 0fbb84118..f9341cd8b 100644 --- a/Library/Formula/dcmtk.rb +++ b/Library/Formula/dcmtk.rb @@ -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 @@ class Dcmtk < Formula 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 diff --git a/Library/Formula/dnsmasq.rb b/Library/Formula/dnsmasq.rb index 5a1bff888..8a592bf9d 100644 --- a/Library/Formula/dnsmasq.rb +++ b/Library/Formula/dnsmasq.rb @@ -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 @@ class Dnsmasq < Formula 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 diff --git a/Library/Formula/ejabberd.rb b/Library/Formula/ejabberd.rb index 60f7b33e7..3183c4b11 100644 --- a/Library/Formula/ejabberd.rb +++ b/Library/Formula/ejabberd.rb @@ -33,7 +33,7 @@ class Ejabberd < Formula 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" diff --git a/Library/Formula/emacs-clang-complete-async.rb b/Library/Formula/emacs-clang-complete-async.rb index 83ea6a774..bb95360e8 100644 --- a/Library/Formula/emacs-clang-complete-async.rb +++ b/Library/Formula/emacs-clang-complete-async.rb @@ -17,7 +17,7 @@ class EmacsClangCompleteAsync < Formula 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 diff --git a/Library/Formula/emacs.rb b/Library/Formula/emacs.rb index f54ee2d61..21448a9e4 100644 --- a/Library/Formula/emacs.rb +++ b/Library/Formula/emacs.rb @@ -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 @@ class Emacs < Formula #{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 diff --git a/Library/Formula/evas.rb b/Library/Formula/evas.rb index d2e73ca21..c58a461f7 100644 --- a/Library/Formula/evas.rb +++ b/Library/Formula/evas.rb @@ -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 diff --git a/Library/Formula/fantom.rb b/Library/Formula/fantom.rb index 903784647..32a2ca06c 100644 --- a/Library/Formula/fantom.rb +++ b/Library/Formula/fantom.rb @@ -13,8 +13,8 @@ class Fantom < Formula 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 @@ __END__ 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 diff --git a/Library/Formula/ffmbc.rb b/Library/Formula/ffmbc.rb index 2a979a28b..31dc5fec6 100644 --- a/Library/Formula/ffmbc.rb +++ b/Library/Formula/ffmbc.rb @@ -32,10 +32,10 @@ class Ffmbc < Formula "--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' diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb index 20b89ac52..6f1b09283 100644 --- a/Library/Formula/ffmpeg.rb +++ b/Library/Formula/ffmpeg.rb @@ -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 @@ class Ffmpeg < Formula 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 @@ class Ffmpeg < Formula 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 diff --git a/Library/Formula/fftw.rb b/Library/Formula/fftw.rb index af59ed93f..4f1630ba2 100644 --- a/Library/Formula/fftw.rb +++ b/Library/Formula/fftw.rb @@ -26,7 +26,7 @@ class Fftw < Formula 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? diff --git a/Library/Formula/fontforge.rb b/Library/Formula/fontforge.rb index f89b050d2..f1eea2d4a 100644 --- a/Library/Formula/fontforge.rb +++ b/Library/Formula/fontforge.rb @@ -61,7 +61,7 @@ class Fontforge < Formula 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" diff --git a/Library/Formula/freediameter.rb b/Library/Formula/freediameter.rb index 7f3adf140..880449c3c 100644 --- a/Library/Formula/freediameter.rb +++ b/Library/Formula/freediameter.rb @@ -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 @@ class Freediameter < Formula -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 diff --git a/Library/Formula/freetds.rb b/Library/Formula/freetds.rb index d9b0d00ff..92706510a 100644 --- a/Library/Formula/freetds.rb +++ b/Library/Formula/freetds.rb @@ -29,7 +29,7 @@ class Freetds < Formula --mandir=#{man} ] - if build.include? "with-unixodbc" + if build.with? "unixodbc" args << "--with-unixodbc=#{Formula['unixodbc'].prefix}" end diff --git a/Library/Formula/gambit-scheme.rb b/Library/Formula/gambit-scheme.rb index f7c1e0791..5eea2d825 100644 --- a/Library/Formula/gambit-scheme.rb +++ b/Library/Formula/gambit-scheme.rb @@ -39,7 +39,7 @@ class GambitScheme < Formula end system "./configure", *args - system "make check" if build.include? 'with-check' + system "make check" if build.with? "check" ENV.j1 system "make" diff --git a/Library/Formula/gearman.rb b/Library/Formula/gearman.rb index 81f1987dc..5d53cab2c 100644 --- a/Library/Formula/gearman.rb +++ b/Library/Formula/gearman.rb @@ -17,7 +17,7 @@ class Gearman < Formula def install args = ["--prefix=#{prefix}"] - args << "--without-mysql" unless build.with? 'mysql' + args << "--without-mysql" if build.without? 'mysql' if build.with? 'postgresql' pg_config = "#{Formula["postgresql"].opt_bin}/pg_config" args << "--with-postgresql=#{pg_config}" diff --git a/Library/Formula/ghostscript.rb b/Library/Formula/ghostscript.rb index 4d64bb6f6..436958e95 100644 --- a/Library/Formula/ghostscript.rb +++ b/Library/Formula/ghostscript.rb @@ -82,7 +82,7 @@ class Ghostscript < Formula --disable-gtk --with-system-libtiff ] - args << '--without-x' unless build.with? 'x11' + args << '--without-x' if build.without? 'x11' if build.head? system './autogen.sh', *args @@ -112,8 +112,8 @@ __END__ --- a/base/unix-dll.mak +++ b/base/unix-dll.mak @@ -64,12 +64,12 @@ - - + + # MacOS X -#GS_SOEXT=dylib -#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) @@ -127,7 +127,7 @@ __END__ -#LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR) +LDFLAGS_SO_MAC=-dynamiclib -install_name __PREFIX__/lib/$(GS_SONAME_MAJOR_MINOR) #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME) - + GS_SO=$(BINDIR)/$(GS_SONAME) #--- a/base/stdpre.h diff --git a/Library/Formula/git-cola.rb b/Library/Formula/git-cola.rb index e4d024942..55e42db26 100644 --- a/Library/Formula/git-cola.rb +++ b/Library/Formula/git-cola.rb @@ -11,7 +11,7 @@ class GitCola < Formula depends_on 'pyqt' - if build.include? 'with-docs' + if build.with? "docs" # these are needed to build man pages depends_on 'asciidoc' depends_on 'xmlto' @@ -20,7 +20,7 @@ class GitCola < Formula def install system "make", "prefix=#{prefix}", "install" - if build.include? 'with-docs' + if build.with? "docs" system "make", "-C", "share/doc/git-cola", "-f", "Makefile.asciidoc", "prefix=#{prefix}", diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb index 6179b2009..ba14b2c37 100644 --- a/Library/Formula/git.rb +++ b/Library/Formula/git.rb @@ -58,7 +58,7 @@ class Git < Formula ENV['LIBPCREDIR'] = Formula['pcre'].opt_prefix end - ENV['NO_GETTEXT'] = '1' unless build.with? 'gettext' + ENV['NO_GETTEXT'] = '1' if build.without? 'gettext' ENV['GIT_DIR'] = cached_download/".git" if build.head? @@ -97,7 +97,7 @@ class Git < Formula end end - unless build.without? 'completions' + if build.with? 'completions' # install the completion script first because it is inside 'contrib' bash_completion.install 'contrib/completion/git-completion.bash' bash_completion.install 'contrib/completion/git-prompt.sh' diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb index 0f769377c..341290b21 100644 --- a/Library/Formula/gnuplot.rb +++ b/Library/Formula/gnuplot.rb @@ -36,7 +36,7 @@ class Gnuplot < Formula depends_on LuaRequirement unless build.include? 'nolua' depends_on 'readline' depends_on 'pango' if build.include? 'cairo' or build.include? 'wx' - depends_on :x11 if build.include? 'with-x' or MacOS::X11.installed? + depends_on :x11 if build.with? "x" or MacOS::X11.installed? depends_on 'pdflib-lite' if build.include? 'pdf' depends_on 'gd' unless build.include? 'nogd' depends_on 'wxmac' if build.include? 'wx' @@ -81,7 +81,7 @@ class Gnuplot < Formula args << '--without-cairo' unless build.include? 'cairo' args << '--enable-qt' if build.include? 'qt' args << '--without-lua' if build.include? 'nolua' - args << '--without-lisp-files' if build.include? 'without-emacs' + args << '--without-lisp-files' if build.without? "emacs" args << (build.with?('aquaterm') ? '--with-aquaterm' : '--without-aquaterm') if build.include? 'latex' diff --git a/Library/Formula/gocr.rb b/Library/Formula/gocr.rb index 8a3a7ca03..8eea241f1 100644 --- a/Library/Formula/gocr.rb +++ b/Library/Formula/gocr.rb @@ -11,7 +11,7 @@ class Gocr < Formula # Edit makefile to install libs per developer documentation def patches - DATA if build.include? 'with-lib' + DATA if build.with? "lib" end def install @@ -24,7 +24,7 @@ class Gocr < Formula s.change_make_var! 'mandir', '/share/man' end - system "make libs" if build.include? 'with-lib' + system "make libs" if build.with? "lib" system "make install" end @@ -41,12 +41,12 @@ index bf4181f..883fec2 @@ -10,7 +10,7 @@ PROGRAM = gocr$(EXEEXT) PGMASCLIB = Pgm2asc #LIBPGMASCLIB = lib$(PGMASCLIB).a - # ToDo: need a better pgm2asc.h for lib users + # ToDo: need a better pgm2asc.h for lib users -#INCLUDEFILES = gocr.h +INCLUDEFILES = pgm2asc.h output.h list.h unicode.h gocr.h pnm.h # avoid german compiler messages LANG=C - + @@ -39,8 +39,8 @@ LIBOBJS=pgm2asc.o \ #VPATH = @srcdir@ bindir = @bindir@ @@ -55,17 +55,17 @@ index bf4181f..883fec2 -#includedir = @includedir@ +libdir = @libdir@ +includedir = /include/gocr - + CC=@CC@ # lib removed for simplification @@ -89,7 +89,8 @@ $(PROGRAM): $(LIBOBJS) gocr.o $(CC) -o $@ $(LDFLAGS) gocr.o $(LIBOBJS) $(LIBS) # if test -r $(PROGRAM); then cp $@ ../bin; fi - + -libs: lib$(PGMASCLIB).a lib$(PGMASCLIB).@PACKAGE_VERSION@.so +#libs: lib$(PGMASCLIB).a lib$(PGMASCLIB).@PACKAGE_VERSION@.so +libs: lib$(PGMASCLIB).a - + #lib$(PGMASCLIB).@PACKAGE_VERSION@.so: $(LIBOBJS) # $(CC) -fPIC -shared -Wl,-h$@ -o $@ $(LIBOBJS) @@ -109,17 +110,17 @@ $(LIBOBJS): Makefile @@ -87,7 +87,7 @@ index bf4181f..883fec2 fi - # ToDo: not sure that the link will be installed correctly - #$(INSTALL) $(INCLUDEFILES) $(DESTDIR)$(includedir) - + # directories are not removed uninstall: @@ -129,7 +130,8 @@ uninstall: @@ -97,6 +97,6 @@ index bf4181f..883fec2 - #for X in $(INCLUDEFILES); do rm -f $(DESTDIR)$(includedir)/$$X; done + for X in $(INCLUDEFILES); do rm -f $(DESTDIR)$(includedir)/$$X; done + -rm -f $(DESTDIR)$(includedir)/config.h - + clean: -rm -f *.o *~ diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index 6bde3c872..c3de8c4fe 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -49,10 +49,10 @@ class Graphicsmagick < Formula "--with-modules", "--disable-openmp"] - args << "--without-gslib" unless build.with? 'ghostscript' - args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" unless build.with? 'ghostscript' + args << "--without-gslib" if build.without? 'ghostscript' + args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" if build.without? 'ghostscript' args << "--without-magick-plus-plus" if build.without? 'magick-plus-plus' - args << "--with-perl" if build.include? 'with-perl' + args << "--with-perl" if build.with? "perl" if build.with? 'quantum-depth-32' quantum_depth = 32 @@ -63,17 +63,17 @@ class Graphicsmagick < Formula end args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth - args << "--without-x" unless build.with? 'x11' + args << "--without-x" if build.without? 'x11' args << "--without-ttf" if build.without? 'freetype' args << "--without-xml" if build.without? 'svg' - args << "--without-lcms" unless build.with? 'little-cms' - args << "--without-lcms2" unless build.with? 'little-cms2' + args << "--without-lcms" if build.without? 'little-cms' + args << "--without-lcms2" if build.without? 'little-cms2' # versioned stuff in main tree is pointless for us inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}' system "./configure", *args system "make", "install" - if build.include? 'with-perl' + if build.with? "perl" cd 'PerlMagick' do # Install the module under the GraphicsMagick prefix system "perl", "Makefile.PL", "INSTALL_BASE=#{prefix}" @@ -88,7 +88,7 @@ class Graphicsmagick < Formula end def caveats - if build.include? 'with-perl' + if build.with? "perl" <<-EOS.undent The Graphics::Magick perl module has been installed under: diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb index a858b898a..be8cbc52a 100644 --- a/Library/Formula/graphviz.rb +++ b/Library/Formula/graphviz.rb @@ -24,13 +24,13 @@ class Graphviz < Formula depends_on :libpng depends_on 'pkg-config' => :build - depends_on 'pango' if build.include? 'with-pangocairo' - depends_on 'swig' if build.include? 'with-bindings' + depends_on 'pango' if build.with? "pangocairo" + depends_on 'swig' if build.with? "bindings" depends_on 'gts' => :optional depends_on "librsvg" => :optional - depends_on :freetype if build.include? 'with-freetype' or MacOS::X11.installed? - depends_on :x11 if build.include? 'with-x' or MacOS::X11.installed? - depends_on :xcode if build.include? 'with-app' + depends_on :freetype if build.with? "freetype" or MacOS::X11.installed? + depends_on :x11 if build.with? "x" or MacOS::X11.installed? + depends_on :xcode if build.with? "app" fails_with :clang do build 318 @@ -50,16 +50,16 @@ class Graphviz < Formula "--without-qt", "--with-quartz"] args << "--with-gts" if build.with? 'gts' - args << "--disable-swig" unless build.include? 'with-bindings' - args << "--without-pangocairo" unless build.include? 'with-pangocairo' - args << "--without-freetype2" unless build.include? 'with-freetype' or MacOS::X11.installed? - args << "--without-x" unless build.include? 'with-x' or MacOS::X11.installed? + args << "--disable-swig" if build.without? "bindings" + args << "--without-pangocairo" if build.without? "pangocairo" + args << "--without-freetype2" if build.without? "freetype" or MacOS::X11.installed? + args << "--without-x" if build.without? "x" or MacOS::X11.installed? args << "--without-rsvg" if build.without? "librsvg" system "./configure", *args system "make install" - if build.include? 'with-app' + if build.with? "app" cd "macosx" do xcodebuild "-configuration", "Release", "SYMROOT=build", "PREFIX=#{prefix}", "ONLY_ACTIVE_ARCH=YES" end diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb index 1c9c360a0..14b9058c0 100644 --- a/Library/Formula/grass.rb +++ b/Library/Formula/grass.rb @@ -39,7 +39,7 @@ class Grass < Formula def headless? # The GRASS GUI is based on WxPython. Unfortunately, Lion does not include # this module so we have to drop it. - build.include? 'without-gui' or MacOS.version == :lion + build.without? "gui" or MacOS.version == :lion end def install @@ -151,6 +151,6 @@ index f1edea6..be404b0 100644 endif - @# enable OSX Help Viewer - @if [ "`cat include/Make/Platform.make | grep -i '^ARCH.*darwin'`" ] ; then /bin/ln -sfh "${INST_DIR}/docs/html" /Library/Documentation/Help/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR} ; fi - - + + install-strip: FORCE diff --git a/Library/Formula/gromacs.rb b/Library/Formula/gromacs.rb index 442d8ef18..c6818afdc 100644 --- a/Library/Formula/gromacs.rb +++ b/Library/Formula/gromacs.rb @@ -14,14 +14,14 @@ class Gromacs < Formula depends_on 'fftw' depends_on 'gsl' => :recommended depends_on :mpi if build.include? 'enable-mpi' - depends_on :x11 if build.include? 'with-x' + depends_on :x11 if build.with? "x" def install args = std_cmake_args - args << "-DGMX_GSL=ON" unless build.include? 'without-gsl' + args << "-DGMX_GSL=ON" if build.with? "gsl" args << "-DGMX_MPI=ON" if build.include? 'enable-mpi' args << "-DGMX_DOUBLE=ON" if build.include? 'enable-double' - args << "-DGMX_X11=ON" if build.include? 'with-x' + args << "-DGMX_X11=ON" if build.with? "x" args << "-DGMX_CPU_ACCELERATION=None" if MacOS.version <= :snow_leopard inreplace 'scripts/CMakeLists.txt', 'BIN_INSTALL_DIR', 'DATA_INSTALL_DIR' diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb index 699da320f..0180bf69c 100644 --- a/Library/Formula/imagemagick.rb +++ b/Library/Formula/imagemagick.rb @@ -65,9 +65,9 @@ class Imagemagick < Formula "--disable-openmp"] args << "--disable-opencl" if build.include? 'disable-opencl' - args << "--without-gslib" unless build.with? 'ghostscript' - args << "--without-perl" unless build.with? 'perl' - args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" unless build.with? 'ghostscript' + args << "--without-gslib" if build.without? 'ghostscript' + args << "--without-perl" if build.without? 'perl' + args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" if build.without? 'ghostscript' args << "--without-magick-plus-plus" if build.without? 'magick-plus-plus' args << "--enable-hdri=yes" if build.include? 'enable-hdri' @@ -81,7 +81,7 @@ class Imagemagick < Formula args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth args << "--with-rsvg" if build.with? 'librsvg' - args << "--without-x" unless build.with? 'x11' + args << "--without-x" if build.without? 'x11' args << "--with-fontconfig=yes" if build.with? 'fontconfig' args << "--with-freetype=yes" if build.with? 'freetype' args << "--with-webp=yes" if build.include? 'webp' diff --git a/Library/Formula/imlib2.rb b/Library/Formula/imlib2.rb index 837a1ec62..17df37c5c 100644 --- a/Library/Formula/imlib2.rb +++ b/Library/Formula/imlib2.rb @@ -9,7 +9,7 @@ class Imlib2 < Formula depends_on :freetype depends_on :libpng => :recommended - depends_on :x11 if MacOS::X11.installed? or not build.include? "without-x" + depends_on :x11 if MacOS::X11.installed? or build.with? "x" depends_on 'pkg-config' => :build depends_on 'jpeg' => :recommended @@ -19,7 +19,7 @@ class Imlib2 < Formula --prefix=#{prefix} --enable-amd64=no ] - args << "--without-x" if build.include? "without-x" + args << "--without-x" if build.without? "x" system "./configure", *args system "make install" diff --git a/Library/Formula/inkscape.rb b/Library/Formula/inkscape.rb index 85bb067b9..68321a4c5 100644 --- a/Library/Formula/inkscape.rb +++ b/Library/Formula/inkscape.rb @@ -28,7 +28,7 @@ class Inkscape < Formula args = [ "--disable-dependency-tracking", "--prefix=#{prefix}", "--enable-lcms" ] - args << "--disable-poppler-cairo" unless build.with? "poppler" + args << "--disable-poppler-cairo" if build.without? "poppler" system "./configure", *args system "make install" diff --git a/Library/Formula/io.rb b/Library/Formula/io.rb index 2679d61e3..78e5b6343 100644 --- a/Library/Formula/io.rb +++ b/Library/Formula/io.rb @@ -19,10 +19,10 @@ class Io < Formula depends_on 'xz' # Used by Bignum add-on - depends_on 'gmp' unless build.include? 'without-addons' + depends_on 'gmp' if build.with? "addons" # Used by Fonts add-on - depends_on :freetype unless build.include? 'without-addons' + depends_on :freetype if build.with? "addons" fails_with :clang do build 421 diff --git a/Library/Formula/jbigkit.rb b/Library/Formula/jbigkit.rb index 5031a4f68..d1a29e6d8 100644 --- a/Library/Formula/jbigkit.rb +++ b/Library/Formula/jbigkit.rb @@ -16,7 +16,7 @@ class Jbigkit < Formula # It needs j1 to make the tests happen in sequence. ENV.deparallelize - system "make test" if build.include? 'with-check' + system "make test" if build.with? "check" # Install the files using three common styles of syntax: prefix.install %w[contrib examples] diff --git a/Library/Formula/libcaca.rb b/Library/Formula/libcaca.rb index df3a70eaa..028c10797 100644 --- a/Library/Formula/libcaca.rb +++ b/Library/Formula/libcaca.rb @@ -8,9 +8,9 @@ class Libcaca < Formula option 'with-imlib2', 'Build with Imlib2 support' - depends_on :x11 if MacOS::X11.installed? or build.include? "with-imlib2" + depends_on :x11 if MacOS::X11.installed? or build.with? "imlib2" - if build.include? "with-imlib2" + if build.with? "imlib2" depends_on 'pkg-config' => :build depends_on 'imlib2' => :optional end @@ -56,7 +56,7 @@ __END__ @@ -645,7 +645,7 @@ typedef struct cucul_buffer cucul_buffer # define CACA_DEPRECATED # endif - + -# if defined __GNUC__ && __GNUC__ > 3 +# if !defined __APPLE__ && defined __GNUC__ && __GNUC__ > 3 # define CACA_ALIAS(x) __attribute__ ((weak, alias(#x))) diff --git a/Library/Formula/libcppa.rb b/Library/Formula/libcppa.rb index 3e9276ab6..4f4546c47 100644 --- a/Library/Formula/libcppa.rb +++ b/Library/Formula/libcppa.rb @@ -27,7 +27,7 @@ class Libcppa < Formula ] args << '--with-opencl' if build.with? 'opencl' - args << '--no-examples' unless build.with? 'examples' + args << '--no-examples' if build.without? 'examples' system "./configure", *args system "make" diff --git a/Library/Formula/libgetdata.rb b/Library/Formula/libgetdata.rb index 3b2362784..feb106087 100644 --- a/Library/Formula/libgetdata.rb +++ b/Library/Formula/libgetdata.rb @@ -21,7 +21,7 @@ class Libgetdata < Formula --prefix=#{prefix} ] - args << "--disable-perl" unless build.with? "perl" + args << "--disable-perl" if build.without? "perl" system "./configure", *args system "make" diff --git a/Library/Formula/liblas.rb b/Library/Formula/liblas.rb index b9e2de763..da654d67d 100644 --- a/Library/Formula/liblas.rb +++ b/Library/Formula/liblas.rb @@ -21,7 +21,7 @@ class Liblas < Formula ENV['Boost_LIBRARY_DIRS'] = "#{HOMEBREW_PREFIX}/lib" system "cmake", "..", "-DWITH_GEOTIFF=ON", "-DWITH_GDAL=ON", *std_cmake_args system "make" - system "make test" if build.include? 'with-test' + system "make test" if build.with? "test" system "make install" end end diff --git a/Library/Formula/liblunar.rb b/Library/Formula/liblunar.rb index 89fc29ff5..39b70c257 100644 --- a/Library/Formula/liblunar.rb +++ b/Library/Formula/liblunar.rb @@ -20,7 +20,7 @@ class Liblunar < Formula --disable-dependency-tracking --prefix=#{prefix} ] - args << '--disable-python' unless build.with? 'python' + args << '--disable-python' if build.without? 'python' system './configure', *args system 'make install' end diff --git a/Library/Formula/libqxt.rb b/Library/Formula/libqxt.rb index f644936c6..47d60ba7f 100644 --- a/Library/Formula/libqxt.rb +++ b/Library/Formula/libqxt.rb @@ -22,7 +22,7 @@ class Libqxt < Formula "-docdir", "#{prefix}/doc", "-featuredir", "#{prefix}/features", "-release"] - args << "-no-db" unless build.with? 'berkeley-db' + args << "-no-db" if build.without? 'berkeley-db' system "./configure", *args system "make" diff --git a/Library/Formula/libspatialite.rb b/Library/Formula/libspatialite.rb index 89e4cab3e..1b0e95090 100644 --- a/Library/Formula/libspatialite.rb +++ b/Library/Formula/libspatialite.rb @@ -42,7 +42,7 @@ class Libspatialite < Formula ENV.append 'LDFLAGS', "-L#{sqlite.opt_lib}" ENV.append 'CFLAGS', "-I#{sqlite.opt_include}" - unless build.without? 'liblwgeom' + if build.with? 'liblwgeom' lwgeom = Formula["liblwgeom"] ENV.append 'LDFLAGS', "-L#{lwgeom.opt_lib}" ENV.append 'CFLAGS', "-I#{lwgeom.opt_include}" @@ -54,8 +54,8 @@ class Libspatialite < Formula --with-sysroot=#{HOMEBREW_PREFIX} ] args << '--enable-freexl=no' if build.without? 'freexl' - args << '--enable-libxml2=yes' unless build.without? 'libxml2' - args << '--enable-lwgeom=yes' unless build.without? 'liblwgeom' + args << '--enable-libxml2=yes' if build.with? 'libxml2' + args << '--enable-lwgeom=yes' if build.with? 'liblwgeom' args << "--enable-geopackage=yes" if build.with? "geopackage" system './configure', *args diff --git a/Library/Formula/libusb.rb b/Library/Formula/libusb.rb index 88698c5cc..c97a7492c 100644 --- a/Library/Formula/libusb.rb +++ b/Library/Formula/libusb.rb @@ -29,7 +29,7 @@ class Libusb < Formula args = %W[--disable-dependency-tracking --prefix=#{prefix}] args << "--disable-log" if build.include? 'no-runtime-logging' - args << "--enable-debug-log" if build.include? 'with-default-log-level-debug' + args << "--enable-debug-log" if build.with? "default-log-level-debug" system "./autogen.sh" if build.head? system "./configure", *args diff --git a/Library/Formula/libvirt.rb b/Library/Formula/libvirt.rb index fe8e1a606..54e8ac663 100644 --- a/Library/Formula/libvirt.rb +++ b/Library/Formula/libvirt.rb @@ -59,7 +59,7 @@ class Libvirt < Formula # If the libvirt daemon is built, update its config file to reflect # the Homebrew prefix - unless build.include? 'without-libvirtd' + if build.with? "libvirtd" inreplace "#{etc}/libvirt/libvirtd.conf" do |s| s.gsub! "/etc/", "#{HOMEBREW_PREFIX}/etc/" s.gsub! "/var/", "#{HOMEBREW_PREFIX}/var/" diff --git a/Library/Formula/libxmlsec1.rb b/Library/Formula/libxmlsec1.rb index c7944e80d..3c1d0619f 100644 --- a/Library/Formula/libxmlsec1.rb +++ b/Library/Formula/libxmlsec1.rb @@ -9,7 +9,7 @@ class Libxmlsec1 < Formula depends_on 'pkg-config' => :build depends_on 'libxml2' # Version on 10.6/10.7 is too old depends_on 'gnutls' => :recommended - depends_on 'libgcrypt' unless build.without? 'gnutls' + depends_on 'libgcrypt' if build.with? 'gnutls' # Add HOMEBREW_PREFIX/lib to dl load path def patches; DATA; end @@ -31,7 +31,7 @@ index 6e8a56a..0e7f06b 100644 +++ b/src/dl.c @@ -141,6 +141,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) { } - + #ifdef XMLSEC_DL_LIBLTDL + lt_dlsetsearchpath("HOMEBREW_PREFIX/lib"); lib->handle = lt_dlopenext((char*)lib->filename); diff --git a/Library/Formula/lilypond.rb b/Library/Formula/lilypond.rb index ad4f3dca0..238db9077 100644 --- a/Library/Formula/lilypond.rb +++ b/Library/Formula/lilypond.rb @@ -46,7 +46,7 @@ class Lilypond < Formula depends_on 'flex' => :build # Assert documentation dependencies if requested. - if build.include? 'with-doc' + if build.with? "doc" depends_on 'netpbm' depends_on 'imagemagick' depends_on 'docbook' @@ -78,7 +78,7 @@ class Lilypond < Formula "--enable-rpath", "--with-ncsb-dir=#{gs.share}/ghostscript/fonts/"] - args << "--disable-documentation" unless build.include? 'with-doc' + args << "--disable-documentation" if build.without? "doc" system "./configure", *args # Separate steps to ensure that lilypond's custom fonts are created. @@ -86,7 +86,7 @@ class Lilypond < Formula system "make install" # Build documentation if requested. - if build.include? 'with-doc' + if build.with? "doc" system "make doc" system "make install-doc" end diff --git a/Library/Formula/lldpd.rb b/Library/Formula/lldpd.rb index 59fcf1e24..feaaa32fc 100644 --- a/Library/Formula/lldpd.rb +++ b/Library/Formula/lldpd.rb @@ -11,8 +11,8 @@ class Lldpd < Formula depends_on 'pkg-config' => :build depends_on 'readline' depends_on 'libevent' - depends_on 'net-snmp' if build.include? 'with-snmp' - depends_on 'jansson' if build.include? 'with-json' + depends_on 'net-snmp' if build.with? "snmp" + depends_on 'jansson' if build.with? "json" def install readline = Formula["readline"] @@ -25,8 +25,8 @@ class Lldpd < Formula "--with-launchddaemonsdir=no", "CPPFLAGS=-I#{readline.include} -DRONLY=1", "LDFLAGS=-L#{readline.lib}"] - args << "--with-snmp" if build.include? 'with-snmp' - args << "--with-json" if build.include? 'with-json' + args << "--with-snmp" if build.with? "snmp" + args << "--with-json" if build.with? "json" system "./configure", *args system "make" @@ -37,7 +37,7 @@ class Lldpd < Formula def plist additional_args = "" - if build.include? 'with-snmp' + if build.with? "snmp" additional_args += "<string>-x</string>" end return <<-EOS.undent diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb index 42f777c5d..2d738c460 100644 --- a/Library/Formula/lua.rb +++ b/Library/Formula/lua.rb @@ -29,7 +29,7 @@ class Lua < Formula p = [DATA] # sigaction provided by posix signalling power patch from # http://lua-users.org/wiki/LuaPowerPatches - unless build.without? 'sigaction' + if build.with? 'sigaction' p << 'http://lua-users.org/files/wiki_insecure/power_patches/5.1/sig_catch.patch' end # completion provided by advanced readline power patch from @@ -89,7 +89,7 @@ index 209a132..9387b09 100644 -TO_LIB= liblua.a +TO_LIB= liblua.5.1.5.dylib TO_MAN= lua.1 luac.1 - + # Lua version and release. @@ -64,6 +64,8 @@ install: dummy cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) @@ -97,7 +97,7 @@ index 209a132..9387b09 100644 cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) + ln -s -f liblua.5.1.5.dylib $(INSTALL_LIB)/liblua.5.1.dylib + ln -s -f liblua.5.1.dylib $(INSTALL_LIB)/liblua.dylib - + ranlib: cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) diff --git a/src/Makefile b/src/Makefile @@ -105,9 +105,9 @@ index e0d4c9f..4477d7b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -22,7 +22,7 @@ MYLIBS= - + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - + -LUA_A= liblua.a +LUA_A= liblua.5.1.5.dylib CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ @@ -115,27 +115,26 @@ index e0d4c9f..4477d7b 100644 lundump.o lvm.o lzio.o @@ -48,11 +48,13 @@ o: $(ALL_O) a: $(ALL_A) - + $(LUA_A): $(CORE_O) $(LIB_O) - $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files - $(RANLIB) $@ + $(CC) -dynamiclib -install_name HOMEBREW_PREFIX/lib/liblua.5.1.dylib \ + -compatibility_version 5.1 -current_version 5.1.5 \ + -o liblua.5.1.5.dylib $^ - + $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + $(CC) -fno-common $(MYLDFLAGS) \ + -o $@ $(LUA_O) $(LUA_A) -L. -llua.5.1.5 $(LIBS) - + $(LUAC_T): $(LUAC_O) $(LUA_A) $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) @@ -99,7 +101,7 @@ linux: $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" - + macosx: - $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" + $(MAKE) all MYCFLAGS="MYCFLAGS_VAL" MYLIBS="-lreadline" # use this on Mac OS X 10.3- # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX - diff --git a/Library/Formula/luarocks.rb b/Library/Formula/luarocks.rb index f7e130c02..f30b7e61a 100644 --- a/Library/Formula/luarocks.rb +++ b/Library/Formula/luarocks.rb @@ -9,12 +9,12 @@ class Luarocks < Formula option 'with-luajit', 'Use LuaJIT instead of the stock Lua' option 'with-lua52', 'Use Lua 5.2 instead of the stock Lua' - if build.include? 'with-luajit' + if build.with? "luajit" depends_on 'luajit' # luajit depends internally on lua being installed # and is only 5.1 compatible, see #25954 depends_on 'lua' - elsif build.include? 'with-lua52' + elsif build.with? "lua52" depends_on 'lua52' else depends_on 'lua' @@ -39,7 +39,7 @@ class Luarocks < Formula "--rocks-tree=#{HOMEBREW_PREFIX}", "--sysconfdir=#{etc}/luarocks"] - if build.include? 'with-luajit' + if build.with? "luajit" args << "--with-lua-include=#{HOMEBREW_PREFIX}/include/luajit-2.0" args << "--lua-suffix=jit" args << "--with-lua=luajit" diff --git a/Library/Formula/mal4s.rb b/Library/Formula/mal4s.rb index 8a1498a14..7a7a64b4b 100644 --- a/Library/Formula/mal4s.rb +++ b/Library/Formula/mal4s.rb @@ -26,7 +26,7 @@ class Mal4s < Formula def install args = ["--disable-dependency-tracking", "--prefix=#{prefix}"] - args << "--without-x" unless build.with? 'x11' + args << "--without-x" if build.without? 'x11' system "autoreconf", "-f", "-i" system "./configure", *args system "make", "install" diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb index 05d36d761..0f3ea0a8d 100644 --- a/Library/Formula/mapserver.rb +++ b/Library/Formula/mapserver.rb @@ -21,7 +21,7 @@ class Mapserver < Formula depends_on 'gdal' depends_on 'geos' => :optional depends_on 'postgresql' => :optional unless MacOS.version >= :lion - depends_on 'fcgi' if build.include? 'with-fastcgi' + depends_on 'fcgi' if build.with? "fastcgi" depends_on 'cairo' => :optional def install @@ -34,7 +34,7 @@ class Mapserver < Formula ] args << "--with-geos" if build.with? 'geos' - args << "--with-php=/usr/bin/php-config" if build.include? 'with-php' + args << "--with-php=/usr/bin/php-config" if build.with? "php" args << "--with-cairo" if build.with? 'cairo' if build.with? 'postgresql' @@ -45,7 +45,7 @@ class Mapserver < Formula end end - args << "--with-fastcgi=#{HOMEBREW_PREFIX}" if build.include? 'with-fastcgi' + args << "--with-fastcgi=#{HOMEBREW_PREFIX}" if build.with? "fastcgi" unless MacOS::CLT.installed? inreplace 'configure', "_JTOPDIR=`echo \"$_ACJNI_FOLLOWED\" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`", @@ -56,7 +56,7 @@ class Mapserver < Formula system "make" install_args = [] - install_args << "PHP_EXT_DIR=#{prefix}" if build.include? 'with-php' + install_args << "PHP_EXT_DIR=#{prefix}" if build.with? "php" system "make", "install", *install_args cd 'mapscript/python' do diff --git a/Library/Formula/mariadb.rb b/Library/Formula/mariadb.rb index 2b0bb6f7d..bc8d2f54a 100644 --- a/Library/Formula/mariadb.rb +++ b/Library/Formula/mariadb.rb @@ -75,7 +75,7 @@ class Mariadb < Formula -DCOMPILATION_COMMENT=Homebrew ] - args << "-DWITH_UNIT_TESTS=OFF" unless build.with? 'tests' + args << "-DWITH_UNIT_TESTS=OFF" if build.without? 'tests' # oqgraph requires boost, but fails to compile against boost 1.54 # Upstream bug: https://mariadb.atlassian.net/browse/MDEV-4795 @@ -85,7 +85,7 @@ class Mariadb < Formula args << "-DWITH_EMBEDDED_SERVER=ON" if build.with? 'embedded' # Compile with readline unless libedit is explicitly chosen - args << "-DWITH_READLINE=yes" unless build.with? 'libedit' + args << "-DWITH_READLINE=yes" if build.without? 'libedit' # Compile with ARCHIVE engine enabled if chosen args << "-DWITH_ARCHIVE_STORAGE_ENGINE=1" if build.with? 'archive-storage-engine' @@ -114,8 +114,8 @@ class Mariadb < Formula # See: https://github.com/Homebrew/homebrew/issues/4975 rm_rf prefix+'data' - (prefix+'mysql-test').rmtree unless build.with? 'tests' # save 121MB! - (prefix+'sql-bench').rmtree unless build.with? 'bench' + (prefix+'mysql-test').rmtree if build.without? 'tests' # save 121MB! + (prefix+'sql-bench').rmtree if build.without? 'bench' # Link the setup script into bin ln_s prefix+'scripts/mysql_install_db', bin+'mysql_install_db' diff --git a/Library/Formula/mdbtools.rb b/Library/Formula/mdbtools.rb index 3fd8668f2..7230333ed 100644 --- a/Library/Formula/mdbtools.rb +++ b/Library/Formula/mdbtools.rb @@ -8,7 +8,7 @@ class Mdbtools < Formula option 'with-man-pages', 'Build manual pages' depends_on 'pkg-config' => :build - depends_on 'txt2man' => :build if build.include? 'with-man-pages' + depends_on 'txt2man' => :build if build.with? "man-pages" depends_on 'glib' depends_on 'readline' @@ -20,7 +20,7 @@ class Mdbtools < Formula ENV.deparallelize args = ["--prefix=#{prefix}"] - args << "--disable-man" unless build.include? 'with-man-pages' + args << "--disable-man" if build.without? "man-pages" if MacOS.version == :snow_leopard # aclocal does not respect ACLOCAL_PATH on 10.6 diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb index 1bf60ecda..a1e0a8abf 100644 --- a/Library/Formula/mplayer.rb +++ b/Library/Formula/mplayer.rb @@ -14,7 +14,7 @@ class Mplayer < Formula depends_on 'libcaca' => :optional depends_on :x11 if build.with? 'x' - unless build.without? 'osd' or build.with? 'x' + if build.with? 'osd' or build.with? 'x' # These are required for the OSD. We can get them from X11, or we can # build our own. depends_on :fontconfig @@ -57,8 +57,8 @@ class Mplayer < Formula --disable-libopenjpeg ] - args << "--enable-menu" unless build.without? 'osd' - args << "--disable-x11" unless build.with? 'x' + args << "--enable-menu" if build.with? 'osd' + args << "--disable-x11" if build.without? 'x' args << "--enable-caca" if build.with? 'libcaca' system "./configure", *args @@ -78,7 +78,7 @@ index a1fba5f..5deaa80 100755 +++ b/configure @@ -49,8 +49,6 @@ if test -e ffmpeg/mp_auto_pull ; then fi - + if ! test -e ffmpeg ; then - echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" - read tmp diff --git a/Library/Formula/mu.rb b/Library/Formula/mu.rb index 1914cf1d6..6e57bde9c 100644 --- a/Library/Formula/mu.rb +++ b/Library/Formula/mu.rb @@ -38,7 +38,7 @@ class Mu < Formula def install # Explicitly tell the build not to include emacs support as the version # shipped by default with Mac OS X is too old. - ENV['EMACS'] = 'no' unless build.with? 'emacs' + ENV['EMACS'] = 'no' if build.without? 'emacs' # I dunno. # https://github.com/djcb/mu/issues/332 diff --git a/Library/Formula/mysql-cluster.rb b/Library/Formula/mysql-cluster.rb index 26bc3c65c..102a6faf4 100644 --- a/Library/Formula/mysql-cluster.rb +++ b/Library/Formula/mysql-cluster.rb @@ -50,23 +50,23 @@ class MysqlCluster < Formula "-DSYSCONFDIR=#{etc}"] # To enable unit testing at build, we need to download the unit testing suite - if build.include? 'with-tests' + if build.with? "tests" args << "-DENABLE_DOWNLOADS=ON" else args << "-DWITH_UNIT_TESTS=OFF" end # Build the embedded server - args << "-DWITH_EMBEDDED_SERVER=ON" if build.include? 'with-embedded' + args << "-DWITH_EMBEDDED_SERVER=ON" if build.with? "embedded" # Compile with readline unless libedit is explicitly chosen - args << "-DWITH_READLINE=yes" unless build.include? 'with-libedit' + args << "-DWITH_READLINE=yes" if build.without? "libedit" # Compile with ARCHIVE engine enabled if chosen - args << "-DWITH_ARCHIVE_STORAGE_ENGINE=1" if build.include? 'with-archive-storage-engine' + args << "-DWITH_ARCHIVE_STORAGE_ENGINE=1" if build.with? "archive-storage-engine" # Compile with BLACKHOLE engine enabled if chosen - args << "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" if build.include? 'with-blackhole-storage-engine' + args << "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" if build.with? "blackhole-storage-engine" # Make universal for binding to universal applications args << "-DCMAKE_OSX_ARCHITECTURES='#{Hardware::CPU.universal_archs.as_cmake_arch_flags}'" if build.universal? diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb index 8966c1647..554bd8212 100644 --- a/Library/Formula/nginx.rb +++ b/Library/Formula/nginx.rb @@ -72,11 +72,11 @@ class Nginx < Formula "--with-http_gzip_static_module" ] - args << passenger_config_args if build.include? 'with-passenger' - args << "--with-http_dav_module" if build.include? 'with-webdav' - args << "--with-debug" if build.include? 'with-debug' - args << "--with-http_spdy_module" if build.include? 'with-spdy' - args << "--with-http_gunzip_module" if build.include? 'with-gunzip' + args << passenger_config_args if build.with? "passenger" + args << "--with-http_dav_module" if build.with? "webdav" + args << "--with-debug" if build.with? "debug" + args << "--with-http_spdy_module" if build.with? "spdy" + args << "--with-http_gunzip_module" if build.with? "gunzip" if build.head? system "./auto/configure", *args diff --git a/Library/Formula/ngspice.rb b/Library/Formula/ngspice.rb index a92071dd2..a2ebbd8ee 100644 --- a/Library/Formula/ngspice.rb +++ b/Library/Formula/ngspice.rb @@ -8,7 +8,7 @@ class Ngspice < Formula option "with-x", "Build with X support" option "without-xspice", "Build without x-spice extensions" - depends_on :x11 if MacOS::X11.installed? or build.include? "with-x" + depends_on :x11 if MacOS::X11.installed? or build.with? "x" def install args = %W[ @@ -16,8 +16,8 @@ class Ngspice < Formula --prefix=#{prefix} --with-editline=yes ] - args << "--enable-x" if build.include? "with-x" - args << "--enable-xspice" unless build.include? "without-xspice" + args << "--enable-x" if build.with? "x" + args << "--enable-xspice" if build.with? "xspice" system "./configure", *args system "make install" diff --git a/Library/Formula/open-scene-graph.rb b/Library/Formula/open-scene-graph.rb index a64931ae2..2186f2066 100644 --- a/Library/Formula/open-scene-graph.rb +++ b/Library/Formula/open-scene-graph.rb @@ -41,7 +41,7 @@ class OpenSceneGraph < Formula ENV.cxx11 if build.cxx11? # Turning off FFMPEG takes this change or a dozen "-DFFMPEG_" variables - unless build.with? 'ffmpeg' + if build.without? 'ffmpeg' inreplace 'CMakeLists.txt', 'FIND_PACKAGE(FFmpeg)', '#FIND_PACKAGE(FFmpeg)' end diff --git a/Library/Formula/opensc.rb b/Library/Formula/opensc.rb index b33bef5e1..dc85bd851 100644 --- a/Library/Formula/opensc.rb +++ b/Library/Formula/opensc.rb @@ -15,7 +15,7 @@ class Opensc < Formula option 'with-man-pages', 'Build manual pages' - depends_on 'docbook' if build.include? 'with-man-pages' + depends_on 'docbook' if build.with? "man-pages" def install extra_args = [] diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb index 2d5bd7942..bc49b237c 100644 --- a/Library/Formula/pango.rb +++ b/Library/Formula/pango.rb @@ -19,7 +19,7 @@ class Pango < Formula depends_on 'cairo' depends_on 'harfbuzz' depends_on 'fontconfig' - depends_on :x11 unless build.without? 'x' + depends_on :x11 if build.with? 'x' depends_on 'gobject-introspection' fails_with :llvm do @@ -37,7 +37,7 @@ class Pango < Formula --enable-introspection=yes ] - if build.include? 'without-x' + if build.without? "x" args << '--without-xft' else args << '--with-xft' diff --git a/Library/Formula/pcb.rb b/Library/Formula/pcb.rb index 34e2f839f..fe346c47a 100644 --- a/Library/Formula/pcb.rb +++ b/Library/Formula/pcb.rb @@ -38,7 +38,7 @@ class Pcb < Formula "--prefix=#{prefix}", "--disable-update-desktop-database", "--disable-update-mime-database"] - args << "--disable-doc" unless build.with? 'doc' + args << "--disable-doc" if build.without? 'doc' system "./configure", *args @@ -56,9 +56,9 @@ index 15273a6..ff73ca7 100644 @@ -66,6 +66,7 @@ #include <dmalloc.h> #endif - + +typedef GLvoid (*_GLUfuncptr)(GLvoid); - + triangle_buffer buffer; float global_depth = 0; diff --git a/Library/Formula/pdnsrec.rb b/Library/Formula/pdnsrec.rb index 54922de5f..4e3480c96 100644 --- a/Library/Formula/pdnsrec.rb +++ b/Library/Formula/pdnsrec.rb @@ -16,7 +16,7 @@ class Pdnsrec < Formula ENV.O0 # Include Lua if requested - if build.include? 'with-lua' + if build.with? "lua" ENV['LUA'] = "1" ENV['LUA_CPPFLAGS_CONFIG'] = "-I#{Formula["lua"].opt_include}" ENV['LUA_LIBS_CONFIG'] = "-llua" diff --git a/Library/Formula/pdsh.rb b/Library/Formula/pdsh.rb index 03934d4b8..793e6ea60 100644 --- a/Library/Formula/pdsh.rb +++ b/Library/Formula/pdsh.rb @@ -24,7 +24,7 @@ class Pdsh < Formula "--without-xcpu"] args << '--with-genders' if build.with? 'genders' - args << ((build.include? 'without-dshgroups') ? '--without-dshgroups' : '--with-dshgroups') + args << ((build.without? "dshgroups") ? '--without-dshgroups' : '--with-dshgroups') system "./configure", *args system "make install" diff --git a/Library/Formula/pike.rb b/Library/Formula/pike.rb index 605a2003c..b176a7d8d 100644 --- a/Library/Formula/pike.rb +++ b/Library/Formula/pike.rb @@ -13,14 +13,14 @@ class Pike < Formula depends_on 'libtiff' => :recommended # optional dependencies - depends_on 'gettext' if build.include? 'with-gettext' or build.include? 'with-all' - depends_on 'gdbm' if build.include? 'with-gdbm' or build.include? 'with-all' - depends_on 'gtk+' if build.include? 'with-gtk2' or build.include? 'with-all' - depends_on 'mysql' if build.include? 'with-mysql' or build.include? 'with-all' - depends_on 'sdl' if build.include? 'with-sdl' or build.include? 'with-all' - depends_on 'sane-backends' if build.include? 'with-sane' or build.include? 'with-all' - depends_on 'pdflib-lite' if build.include? 'with-pdf' or build.include? 'with-all' - depends_on 'mesalib-glw' if build.include? 'with-gl' or build.include? 'with-all' + depends_on 'gettext' if build.with? "gettext" or build.with? "all" + depends_on 'gdbm' if build.with? "gdbm" or build.with? "all" + depends_on 'gtk+' if build.with? "gtk2" or build.with? "all" + depends_on 'mysql' if build.with? "mysql" or build.with? "all" + depends_on 'sdl' if build.with? "sdl" or build.with? "all" + depends_on 'sane-backends' if build.with? "sane" or build.with? "all" + depends_on 'pdflib-lite' if build.with? "pdf" or build.with? "all" + depends_on 'mesalib-glw' if build.with? "gl" or build.with? "all" option 'with-gettext', 'Include Gettext support' option 'with-gdbm', 'Include Gdbm support' @@ -50,7 +50,7 @@ class Pike < Formula args << "--with-abi=32" end - unless build.include? 'with-machine-code' + if build.without? "machine-code" args << "--without-machine-code" end diff --git a/Library/Formula/plplot.rb b/Library/Formula/plplot.rb index 21f3197b8..60d861b2f 100644 --- a/Library/Formula/plplot.rb +++ b/Library/Formula/plplot.rb @@ -15,7 +15,7 @@ class Plplot < Formula def install args = std_cmake_args args << '-DPLD_wxwidgets=OFF' << '-DENABLE_wxwidgets=OFF' - args << '-DENABLE_java=OFF' unless build.with? 'java' + args << '-DENABLE_java=OFF' if build.without? 'java' args << '-DPLD_xcairo=OFF' unless MacOS::X11.installed? mkdir "plplot-build" do system "cmake", "..", *args diff --git a/Library/Formula/portmidi.rb b/Library/Formula/portmidi.rb index 259ced5ab..4a92124db 100644 --- a/Library/Formula/portmidi.rb +++ b/Library/Formula/portmidi.rb @@ -14,7 +14,7 @@ class Portmidi < Formula def patches # Avoid that the Makefile.osx builds the java app and fails because: fatal error: 'jni.h' file not found # Since 217 the Makefile.osx includes pm_common/CMakeLists.txt wich builds the Java app - DATA unless build.include? 'with-java' + DATA if build.without? "java" end def install diff --git a/Library/Formula/postgis.rb b/Library/Formula/postgis.rb index a35bfe3c7..c8843c286 100644 --- a/Library/Formula/postgis.rb +++ b/Library/Formula/postgis.rb @@ -18,7 +18,7 @@ class Postgis < Formula depends_on 'proj' depends_on 'geos' - depends_on 'gtk+' if build.include? 'with-gui' + depends_on 'gtk+' if build.with? "gui" # For GeoJSON and raster handling depends_on 'json-c' @@ -47,7 +47,7 @@ class Postgis < Formula # gettext installations are. "--disable-nls" ] - args << '--with-gui' if build.include? 'with-gui' + args << '--with-gui' if build.with? "gui" system './autogen.sh' system './configure', *args diff --git a/Library/Formula/postgres-xc.rb b/Library/Formula/postgres-xc.rb index 8fdaa87f5..7bc039f53 100644 --- a/Library/Formula/postgres-xc.rb +++ b/Library/Formula/postgres-xc.rb @@ -46,13 +46,13 @@ class PostgresXc < Formula "--with-libxml", "--with-libxslt"] - args << "--with-ossp-uuid" unless build.without? 'ossp-uuid' + args << "--with-ossp-uuid" if build.with? 'ossp-uuid' args << "--with-python" if build.with? 'python' args << "--with-perl" unless build.include? 'no-perl' args << "--enable-dtrace" if build.include? 'enable-dtrace' args << "ARCHFLAGS='-arch x86_64'" - unless build.without? 'ossp-uuid' + if build.with? 'ossp-uuid' ENV.append 'CFLAGS', `uuid-config --cflags`.strip ENV.append 'LDFLAGS', `uuid-config --ldflags`.strip ENV.append 'LIBS', `uuid-config --libs`.strip diff --git a/Library/Formula/proof-general.rb b/Library/Formula/proof-general.rb index ca0d0daf6..6d8b66caa 100644 --- a/Library/Formula/proof-general.rb +++ b/Library/Formula/proof-general.rb @@ -57,13 +57,13 @@ class ProofGeneral < Formula man1.install "doc/proofgeneral.1" info.install "doc/ProofGeneral.info", "doc/PG-adapting.info" - doc.install "doc/ProofGeneral", "doc/PG-adapting" if build.include? 'with-doc' + doc.install "doc/ProofGeneral", "doc/PG-adapting" if build.with? "doc" end end def caveats doc = "" - if build.include? 'with-doc' + if build.with? "doc" doc += <<-EOS.undent HTML documentation is available in: #{HOMEBREW_PREFIX}/share/doc/proof-general diff --git a/Library/Formula/pulseaudio.rb b/Library/Formula/pulseaudio.rb index 126b44bee..7cc4fbd88 100644 --- a/Library/Formula/pulseaudio.rb +++ b/Library/Formula/pulseaudio.rb @@ -42,7 +42,7 @@ class Pulseaudio < Formula args << "--with-mac-sysroot=#{MacOS.sdk_path}" args << "--with-mac-version-min=#{MacOS.version}" - args << "--disable-nls" unless build.with? "nls" + args << "--disable-nls" if build.without? "nls" if build.universal? args << "--enable-mac-universal" diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb index 02c5ba2d0..6425261ce 100644 --- a/Library/Formula/python.rb +++ b/Library/Formula/python.rb @@ -111,7 +111,7 @@ class Python < Formula # HAVE_POLL is "broken" on OS X # See: http://trac.macports.org/ticket/18376 and http://bugs.python.org/issue5154 - inreplace 'pyconfig.h', /.*?(HAVE_POLL[_A-Z]*).*/, '#undef \1' unless build.with? "poll" + inreplace 'pyconfig.h', /.*?(HAVE_POLL[_A-Z]*).*/, '#undef \1' if build.without? "poll" system "make" @@ -328,7 +328,7 @@ index 716f08e..66114ef 100644 - if (host_platform == 'darwin' and - self.detect_tkinter_darwin(inc_dirs, lib_dirs)): - return - + # Assume we haven't found any of the libraries or include files # The versions with dots are used on Unix, and the versions without @@ -1858,21 +1855,6 @@ class PyBuildExt(build_ext): @@ -350,16 +350,16 @@ index 716f08e..66114ef 100644 - # Assume default location for X11 - include_dirs.append('/usr/X11/include') - added_lib_dirs.append('/usr/X11/lib') - + # If Cygwin, then verify that X is installed before proceeding if host_platform == 'cygwin': @@ -1897,9 +1879,6 @@ class PyBuildExt(build_ext): if host_platform in ['aix3', 'aix4']: libs.append('ld') - + - # Finally, link with the X11 libraries (not appropriate on cygwin) - if host_platform != "cygwin": - libs.append('X11') - + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], define_macros=[('WITH_APPINIT', 1)] + defs, diff --git a/Library/Formula/python3.rb b/Library/Formula/python3.rb index 9d1ed493d..985b64934 100644 --- a/Library/Formula/python3.rb +++ b/Library/Formula/python3.rb @@ -185,7 +185,7 @@ class Python3 < Formula ldflags += " -isysroot #{MacOS.sdk_path}" # Same zlib.h-not-found-bug as in env :std (see below) args << "CPPFLAGS=-I#{MacOS.sdk_path}/usr/include" - unless build.with? 'brewed-tk' + if build.without? 'brewed-tk' cflags += " -I#{MacOS.sdk_path}/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers" end end diff --git a/Library/Formula/qd.rb b/Library/Formula/qd.rb index 885f77ca0..ccbf93440 100644 --- a/Library/Formula/qd.rb +++ b/Library/Formula/qd.rb @@ -9,7 +9,7 @@ class Qd < Formula def install args = ["--disable-dependency-tracking", "--enable-shared", "--prefix=#{prefix}"] - args << "--enable-fortran=no" unless build.with? :fortran + args << "--enable-fortran=no" if build.without? :fortran system "./configure", *args system "make" system "make check" diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb index c939c2c77..75108f8df 100644 --- a/Library/Formula/qt.rb +++ b/Library/Formula/qt.rb @@ -34,9 +34,9 @@ class Qt < Formula depends_on "d-bus" => :optional depends_on "mysql" => :optional - odie 'qt: --with-qtdbus has been renamed to --with-d-bus' if build.include? 'with-qtdbus' - odie 'qt: --with-demos-examples is no longer supported' if build.include? 'with-demos-examples' - odie 'qt: --with-debug-and-release is no longer supported' if build.include? 'with-debug-and-release' + odie 'qt: --with-qtdbus has been renamed to --with-d-bus' if build.with? "qtdbus" + odie 'qt: --with-demos-examples is no longer supported' if build.with? "demos-examples" + odie 'qt: --with-debug-and-release is no longer supported' if build.with? "debug-and-release" def install ENV.universal_binary if build.universal? diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb index 5fb8bfa4b..0d40c95bb 100644 --- a/Library/Formula/qt5.rb +++ b/Library/Formula/qt5.rb @@ -36,9 +36,9 @@ class Qt5 < Formula depends_on "d-bus" => :optional depends_on "mysql" => :optional - odie 'qt5: --with-qtdbus has been renamed to --with-d-bus' if build.include? 'with-qtdbus' - odie 'qt5: --with-demos-examples is no longer supported' if build.include? 'with-demos-examples' - odie 'qt5: --with-debug-and-release is no longer supported' if build.include? 'with-debug-and-release' + odie 'qt5: --with-qtdbus has been renamed to --with-d-bus' if build.with? "qtdbus" + odie 'qt5: --with-demos-examples is no longer supported' if build.with? "demos-examples" + odie 'qt5: --with-debug-and-release is no longer supported' if build.with? "debug-and-release" def install # fixed hardcoded link to plugin dir: https://bugreports.qt-project.org/browse/QTBUG-29188 diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb index 46f3ccba0..95be8c1da 100644 --- a/Library/Formula/ruby.rb +++ b/Library/Formula/ruby.rb @@ -38,8 +38,8 @@ class Ruby < Formula args = %W[--prefix=#{prefix} --enable-shared --disable-silent-rules] args << "--program-suffix=21" if build.with? "suffix" args << "--with-arch=#{Hardware::CPU.universal_archs.join(',')}" if build.universal? - args << "--with-out-ext=tk" unless build.with? "tcltk" - args << "--disable-install-doc" unless build.with? "doc" + args << "--with-out-ext=tk" if build.without? "tcltk" + args << "--disable-install-doc" if build.without? "doc" args << "--disable-dtrace" unless MacOS::CLT.installed? paths = [ @@ -94,7 +94,7 @@ index 3911f8f..74d1ab7 100644 @@ -1416,15 +1416,6 @@ timer_thread_sleep(rb_global_vm_lock_t* unused) } #endif /* USE_SLEEPY_TIMER_THREAD */ - + -#if defined(__linux__) && defined(PR_SET_NAME) -# define SET_THREAD_NAME(name) prctl(PR_SET_NAME, name) -#elif defined(__APPLE__) @@ -108,13 +108,13 @@ index 3911f8f..74d1ab7 100644 thread_timer(void *p) { @@ -1432,7 +1423,9 @@ thread_timer(void *p) - + if (TT_DEBUG) WRITE_CONST(2, "start timer thread\n"); - + - SET_THREAD_NAME("ruby-timer-thr"); +#if defined(__linux__) && defined(PR_SET_NAME) + prctl(PR_SET_NAME, "ruby-timer-thr"); +#endif - + #if !USE_SLEEPY_TIMER_THREAD native_mutex_initialize(&timer_thread_lock); diff --git a/Library/Formula/sbcl.rb b/Library/Formula/sbcl.rb index e38946009..59786e48f 100644 --- a/Library/Formula/sbcl.rb +++ b/Library/Formula/sbcl.rb @@ -46,9 +46,9 @@ class Sbcl < Formula def write_features features = [] - features << ":sb-thread" unless build.include? "without-threads" - features << ":sb-ldb" if build.include? "with-ldb" - features << ":sb-xref-for-internals" if build.include? "with-internal-xref" + features << ":sb-thread" if build.with? "threads" + features << ":sb-ldb" if build.with? "ldb" + features << ":sb-xref-for-internals" if build.with? "internal-xref" File.open("customize-target-features.lisp", "w") do |file| file.puts "(lambda (list)" diff --git a/Library/Formula/shmcat.rb b/Library/Formula/shmcat.rb index 78d94c672..70c290f76 100644 --- a/Library/Formula/shmcat.rb +++ b/Library/Formula/shmcat.rb @@ -8,15 +8,15 @@ class Shmcat < Formula option 'with-ftok', "Build the ftok utility" option 'with-nls', "Use Native Language Support" - depends_on 'gettext' if build.include? 'with-nls' + depends_on 'gettext' if build.with? "nls" def install args = %W[ --disable-dependency-tracking --prefix=#{prefix} ] - args << "--disable-ftok" unless build.include? 'with-ftok' - if build.include? 'with-nls' + args << "--disable-ftok" if build.without? "ftok" + if build.with? "nls" gettext = Formula['gettext'] args << "--with-libintl-prefix=#{gettext.include}" else diff --git a/Library/Formula/slicot.rb b/Library/Formula/slicot.rb index 7b5125dc0..578a19a0d 100644 --- a/Library/Formula/slicot.rb +++ b/Library/Formula/slicot.rb @@ -22,7 +22,7 @@ class Slicot < Formula lib.install "#{slicotlibname}" system "make", "clean" - if build.include? 'with-default-integer-8' + if build.with? "default-integer-8" slicotlibname = "libslicot64_pic.a" system "make", "lib", "OPTS=-fPIC -fdefault-integer-8", "SLICOTLIB=../#{slicotlibname}", *args lib.install "#{slicotlibname}" diff --git a/Library/Formula/snownews.rb b/Library/Formula/snownews.rb index 8097ddfd7..d3dbf6d1e 100644 --- a/Library/Formula/snownews.rb +++ b/Library/Formula/snownews.rb @@ -7,7 +7,7 @@ class Snownews < Formula option 'without-nls', "Build without translations" - depends_on 'gettext' unless build.without? 'nls' + depends_on 'gettext' if build.with? 'nls' # Fix zlib linking issue on OS X # snownews author assisted on quest creating this working Formula. diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb index 58633b872..058fe01c7 100644 --- a/Library/Formula/sqlite.rb +++ b/Library/Formula/sqlite.rb @@ -37,7 +37,7 @@ class Sqlite < Formula end def install - ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_RTREE" unless build.without? "rtree" + ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_RTREE" if build.with? "rtree" ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS" if build.with? "fts" ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_COLUMN_METADATA" diff --git a/Library/Formula/ssreflect.rb b/Library/Formula/ssreflect.rb index 9b1b0fb39..f48607f18 100644 --- a/Library/Formula/ssreflect.rb +++ b/Library/Formula/ssreflect.rb @@ -21,7 +21,7 @@ class Ssreflect < Formula ENV.j1 # Enable static linking. - if build.include? 'with-static' + if build.with? "static" inreplace 'Make' do |s| s.gsub! /#\-custom/, '-custom' s.gsub! /#SSRCOQ/, 'SSRCOQ' @@ -34,12 +34,12 @@ class Ssreflect < Formula "DSTROOT=#{prefix}/"] system "make", *args system "make", "install", *args - if build.include? 'with-doc' + if build.with? "doc" system "make", "-f", "Makefile.coq", "html", *args system "make", "-f", "Makefile.coq", "mlihtml", *args system "make", "-f", "Makefile.coq", "install-doc", *args end - bin.install 'bin/ssrcoq.byte', 'bin/ssrcoq' if build.include? 'with-static' + bin.install 'bin/ssrcoq.byte', 'bin/ssrcoq' if build.with? "static" (share/'ssreflect').install "pg-ssr.el" end diff --git a/Library/Formula/strongswan.rb b/Library/Formula/strongswan.rb index 1e348b409..2d858987e 100644 --- a/Library/Formula/strongswan.rb +++ b/Library/Formula/strongswan.rb @@ -8,7 +8,7 @@ class Strongswan < Formula option 'with-curl', 'Build with libcurl based fetcher' option 'with-suite-b', 'Build with Suite B support (does not use the IPsec implementation provided by the kernel)' - depends_on 'openssl' if build.include? 'with-suite-b' or MacOS.version <= :leopard + depends_on 'openssl' if build.with? "suite-b" or MacOS.version <= :leopard depends_on 'curl' => :optional def install @@ -46,7 +46,7 @@ class Strongswan < Formula --enable-xauth-generic ] args << "--enable-curl" if build.with? 'curl' - args << "--enable-kernel-pfkey" unless build.with? 'suite-b' + args << "--enable-kernel-pfkey" if build.without? 'suite-b' args << "--enable-kernel-libipsec" if build.with? 'suite-b' system "./configure", *args diff --git a/Library/Formula/swi-prolog.rb b/Library/Formula/swi-prolog.rb index 90829df26..f07370733 100644 --- a/Library/Formula/swi-prolog.rb +++ b/Library/Formula/swi-prolog.rb @@ -23,7 +23,7 @@ class SwiProlog < Formula depends_on 'readline' depends_on 'gmp' - if build.include? 'with-xpce' + if build.with? "xpce" depends_on 'pkg-config' => :build depends_on :x11 depends_on 'jpeg' @@ -42,8 +42,8 @@ class SwiProlog < Formula def install args = ["--prefix=#{libexec}", "--mandir=#{man}"] - ENV.append 'DISABLE_PKGS', "jpl" unless build.include? "with-jpl" - ENV.append 'DISABLE_PKGS', "xpce" unless build.include? 'with-xpce' + ENV.append 'DISABLE_PKGS', "jpl" if build.without? "jpl" + ENV.append 'DISABLE_PKGS', "xpce" if build.without? "xpce" # SWI-Prolog's Makefiles don't add CPPFLAGS to the compile command, but do # include CIFLAGS. Setting it here. Also, they clobber CFLAGS, so including diff --git a/Library/Formula/thrift.rb b/Library/Formula/thrift.rb index a3a2d6032..a426133be 100644 --- a/Library/Formula/thrift.rb +++ b/Library/Formula/thrift.rb @@ -49,12 +49,12 @@ class Thrift < Formula exclusions = ["--without-ruby", "--without-tests", "--without-php_extension"] - exclusions << "--without-python" unless build.with? "python" - exclusions << "--without-haskell" unless build.include? "with-haskell" - exclusions << "--without-java" unless build.include? "with-java" - exclusions << "--without-perl" unless build.include? "with-perl" - exclusions << "--without-php" unless build.include? "with-php" - exclusions << "--without-erlang" unless build.include? "with-erlang" + exclusions << "--without-python" if build.without? "python" + exclusions << "--without-haskell" if build.without? "haskell" + exclusions << "--without-java" if build.without? "java" + exclusions << "--without-perl" if build.without? "perl" + exclusions << "--without-php" if build.without? "php" + exclusions << "--without-erlang" if build.without? "erlang" ENV.cxx11 if MacOS.version >= :mavericks && ENV.compiler == :clang diff --git a/Library/Formula/transmission.rb b/Library/Formula/transmission.rb index f2f0df0d2..21b46e347 100644 --- a/Library/Formula/transmission.rb +++ b/Library/Formula/transmission.rb @@ -26,7 +26,7 @@ class Transmission < Formula --disable-mac --without-gtk] - args << "--disable-nls" unless build.with? 'nls' + args << "--disable-nls" if build.without? 'nls' #fixes issue w/ webui files not being found #21151 #submitted upstream: https://trac.transmissionbt.com/ticket/5304 diff --git a/Library/Formula/vim.rb b/Library/Formula/vim.rb index a67ab019b..b123a8b02 100644 --- a/Library/Formula/vim.rb +++ b/Library/Formula/vim.rb @@ -45,7 +45,7 @@ class Vim < Formula "--enable-#{language}interp" if build.with? language end opts += LANGUAGES_DEFAULT.map do |language| - "--enable-#{language}interp" unless build.without? language + "--enable-#{language}interp" if build.with? language end if opts.include? "--enable-pythoninterp" and opts.include? "--enable-python3interp" opts = opts - %W[--enable-pythoninterp --enable-python3interp] + %W[--enable-pythoninterp=dynamic --enable-python3interp=dynamic] diff --git a/Library/Formula/vorbis-tools.rb b/Library/Formula/vorbis-tools.rb index 040d47aea..a3846e43b 100644 --- a/Library/Formula/vorbis-tools.rb +++ b/Library/Formula/vorbis-tools.rb @@ -19,7 +19,7 @@ class VorbisTools < Formula "--prefix=#{prefix}" ] - args << "--without-flac" unless build.with? 'flac' + args << "--without-flac" if build.without? 'flac' system "./configure", *args system "make install" diff --git a/Library/Formula/weechat.rb b/Library/Formula/weechat.rb index 0ad48711d..ef119c3a9 100644 --- a/Library/Formula/weechat.rb +++ b/Library/Formula/weechat.rb @@ -29,12 +29,12 @@ class Weechat < Formula -DPREFIX=#{prefix} -DENABLE_GTK=OFF ] - args << '-DENABLE_LUA=OFF' unless build.with? 'lua' - args << '-DENABLE_PERL=OFF' unless build.with? 'perl' - args << '-DENABLE_RUBY=OFF' unless build.with? 'ruby' - args << '-DENABLE_ASPELL=OFF' unless build.with? 'aspell' - args << '-DENABLE_GUILE=OFF' unless build.with? 'guile' - args << '-DENABLE_PYTHON=OFF' unless build.with? 'python' + args << '-DENABLE_LUA=OFF' if build.without? 'lua' + args << '-DENABLE_PERL=OFF' if build.without? 'perl' + args << '-DENABLE_RUBY=OFF' if build.without? 'ruby' + args << '-DENABLE_ASPELL=OFF' if build.without? 'aspell' + args << '-DENABLE_GUILE=OFF' if build.without? 'guile' + args << '-DENABLE_PYTHON=OFF' if build.without? 'python' # NLS/gettext support disabled for now since it doesn't work in stdenv # see https://github.com/Homebrew/homebrew/issues/18722 diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb index c3dbcad02..dbdae3a9a 100644 --- a/Library/Formula/wine.rb +++ b/Library/Formula/wine.rb @@ -87,7 +87,7 @@ class Wine < Formula def library_path paths = %W[#{HOMEBREW_PREFIX}/lib /usr/lib] - paths.unshift(MacOS::X11.lib) unless build.without? 'x11' + paths.unshift(MacOS::X11.lib) if build.with? 'x11' paths.join(':') end @@ -122,7 +122,7 @@ class Wine < Formula # separately and not built universal, it's going to get picked up and break the build. # We cannot use FREETYPE_LIBS because it is inserted after LDFLAGS and thus cannot # take precedence over the homebrew freetype. - ENV.prepend "LDFLAGS", "-L#{MacOS::X11.lib}" unless build.without? 'x11' + ENV.prepend "LDFLAGS", "-L#{MacOS::X11.lib}" if build.with? 'x11' args = ["--prefix=#{prefix}"] args << "--disable-win16" if MacOS.version <= :leopard or ENV.compiler == :clang @@ -166,7 +166,7 @@ class Wine < Formula http://bugs.winehq.org/show_bug.cgi?id=31374 EOS - unless build.without? 'x11' + if build.with? 'x11' s += <<-EOS.undent By default Wine uses a native Mac driver. To switch to the X11 driver, use diff --git a/Library/Formula/wireshark.rb b/Library/Formula/wireshark.rb index fc03c0304..30328287e 100644 --- a/Library/Formula/wireshark.rb +++ b/Library/Formula/wireshark.rb @@ -60,8 +60,8 @@ class Wireshark < Formula "--with-ssl"] args << "--disable-warnings-as-errors" if build.head? - args << "--disable-wireshark" unless build.with? "x" or build.with? "qt" - args << "--disable-gtktest" unless build.with? "x" + args << "--disable-wireshark" if build.without? "x" or build.with? "qt" + args << "--disable-gtktest" if build.without? "x" args << "--with-qt" if build.with? "qt" system "./configure", *args @@ -120,7 +120,7 @@ index cd41b63..c473fe7 100755 $as_echo "yes" >&6; } ;; esac - + # - # Add a -mmacosx-version-min flag to force tests that - # use the compiler, as well as the build itself, not to, diff --git a/Library/Formula/x3270.rb b/Library/Formula/x3270.rb index 0f298bbc8..7669a6149 100644 --- a/Library/Formula/x3270.rb +++ b/Library/Formula/x3270.rb @@ -23,9 +23,9 @@ class X3270 < Formula def install make_directory 'x3270-3.3' - make_directory 'c3270-3.3' if build.include? "with-c3270" - make_directory 'pr3287-3.3' if build.include? "with-pr3287" - make_directory 's3270-3.3' if build.include? "with-s3270" - make_directory 'tcl3270-3.3' if build.include? "with-tcl3270" + make_directory 'c3270-3.3' if build.with? "c3270" + make_directory 'pr3287-3.3' if build.with? "pr3287" + make_directory 's3270-3.3' if build.with? "s3270" + make_directory 'tcl3270-3.3' if build.with? "tcl3270" end end diff --git a/Library/Formula/xplanet.rb b/Library/Formula/xplanet.rb index f38cb6c80..5b6f603f9 100644 --- a/Library/Formula/xplanet.rb +++ b/Library/Formula/xplanet.rb @@ -18,7 +18,7 @@ class Xplanet < Formula --disable-dependency-tracking --prefix=#{prefix} ] - if build.include? "with-x" + if build.with? "x" args << "--with-x" else args << "--with-aqua" << "--without-x" diff --git a/Library/Formula/yaws.rb b/Library/Formula/yaws.rb index 7149b83dd..353b48946 100644 --- a/Library/Formula/yaws.rb +++ b/Library/Formula/yaws.rb @@ -29,7 +29,7 @@ class Yaws < Formula system "./configure", "--prefix=#{prefix}" system "make install" - unless build.include? 'without-yapp' + if build.with? "yapp" cd 'applications/yapp' do system "make" system "make install" diff --git a/Library/Formula/zabbix.rb b/Library/Formula/zabbix.rb index 23cc75077..e05fabf00 100644 --- a/Library/Formula/zabbix.rb +++ b/Library/Formula/zabbix.rb @@ -10,7 +10,7 @@ class Zabbix < Formula unless build.include? 'agent-only' depends_on :mysql => :optional - depends_on :postgresql unless build.with? 'mysql' + depends_on :postgresql if build.without? 'mysql' depends_on 'fping' depends_on 'libssh2' end diff --git a/Library/Formula/zeromq.rb b/Library/Formula/zeromq.rb index fab5b3b1c..f61ac862d 100644 --- a/Library/Formula/zeromq.rb +++ b/Library/Formula/zeromq.rb @@ -18,14 +18,14 @@ class Zeromq < Formula option 'with-pgm', 'Build with PGM extension' depends_on 'pkg-config' => :build - depends_on 'libpgm' if build.include? 'with-pgm' + depends_on 'libpgm' if build.with? "pgm" depends_on 'libsodium' => :optional def install ENV.universal_binary if build.universal? args = ["--disable-dependency-tracking", "--prefix=#{prefix}"] - if build.include? 'with-pgm' + if build.with? "pgm" # Use HB libpgm-5.2 because their internal 5.1 is b0rked. ENV['OpenPGM_CFLAGS'] = %x[pkg-config --cflags openpgm-5.2].chomp ENV['OpenPGM_LIBS'] = %x[pkg-config --libs openpgm-5.2].chomp |