pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/tnftp prevent unwanted hidden openssl detection.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8286ee536375
branches:  trunk
changeset: 641248:8286ee536375
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Nov 03 04:07:36 2014 +0000

description:
prevent unwanted hidden openssl detection.

diffstat:

 net/tnftp/options.mk |  20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 42706bdaa3c8 -r 8286ee536375 net/tnftp/options.mk
--- a/net/tnftp/options.mk      Mon Nov 03 03:20:31 2014 +0000
+++ b/net/tnftp/options.mk      Mon Nov 03 04:07:36 2014 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index