Skip to content
Browse files

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

  • Loading branch information...
2 parents 2e13010 + 7ac1cbc commit 1ca785a80111df736145e33957bc95fb066a0e76 @fahasch committed May 18, 2012
View
78 Library/Formula/bdw-gc.rb
@@ -1,19 +1,9 @@
require 'formula'
-# Upstream recommends using 7.2alpha6 over 7.1
class BdwGc < Formula
homepage 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/'
- url 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2alpha6.tar.gz'
- md5 '319d0b18cc4eb735c8038ece9df055e4'
- version '7.2alpha6'
-
- # fix inline ASM issues with LLVM and Makefile double-install
- # both fixes already upstream
- # Third patch is upstream, https://github.com/ivmai/bdwgc/commit/c285b29
- # and fixes compile with Clang when XCode-4.3. Remove at gc-7.2alpha7.
- def patches
- DATA
- end
+ url 'http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2.tar.gz'
+ md5 'd17aecedef3d73e75387fb63558fa4eb'
def install
system "./configure", "--disable-debug",
@@ -25,67 +15,3 @@ def install
system "make install"
end
end
-
-__END__
-diff --git a/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h b/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h
-index 5e6d7fa..c0845ba 100644
---- a/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h
-+++ b/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h
-@@ -113,7 +113,7 @@ AO_test_and_set_full(volatile AO_TS_t *addr)
- /* Note: the "xchg" instruction does not need a "lock" prefix */
- __asm__ __volatile__("xchgb %0, %1"
- : "=q"(oldval), "=m"(*addr)
-- : "0"(0xff), "m"(*addr) : "memory");
-+ : "0"((unsigned char)0xff), "m"(*addr) : "memory");
- return (AO_TS_VAL_t)oldval;
- }
- #define AO_HAVE_test_and_set_full
-diff --git a/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h b/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
-index 0f68c1e..b3b57f9 100644
---- a/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
-+++ b/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
-@@ -110,7 +110,7 @@ AO_test_and_set_full(volatile AO_TS_t *addr)
- /* Note: the "xchg" instruction does not need a "lock" prefix */
- __asm__ __volatile__("xchgb %0, %1"
- : "=q"(oldval), "=m"(*addr)
-- : "0"(0xff), "m"(*addr) : "memory");
-+ : "0"((unsigned char)0xff), "m"(*addr) : "memory");
- return (AO_TS_VAL_t)oldval;
- }
- #define AO_HAVE_test_and_set_full
-
-diff --git a/Makefile.in b/Makefile.in
-index 09dea13..1f4356e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -108,7 +108,6 @@ check_PROGRAMS = gctest$(EXEEXT) leaktest$(EXEEXT) middletest$(EXEEXT) \
- # C++ Interface
- # -------------
- @CPLUSPLUS_TRUE@am__append_5 = libgccpp.la
--@CPLUSPLUS_TRUE@am__append_6 = include/gc_cpp.h include/gc_allocator.h
- DIST_COMMON = $(am__configure_deps) $(am__pkginclude_HEADERS_DIST) \
- $(dist_noinst_HEADERS) $(dist_noinst_SCRIPTS) \
- $(dist_pkgdata_DATA) $(include_HEADERS) $(srcdir)/Makefile.am \
-@@ -579,7 +578,7 @@ include_HEADERS = include/extra/gc.h include/extra/gc_cpp.h
-
- # installed headers
- #
--pkginclude_HEADERS = $(am__append_6) include/gc.h include/gc_typed.h \
-+pkginclude_HEADERS = include/gc.h include/gc_typed.h \
- include/gc_inline.h include/gc_mark.h include/gc_cpp.h \
- include/weakpointer.h include/new_gc_alloc.h \
- include/gc_allocator.h include/gc_backptr.h include/gc_gcj.h \
-diff --git a/misc.c b/misc.c
-index 2fd4166..8db6085 100644
---- a/misc.c
-+++ b/misc.c
-@@ -930,7 +930,8 @@ GC_API void GC_CALL GC_init(void)
- GC_STATIC_ASSERT((word)(-1) > (word)0);
- /* word should be unsigned */
- # endif
--# if !defined(__BORLANDC__) && !defined(__CC_ARM) /* Workaround */
-+# if !defined(__BORLANDC__) && !defined(__CC_ARM) \
-+ && !(defined(__clang__) && defined(X86_64)) /* Workaround */
- GC_STATIC_ASSERT((ptr_t)(word)(-1) > (ptr_t)0);
- /* Ptr_t comparisons should behave as unsigned comparisons. */
- # endif
View
8 Library/Formula/glib.rb
@@ -4,8 +4,8 @@ def build_tests?; ARGV.include? '--test'; end
class Glib < Formula
homepage 'http://developer.gnome.org/glib/'
- url 'ftp://ftp.gnome.org/pub/gnome/sources/glib/2.32/glib-2.32.2.tar.xz'
- sha256 'b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136'
+ url 'ftp://ftp.gnome.org/pub/gnome/sources/glib/2.32/glib-2.32.3.tar.xz'
+ sha256 'b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d'
depends_on 'xz' => :build
depends_on 'gettext'
@@ -17,8 +17,8 @@ class Glib < Formula
end
def patches
- # https://bugzilla.gnome.org/show_bug.cgi?id=673047 Still open @ 2.32.2
- # https://bugzilla.gnome.org/show_bug.cgi?id=644473 Still open @ 2.32.2
+ # https://bugzilla.gnome.org/show_bug.cgi?id=673047 Still open at 2.32.3
+ # https://bugzilla.gnome.org/show_bug.cgi?id=644473 Still open at 2.32.3
# https://bugzilla.gnome.org/show_bug.cgi?id=673135 Resolved as wontfix.
p = { :p1 => %W[
https://raw.github.com/gist/2235195/19cdaebdff7dcc94ccd9b3747d43a09318f0b846/glib-gunicollate.diff
View
4 Library/Formula/gobject-introspection.rb
@@ -1,9 +1,9 @@
require 'formula'
class GobjectIntrospection < Formula
- url 'http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/1.31/gobject-introspection-1.31.10.tar.xz'
homepage 'http://live.gnome.org/GObjectIntrospection'
- md5 'f71e80054048546d282af5f205a08a14'
+ url 'http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.1.tar.xz'
+ sha256 '44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858'
depends_on 'pkg-config' => :build
depends_on 'xz' => :build
View
4 Library/Formula/intltool.rb
@@ -2,8 +2,8 @@
class Intltool < Formula
homepage 'http://www.freedesktop.org/wiki/Software/intltool'
- url 'http://launchpad.net/intltool/trunk/0.50.0/+download/intltool-0.50.0.tar.gz'
- md5 '0da9847a60391ca653df35123b1f7cc0'
+ url 'http://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz'
+ md5 '23fbd879118253cb99aeac067da5f591'
# Even though this module is supposed to be there on Snow Leopard,
# I've run into a situation where it isn't, and we have gotten other
View
36 Library/Formula/libmp3splt.rb
@@ -1,46 +1,30 @@
require 'formula'
class Libmp3splt < Formula
- url 'http://downloads.sourceforge.net/project/mp3splt/libmp3splt/0.7.1/libmp3splt-0.7.1.tar.gz'
homepage 'http://mp3splt.sourceforge.net'
- md5 '62025951f483334f14f1b9be58162094'
+ url 'http://downloads.sourceforge.net/project/mp3splt/libmp3splt/0.7.2/libmp3splt-0.7.2.tar.gz'
+ md5 '848817d1d980729aec99bbc62caddd76'
+
+ unless MacOS.lion?
+ depends_on 'automake' => :build
+ depends_on 'libtool' => :build
+ end
depends_on 'pkg-config' => :build
- depends_on 'automake' => :build unless MacOS.lion?
depends_on 'gettext'
depends_on 'pcre'
depends_on 'libid3tag'
depends_on 'mad'
depends_on 'libvorbis'
- # autogen.sh calls `libtoolize`, while OS X installs under the name `glibtoolize`
- # reported upstream at https://sourceforge.net/tracker/?func=detail&aid=3497957&group_id=55130&atid=476061
- def patches
- DATA
- end
-
def install
- if !MacOS.lion?
+ unless MacOS.lion?
system "./autogen.sh"
system "autoconf"
end
- system "./configure", "--disable-debug", "--disable-dependency-tracking",
+ system "./configure", "--disable-debug",
+ "--disable-dependency-tracking",
"--prefix=#{prefix}"
system "make install"
end
end
-
-__END__
-diff --git a/autogen.sh b/autogen.sh
-index 68962f2..916b868 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -53,7 +53,7 @@ echo -n "1/6 Running autopoint... " \
- && echo -n "3/6 Running autoheader... " \
- && autoheader && echo "done" \
- && echo -n "4/6 Running libtoolize... " \
--&& libtoolize -c --force && echo "done" \
-+&& glibtoolize -c --force && echo "done" \
- && echo -n "5/6 Running autoconf... " \
- && autoconf && echo "done" \
- && echo -n "6/6 Running automake... " \
View
80 Library/Formula/liboping.rb
@@ -1,90 +1,18 @@
require 'formula'
class Liboping < Formula
- url 'http://verplant.org/liboping/files/liboping-1.6.1.tar.bz2'
homepage 'http://verplant.org/liboping/'
- sha256 'cf5c9ac217ddc653543785de50fae6b2595393efa9d73e2e1acb63dc48fb3983'
+ url 'http://verplant.org/liboping/files/liboping-1.6.2.tar.bz2'
+ sha256 '5f4ab4b127b5a8a79ab771002604bff0e2903622393e5602f336cad258bb73cf'
def install
- system "./configure", "--disable-debug", "--disable-dependency-tracking",
+ system "./configure", "--disable-debug",
+ "--disable-dependency-tracking",
"--prefix=#{prefix}"
system "make install"
end
- # Patches from user Dvorak. See:
- # https://github.com/mxcl/homebrew/pull/8374
- def patches
- DATA
- end
-
def caveats
"Run oping and noping sudo'ed in order to avoid the 'Operation not permitted'"
end
end
-
-__END__
-diff --git a/src/liboping.c b/src/liboping.c
-index beef4f5..daa61c4 100644
---- a/src/liboping.c
-+++ b/src/liboping.c
-@@ -69,6 +69,9 @@
- # include <netdb.h>
- #endif
-
-+#ifdef __APPLE__
-+#define __APPLE_USE_RFC_3542
-+#endif
- #if HAVE_NETINET_IN_SYSTM_H
- # include <netinet/in_systm.h>
- #endif
-@@ -545,6 +548,7 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph,
- sizeof (recv_qos));
- dprintf ("TOSv6 = 0x%02"PRIx8";\n", recv_qos);
- } else
-+#ifdef IPV6_HOPLIMIT
- if (cmsg->cmsg_type == IPV6_HOPLIMIT)
- {
- memcpy (&recv_ttl, CMSG_DATA (cmsg),
-@@ -552,6 +556,25 @@ static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph,
- dprintf ("TTLv6 = %i;\n", recv_ttl);
- }
- else
-+#endif
-+#ifdef IPV6_UNICAST_HOPS
-+ if (cmsg->cmsg_type == IPV6_UNICAST_HOPS)
-+ {
-+ memcpy (&recv_ttl, CMSG_DATA (cmsg),
-+ sizeof (recv_ttl));
-+ dprintf ("TTLv6 = %i;\n", recv_ttl);
-+ }
-+ else
-+#endif
-+#ifdef IPV6_MULTICAST_HOPS
-+ if (cmsg->cmsg_type == IPV6_MULTICAST_HOPS)
-+ {
-+ memcpy (&recv_ttl, CMSG_DATA (cmsg),
-+ sizeof (recv_ttl));
-+ dprintf ("TTLv6 = %i;\n", recv_ttl);
-+ }
-+ else
-+#endif
- {
- dprintf ("Not handling option %i.\n",
- cmsg->cmsg_type);
-diff --git a/src/liboping.c b/src/liboping.c
-index daa61c4..3467ca5 100644
---- a/src/liboping.c
-+++ b/src/liboping.c
-@@ -1563,10 +1563,12 @@ int ping_host_add (pingobj_t *obj, const char *host)
- {
- int opt;
-
-+#ifdef IP_RECVTOS
- /* Enable receiving the TOS field */
- opt = 1;
- setsockopt (ph->fd, IPPROTO_IP, IP_RECVTOS,
- &opt, sizeof (opt));
-+#endif
-
- /* Enable receiving the TTL field */
- opt = 1;
View
2 Library/Formula/midgard2.rb
@@ -12,8 +12,6 @@ class Midgard2 < Formula
depends_on 'libgda'
if ARGV.build_head? and MacOS.xcode_version >= "4.3"
- # remove the autoreconf if possible, no comment provided about why it is there
- # so we have no basis to make a decision at this point.
depends_on "automake" => :build
depends_on "libtool" => :build
end
View
4 Library/Formula/mp3splt.rb
@@ -1,9 +1,9 @@
require 'formula'
class Mp3splt < Formula
- url 'http://downloads.sourceforge.net/project/mp3splt/mp3splt/mp3splt-2.4.1.tar.gz'
homepage 'http://mp3splt.sourceforge.net'
- md5 'aed4a94f996abcdb07679206a600fc5b'
+ url 'http://downloads.sourceforge.net/project/mp3splt/mp3splt/2.4.2/mp3splt-2.4.2.tar.gz'
+ md5 'f4c5c42f9dec9fb72b7f6ffeacd82906'
depends_on 'libmp3splt'
View
21 Library/Formula/ode.rb
@@ -1,21 +1,24 @@
require 'formula'
class Ode < Formula
- # Build from svn to get Snow Leopard fixes.
- url 'http://opende.svn.sourceforge.net/svnroot/opende/trunk', :revision => 1760
- version 'r1760'
homepage 'http://www.ode.org/'
+ url 'http://sourceforge.net/projects/opende/files/ODE/0.12/ode-0.12.tar.bz2'
+ sha1 '98ceaba7d1b947fba1c793c5d990c399624f1c47'
+
head 'http://opende.svn.sourceforge.net/svnroot/opende/trunk'
- if MacOS.xcode_version >= "4.3"
- # find a proper tarball with configure and remove autogen and these deps
- depends_on "automake" => :build
- depends_on "libtool" => :build
+ if ARGV.build_head?
+ # Requires newer automake and libtool
+ depends_on 'automake' => :build
+ depends_on 'libtool' => :build
end
def install
- ENV.j1
- system "sh autogen.sh"
+ if ARGV.build_head?
+ ENV['LIBTOOLIZE'] = 'glibtoolize'
+ inreplace 'autogen.sh', 'libtoolize', '$LIBTOOLIZE'
+ system "./autogen.sh"
+ end
system "./configure", "--prefix=#{prefix}", "--disable-demos"
system "make"
system "make install"

0 comments on commit 1ca785a

Please sign in to comment.
Something went wrong with that request. Please try again.