diff options
| -rw-r--r-- | Library/Formula/recode.rb | 15 | ||||
| -rw-r--r-- | Library/Formula/tcpflow.rb | 13 | ||||
| -rw-r--r-- | Library/Formula/trafshow.rb | 26 |
3 files changed, 41 insertions, 13 deletions
diff --git a/Library/Formula/recode.rb b/Library/Formula/recode.rb index b7ecd6c69..16d21fcce 100644 --- a/Library/Formula/recode.rb +++ b/Library/Formula/recode.rb @@ -3,7 +3,7 @@ require 'formula' class Recode < Formula homepage 'http://recode.progiciels-bpi.ca/index.html' url 'https://github.com/pinard/Recode/tarball/v3.6' - md5 'f82e9a6ede9119268c13493c9add2809' + sha1 '417c36dfe9c729276a3d439d280b515b615241df' depends_on "gettext" depends_on :libtool @@ -14,17 +14,22 @@ class Recode < Formula { :p0 => DATA } end - def install - ENV.append 'LDFLAGS', '-liconv' - + def copy_libtool_files! if MacOS.xcode_version >= "4.3" - d = "#{HOMEBREW_PREFIX}/share/libtool/config" + s = Formula.factory('libtool').share + d = "#{s}/libtool/config" cp ["#{d}/config.guess", "#{d}/config.sub"], "." elsif MacOS.leopard? cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config.*"], "." else cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config/config.*"], "." end + end + + def install + ENV.append 'LDFLAGS', '-liconv' + + copy_libtool_files! system "./configure", "--disable-debug", "--disable-dependency-tracking", "--without-included-gettext", diff --git a/Library/Formula/tcpflow.rb b/Library/Formula/tcpflow.rb index 39691a1a2..da82b8b95 100644 --- a/Library/Formula/tcpflow.rb +++ b/Library/Formula/tcpflow.rb @@ -3,18 +3,25 @@ require 'formula' class Tcpflow < Formula homepage 'https://github.com/simsong/tcpflow' url 'https://github.com/downloads/simsong/tcpflow/tcpflow-1.2.6.tar.gz' - md5 '7562f8a1a65f1ce1238be84a1fe83bf6' + sha1 '4267c491cd5f944f8deba727aa7870ced1ad2224' # Patch from MacPorts def patches; DATA; end - def install - if MacOS.leopard? + def copy_libtool_files! + if MacOS.xcode_version >= "4.3" + s = Formula.factory('libtool').share + d = "#{s}/libtool/config" + cp ["#{d}/config.guess", "#{d}/config.sub"], "." + elsif MacOS.leopard? cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config.*"], "." else cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config/config.*"], "." end + end + def install + copy_libtool_files! system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--mandir=#{man}" diff --git a/Library/Formula/trafshow.rb b/Library/Formula/trafshow.rb index 1c35aa51b..92fd3d1ec 100644 --- a/Library/Formula/trafshow.rb +++ b/Library/Formula/trafshow.rb @@ -1,9 +1,11 @@ require 'formula' class Trafshow < Formula - url 'ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/trafshow-5.2.3.tgz' homepage 'http://soft.risp.ru/trafshow/index_en.shtml' - md5 '0b2f0bb23b7832138b7d841437b9e182' + url 'ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/trafshow-5.2.3.tgz' + sha1 '1c68f603f12357e932c83de850366c9b46e53d89' + + depends_on :libtool def patches files = %w[patch-domain_resolver.c patch-colormask.c patch-trafshow.c patch-trafshow.1 patch-configure] @@ -13,10 +15,24 @@ class Trafshow < Formula } end + def copy_libtool_files! + if MacOS.xcode_version >= "4.3" + s = Formula.factory('libtool').share + d = "#{s}/libtool/config" + cp ["#{d}/config.guess", "#{d}/config.sub"], "." + elsif MacOS.leopard? + cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config.*"], "." + else + cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config/config.*"], "." + end + end + def install - # Per MacPorts, to detect OS X as the system - system "cp /usr/share/libtool/config/config.* ." - system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--disable-slang" + copy_libtool_files! + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--prefix=#{prefix}", + "--disable-slang" system "make" bin.install "trafshow" |