[pkgsrc/trunk]: pkgsrc/net/tnftp fixes broken "ssl" configure option behavior.

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/525c27e243f3
branches:  trunk
changeset: 644902:525c27e243f3
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Jan 19 11:15:37 2015 +0000

description:
fixes broken "ssl" configure option behavior.

diffstat:

 net/tnftp/files/configure    |  6 +++---
 net/tnftp/files/configure.ac |  8 ++++----
 net/tnftp/options.mk         |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (66 lines):

diff -r 01a9cff3114b -r 525c27e243f3 net/tnftp/files/configure
--- a/net/tnftp/files/configure Mon Jan 19 02:15:55 2015 +0000
+++ b/net/tnftp/files/configure Mon Jan 19 11:15:37 2015 +0000
@@ -3150,9 +3150,9 @@
 
 # Check whether --enable-ssl was given.
 if test "${enable_ssl+set}" = set; then :
-  enableval=$enable_ssl; opt_ssl=$enableval
-else
-  opt_ssl=auto
+  enableval=$enable_ssl; with_ssl=$enableval
+else
+  with_ssl=auto
 fi
 
 
diff -r 01a9cff3114b -r 525c27e243f3 net/tnftp/files/configure.ac
--- a/net/tnftp/files/configure.ac      Mon Jan 19 02:15:55 2015 +0000
+++ b/net/tnftp/files/configure.ac      Mon Jan 19 11:15:37 2015 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: configure.ac,v 1.4 2014/11/04 22:38:26 agc Exp $
+#       $NetBSD: configure.ac,v 1.5 2015/01/19 11:15:37 obache Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@
 Copyright (c) 1999-2014 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.4 $])
+AC_REVISION([$Revision: 1.5 $])
 
 AS_SHELL_SANITIZE()
 
@@ -41,8 +41,8 @@
               [AS_HELP_STRING([--enable-ssl],
                               [enable SSL support (requires --with-openssl)
                                [default=auto]])],
-              [opt_ssl=$enableval],
-              [opt_ssl=auto])
+              [with_ssl=$enableval],
+              [with_ssl=auto])
 AC_ARG_WITH([socks],
             [AS_HELP_STRING([--with-socks],
                             [enable support for (Dante) SOCKS5 proxy
diff -r 01a9cff3114b -r 525c27e243f3 net/tnftp/options.mk
--- a/net/tnftp/options.mk      Mon Jan 19 02:15:55 2015 +0000
+++ b/net/tnftp/options.mk      Mon Jan 19 11:15:37 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2014/12/21 09:11:40 obache Exp $
+# $NetBSD: options.mk,v 1.8 2015/01/19 11:15:37 obache Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tnftp
 PKG_SUPPORTED_OPTIONS=         inet6 ssl
@@ -30,9 +30,9 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=       --with-ssl=yes
+CONFIGURE_ARGS+=       --enable-ssl
 .include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
 .else
-CONFIGURE_ARGS+=       --with-ssl=no
+CONFIGURE_ARGS+=       --disable-ssl
 .endif