diff options
75 files changed, 110 insertions, 104 deletions
diff --git a/Library/Formula/abcde.rb b/Library/Formula/abcde.rb index 81c82ef04..8553cd6d8 100644 --- a/Library/Formula/abcde.rb +++ b/Library/Formula/abcde.rb @@ -14,8 +14,8 @@ class Abcde < Formula depends_on 'mkcue' def install - # Makefile hardcodes installing files owned by root; don't do this. - inreplace 'Makefile', '-o 0', '' - system "export prefix=#{prefix};export DESTDIR=$prefix;make -e install" + bin.install 'abcde', 'cddb-tool' + etc.install 'abcde.conf' unless (etc/'abcde.conf').exist? + man1.install 'abcde.1', 'cddb-tool.1' end end diff --git a/Library/Formula/asciitex.rb b/Library/Formula/asciitex.rb index 92e0c2675..6e9a61f2c 100644 --- a/Library/Formula/asciitex.rb +++ b/Library/Formula/asciitex.rb @@ -13,6 +13,6 @@ class Asciitex < Formula end def test - system "#{bin}/asciiTeX -f #{prefix}/EXAMPLES" + system "#{bin}/asciiTeX", "-f", "#{prefix}/EXAMPLES" end end diff --git a/Library/Formula/assimp.rb b/Library/Formula/assimp.rb index cc6981701..dca759cd0 100644 --- a/Library/Formula/assimp.rb +++ b/Library/Formula/assimp.rb @@ -14,6 +14,6 @@ class Assimp < Formula end def test - system "#{bin}/assimp version" + system "#{bin}/assimp", "version" end end diff --git a/Library/Formula/audiofile.rb b/Library/Formula/audiofile.rb index 8e2e864ba..95601fb1a 100644 --- a/Library/Formula/audiofile.rb +++ b/Library/Formula/audiofile.rb @@ -47,9 +47,9 @@ class Audiofile < Formula end mktemp do - system "#{conv_bin} #{inn} #{out} format wave" - system "#{info_bin} --short --reporterror #{out}" - system "#{hear_bin} -p #{out}" if ARGV.verbose? + system conv_bin, inn, out, 'format', 'wave' + system info_bin, '--short', '--reporterror', out + system hear_bin, '-p', out if ARGV.verbose? end end end diff --git a/Library/Formula/avanor.rb b/Library/Formula/avanor.rb index 11c9b9858..3685dfb21 100644 --- a/Library/Formula/avanor.rb +++ b/Library/Formula/avanor.rb @@ -11,7 +11,7 @@ class Avanor < Formula s.gsub! "LD = gpp", "LD = cpp" end - system "make DATA_DIR=#{share}/avanor/" + system "make", "DATA_DIR=#{share}/avanor/" bin.install "avanor" (share+"avanor").install "manual" end diff --git a/Library/Formula/bibutils.rb b/Library/Formula/bibutils.rb index 036a2cbf8..f6a151f4c 100644 --- a/Library/Formula/bibutils.rb +++ b/Library/Formula/bibutils.rb @@ -6,7 +6,7 @@ class Bibutils < Formula md5 '395f46393eca8e184652c5e8e1ae83b6' def install - system "./configure --install-dir #{prefix}" + system "./configure", "--install-dir", prefix # The configure script replaces the CC variable wrong, so fix it here inreplace 'Makefile' do |s| diff --git a/Library/Formula/camlp5.rb b/Library/Formula/camlp5.rb index 374567075..1f6fc0382 100644 --- a/Library/Formula/camlp5.rb +++ b/Library/Formula/camlp5.rb @@ -20,7 +20,7 @@ class Camlp5 < Formula strictness = "-transitional" end - system "./configure -prefix #{prefix} -mandir #{man} #{strictness}" + system "./configure", "-prefix", prefix, "-mandir", man, strictness # this build fails if jobs are parallelized ENV.deparallelize system "make world.opt" diff --git a/Library/Formula/catdoc.rb b/Library/Formula/catdoc.rb index aace4f309..574bac93a 100644 --- a/Library/Formula/catdoc.rb +++ b/Library/Formula/catdoc.rb @@ -8,7 +8,7 @@ class Catdoc < Formula def install # catdoc configure says it respects --mandir=, but does not. ENV['man1dir'] = man1 - system "./configure --disable-debug --disable-dependency-tracking --prefix=#{prefix}" + system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}" # The INSTALL file confuses make on case insensitive filesystems. system "mv INSTALL INSTALL.txt" system "make" diff --git a/Library/Formula/cd-discid.rb b/Library/Formula/cd-discid.rb index 86ff967dc..f9c93a49f 100644 --- a/Library/Formula/cd-discid.rb +++ b/Library/Formula/cd-discid.rb @@ -12,6 +12,9 @@ class CdDiscid < Formula end def install - system "export prefix=#{prefix}; make -e install" + system "make", "prefix=#{prefix}", + "CC=#{ENV.cc}", + "CFLAGS=#{ENV.cflags}", + "install" end end diff --git a/Library/Formula/cfitsio.rb b/Library/Formula/cfitsio.rb index 221e84b0d..d7a4c453e 100644 --- a/Library/Formula/cfitsio.rb +++ b/Library/Formula/cfitsio.rb @@ -31,7 +31,7 @@ class Cfitsio < Formula Dir['*.c'].each do |f| # compressed_fits.c does not work (obsolete function call) next if f == 'compress_fits.c' - system "#{ENV.cc} #{f} -I#{include} -L#{lib} -lcfitsio -lm -o bin/#{f.sub('.c','')}" + system ENV.cc, f, "-I#{include}", "-L#{lib}", "-lcfitsio", "-lm", "-o", "bin/#{f.sub('.c', '')}" end bin.install Dir['bin/*'] end diff --git a/Library/Formula/chuck.rb b/Library/Formula/chuck.rb index 2ac4d5599..608a06a02 100644 --- a/Library/Formula/chuck.rb +++ b/Library/Formula/chuck.rb @@ -6,7 +6,7 @@ class Chuck < Formula md5 'ac8459b4067c2491fbdeb61d122a5985' def install - system "make -C src/ osx-#{Hardware.cpu_type}" + system "make", "-C", "src", "osx-#{Hardware.cpu_type}" bin.install "src/chuck" (share+'chuck').install "examples/" end diff --git a/Library/Formula/clam.rb b/Library/Formula/clam.rb index 7b0300f36..2b7c2a4e0 100644 --- a/Library/Formula/clam.rb +++ b/Library/Formula/clam.rb @@ -16,7 +16,7 @@ class Clam < Formula depends_on 'id3lib' def install - system "scons configure prefix=#{prefix} with_ladspa=no xmlbackend=none" + system "scons", "configure", "prefix=#{prefix}", "with_ladspa=no", "xmlbackend=none" system "scons" system "scons install" end diff --git a/Library/Formula/clay.rb b/Library/Formula/clay.rb index c61ab97a0..dd6a99e23 100644 --- a/Library/Formula/clay.rb +++ b/Library/Formula/clay.rb @@ -16,6 +16,6 @@ class Clay < Formula end def test - system "#{bin}/clay -e 'println(\"Hello, Clay!\");'" + system "#{bin}/clay", "-e", "println(\"Hello, Clay!\");" end end diff --git a/Library/Formula/clhep.rb b/Library/Formula/clhep.rb index cb52857f1..941bdf361 100644 --- a/Library/Formula/clhep.rb +++ b/Library/Formula/clhep.rb @@ -9,7 +9,7 @@ class Clhep < Formula def install mkdir 'clhep-build' do - system "cmake #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{prefix} ../CLHEP" + system "cmake #{std_cmake_parameters} -DCMAKE_PREFIX_PATH='#{prefix}' ../CLHEP" system "make install" end end diff --git a/Library/Formula/couchdb-lucene.rb b/Library/Formula/couchdb-lucene.rb index f7fc00ae5..49e7586f2 100644 --- a/Library/Formula/couchdb-lucene.rb +++ b/Library/Formula/couchdb-lucene.rb @@ -11,8 +11,8 @@ class CouchdbLucene < Formula def install system "mvn" - system "tar -xzf target/couchdb-lucene-#{version}-dist.tar.gz" - system "mv couchdb-lucene-#{version}/* #{prefix}" + system "tar", "-xzf", "target/couchdb-lucene-#{version}-dist.tar.gz" + prefix.install Dir["couchdb-lucene-#{version}/*"] (etc + "couchdb/local.d/couchdb-lucene.ini").write ini_file plist_path.write startup_plist diff --git a/Library/Formula/daemon.rb b/Library/Formula/daemon.rb index df6d22d60..7d90324de 100644 --- a/Library/Formula/daemon.rb +++ b/Library/Formula/daemon.rb @@ -8,7 +8,7 @@ class Daemon < Formula def install system "./config" system "make" - system "make PREFIX=#{prefix} install" + system "make", "PREFIX=#{prefix}", "install" end def test diff --git a/Library/Formula/direnv.rb b/Library/Formula/direnv.rb index 6b40d490e..e133c3edf 100644 --- a/Library/Formula/direnv.rb +++ b/Library/Formula/direnv.rb @@ -8,7 +8,7 @@ class Direnv < Formula head 'https://github.com/zimbatm/direnv.git' def install - system "make install DESTDIR=#{prefix}" + system "make", "install", "DESTDIR=#{prefix}" end def caveats; <<-EOS.undent diff --git a/Library/Formula/dnsmasq.rb b/Library/Formula/dnsmasq.rb index f83ae3668..f6b4d44fb 100644 --- a/Library/Formula/dnsmasq.rb +++ b/Library/Formula/dnsmasq.rb @@ -28,7 +28,7 @@ class Dnsmasq < Formula s.change_make_var! "CFLAGS", ENV.cflags end - system "make install PREFIX=#{prefix}" + system "make", "install", "PREFIX=#{prefix}" prefix.install "dnsmasq.conf.example" plist_path.write startup_plist diff --git a/Library/Formula/dvtm.rb b/Library/Formula/dvtm.rb index 23e6b9389..65fed625a 100644 --- a/Library/Formula/dvtm.rb +++ b/Library/Formula/dvtm.rb @@ -9,6 +9,6 @@ class Dvtm < Formula def install inreplace 'config.mk', 'LIBS = -lc -lutil -lncursesw', 'LIBS = -lc -lutil -lncurses' inreplace 'Makefile', 'strip -s', 'strip' - system "make PREFIX=#{prefix} install" + system "make", "PREFIX=#{prefix}", "install" end end diff --git a/Library/Formula/dwm.rb b/Library/Formula/dwm.rb index 970341dd3..be1281db0 100644 --- a/Library/Formula/dwm.rb +++ b/Library/Formula/dwm.rb @@ -13,7 +13,7 @@ class Dwm < Formula '{ MODKEY|ShiftMask, XK_q, quit, {0} },', '{ MODKEY|ControlMask, XK_q, quit, {0} },' inreplace 'dwm.1', '.B Mod1\-Shift\-q', '.B Mod1\-Control\-q' - system "make PREFIX=#{prefix} install" + system "make", "PREFIX=#{prefix}", "install" end def caveats diff --git a/Library/Formula/eigen.rb b/Library/Formula/eigen.rb index f8f6ab437..39278db95 100644 --- a/Library/Formula/eigen.rb +++ b/Library/Formula/eigen.rb @@ -10,7 +10,7 @@ class Eigen < Formula def install ENV.fortran mkdir 'eigen-build' do - system "cmake #{std_cmake_parameters} -DCMAKE_BUILD_TYPE=Release -Dpkg_config_libdir=#{lib} .." + system "cmake #{std_cmake_parameters} -DCMAKE_BUILD_TYPE=Release -Dpkg_config_libdir='#{lib}' .." system "make install" end end diff --git a/Library/Formula/freeimage.rb b/Library/Formula/freeimage.rb index 3b113005d..aa61e7114 100644 --- a/Library/Formula/freeimage.rb +++ b/Library/Formula/freeimage.rb @@ -25,10 +25,10 @@ class Freeimage < Formula def install ENV.universal_binary if ARGV.build_universal? - system "gnumake -f Makefile.gnu" - system "gnumake -f Makefile.gnu install PREFIX=#{prefix}" - system "gnumake -f Makefile.fip" - system "gnumake -f Makefile.fip install PREFIX=#{prefix}" + system "make", "-f", "Makefile.gnu" + system "make", "-f", "Makefile.gnu", "install", "PREFIX=#{prefix}" + system "make", "-f", "Makefile.fip" + system "make", "-f", "Makefile.fip", "install", "PREFIX=#{prefix}" end end diff --git a/Library/Formula/git-sh.rb b/Library/Formula/git-sh.rb index 2f8d839ab..3c5f1c917 100644 --- a/Library/Formula/git-sh.rb +++ b/Library/Formula/git-sh.rb @@ -13,6 +13,6 @@ class GitSh < Formula def install system "make" - system "make install PREFIX=#{prefix}" + system "make", "install", "PREFIX=#{prefix}" end end diff --git a/Library/Formula/git-url-sub.rb b/Library/Formula/git-url-sub.rb index d157b81a2..df4e79536 100644 --- a/Library/Formula/git-url-sub.rb +++ b/Library/Formula/git-url-sub.rb @@ -6,6 +6,6 @@ class GitUrlSub < Formula md5 '5d2dad29dcd53eedc0730f42014bec51' def install - system "make install PREFIX=#{prefix}" + system "make", "install", "PREFIX=#{prefix}" end end diff --git a/Library/Formula/gitslave.rb b/Library/Formula/gitslave.rb index 0ab030ec5..04e4a6790 100644 --- a/Library/Formula/gitslave.rb +++ b/Library/Formula/gitslave.rb @@ -6,6 +6,6 @@ class Gitslave < Formula md5 '7fed63110ae1a656af10462f60592000' def install - system "make install prefix=#{prefix}" + system "make", "install", "prefix=#{prefix}" end end diff --git a/Library/Formula/httping.rb b/Library/Formula/httping.rb index fc074ffbd..b4cea2da1 100644 --- a/Library/Formula/httping.rb +++ b/Library/Formula/httping.rb @@ -11,6 +11,6 @@ class Httping < Formula end def install - system "make install PREFIX=#{prefix}" + system "make", "install", "PREFIX=#{prefix}" end end diff --git a/Library/Formula/innotop.rb b/Library/Formula/innotop.rb index be12b600c..2ea15931f 100644 --- a/Library/Formula/innotop.rb +++ b/Library/Formula/innotop.rb @@ -8,7 +8,7 @@ class Innotop < Formula depends_on 'DBD::mysql' => :perl def install - system "perl Makefile.PL PREFIX=#{prefix}" + system "perl", "Makefile.PL", "PREFIX=#{prefix}" system "make install" end end diff --git a/Library/Formula/iodine.rb b/Library/Formula/iodine.rb index 0c5885f43..fefa72a8f 100644 --- a/Library/Formula/iodine.rb +++ b/Library/Formula/iodine.rb @@ -11,6 +11,6 @@ class Iodine < Formula "arpa/nameser8_compat", "arpa/nameser_compat" end - system "make install prefix=#{prefix}" + system "make", "install", "prefix=#{prefix}" end end diff --git a/Library/Formula/ioping.rb b/Library/Formula/ioping.rb index 8a7d2df3a..bc25ece26 100644 --- a/Library/Formula/ioping.rb +++ b/Library/Formula/ioping.rb @@ -8,6 +8,6 @@ class Ioping < Formula def install system "make" - system "make install PREFIX=#{prefix}" + system "make", "install", "PREFIX=#{prefix}" end end diff --git a/Library/Formula/jbigkit.rb b/Library/Formula/jbigkit.rb index a18b212ee..afdf7812e 100644 --- a/Library/Formula/jbigkit.rb +++ b/Library/Formula/jbigkit.rb @@ -38,7 +38,7 @@ class Jbigkit < Formula def test mktemp do system "#{bin}/jbgtopbm #{prefix}/examples/ccitt7.jbg | #{bin}/pbmtojbg - testoutput.jbg" - system "/usr/bin/cmp #{prefix}/examples/ccitt7.jbg testoutput.jbg" + system "/usr/bin/cmp", "#{prefix}/examples/ccitt7.jbg", "testoutput.jbg" end end end diff --git a/Library/Formula/john.rb b/Library/Formula/john.rb index f2a62dc02..1c834525e 100644 --- a/Library/Formula/john.rb +++ b/Library/Formula/john.rb @@ -16,7 +16,7 @@ class John < Formula arch = Hardware.is_64_bit? ? '64' : 'sse2' cd 'src' do - system "make clean macosx-x86-#{arch}" + system "make", "clean", "macosx-x86-#{arch}" end rm 'README' diff --git a/Library/Formula/jruby.rb b/Library/Formula/jruby.rb index acdf43a02..4409b3cfd 100644 --- a/Library/Formula/jruby.rb +++ b/Library/Formula/jruby.rb @@ -28,6 +28,6 @@ class Jruby < Formula end def test - system "#{bin}/jruby -e 'puts \"hello\"'" + system "#{bin}/jruby", "-e", "puts 'hello'" end end diff --git a/Library/Formula/lasi.rb b/Library/Formula/lasi.rb index 2b4c947a6..2594f153c 100644 --- a/Library/Formula/lasi.rb +++ b/Library/Formula/lasi.rb @@ -13,7 +13,7 @@ class Lasi < Formula depends_on 'doxygen' def install - system "cmake -DCMAKE_INSTALL_PREFIX=#{prefix} ." + system "cmake -DCMAKE_INSTALL_PREFIX='#{prefix}' ." system "make install" end end diff --git a/Library/Formula/latex2rtf.rb b/Library/Formula/latex2rtf.rb index 3dcfb5640..61c15e207 100644 --- a/Library/Formula/latex2rtf.rb +++ b/Library/Formula/latex2rtf.rb @@ -11,6 +11,6 @@ class Latex2rtf < Formula s.change_make_var! 'MAN_INSTALL', man1 end - system "make PREFIX=#{prefix} install" + system "make", "PREFIX=#{prefix}", "install" end end diff --git a/Library/Formula/lcov.rb b/Library/Formula/lcov.rb index bca83988b..da8e69661 100644 --- a/Library/Formula/lcov.rb +++ b/Library/Formula/lcov.rb @@ -9,7 +9,7 @@ class Lcov < Formula %w(bin/gendesc bin/genhtml bin/geninfo bin/genpng bin/lcov).each do |file| inreplace file, '/etc/lcovrc', "#{prefix}/etc/lcovrc" end - system "make PREFIX=#{prefix} install" + system "make", "PREFIX=#{prefix}", "install" end def patches diff --git a/Library/Formula/ledger.rb b/Library/Formula/ledger.rb index 551bd6a43..f81f5eb33 100644 --- a/Library/Formula/ledger.rb +++ b/Library/Formula/ledger.rb @@ -28,7 +28,7 @@ class Ledger < Formula # gmp installs x86_64 only inreplace 'acprep', "'-arch', 'i386', ", "" if Hardware.is_64_bit? no_python = ((ARGV.include? '--no-python') ? '--no-python' : '') - system "./acprep #{no_python} -j#{ENV.make_jobs} opt make -- --prefix=#{prefix}" + system "./acprep", no_python, "-j#{ENV.make_jobs}", "opt", "make", "--", "--prefix=#{prefix}" end system 'make' ENV.deparallelize diff --git a/Library/Formula/ledit.rb b/Library/Formula/ledit.rb index c126813e2..b425aa040 100644 --- a/Library/Formula/ledit.rb +++ b/Library/Formula/ledit.rb @@ -11,7 +11,8 @@ class Ledit < Formula def install # like camlp5, this build fails if the jobs are parallelized ENV.deparallelize - system "make BINDIR=#{bin} LIBDIR=#{lib} MANDIR=#{man}" - system "make install BINDIR=#{bin} LIBDIR=#{lib} MANDIR=#{man}" + args = %W[BINDIR=#{bin} LIBDIR=#{lib} MANDIR=#{man}] + system "make", *args + system "make", "install", *args end end diff --git a/Library/Formula/libmusicbrainz.rb b/Library/Formula/libmusicbrainz.rb index 28ff1410c..cee7a6214 100644 --- a/Library/Formula/libmusicbrainz.rb +++ b/Library/Formula/libmusicbrainz.rb @@ -10,7 +10,7 @@ class Libmusicbrainz < Formula def install neon = Formula.factory("neon") - neon_args = "-DNEON_LIBRARIES:FILEPATH=#{neon.lib}/libneon.dylib -DNEON_INCLUDE_DIR:PATH=#{neon.include}/neon" + neon_args = "-DNEON_LIBRARIES:FILEPATH='#{neon.lib}/libneon.dylib' -DNEON_INCLUDE_DIR:PATH='#{neon.include}/neon'" system "cmake #{std_cmake_parameters} #{neon_args} ." system "make install" diff --git a/Library/Formula/libplist.rb b/Library/Formula/libplist.rb index 2e0eee655..0380bba8c 100644 --- a/Library/Formula/libplist.rb +++ b/Library/Formula/libplist.rb @@ -16,7 +16,7 @@ class Libplist < Formula def install ENV.deparallelize # make fails on an 8-core Mac Pro - system "cmake #{std_cmake_parameters} -DCMAKE_INSTALL_NAME_DIR=#{lib} ." + system "cmake #{std_cmake_parameters} -DCMAKE_INSTALL_NAME_DIR='#{lib}' ." system "make install" # Remove 'plutil', which duplicates the system-provided one. Leave the versioned one, though. diff --git a/Library/Formula/libutf.rb b/Library/Formula/libutf.rb index 2c8e651e0..76a884df3 100644 --- a/Library/Formula/libutf.rb +++ b/Library/Formula/libutf.rb @@ -8,6 +8,6 @@ class Libutf < Formula def install inreplace 'Makefile', 'man/man7', 'share/man/man7' - system "make PREFIX=#{prefix} install" + system "make", "PREFIX=#{prefix}", "install" end end diff --git a/Library/Formula/magit.rb b/Library/Formula/magit.rb index 0844e749d..44e6d0ceb 100644 --- a/Library/Formula/magit.rb +++ b/Library/Formula/magit.rb @@ -7,6 +7,6 @@ class Magit < Formula head 'https://github.com/magit/magit.git' def install - system "make install DESTDIR=#{prefix} PREFIX=" + system "make", "install", "DESTDIR=#{prefix}", "PREFIX=" end end diff --git a/Library/Formula/mg.rb b/Library/Formula/mg.rb index ec7a79883..ba3e1bc64 100644 --- a/Library/Formula/mg.rb +++ b/Library/Formula/mg.rb @@ -9,6 +9,6 @@ class Mg < Formula # -Wno-error=unused-but-set-variable requires GCC 4.6+ inreplace 'Makefile.in', '-Wno-error=unused-but-set-variable', '' system "./configure" - system "make install prefix=#{prefix} mandir=#{man}" + system "make", "install", "prefix=#{prefix}", "mandir=#{man}" end end diff --git a/Library/Formula/mhash.rb b/Library/Formula/mhash.rb index 314e3f256..af6d25715 100644 --- a/Library/Formula/mhash.rb +++ b/Library/Formula/mhash.rb @@ -6,7 +6,7 @@ class Mhash < Formula md5 'ee66b7d5947deb760aeff3f028e27d25' def install - system "./configure --prefix=#{prefix} --disable-debug --disable-dependency-tracking" + system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking" system "make install" end end diff --git a/Library/Formula/mkvtoolnix.rb b/Library/Formula/mkvtoolnix.rb index 39492799a..916c8d6b2 100644 --- a/Library/Formula/mkvtoolnix.rb +++ b/Library/Formula/mkvtoolnix.rb @@ -21,7 +21,7 @@ class Mkvtoolnix < Formula "--prefix=#{prefix}", "--with-boost-libdir=#{HOMEBREW_PREFIX}/lib", # For non-/usr/local prefix "--with-boost-regex=boost_regex-mt" # via macports - system "./drake -j#{ENV.make_jobs}" + system "./drake", "-j#{ENV.make_jobs}" system "./drake install" end end diff --git a/Library/Formula/mongrel2.rb b/Library/Formula/mongrel2.rb index a774a241b..c444295ce 100644 --- a/Library/Formula/mongrel2.rb +++ b/Library/Formula/mongrel2.rb @@ -18,6 +18,6 @@ class Mongrel2 < Formula ENV['OPTLIBS'] = ENV.ldflags system "make all" - system "make install PREFIX=#{prefix}" + system "make", "install", "PREFIX=#{prefix}" end end diff --git a/Library/Formula/mupdf.rb b/Library/Formula/mupdf.rb index 50aa3c102..71e0c46ce 100644 --- a/Library/Formula/mupdf.rb +++ b/Library/Formula/mupdf.rb @@ -33,7 +33,7 @@ class Mupdf < Formula def install ENV.x11 # For LibPNG and Freetype - system "make install prefix=#{prefix}" + system "make", "install", "prefix=#{prefix}" # MuPDF comes with some handy command-line tools. However, their names can # clash with other tools installed by formulae such as Poppler. So, we diff --git a/Library/Formula/mytop.rb b/Library/Formula/mytop.rb index 402b87acd..02d513f15 100644 --- a/Library/Formula/mytop.rb +++ b/Library/Formula/mytop.rb @@ -8,7 +8,7 @@ class Mytop < Formula depends_on 'DBD::mysql' => :perl def install - system "perl Makefile.PL PREFIX=#{prefix}" + system "perl", "Makefile.PL", "PREFIX=#{prefix}" system "make test install" end end diff --git a/Library/Formula/nacl.rb b/Library/Formula/nacl.rb index 6f18ce193..43aca1e91 100644 --- a/Library/Formula/nacl.rb +++ b/Library/Formula/nacl.rb @@ -29,7 +29,7 @@ class Nacl < Formula # but plenty of the key generation routines depend on it. Users shouldn't have to # know this. nacl_libdir = "build/#{hoststr}/lib/#{archstr}" - system "ar -r #{nacl_libdir}/libnacl.a #{nacl_libdir}/randombytes.o" + system "ar", "-r", "#{nacl_libdir}/libnacl.a", "#{nacl_libdir}/randombytes.o" lib.install "#{nacl_libdir}/libnacl.a" end end diff --git a/Library/Formula/noweb.rb b/Library/Formula/noweb.rb index 60d1057be..41db6b9e1 100644 --- a/Library/Formula/noweb.rb +++ b/Library/Formula/noweb.rb @@ -15,17 +15,17 @@ class Noweb < Formula if which 'kpsewhich' ohai 'TeX installation found. Installing TeX support files there might fail if your user does not have permission' - texmf = "`kpsewhich -var-value=TEXMFLOCAL`" + texmf = Pathname.new(`kpsewhich -var-value=TEXMFLOCAL`.chomp) else ohai 'No TeX installation found. Installing TeX support files in the noweb Cellar.' - texmf = "#{prefix}" + texmf = prefix end bin.mkpath lib.mkpath man.mkpath + (texmf/'tex/generic/noweb').mkpath - system "mkdir -p #{texmf}/tex/generic/noweb" system "make", "install", "BIN=#{bin}", "LIB=#{lib}", "MAN=#{man}", diff --git a/Library/Formula/nss.rb b/Library/Formula/nss.rb index d16b6dd73..c11606813 100644 --- a/Library/Formula/nss.rb +++ b/Library/Formula/nss.rb @@ -20,7 +20,7 @@ class Nss < Formula ] args << 'USE_64=1' if MacOS.prefer_64_bit? - system "make build_coreconf build_dbm all -C mozilla/security/nss #{args.join ' '}" + system "make", "build_coreconf", "build_dbm", "all", "-C", "mozilla/security/nss", *args # We need to use cp here because all files get cross-linked into the dist # hierarchy, and Homebrew's Pathname.install moves the symlink into the keg @@ -52,8 +52,8 @@ class Nss < Formula # See: http://www.mozilla.org/projects/security/pki/nss/tools/certutil.html mktemp do File.open('passwd', 'w') {|f| f.write("It's a secret to everyone.") } - system "#{bin}/certutil -N -d #{Dir.getwd} -f passwd" - system "#{bin}/certutil -L -d #{Dir.getwd}" + system "#{bin}/certutil", "-N", "-d", pwd, "-f", "passwd" + system "#{bin}/certutil", "-L", "-d", pwd end end diff --git a/Library/Formula/num-utils.rb b/Library/Formula/num-utils.rb index 9fa208cde..52e97f9e7 100644 --- a/Library/Formula/num-utils.rb +++ b/Library/Formula/num-utils.rb @@ -1,13 +1,13 @@ require 'formula' class NumUtils < Formula + homepage 'http://suso.suso.org/programs/num-utils/' url "http://suso.suso.org/programs/num-utils/downloads/num-utils-0.5.tar.gz" md5 '58eed69761c2da97c3bfdfa422633427' - homepage 'http://suso.suso.org/programs/num-utils/' def install %w(average bound interval normalize numgrep numprocess numsum random range round).each do |program| - system "pod2man #{program} #{program}.1" + system "pod2man", program, "#{program}.1" bin.install program man1.install "#{program}.1" end diff --git a/Library/Formula/o-make.rb b/Library/Formula/o-make.rb index e69aa6c6c..5ca679a50 100644 --- a/Library/Formula/o-make.rb +++ b/Library/Formula/o-make.rb @@ -13,7 +13,7 @@ class OMake < Formula end def install - system "make install PREFIX=#{prefix}" + system "make", "install", "PREFIX=#{prefix}" end end diff --git a/Library/Formula/objective-caml.rb b/Library/Formula/objective-caml.rb index a839809c7..723f9b96a 100644 --- a/Library/Formula/objective-caml.rb +++ b/Library/Formula/objective-caml.rb @@ -19,7 +19,7 @@ class ObjectiveCaml < Formula system "make world" system "make opt" system "make opt.opt" - system "make PREFIX=#{prefix} install" + system "make", "PREFIX=#{prefix}", "install" (lib+'ocaml/compiler-libs').install 'typing', 'parsing', 'utils' # site-lib in the Cellar will be a symlink to the HOMEBREW_PREFIX location, diff --git a/Library/Formula/opentracker.rb b/Library/Formula/opentracker.rb index 531caa642..0eee65ac3 100644 --- a/Library/Formula/opentracker.rb +++ b/Library/Formula/opentracker.rb @@ -14,7 +14,7 @@ class Opentracker < Formula # First libowfat must be compiled and installed where opentracker is expecting it libowfat_include = Pathname.new(pwd) + 'libowfat' Libowfat.new.brew do - system "make install INCLUDEDIR=#{libowfat_include} LIBDIR=#{libowfat_include} MAN3DIR=." + system "make", "install", "INCLUDEDIR=#{libowfat_include}", "LIBDIR=#{libowfat_include}", "MAN3DIR=." end # Tell opentracker that libowfat headers are located in the same directory as itself diff --git a/Library/Formula/parmetis.rb b/Library/Formula/parmetis.rb index 488db5d4f..9c1c6daf3 100644 --- a/Library/Formula/parmetis.rb +++ b/Library/Formula/parmetis.rb @@ -8,7 +8,7 @@ class Parmetis < Formula depends_on 'cmake' => :build def install - system "make config prefix=#{prefix}" + system "make", "config", "prefix=#{prefix}" system 'make install' end end diff --git a/Library/Formula/percona-toolkit.rb b/Library/Formula/percona-toolkit.rb index 62fb20218..1d8f2cc2c 100644 --- a/Library/Formula/percona-toolkit.rb +++ b/Library/Formula/percona-toolkit.rb @@ -9,7 +9,7 @@ class PerconaToolkit < Formula depends_on 'DBD::mysql' => :perl def install - system "perl Makefile.PL PREFIX=#{prefix}" + system "perl", "Makefile.PL", "PREFIX=#{prefix}" system "make" system "make test" system "make install" diff --git a/Library/Formula/polipo.rb b/Library/Formula/polipo.rb index 7d3f3abe3..76d80ab7b 100644 --- a/Library/Formula/polipo.rb +++ b/Library/Formula/polipo.rb @@ -9,9 +9,15 @@ class Polipo < Formula def install cache_root = (var + "cache/polipo") cache_root.mkpath - make_opts = "PREFIX=#{prefix} LOCAL_ROOT=#{share}/polipo/www DISK_CACHE_ROOT=#{cache_root} MANDIR=#{man} INFODIR=#{info} PLATFORM_DEFINES=-DHAVE_IPv6" - system "make all #{make_opts}" - system "make install #{make_opts}" + args = %W[PREFIX=#{prefix} + LOCAL_ROOT=#{share}/polipo/www + DISK_CACHE_ROOT=#{cache_root} + MANDIR=#{man} + INFODIR=#{info} + PLATFORM_DEFINES=-DHAVE_IPv6] + + system "make", "all", *args + system "make", "install", *args plist_path.write startup_plist plist_path.chmod 0644 diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb index 96c02db52..66c868b5b 100644 --- a/Library/Formula/poppler.rb +++ b/Library/Formula/poppler.rb @@ -44,7 +44,7 @@ class Poppler < Formula # Install poppler font data. PopplerData.new.brew do - system "make install prefix=#{prefix}" + system "make", "install", "prefix=#{prefix}" end end end diff --git a/Library/Formula/putty.rb b/Library/Formula/putty.rb index d6eedc435..8859ff49f 100644 --- a/Library/Formula/putty.rb +++ b/Library/Formula/putty.rb @@ -12,7 +12,7 @@ class Putty < Formula system "./configure", "--prefix=#{prefix}", "--disable-gtktest", "--with-gtk-prefix=/dev/null" - system "make VER=-DRELEASE=#{version} all-cli" + system "make", "VER=-DRELEASE=#{version}", "all-cli" # install manually bin.install %w{ plink pscp psftp puttygen } end diff --git a/Library/Formula/pyside.rb b/Library/Formula/pyside.rb index b3aa9d915..9f8061d4f 100644 --- a/Library/Formula/pyside.rb +++ b/Library/Formula/pyside.rb @@ -24,7 +24,7 @@ class Pyside < Formula ENV.append_to_cflags "-F#{qt.prefix}/Frameworks" # Also need `ALTERNATIVE_QT_INCLUDE_DIR` to prevent "missing file" errors. - system "cmake #{std_cmake_parameters} -DALTERNATIVE_QT_INCLUDE_DIR=#{qt.prefix}/Frameworks -DSITE_PACKAGE=#{site_package_dir} -DBUILD_TESTS=NO ." + system "cmake #{std_cmake_parameters} -DALTERNATIVE_QT_INCLUDE_DIR='#{qt.prefix}/Frameworks' -DSITE_PACKAGE=#{site_package_dir} -DBUILD_TESTS=NO ." system 'make install' end diff --git a/Library/Formula/qhull.rb b/Library/Formula/qhull.rb index 03ec9a587..d56a459b7 100644 --- a/Library/Formula/qhull.rb +++ b/Library/Formula/qhull.rb @@ -21,7 +21,7 @@ class Qhull < Formula end def install - system "cmake #{std_cmake_parameters} -DMAN_INSTALL_DIR=#{man1} ." + system "cmake #{std_cmake_parameters} -DMAN_INSTALL_DIR='#{man1}' ." system "make install" end end diff --git a/Library/Formula/rakudo-star.rb b/Library/Formula/rakudo-star.rb index 83685b29c..14fba61ac 100644 --- a/Library/Formula/rakudo-star.rb +++ b/Library/Formula/rakudo-star.rb @@ -10,7 +10,7 @@ class RakudoStar < Formula depends_on 'pcre' => :optional def install - system "perl Configure.pl --prefix=#{prefix} --gen-parrot" + system "perl", "Configure.pl", "--prefix=#{prefix}", "--gen-parrot" system "make" system "make install" end diff --git a/Library/Formula/sbcl.rb b/Library/Formula/sbcl.rb index 2e35e70fd..bc5f3524d 100644 --- a/Library/Formula/sbcl.rb +++ b/Library/Formula/sbcl.rb @@ -67,20 +67,17 @@ class Sbcl < Formula value =~ /[\x80-\xff]/ end - SbclBootstrapBinaries.new.brew { + SbclBootstrapBinaries.new.brew do # We only need the binaries for bootstrapping, so don't install anything: command = Dir.pwd + "/src/runtime/sbcl" core = Dir.pwd + "/output/sbcl.core" xc_cmdline = "#{command} --core #{core} --disable-debugger --no-userinit --no-sysinit" cd buildpath do - if ARGV.build_32_bit? - system "SBCL_ARCH=x86 ./make.sh --prefix='#{prefix}' --xc-host='#{xc_cmdline}'" - else - system "./make.sh --prefix='#{prefix}' --xc-host='#{xc_cmdline}'" - end + ENV['SBCL_ARCH'] = 'x86' if ARGV.build_32_bit? + system "./make.sh", "--prefix=#{prefix}", "--xc-host=#{xc_cmdline}" end - } + end ENV['INSTALL_ROOT'] = prefix system "sh install.sh" diff --git a/Library/Formula/sc68.rb b/Library/Formula/sc68.rb index 8bd2097d2..c35f1e00d 100644 --- a/Library/Formula/sc68.rb +++ b/Library/Formula/sc68.rb @@ -15,6 +15,6 @@ class Sc68 < Formula def test # SC68 ships with a sample module; test attempts to print its metadata - system "#{bin}/info68 #{share}/sc68/Sample/About-Intro.sc68 -C ': ' -N -L" + system "#{bin}/info68", "#{share}/sc68/Sample/About-Intro.sc68", "-C", ": ", "-N", "-L" end end diff --git a/Library/Formula/sedna.rb b/Library/Formula/sedna.rb index 776567c05..d51fc42a8 100644 --- a/Library/Formula/sedna.rb +++ b/Library/Formula/sedna.rb @@ -8,10 +8,9 @@ class Sedna < Formula depends_on 'cmake' => :build def install - path = pwd # Build needs to be created from outside the source directory. mktemp do - system "cmake #{std_cmake_parameters} #{path}" + system "cmake #{std_cmake_parameters} #{buildpath}" system "make install" end end diff --git a/Library/Formula/sigar.rb b/Library/Formula/sigar.rb index c09cf633a..c27d017ae 100644 --- a/Library/Formula/sigar.rb +++ b/Library/Formula/sigar.rb @@ -66,7 +66,7 @@ class Sigar < Formula # Install Ruby bindings cd "bindings/ruby" do - system "ruby", "extconf.rb", "--prefix='#{prefix}'" + system "ruby", "extconf.rb", "--prefix=#{prefix}" system "make install" end if ARGV.include? "--ruby" end diff --git a/Library/Formula/sipp.rb b/Library/Formula/sipp.rb index 802ff116f..e92d65ad0 100644 --- a/Library/Formula/sipp.rb +++ b/Library/Formula/sipp.rb @@ -7,7 +7,7 @@ class Sipp < Formula version '3.2' def install - system "make DESTDIR=#{prefix}" + system "make", "DESTDIR=#{prefix}" bin.install "sipp" end end diff --git a/Library/Formula/tabbed.rb b/Library/Formula/tabbed.rb index 3743cb8c8..f45f97100 100644 --- a/Library/Formula/tabbed.rb +++ b/Library/Formula/tabbed.rb @@ -12,6 +12,6 @@ class Tabbed < Formula inreplace 'config.def.h', '{ MODKEY|ShiftMask, XK_Return, spawn, { .v = (char*[]){ "surf", "-e", winid, NULL} } },', '{ MODKEY|ShiftMask, XK_Return, spawn, { .v = (char*[]){ "xterm", "-into", winid, NULL} } },' - system "make PREFIX=#{prefix} install" + system "make", "PREFIX=#{prefix}", "install" end end diff --git a/Library/Formula/unifdef.rb b/Library/Formula/unifdef.rb index 9e3117ea4..775a3897c 100644 --- a/Library/Formula/unifdef.rb +++ b/Library/Formula/unifdef.rb @@ -9,7 +9,7 @@ class Unifdef < Formula "The unifdef provided by Xcode cannot compile gevent." def install - system "make prefix=#{prefix} install" + system "make", "PREFIX=#{prefix}", "install" end def test diff --git a/Library/Formula/vtk.rb b/Library/Formula/vtk.rb index 72fdc3e0f..5147ba7f9 100644 --- a/Library/Formula/vtk.rb +++ b/Library/Formula/vtk.rb @@ -73,7 +73,7 @@ class Vtk < Formula # to get the right RPATH in the python libraries (the .so files in the vtk egg). # Also readable: http://vtk.1045678.n5.nabble.com/VTK-Python-Wrappers-on-Red-Hat-td1246159.html args << "-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" - ENV['DYLD_LIBRARY_PATH'] = `pwd`.strip + "/build/bin" + ENV['DYLD_LIBRARY_PATH'] = buildpath/'build/bin' args << ".." @@ -84,10 +84,10 @@ class Vtk < Formula # collect2: ld returned 1 exit status # make[2]: *** [bin/vtkpython] Error 1 # We symlink such that the DCMAKE_INSTALL_NAME_DIR is available and points to the current build/bin - mkpath "#{lib}" # create empty directories, because we need it here - system "ln -s " + ENV['DYLD_LIBRARY_PATH'] + " '#{lib}/vtk-5.8'" + lib.mkpath # create empty directories, because we need it here + ln_s ENV['DYLD_LIBRARY_PATH'], lib/'vtk-5.8' system "make" - system "rm '#{lib}/vtk-5.8'" # Remove our symlink, was only needed to make make succeed. + rm lib/'vtk-5.8' # Remove our symlink, was only needed to make make succeed. # end work-a-round system "make install" # Finally move libs in their places. end diff --git a/Library/Formula/wxmac.rb b/Library/Formula/wxmac.rb index 7371a3255..6da110a63 100644 --- a/Library/Formula/wxmac.rb +++ b/Library/Formula/wxmac.rb @@ -132,7 +132,7 @@ def install_wx_python unless ARGV.build_devel? # erlang needs contrib/stc during configure phase. %w{ gizmos stc ogl }.each do |c| - system "make -C contrib/src/#{c} install" + system "make", "-C", "contrib/src/#{c}", "install" end end diff --git a/Library/Formula/xmp.rb b/Library/Formula/xmp.rb index 897b95dd5..3a1ae8bd7 100644 --- a/Library/Formula/xmp.rb +++ b/Library/Formula/xmp.rb @@ -14,6 +14,6 @@ class Xmp < Formula end def test - system "#{bin}/xmp --load-only #{share}/SynthSong1" + system "#{bin}/xmp", "--load-only", "#{share}/SynthSong1" end end diff --git a/Library/Formula/xspringies.rb b/Library/Formula/xspringies.rb index a3bb8d02b..05319122c 100644 --- a/Library/Formula/xspringies.rb +++ b/Library/Formula/xspringies.rb @@ -10,6 +10,6 @@ class Xspringies < Formula s.change_make_var! "LIBS", '-L/usr/X11/lib -lm -lX11' s.gsub! 'mkdirhier', 'mkdir -p' end - system "make -f Makefile.std DDIR=#{prefix}/ install" + system "make", "-f", "Makefile.std", "DDIR=#{prefix}/", "install" end end diff --git a/Library/Formula/zeromq.rb b/Library/Formula/zeromq.rb index ed328610c..cb46f8126 100644 --- a/Library/Formula/zeromq.rb +++ b/Library/Formula/zeromq.rb @@ -29,13 +29,13 @@ class Zeromq < Formula def build_fat # make 32-bit - system "CFLAGS=\"$CFLAGS -arch i386\" CXXFLAGS=\"$CXXFLAGS -arch i386\" ./configure --disable-dependency-tracking --prefix=#{prefix} #{pgm_flags}" + system "CFLAGS=\"$CFLAGS -arch i386\" CXXFLAGS=\"$CXXFLAGS -arch i386\" ./configure --disable-dependency-tracking --prefix='#{prefix}' #{pgm_flags}" system "make" system "mv src/.libs src/libs-32" system "make clean" # make 64-bit - system "CFLAGS=\"$CFLAGS -arch x86_64\" CXXFLAGS=\"$CXXFLAGS -arch x86_64\" ./configure --disable-dependency-tracking --prefix=#{prefix} #{pgm_flags}" + system "CFLAGS=\"$CFLAGS -arch x86_64\" CXXFLAGS=\"$CXXFLAGS -arch x86_64\" ./configure --disable-dependency-tracking --prefix='#{prefix}' #{pgm_flags}" system "make" system "mv src/.libs/libzmq.1.dylib src/.libs/libzmq.64.dylib" diff --git a/Library/Formula/zint.rb b/Library/Formula/zint.rb index 5ed8e2181..6a1dc9193 100644 --- a/Library/Formula/zint.rb +++ b/Library/Formula/zint.rb @@ -11,15 +11,15 @@ class Zint < Formula def install mkdir 'zint-build' do - system "cmake #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{prefix} -DCMAKE_C_FLAGS=-I/usr/X11/include .." + system "cmake #{std_cmake_parameters} -DCMAKE_PREFIX_PATH='#{prefix}' -DCMAKE_C_FLAGS=-I/usr/X11/include .." system "make install" end end def test mktemp do - system "#{bin}/zint -o test-zing.png -d 'This Text'" - system "/usr/bin/qlmanage -p test-zing.png" + system "#{bin}/zint", "-o", "test-zing.png", "-d", "This Text" + system "/usr/bin/qlmanage", "-p", "test-zing.png" end end end |