diff options
| author | obache <obache> | 2015-02-01 08:58:52 +0000 |
|---|---|---|
| committer | obache <obache> | 2015-02-01 08:58:52 +0000 |
| commit | 17e312a1f22a33d2ec1cedb95939b2c61c2ac82c (patch) | |
| tree | b07411895f93d0e5556d49ef214c2dda1bc6aa57 /net | |
| parent | 7ae5dba75772994fc5a95bf9bf52a0b216b09dbe (diff) | |
| download | pkgsrc-17e312a1f22a33d2ec1cedb95939b2c61c2ac82c.tar.gz | |
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 (limited to 'net')
| -rwxr-xr-x | net/tnftp/files/configure | 4 | ||||
| -rw-r--r-- | net/tnftp/files/configure.ac | 8 | ||||
| -rw-r--r-- | net/tnftp/options.mk | 20 |
3 files changed, 8 insertions, 24 deletions
diff --git a/net/tnftp/files/configure b/net/tnftp/files/configure index ef0baa3a0da..f518841d6aa 100755 --- a/net/tnftp/files/configure +++ b/net/tnftp/files/configure @@ -3150,9 +3150,9 @@ fi # Check whether --enable-ssl was given. if test "${enable_ssl+set}" = set; then : - enableval=$enable_ssl; with_ssl=$enableval + enableval=$enable_ssl; opt_ssl=$enableval else - with_ssl=auto + opt_ssl=auto fi diff --git a/net/tnftp/files/configure.ac b/net/tnftp/files/configure.ac index 430fd98affc..abc011bebf2 100644 --- a/net/tnftp/files/configure.ac +++ b/net/tnftp/files/configure.ac @@ -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 @@ AC_COPYRIGHT([ 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 @@ AC_ARG_ENABLE([ssl], [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 --git a/net/tnftp/options.mk b/net/tnftp/options.mk index 1e592b6cf16..ded8b8c8b68 100644 --- a/net/tnftp/options.mk +++ b/net/tnftp/options.mk @@ -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 @@ CONFIGURE_ARGS+= --enable-ipv6 .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 |