[Lunar-commits] <moonbase> lftp: made it alias-aware and moved nls completely to CONFIGURE

[Auke Kok]

commit 788b7c3f4054bdd9f1cafb6ea5f7d2d05067fa82
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Mon Feb 7 23:46:23 2011 +0100

    lftp: made it alias-aware and moved nls completely to CONFIGURE
---
 ftp/lftp/BUILD     |   19 +++++++++++++------
 ftp/lftp/CONFIGURE |    5 ++++-
 ftp/lftp/DEPENDS   |    4 ++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ftp/lftp/BUILD b/ftp/lftp/BUILD
index 93328d5..4fd421e 100644
--- a/ftp/lftp/BUILD
+++ b/ftp/lftp/BUILD
@@ -1,10 +1,17 @@
 (
-  
-  if [ "$CONFIG_NLS" == "n" ]; then
-    OPTS+=" --disable-nls"
+
+  # get the alias
+  SSL=`unalias %SSL` &&
+
+  # setting the ssl option
+  if [[ $SSL == "openssl" ]] && module_installed "openssl" ; then
+        OPTS+=" --with-openssl --without-gnutls"
+  elif [[ $SSL == "gnutls" ]] && module_installed "gnutls" ; then
+        OPTS+=" --with-gnutls --without-openssl"
   else
-    OPTS+=" --enable-nls"
-  fi
+        OPTS+=" --without-openssl --without-gnutls"
+  fi &&
+
   default_build
-              
+
 ) > $C_FIFO 2>&1
diff --git a/ftp/lftp/CONFIGURE b/ftp/lftp/CONFIGURE
index 8786543..bc8605a 100644
--- a/ftp/lftp/CONFIGURE
+++ b/ftp/lftp/CONFIGURE
@@ -1 +1,4 @@
-mquery CONFIG_NLS "Do you want NLS enabled?" n
+mquery CONFIG_NLS "Do you want NLS enabled?" \
+                  n                          \
+                  "--enable-nls"             \
+                  "--disable-nls"
diff --git a/ftp/lftp/DEPENDS b/ftp/lftp/DEPENDS
index c605eb0..4deb74b 100644
--- a/ftp/lftp/DEPENDS
+++ b/ftp/lftp/DEPENDS
@@ -1,5 +1,5 @@
 depends ncurses
 depends readline
+depends expat
 
-optional_depends "openssl" "--with-openssl" "--without-openssl" "for SSL https and ftps support"
-optional_depends "gnutls"  "--with-gnutls"  "--without-gnutls"  "for TLS https and ftps support"
+optional_depends "%SSL" "" "" "for ftps support"