From adacd5f52f9625cc2e4f89efc0cd2422517c9c36 Mon Sep 17 00:00:00 2001
From: Arne Jørgensen
Date: Wed, 26 Dec 2012 19:10:21 +0100
Subject: global: Update to 6.2.7

Also removed option "without-rebuilding-php-parser". Option no longer
needed as GNU Global is now distributed with the rebuild PHP parser by
default.

Closes #16759.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
---
 Library/Formula/global.rb | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/global.rb b/Library/Formula/global.rb
index 153e3bfa2..cd7903e2e 100644
--- a/Library/Formula/global.rb
+++ b/Library/Formula/global.rb
@@ -2,11 +2,10 @@ require 'formula'
 
 class Global < Formula
   homepage 'http://www.gnu.org/software/global/'
-  url 'http://ftpmirror.gnu.org/global/global-6.2.6.tar.gz'
-  mirror 'http://ftp.gnu.org/gnu/global/global-6.2.6.tar.gz'
-  sha1 '9c802a8fdc2d50e2a0780eb7033d5bad258c3f42'
+  url 'http://ftpmirror.gnu.org/global/global-6.2.7.tar.gz'
+  mirror 'http://ftp.gnu.org/gnu/global/global-6.2.7.tar.gz'
+  sha1 '332606e3e864e65277a6d8d84ab87c8e198b2bd0'
 
-  option "without-rebuilding-php-parser", "Don't rebuild PHP parser; use provied parser"
   option 'with-exuberant-ctags', 'Enable Exuberant Ctags as a plug-in parser'
 
   if build.include? 'with-exuberant-ctags'
@@ -15,12 +14,6 @@ class Global < Formula
   end
 
   def install
-    # Rebuilding the PHP parser, see:
-    # http://comments.gmane.org/gmane.comp.gnu.global.bugs/1439
-    unless build.include? "without-rebuilding-php-parser"
-      system "flex -o libparser/php.c libparser/php.l"
-    end
-
     args = %W[
       --disable-dependency-tracking
       --prefix=#{prefix}
@@ -38,24 +31,4 @@ class Global < Formula
       rm %w[README COPYING LICENSE INSTALL ChangeLog AUTHORS]
     end
   end
-
-  def caveats; <<-EOS.undent
-    GNU GLOBAL is distributed with a PHP parser generated with an
-    old version of flex(1). That parser has some limitation. See:
-      http://comments.gmane.org/gmane.comp.gnu.global.bugs/1439
-
-    Installing GNU GLOBAL with Homebrew will therefor rebuild the
-    PHP parser using Mac OS X' newer version of flex(1) which
-    generates a parser without the limit.
-
-    You can install GNU GLOBAL without rebuilding the PHP parser
-    (and instead use the parser distributed by GNU GLOBAL) by using
-    the option '--without-rebuilding-php-parser':
-
-      brew install global --without-rebuilding-php-parser
-
-    Use i.e. if you want to be sure whether a problem is caused by
-    the rebuild parser or some other thing in GNU GLOBAL.
-    EOS
-  end
 end
-- 
cgit v1.2.3