From 6fd0336324ee953eb5c7192b843d1e831a9ad2c4 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:06 +0200 Subject: [PATCH 01/33] bash-snippets: remove some options --- Formula/bash-snippets.rb | 54 ++++++---------------------------------- 1 file changed, 7 insertions(+), 47 deletions(-) diff --git a/Formula/bash-snippets.rb b/Formula/bash-snippets.rb index 6b34f40c5df5..47035b97eb75 100644 --- a/Formula/bash-snippets.rb +++ b/Formula/bash-snippets.rb @@ -6,57 +6,17 @@ class BashSnippets < Formula bottle :unneeded - option "with-bash-snippets", "Install bash-snippets gui" - option "with-cheat", "Install cheat" - option "with-cloudup", "Install cloudup" - option "with-crypt", "Install crypt" - option "with-cryptocurrency", "Install cryptocurrency" - option "with-currency", "Install currency" - option "with-geo", "Install geo" - option "with-lyrics", "Install lyrics" - option "with-meme", "Install meme" - option "with-movies", "Install movies" - option "with-newton", "Install newton" - option "with-pwned", "Install pwned" - option "with-qrify", "Install qrify" - option "with-short", "Install short" - option "with-siteciphers", "Install siteciphers" - option "with-stocks", "Install stocks" - option "with-taste", "Install taste" - option "with-todo", "Install todo" - option "with-transfer", "Install transfer" - option "with-weather", "Install weather" - option "with-ytview", "Install ytview" - option "without-all-tools", "Do not install all available snippets" - - if build.with?("all-tools") || build.with?("cheat") - conflicts_with "cheat", :because => "Both install a `cheat` executable" - end + conflicts_with "cheat", :because => "Both install a `cheat` executable" def install - if build.with? "all-tools" - system "./install.sh", "--prefix=#{prefix}", "all" - else - args = [] - %w[bash-snippets cheat cloudup crypt cryptocurrency currency geo lyrics movies newton qrify - short siteciphers stocks taste todo transfer weather ytview].each do |tool| - args << tool if build.with? tool - end - system "./install.sh", "--prefix=#{prefix}", *args - end + system "./install.sh", "--prefix=#{prefix}", "all" end test do - if build.with?("all-tools") || build.with?("weather") - output = shell_output("#{bin}/weather Paramus").lines.first - assert_equal "Weather report: Paramus, United States of America", output.chomp - end - if build.with?("all-tools") || build.with?("qrify") - output = shell_output("#{bin}/qrify This is a test") - assert_match "████ ▄▄▄▄▄ █▀ █▀▄█ ▄▄▄▄▄ ████", output - end - if build.with?("all-tools") || build.with?("stocks") - assert_match "AAPL stock info", shell_output("#{bin}/stocks Apple") - end + output = shell_output("#{bin}/weather Paramus").lines.first.chomp + assert_equal "Weather report: Paramus, United States of America", output + output = shell_output("#{bin}/qrify This is a test") + assert_match "████ ▄▄▄▄▄ █▀ █▀▄█ ▄▄▄▄▄ ████", output + assert_match "AAPL stock info", shell_output("#{bin}/stocks Apple") end end From d131d6f9b616d5c498092c9ba6b48d69ff9ff9b8 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:06 +0200 Subject: [PATCH 02/33] bup: remove some options --- Formula/bup.rb | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/Formula/bup.rb b/Formula/bup.rb index 548a645bd780..4705fa73fba5 100644 --- a/Formula/bup.rb +++ b/Formula/bup.rb @@ -13,14 +13,7 @@ class Bup < Formula sha256 "462b39a188a6fd32d9df4812a629b3bf8692f38439125d98e58e306261277903" => :yosemite end - option "with-pandoc", "Build and install the manpages" - option "with-test", "Run unit tests after compilation" - option "without-web", "Build without repository access via `bup web`" - - deprecated_option "run-tests" => "with-test" - deprecated_option "with-tests" => "with-test" - - depends_on "pandoc" => [:optional, :build] + depends_on "pandoc" => :build depends_on "python@2" resource "backports_abc" do @@ -60,23 +53,18 @@ def install if test -n \"$run_test\"; then EOS - if build.with? "web" - ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages" - resources.each do |r| - r.stage do - system "python", *Language::Python.setup_install_args(libexec/"vendor") - end + ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages" + resources.each do |r| + r.stage do + system "python", *Language::Python.setup_install_args(libexec/"vendor") end end system "make" - system "make", "test" if build.bottle? || build.with?("test") system "make", "install", "DESTDIR=#{prefix}", "PREFIX=" - if build.with? "web" - mv bin/"bup", libexec/"bup.py" - (bin/"bup").write_env_script libexec/"bup.py", :PYTHONPATH => ENV["PYTHONPATH"] - end + mv bin/"bup", libexec/"bup.py" + (bin/"bup").write_env_script libexec/"bup.py", :PYTHONPATH => ENV["PYTHONPATH"] end test do From 40b19dc36e5cbe877153263bec6ec4b1d6420459 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:06 +0200 Subject: [PATCH 03/33] dar: remove some options --- Formula/dar.rb | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/Formula/dar.rb b/Formula/dar.rb index ddeb139a0c87..681f6ab79d3e 100644 --- a/Formula/dar.rb +++ b/Formula/dar.rb @@ -11,39 +11,23 @@ class Dar < Formula sha256 "0f3d68d33877c3d98b9d8fbacdbd52c54569ccc1a46130ecec244415c58c5c73" => :el_capitan end - option "with-doxygen", "build libdar API documentation and html man page" - option "with-libgcrypt", "enable strong encryption support" - option "with-lzo", "enable lzo compression support" - option "with-upx", "make executables compressed at installation time" - - deprecated_option "with-docs" => "with-doxygen" - depends_on :macos => :el_capitan # needs thread-local storage - depends_on "doxygen" => [:build, :optional] - depends_on "upx" => [:build, :optional] - depends_on "libgcrypt" => :optional - depends_on "lzo" => :optional - depends_on "xz" => :optional needs :cxx11 def install ENV.cxx11 - args = %W[ - --enable-mode=64 - --disable-debug - --disable-dependency-tracking - --disable-dar-static - --prefix=#{prefix} - ] - args << "--disable-build-html" if build.without? "doxygen" - args << "--disable-upx" if build.without? "upx" - args << "--disable-libgcrypt-linking" if build.without? "libgcrypt" - args << "--disable-liblzo2-linking" if build.without? "lzo" - args << "--disable-libxz-linking" if build.without? "xz" - - system "./configure", *args + system "./configure", "--prefix=#{prefix}", + "--disable-build-html", + "--disable-dar-static", + "--disable-debug", + "--disable-dependency-tracking", + "--disable-libgcrypt-linking", + "--disable-liblzo2-linking", + "--disable-libxz-linking", + "--disable-upx", + "--enable-mode=64" system "make", "install" end From ee3c3a9203ef6e44ef15febd947f665b2e486883 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:06 +0200 Subject: [PATCH 04/33] git: remove some options --- Formula/git.rb | 54 ++++++++------------------------------------------ 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/Formula/git.rb b/Formula/git.rb index c548d5e2dbda..42ef306750a7 100644 --- a/Formula/git.rb +++ b/Formula/git.rb @@ -12,17 +12,9 @@ class Git < Formula sha256 "cb0c4eac4a49fbd1936bae4070ecac3c3543aecfb2ba09869f6f6fd2aeb11015" => :el_capitan end - option "with-blk-sha1", "Compile with the block-optimized SHA1 implementation" - option "without-completions", "Disable bash/zsh completions from 'contrib' directory" - option "with-subversion", "Use Homebrew's version of SVN" - option "with-persistent-https", "Build git-remote-persistent-https from 'contrib' directory" - - deprecated_option "with-brewed-svn" => "with-subversion" deprecated_option "with-pcre" => "with-pcre2" depends_on "pcre2" => :optional - depends_on "gettext" => :optional - depends_on "go" => :build if build.with? "persistent-https" if MacOS.version < :yosemite depends_on "openssl" @@ -38,14 +30,6 @@ class Git < Formula depends_on "curl" => :optional end - if build.with? "subversion" - depends_on "subversion" - depends_on "perl" => :recommended - else - option "with-perl", "Build against Homebrew's Perl rather than system default" - depends_on "perl" => :optional - end - resource "html" do url "https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.18.0.tar.xz" sha256 "5b70d9b1f86aad464ae172040eb87da83058c00581388af6f60b050214912efc" @@ -60,22 +44,15 @@ def install # If these things are installed, tell Git build system not to use them ENV["NO_FINK"] = "1" ENV["NO_DARWIN_PORTS"] = "1" - ENV["V"] = "1" # build verbosely + ENV["NO_GETTEXT"] = "1" ENV["NO_R_TO_GCC_LINKER"] = "1" # pass arguments to LD correctly ENV["PYTHON_PATH"] = which("python") ENV["PERL_PATH"] = which("perl") + ENV["V"] = "1" # build verbosely perl_version = Utils.popen_read("perl --version")[/v(\d+\.\d+)(?:\.\d+)?/, 1] - # If building with a non-system Perl search everywhere declared in @INC. - perl_inc = Utils.popen_read("perl -e 'print join\":\",@INC'").sub(":.", "") - if build.with? "subversion" - ENV["PERLLIB_EXTRA"] = %W[ - #{Formula["subversion"].opt_lib}/perl5/site_perl - ].join(":") - elsif build.with? "perl" - ENV["PERLLIB_EXTRA"] = perl_inc - elsif MacOS.version >= :mavericks + if MacOS.version >= :mavericks ENV["PERLLIB_EXTRA"] = %W[ #{MacOS.active_developer_dir} /Library/Developer/CommandLineTools @@ -89,9 +66,6 @@ def install ENV["NO_PERL_MAKEMAKER"] = "1" end - ENV["BLK_SHA1"] = "1" if build.with? "blk-sha1" - ENV["NO_GETTEXT"] = "1" if build.without? "gettext" - if build.with? "pcre2" ENV["USE_LIBPCRE2"] = "1" ENV["LIBPCREDIR"] = Formula["pcre2"].opt_prefix @@ -144,23 +118,11 @@ def install git_core.install "git-subtree" end - if build.with? "persistent-https" - cd "contrib/persistent-https" do - system "make" - git_core.install "git-remote-persistent-http", - "git-remote-persistent-https", - "git-remote-persistent-https--proxy" - end - end - - 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" - - zsh_completion.install "contrib/completion/git-completion.zsh" => "_git" - cp "#{bash_completion}/git-completion.bash", zsh_completion - end + # 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" + zsh_completion.install "contrib/completion/git-completion.zsh" => "_git" + cp "#{bash_completion}/git-completion.bash", zsh_completion elisp.install Dir["contrib/emacs/*.el"] (share/"git-core").install "contrib" From ce660a8e93328c585e3390cc2786365a9e60ab53 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:06 +0200 Subject: [PATCH 05/33] groonga: remove some options --- Formula/groonga.rb | 49 +++++----------------------------------------- 1 file changed, 5 insertions(+), 44 deletions(-) diff --git a/Formula/groonga.rb b/Formula/groonga.rb index 1a28c5bc7d2d..c4a68fc72b22 100644 --- a/Formula/groonga.rb +++ b/Formula/groonga.rb @@ -18,36 +18,18 @@ class Groonga < Formula depends_on "libtool" => :build end - option "with-glib", "With benchmark program for developer use" - option "with-zeromq", "With suggest plugin for suggesting" - option "with-stemmer", "Build with libstemmer support" - - deprecated_option "enable-benchmark" => "with-glib" - deprecated_option "with-benchmark" => "with-glib" - deprecated_option "with-suggest-plugin" => "with-zeromq" - depends_on "pkg-config" => :build - depends_on "pcre" depends_on "msgpack" depends_on "openssl" - depends_on "glib" => :optional - depends_on "lz4" => :optional + depends_on "pcre" depends_on "mecab" => :optional depends_on "mecab-ipadic" if build.with? "mecab" - depends_on "zeromq" => :optional - depends_on "libevent" if build.with? "zeromq" - depends_on "zstd" => :optional resource "groonga-normalizer-mysql" do url "https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.3.tar.gz" sha256 "e4534c725de244f5da72b2b05ddcbf1cfb4e56e71ac40f01acae817adf90d72c" end - resource "stemmer" do - url "https://github.com/snowballstem/snowball.git", - :revision => "1964ce688cbeca505263c8f77e16ed923296ce7a" - end - link_overwrite "lib/groonga/plugins/normalizers/" link_overwrite "share/doc/groonga-normalizer-mysql/" link_overwrite "lib/pkgconfig/groonga-normalizer-mysql.pc" @@ -55,35 +37,14 @@ class Groonga < Formula def install args = %W[ --prefix=#{prefix} - --with-zlib - --with-ssl + --disable-zeromq --enable-mruby + --with-ssl + --with-zlib + --without-libstemmer ] - if build.with? "zeromq" - args << "--enable-zeromq" - else - args << "--disable-zeromq" - end - - if build.with? "stemmer" - resource("stemmer").stage do - system "make", "dist_libstemmer_c" - system "tar", "xzf", "dist/libstemmer_c.tgz", "-C", buildpath - Dir.chdir buildpath.join("libstemmer_c") - system "make" - mkdir "lib" - mv "libstemmer.o", "lib/libstemmer.a" - args << "--with-libstemmer=#{Dir.pwd}" - end - else - args << "--without-libstemmer" - end - - args << "--enable-benchmark" if build.with? "glib" args << "--with-mecab" if build.with? "mecab" - args << "--with-lz4" if build.with? "lz4" - args << "--with-zstd" if build.with? "zstd" if build.head? args << "--with-ruby" From 7f4fa22a4f1d397bf4bfc612bc6ebd083cea94cc Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:06 +0200 Subject: [PATCH 06/33] libgetdata: remove some options --- Formula/libgetdata.rb | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/Formula/libgetdata.rb b/Formula/libgetdata.rb index dab24a7916c3..f4018872d4d1 100644 --- a/Formula/libgetdata.rb +++ b/Formula/libgetdata.rb @@ -13,36 +13,18 @@ class Libgetdata < Formula sha256 "88055dcabc5ed8b6cc068e244f8174eb798fd778e67a27867b3a0b33b3453121" => :el_capitan end - option "with-gcc", "Build Fortran bindings" - option "with-libzzip", "Build with zzip compression support" - option "with-perl", "Build against Homebrew's Perl rather than system default" - option "with-xz", "Build with LZMA compression support" - - deprecated_option "lzma" => "with-xz" - deprecated_option "zzip" => "with-libzzip" - deprecated_option "with-fortran" => "with-gcc" - depends_on "libtool" - depends_on "gcc" => :optional - depends_on "libzzip" => :optional - depends_on "perl" => :optional - depends_on "xz" => :optional def install - args = %W[ - --disable-dependency-tracking - --disable-silent-rules - --prefix=#{prefix} - --disable-php - --disable-python - ] - - args << "--with-perl-dir=#{lib}/perl5/site_perl" if build.with? "perl" - args << "--without-liblzma" if build.without? "xz" - args << "--without-libzzip" if build.without? "libzzip" - args << "--disable-fortran" << "--disable-fortran95" if build.without? "gcc" - - system "./configure", *args + system "./configure", "--prefix=#{prefix}", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--disable-fortran", + "--disable-fortran95", + "--disable-php", + "--disable-python", + "--without-liblzma", + "--without-libzzip" system "make" system "make", "install" end From 85bd6bc3e60cfa0568484df629812e832cd08dbb Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:06 +0200 Subject: [PATCH 07/33] nut: remove some options --- Formula/nut.rb | 59 ++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/Formula/nut.rb b/Formula/nut.rb index ccb8d66d656a..f98bb9f6e06e 100644 --- a/Formula/nut.rb +++ b/Formula/nut.rb @@ -21,25 +21,9 @@ class Nut < Formula depends_on "libtool" => :build end - option "without-serial", "Omits serial drivers" - option "without-libusb-compat", "Omits USB drivers" - option "with-dev", "Includes dev headers" - option "with-net-snmp", "Builds SNMP support" - option "with-neon", "Builds XML-HTTP support" - option "with-powerman", "Builds powerman PDU support" - option "with-freeipmi", "Builds IPMI PSU support" - option "with-cgi", "Builds CGI wrappers" - option "with-libltdl", "Adds dynamic loading support of plugins using libltdl" - depends_on "pkg-config" => :build - depends_on "libusb-compat" => :recommended - depends_on "net-snmp" => :optional - depends_on "neon" => :optional - depends_on "powerman" => :optional - depends_on "freeipmi" => :optional + depends_on "libusb-compat" depends_on "openssl" - depends_on "libtool" => :build - depends_on "gd" if build.with? "cgi" conflicts_with "rhino", :because => "both install `rhino` binaries" @@ -49,29 +33,24 @@ def install system "./autogen.sh" end - args = %W[ - --disable-dependency-tracking - --prefix=#{prefix} - --localstatedir=#{var} - --without-doc - --without-avahi - --with-macosx_ups - --with-openssl - --without-nss - --without-wrap - ] - args << (build.with?("serial") ? "--with-serial" : "--without-serial") - args << (build.with?("libusb-compat") ? "--with-usb" : "--without-usb") - args << (build.with?("dev") ? "--with-dev" : "--without-dev") - args << (build.with?("net-snmp") ? "--with-snmp" : "--without-snmp") - args << (build.with?("neon") ? "--with-neon" : "--without-neon") - args << (build.with?("powerman") ? "--with-powerman" : "--without-powerman") - args << (build.with?("ipmi") ? "--with-ipmi" : "--without-ipmi") - args << "--with-freeipmi" if build.with? "ipmi" - args << (build.with?("libltdl") ? "--with-libltdl" : "--without-libltdl") - args << (build.with?("cgi") ? "--with-cgi" : "--without-cgi") - - system "./configure", *args + system "./configure", "--disable-dependency-tracking", + "--prefix=#{prefix}", + "--localstatedir=#{var}", + "--with-macosx_ups", + "--with-openssl", + "--with-serial", + "--with-usb", + "--without-avahi", + "--without-cgi", + "--without-dev", + "--without-doc", + "--without-ipmi", + "--without-libltdl", + "--without-neon", + "--without-nss", + "--without-powerman", + "--without-snmp", + "--without-wrap" system "make", "install" end From f44f8a33663e6f00c73ef8c2518dd3d0b741372f Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:07 +0200 Subject: [PATCH 08/33] ola: remove some options --- Formula/ola.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Formula/ola.rb b/Formula/ola.rb index 4e3ff9cf7fc2..4376af609e1d 100644 --- a/Formula/ola.rb +++ b/Formula/ola.rb @@ -24,13 +24,12 @@ class Ola < Formula deprecated_option "with-ftdi" => "with-libftdi" depends_on "pkg-config" => :build + depends_on "liblo" depends_on "libmicrohttpd" + depends_on "libusb" depends_on "ossp-uuid" depends_on "protobuf@3.1" depends_on "python@2" - depends_on "liblo" => :recommended - depends_on "libusb" => :recommended - depends_on "doxygen" => :optional depends_on "libftdi" => :optional depends_on "libftdi0" if build.with? "libftdi" @@ -60,7 +59,6 @@ def install ] args << "--enable-rdm-tests" if build.with? "rdm-tests" - args << "--enable-doxygen-man" if build.with? "doxygen" system "autoreconf", "-fvi" if build.head? system "./configure", *args From d949880b48fc0c898f05cdd05855ac90a7efe47e Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:07 +0200 Subject: [PATCH 09/33] opencolorio: remove some options --- Formula/opencolorio.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Formula/opencolorio.rb b/Formula/opencolorio.rb index 76256ad57dfa..e00a8ab97b1f 100644 --- a/Formula/opencolorio.rb +++ b/Formula/opencolorio.rb @@ -13,11 +13,7 @@ class Opencolorio < Formula sha256 "9eac0c648be323730035b3885b376db665408f02290efa9dd1263655029a914f" => :el_capitan end - option "with-test", "Verify the build with its unit tests (~1min)" - option "with-docs", "Build the documentation" - deprecated_option "with-python" => "with-python@2" - deprecated_option "with-tests" => "with-test" depends_on "cmake" => :build depends_on "pkg-config" => :build @@ -26,21 +22,15 @@ class Opencolorio < Formula def install args = std_cmake_args - args << "-DOCIO_BUILD_TESTS=ON" if build.with? "test" - args << "-DOCIO_BUILD_DOCS=ON" if build.with? "docs" args << "-DCMAKE_VERBOSE_MAKEFILE=OFF" - # Python note: # OCIO's PyOpenColorIO.so doubles as a shared library. So it lives in lib, rather # than the usual HOMEBREW_PREFIX/lib/python2.7/site-packages per developer choice. args << "-DOCIO_BUILD_PYGLUE=OFF" if build.without? "python@2" - args << ".." - mkdir "macbuild" do - system "cmake", *args + system "cmake", *args, ".." system "make" - system "make", "test" if build.with? "test" system "make", "install" end end From d2043990b12f3bcdd9e3378236aa1a210d9b6da7 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:07 +0200 Subject: [PATCH 10/33] pike: remove some options --- Formula/pike.rb | 85 ++++++++----------------------------------------- 1 file changed, 13 insertions(+), 72 deletions(-) diff --git a/Formula/pike.rb b/Formula/pike.rb index ef932903b18e..75d453567d4c 100644 --- a/Formula/pike.rb +++ b/Formula/pike.rb @@ -1,6 +1,6 @@ class Pike < Formula desc "Dynamic programming language" - homepage "https://pike.lysator.liu.se" + homepage "https://pike.lysator.liu.se/" url "https://pike.lysator.liu.se/pub/pike/all/8.0.610/Pike-v8.0.610.tar.gz" sha256 "6eeb410caf56ff4a209a06db29f003208d507680f7c17c0fd93c15f48b5edf53" @@ -11,84 +11,25 @@ class Pike < Formula sha256 "f23b16351cd5bed06c310c78b083caa6df91c21fbe386f6a2f73803404f01762" => :el_capitan end - option "with-gettext", "Include Gettext support" - option "with-gdbm", "Include Gdbm support" - option "with-gtk2", "Include GTK2 support" - option "with-mysql", "Include Mysql support" - option "with-pcre", "Include Regexp.PCRE support" - option "with-sdl", "Include SDL support" - option "with-sane", "Include Sane support" - option "with-pdf", "Include PDF support" - option "with-gl", "Include GL support" - option "with-all", "Include all features" - - depends_on "nettle" depends_on "gmp" + depends_on "libtiff" + depends_on "nettle" depends_on "pcre" - depends_on :x11 => :optional - depends_on "libtiff" => :recommended - - # optional dependencies - depends_on "gettext" if build.with?("gettext") || build.with?("all") - depends_on "gdbm" if build.with?("gdbm") || build.with?("all") - depends_on "gtk+" if build.with?("gtk2") || build.with?("all") - depends_on "mysql" if build.with?("mysql") || build.with?("all") - depends_on "sdl" if build.with?("sdl") || build.with?("all") - depends_on "sane-backends" if build.with?("sane") || build.with?("all") - depends_on "pdflib-lite" if build.with?("pdf") || build.with?("all") - depends_on "mesalib-glw" if build.with?("gl") || build.with?("all") def install - args = ["--prefix=#{prefix}", "--without-bundles"] - - if MacOS.prefer_64_bit? - ENV.append "CFLAGS", "-m64" - args << "--with-abi=64" - else - ENV.append "CFLAGS", "-m32" - args << "--with-abi=32" - end - + ENV.append "CFLAGS", "-m64" ENV.deparallelize - system "make", "CONFIGUREARGS='" + args.join(" ") + "'" + system "make", "CONFIGUREARGS='--prefix=#{prefix} --without-bundles --with-abi=64'" - # installation is complicated by some of brew's standard patterns. - # hopefully these notes explain the reasons for diverging from - # the path that most other formulae use. - # - # item 1 - # - # basically, pike already installs itself naturally as brew would want - # it; that is, if prefix=/Cellar, installation would create - # /Cellar/pike/ver/bin and so forth. We could just go with that, but it's - # possible that homebrew might change its layout and then the formula - # would no longer work. - # - # so, rather than guessing at it, we do this alternate gyration, forcing - # pike to install in a slightly nonstandard way (for pike, at least) - # - # item 2 - # - # a second problem crops up because the during installation, the link - # function tries to pull in stuff from lib/, which is really more like - # what one would expect share or libexec in homebrew might be: pike - # specific files, rather than shared libraries. we could approach this - # in a similar fashion, but the result would be a really odd arrangement - # for anyone remotely familar with standard pike installs. - # - # because there's no way to override the keg.link command, this formula - # installs the whole pike install into prefix/libexec and then links the - # man page and binary back into prefix/share and prefix/bin. not so - # elegant, but that's the way brew works. - system "make", "install", - "prefix=#{libexec}", - "exec_prefix=#{libexec}", - "share_prefix=#{libexec}/share", - "lib_prefix=#{libexec}/lib", - "man_prefix=#{libexec}/man", - "include_path=#{libexec}/include", - "INSTALLARGS=--traditional" + system "make", "install", + "prefix=#{libexec}", + "exec_prefix=#{libexec}", + "share_prefix=#{libexec}/share", + "lib_prefix=#{libexec}/lib", + "man_prefix=#{libexec}/man", + "include_path=#{libexec}/include", + "INSTALLARGS=--traditional" bin.install_symlink "#{libexec}/bin/pike" share.install_symlink "#{libexec}/share/man" From 30f1fe967f1399a724e370a7820d43617585c0ff Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:07 +0200 Subject: [PATCH 11/33] sphinx: remove some options --- Formula/sphinx.rb | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Formula/sphinx.rb b/Formula/sphinx.rb index 529617db085e..b43318c53a4c 100644 --- a/Formula/sphinx.rb +++ b/Formula/sphinx.rb @@ -16,13 +16,10 @@ class Sphinx < Formula option "with-mysql", "Force compiling against MySQL" option "with-postgresql", "Force compiling against PostgreSQL" - option "with-id64", "Force compiling with 64-bit ID support" deprecated_option "mysql" => "with-mysql" deprecated_option "pgsql" => "with-postgresql" - deprecated_option "id64" => "with-id64" - depends_on "re2" => :optional depends_on "mysql" => :optional depends_on "postgresql" => :optional depends_on "openssl" if build.with? "mysql" @@ -37,18 +34,7 @@ class Sphinx < Formula cause "sphinxexpr.cpp:1802:11: error: use of undeclared identifier 'ExprEval'" end - needs :cxx11 if build.with? "re2" - def install - if build.with? "re2" - ENV.cxx11 - - # Fix "error: invalid suffix on literal" and "error: - # non-constant-expression cannot be narrowed from type 'long' to 'int'" - # Upstream issue from 7 Dec 2016 http://sphinxsearch.com/bugs/view.php?id=2578 - ENV.append "CXXFLAGS", "-Wno-reserved-user-defined-literal -Wno-c++11-narrowing" - end - resource("stemmer").stage do system "make", "dist_libstemmer_c" system "tar", "xzf", "dist/libstemmer_c.tgz", "-C", buildpath @@ -61,9 +47,6 @@ def install --with-libstemmer ] - args << "--enable-id64" if build.with? "id64" - args << "--with-re2" if build.with? "re2" - if build.with? "mysql" args << "--with-mysql" else From 8c40dfdcf0d8b1fb931e9b7096d588f05589143c Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:07 +0200 Subject: [PATCH 12/33] sqlite: remove some options --- Formula/sqlite.rb | 76 ++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 53 deletions(-) diff --git a/Formula/sqlite.rb b/Formula/sqlite.rb index 018bc590392e..1f48266518bb 100644 --- a/Formula/sqlite.rb +++ b/Formula/sqlite.rb @@ -15,21 +15,12 @@ class Sqlite < Formula keg_only :provided_by_macos, "macOS provides an older sqlite3" - option "with-docs", "Install HTML documentation" - option "without-rtree", "Disable the R*Tree index module" option "with-fts", "Enable the FTS3 module" option "with-fts5", "Enable the FTS5 module (experimental)" - option "with-secure-delete", "Defaults secure_delete to on" - option "with-unlock-notify", "Enable the unlock notification feature" - option "with-icu4c", "Enable the ICU module" option "with-functions", "Enable more math and string functions for SQL queries" - option "with-dbstat", "Enable the 'dbstat' virtual table" option "with-json1", "Enable the JSON1 extension" - option "with-session", "Enable the session extension" - option "with-soundex", "Enable the SOUNDEX function" - depends_on "readline" => :recommended - depends_on "icu4c" => :optional + depends_on "readline" resource "functions" do url "https://sqlite.org/contrib/download/extension-functions.c?get=25" @@ -37,42 +28,23 @@ class Sqlite < Formula sha256 "991b40fe8b2799edc215f7260b890f14a833512c9d9896aa080891330ffe4052" end - resource "docs" do - url "https://sqlite.org/2018/sqlite-doc-3240000.zip" - version "3.24.0" - sha256 "77b104df2b57a32c40d0336bbf77ab013a1a95ab49a5fe0ea92250e9f2ae82c1" - end - def install ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_COLUMN_METADATA=1" # Default value of MAX_VARIABLE_NUMBER is 999 which is too low for many # applications. Set to 250000 (Same value used in Debian and Ubuntu). ENV.append "CPPFLAGS", "-DSQLITE_MAX_VARIABLE_NUMBER=250000" - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_RTREE=1" if build.with? "rtree" + ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_RTREE=1" ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1" if build.with? "fts" ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_FTS5=1" if build.with? "fts5" - ENV.append "CPPFLAGS", "-DSQLITE_SECURE_DELETE=1" if build.with? "secure-delete" - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" if build.with? "unlock-notify" - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_DBSTAT_VTAB=1" if build.with? "dbstat" ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_JSON1=1" if build.with? "json1" - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_PREUPDATE_HOOK=1 -DSQLITE_ENABLE_SESSION=1" if build.with? "session" - ENV.append "CPPFLAGS", "-DSQLITE_SOUNDEX" if build.with? "soundex" - - if build.with? "icu4c" - icu4c = Formula["icu4c"] - icu4cldflags = `#{icu4c.opt_bin}/icu-config --ldflags`.tr("\n", " ") - icu4ccppflags = `#{icu4c.opt_bin}/icu-config --cppflags`.tr("\n", " ") - ENV.append "LDFLAGS", icu4cldflags - ENV.append "CPPFLAGS", icu4ccppflags - ENV.append "CPPFLAGS", "-DSQLITE_ENABLE_ICU=1" - end - args = [ - "--prefix=#{prefix}", - "--disable-dependency-tracking", - "--enable-dynamic-extensions", + args = %W[ + --prefix=#{prefix} + --disable-dependency-tracking + --enable-dynamic-extensions + --enable-readline + --disable-editline ] - args << "--enable-readline" << "--disable-editline" if build.with? "readline" system "./configure", *args system "make", "install" @@ -86,7 +58,6 @@ def install *ENV.cflags.to_s.split lib.install "libsqlitefunctions.dylib" end - doc.install resource("docs") if build.with? "docs" end def caveats @@ -111,22 +82,21 @@ def caveats 0.707106781186548 EOS end - if build.with? "readline" - user_history = "~/.sqlite_history" - user_history_path = File.expand_path(user_history) - if File.exist?(user_history_path) && File.read(user_history_path).include?("\\040") - s += <<~EOS - Homebrew has detected an existing SQLite history file that was created - with the editline library. The current version of this formula is - built with Readline. To back up and convert your history file so that - it can be used with Readline, run: - - sed -i~ 's/\\\\040/ /g' #{user_history} - - before using the `sqlite` command-line tool again. Otherwise, your - history will be lost. - EOS - end + + user_history = "~/.sqlite_history" + user_history_path = File.expand_path(user_history) + if File.exist?(user_history_path) && File.read(user_history_path).include?("\\040") + s += <<~EOS + Homebrew has detected an existing SQLite history file that was created + with the editline library. The current version of this formula is + built with Readline. To back up and convert your history file so that + it can be used with Readline, run: + + sed -i~ 's/\\\\040/ /g' #{user_history} + + before using the `sqlite` command-line tool again. Otherwise, your + history will be lost. + EOS end s end From 749360f675ea9832363f1d62b0904506a58bbe69 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:07 +0200 Subject: [PATCH 13/33] weechat: remove some options --- Formula/weechat.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Formula/weechat.rb b/Formula/weechat.rb index d5d8c613b9f9..cfcdc4cd1a44 100644 --- a/Formula/weechat.rb +++ b/Formula/weechat.rb @@ -15,21 +15,19 @@ class Weechat < Formula option "with-perl", "Build the perl module" option "with-ruby", "Build the ruby module" option "with-curl", "Build with brewed curl" - option "with-debug", "Build with debug information" - option "without-tcl", "Do not build the tcl module" depends_on "asciidoctor" => :build depends_on "cmake" => :build depends_on "pkg-config" => :build + depends_on "gettext" depends_on "gnutls" depends_on "libgcrypt" - depends_on "gettext" depends_on "aspell" => :optional + depends_on "curl" => :optional depends_on "lua" => :optional depends_on "perl" => :optional depends_on "python@2" => :optional depends_on "ruby" => :optional if MacOS.version <= :sierra - depends_on "curl" => :optional def install args = std_cmake_args + %W[ @@ -38,10 +36,6 @@ def install -DCA_FILE=#{etc}/openssl/cert.pem -DENABLE_JAVASCRIPT=OFF ] - if build.with? "debug" - args -= %w[-DCMAKE_BUILD_TYPE=Release] - args << "-DCMAKE_BUILD_TYPE=Debug" - end if build.without? "ruby" args << "-DENABLE_RUBY=OFF" @@ -53,7 +47,6 @@ def install args << "-DENABLE_LUA=OFF" if build.without? "lua" args << "-DENABLE_PERL=OFF" if build.without? "perl" args << "-DENABLE_ASPELL=OFF" if build.without? "aspell" - args << "-DENABLE_TCL=OFF" if build.without? "tcl" args << "-DENABLE_PYTHON=OFF" if build.without? "python@2" mkdir "build" do From 36ab330f1a49bd00eabe7924a14916102830afdc Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:07 +0200 Subject: [PATCH 14/33] x3270: remove some options --- Formula/x3270.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Formula/x3270.rb b/Formula/x3270.rb index 5bac8b296b37..a930487e3faf 100644 --- a/Formula/x3270.rb +++ b/Formula/x3270.rb @@ -12,21 +12,20 @@ class X3270 < Formula end option "with-x11", "Include x3270 (X11-based version)" - option "without-c3270", "Exclude c3270 (curses-based version)" - option "without-s3270", "Exclude s3270 (displayless version)" - option "without-tcl3270", "Exclude tcl3270 (integrated with Tcl)" - option "without-pr3287", "Exclude pr3287 (printer emulation)" - depends_on :x11 => :optional depends_on "openssl" + depends_on :x11 => :optional def install - args = ["--prefix=#{prefix}"] + args = %W[ + --prefix=#{prefix} + --enable-c3270 + --enable-pr3287 + --enable-s3270 + --enable-tcl3270 + ] + args << "--enable-x3270" if build.with? "x11" - args << "--enable-c3270" if build.with? "c3270" - args << "--enable-s3270" if build.with? "s3270" - args << "--enable-tcl3270" if build.with? "tcl3270" - args << "--enable-pr3287" if build.with? "pr3287" system "./configure", *args system "make", "install" From bc84103b940a7aae6bd6f9144330beddfc4db6b5 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:07 +0200 Subject: [PATCH 15/33] xapian: remove some options --- Formula/xapian.rb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Formula/xapian.rb b/Formula/xapian.rb index 24debab85d3c..e9263e4ab60f 100644 --- a/Formula/xapian.rb +++ b/Formula/xapian.rb @@ -13,12 +13,8 @@ class Xapian < Formula sha256 "1ee62f239e87de8a4ba26c7f74eaefff7ec4841e83a01dbcf14d4a2c712781c0" => :el_capitan end - option "with-java", "Java bindings" - option "with-php", "PHP bindings" option "with-ruby", "Ruby bindings" - deprecated_option "java" => "with-java" - deprecated_option "php" => "with-php" deprecated_option "ruby" => "with-ruby" deprecated_option "with-python" => "with-python@2" @@ -34,14 +30,12 @@ class Xapian < Formula end def install - build_binds = build.with?("ruby") || build.with?("python@2") || build.with?("java") || build.with?("php") - system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", "--prefix=#{prefix}" system "make", "install" - if build_binds + if build.with?("ruby") || build.with?("python@2") resource("bindings").stage do ENV["XAPIAN_CONFIG"] = bin/"xapian-config" @@ -50,8 +44,6 @@ def install --prefix=#{prefix} ] - args << "--with-java" if build.with? "java" - if build.with? "ruby" ruby_site = lib/"ruby/site_ruby" ENV["RUBY_LIB"] = ENV["RUBY_LIB_ARCH"] = ruby_site @@ -73,12 +65,6 @@ def install args << "--with-python" end - if build.with? "php" - extension_dir = lib/"php/extensions" - extension_dir.mkpath - args << "--with-php" << "PHP_EXTENSION_DIR=#{extension_dir}" - end - system "./configure", *args system "make", "install" end From 2bf23bdc9dce913f7bf3fcc560717c5f7ccbb9a6 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 22:58:07 +0200 Subject: [PATCH 16/33] xplanet: remove some options --- Formula/xplanet.rb | 68 ++++++++++++---------------------------------- 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/Formula/xplanet.rb b/Formula/xplanet.rb index e872c89e140f..988d0772a6d2 100644 --- a/Formula/xplanet.rb +++ b/Formula/xplanet.rb @@ -12,31 +12,12 @@ class Xplanet < Formula sha256 "4c0e0c1b025079129f808e85d3d5e76280799929fa6e9d119000e94283769a8d" => :yosemite end - option "with-x11", "Build for X11 instead of Aqua" - option "with-all", "Build with default Xplanet configuration dependencies" - option "with-pango", "Build Xplanet to support Internationalized text library" - option "with-netpbm", "Build Xplanet with PNM graphic support" - option "with-cspice", "Build Xplanet with JPLs SPICE toolkit support" - depends_on "pkg-config" => :build - - depends_on "giflib" => :recommended - depends_on "jpeg" => :recommended - depends_on "libpng" => :recommended - depends_on "libtiff" => :recommended - - if build.with?("all") - depends_on "netpbm" - depends_on "pango" - depends_on "cspice" - end - - depends_on "netpbm" => :optional - depends_on "pango" => :optional - depends_on "cspice" => :optional - depends_on "freetype" - depends_on :x11 => :optional + depends_on "giflib" + depends_on "jpeg" + depends_on "libpng" + depends_on "libtiff" # patches bug in 1.3.1 with flag -num_times=2 (1.3.2 will contain fix, when released) # https://sourceforge.net/p/xplanet/code/208/tree/trunk/src/libdisplay/DisplayOutput.cpp?diff=5056482efd48f8457fc7910a:207 @@ -53,35 +34,20 @@ class Xplanet < Formula end def install - args = %W[ - --disable-dependency-tracking - --prefix=#{prefix} - --without-cygwin - ] - - if build.without?("all") - args << "--without-gif" if build.without?("giflib") - args << "--without-jpeg" if build.without?("jpeg") - args << "--without-libpng" if build.without?("libpng") - args << "--without-libtiff" if build.without?("libtiff") - args << "--without-pnm" if build.without?("netpbm") - args << "--without-pango" if build.without?("pango") - args << "--without-cspice" if build.without?("cspice") - end - - if build.with?("x11") - args << "--with-x" << "--with-xscreensaver" << "--without-aqua" - else - args << "--with-aqua" << "--without-x" << "--without-xscreensaver" - end - - if build.with?("netpbm") || build.with?("all") - netpbm = Formula["netpbm"].opt_prefix - ENV.append "CPPFLAGS", "-I#{netpbm}/include/netpbm" - ENV.append "LDFLAGS", "-L#{netpbm}/lib" - end + system "./configure", "--disable-dependency-tracking", + "--prefix=#{prefix}", + "--with-aqua", + "--without-cspice", + "--without-cygwin", + "--without-gif", + "--without-jpeg", + "--without-libpng", + "--without-libtiff", + "--without-pango", + "--without-pnm", + "--without-x", + "--without-xscreensaver" - system "./configure", *args system "make", "install" end From 8485a2e662fbe52cb149130b282e843bfd3e645f Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:07:57 +0200 Subject: [PATCH 17/33] mupen64plus: remove options --- Formula/mupen64plus.rb | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/Formula/mupen64plus.rb b/Formula/mupen64plus.rb index 88ca3f37aa58..c68d2add7240 100644 --- a/Formula/mupen64plus.rb +++ b/Formula/mupen64plus.rb @@ -13,21 +13,11 @@ class Mupen64plus < Formula sha256 "6d9d9900813b21abc89149ded185d4b74147a85c1a350d54511ee535acde171c" => :el_capitan end - option "without-osd", "Disables the On Screen Display" - option "with-new-dynarec", "Replace dynamic recompiler with Ari64's experimental dynarec" - option "with-src", "Build with libsamplerate" - option "with-speex", "Build with libspeexdsp" - - deprecated_option "disable-osd" => "without-osd" - deprecated_option "enable-new-dynarec" => "with-new-dynarec" - depends_on "pkg-config" => :build + depends_on "boost" + depends_on "freetype" depends_on "libpng" depends_on "sdl" - depends_on "boost" - depends_on "freetype" if build.with? "osd" - depends_on "libsamplerate" if build.with? "src" - depends_on "speex" => :optional resource "rom" do url "https://github.com/mupen64plus/mupen64plus-rom/raw/76ef14c876ed036284154444c7bdc29d19381acc/m64p_test_rom.v64" @@ -44,40 +34,34 @@ def install inreplace "source/mupen64plus-video-glide64mk2/src/Glide64/3dmath.cpp", "__builtin_ia32_storeups", "_mm_storeu_ps" - common_args = ["install", "PREFIX=#{prefix}", "INSTALL_STRIP_FLAG=-S"] + args = ["install", "PREFIX=#{prefix}", "INSTALL_STRIP_FLAG=-S"] cd "source/mupen64plus-core/projects/unix" do - args = common_args.dup - args << "OSD=0" if build.without? "osd" - args << "NEW_DYNAREC=1" if build.with? "new-dynarec" system "make", *args end cd "source/mupen64plus-audio-sdl/projects/unix" do - args = common_args.dup - args << "NO_SRC=1" if build.without? "src" - args << "NO_SPEEX=1" if build.without? "speex" - system "make", *args + system "make", *args, "NO_SRC=1", "NO_SPEEX=1" end cd "source/mupen64plus-input-sdl/projects/unix" do - system "make", *common_args + system "make", *args end cd "source/mupen64plus-rsp-hle/projects/unix" do - system "make", *common_args + system "make", *args end cd "source/mupen64plus-video-glide64mk2/projects/unix" do - system "make", *common_args + system "make", *args end cd "source/mupen64plus-video-rice/projects/unix" do - system "make", *common_args + system "make", *args end cd "source/mupen64plus-ui-console/projects/unix" do - system "make", *common_args + system "make", *args end end From 110bfe4deaca6be229128354ec5383a5bd255b42 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:12:17 +0200 Subject: [PATCH 18/33] redland: remove options --- Formula/redland.rb | 101 ++++----------------------------------------- 1 file changed, 7 insertions(+), 94 deletions(-) diff --git a/Formula/redland.rb b/Formula/redland.rb index 9f0445c0057e..a9a08a322e4c 100644 --- a/Formula/redland.rb +++ b/Formula/redland.rb @@ -15,18 +15,11 @@ class Redland < Formula sha256 "bbe8f82451695648adb66ab2766413e938f8f4ffdc318ba946e210d23e637dd2" => :mountain_lion end - option "with-php", "Build with php support" - option "with-ruby", "Build with ruby support" - - deprecated_option "with-python" => "with-python@2" - depends_on "pkg-config" => :build depends_on "raptor" depends_on "rasqal" + depends_on "sqlite" depends_on "unixodbc" - depends_on "sqlite" => :recommended - depends_on "berkeley-db" => :optional - depends_on "python@2" => :optional resource "bindings" do url "http://download.librdf.org/source/redland-bindings-1.0.17.1.tar.gz" @@ -34,92 +27,12 @@ class Redland < Formula end def install - args = %W[ - --disable-debug - --disable-dependency-tracking - --prefix=#{prefix} - --with-mysql=no - ] - - if build.with? "sqlite" - args << "--with-sqlite=yes" - else - args << "--with-sqlite=no" - end - - if build.with? "berkeley-db" - args << "--with-bdb=#{Formula["berkeley-db"].opt_prefix}" - else - args << "--with-bdb=no" - end - - system "./configure", *args + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--prefix=#{prefix}", + "--with-bdb=no", + "--with-mysql=no", + "--with-sqlite=yes" system "make", "install" - - if %w[php python ruby].any? { |lang| build.with? lang } - resource("bindings").stage do - args = %W[ - --disable-debug - --disable-dependency-tracking - --prefix=#{prefix} - ] - - if build.with? "php" - args << "--with-php" - args << "--with-php-linking=dylib" - end - - if build.with? "ruby" - `ruby --version` =~ /ruby (\d\.\d).\d \(.*\) \[(.*)\]/ - ruby_install_dir = lib + "ruby/site_ruby/" + Regexp.last_match(1) - ruby_arch_install_dir = ruby_install_dir + Regexp.last_match(2) - ruby_install_dir.mkpath - ruby_arch_install_dir.mkpath - args << "--with-ruby" - args << "--with-ruby-install-dir=#{ruby_install_dir}" - args << "--with-ruby-arch-install-dir=#{ruby_arch_install_dir}" - end - - if build.with? "python@2" - ENV["PYTHON_LIB"] = lib/"python2.7/site-packages" - args << "--with-python" - end - - ENV.append_path "PKG_CONFIG_PATH", "#{lib}/pkgconfig" - - system "./configure", *args - - if build.with? "php" - php_extension_dir = lib + "php/extensions" - php_extension_dir.mkpath - inreplace "php/Makefile" do |s| - s.change_make_var! "PHP_EXTENSION_DIR", php_extension_dir - s.change_make_var! "phpdir", php_extension_dir - end - end - - system "make", "install" - end - end - end - - def caveats - s = "" - - if build.with? "php" - s += <<~EOS - You may need to add the following line to php.ini: - extension="#{HOMEBREW_PREFIX}/lib/php/extensions/redland.dylib" - EOS - end - - if build.with? "ruby" - s += <<~EOS - You may need to add the Ruby bindings to your RUBYLIB from: - #{HOMEBREW_PREFIX}/lib/ruby/site_ruby - EOS - end - - s.empty? ? nil : s end end From bad939db8afe505d4a2a4665039e5c8f059e529e Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:14:17 +0200 Subject: [PATCH 19/33] vrpn: remove options --- Formula/vrpn.rb | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/Formula/vrpn.rb b/Formula/vrpn.rb index 8894573494ea..436a5b634957 100644 --- a/Formula/vrpn.rb +++ b/Formula/vrpn.rb @@ -13,32 +13,17 @@ class Vrpn < Formula sha256 "36e5273f8006b1fe5f1655e258f8937e06e9abc4ad849e2c9b1e7a1462fe790d" => :el_capitan end - option "with-clients", "Build client apps and tests" - option "with-docs", "Build doxygen-based API documentation" - - deprecated_option "docs" => "with-docs" - deprecated_option "clients" => "with-clients" - depends_on "cmake" => :build - depends_on "doxygen" => :build if build.with? "docs" depends_on "libusb" # for HID support def install ENV.libstdcxx unless MacOS.version > :mavericks - args = std_cmake_args - args << "-DCMAKE_OSX_SYSROOT=#{MacOS.sdk_path}" - args << "-DVRPN_BUILD_JAVA:BOOL=OFF" - - if build.with? "clients" - args << "-DVRPN_BUILD_CLIENTS:BOOL=ON" - else - args << "-DVRPN_BUILD_CLIENTS:BOOL=OFF" - end - mkdir "build" do - system "cmake", "..", *args - system "make", "doc" if build.with? "docs" + system "cmake", "..", *std_cmake_args, + "-DCMAKE_OSX_SYSROOT=#{MacOS.sdk_path}", + "-DVRPN_BUILD_CLIENTS:BOOL=OFF", + "-DVRPN_BUILD_JAVA:BOOL=OFF" system "make", "install" end end From 84d7aae5b461012dd86456330c888fa179ee07f9 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:16:47 +0200 Subject: [PATCH 20/33] glfw: remove some options --- Formula/glfw.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Formula/glfw.rb b/Formula/glfw.rb index 2757bb3dc4f2..17ecaa51dd3e 100644 --- a/Formula/glfw.rb +++ b/Formula/glfw.rb @@ -15,15 +15,10 @@ class Glfw < Formula end option "without-shared-library", "Build static library only (defaults to building dylib only)" - option "with-examples", "Build examples" - option "with-test", "Build test programs" depends_on "cmake" => :build - deprecated_option "build-examples" => "with-examples" deprecated_option "static" => "without-shared-library" - deprecated_option "build-tests" => "with-test" - deprecated_option "with-tests" => "with-test" def install args = std_cmake_args + %w[ @@ -31,14 +26,9 @@ def install -DGLFW_USE_MENUBAR=TRUE ] args << "-DBUILD_SHARED_LIBS=TRUE" if build.with? "shared-library" - args << "-DGLFW_BUILD_EXAMPLES=TRUE" if build.with? "examples" - args << "-DGLFW_BUILD_TESTS=TRUE" if build.with? "test" - args << "." - system "cmake", *args + system "cmake", *args, "." system "make", "install" - libexec.install Dir["examples/*"] if build.with? "examples" - libexec.install Dir["tests/*"] if build.with? "test" end test do From 1892cfb86028074839765eeeee37312c5c1070c1 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:20:02 +0200 Subject: [PATCH 21/33] postgres-xc: remove options --- Formula/postgres-xc.rb | 79 ++++++++++-------------------------------- 1 file changed, 19 insertions(+), 60 deletions(-) diff --git a/Formula/postgres-xc.rb b/Formula/postgres-xc.rb index faa3c97042bd..777a37d1f5f8 100644 --- a/Formula/postgres-xc.rb +++ b/Formula/postgres-xc.rb @@ -13,18 +13,10 @@ class PostgresXc < Formula sha256 "3dc1e2e4d10cc1cf2604b5bc91c4167257bd84b27a167580d2342e7ab7539428" => :yosemite end - option "with-dtrace", "Build with DTrace support" - option "without-perl", "Build without Perl support" - - deprecated_option "no-perl" => "without-perl" - deprecated_option "enable-dtrace" => "with-dtrace" - deprecated_option "with-python" => "with-python@2" - depends_on :arch => :x86_64 depends_on "openssl" + depends_on "ossp-uuid" depends_on "readline" - depends_on "ossp-uuid" => :recommended - depends_on "python@2" => :optional conflicts_with "postgresql", :because => "postgres-xc and postgresql install the same binaries." @@ -46,34 +38,26 @@ def install ENV.prepend "LDFLAGS", "-L#{Formula["openssl"].opt_lib} -L#{Formula["readline"].opt_lib}" ENV.prepend "CPPFLAGS", "-I#{Formula["openssl"].opt_include} -I#{Formula["readline"].opt_include}" - args = %W[ - --disable-debug - --prefix=#{prefix} - --datadir=#{pkgshare} - --docdir=#{doc} - --enable-thread-safety - --with-bonjour - --with-gssapi - --with-krb5 - --with-openssl - --with-libxml - --with-libxslt + ENV.append "CFLAGS", `uuid-config --cflags`.strip + ENV.append "LDFLAGS", `uuid-config --ldflags`.strip + ENV.append "LIBS", `uuid-config --libs`.strip + + args = [ + "--disable-debug", + "--prefix=#{prefix}", + "--datadir=#{pkgshare}", + "--docdir=#{doc}", + "--enable-thread-safety", + "--with-bonjour", + "--with-gssapi", + "--with-krb5", + "--with-libxml", + "--with-libxslt", + "--with-openssl", + "--with-ossp-uuid", + "ARCHFLAGS=-arch x86_64", ] - args << "--with-ossp-uuid" if build.with? "ossp-uuid" - args << "--with-python" if build.with? "python@2" - args << "--with-perl" if build.with? "perl" - args << "--enable-dtrace" if build.with? "dtrace" - args << "ARCHFLAGS='-arch x86_64'" - - 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 - end - - check_python_arch if build.with? "python@2" - system "./configure", *args # Building the documentation looks for Jade or OpenJade, neither of which exist on macOS @@ -95,31 +79,6 @@ def post_install (var/"postgres-xc").mkpath end - def check_python_arch - # On 64-bit systems, we need to look for a 32-bit Framework Python. - # The configure script prefers this Python version, and if it doesn't - # have 64-bit support then linking will fail. - framework_python = Pathname.new "/Library/Frameworks/Python.framework/Versions/Current/Python" - return unless framework_python.exist? - unless (archs_for_command framework_python).include? :x86_64 - opoo "Detected a framework Python that does not have 64-bit support in:" - puts <<~EOS - #{framework_python} - - The configure script seems to prefer this version of Python over any others, - so you may experience linker problems as described in: - https://osdir.com/ml/pgsql-general/2009-09/msg00160.html - - To fix this issue, you may need to either delete the version of Python - shown above, or move it out of the way before brewing PostgreSQL. - - Note that a framework Python in /Library/Frameworks/Python.framework is - the "MacPython" version, and not the system-provided version which is in: - /System/Library/Frameworks/Python.framework - EOS - end - end - def caveats; <<~EOS To get started with Postgres-XC, read the documents at https://sourceforge.net/projects/postgres-xc/files/Publication/ From 27dcc7a29605c4dabd6f1208672360f75f85ab07 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:23:05 +0200 Subject: [PATCH 22/33] shmcat: remove options --- Formula/shmcat.rb | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/Formula/shmcat.rb b/Formula/shmcat.rb index 9a9c3ee3c395..780dbbd824c6 100644 --- a/Formula/shmcat.rb +++ b/Formula/shmcat.rb @@ -12,28 +12,11 @@ class Shmcat < Formula sha256 "1b6ddaf528253df2e2d5b93e97b6f4ade717ff8f3f6bcf829ed7cf9d9e682539" => :el_capitan end - option "with-ftok", "Build the ftok utility" - option "with-gettext", "Build with Native Language Support" - - deprecated_option "with-nls" => "with-gettext" - - depends_on "gettext" => :optional - def install - args = %W[ - --disable-dependency-tracking - --prefix=#{prefix} - ] - - args << "--disable-ftok" if build.without? "ftok" - - if build.with? "gettext" - args << "--with-libintl-prefix=#{Formula["gettext"].opt_include}" - else - args << "--disable-nls" - end - - system "./configure", *args + system "./configure", "--prefix=#{prefix}", + "--disable-dependency-tracking", + "--disable-ftok", + "--disable-nls" system "make", "install" end From b222a506501b2f8a6548814abf999ca9ac74c614 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:25:58 +0200 Subject: [PATCH 23/33] ibex: remove options --- Formula/ibex.rb | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/Formula/ibex.rb b/Formula/ibex.rb index 22be56203905..6682311678ac 100644 --- a/Formula/ibex.rb +++ b/Formula/ibex.rb @@ -13,10 +13,6 @@ class Ibex < Formula sha256 "8f4d1957bbe546215cf3d328ce06ae6aae6657c764ca2658895654358596f256" => :el_capitan end - option "with-java", "Enable Java bindings for CHOCO solver." - option "with-ampl", "Use AMPL file loader plugin" - - depends_on :java => ["1.8+", :optional] depends_on "bison" => :build depends_on "flex" => :build depends_on "pkg-config" => :build @@ -29,21 +25,10 @@ def install # Reported 9 Oct 2017 https://github.com/ibex-team/ibex-lib/issues/286 ENV.deparallelize - if build.with?("java") && build.with?("ampl") - odie "Cannot set options --with-java and --with-ampl simultaneously for now." - end - - args = %W[ - --prefix=#{prefix} - --enable-shared - --with-optim - --lp-lib=soplex - ] - - args << "--with-jni" if build.with? "java" - args << "--with-ampl" if build.with? "ampl" - - system "./waf", "configure", *args + system "./waf", "configure", "--prefix=#{prefix}", + "--enable-shared", + "--lp-lib=soplex", + "--with-optim" system "./waf", "install" pkgshare.install %w[examples plugins/solver/benchs] From 0483594d698933bdd39a197359a241b362a77af4 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:30:32 +0200 Subject: [PATCH 24/33] open-scene-graph: remove some options --- Formula/open-scene-graph.rb | 50 +++++++++++-------------------------- 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/Formula/open-scene-graph.rb b/Formula/open-scene-graph.rb index 2b1907aa3dbe..9d1ad85e92bd 100644 --- a/Formula/open-scene-graph.rb +++ b/Formula/open-scene-graph.rb @@ -11,34 +11,22 @@ class OpenSceneGraph < Formula sha256 "53f1f0213c088c02506e66dbf6af11c6837e672e10ef8c4521773676e4045d4a" => :el_capitan end - option "with-docs", "Build the documentation with Doxygen and Graphviz" - - deprecated_option "docs" => "with-docs" - depends_on "cmake" => :build + depends_on "doxygen" => :build + depends_on "graphviz" => :build depends_on "pkg-config" => :build - depends_on "jpeg" - depends_on "gtkglext" depends_on "freetype" + depends_on "gtkglext" + depends_on "jpeg" depends_on "sdl" - depends_on "gdal" => :optional - depends_on "jasper" => :optional - depends_on "openexr" => :optional - depends_on "dcmtk" => :optional - depends_on "librsvg" => :optional depends_on "collada-dom" => :optional - depends_on "gnuplot" => :optional depends_on "ffmpeg" => :optional + depends_on "gdal" => :optional # patch necessary to ensure support for gtkglext-quartz # filed as an issue to the developers https://github.com/openscenegraph/osg/issues/34 patch :DATA - if build.with? "docs" - depends_on "doxygen" => :build - depends_on "graphviz" => :build - end - def install # Fix "fatal error: 'os/availability.h' file not found" on 10.11 and # "error: expected function body after function declarator" on 10.12 @@ -47,32 +35,22 @@ def install end args = std_cmake_args - # Disable opportunistic linkage - args << "-DCMAKE_DISABLE_FIND_PACKAGE_GDAL=ON" if build.without? "gdal" - args << "-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON" if build.without? "jasper" - args << "-DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=ON" if build.without? "openexr" - args << "-DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=ON" if build.without? "dcmtk" - args << "-DCMAKE_DISABLE_FIND_PACKAGE_RSVG=ON" if build.without? "librsvg" - args << "-DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=ON" if build.without? "collada-dom" - args << "-DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON" if build.without? "ffmpeg" - args << "-DCMAKE_DISABLE_FIND_PACKAGE_cairo=ON" + args << "-DBUILD_DOCUMENTATION=ON" args << "-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=ON" - - args << "-DBUILD_DOCUMENTATION=" + (build.with?("docs") ? "ON" : "OFF") + args << "-DCMAKE_DISABLE_FIND_PACKAGE_cairo=ON" args << "-DCMAKE_CXX_FLAGS=-Wno-error=narrowing" # or: -Wno-c++11-narrowing - - if MacOS.prefer_64_bit? - args << "-DCMAKE_OSX_ARCHITECTURES=#{Hardware::CPU.arch_64_bit}" - args << "-DOSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX=imageio" - args << "-DOSG_WINDOWING_SYSTEM=Cocoa" - else - args << "-DCMAKE_OSX_ARCHITECTURES=#{Hardware::CPU.arch_32_bit}" - end + args << "-DCMAKE_OSX_ARCHITECTURES=#{Hardware::CPU.arch_64_bit}" + args << "-DOSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX=imageio" + args << "-DOSG_WINDOWING_SYSTEM=Cocoa" if build.with? "collada-dom" + args << "-DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=ON" args << "-DCOLLADA_INCLUDE_DIR=#{Formula["collada-dom"].opt_include}/collada-dom2.4" end + args << "-DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON" if build.without? "ffmpeg" + args << "-DCMAKE_DISABLE_FIND_PACKAGE_GDAL=ON" if build.without? "gdal" + mkdir "build" do system "cmake", "..", *args system "make" From 1860d4f307edda8b839d3ba34b3b594e869e6e90 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:33:08 +0200 Subject: [PATCH 25/33] ngircd: remove options --- Formula/ngircd.rb | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/Formula/ngircd.rb b/Formula/ngircd.rb index 5ba5429e466a..c4f9ed73258c 100644 --- a/Formula/ngircd.rb +++ b/Formula/ngircd.rb @@ -13,34 +13,16 @@ class Ngircd < Formula sha256 "678de9420c8bd5661ec0a6c9418539684a874298c1b35a99684368aac365d2e2" => :yosemite end - option "with-iconv", "Enable character conversion using libiconv." - option "with-pam", "Enable user authentication using PAM." - option "with-sniffer", "Enable IRC traffic sniffer (also enables additional debug output)." - option "with-debug", "Enable additional debug output." - - # Older Formula used the next option by default, so keep it unless - # deactivated by the user: - option "without-ident", "Disable 'IDENT' ('AUTH') protocol support." - - depends_on "libident" if build.with? "ident" + depends_on "libident" depends_on "openssl" def install - args = %W[ - --disable-dependency-tracking - --prefix=#{prefix} - --sysconfdir=#{HOMEBREW_PREFIX}/etc - --enable-ipv6 - --with-openssl - ] - - args << "--with-iconv" if build.with? "iconv" - args << "--with-ident" if build.with? "ident" - args << "--with-pam" if build.with? "pam" - args << "--enable-debug" if build.with? "debug" - args << "--enable-sniffer" if build.with? "sniffer" - - system "./configure", *args + system "./configure", "--disable-dependency-tracking", + "--prefix=#{prefix}", + "--sysconfdir=#{HOMEBREW_PREFIX}/etc", + "--enable-ipv6", + "--with-ident", + "--with-openssl" system "make", "install" prefix.install "contrib/MacOSX/de.barton.ngircd.plist.tmpl" => "de.barton.ngircd.plist" From c671a2122a9a08f552259b2a03424545a611b954 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:34:21 +0200 Subject: [PATCH 26/33] mjpegtools: remove options --- Formula/mjpegtools.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Formula/mjpegtools.rb b/Formula/mjpegtools.rb index 3db8286d2969..407de5c070c9 100644 --- a/Formula/mjpegtools.rb +++ b/Formula/mjpegtools.rb @@ -14,14 +14,8 @@ class Mjpegtools < Formula sha256 "ba1ec63066197a9bb7fc53f075b17d66f739936b151e90e39a741b33f19eaa9f" => :yosemite end - depends_on :x11 => :optional - depends_on "pkg-config" => :build depends_on "jpeg" - depends_on "libquicktime" => :optional - depends_on "libdv" => :optional - depends_on "gtk+" => :optional - depends_on "sdl_gfx" => :optional def install system "./configure", "--disable-dependency-tracking", From bf5e2c41dfbfd9aedd38a11b7fc8022c5b6d7400 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:36:16 +0200 Subject: [PATCH 27/33] gegl: remove options --- Formula/gegl.rb | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Formula/gegl.rb b/Formula/gegl.rb index 628ee77de6fa..7cb22aa5ad73 100644 --- a/Formula/gegl.rb +++ b/Formula/gegl.rb @@ -28,28 +28,18 @@ class Gegl < Formula depends_on "jpeg" depends_on "json-glib" depends_on "libpng" - depends_on "cairo" => :optional - depends_on "librsvg" => :optional - depends_on "lua" => :optional - depends_on "pango" => :optional - depends_on "sdl" => :optional conflicts_with "coreutils", :because => "both install `gcut` binaries" def install - args = %W[ - --disable-debug - --disable-dependency-tracking - --prefix=#{prefix} - --disable-docs - --without-jasper - --without-umfpack - ] - - args << "--without-cairo" if build.without? "cairo" - system "./autogen.sh" if build.head? - system "./configure", *args + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--prefix=#{prefix}", + "--disable-docs", + "--without-cairo", + "--without-jasper", + "--without-umfpack" system "make", "install" end From a0d757c424902e19d5d0e56d3e42c9f824383185 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:37:16 +0200 Subject: [PATCH 28/33] udunits: remove options --- Formula/udunits.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Formula/udunits.rb b/Formula/udunits.rb index 15c815f98a2b..0130439cf1a3 100644 --- a/Formula/udunits.rb +++ b/Formula/udunits.rb @@ -11,20 +11,11 @@ class Udunits < Formula sha256 "5fbd4d1d36e471bc71720b61a1d4a76b363e115fc71b74208fc5284883087bda" => :el_capitan end - option "with-html-docs", "Installs html documentation" - option "with-pdf-docs", "Installs pdf documentation" - - deprecated_option "html-docs" => "with-html-docs" - deprecated_option "pdf-docs" => "with-pdf-docs" - def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}" - args = %w[install] - args << "install-html" if build.with? "html-docs" - args << "install-pdf" if build.with? "pdf-docs" - system "make", *args + system "make", "install" end test do From 584a9faa5c2decf32f25bb9d5f028395bb93ab5f Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:40:55 +0200 Subject: [PATCH 29/33] apr-util: remove options --- Formula/apr-util.rb | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/Formula/apr-util.rb b/Formula/apr-util.rb index f0ee21efc002..4dee25282b8a 100644 --- a/Formula/apr-util.rb +++ b/Formula/apr-util.rb @@ -16,34 +16,13 @@ class AprUtil < Formula depends_on "apr" depends_on "openssl" - depends_on "postgresql" => :optional - depends_on "mysql" => :optional - depends_on "freetds" => :optional - depends_on "unixodbc" => :optional - depends_on "sqlite" => :optional - depends_on "openldap" => :optional def install - # Stick it in libexec otherwise it pollutes lib with a .exp file. - args = %W[ - --prefix=#{libexec} - --with-apr=#{Formula["apr"].opt_prefix} - --with-openssl=#{Formula["openssl"].opt_prefix} - --with-crypto - ] - - args << "--with-pgsql=#{Formula["postgresql"].opt_prefix}" if build.with? "postgresql" - args << "--with-mysql=#{Formula["mysql"].opt_prefix}" if build.with? "mysql" - args << "--with-freetds=#{Formula["freetds"].opt_prefix}" if build.with? "freetds" - args << "--with-odbc=#{Formula["unixodbc"].opt_prefix}" if build.with? "unixodbc" - - if build.with? "openldap" - args << "--with-ldap" - args << "--with-ldap-lib=#{Formula["openldap"].opt_lib}" - args << "--with-ldap-include=#{Formula["openldap"].opt_include}" - end - - system "./configure", *args + # Install in libexec otherwise it pollutes lib with a .exp file. + system "./configure", "--prefix=#{libexec}", + "--with-apr=#{Formula["apr"].opt_prefix}", + "--with-crypto", + "--with-openssl=#{Formula["openssl"].opt_prefix}" system "make" system "make", "install" bin.install_symlink Dir["#{libexec}/bin/*"] From 0b3c48421ba47a8b17b446e7e379af7b895234a8 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:46:16 +0200 Subject: [PATCH 30/33] uwsgi: remove some options --- Formula/uwsgi.rb | 48 ++---------------------------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) diff --git a/Formula/uwsgi.rb b/Formula/uwsgi.rb index fd407b4f71d9..652b40309c83 100644 --- a/Formula/uwsgi.rb +++ b/Formula/uwsgi.rb @@ -11,37 +11,18 @@ class Uwsgi < Formula sha256 "3b51757ece80a6bb790d6db1a923ca46c7cccb7ab59b13150edaffc9229c0c07" => :el_capitan end - option "with-java", "Compile with Java support" - option "with-ruby", "Compile with Ruby support" - - deprecated_option "with-lua51" => "with-lua@5.1" deprecated_option "with-python3" => "with-python" depends_on "pkg-config" => :build depends_on "pcre" depends_on "openssl" depends_on "python@2" + depends_on "yajl" - depends_on "geoip" => :optional - depends_on "gloox" => :optional depends_on "go" => [:build, :optional] - depends_on "jansson" => :optional - depends_on "libffi" => :optional - depends_on "libxslt" => :optional depends_on "libyaml" => :optional - depends_on "lua@5.1" => :optional - depends_on "mongodb" => :optional - depends_on "mongrel2" => :optional - depends_on "mono" => :optional - depends_on "nagios" => :optional - depends_on "postgresql" => :optional depends_on "python" => :optional - depends_on "rrdtool" => :optional - depends_on "rsyslog" => :optional - depends_on "tcc" => :optional - depends_on "v8" => :optional depends_on "zeromq" => :optional - depends_on "yajl" if build.without? "jansson" # "no such file or directory: '... libpython2.7.a'" # Reported 23 Jun 2016: https://github.com/unbit/uwsgi/issues/1299 @@ -62,13 +43,12 @@ def install ENV.prepend "CFLAGS", "-I#{openssl.opt_include}" ENV.prepend "LDFLAGS", "-L#{openssl.opt_lib}" - json = build.with?("jansson") ? "jansson" : "yajl" yaml = build.with?("libyaml") ? "libyaml" : "embedded" (buildpath/"buildconf/brew.ini").write <<~EOS [uwsgi] ssl = true - json = #{json} + json = yajl xml = libxml2 yaml = #{yaml} inherit = base @@ -95,31 +75,7 @@ def install transformation_offload transformation_tofile transformation_toupper ugreen webdav zergpool] - plugins << "alarm_xmpp" if build.with? "gloox" - plugins << "emperor_mongodb" if build.with? "mongodb" - plugins << "emperor_pg" if build.with? "postgresql" - plugins << "ffi" if build.with? "libffi" - plugins << "fiber" if build.with? "ruby" plugins << "gccgo" if build.with? "go" - plugins << "geoip" if build.with? "geoip" - plugins << "jvm" if build.with? "java" - plugins << "jwsgi" if build.with? "java" - plugins << "libtcc" if build.with? "tcc" - plugins << "lua" if build.with? "lua@5.1" - plugins << "mongodb" if build.with? "mongodb" - plugins << "mongodblog" if build.with? "mongodb" - plugins << "mongrel2" if build.with? "mongrel2" - plugins << "mono" if build.with? "mono" - plugins << "nagios" if build.with? "nagios" - plugins << "rack" if build.with? "ruby" - plugins << "rbthreads" if build.with? "ruby" - plugins << "ring" if build.with? "java" - plugins << "rrdtool" if build.with? "rrdtool" - plugins << "rsyslog" if build.with? "rsyslog" - plugins << "servlet" if build.with? "java" - plugins << "stats_pusher_mongodb" if build.with? "mongodb" - plugins << "v8" if build.with? "v8" - plugins << "xslt" if build.with? "libxslt" (libexec/"uwsgi").mkpath plugins.each do |plugin| From 068b2f0d7eb57fda602909d220ff3186767b2557 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:48:55 +0200 Subject: [PATCH 31/33] aubio: remove some options --- Formula/aubio.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Formula/aubio.rb b/Formula/aubio.rb index ce08f590c0a1..e5dda60c65dd 100644 --- a/Formula/aubio.rb +++ b/Formula/aubio.rb @@ -14,15 +14,12 @@ class Aubio < Formula end depends_on :macos => :lion - depends_on "pkg-config" => :build depends_on "libtool" => :build + depends_on "pkg-config" => :build depends_on "numpy" depends_on "python@2" - depends_on "libav" => :optional - depends_on "libsndfile" => :optional - depends_on "libsamplerate" => :optional depends_on "fftw" => :optional - depends_on "jack" => :optional + depends_on "libav" => :optional def install # Needed due to issue with recent cland (-fno-fused-madd)) From 1c87ac2c7d37218da9b821793dd75299812ae080 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:50:35 +0200 Subject: [PATCH 32/33] libquicktime: remove options --- Formula/libquicktime.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Formula/libquicktime.rb b/Formula/libquicktime.rb index 69ed9afb6833..7c38dd8f987f 100644 --- a/Formula/libquicktime.rb +++ b/Formula/libquicktime.rb @@ -15,10 +15,6 @@ class Libquicktime < Formula depends_on "pkg-config" => :build depends_on "gettext" - depends_on "jpeg" => :optional - depends_on "lame" => :optional - depends_on "schroedinger" => :optional - depends_on "libvorbis" => :optional # Fix CVE-2016-2399. Applied upstream on March 6th 2017. # Also, fixes from upstream for CVE-2017-9122 through CVE-2017-9128, applied @@ -37,8 +33,8 @@ def install "--prefix=#{prefix}", "--enable-gpl", "--without-doxygen", - "--without-x", - "--without-gtk" + "--without-gtk", + "--without-x" system "make" system "make", "install" end From dd3fba26e0d984c9046d1ebfa5ae7c7c5fdd1a0b Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 4 Sep 2018 23:53:22 +0200 Subject: [PATCH 33/33] teem: remove options --- Formula/teem.rb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Formula/teem.rb b/Formula/teem.rb index 63700ca2195e..7f69f29f5a1b 100644 --- a/Formula/teem.rb +++ b/Formula/teem.rb @@ -15,26 +15,15 @@ class Teem < Formula sha256 "96733ab04a4a3a7feb5db5c95f58b0a0c1ef418b91988d1000898a46c142a3ec" => :mountain_lion end - option "with-experimental-apps", "Build experimental apps" - option "with-experimental-libs", "Build experimental libs" - - deprecated_option "experimental-apps" => "with-experimental-apps" - deprecated_option "experimental-libs" => "with-experimental-libs" - depends_on "cmake" => :build depends_on "libpng" def install - args = std_cmake_args - args << "-DBUILD_SHARED_LIBS:BOOL=ON" - args << "-DBUILD_EXPERIMENTAL_APPS:BOOL=ON" if build.with? "experimental-apps" - args << "-DBUILD_EXPERIMENTAL_LIBS:BOOL=ON" if build.with? "experimental-libs" - # Installs CMake archive files directly into lib, which we discourage. # Workaround by adding version to libdir & then symlink into expected structure. - args << "-DTeem_USE_LIB_INSTALL_SUBDIR:BOOL=ON" - - system "cmake", *args + system "cmake", *std_cmake_args, + "-DBUILD_SHARED_LIBS:BOOL=ON", + "-DTeem_USE_LIB_INSTALL_SUBDIR:BOOL=ON" system "make", "install" lib.install_symlink Dir.glob(lib/"Teem-#{version}/*.dylib")