bbftp-client: fix openssl linkage

Fixes the OpenSSL system linkage, inserts a dirty dirty patch to enable
compile on Yosemite and fixed the style nits.

Closes #35846.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

1 files changed, 91 insertions, 8 deletions

diff --git a/Library/Formula/bbftp-client.rb b/Library/Formula/bbftp-client.rb
index 26c3175ba..98b6624dd 100644
--- a/Library/Formula/bbftp-client.rb
+++ b/Library/Formula/bbftp-client.rb
@@ -1,15 +1,20 @@
-require 'formula'
-
 class BbftpClient < Formula
-  homepage 'http://doc.in2p3.fr/bbftp/'
-  url 'http://doc.in2p3.fr/bbftp/dist/bbftp-client-3.2.1.tar.gz'
-  sha1 '26113782b8826610c877f83bdaf79798b30a507d'
+  homepage "http://doc.in2p3.fr/bbftp/"
+  url "http://doc.in2p3.fr/bbftp/dist/bbftp-client-3.2.1.tar.gz"
+  sha1 "26113782b8826610c877f83bdaf79798b30a507d"
+  revision 1
+
+  depends_on "openssl"
+
+  # Dirty patch to fix ntohll errors on Yosemite.
+  # Reported upstream on 14/01/2015.
+  patch :DATA if MacOS.version >= :yosemite
 
   def install
-    cd 'bbftpc' do
+    cd "bbftpc" do
       system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                            "--prefix=#{prefix}"
-      system "make install"
+                            "--with-ssl=#{Formula["openssl"].opt_prefix}", "--prefix=#{prefix}"
+      system "make", "install"
     end
   end
 
@@ -17,3 +22,81 @@ class BbftpClient < Formula
     system "#{bin}/bbftp", "-v"
   end
 end
+
+__END__
+
+diff --git a/bbftpc/bbftp_get.c b/bbftpc/bbftp_get.c
+index 96c8d35..b1cd2e3 100644
+--- a/bbftpc/bbftp_get.c
++++ b/bbftpc/bbftp_get.c
+@@ -94,9 +94,9 @@ extern  int     nbport ;
+ extern  int     state ;
+ extern  int     protocol ;
+
+-#ifndef HAVE_NTOHLL
+-my64_t ntohll(my64_t v) ;
+-#endif
++// #ifndef HAVE_NTOHLL
++// my64_t ntohll(my64_t v) ;
++// #endif
+
+ int bbftp_get(char *remotefilename,int  *errcode)
+ {
+
+diff --git a/bbftpc/bbftp_put.c b/bbftpc/bbftp_put.c
+index 53c9919..b633ceb 100644
+--- a/bbftpc/bbftp_put.c
++++ b/bbftpc/bbftp_put.c
+@@ -96,9 +96,9 @@ extern  int     state ;
+ extern  int     simulation_mode ;
+ extern  int     protocol ;
+
+-#ifndef HAVE_NTOHLL
+-my64_t ntohll(my64_t v) ;
+-#endif
++// #ifndef HAVE_NTOHLL
++// my64_t ntohll(my64_t v) ;
++// #endif
+
+ int bbftp_put(char *remotefilename,int  *errcode)
+ {
+
+diff --git a/bbftpc/bbftp_utils.c b/bbftpc/bbftp_utils.c
+index 40d5f9e..7143903 100644
+--- a/bbftpc/bbftp_utils.c
++++ b/bbftpc/bbftp_utils.c
+@@ -82,20 +82,20 @@ my64_t convertlong(my64_t v) {
+     return tmp64 ;
+ }
+
+-#ifndef HAVE_NTOHLL
+-my64_t ntohll(my64_t v) {
+-#ifdef HAVE_BYTESWAP_H
+-    return bswap_64(v);
+-#else
+-    long lo = v & 0xffffffff;
+-    long hi = v >> 32U;
+-    lo = ntohl(lo);
+-    hi = ntohl(hi);
+-    return ((my64_t) lo) << 32U | hi;
+-#endif
+-}
+-#define htonll ntohll
+-#endif
++// #ifndef HAVE_NTOHLL
++// my64_t ntohll(my64_t v) {
++// #ifdef HAVE_BYTESWAP_H
++//    return bswap_64(v);
++// #else
++//    long lo = v & 0xffffffff;
++//    long hi = v >> 32U;
++//    lo = ntohl(lo);
++//    hi = ntohl(hi);
++//    return ((my64_t) lo) << 32U | hi;
++// #endif
++// }
++// #define htonll ntohll
++// #endif
+
+ void printmessage(FILE *strm , int flag, int errcode, int tok, char *fmt, ...)
+ {