From 41641e297e29e03eb72fc02815f7a68da2169d16 Mon Sep 17 00:00:00 2001 From: obache Date: Mon, 3 Nov 2014 04:07:36 +0000 Subject: prevent unwanted hidden openssl detection. --- net/tnftp/options.mk | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/net/tnftp/options.mk b/net/tnftp/options.mk index 7729b43ad71..6c59b4f8112 100644 --- a/net/tnftp/options.mk +++ b/net/tnftp/options.mk @@ -1,11 +1,19 @@ -# $NetBSD: options.mk,v 1.5 2011/03/12 12:02:09 wiz Exp $ +# $NetBSD: options.mk,v 1.6 2014/11/03 04:07:36 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tnftp -PKG_SUPPORTED_OPTIONS= inet6 +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 +.endif + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msocks5) @@ -20,3 +28,11 @@ 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 -- cgit v1.2.3