Permalink
Browse files

Merge branch 'master' of https://github.com/mxcl/homebrew

  • Loading branch information...
2 parents dbd4fda + 67d6f99 commit 48aca0bd12cc03c6d322ed031bb33d0afdc55d37 @allenhuang committed Sep 30, 2012
View
@@ -21,6 +21,18 @@ def syspath
%W{/usr /usr/local}
end
end
+def exec *args
+ path = File.expand_path('~/Library/Logs/Homebrew/cc.log')
+ open(path, 'a') do |f|
+ f.print '[', $0
+ f.print " -%s" % ENV['HOMEBREW_CCCFG'] if ENV['HOMEBREW_CCCFG']
+ f.print '] '
+ f.puts args.join(' ')
+ f.puts
+ end
+ Kernel.exec *args
+end if ENV['HOMEBREW_LOG']
+
class Cmd
def initialize path, args
View
@@ -4,8 +4,6 @@
# But many build-systems expect it to work. This fixes that.
# NOTE only works if the build-tool calls xcrun without a path prefixed!
-ENV['HOMEBREW_LOG'] = nil
-
require "#{File.dirname __FILE__}/../libsuperenv"
SUPERBIN = __FILE__.dirname.cleanpath.freeze
View
@@ -25,20 +25,5 @@ def to_flags prefix
end
end
-module Kernel extend self
- alias :_exec :exec
- def exec *args
- path = File.expand_path('~/Library/Logs/Homebrew/cc.log')
- open(path, 'a') do |f|
- f.print '[', $0
- f.print " -%s" % ENV['HOMEBREW_CCCFG'] if ENV['HOMEBREW_CCCFG']
- f.print '] '
- f.puts args.join(' ')
- f.puts
- end
- _exec *args
- end
-end if ENV['HOMEBREW_LOG']
-
$brewfix = "#{__FILE__}/../../../".cleanpath.freeze
$sdkroot = ENV['HOMEBREW_SDKROOT'].freeze
@@ -2,9 +2,9 @@
class Automake < Formula
homepage 'http://www.gnu.org/software/automake/'
- url 'http://ftpmirror.gnu.org/automake/automake-1.12.3.tar.gz'
- mirror 'http://ftp.gnu.org/gnu/automake/automake-1.12.3.tar.gz'
- sha1 '0cf6d03fa323f726f41044e3d57d248f565a07c0'
+ url 'http://ftpmirror.gnu.org/automake/automake-1.12.4.tar.gz'
+ mirror 'http://ftp.gnu.org/gnu/automake/automake-1.12.4.tar.gz'
+ sha1 'c474eb8c058d93ead9b2433fbcfb0c349517e171'
# Always needs a newer autoconf, even on Snow Leopard.
depends_on 'autoconf'
View
@@ -13,9 +13,28 @@ class Goffice < Formula
depends_on 'pcre'
depends_on :x11
+ # Fix for goffice trying to use a retired pcre api. Reported/source = Macports
+ # https://github.com/mxcl/homebrew/issues/15171
+ def patches
+ DATA
+ end
+
def install
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}"
system "make install"
end
end
+
+__END__
+--- a/goffice/utils/regutf8.c 2009-09-05 16:52:09.000000000 -0700
++++ b/goffice/utils/regutf8.c 2012-09-28 20:53:51.000000000 -0700
+@@ -155,7 +155,7 @@
+ default: return GO_REG_BADPAT;
+ }
+ } else {
+- gor->re_nsub = pcre_info (r, NULL, NULL);
++ gor->re_nsub = pcre_fullinfo (r, NULL, 0, NULL);
+ gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+ return 0;
+ }
@@ -2,8 +2,8 @@
class Groonga < Formula
homepage 'http://groonga.org/'
- url 'http://packages.groonga.org/source/groonga/groonga-2.0.6.tar.gz'
- sha1 'a012a86d03e193f2ab029de2f1e09aa5f0e52bcf'
+ url 'http://packages.groonga.org/source/groonga/groonga-2.0.7.tar.gz'
+ sha1 '577f609c785803f90b65e2defa23247a5a256623'
depends_on 'pkg-config' => :build
depends_on 'pcre'
View
@@ -0,0 +1,12 @@
+require 'formula'
+
+class Jsdoc3 < Formula
+ homepage 'http://usejsdoc.org/'
+ url 'https://github.com/jsdoc3/jsdoc/tarball/v3.0.1'
+ sha1 '0c6ad2321d300a3eaa2e1d543f3fbf166ff1ce18'
+
+ def install
+ libexec.install Dir['*']
+ bin.install_symlink libexec/'jsdoc'
+ end
+end
@@ -2,12 +2,16 @@
class JsonC < Formula
homepage 'https://github.com/json-c/json-c/wiki'
- url 'http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz'
- sha1 'daaf5eb960fa98e137abc5012f569b83c79be90f'
+ url 'https://github.com/downloads/json-c/json-c/json-c-0.10.tar.gz'
+ sha1 'f90f643c8455da21d57b3e8866868a944a93c596'
def install
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}"
system "make install"
+
+ # The Makefile forgets to install this header. This is fixed upstream and
+ # can be pulled on the next release.
+ include.install 'json_object_iterator.h'
end
end
View
@@ -0,0 +1,24 @@
+require 'formula'
+
+class Juise < Formula
+ homepage 'http://code.google.com/p/juise/'
+ url 'http://juise.googlecode.com/files/juise-0.3.10.tar.gz'
+ sha1 '1e3c0f5e98ee3f499b5180512cc98e294c551fde'
+
+ depends_on 'libtool' => :build
+ depends_on 'libslax'
+ depends_on 'pcre'
+
+ # Need newer versions of these libraries
+ if MacOS.version <= :lion
+ depends_on 'libxml2'
+ depends_on 'libxslt'
+ depends_on 'curl'
+ end
+
+ def install
+ system "./configure", "--disable-dependency-tracking",
+ "--prefix=#{prefix}"
+ system "make install"
+ end
+end
View
@@ -2,8 +2,8 @@
class Lftp < Formula
homepage 'http://lftp.yar.ru/'
- url 'http://ftp.yars.free.net/pub/source/lftp/lftp-4.3.8.tar.bz2'
- sha1 '6e3b8165fa89781533f4af7350f62eb670ab26fe'
+ url 'http://ftp.yar.ru/pub/source/lftp/lftp-4.4.0.tar.bz2'
+ sha1 '4eef63d05760a0e7d6d6a7318e1fcda8de8c154e'
depends_on 'pkg-config' => :build
depends_on 'readline'
View
@@ -0,0 +1,22 @@
+require 'formula'
+
+class Libslax < Formula
+ homepage 'https://code.google.com/p/libslax/'
+ url 'https://libslax.googlecode.com/files/libslax-0.11.23.tar.gz'
+ sha1 '0be3d52f8e9f0b048b2816086d5fa3688b0d8364'
+
+ depends_on 'libtool' => :build
+
+ # Need newer versions of these libraries
+ if MacOS.version <= :lion
+ depends_on 'libxml2'
+ depends_on 'libxslt'
+ depends_on 'curl'
+ end
+
+ def install
+ system "./configure", "--disable-dependency-tracking",
+ "--prefix=#{prefix}"
+ system "make install"
+ end
+end
View
@@ -2,10 +2,10 @@
class Mame < Formula
homepage 'http://mamedev.org/'
- url 'svn://messdev.no-ip.org/mess', :revision => 15603
+ url 'svn://dspnet.fr/mame/trunk', :revision => 15603
version '146u3'
- head 'svn://messdev.no-ip.org/mess'
+ head 'svn://dspnet.fr/mame/trunk'
depends_on :x11
depends_on 'sdl'
View
@@ -2,10 +2,10 @@
class Mess < Formula
homepage 'http://www.mess.org/'
- url 'svn://messdev.no-ip.org/mess', :revision => 15603
+ url 'svn://dspnet.fr/mame/trunk', :revision => 15603
version '146u3'
- head 'svn://messdev.no-ip.org/mess'
+ head 'svn://dspnet.fr/mame/trunk'
depends_on :x11
depends_on 'sdl'
View
@@ -25,16 +25,16 @@ def patches
end
def passenger_config_args
- passenger_root = `passenger-config --root`.chomp
+ passenger_root = `passenger-config --root`.chomp
- if File.directory?(passenger_root)
- return "--add-module=#{passenger_root}/ext/nginx"
- end
+ if File.directory?(passenger_root)
+ return "--add-module=#{passenger_root}/ext/nginx"
+ end
- puts "Unable to install nginx with passenger support. The passenger"
- puts "gem must be installed and passenger-config must be in your path"
- puts "in order to continue."
- exit
+ puts "Unable to install nginx with passenger support. The passenger"
+ puts "gem must be installed and passenger-config must be in your path"
+ puts "in order to continue."
+ exit
end
def install
@@ -46,7 +46,12 @@ def install
"--with-ld-opt=-L#{HOMEBREW_PREFIX}/lib",
"--conf-path=#{etc}/nginx/nginx.conf",
"--pid-path=#{var}/run/nginx.pid",
- "--lock-path=#{var}/nginx/nginx.lock"]
+ "--lock-path=#{var}/run/nginx.lock",
+ "--http-client-body-temp-path=#{var}/run/nginx/client_body_temp",
+ "--http-proxy-temp-path=#{var}/run/nginx/proxy_temp",
+ "--http-fastcgi-temp-path=#{var}/run/nginx/fastcgi_temp",
+ "--http-uwsgi-temp-path=#{var}/run/nginx/uwsgi_temp",
+ "--http-scgi-temp-path=#{var}/run/nginx/scgi_temp"]
args << passenger_config_args if build.include? 'with-passenger'
args << "--with-http_dav_module" if build.include? 'with-webdav'
@@ -55,6 +60,7 @@ def install
system "make"
system "make install"
man8.install "objs/nginx.8"
+ (var/'run/nginx').mkpath
end
def caveats; <<-EOS.undent
View
@@ -44,8 +44,8 @@ def fatal?
class Node < Formula
homepage 'http://nodejs.org/'
- url 'http://nodejs.org/dist/v0.8.10/node-v0.8.10.tar.gz'
- sha1 'c596cce77726724441cf7fc98f42df3a5335ab8e'
+ url 'http://nodejs.org/dist/v0.8.11/node-v0.8.11.tar.gz'
+ sha1 'e9dd36cbbe03c632ee7e9c52e06122fa022981c8'
head 'https://github.com/joyent/node.git'
@@ -2,8 +2,8 @@
class Pngcrush < Formula
homepage 'http://pmt.sourceforge.net/pngcrush/'
- url 'http://downloads.sourceforge.net/project/pmt/pngcrush/1.7.37/pngcrush-1.7.37.tar.gz'
- sha1 'b301cb451ddfa975f60875100c8ade49d5f89087'
+ url 'http://downloads.sourceforge.net/project/pmt/pngcrush/1.7.38/pngcrush-1.7.38.tar.gz'
+ sha1 'ed156aaa53b1b48fa0d3e32466d0d5512b25a67a'
def install
# Required to successfully build the bundled zlib 1.2.6
Oops, something went wrong.

0 comments on commit 48aca0b

Please sign in to comment.