Fri Jul 27 13:20:26 2012 UTC ()
Sync with net/libfetch/options.mk so that the bundled libfetch can be
correctly built without SSL support.


(jperkin)
diff -r1.2 -r1.3 pkgsrc/pkgtools/pkg_install/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/pkg_install/options.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/options.mk 2012/06/12 15:46:02 1.2
+++ pkgsrc/pkgtools/pkg_install/options.mk 2012/07/27 13:20:26 1.3
@@ -1,13 +1,27 @@ @@ -1,13 +1,27 @@
1# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:02 wiz Exp $ 1# $NetBSD: options.mk,v 1.3 2012/07/27 13:20:26 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libfetch 3PKG_OPTIONS_VAR= PKG_OPTIONS.libfetch
4PKG_SUPPORTED_OPTIONS= inet6 4PKG_SUPPORTED_OPTIONS= inet6 openssl
5PKG_SUGGESTED_OPTIONS= inet6 5PKG_SUGGESTED_OPTIONS= inet6
6 6
 7.include "../../security/openssl/builtin.mk"
 8
 9.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 10PKG_SUGGESTED_OPTIONS+= openssl
 11.endif
 12
7.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
8 14
9.if !empty(PKG_OPTIONS:Minet6) 15.if !empty(PKG_OPTIONS:Minet6)
10MAKE_ENV+= FETCH_WITH_INET6=yes 16MAKE_ENV+= FETCH_WITH_INET6=yes
11.else 17.else
12MAKE_ENV+= FETCH_WITH_INET6=no 18MAKE_ENV+= FETCH_WITH_INET6=no
13.endif 19.endif
 20
 21.if !empty(PKG_OPTIONS:Mopenssl)
 22MAKE_ENV+= FETCH_WITH_OPENSSL=yes
 23
 24.include "../../security/openssl/buildlink3.mk"
 25.else
 26MAKE_ENV+= FETCH_WITH_OPENSSL=no
 27.endif