aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/bdb.mk2
-rw-r--r--Mk/Uses/firebird.mk1
-rw-r--r--Mk/Uses/fortran.mk1
-rw-r--r--Mk/Uses/ghostscript.mk3
-rw-r--r--Mk/Uses/lua.mk1
-rw-r--r--Mk/Uses/mysql.mk2
-rw-r--r--Mk/Uses/perl5.mk1
-rw-r--r--Mk/Uses/pgsql.mk2
-rw-r--r--Mk/Uses/php.mk2
-rw-r--r--Mk/Uses/python.mk3
-rw-r--r--Mk/Uses/ssl.mk2
-rw-r--r--Mk/Uses/tcl.mk1
-rw-r--r--Mk/bsd.apache.mk2
-rw-r--r--Mk/bsd.fpc.mk2
-rw-r--r--Mk/bsd.gcc.mk2
-rw-r--r--Mk/bsd.port.mk2
-rw-r--r--Mk/bsd.ruby.mk2
17 files changed, 2 insertions, 29 deletions
diff --git a/Mk/Uses/bdb.mk b/Mk/Uses/bdb.mk
index 3b87200ac3f6..3f3839abdd71 100644
--- a/Mk/Uses/bdb.mk
+++ b/Mk/Uses/bdb.mk
@@ -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
diff --git a/Mk/Uses/firebird.mk b/Mk/Uses/firebird.mk
index 07437f3a1a71..49eb5c4462a4 100644
--- a/Mk/Uses/firebird.mk
+++ b/Mk/Uses/firebird.mk
@@ -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}
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk
index 751b22d1044a..9265e1e509ce 100644
--- a/Mk/Uses/fortran.mk
+++ b/Mk/Uses/fortran.mk
@@ -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
diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk
index 28ac66f2d18c..925729bcdf01 100644
--- a/Mk/Uses/ghostscript.mk
+++ b/Mk/Uses/ghostscript.mk
@@ -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
diff --git a/Mk/Uses/lua.mk b/Mk/Uses/lua.mk
index 7bc11f1f50bb..98f3647dd1f9 100644
--- a/Mk/Uses/lua.mk
+++ b/Mk/Uses/lua.mk
@@ -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}
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index 548802a1bb3b..b8a40eb34ab7 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -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
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index c8dc83aa2502..8d3b0b7eadce 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -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
diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index d72a8b4005ed..f5fde3e5f861 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -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}
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index 0ad6d4b76c5d..48636dac9ea6 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -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
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 3877fde8429f..4a68ef552f45 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -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
diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
index 54777700430c..192a53fec602 100644
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -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
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
index 4db96cc5e6bf..b4aad235af71 100644
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -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}
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index ced4fc792d53..768cb2cecfe6 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -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
diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
index 3bec79fe9911..5568d7269140 100644
--- a/Mk/bsd.fpc.mk
+++ b/Mk/bsd.fpc.mk
@@ -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
diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk
index e3754ea4084b..e6a60556e608 100644
--- a/Mk/bsd.gcc.mk
+++ b/Mk/bsd.gcc.mk
@@ -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
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index c9e9f3b5281d..2429aa761093 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -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 ','
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index dc177df3895e..b1b6394bf93f 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 10:02:09 +0000