mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
Always include bsd.default-versions.mk in bsd.port.mk.
The variable defined in it are now always available after including bsd.port.pre.mk. PR: 210666 Submitted by: mat Exp-run by: antoine Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D6933
This commit is contained in:
parent
2b1689ae8a
commit
0761532ec5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=419511
@ -65,8 +65,6 @@ WARNING+= "WITH_BDB_VER is deprecated and will be removed on 2016-08-01. Use DEF
|
|||||||
BDB_DEFAULT:=${WITH_BDB_VER}
|
BDB_DEFAULT:=${WITH_BDB_VER}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
_BDB_DEFAULT_save:=${BDB_DEFAULT}
|
_BDB_DEFAULT_save:=${BDB_DEFAULT}
|
||||||
|
|
||||||
_DB_PORTS= 48 5 6
|
_DB_PORTS= 48 5 6
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
.if !defined(_INCLUDE_USES_FIREBIRD_MK)
|
.if !defined(_INCLUDE_USES_FIREBIRD_MK)
|
||||||
_INCLUDE_USES_FIREBIRD_MK= yes
|
_INCLUDE_USES_FIREBIRD_MK= yes
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
.if !empty(firebird_ARGS)
|
.if !empty(firebird_ARGS)
|
||||||
FIREBIRD_VER= ${firebird_ARGS}
|
FIREBIRD_VER= ${firebird_ARGS}
|
||||||
|
@ -16,7 +16,6 @@ fortran_ARGS= gcc
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${fortran_ARGS} == gcc
|
.if ${fortran_ARGS} == gcc
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
_GCC_VER= ${GCC_DEFAULT:S/.//}
|
_GCC_VER= ${GCC_DEFAULT:S/.//}
|
||||||
.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
|
.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
|
||||||
BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
|
BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
|
||||||
|
@ -38,9 +38,6 @@ _GS_ARGS= ${ghostscript_ARGS}
|
|||||||
IGNORE?= Unknown ghostscript argument ${_GS_ARGS}
|
IGNORE?= Unknown ghostscript argument ${_GS_ARGS}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Determine version number of Ghostscript to use
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
.if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl}
|
.if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl}
|
||||||
IGNORE?= Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
|
IGNORE?= Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
|
||||||
.endif
|
.endif
|
||||||
|
@ -14,7 +14,6 @@ _INCLUDE_USES_LUA_MK= yes
|
|||||||
# Mk/bsd.default-versions.mk in sync.
|
# Mk/bsd.default-versions.mk in sync.
|
||||||
_LUA_VALID_VERSIONS= 53 52 51
|
_LUA_VALID_VERSIONS= 53 52 51
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
_LUA_DEFAULT_VERSION= ${LUA_DEFAULT:S/.//}
|
_LUA_DEFAULT_VERSION= ${LUA_DEFAULT:S/.//}
|
||||||
.if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}}
|
.if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}}
|
||||||
IGNORE= Invalid lua version ${LUA_DEFAULT}
|
IGNORE= Invalid lua version ${LUA_DEFAULT}
|
||||||
|
@ -26,8 +26,6 @@
|
|||||||
.if !defined(_INCLUDE_USES_MYSQL_MK)
|
.if !defined(_INCLUDE_USES_MYSQL_MK)
|
||||||
_INCLUDE_USES_MYSQL_MK= yes
|
_INCLUDE_USES_MYSQL_MK= yes
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
.if !empty(mysql_ARGS)
|
.if !empty(mysql_ARGS)
|
||||||
.undef _WANT_MYSQL_VER
|
.undef _WANT_MYSQL_VER
|
||||||
.undef _WANT_MYSQL_SERVER
|
.undef _WANT_MYSQL_SERVER
|
||||||
|
@ -51,7 +51,6 @@ THIS_IS_OLD_PERL= yes
|
|||||||
# end of remove
|
# end of remove
|
||||||
# When adding a version, please keep the comment in
|
# When adding a version, please keep the comment in
|
||||||
# Mk/bsd.default-versions.mk in sync.
|
# Mk/bsd.default-versions.mk in sync.
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
.if ${PERL5_DEFAULT} == 5.18
|
.if ${PERL5_DEFAULT} == 5.18
|
||||||
.include "${PORTSDIR}/lang/perl5.18/version.mk"
|
.include "${PORTSDIR}/lang/perl5.18/version.mk"
|
||||||
.elif ${PERL5_DEFAULT} == 5.20
|
.elif ${PERL5_DEFAULT} == 5.20
|
||||||
|
@ -43,8 +43,6 @@ PGSQL_LIBVER= 5
|
|||||||
PGSQL$v_LIBVER?= ${PGSQL_LIBVER}
|
PGSQL$v_LIBVER?= ${PGSQL_LIBVER}
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
.for v in ${PGSQL_DEFAULT}
|
.for v in ${PGSQL_DEFAULT}
|
||||||
. if ! ${VALID_PGSQL_VER:M$v}
|
. if ! ${VALID_PGSQL_VER:M$v}
|
||||||
IGNORE= Invalid PGSQL default version ${PGSQL_DEFAULT}; valid versions are ${VALID_PGSQL_VER}
|
IGNORE= Invalid PGSQL default version ${PGSQL_DEFAULT}; valid versions are ${VALID_PGSQL_VER}
|
||||||
|
@ -38,8 +38,6 @@ PHP_Include_MAINTAINER= ale@FreeBSD.org
|
|||||||
|
|
||||||
_INCLUDE_USES_PHP_MK= yes
|
_INCLUDE_USES_PHP_MK= yes
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
. if defined(DEFAULT_PHP_VER)
|
. if defined(DEFAULT_PHP_VER)
|
||||||
WARNING+= "DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead"
|
WARNING+= "DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead"
|
||||||
. endif
|
. endif
|
||||||
|
@ -260,9 +260,6 @@ _PYTHON_RUN_DEP= yes
|
|||||||
_PYTHON_TEST_DEP= yes
|
_PYTHON_TEST_DEP= yes
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Determine version number of Python to use
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
.if defined(PYTHON_DEFAULT_VERSION)
|
.if defined(PYTHON_DEFAULT_VERSION)
|
||||||
WARNING+= "PYTHON_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//} instead"
|
WARNING+= "PYTHON_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//} instead"
|
||||||
.endif
|
.endif
|
||||||
|
@ -32,8 +32,6 @@ _INCLUDE_USES_SSL_MK= yes
|
|||||||
IGNORE= "USES=ssl does not take any argument."
|
IGNORE= "USES=ssl does not take any argument."
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
.if ${SSL_DEFAULT} == base
|
.if ${SSL_DEFAULT} == base
|
||||||
OPENSSLBASE= /usr
|
OPENSSLBASE= /usr
|
||||||
OPENSSLDIR?= /etc/ssl
|
OPENSSLDIR?= /etc/ssl
|
||||||
|
@ -78,7 +78,6 @@ _TCLTK_VALID_VERSIONS= 84 85 86
|
|||||||
# Bring in the default and check that the specified version is in the list of
|
# Bring in the default and check that the specified version is in the list of
|
||||||
# valid versions.
|
# valid versions.
|
||||||
#
|
#
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
_TCLTK_DEFAULT_VERSION= ${TCLTK_DEFAULT:S/.//}
|
_TCLTK_DEFAULT_VERSION= ${TCLTK_DEFAULT:S/.//}
|
||||||
.if ! ${_TCLTK_VALID_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
|
.if ! ${_TCLTK_VALID_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
|
||||||
IGNORE= Invalid tcltk version ${TCLTK_DEFAULT}
|
IGNORE= Invalid tcltk version ${TCLTK_DEFAULT}
|
||||||
|
@ -85,8 +85,6 @@
|
|||||||
|
|
||||||
Apache_Pre_Include= bsd.apache.mk
|
Apache_Pre_Include= bsd.apache.mk
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
.if defined(DEFAULT_APACHE_VER)
|
.if defined(DEFAULT_APACHE_VER)
|
||||||
WARNING+= "DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSIONS+=apache=${DEFAULT_APACHE_VER} instead"
|
WARNING+= "DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSIONS+=apache=${DEFAULT_APACHE_VER} instead"
|
||||||
.endif
|
.endif
|
||||||
|
@ -30,8 +30,6 @@
|
|||||||
|
|
||||||
_FPCMKINCLUDED= yes
|
_FPCMKINCLUDED= yes
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
.if defined(DEFAULT_FPC_VER)
|
.if defined(DEFAULT_FPC_VER)
|
||||||
WARNING+= "DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
|
WARNING+= "DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
|
||||||
.endif
|
.endif
|
||||||
|
@ -31,8 +31,6 @@
|
|||||||
|
|
||||||
GCC_Include_MAINTAINER= gerald@FreeBSD.org
|
GCC_Include_MAINTAINER= gerald@FreeBSD.org
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
# All GCC versions supported by the ports framework. Keep them in
|
# All GCC versions supported by the ports framework. Keep them in
|
||||||
# ascending order and in sync with the table below.
|
# ascending order and in sync with the table below.
|
||||||
# When adding a version, please keep the comment in
|
# When adding a version, please keep the comment in
|
||||||
|
@ -1275,6 +1275,8 @@ WITH_DEBUG= yes
|
|||||||
|
|
||||||
_PREMKINCLUDED= yes
|
_PREMKINCLUDED= yes
|
||||||
|
|
||||||
|
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
||||||
|
|
||||||
.if defined(PORTVERSION)
|
.if defined(PORTVERSION)
|
||||||
.if ${PORTVERSION:M*[-_,]*}x != x
|
.if ${PORTVERSION:M*[-_,]*}x != x
|
||||||
IGNORE= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
|
IGNORE= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
|
||||||
|
@ -128,8 +128,6 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.org
|
|||||||
# RUBY_ELISPDIR - Installation path for emacs lisp files.
|
# RUBY_ELISPDIR - Installation path for emacs lisp files.
|
||||||
#
|
#
|
||||||
|
|
||||||
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
|
|
||||||
|
|
||||||
.if defined(RUBY_DEFAULT_VER)
|
.if defined(RUBY_DEFAULT_VER)
|
||||||
WARNING+= "RUBY_DEFAULT_VER is defined, consider using DEFAULT_VERSIONS=ruby=${RUBY_DEFAULT_VER} instead"
|
WARNING+= "RUBY_DEFAULT_VER is defined, consider using DEFAULT_VERSIONS=ruby=${RUBY_DEFAULT_VER} instead"
|
||||||
.endif
|
.endif
|
||||||
|
Loading…
Reference in New Issue
Block a user