From 0006013c3b9a2cf5ecd80de04af5366aa516d93b Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Fri, 29 Jul 2011 09:21:51 -0700
Subject: goaccess: remove duplicate older version

---
 Library/Formula/go-access.rb | 28 ----------------------------
 Library/Formula/goaccess.rb  | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 Library/Formula/go-access.rb

(limited to 'Library')

diff --git a/Library/Formula/go-access.rb b/Library/Formula/go-access.rb
deleted file mode 100644
index 31a35887a..000000000
--- a/Library/Formula/go-access.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'formula'
-
-class GoAccess < Formula
-  url 'http://sourceforge.net/projects/goaccess/files/0.4.1/goaccess-0.4.1.tar.gz'
-  homepage 'http://goaccess.prosoftcorp.com/'
-  sha1 'f68336fc49eb4907262f53956d4b88d5573a861e'
-
-  depends_on 'glib'
-  depends_on 'geoip' if ARGV.include? "--enable-geoip"
-
-  def options
-    [['--enable-geoip', "Enable IP location information using GeoIP"]]
-  end
-
-  def install
-    # Don't attempt to link to librt since it doesn't exist on OSX.
-    inreplace "Makefile.in", "LIBS = @GLIB2_LIBS@ -lrt", "LIBS = @GLIB2_LIBS@"
-
-    args = ["--prefix=#{prefix}",
-            "--disable-debug",
-            "--disable-dependency-tracking"]
-
-    args << "--enable-geoip" if ARGV.include? '--enable-geoip'
-
-    system "./configure", *args
-    system "make install"
-  end
-end
diff --git a/Library/Formula/goaccess.rb b/Library/Formula/goaccess.rb
index 379ce4ed4..4002012c3 100644
--- a/Library/Formula/goaccess.rb
+++ b/Library/Formula/goaccess.rb
@@ -6,12 +6,21 @@ class Goaccess < Formula
   md5 '7d7707c294c949d612e451da2f003c37'
   head 'git://goaccess.git.sourceforge.net/gitroot/goaccess/goaccess'
 
-  depends_on 'geoip'
   depends_on 'glib'
+  depends_on 'geoip' if ARGV.include? "--enable-geoip"
+
+  def options
+    [['--enable-geoip', "Enable IP location information using GeoIP"]]
+  end
 
   def install
-    system "./configure", "--enable-geoip",
-                          "--prefix=#{prefix}"
+    args = ["--prefix=#{prefix}",
+            "--disable-debug",
+            "--disable-dependency-tracking"]
+
+    args << "--enable-geoip" if ARGV.include? '--enable-geoip'
+
+    system "./configure", *args
     system "make install"
   end
 end
-- 
cgit v1.2.3