diff options
| author | mat <mat@FreeBSD.org> | 2016-06-23 18:19:02 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2016-06-23 18:19:02 +0800 |
| commit | 342b2aa3150a0dbda23825559aa1af1be540c980 (patch) | |
| tree | 79dc3c9729a57692ae9d181806747eed83bc90b6 /Mk/bsd.default-versions.mk | |
| parent | 5f6c41cb93a649a6cd82c3aa7319d71ef2308467 (diff) | |
| download | freebsd-ports-gnome-342b2aa3150a0dbda23825559aa1af1be540c980.tar.gz freebsd-ports-gnome-342b2aa3150a0dbda23825559aa1af1be540c980.tar.zst freebsd-ports-gnome-342b2aa3150a0dbda23825559aa1af1be540c980.zip | |
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
Diffstat (limited to 'Mk/bsd.default-versions.mk')
| -rw-r--r-- | Mk/bsd.default-versions.mk | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 4e286f8d8aa6..7b9424f07f09 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -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 make.conf is deprecated, replace it with D 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 |