mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

Always include bsd.default-versions.mk in bsd.port.mk.

Browse Source 
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:
Mathieu Arnold 2016-08-03 12:09:37 +00:00
parent 2b1689ae8a
commit 0761532ec5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=419511
17 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk/Uses/bdb.mk
View File

@ -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}
.endif
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
_BDB_DEFAULT_save:=${BDB_DEFAULT}
_DB_PORTS= 48 5 6

1
Mk/Uses/firebird.mk
View File

@ -7,7 +7,6 @@
.if !defined(_INCLUDE_USES_FIREBIRD_MK)
_INCLUDE_USES_FIREBIRD_MK= yes
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if !empty(firebird_ARGS)
FIREBIRD_VER= ${firebird_ARGS}

1
Mk/Uses/fortran.mk
View File

@ -16,7 +16,6 @@ fortran_ARGS= gcc
.endif
.if ${fortran_ARGS} == gcc
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
_GCC_VER= ${GCC_DEFAULT:S/.//}
.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc

3
Mk/Uses/ghostscript.mk
View File

@ -38,9 +38,6 @@ _GS_ARGS= ${ghostscript_ARGS}
IGNORE?= Unknown ghostscript argument ${_GS_ARGS}
.endif
# Determine version number of Ghostscript to use
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl}
IGNORE?= Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
.endif

1
Mk/Uses/lua.mk
View File

@ -14,7 +14,6 @@ _INCLUDE_USES_LUA_MK= yes
# Mk/bsd.default-versions.mk in sync.
_LUA_VALID_VERSIONS= 53 52 51
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
_LUA_DEFAULT_VERSION= ${LUA_DEFAULT:S/.//}
.if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}}
IGNORE= Invalid lua version ${LUA_DEFAULT}

2
Mk/Uses/mysql.mk
View File

@ -26,8 +26,6 @@
.if !defined(_INCLUDE_USES_MYSQL_MK)
_INCLUDE_USES_MYSQL_MK= yes
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if !empty(mysql_ARGS)
.undef _WANT_MYSQL_VER
.undef _WANT_MYSQL_SERVER

1
Mk/Uses/perl5.mk
View File

@ -51,7 +51,6 @@ THIS_IS_OLD_PERL= yes
# end of remove
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if ${PERL5_DEFAULT} == 5.18
.include "${PORTSDIR}/lang/perl5.18/version.mk"
.elif ${PERL5_DEFAULT} == 5.20

2
Mk/Uses/pgsql.mk
View File

@ -43,8 +43,6 @@ PGSQL_LIBVER= 5
PGSQL$v_LIBVER?= ${PGSQL_LIBVER}
.endfor
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.for v in ${PGSQL_DEFAULT}
. if ! ${VALID_PGSQL_VER:M$v}
IGNORE= Invalid PGSQL default version ${PGSQL_DEFAULT}; valid versions are ${VALID_PGSQL_VER}

2
Mk/Uses/php.mk
View File

@ -38,8 +38,6 @@ PHP_Include_MAINTAINER= ale@FreeBSD.org
_INCLUDE_USES_PHP_MK= yes
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
. if defined(DEFAULT_PHP_VER)
WARNING+= "DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead"
. endif

3
Mk/Uses/python.mk
View File

@ -260,9 +260,6 @@ _PYTHON_RUN_DEP= yes
_PYTHON_TEST_DEP= yes
.endif
# Determine version number of Python to use
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if defined(PYTHON_DEFAULT_VERSION)
WARNING+= "PYTHON_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//} instead"
.endif

2
Mk/Uses/ssl.mk
View File

@ -32,8 +32,6 @@ _INCLUDE_USES_SSL_MK= yes
IGNORE= "USES=ssl does not take any argument."
.endif
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if ${SSL_DEFAULT} == base
OPENSSLBASE= /usr
OPENSSLDIR?= /etc/ssl

1
Mk/Uses/tcl.mk
View File

@ -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
# valid versions.
#
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
_TCLTK_DEFAULT_VERSION= ${TCLTK_DEFAULT:S/.//}
.if ! ${_TCLTK_VALID_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
IGNORE= Invalid tcltk version ${TCLTK_DEFAULT}

2
Mk/bsd.apache.mk
View File

@ -85,8 +85,6 @@
Apache_Pre_Include= bsd.apache.mk
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if defined(DEFAULT_APACHE_VER)
WARNING+= "DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSIONS+=apache=${DEFAULT_APACHE_VER} instead"
.endif

2
Mk/bsd.fpc.mk
View File

@ -30,8 +30,6 @@
_FPCMKINCLUDED= yes
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if defined(DEFAULT_FPC_VER)
WARNING+= "DEFAULT_FPC_VER is defined, consider using DEFAULT_VERSIONS=fpc=${DEFAULT_FPC_VER} instead"
.endif

2
Mk/bsd.gcc.mk
View File

@ -31,8 +31,6 @@
GCC_Include_MAINTAINER= gerald@FreeBSD.org
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
# All GCC versions supported by the ports framework. Keep them in
# ascending order and in sync with the table below.
# When adding a version, please keep the comment in

2
Mk/bsd.port.mk
View File

@ -1275,6 +1275,8 @@ WITH_DEBUG= yes
_PREMKINCLUDED= yes
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if defined(PORTVERSION)
.if ${PORTVERSION:M*[-_,]*}x != x
IGNORE= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','

2
Mk/bsd.ruby.mk
View File

@ -128,8 +128,6 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.org
# RUBY_ELISPDIR - Installation path for emacs lisp files.
#
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if defined(RUBY_DEFAULT_VER)
WARNING+= "RUBY_DEFAULT_VER is defined, consider using DEFAULT_VERSIONS=ruby=${RUBY_DEFAULT_VER} instead"
.endif