Index: Mk/bsd.default-versions.mk =================================================================== --- Mk/bsd.default-versions.mk +++ Mk/bsd.default-versions.mk @@ -84,18 +84,26 @@ SSL_DEFAULT= base . else . if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) +. if defined(PKG_BIN) # find installed port and use it for dependency -. if !defined(OPENSSL_INSTALLED) -. if defined(DESTDIR) +. if !defined(OPENSSL_INSTALLED) +. if defined(DESTDIR) PKGARGS= -c ${DESTDIR} -. else +. else PKGARGS= -. endif +. endif OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || : -. endif -. if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED) +. endif +. if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED) SSL_DEFAULT:= ${OPENSSL_INSTALLED:T} WARNING+= "You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf" +. endif +. else +check-makevars:: + @${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable" + @${ECHO_MSG} "to determine what port it comes from." + @${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl= to your /etc/make.conf and try again." + @${FALSE} . endif . endif . endif Index: ftp/curl/Makefile =================================================================== --- ftp/curl/Makefile +++ ftp/curl/Makefile @@ -32,8 +32,9 @@ TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support LOCALBASE?= /usr/local +.include <${.CURDIR}/../../Mk/bsd.default-versions.mk> -.if exists(${LOCALBASE}/lib/libcrypto.so) +.if ${SSL_DEFAULT} != base OPTIONS_DEFAULT+= GSSAPI_NONE .else OPTIONS_DEFAULT+= GSSAPI_BASE