Date: Thu, 23 Jun 2016 10:19:02 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417358 - in head: Mk ftp/curl Message-ID: <201606231019.u5NAJ2dg094369@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Jun 23 10:19:02 2016 New Revision: 417358 URL: https://svnweb.freebsd.org/changeset/ports/417358 Log: Make it possible to have bsd.default-versions.mk included before any other bsd.*.mk file. Restore the way ftp/curl was working before. With hat: portmgr Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D6921 Modified: head/Mk/bsd.default-versions.mk (contents, props changed) head/ftp/curl/Makefile (contents, props changed) Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Thu Jun 23 10:15:13 2016 (r417357) +++ head/Mk/bsd.default-versions.mk Thu Jun 23 10:19:02 2016 (r417358) @@ -13,6 +13,8 @@ .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK) _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes +LOCALBASE?= /usr/local + .for lang in ${DEFAULT_VERSIONS} _l= ${lang:C/=.*//g} ${_l:tu}_DEFAULT= ${lang:C/.*=//g} @@ -84,18 +86,26 @@ WARNING+= "Using WITH_OPENSSL_BASE in ma 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=<openssl package name> to your /etc/make.conf and try again." + @${FALSE} . endif . endif . endif Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Thu Jun 23 10:15:13 2016 (r417357) +++ head/ftp/curl/Makefile Thu Jun 23 10:19:02 2016 (r417358) @@ -31,9 +31,9 @@ RESOLV_DESC= DNS resolving options THREADED_RESOLVER_DESC= Threaded DNS resolver 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606231019.u5NAJ2dg094369>