Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/mxcl/homebrew
Browse files Browse the repository at this point in the history
  • Loading branch information
erikg committed Apr 13, 2012
2 parents 02aab8a + 6a46e07 commit 697dfce
Show file tree
Hide file tree
Showing 12 changed files with 204 additions and 49 deletions.
4 changes: 2 additions & 2 deletions Library/Formula/exiftool.rb
Expand Up @@ -2,8 +2,8 @@

class Exiftool < Formula
homepage 'http://www.sno.phy.queensu.ca/~phil/exiftool/index.html'
url 'http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-8.86.tar.gz'
md5 'a575954d98a8896d248b16d8a849602c'
url 'http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-8.87.tar.gz'
md5 '0c52327246214fd5f3476fc95e1856a1'

def install
system "perl", "Makefile.PL"
Expand Down
12 changes: 3 additions & 9 deletions Library/Formula/libffi.rb
@@ -1,19 +1,13 @@
require 'formula'

class Libffi < Formula
url 'http://mirrors.kernel.org/sources.redhat.com/libffi/libffi-3.0.10.tar.gz'
mirror 'ftp://sourceware.org/pub/libffi/libffi-3.0.10.tar.gz'
homepage 'http://sourceware.org/libffi/'
sha1 '97abf70e6a6d315d9259d58ac463663051d471e1'
url 'http://mirrors.kernel.org/sources.redhat.com/libffi/libffi-3.0.11.tar.gz'
mirror 'ftp://sourceware.org/pub/libffi/libffi-3.0.11.tar.gz'
sha1 'bff6a6c886f90ad5e30dee0b46676e8e0297d81d'

keg_only :provided_by_osx, "Some formulae require a newer version of libffi."

def patches
# both of these are fixed upstream
{ :p0 => ["https://trac.macports.org/export/88691/trunk/dports/devel/libffi/files/patch-configure.diff",
"https://trac.macports.org/export/88691/trunk/dports/devel/libffi/files/patch-configure-darwin11.diff"] }
end

def install
ENV.universal_binary
system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
Expand Down
20 changes: 2 additions & 18 deletions Library/Formula/mogenerator.rb
@@ -1,29 +1,13 @@
require 'formula'

class Mogenerator < Formula
url 'https://github.com/rentzsch/mogenerator/tarball/1.25'
url 'https://github.com/rentzsch/mogenerator/tarball/1.26'
homepage 'http://rentzsch.github.com/mogenerator/'
md5 '008f4cc1a96a1ad5acad87cbe4f47e95'
md5 'cc761752cc581188e1065bd0919ad4c3'
head "https://github.com/rentzsch/mogenerator.git"

def install
system "xcodebuild -target mogenerator -configuration Release SYMROOT=symroot OBJROOT=objroot"
bin.install "symroot/Release/mogenerator"

# Install default demplates
(prefix+'templates').install Dir['templates/*.motemplate']
end

def caveats; <<-EOS.undent
A default set of Mogenerator templates have been installed to:
#{prefix}/templates
If you haven't written your own templates, you may wish to copy these for
your own use:
mkdir -p "#{ENV['HOME']}/Library/Application Support/mogenerator"
cp #{prefix}/templates/*.motemplate "#{ENV['HOME']}/Library/Application Support/mogenerator/"
EOS
end
end
138 changes: 135 additions & 3 deletions Library/Formula/mp4v2.rb
@@ -1,12 +1,144 @@
require 'formula'

class Mp4v2 < Formula
url 'http://mp4v2.googlecode.com/files/mp4v2-1.9.1.tar.bz2'
homepage 'http://code.google.com/p/mp4v2/'
md5 '986701929ef15b03155ac4fb16444797'
url 'http://mp4v2.googlecode.com/files/mp4v2-1.9.1.tar.bz2'
sha1 'c62d00e99b65efce16accd83c501fb8a57206aa8'

devel do
url 'http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2'
sha1 '1999b805d5e66dffbd95ec3a563758650e23bf60'
version 'r479'
end

def patches
# Fixes compile error on Lion w/Clang using a patch from svn:
# http://code.google.com/p/mp4v2/source/detail?r=442
# It is inline because there's no direct link to the raw patch.
DATA unless ARGV.build_devel?
end

def install
system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
system "./configure", "--disable-debug", "--prefix=#{prefix}"
system "make"
system "make install"
system "make install-man"
end
end

__END__
--- a/src/bmff/typebmff.cpp 2009-07-13 16:07:10.000000000 -0700
+++ b/src/bmff/typebmff.cpp 2012-03-28 11:05:48.000000000 -0700
@@ -23,19 +23,12 @@

#include "impl.h"

-// VStudio idiocy prevents defining template instanced static data
-// in a namespace. Workaround it by defining in global scope.
-// Other platforms will continue to put things in the proper namespace.
-#if defined( _MSC_VER )
-using namespace mp4v2::impl::bmff;
-#else
-namespace mp4v2 { namespace impl { namespace bmff {
-#endif
+namespace mp4v2 { namespace impl {

///////////////////////////////////////////////////////////////////////////////

template <>
-const EnumLanguageCode::Entry EnumLanguageCode::data[] = {
+const bmff::EnumLanguageCode::Entry bmff::EnumLanguageCode::data[] = {
{ mp4v2::impl::bmff::ILC_AAR, "aar", "Afar" },
{ mp4v2::impl::bmff::ILC_ABK, "abk", "Abkhazian" },
{ mp4v2::impl::bmff::ILC_ACE, "ace", "Achinese" },
@@ -526,9 +519,7 @@

///////////////////////////////////////////////////////////////////////////////

-#if defined( _MSC_VER )
-namespace mp4v2 { namespace impl { namespace bmff {
-#endif
+namespace bmff {

///////////////////////////////////////////////////////////////////////////////

--- a/src/itmf/type.cpp 2009-07-13 16:07:08.000000000 -0700
+++ b/src/itmf/type.cpp 2012-03-28 11:30:25.000000000 -0700
@@ -24,19 +24,12 @@

#include "impl.h"

-// VStudio idiocy prevents defining template instanced static data
-// in a namespace. Workaround it by defining in global scope.
-// Other platforms will continue to put things in the proper namespace.
-#if defined( _MSC_VER )
-using namespace mp4v2::impl::itmf;
-#else
-namespace mp4v2 { namespace impl { namespace itmf {
-#endif
+namespace mp4v2 { namespace impl {

///////////////////////////////////////////////////////////////////////////////

template <>
-const EnumBasicType::Entry EnumBasicType::data[] = {
+const itmf::EnumBasicType::Entry itmf::EnumBasicType::data[] = {
{ mp4v2::impl::itmf::BT_IMPLICIT, "implicit", "implicit" },
{ mp4v2::impl::itmf::BT_UTF8, "utf8", "UTF-8" },
{ mp4v2::impl::itmf::BT_UTF16, "utf16", "UTF-16" },
@@ -64,7 +57,7 @@
///////////////////////////////////////////////////////////////////////////////

template <>
-const EnumGenreType::Entry EnumGenreType::data[] = {
+const itmf::EnumGenreType::Entry itmf::EnumGenreType::data[] = {
{ mp4v2::impl::itmf::GENRE_BLUES, "blues", "Blues" },
{ mp4v2::impl::itmf::GENRE_CLASSIC_ROCK, "classicrock", "Classic Rock" },
{ mp4v2::impl::itmf::GENRE_COUNTRY, "country", "Country" },
@@ -200,7 +193,7 @@
///////////////////////////////////////////////////////////////////////////////

template <>
-const EnumStikType::Entry EnumStikType::data[] = {
+const itmf::EnumStikType::Entry itmf::EnumStikType::data[] = {
{ mp4v2::impl::itmf::STIK_OLD_MOVIE, "oldmovie", "Movie" },
{ mp4v2::impl::itmf::STIK_NORMAL, "normal", "Normal" },
{ mp4v2::impl::itmf::STIK_AUDIOBOOK, "audiobook", "Audio Book" },
@@ -216,7 +209,7 @@
///////////////////////////////////////////////////////////////////////////////

template <>
-const EnumAccountType::Entry EnumAccountType::data[] = {
+const itmf::EnumAccountType::Entry itmf::EnumAccountType::data[] = {
{ mp4v2::impl::itmf::AT_ITUNES, "itunes", "iTunes" },
{ mp4v2::impl::itmf::AT_AOL, "aol", "AOL" },

@@ -226,7 +219,7 @@
///////////////////////////////////////////////////////////////////////////////

template <>
-const EnumCountryCode::Entry EnumCountryCode::data[] = {
+const itmf::EnumCountryCode::Entry itmf::EnumCountryCode::data[] = {
{ mp4v2::impl::itmf::CC_USA, "usa", "United States" },
{ mp4v2::impl::itmf::CC_USA, "fra", "France" },
{ mp4v2::impl::itmf::CC_DEU, "ger", "Germany" },
@@ -256,7 +249,7 @@
///////////////////////////////////////////////////////////////////////////////

template <>
-const EnumContentRating::Entry EnumContentRating::data[] = {
+const itmf::EnumContentRating::Entry itmf::EnumContentRating::data[] = {
{ mp4v2::impl::itmf::CR_NONE, "none", "None" },
{ mp4v2::impl::itmf::CR_CLEAN, "clean", "Clean" },
{ mp4v2::impl::itmf::CR_EXPLICIT, "explicit", "Explicit" },
@@ -266,9 +259,7 @@

///////////////////////////////////////////////////////////////////////////////

-#if defined( _MSC_VER )
-namespace mp4v2 { namespace impl { namespace itmf {
-#endif
+namespace itmf {

///////////////////////////////////////////////////////////////////////////////

14 changes: 14 additions & 0 deletions Library/Formula/osslsigncode.rb
@@ -0,0 +1,14 @@
require 'formula'

class Osslsigncode < Formula
homepage 'http://sourceforge.net/projects/osslsigncode/'
url 'http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.4.tar.gz'
md5 '018b12b3efc4a5250dd3977c2bada3cd'

depends_on 'pkg-config' => :build

def install
system "./configure", "--prefix=#{prefix}"
system "make install"
end
end
1 change: 1 addition & 0 deletions Library/Formula/python.rb
Expand Up @@ -18,6 +18,7 @@ class Python < Formula
url 'http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2'
md5 'c57477edd6d18bd9eeca2f21add73919'

depends_on 'pkg-config' => :build
depends_on 'readline' => :optional # Prefer over OS X's libedit
depends_on 'sqlite' => :optional # Prefer over OS X's older version
depends_on 'gdbm' => :optional
Expand Down
4 changes: 2 additions & 2 deletions Library/Formula/reposurgeon.rb
@@ -1,9 +1,9 @@
require 'formula'

class Reposurgeon < Formula
url 'http://www.catb.org/esr/reposurgeon/reposurgeon-0.7.tar.gz'
url 'http://www.catb.org/esr/reposurgeon/reposurgeon-1.9.tar.gz'
homepage 'http://www.catb.org/esr/reposurgeon/'
md5 'cede4de54cc56b259c14969afaeeeb7f'
md5 '5ebedd5f69e3e5b42aada02b237e724c'

def install
bin.install "reposurgeon"
Expand Down
4 changes: 2 additions & 2 deletions Library/Formula/swi-prolog.rb
Expand Up @@ -2,8 +2,8 @@

class SwiProlog < Formula
homepage 'http://www.swi-prolog.org/'
url 'http://www.swi-prolog.org/download/stable/src/pl-6.0.0.tar.gz'
sha256 '85591936c8b6af610b1a9960924e6e4eaf5abccf253749a15355ad79a9e80de9'
url 'http://www.swi-prolog.org/download/stable/src/pl-6.0.2.tar.gz'
sha256 '9dbc4d3aef399204263f168583e54468078528bff75c48c7895ae3efe5499b75'
head 'git://www.swi-prolog.org/home/pl/git/pl.git'

depends_on 'pkg-config' => :build
Expand Down
26 changes: 19 additions & 7 deletions Library/Formula/synergy.rb
@@ -1,16 +1,28 @@
require 'formula'

class Synergy < Formula
# Newer 1.3.x versions have a critical bug on OS X:
# http://code.google.com/p/synergy-plus/issues/detail?id=47
# Do not bump this to 1.3.7 or newer until that issue is resolved.
url 'http://synergy.googlecode.com/files/synergy-1.3.6p2-MacOSX-Universal.zip'
sha1 '5b9336fb553db17bd109e3f2bca517af18ed3863'
homepage 'http://synergy-foss.org'
version '1.3.8'

if MacOS.lion?
url 'http://synergy.googlecode.com/files/synergy-1.3.8-MacOSX107-Universal.zip'
sha1 '6b9b0e75a468b9f9c80519894e4d2d589aca2d31'
else
url 'http://synergy.googlecode.com/files/synergy-1.3.8-MacOSX106-Universal.zip'
sha1 'cedf8dc0f5f1d95b967fabcd4ed9bfc0f72840e6'
end

devel do
url 'http://synergy.googlecode.com/files/synergy-1.4.3-MacOSX106-Universal.zip'
sha1 'aa60fa6ac975dd22dc095d6cd9f3dc755b91bb64'
version '1.4.8'
if MacOS.lion?
url 'http://synergy.googlecode.com/files/synergy-1.4.8-MacOSX107-x86_64.dmg'
sha1 '8c3f0326d74c935c20cc83c79dda20677d9b5814'
elsif MacOS.snow_leopard?
url 'http://synergy.googlecode.com/files/synergy-1.4.8-MacOSX106-i386.dmg'
sha1 '1de78afdc838b1c0ef21e36d996b18ff6019b191'
else
opoo "No --devel for this version of OS X."
end
end

def install
Expand Down
4 changes: 2 additions & 2 deletions Library/Formula/the_silver_searcher.rb
Expand Up @@ -2,8 +2,8 @@

class TheSilverSearcher < Formula
homepage 'https://github.com/ggreer/the_silver_searcher'
url 'https://github.com/ggreer/the_silver_searcher/tarball/0.3'
md5 'd45bf240e3219f9392b5b3cc7a66056c'
url 'https://github.com/ggreer/the_silver_searcher/tarball/0.5'
md5 'e39ccf313e40156176fb9fcd5373864c'
head 'https://github.com/ggreer/the_silver_searcher.git'

if MacOS.xcode_version >= '4.3'
Expand Down
17 changes: 17 additions & 0 deletions Library/Formula/xclip.rb
@@ -0,0 +1,17 @@
require 'formula'

class Xclip < Formula
homepage 'http://xclip.sourceforge.net/'
url 'http://downloads.sourceforge.net/project/xclip/xclip/0.12/xclip-0.12.tar.gz'
md5 'f7e19d3e976fecdc1ea36cd39e39900d'

def install
ENV.x11
system "./configure", "--prefix=#{prefix}"
system "make install"
end

def test
system "#{bin}/xclip -version"
end
end
9 changes: 5 additions & 4 deletions Library/Formula/zile.rb
Expand Up @@ -2,14 +2,15 @@

class Zile < Formula
homepage 'http://www.gnu.org/software/zile/'
url 'http://ftpmirror.gnu.org/zile/zile-2.4.6.tar.gz'
mirror 'http://ftp.gnu.org/gnu/zile/zile-2.4.6.tar.gz'
md5 '508d14a3410d7dde89088eca06dad692'
url 'http://ftpmirror.gnu.org/zile/zile-2.4.7.tar.gz'
mirror 'http://ftp.gnu.org/gnu/zile/zile-2.4.7.tar.gz'
sha1 '30c47a399b94b5dce68a178fe98807f86719a466'

depends_on 'bdw-gc'
depends_on 'gettext'

def install
system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--mandir=#{man}"
system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
system "make install"
end
end

0 comments on commit 697dfce

Please sign in to comment.