[Lunar-commits] <moonbase-core> lftp: let lunar internals handle dependency aliases

[Stefan Wold]

commit 77f61f1594afa06aca76b6e4b1dd945d9be12e21
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Thu, 07 Aug 2014 19:50:46 +0200
URL: https://github.com/lunar-linux/moonbase-core/commit/77f61f1594afa06aca76b6e4b1dd945d9be12e21

lftp: let lunar internals handle dependency aliases

in_depends() is future proof and handle expansion of aliases already.
Changed CONFIG_NLS to default to y.
---
  ftp/lftp/BUILD     | +10/-20   
  ftp/lftp/CONFIGURE | +1/-1     
  2 files changed, 11 insertions(+), 21 deletions(-)

--- a/ftp/lftp/BUILD
+++ b/ftp/lftp/BUILD
@@ -1,20 +1,10 @@
-(
-
-  # fix compiling with glibc 2.16.0
-  sedit '/gets is a security hole/d' lib/stdio.in.h  &&
-
-  # 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+=" --without-openssl --without-gnutls"
-  fi &&
-
-  default_build
-
-) > $C_FIFO 2>&1
+# setting the ssl option
+if in_depends $MODULE openssl && module_installed "openssl" ; then
+  OPTS+=" --with-openssl --without-gnutls"
+elif in_depends $MODULE gnutls && module_installed "gnutls" ; then
+  OPTS+=" --with-gnutls --without-openssl"
+else
+  OPTS+=" --without-openssl --without-gnutls"
+fi &&
+
+default_build
--- a/ftp/lftp/CONFIGURE
+++ b/ftp/lftp/CONFIGURE
@@ -1,4 +1,4 @@
 mquery CONFIG_NLS "Do you want NLS enabled?" \
-                  n                          \
+                  y                          \
                   "--enable-nls"             \
                   "--disable-nls"