Date: Wed, 3 Aug 2016 12:09:37 +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: r419511 - in head/Mk: . Uses Message-ID: <201608031209.u73C9brj057010@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Aug 3 12:09:37 2016 New Revision: 419511 URL: https://svnweb.freebsd.org/changeset/ports/419511 Log: 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 Modified: head/Mk/Uses/bdb.mk head/Mk/Uses/firebird.mk head/Mk/Uses/fortran.mk head/Mk/Uses/ghostscript.mk head/Mk/Uses/lua.mk head/Mk/Uses/mysql.mk head/Mk/Uses/perl5.mk head/Mk/Uses/pgsql.mk head/Mk/Uses/php.mk head/Mk/Uses/python.mk head/Mk/Uses/ssl.mk head/Mk/Uses/tcl.mk head/Mk/bsd.apache.mk (contents, props changed) head/Mk/bsd.fpc.mk (contents, props changed) head/Mk/bsd.gcc.mk (contents, props changed) head/Mk/bsd.port.mk (contents, props changed) head/Mk/bsd.ruby.mk (contents, props changed) Modified: head/Mk/Uses/bdb.mk ============================================================================== --- head/Mk/Uses/bdb.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/bdb.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -65,8 +65,6 @@ WARNING+= "WITH_BDB_VER is deprecated an BDB_DEFAULT:=${WITH_BDB_VER} .endif -.include "${PORTSDIR}/Mk/bsd.default-versions.mk" - _BDB_DEFAULT_save:=${BDB_DEFAULT} _DB_PORTS= 48 5 6 Modified: head/Mk/Uses/firebird.mk ============================================================================== --- head/Mk/Uses/firebird.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/firebird.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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} Modified: head/Mk/Uses/fortran.mk ============================================================================== --- head/Mk/Uses/fortran.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/fortran.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/Uses/ghostscript.mk ============================================================================== --- head/Mk/Uses/ghostscript.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/ghostscript.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/Uses/lua.mk ============================================================================== --- head/Mk/Uses/lua.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/lua.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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} Modified: head/Mk/Uses/mysql.mk ============================================================================== --- head/Mk/Uses/mysql.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/mysql.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/perl5.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/Uses/pgsql.mk ============================================================================== --- head/Mk/Uses/pgsql.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/pgsql.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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} Modified: head/Mk/Uses/php.mk ============================================================================== --- head/Mk/Uses/php.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/php.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/python.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/Uses/ssl.mk ============================================================================== --- head/Mk/Uses/ssl.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/ssl.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/Uses/tcl.mk ============================================================================== --- head/Mk/Uses/tcl.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/Uses/tcl.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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} Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/bsd.apache.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/bsd.fpc.mk ============================================================================== --- head/Mk/bsd.fpc.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/bsd.fpc.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/bsd.gcc.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/bsd.port.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -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 ',' Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Wed Aug 3 11:34:19 2016 (r419510) +++ head/Mk/bsd.ruby.mk Wed Aug 3 12:09:37 2016 (r419511) @@ -128,8 +128,6 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.or # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608031209.u73C9brj057010>