diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2018-01-09 07:40:55 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2018-01-09 07:40:55 +0000 |
| commit | bb5196a1496272ccd5cd26d76c34926a2c5e1a60 (patch) | |
| tree | 3a9c2be4469b755e07de4bf2850a1b143ad46e2e /Mk/bsd.default-versions.mk | |
| parent | 52353e34b0d1b014946d1c5b38d9970101a2ba00 (diff) | |
| download | ports-bb5196a1496272ccd5cd26d76c34926a2c5e1a60.tar.gz ports-bb5196a1496272ccd5cd26d76c34926a2c5e1a60.zip | |
Remove support for variables that have been deprecated for a while.
variables deprecation revision
WITHOUT_NLS 2013-12-13 r336337
WITH_/WITHOUT_ 2014-02-24 r345870
NOPORT(DOC|EXAMPLE)S 2014-04-19 r351587
WITH_BDB_VER 2016-05-02 r414444
OVERRIDE_LINUX_BASE_PORT 2016-09-05 r421387
WITH_OPENSSL_(BASE|PORT) 2016-06-16 r416965
While there, add an ERROR variable that works like DEV_ERROR, but for
user facing errors, and move NOPORTDOCS,
NOPORTEXAMPLES and WITHOUT_NLS to it.
Cleanup bsd.sanity.mk a bit.
Fix fallout.
PR: 224613
Submitted by: mat
Exp-run by: antoine
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D13490
Notes
Notes:
svn path=/head/; revision=458513
Diffstat (limited to 'Mk/bsd.default-versions.mk')
| -rw-r--r-- | Mk/bsd.default-versions.mk | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 0dda7f38efbe..e91196807bbd 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -18,8 +18,7 @@ LOCALBASE?= /usr/local .for lang in APACHE BDB FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA MYSQL \ PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK .if defined(${lang}_DEFAULT) -WARNING+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" -WARNING+= "This behaviour has never been supported and will be removed on 2017-01-31" +ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" .endif #.undef ${lang}_DEFAULT .endfor @@ -50,10 +49,6 @@ LINUX_DEFAULT?= c6_64 # Possible values: c6 LINUX_DEFAULT?= c6 .endif -.if defined(OVERRIDE_LINUX_BASE_PORT) -LINUX_DEFAULT:= ${OVERRIDE_LINUX_BASE_PORT} -WARNING+= "OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}." -.endif # Possible values: 5.1, 5.2, 5.3 LUA_DEFAULT?= 5.2 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 5.5p, 5.6p, 5.7p, 5.6w @@ -91,20 +86,7 @@ SAMBA_DEFAULT?= 4.6 .if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version # but give an installed port preference over it. -. if defined(WITH_OPENSSL_PORT) -. if defined(OPENSSL_PORT) -SSL_DEFAULT:=${OPENSSL_PORT:T} -WARNING+= "Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is deprecated, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} in your make.conf" -. else -SSL_DEFAULT=openssl -WARNING+= "Using WITH_OPENSSL_PORT in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=openssl in your make.conf" -. endif -. elif defined(WITH_OPENSSL_BASE) -SSL_DEFAULT=base -WARNING+= "Using WITH_OPENSSL_BASE in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=base in your make.conf" -. elif !defined(WITH_OPENSSL_BASE) && \ - !defined(WITH_OPENSSL_PORT) && \ - !defined(SSL_DEFAULT) && \ +. if !defined(SSL_DEFAULT) && \ !exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \ exists(${DESTDIR}/usr/include/openssl/opensslv.h) SSL_DEFAULT= base |