aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Vandenberg2010-10-21 07:54:17 -0700
committerAdam Vandenberg2010-10-21 07:54:17 -0700
commite31c3b430d9014f9617b58bef283c014b9403f6e (patch)
tree94ac71f553f929ad012c4bf57eb861ce08eeb08a
parentae9b3ef59f406c8330c2621e5355c75694723f35 (diff)
downloadhomebrew-e31c3b430d9014f9617b58bef283c014b9403f6e.tar.bz2
Homebrew style is to indent w/ 2 spaces, not tabs
-rw-r--r--Library/Formula/bsdiff.rb6
-rw-r--r--Library/Formula/cairomm.rb6
-rw-r--r--Library/Formula/cd-discid.rb6
-rw-r--r--Library/Formula/cppdom.rb8
-rw-r--r--Library/Formula/cscope.rb6
-rw-r--r--Library/Formula/d-bus.rb2
-rw-r--r--Library/Formula/ddate.rb2
-rw-r--r--Library/Formula/ddclient.rb72
-rw-r--r--Library/Formula/freealut.rb12
-rw-r--r--Library/Formula/geeqie.rb2
-rw-r--r--Library/Formula/ledit.rb2
-rw-r--r--Library/Formula/mcl.rb2
-rw-r--r--Library/Formula/openvpn.rb40
-rw-r--r--Library/Formula/qdbm.rb4
-rw-r--r--Library/Formula/rebar.rb14
-rw-r--r--Library/Formula/schroedinger.rb6
-rw-r--r--Library/Formula/skipfish.rb1
-rw-r--r--Library/Formula/sleepnow.rb2
-rw-r--r--Library/Formula/squirrel.rb1
-rw-r--r--Library/Formula/ssldump.rb20
-rw-r--r--Library/Formula/tofrodos.rb4
21 files changed, 108 insertions, 110 deletions
diff --git a/Library/Formula/bsdiff.rb b/Library/Formula/bsdiff.rb
index e33fdced0..ae3d9cdea 100644
--- a/Library/Formula/bsdiff.rb
+++ b/Library/Formula/bsdiff.rb
@@ -10,9 +10,9 @@ class Bsdiff <Formula
end
def install
- system "/usr/bin/bsdmake"
- bin.install "bsdiff"
- man1.install "bsdiff.1"
+ system "/usr/bin/bsdmake"
+ bin.install "bsdiff"
+ man1.install "bsdiff.1"
end
end
diff --git a/Library/Formula/cairomm.rb b/Library/Formula/cairomm.rb
index b96693c23..addac62d6 100644
--- a/Library/Formula/cairomm.rb
+++ b/Library/Formula/cairomm.rb
@@ -18,9 +18,9 @@ class Cairomm <Formula
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}",
"--without-x",
- "--without-xlib",
- "--disable-quartz",
- "--disable-quartz-font"
+ "--without-xlib",
+ "--disable-quartz",
+ "--disable-quartz-font"
system "make install"
end
end
diff --git a/Library/Formula/cd-discid.rb b/Library/Formula/cd-discid.rb
index 0fee8c207..49751219f 100644
--- a/Library/Formula/cd-discid.rb
+++ b/Library/Formula/cd-discid.rb
@@ -6,9 +6,9 @@ class CdDiscid <Formula
md5 '04cb368e3f1ce17e656ac6691ca0b687'
def patches
- { :p0 =>
- "http://trac.macports.org/export/70630/trunk/dports/audio/cd-discid/files/patch-cd-discid.c.diff"
- }
+ { :p0 =>
+ "http://trac.macports.org/export/70630/trunk/dports/audio/cd-discid/files/patch-cd-discid.c.diff"
+ }
end
def install
diff --git a/Library/Formula/cppdom.rb b/Library/Formula/cppdom.rb
index 3f55e314b..fb62c5d65 100644
--- a/Library/Formula/cppdom.rb
+++ b/Library/Formula/cppdom.rb
@@ -8,6 +8,9 @@ class Cppdom <Formula
depends_on 'scons' => :build
depends_on 'boost'
+ # Don't install to prefix/lib64
+ def patches; DATA; end
+
def install
args = ["prefix=#{prefix}", "build_test=no", "var_type=optimized",
"BoostBaseDir=#{HOMEBREW_PREFIX}/"]
@@ -20,11 +23,6 @@ class Cppdom <Formula
system "#{HOMEBREW_PREFIX}/bin/scons", "install", *args
end
-
- def patches
- # Don't install to prefix/lib64
- DATA
- end
end
__END__
diff --git a/Library/Formula/cscope.rb b/Library/Formula/cscope.rb
index 07e7885e0..d16cf0d7c 100644
--- a/Library/Formula/cscope.rb
+++ b/Library/Formula/cscope.rb
@@ -5,10 +5,8 @@ class Cscope <Formula
homepage 'http://cscope.sourceforge.net/'
md5 'da43987622ace8c36bbf14c15a350ec1'
- def patches
- # Patch from http://bugs.gentoo.org/show_bug.cgi?ctype=html&id=111621
- DATA
- end
+ # Patch from http://bugs.gentoo.org/show_bug.cgi?ctype=html&id=111621
+ def patches; DATA; end
def install
system "./configure", "--prefix=#{prefix}",
diff --git a/Library/Formula/d-bus.rb b/Library/Formula/d-bus.rb
index 72d1b02ad..b00bd4a1e 100644
--- a/Library/Formula/d-bus.rb
+++ b/Library/Formula/d-bus.rb
@@ -17,7 +17,7 @@ class DBus <Formula
"--prefix=#{prefix}",
"--disable-xml-docs",
"--disable-doxygen-docs",
- "--without-x"
+ "--without-x"
system "make install"
# Generate D-Bus's UUID for this machine
diff --git a/Library/Formula/ddate.rb b/Library/Formula/ddate.rb
index 7aa91239a..7acf87486 100644
--- a/Library/Formula/ddate.rb
+++ b/Library/Formula/ddate.rb
@@ -7,7 +7,7 @@ class Ddate <Formula
version '0.1.0'
def install
- system "#{ENV['CC']}", "ddate.c", "-o", "ddate"
+ system "#{ENV['CC']}", "ddate.c", "-o", "ddate"
bin.install 'ddate'
end
end
diff --git a/Library/Formula/ddclient.rb b/Library/Formula/ddclient.rb
index 9d055eb39..066e72303 100644
--- a/Library/Formula/ddclient.rb
+++ b/Library/Formula/ddclient.rb
@@ -19,18 +19,20 @@ class Ddclient <Formula
sbin.install "ddclient"
# Install sample files
- inreplace 'sample-ddclient-wrapper.sh' do |s|
- s.gsub! "/etc/ddclient", (etc + 'ddclient')
- end
- inreplace 'sample-etc_cron.d_ddclient' do |s|
- s.gsub! "/usr/sbin/ddclient", (sbin + 'ddclient')
- end
- inreplace 'sample-etc_ddclient.conf' do |s|
- s.gsub! "/var/run/ddclient.pid", (var + 'run/ddclient/pid')
- end
- (share + 'doc/ddclient').install ['sample-ddclient-wrapper.sh',\
- 'sample-etc_cron.d_ddclient',\
- 'sample-etc_ddclient.conf']
+ inreplace 'sample-ddclient-wrapper.sh',
+ "/etc/ddclient", (etc + 'ddclient')
+
+ inreplace 'sample-etc_cron.d_ddclient',
+ "/usr/sbin/ddclient", (sbin + 'ddclient')
+
+ inreplace 'sample-etc_ddclient.conf',
+ "/var/run/ddclient.pid", (var + 'run/ddclient/pid')
+
+ (share + 'doc/ddclient').install %w(
+ sample-ddclient-wrapper.sh
+ sample-etc_cron.d_ddclient
+ sample-etc_ddclient.conf
+ )
# Create etc & var paths
(etc + 'ddclient').mkpath
@@ -65,29 +67,29 @@ EOS
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>Label</key>
- <string>org.ddclient</string>
- <key>OnDemand</key>
- <true/>
- <key>ProgramArguments</key>
- <array>
- <string>#{sbin}/ddclient</string>
- <string>-file</string>
- <string>#{etc}/ddclient/ddclient.conf</string>
- </array>
- <key>RunAtLoad</key>
- <true/>
- <key>StartCalendarInterval</key>
- <dict>
- <key>Minute</key>
- <integer>0</integer>
- </dict>
- <key>WatchPaths</key>
- <array>
- <string>#{etc}/ddclient</string>
- </array>
- <key>WorkingDirectory</key>
- <string>#{etc}/ddclient</string>
+ <key>Label</key>
+ <string>org.ddclient</string>
+ <key>OnDemand</key>
+ <true/>
+ <key>ProgramArguments</key>
+ <array>
+ <string>#{sbin}/ddclient</string>
+ <string>-file</string>
+ <string>#{etc}/ddclient/ddclient.conf</string>
+ </array>
+ <key>RunAtLoad</key>
+ <true/>
+ <key>StartCalendarInterval</key>
+ <dict>
+ <key>Minute</key>
+ <integer>0</integer>
+ </dict>
+ <key>WatchPaths</key>
+ <array>
+ <string>#{etc}/ddclient</string>
+ </array>
+ <key>WorkingDirectory</key>
+ <string>#{etc}/ddclient</string>
</dict>
</plist>
EOS
diff --git a/Library/Formula/freealut.rb b/Library/Formula/freealut.rb
index bf1f400ba..f797ace62 100644
--- a/Library/Formula/freealut.rb
+++ b/Library/Formula/freealut.rb
@@ -5,14 +5,14 @@ class Freealut <Formula
homepage 'http://connect.creativelabs.com/openal/Documentation/The%20OpenAL%20Utility%20Toolkit.htm'
md5 'e089b28a0267faabdb6c079ee173664a'
- def patches
- # Adds the OpenAL frameworks to the library list so linking succeeds
- DATA
- end
+ # Adds the OpenAL frameworks to the library list so linking succeeds
+ def patches; DATA; end
def install
- system "./autogen.sh"
- system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", "--mandir=#{man}"
+ system "./autogen.sh"
+ system "./configure", "--disable-debug", "--disable-dependency-tracking",
+ "--prefix=#{prefix}",
+ "--mandir=#{man}"
system "make install"
end
end
diff --git a/Library/Formula/geeqie.rb b/Library/Formula/geeqie.rb
index 1fb070185..25dee0dc2 100644
--- a/Library/Formula/geeqie.rb
+++ b/Library/Formula/geeqie.rb
@@ -18,7 +18,7 @@ class Geeqie <Formula
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}",
"--disable-glibtest",
- "--disable-gtktest"
+ "--disable-gtktest"
system "make install"
end
end
diff --git a/Library/Formula/ledit.rb b/Library/Formula/ledit.rb
index ef1665677..843d900e6 100644
--- a/Library/Formula/ledit.rb
+++ b/Library/Formula/ledit.rb
@@ -9,7 +9,7 @@ class Ledit <Formula
depends_on 'camlp5'
def install
- # like camlp5, this build fails if the jobs are parallelized
+ # like camlp5, this build fails if the jobs are parallelized
system "make -j 1 BINDIR=#{bin} LIBDIR=#{lib} MANDIR=#{man}"
system "make install BINDIR=#{bin} LIBDIR=#{lib} MANDIR=#{man}"
end
diff --git a/Library/Formula/mcl.rb b/Library/Formula/mcl.rb
index 68fefd1bf..7d9dee0ab 100644
--- a/Library/Formula/mcl.rb
+++ b/Library/Formula/mcl.rb
@@ -7,7 +7,7 @@ class Mcl <Formula
md5 '9e8aecb9011560b9c3e55fe0f2d1e791'
def install
- bin.mkpath
+ bin.mkpath
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}",
"--enable-blast"
diff --git a/Library/Formula/openvpn.rb b/Library/Formula/openvpn.rb
index 530a91a42..959e3ad0d 100644
--- a/Library/Formula/openvpn.rb
+++ b/Library/Formula/openvpn.rb
@@ -59,26 +59,26 @@ EOS
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
<plist version="1.0">
<dict>
- <key>Label</key>
- <string>org.openvpn</string>
- <key>ProgramArguments</key>
- <array>
- <string>#{sbin}/openvpn</string>
- <string>--config</string>
- <string>#{etc}/openvpn/openvpn.conf</string>
- </array>
- <key>OnDemand</key>
- <false/>
- <key>RunAtLoad</key>
- <true/>
- <key>TimeOut</key>
- <integer>90</integer>
- <key>WatchPaths</key>
- <array>
- <string>#{etc}/openvpn</string>
- </array>
- <key>WorkingDirectory</key>
- <string>#{etc}/openvpn</string>
+ <key>Label</key>
+ <string>org.openvpn</string>
+ <key>ProgramArguments</key>
+ <array>
+ <string>#{sbin}/openvpn</string>
+ <string>--config</string>
+ <string>#{etc}/openvpn/openvpn.conf</string>
+ </array>
+ <key>OnDemand</key>
+ <false/>
+ <key>RunAtLoad</key>
+ <true/>
+ <key>TimeOut</key>
+ <integer>90</integer>
+ <key>WatchPaths</key>
+ <array>
+ <string>#{etc}/openvpn</string>
+ </array>
+ <key>WorkingDirectory</key>
+ <string>#{etc}/openvpn</string>
</dict>
</plist>
EOS
diff --git a/Library/Formula/qdbm.rb b/Library/Formula/qdbm.rb
index 62618064a..395df8d53 100644
--- a/Library/Formula/qdbm.rb
+++ b/Library/Formula/qdbm.rb
@@ -7,8 +7,8 @@ class Qdbm <Formula
def install
system "./configure", "--disable-debug", "--disable-dependency-tracking",
- "--prefix=#{prefix}",
- "--mandir=#{man}"
+ "--prefix=#{prefix}",
+ "--mandir=#{man}"
system "make mac"
system "make install-mac"
end
diff --git a/Library/Formula/rebar.rb b/Library/Formula/rebar.rb
index 6cc9c165e..c15503fd9 100644
--- a/Library/Formula/rebar.rb
+++ b/Library/Formula/rebar.rb
@@ -1,13 +1,13 @@
require 'formula'
class Rebar <Formula
- head 'http://hg.basho.com/rebar/get/tip.tar.gz'
- homepage 'http://hg.basho.com/rebar/'
+ head 'http://hg.basho.com/rebar/get/tip.tar.gz'
+ homepage 'http://hg.basho.com/rebar/'
- depends_on 'erlang'
+ depends_on 'erlang'
- def install
- system "./bootstrap"
- bin.install "rebar"
- end
+ def install
+ system "./bootstrap"
+ bin.install "rebar"
+ end
end
diff --git a/Library/Formula/schroedinger.rb b/Library/Formula/schroedinger.rb
index a3076a5c5..90d9e861f 100644
--- a/Library/Formula/schroedinger.rb
+++ b/Library/Formula/schroedinger.rb
@@ -1,9 +1,9 @@
require 'formula'
class Schroedinger <Formula
- head 'git://diracvideo.org/git/schroedinger.git'
- url 'http://diracvideo.org/download/schroedinger/schroedinger-1.0.9.tar.gz'
- md5 'd67ec48b7c506db8c8b49156bf409e60'
+ head 'git://diracvideo.org/git/schroedinger.git'
+ url 'http://diracvideo.org/download/schroedinger/schroedinger-1.0.9.tar.gz'
+ md5 'd67ec48b7c506db8c8b49156bf409e60'
homepage 'http://diracvideo.org/'
depends_on 'pkg-config' => :build
diff --git a/Library/Formula/skipfish.rb b/Library/Formula/skipfish.rb
index c887418c2..8e93a197b 100644
--- a/Library/Formula/skipfish.rb
+++ b/Library/Formula/skipfish.rb
@@ -4,6 +4,7 @@ class Skipfish <Formula
url 'http://skipfish.googlecode.com/files/skipfish-1.69b.tgz'
homepage 'http://code.google.com/p/skipfish/'
md5 'ece789b885014208a760138354d972c3'
+
depends_on 'libidn'
def install
diff --git a/Library/Formula/sleepnow.rb b/Library/Formula/sleepnow.rb
index 358034111..df7631380 100644
--- a/Library/Formula/sleepnow.rb
+++ b/Library/Formula/sleepnow.rb
@@ -11,7 +11,7 @@ class Sleepnow <Formula
# Remove unneeded SDK reference
inreplace "SleepNow.xcodeproj/project.pbxproj", /SDKROOT.*$/, ''
- # Build binary
+ # Build binary
system "xcodebuild", "-target", "SleepNow", "-configuration", "Release", "ONLY_ACTIVE_ARCH=YES"
# Install binary and rename to lowercase
diff --git a/Library/Formula/squirrel.rb b/Library/Formula/squirrel.rb
index e25786ff3..ebf80018c 100644
--- a/Library/Formula/squirrel.rb
+++ b/Library/Formula/squirrel.rb
@@ -9,7 +9,6 @@ class Squirrel <Formula
system "make"
prefix.install %w[bin include lib]
-
doc.install Dir['doc/*.pdf']
doc.install %w[etc samples]
end
diff --git a/Library/Formula/ssldump.rb b/Library/Formula/ssldump.rb
index 4af90f64f..c09183d70 100644
--- a/Library/Formula/ssldump.rb
+++ b/Library/Formula/ssldump.rb
@@ -6,22 +6,22 @@ class Ssldump <Formula
md5 'ac8c28fe87508d6bfb06344ec496b1dd'
def install
- ENV["LIBS"] = "-lssl -lcrypto"
+ ENV["LIBS"] = "-lssl -lcrypto"
- # .dylib, not .a
- inreplace "configure", "if test -f $dir/libpcap.a; then", "if test -f $dir/libpcap.dylib; then"
+ # .dylib, not .a
+ inreplace "configure", "if test -f $dir/libpcap.a; then", "if test -f $dir/libpcap.dylib; then"
system "./configure", "osx", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
- system "make"
+ system "make"
bin.install "ssldump"
- man1.install "ssldump.1"
+ man1.install "ssldump.1"
end
- def patches
- # reorder include files
- # => http://sourceforge.net/tracker/index.php?func=detail&aid=1622854&group_id=68993&atid=523055
- DATA
- end
+ def patches
+ # reorder include files
+ # => http://sourceforge.net/tracker/index.php?func=detail&aid=1622854&group_id=68993&atid=523055
+ DATA
+ end
end
__END__
diff --git a/Library/Formula/tofrodos.rb b/Library/Formula/tofrodos.rb
index 5bdfe83e6..f64730b0d 100644
--- a/Library/Formula/tofrodos.rb
+++ b/Library/Formula/tofrodos.rb
@@ -6,10 +6,10 @@ class Tofrodos <Formula
md5 'aaa044f9817a048e126d9eb7a7535e96'
def install
- Dir.chdir 'src'
+ Dir.chdir 'src'
system "make"
bin.install %w[todos fromdos]
- man1.install %w[fromdos.1]
+ man1.install "fromdos.1"
ln_s man1+'fromdos.1', man1+'todos.1'
end
end