Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: bertjwregeer/homebrew
...
head fork: bertjwregeer/homebrew
  • 7 commits
  • 9 files changed
  • 0 commit comments
  • 2 contributors
Commits on Feb 15, 2012
Jack Nagel jacknagel duplicity: don't shell out to move files
And don't invoke system in such a way that escapes the glob.

Fixes #10196.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
e789dc2
Jack Nagel jacknagel mira 3.4.0.1
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
cfea0a9
Jack Nagel jacknagel tor: remove unused configure switch
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
bc82010
Jack Nagel jacknagel docbook: keep XML catalog inside HOMEBREW_PREFIX
Rather than download a shell script and tell users to run it with
`sudo`, it is better to keep everything under Homebrew's control.
Luckily, the XML toolchain provides the environment variable
XML_CATALOG_FILES to allow files otehr than /etc/xml/catalog to be used.

So remove the shell script, and do all the work inside the formula
itself. When we're done, we just tell the user to add
HOMEBREW_PREFIX/etc/xml/catalog to their shell configuration, rather
than tell them to `sudo docbook-register`.

Rather than download the shell script, just download docbook 5.0, which
we need anyway.

This also simplifies the logic in a handful of docbook-using formula.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
fba3d90
Jack Nagel jacknagel bdw-gc: apply patch to fix Makefile issue
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
1f22e24
Jack Nagel jacknagel libvpx: fix build on 64-bit
Fixes #8163.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
97c76e2
2bits 2bits mcabber: fixes for autogen.sh
Define a couple of variables to help --HEAD run autogen.sh and locate
our m4 macros.  Adds a Dir.chdir for HEAD, and a depend_on libotr,
otherwise configure will choke once you generate it and run it.  Adds a
caveat to inform the user how to setup their .mcabberrc configuration
file.  This compiles on Lion and Snow Lep with all five compilers,
either stable or head.

Changes --enable-otr from an option to being the default.

Closes #10174.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
f97f5a0
27 Library/Formula/bdw-gc.rb
View
@@ -8,7 +8,10 @@ class BdwGc < Formula
version '7.2alpha6'
def patches
- DATA # fix inline asm errors with LLVM, present in upstream SVN
+ # fix inline ASM issues with LLVM
+ # fix Makefile double-install
+ # both fixes already upstream
+ DATA
end
def install
@@ -49,3 +52,25 @@ def install
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 \
78 Library/Formula/docbook.rb
View
@@ -1,33 +1,39 @@
require 'formula'
class Docbook < Formula
- url 'https://gist.github.com/raw/462528/098ccc609b039cf5b6d11fcd9c8ef333c3861b65/docbook-register'
- md5 '0fbc35a136190050de3598354655fd82'
- version '5.0'
homepage 'http://docbook.sourceforge.net/'
-
- def packages; [
- Docbookxml412,
- Docbookxml42,
- Docbookxml43,
- Docbookxml44,
- Docbookxml45,
- Docbookxml50,
- Docbookxsl,
- ]; end
+ url 'http://www.docbook.org/xml/5.0/docbook-5.0.zip'
+ md5 '2411c19ed4fb141f3fa3d389fae40736'
def install
- bin.install 'docbook-register'
+ packages = [Docbookxml412,
+ Docbookxml42,
+ Docbookxml43,
+ Docbookxml44,
+ Docbookxml45,
+ Docbookxml50,
+ Docbookxsl]
+
+ (etc+'xml').mkpath
+ system "xmlcatalog", "--noout", "--create", "#{etc}/xml/catalog"
+
packages.each do |pkg|
- pkg.new.brew { |formula| formula.install }
+ pkg.new.brew do |f|
+ f.install
+ catalog = prefix+f.catalog+'catalog.xml'
+ system "xmlcatalog", "--noout", "--del",
+ "file://#{catalog}", "#{etc}/xml/catalog"
+ system "xmlcatalog", "--noout", "--add", "nextCatalog",
+ "", "file://#{catalog}", "#{etc}/xml/catalog"
+ end
end
end
def caveats; <<-EOS.undent
- To use the DocBook package in your XML toolchain, you need to
- register it with the global XML catalog with this command:
+ To use the DocBook package in your XML toolchain,
+ you need to add the following to your ~/.bashrc:
- sudo docbook-register
+ export XML_CATALOG_FILES="#{etc}/xml/catalog"
EOS
end
end
@@ -38,46 +44,54 @@ def install
docbook = Formula.factory 'docbook'
(docbook.prefix+'docbook/xml'+version).install Dir['*']
end
+
+ def catalog; 'docbook/xml/'+version; end
end
-class Docbookxml412 <Docbookxml
+
+class Docbookxml412 < Docbookxml
url 'http://www.docbook.org/xml/4.1.2/docbkx412.zip'
md5 '900d7609fb7e6d78901b357e4acfbc17'
version '4.1.2'
- homepage 'http://www.docbook.org/'
end
-class Docbookxml42 <Docbookxml
+
+class Docbookxml42 < Docbookxml
url 'http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip'
md5 '73fe50dfe74ca631c1602f558ed8961f'
- homepage 'http://www.docbook.org/'
end
-class Docbookxml43 <Docbookxml
+
+class Docbookxml43 < Docbookxml
url 'http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip'
md5 'ab200202b9e136a144db1e0864c45074'
- homepage 'http://www.docbook.org/'
end
-class Docbookxml44 <Docbookxml
+
+class Docbookxml44 < Docbookxml
url 'http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip'
md5 'cbb04e9a700955d88c50962ef22c1634'
- homepage 'http://www.docbook.org/'
end
-class Docbookxml45 <Docbookxml
+
+class Docbookxml45 < Docbookxml
url 'http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip'
md5 '03083e288e87a7e829e437358da7ef9e'
- homepage 'http://www.docbook.org/'
end
-class Docbookxml50 <Docbookxml
+
+class Docbookxml50 < Docbookxml
url 'http://www.docbook.org/xml/5.0/docbook-5.0.zip'
md5 '2411c19ed4fb141f3fa3d389fae40736'
- homepage 'http://www.docbook.org/'
end
+
class Docbookxsl < Formula
+ homepage 'http://docbook.sourceforge.net/'
url 'http://downloads.sourceforge.net/project/docbook/docbook-xsl/1.76.1/docbook-xsl-1.76.1.tar.bz2'
md5 'b5340507cb240cc7ce00632b9c40bff5'
- homepage 'http://docbook.sourceforge.net/'
+
def install
doc_files = %w[AUTHORS BUGS README RELEASE-NOTES.txt TODO VERSION NEWS COPYING]
- xsl_files = %w[catalog.xml common eclipse epub extensions fo highlighting html htmlhelp images javahelp lib manpages params profiling roundtrip slides template tools website xhtml xhtml-1_1]
+ xsl_files = %w[catalog.xml common eclipse epub extensions fo highlighting html
+ htmlhelp images javahelp lib manpages params profiling roundtrip
+ slides template tools website xhtml xhtml-1_1]
docbook = Formula.factory 'docbook'
(docbook.prefix+'docbook/xsl'+version).install xsl_files + doc_files
end
+
+ def catalog; 'docbook/xsl/'+version; end
end
4 Library/Formula/duplicity.rb
View
@@ -18,8 +18,8 @@ def install
"--install-scripts=#{bin}"
# Shift files around to avoid needing a PYTHONPATH
- system "mv", "#{bin}/duplicity", "#{bin}/duplicity.py"
- system "mv", "#{bin}/*", libexec
+ mv bin+'duplicity', bin+'duplicity.py'
+ mv Dir[bin+'*'], libexec
bin.install_symlink "#{libexec}/duplicity.py" => "duplicity"
bin.install_symlink "#{libexec}/rdiffdir"
3  Library/Formula/gtk-doc.rb
View
@@ -15,7 +15,8 @@ def install
system "./configure", "--disable-debug",
"--disable-dependency-tracking",
"--prefix=#{prefix}",
- "--disable-scrollkeeper"
+ "--disable-scrollkeeper",
+ "--with-xml-catalog=#{etc}/xml/catalog"
system "make"
system "make install"
end
19 Library/Formula/libvpx.rb
View
@@ -17,9 +17,6 @@ def options
end
def install
- macbuild = Pathname.pwd+'macbuild'
- mkdir macbuild
- Dir.chdir macbuild
args = ["--prefix=#{prefix}",
"--enable-pic",
"--enable-vp8"]
@@ -27,10 +24,16 @@ def install
args << "--enable-mem-tracker" if ARGV.include? "--mem-tracker"
args << "--enable-postproc" if ARGV.include? "--postproc"
args << "--enable-postproc-visualizer" if ARGV.include? "--visualizer"
- # Configure detects 32-bit CPUs incorrectly.
- args << "--target=generic-gnu" unless MacOS.prefer_64_bit?
- system "../configure", *args
- system "make"
- system "make install"
+
+ # Unless the arch is specified, configure tries to build universal.
+ # Patches welcome to detect and apply the real arch strings on each platform.
+ args << "--target=generic-gnu"
+
+ mkdir 'macbuild'
+ cd 'macbuild' do
+ system "../configure", *args
+ system "make"
+ system "make install"
+ end
end
end
31 Library/Formula/mcabber.rb
View
@@ -11,31 +11,46 @@ class Mcabber < Formula
depends_on 'loudmouth'
depends_on 'gpgme'
depends_on 'libgcrypt'
- depends_on 'aspell' => :optional if ARGV.include? '--enable-aspell'
- depends_on 'enchant' => :optional if ARGV.include? '--enable-enchant'
- depends_on 'libotr' => :optional if ARGV.include? '--enable-otr'
- depends_on 'libidn' => :optional
+ depends_on 'libotr'
+ depends_on 'libidn'
+ depends_on 'aspell' if ARGV.include? '--enable-aspell'
+ depends_on 'enchant' if ARGV.include? '--enable-enchant'
def options
[
["--enable-enchant", "Enable spell checking support via enchant"],
["--enable-aspell", "Enable spell checking support via aspell"],
- ["--enable-otr", "Enable support for off-the-record messages"]
]
end
def install
- system "./autogen.sh" if ARGV.build_head?
+ if ARGV.build_head? then
+ ENV['LIBTOOLIZE'] = '/usr/bin/glibtoolize'
+ ENV['ACLOCAL'] = "/usr/bin/aclocal -I #{HOMEBREW_PREFIX}/share/aclocal"
+ Dir.chdir 'mcabber'
+ inreplace 'autogen.sh', 'libtoolize', '$LIBTOOLIZE'
+ inreplace 'autogen.sh', 'aclocal', '$ACLOCAL'
+ system "./autogen.sh"
+ end
+
args = ["--disable-debug", "--disable-dependency-tracking",
- "--prefix=#{prefix}"]
+ "--prefix=#{prefix}", "--enable-otr"]
args << "--enable-aspell" if ARGV.include? "--enable-aspell"
args << "--enable-enchant" if ARGV.include? "--enable-enchant"
- args << "--enable-otr" if ARGV.include? "--enable-otr"
system "./configure", *args
system "make install"
(share+'mcabber').install %w[mcabberrc.example contrib]
end
+
+ def caveats
+ <<-EOS.undent
+ A configuration file is necessary to start mcabber. The template is here:
+ #{share}/mcabber/mcabberrc.example
+ And there is a Getting Started Guide you will need to setup Mcabber:
+ http://wiki.mcabber.com/index.php/Getting_started
+ EOS
+ end
end
11 Library/Formula/mira.rb
View
@@ -1,23 +1,22 @@
require 'formula'
class Mira < Formula
- url 'http://downloads.sourceforge.net/project/mira-assembler/MIRA/stable/mira-3.4.0.tar.bz2'
homepage 'http://sourceforge.net/apps/mediawiki/mira-assembler/'
- md5 '4cebaca9e760180c9fa7ed30be8fc178'
+ url 'http://downloads.sourceforge.net/project/mira-assembler/MIRA/stable/mira-3.4.0.1.tar.bz2'
+ md5 '8ae61c3000aef681ef08a7936469af35'
depends_on 'boost'
depends_on 'google-perftools'
depends_on 'docbook'
def install
- system "./configure", "--disable-debug", "--disable-dependency-tracking",
+ system "./configure", "--disable-debug",
+ "--disable-dependency-tracking",
"--prefix=#{prefix}"
system "make install"
- # Can't use because of absent of dblatex
- #system "make docs"
end
def test
- system "mira"
+ system "#{bin}/mira"
end
end
5 Library/Formula/tor.rb
View
@@ -1,15 +1,14 @@
require 'formula'
class Tor < Formula
- url 'https://www.torproject.org/dist/tor-0.2.2.35.tar.gz'
homepage 'https://www.torproject.org/'
+ url 'https://www.torproject.org/dist/tor-0.2.2.35.tar.gz'
md5 'dcecf699c4b929319d5f1ce0358d4835'
depends_on 'libevent'
def install
- system "./configure", "--disable-debug", "--disable-dependency-tracking",
- "--prefix=#{prefix}"
+ system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
system "make install"
plist_path.write startup_plist
28 Library/Formula/xmlto.rb
View
@@ -1,39 +1,21 @@
require 'formula'
class Xmlto < Formula
+ homepage 'http://cyberelk.net/tim/software/xmlto/'
url 'http://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2'
md5 '3001d6bb2bbc2c8f6c2301f05120f074'
- homepage 'http://cyberelk.net/tim/software/xmlto/'
depends_on 'docbook'
depends_on 'gnu-getopt'
def install
- docbook = Formula.factory "docbook"
- getopt = Formula.factory "gnu-getopt"
-
- unless File.exist? "/private/etc/xml/catalog"
- opoo "You must to register docbook"
- puts docbook.caveats
- exit 99
- end
-
# GNU getopt is keg-only, so point configure to it
- ENV['GETOPT']=getopt.bin+"getopt"
+ ENV['GETOPT'] = Formula.factory('gnu-getopt').bin+"getopt"
+ # Find our docbook catalog
+ ENV['XML_CATALOG_FILES'] = "#{etc}/xml/catalog"
- ENV.j1
+ ENV.deparallelize
system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
-
system "make install"
end
-
- def caveats
- docbook = Formula.factory "docbook"
- <<-EOS.undent
- xmlto requires that docbook be installed and registered.
-
- See:
- brew info docbook
- EOS
- end
end

No commit comments for this range

Something went wrong with that request. Please try again.