[pkgsrc/trunk]: pkgsrc/net/tnftp Revert "ssl" option handling changes.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8aee9596ec27
branches:  trunk
changeset: 645673:8aee9596ec27
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Feb 01 08:58:52 2015 +0000

description:
Revert "ssl" option handling changes.

"configure fix patch" was sent to MAINTAINER, but not approved yet.
Moreover, this package is a part of bootstrap dependency, so changes must be
proposed/discussed first.

diffstat:

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

diffs (82 lines):

diff -r 13d22d895c0f -r 8aee9596ec27 net/tnftp/files/configure
--- a/net/tnftp/files/configure Sun Feb 01 08:53:24 2015 +0000
+++ b/net/tnftp/files/configure Sun Feb 01 08:58:52 2015 +0000
@@ -3150,9 +3150,9 @@
 
 # Check whether --enable-ssl was given.
 if test "${enable_ssl+set}" = set; then :
-  enableval=$enable_ssl; with_ssl=$enableval
-else
-  with_ssl=auto
+  enableval=$enable_ssl; opt_ssl=$enableval
+else
+  opt_ssl=auto
 fi
 
 
diff -r 13d22d895c0f -r 8aee9596ec27 net/tnftp/files/configure.ac
--- a/net/tnftp/files/configure.ac      Sun Feb 01 08:53:24 2015 +0000
+++ b/net/tnftp/files/configure.ac      Sun Feb 01 08:58:52 2015 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: configure.ac,v 1.5 2015/01/19 11:15:37 obache Exp $
+#       $NetBSD: configure.ac,v 1.6 2015/02/01 08:58:52 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.5 $])
+AC_REVISION([$Revision: 1.6 $])
 
 AS_SHELL_SANITIZE()
 
@@ -41,8 +41,8 @@
               [AS_HELP_STRING([--enable-ssl],
                               [enable SSL support (requires --with-openssl)
                                [default=auto]])],
-              [with_ssl=$enableval],
-              [with_ssl=auto])
+              [opt_ssl=$enableval],
+              [opt_ssl=auto])
 AC_ARG_WITH([socks],
             [AS_HELP_STRING([--with-socks],
                             [enable support for (Dante) SOCKS5 proxy
diff -r 13d22d895c0f -r 8aee9596ec27 net/tnftp/options.mk
--- a/net/tnftp/options.mk      Sun Feb 01 08:53:24 2015 +0000
+++ b/net/tnftp/options.mk      Sun Feb 01 08:58:52 2015 +0000
@@ -1,19 +1,11 @@
-# $NetBSD: options.mk,v 1.8 2015/01/19 11:15:37 obache Exp $
+# $NetBSD: options.mk,v 1.9 2015/02/01 08:58:52 obache Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tnftp
-PKG_SUPPORTED_OPTIONS=         inet6 ssl
+PKG_SUPPORTED_OPTIONS=         inet6
 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
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msocks5)
@@ -28,11 +20,3 @@
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=       --enable-ssl
-.include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
-.else
-CONFIGURE_ARGS+=       --disable-ssl
-.endif