 @@ -1,14 +1,14 @@
-# $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
 PKG_OPTIONS_OPTIONAL_GROUPS+=	socks
 PKG_OPTIONS_GROUP.socks=	socks5
 PKG_SUGGESTED_OPTIONS=		inet6
 CHECK_BUILTIN.openssl:=	yes
 .include "../../security/openssl/builtin.mk"
 CHECK_BUILTIN.openssl:=	no
 .if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 PKG_SUGGESTED_OPTIONS+=	ssl
 @@ -20,19 +20,19 @@ PKG_SUGGESTED_OPTIONS+=	ssl
 CONFIGURE_ARGS+=	--with-socks
 .include "../../net/socks5/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-socks
 .endif
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .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

 @@ -3140,29 +3140,29 @@ if test "${enable_editcomplete+set}" = s
 else
   opt_editcomplete=yes
 fi
 # Check whether --enable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then :
   enableval=$enable_ipv6; opt_ipv6=$enableval
 else
   opt_ipv6=yes
 fi
 # Check whether --enable-ssl was given.
 if test "${enable_ssl+set}" = set; then :
-  enableval=$enable_ssl; opt_ssl=$enableval
+  enableval=$enable_ssl; with_ssl=$enableval
 else
-  opt_ssl=auto
+  with_ssl=auto
 fi
 # Check whether --with-socks was given.
 if test "${with_socks+set}" = set; then :
   withval=$with_socks;
 else
   with_socks=auto
 fi
+#
 # Autoheader templates symbols.

 @@ -1,25 +1,25 @@
-#       $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.
 AC_INIT([tnftp], [20141104], [lukem@NetBSD.org])
 AC_PREREQ([2.69])
 AC_COPYRIGHT([
 Copyright (c) 1999-2014 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.4 $])
+AC_REVISION([$Revision: 1.5 $])
 AS_SHELL_SANITIZE()
 AC_CONFIG_SRCDIR([tnftp.h])
 AC_CONFIG_AUX_DIR([buildaux])
 AC_CONFIG_MACRO_DIR([buildaux])
 AC_CONFIG_HEADERS([tnftp_config.h])
 AC_CONFIG_LIBOBJ_DIR([libnetbsd])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules])
 AM_MAINTAINER_MODE()
+#
 @@ -31,28 +31,28 @@ AC_ARG_ENABLE([editcomplete],
                                [default=enabled]])],
               [opt_editcomplete=$enableval],
               [opt_editcomplete=yes])
 AC_ARG_ENABLE([ipv6],
               [AS_HELP_STRING([--enable-ipv6],
                               [enable IPv6 support (if your OS supports it)
                                [default=enabled]])],
               [opt_ipv6=$enableval],
               [opt_ipv6=yes])
 AC_ARG_ENABLE([ssl],
               [AS_HELP_STRING([--enable-ssl],
                               [enable SSL support (requires --with-openssl)
                                [default=auto]])],
-              [opt_ssl=$enableval],
+              [with_ssl=$enableval],
-              [opt_ssl=auto])
+              [with_ssl=auto])
 AC_ARG_WITH([socks],
             [AS_HELP_STRING([--with-socks],
                             [enable support for (Dante) SOCKS5 proxy
                              [default=auto]])],
             [],
             [with_socks=auto])
+#
 # Autoheader templates symbols.
+#
 AH_TEMPLATE([HAVE_POLL],
             [Define if we have poll() and it is not emulated.])
 AH_TEMPLATE([HAVE_PRINTF_QD],