aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Library/Formula/augeas.rb11
-rw-r--r--Library/Formula/ffmpeg.rb2
-rw-r--r--Library/Formula/fish.rb7
-rw-r--r--Library/Formula/git-multipush.rb8
-rw-r--r--Library/Formula/git.rb2
-rw-r--r--Library/Formula/hub.rb1
-rw-r--r--Library/Formula/hugo.rb3
-rw-r--r--Library/Formula/libcouchbase.rb3
-rw-r--r--Library/Formula/openconnect.rb1
-rw-r--r--Library/Formula/qt5.rb15
-rw-r--r--Library/Formula/ttfautohint.rb6
-rw-r--r--Library/Formula/wget.rb8
12 files changed, 6 insertions, 61 deletions
diff --git a/Library/Formula/augeas.rb b/Library/Formula/augeas.rb
index 376ad3a99..402397525 100644
--- a/Library/Formula/augeas.rb
+++ b/Library/Formula/augeas.rb
@@ -1,5 +1,3 @@
-require "formula"
-
class Augeas < Formula
homepage "http://augeas.net"
url "http://download.augeas.net/augeas-1.3.0.tar.gz"
@@ -25,14 +23,7 @@ class Augeas < Formula
depends_on "readline"
def install
- if build.head?
- # The bootstrap script run by autogen needs to check the state of the
- # gnulib submodule.
- ln_s cached_download + ".git", ".git"
- ln_s cached_download + ".gnulib/.git", ".gnulib/.git"
-
- system "./autogen.sh"
- end
+ system "./autogen.sh" if build.head?
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}"
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index 3e6538f40..1270f48b2 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -138,8 +138,6 @@ class Ffmpeg < Formula
# http://trac.macports.org/ticket/20938#comment:22
ENV.append_to_cflags "-mdynamic-no-pic" if Hardware.is_32_bit? && Hardware::CPU.intel? && ENV.compiler == :clang
- ENV["GIT_DIR"] = cached_download/".git" if build.head?
-
system "./configure", *args
if MacOS.prefer_64_bit?
diff --git a/Library/Formula/fish.rb b/Library/Formula/fish.rb
index fa77c76b3..834d4c649 100644
--- a/Library/Formula/fish.rb
+++ b/Library/Formula/fish.rb
@@ -1,5 +1,3 @@
-require "formula"
-
class Fish < Formula
homepage "http://fishshell.com"
url "https://github.com/fish-shell/fish-shell/releases/download/2.1.1/fish-2.1.1.tar.gz"
@@ -22,10 +20,7 @@ class Fish < Formula
skip_clean "share/doc"
def install
- if build.head?
- ENV['GIT_DIR'] = cached_download/'.git'
- system "autoconf"
- end
+ system "autoconf" if build.head?
# In Homebrew's 'superenv' sed's path will be incompatible, so
# the correct path is passed into configure here.
system "./configure", "--prefix=#{prefix}", "SED=/usr/bin/sed"
diff --git a/Library/Formula/git-multipush.rb b/Library/Formula/git-multipush.rb
index 17fda8581..89e4d1ac9 100644
--- a/Library/Formula/git-multipush.rb
+++ b/Library/Formula/git-multipush.rb
@@ -1,5 +1,3 @@
-require 'formula'
-
class GitMultipush < Formula
homepage 'http://code.google.com/p/git-multipush/'
url 'https://git-multipush.googlecode.com/files/git-multipush-2.3.tar.bz2'
@@ -16,11 +14,7 @@ class GitMultipush < Formula
depends_on 'asciidoc' => :build
def install
- if build.head?
- ENV['GIT_DIR'] = cached_download/'.git'
- inreplace 'make/gen-version.mk', '.git', '$(GIT_DIR)'
- system "make"
- end
+ system "make" if build.head?
system "make", "prefix=#{prefix}", "install"
end
end
diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb
index eaf81af57..5b1067f73 100644
--- a/Library/Formula/git.rb
+++ b/Library/Formula/git.rb
@@ -76,8 +76,6 @@ class Git < Formula
ENV["NO_GETTEXT"] = "1" if build.without? "gettext"
- ENV["GIT_DIR"] = cached_download/".git" if build.head?
-
system "make", "prefix=#{prefix}",
"sysconfdir=#{etc}",
"CC=#{ENV.cc}",
diff --git a/Library/Formula/hub.rb b/Library/Formula/hub.rb
index f53387695..60210221f 100644
--- a/Library/Formula/hub.rb
+++ b/Library/Formula/hub.rb
@@ -20,7 +20,6 @@ class Hub < Formula
def install
if build.head? || build.devel?
- ENV["GIT_DIR"] = cached_download/".git"
system "script/build"
bin.install "hub"
man1.install Dir["man/*"]
diff --git a/Library/Formula/hugo.rb b/Library/Formula/hugo.rb
index 494169b8c..e6155b9b7 100644
--- a/Library/Formula/hugo.rb
+++ b/Library/Formula/hugo.rb
@@ -1,5 +1,3 @@
-require "formula"
-
class Hugo < Formula
homepage "http://hugo.spf13.com/"
head "https://github.com/spf13/hugo.git"
@@ -18,7 +16,6 @@ class Hugo < Formula
depends_on :hg => :build
def install
- ENV["GIT_DIR"] = cached_download/".git" if build.head?
ENV["GOBIN"] = bin
ENV["GOPATH"] = buildpath
ENV["GOHOME"] = buildpath
diff --git a/Library/Formula/libcouchbase.rb b/Library/Formula/libcouchbase.rb
index 8fccf40eb..ece02cfe9 100644
--- a/Library/Formula/libcouchbase.rb
+++ b/Library/Formula/libcouchbase.rb
@@ -1,5 +1,3 @@
-require 'formula'
-
class Libcouchbase < Formula
homepage 'http://docs.couchbase.com/developer/c-2.4/c-intro.html'
url 'http://packages.couchbase.com/clients/c/libcouchbase-2.4.6.tar.gz'
@@ -40,7 +38,6 @@ class Libcouchbase < Formula
args << '-DLCB_NO_PLUGINS=1'
end
- ENV["GIT_DIR"] = cached_download/".git" if build.head?
mkdir 'LCB-BUILD' do
system "cmake", "..", *args
system 'make install'
diff --git a/Library/Formula/openconnect.rb b/Library/Formula/openconnect.rb
index a9b6627dc..c1565675b 100644
--- a/Library/Formula/openconnect.rb
+++ b/Library/Formula/openconnect.rb
@@ -36,7 +36,6 @@ class Openconnect < Formula
chmod 0755, "#{etc}/vpnc-script"
if build.head?
- ENV["GIT_DIR"] = cached_download/".git"
ENV["LIBTOOLIZE"] = "glibtoolize"
system "./autogen.sh"
end
diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb
index 77e1b1e3f..75bb73dba 100644
--- a/Library/Formula/qt5.rb
+++ b/Library/Formula/qt5.rb
@@ -1,15 +1,3 @@
-require "formula"
-
-class Qt5HeadDownloadStrategy < GitDownloadStrategy
- def stage
- cached_location.cd { reset }
- quiet_safe_system "git", "clone", cached_location, "."
- ln_s cached_location, "qt"
- quiet_safe_system "./init-repository", { :quiet_flag => "-q" }, "--mirror", "#{Dir.pwd}/"
- rm "qt"
- end
-end
-
class OracleHomeVar < Requirement
fatal true
satisfy ENV["ORACLE_HOME"]
@@ -33,8 +21,7 @@ class Qt5 < Formula
sha1 "a6bbd39629a69c35c8a5d5e8ede4b6c752e3aecf" => :mountain_lion
end
- head "https://gitorious.org/qt/qt5.git", :branch => "5.4",
- :using => Qt5HeadDownloadStrategy, :shallow => false
+ head "https://gitorious.org/qt/qt5.git", :branch => "5.4", :shallow => false
keg_only "Qt 5 conflicts Qt 4 (which is currently much more widely used)."
diff --git a/Library/Formula/ttfautohint.rb b/Library/Formula/ttfautohint.rb
index 29257fd97..796c2ab88 100644
--- a/Library/Formula/ttfautohint.rb
+++ b/Library/Formula/ttfautohint.rb
@@ -25,11 +25,7 @@ class Ttfautohint < Formula
depends_on "harfbuzz"
def install
- if build.head?
- ln_s cached_download/".git", ".git"
- system "./bootstrap"
- end
-
+ system "./bootstrap" if build.head?
system "./configure", "--disable-dependency-tracking",
"--disable-silent-rules",
"--prefix=#{prefix}",
diff --git a/Library/Formula/wget.rb b/Library/Formula/wget.rb
index a249aceae..7d0c94957 100644
--- a/Library/Formula/wget.rb
+++ b/Library/Formula/wget.rb
@@ -1,5 +1,3 @@
-require "formula"
-
# NOTE: Configure will fail if using awk 20110810 from dupes.
# Upstream issue: https://savannah.gnu.org/bugs/index.php?37063
@@ -35,11 +33,6 @@ class Wget < Formula
depends_on "pcre" => :optional
def install
- if build.head?
- ln_s cached_download/".git", ".git"
- system "./bootstrap"
- end
-
args = %W[
--prefix=#{prefix}
--sysconfdir=#{etc}
@@ -51,6 +44,7 @@ class Wget < Formula
args << "--disable-iri" if build.without? "iri"
args << "--disable-pcre" if build.without? "pcre"
+ system "./bootstrap" if build.head?
system "./configure", *args
system "make", "install"
end