From ca09a39655bfc4f79b97edb632316c4ad679f096 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Fri, 5 Dec 2014 02:09:14 +0000 Subject: irssi: perl fix A few things here: * Irssi defaults to using OpenSSL now, so our ``` —enable-ssl ``` argument was getting ignored and Irssi was hooking into the system OpenSSL regardless. I’ve changed the dep to recommended, and fixed the configure switch. Revision to deal with the system OpenSSL tapping. * The Perl element has gone completely rogue. See #34685 for discussion & problem. * An optional dependency on Dante so people can roll the whole SOCKS support if they so desire. It looks for the libs Dante ships, but it doesn’t firmly depend on them, so optional. Closes #34692. Signed-off-by: Mike McQuaid --- Library/Formula/irssi.rb | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/irssi.rb b/Library/Formula/irssi.rb index 9327eb611..581e8309d 100644 --- a/Library/Formula/irssi.rb +++ b/Library/Formula/irssi.rb @@ -4,6 +4,7 @@ class Irssi < Formula homepage "http://irssi.org/" url "http://irssi.org/files/irssi-0.8.17.tar.bz2" sha1 "3bdee9a1c1f3e99673143c275d2c40275136664a" + revision 1 bottle do sha1 "cf15f3d0cadb37218e164250c44d78b4c892d177" => :mavericks @@ -15,7 +16,8 @@ class Irssi < Formula depends_on "pkg-config" => :build depends_on "glib" - depends_on "openssl" => :optional + depends_on "openssl" => :recommended + depends_on "dante" => :optional # Fix Perl build flags and paths in man page patch :DATA @@ -24,26 +26,23 @@ class Irssi < Formula args = %W[ --disable-dependency-tracking --prefix=#{prefix} - --sysconfdir=#{etc} + --sysconfdir=#{etc}/irssi --with-bot --with-proxy --enable-ipv6 --enable-true-color --with-socks + --with-perl=no --with-ncurses=#{MacOS.sdk_path}/usr ] - if build.with? "perl" - args << "--with-perl=yes" - args << "--with-perl-lib=#{lib}/perl5/site_perl" - else - args << "--with-perl=no" - end - - args << "--enable-ssl" if build.with? "openssl" + args << "--disable-ssl" if build.without? "openssl" + # It'd be nice to stick Perl support back in at some point but right now + # even explicitly setting a Perl libdir gets ignored by configure + # and it attempts to dump things in $HOME, causing permission hell. See: + # https://github.com/Homebrew/homebrew/issues/34685 system "./configure", *args - # "make" and "make install" must be done separately on some systems system "make" system "make", "install" -- cgit v1.2.3