diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/azurepy.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/java.mk | 7 | ||||
| -rw-r--r-- | Mk/Uses/kde.mk | 14 | ||||
| -rw-r--r-- | Mk/Uses/luajit.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/mysql.mk | 1 | ||||
| -rw-r--r-- | Mk/Uses/nodejs.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/python.mk | 28 | ||||
| -rw-r--r-- | Mk/Uses/ruby.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 10 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 10 |
10 files changed, 45 insertions, 37 deletions
diff --git a/Mk/Uses/azurepy.mk b/Mk/Uses/azurepy.mk index bb3955549e9d..1434bfb84160 100644 --- a/Mk/Uses/azurepy.mk +++ b/Mk/Uses/azurepy.mk @@ -1,7 +1,7 @@ # Shared namespace for py-azure-* ports # Feature: azurepy # Usage: USES= azurepy -# MAINTAINER: dbaio@FreeBSD.org +# MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_AZUREPY_MK) _INCLUDE_USES_AZUREPY_MK= yes diff --git a/Mk/Uses/java.mk b/Mk/Uses/java.mk index 8588884e51c5..ff5d35556f0c 100644 --- a/Mk/Uses/java.mk +++ b/Mk/Uses/java.mk @@ -30,7 +30,7 @@ # JAVA_VERSION List of space-separated suitable java versions for the # port. An optional "+" allows you to specify a range of # versions. (allowed values: 8[+] 11[+] 17[+] 18[+] 19[+] -# 20[+] 21[+] 22[+] 23[+] 24[+]) +# 20[+] 21[+] 22[+] 23[+] 24[+] 25[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -228,6 +228,8 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_23_INFO= PORT=java/openjdk23 HOME=${LOCALBASE}/ VERSION=23 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_24_INFO= PORT=java/openjdk24 HOME=${LOCALBASE}/openjdk24 \ VERSION=24 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_25_INFO= PORT=java/openjdk25 HOME=${LOCALBASE}/openjdk25 \ + VERSION=25 OS=native VENDOR=openjdk _JAVA_PORT_LINUX_ORACLE_JDK_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \ VERSION=8 OS=linux VENDOR=oracle @@ -251,6 +253,7 @@ __JAVA_PORTS_ALL= \ JAVA_PORT_NATIVE_OPENJDK_JDK_22 \ JAVA_PORT_NATIVE_OPENJDK_JDK_23 \ JAVA_PORT_NATIVE_OPENJDK_JDK_24 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_25 \ JAVA_PORT_LINUX_ORACLE_JDK_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \ @@ -314,7 +317,7 @@ check-makevars:: . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23 24+/:S/^24+/24/} +_JAVA_VERSION= ${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23 24+/:S/^24+/24 25+/:S/^25+/25/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index a2795ad5fcc2..03ac4ddd5dd5 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -91,7 +91,7 @@ KDE_PLASMA5_VERSION?= 5.27.12 KDE_PLASMA5_BRANCH?= stable # Current KDE Plasma desktop. -KDE_PLASMA6_VERSION?= 6.4.5 +KDE_PLASMA6_VERSION?= 6.5.0 KDE_PLASMA6_BRANCH?= stable # Legacy KDE frameworks (Qt5 based). @@ -99,13 +99,13 @@ KDE_FRAMEWORKS5_VERSION?= 5.116.0 KDE_FRAMEWORKS5_BRANCH?= stable # Current KDE Frameworks (Qt6 based). -KDE_FRAMEWORKS6_VERSION?= 6.18.0 +KDE_FRAMEWORKS6_VERSION?= 6.19.0 KDE_FRAMEWORKS6_BRANCH?= stable # Current KDE applications. Update _${PORTNAME}_PROJECT_VERSION for the following ports: # devel/kdevelop, games/libkdegames, games/libkmahjongg, graphics/kgraphviewer -KDE_APPLICATIONS6_VERSION?= 25.08.1 -KDE_APPLICATIONS6_SHLIB_VER?= 6.5.1 +KDE_APPLICATIONS6_VERSION?= 25.08.2 +KDE_APPLICATIONS6_SHLIB_VER?= 6.5.2 # G as in KDE Gear, and as in "don't make the variable name longer than required". KDE_APPLICATIONS6_SHLIB_G_VER?= ${KDE_APPLICATIONS6_VERSION} KDE_APPLICATIONS6_BRANCH?= stable @@ -317,6 +317,7 @@ _USE_PLASMA6_ALL= activities activities-stats activitymanagerd \ aurorae breeze breeze-gtk decoration discover \ globalacceld infocenter kde-cli-tools \ kde-gtk-config kdeplasma-addons kgamma kmenuedit \ + knighttime \ kpipewire kscreen kscreenlocker ksshaskpass \ ksystemstats kwallet-pam kwin kwin-x11 kwrited \ layer-shell-qt libkscreen libksysguard libplasma \ @@ -704,6 +705,9 @@ kde-kgamma_PATH= ${QT_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets/kcm_kgamma kde-kmenuedit_PORT= sysutils/plasma${_KDE_VERSION}-kmenuedit kde-kmenuedit_PATH= ${KDE_PREFIX}/bin/kmenuedit +kde-knighttime_PORT= sysutils/plasma${_KDE_VERSION}-knighttime +kde-knighttime_LIB= libKNightTime.so + kde-kscreen_PORT= x11/plasma${_KDE_VERSION}-kscreen kde-kscreen_PATH= ${KDE_PREFIX}/bin/kscreen-console @@ -737,7 +741,7 @@ kde-libksysguard_LIB6= libKSysGuardSystemStats.so kde-libksysguard_LIB= ${kde-libksysguard_LIB${_KDE_VERSION}} kde-milou_PORT= deskutils/plasma${_KDE_VERSION}-milou -kde-milou_PATH= ${QT_QMLDIR}/org/kde/milou/libmilouqmlplugin.so +kde-milou_PATH= ${QT_QMLDIR}/org/kde/milou/libmilou.so kde-ocean-sound-theme_PORT= audio/plasma${_KDE_VERSION}-ocean-sound-theme kde-ocean-sound-theme_PATH= ${KDE_PREFIX}/share/sounds/ocean/index.theme diff --git a/Mk/Uses/luajit.mk b/Mk/Uses/luajit.mk index 7e62c192fd77..4f53fd7dc87b 100644 --- a/Mk/Uses/luajit.mk +++ b/Mk/Uses/luajit.mk @@ -20,7 +20,7 @@ LUAJIT_VER= ${LUAJIT_DEFAULT} # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync -VALID_LUAJIT_VER= luajit luajit-devel luajit-openresty +VALID_LUAJIT_VER= luajit luajit-openresty .if empty(VALID_LUAJIT_VER:M${LUAJIT_DEFAULT}) IGNORE= Invalid luajit default version ${LUAJIT_DEFAULT}: valid versions are ${VALID_LUAJIT_VER} diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index 8062734165a7..1931a0635e16 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -62,6 +62,7 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} MYSQL80_LIBVER= 21 MYSQL84_LIBVER= 24 MYSQL91_LIBVER= 24 +MYSQL94_LIBVER= 24 . for v in 106 1011 114 118 MYSQL${v}m_LIBVER= 3 diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk index c1666835554a..e342647140f4 100644 --- a/Mk/Uses/nodejs.mk +++ b/Mk/Uses/nodejs.mk @@ -7,7 +7,7 @@ # - build use node as build-time dependency # - run use node as runtime dependency # - env set the environment (NODEJS_VERSION and NODEJS_SUFFIX) -# - version available version: lts, current, 20, 22, 24 +# - version available version: lts, current, 20, 22, 24, 25 # # Note: # - The supported versions follow upstream release schedule @@ -22,13 +22,13 @@ .if !defined(_INCLUDE_USES_NODEJS_MK) _INCLUDE_USES_NODEJS_MK= yes -_VALID_NODEJS_VERSIONS= 20 22 24 current lts +_VALID_NODEJS_VERSIONS= 20 22 24 25 current lts . if ! ${_VALID_NODEJS_VERSIONS:M${NODEJS_DEFAULT}} IGNORE= Invalid default nodejs version ${NODEJS_DEFAULT}; valid versions are ${_VALID_NODEJS_VERSIONS} . endif -. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N20:N22:N24) +. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N20:N22:N24:N25) IGNORE= USES=nodejs has invalid arguments ${nodejs_ARGS} . endif diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 3ceacc7c115d..7cb24247d578 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -17,19 +17,19 @@ # Examples: # # USES=python:2.7 # Supports Python 2.7 Only -# USES=python:3.9+ # Supports Python 3.9 or later -# USES=python:3.9-3.10 # Supports Python 3.9 to 3.10 -# USES=python:-3.9 # Supports Python up to 3.9 -# USES=python # Supports 3.9+ +# USES=python:3.11+ # Supports Python 3.11 or later +# USES=python:3.11-3.12 # Supports Python 3.11 to 3.12 +# USES=python:-3.11 # Supports Python up to 3.11 +# USES=python # Supports 3.10+ # # NOTE: <version-spec> should be as specific as possible, matching the versions # upstream declares support for, without being incorrect. In particular, -# USES=python *without* a <version-spec> means 3.9+, +# USES=python *without* a <version-spec> means 3.11+, # including unreleased versions, which is probably incorrect. # # Not specifying a <version-spec> should only be used when a more specific # <version-spec> cannot be specified due to syntax limitations, for -# example: 2.7,3.9-3.10, but even in this case, X.Y+ (2.7+), or -X.Y (-3.9) +# example: 2.7,3.11-3.12, but even in this case, X.Y+ (2.7+), or -X.Y (-3.11) # is preferred and likely more correct. # # patch Python is needed at patch time. Adds dependency to PATCH_DEPENDS. @@ -50,7 +50,7 @@ # Exported variables: # # PYTHON_VERSION - The chosen Python interpreter including the version, -# e.g. python2.7, python3.9, etc. +# e.g. python2.7, python3.11, etc. # # Variables, which can be set by the port: # @@ -227,10 +227,10 @@ # PYTHON_PORTSDIR - The port directory of the chosen Python interpreter # # PYTHON_REL - The release number of the chosen Python interpreter -# without dots, e.g. 20706, 30901, ... +# without dots, e.g. 20706, 31114, ... # # PYTHON_SUFFIX - The major-minor release number of the chosen Python -# interpreter without dots, e.g. 27, 38, ... +# interpreter without dots, e.g. 27, 310, ... # Used for prefixes and suffixes. # # PYTHON_BASESUFFIX - PYTHON_SUFFIX without the threaded ABI flag. @@ -252,7 +252,7 @@ # interpreter, e.g. 2, 3, ... # # PYTHON_VER - The major-minor release version of the chosen Python -# interpreter, e.g. 2.7, 3.9, ... +# interpreter, e.g. 2.7, 3.12, ... # # PYTHON_BASEVER - PYTHON_VER without the threaded ABI flag. # @@ -341,7 +341,7 @@ ZEROREGS_UNSAFE= yes # What Python version and what Python interpreters are currently supported? # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -_PYTHON_VERSIONS= 3.11 3.12 3.10 3.9 2.7 # preferred first +_PYTHON_VERSIONS= 3.11 3.12 3.13 3.13t 3.14 3.10 2.7 # preferred first _PYTHON_PORTBRANCH= 3.11 # ${_PYTHON_VERSIONS:[1]} _PYTHON_BASECMD= ${LOCALBASE}/bin/python _PYTHON_RELPORTDIR= lang/python @@ -444,13 +444,13 @@ DEV_WARNING+= "lang/python27 reached End of Life and will be removed somewhere . elif ${_PYTHON_ARGS} == 2 DEV_ERROR+= "USES=python:2 is no longer supported, use USES=python:2.7" . elif ${_PYTHON_ARGS} == 3 -DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.9+ or an appropriate version range" +DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.11+ or an appropriate version range" . endif # ${_PYTHON_ARGS} == 2.7 _PYTHON_VERSION:= ${PYTHON_DEFAULT} . if empty(_PYTHON_ARGS) -_PYTHON_ARGS= 3.9+ +_PYTHON_ARGS= 3.10+ . endif # Validate Python version whether it meets the version restriction. @@ -552,7 +552,7 @@ PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} # To avoid having dependencies with @ and empty flavor: # _PYTHON_VERSION is either set by (first that matches): # - If using Python flavors, from the current Python flavor -# - If using a version restriction (USES=python:3.9+), from the first +# - If using a version restriction (USES=python:3.11+), from the first # acceptable default Python version. # - From PYTHON_DEFAULT PY_FLAVOR= py${_PYTHON_VERSION:S/.//} diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index fb4699b8086f..7e3253818cb2 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -154,7 +154,7 @@ RUBY_PORTREVISION= 0 # # Ruby 3.3 # -RUBY_DISTVERSION= 3.3.9 +RUBY_DISTVERSION= 3.3.10 RUBY_PORTREVISION= 0 diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 3960d683d7e8..6336b8e1bba1 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -73,7 +73,7 @@ GUILE_DEFAULT?= 2.2 # Format: version[-flavor] # Examples: 6-nox11, 7 IMAGEMAGICK_DEFAULT?= 7 -# Possible values: 8, 11, 17, 18, 19, 20, 21, 22, 23, 24 +# Possible values: 8, 11, 17, 18, 19, 20, 21, 22, 23, 24, 25 JAVA_DEFAULT?= 8 # Possible values: 4.2, 4.99 . if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64} @@ -97,7 +97,7 @@ LINUX_DEFAULT?= rl9 LLVM_DEFAULT?= 19 # Possible values: 5.1, 5.2, 5.3, 5.4 LUA_DEFAULT?= 5.4 -# Possible values: luajit, luajit-devel, luajit-openresty +# Possible values: luajit, luajit-openresty . if ${ARCH:Mpowerpc64*} LUAJIT_DEFAULT?= luajit-openresty . else @@ -105,11 +105,11 @@ LUAJIT_DEFAULT?= luajit . endif # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.20 -# Possible values: 8.0, 8.4, 9.1, 10.6m, 10.11m, 11.4m, 11.8m +# Possible values: 8.0, 8.4, 9.1, 9.4, 10.6m, 10.11m, 11.4m, 11.8m MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja -# Possible value: 20, 22, 24, current, lts (Note: current = 24 and lts = 22) +# Possible value: 20, 22, 24, 25, current, lts (Note: current = 24 and lts = 22) NODEJS_DEFAULT?= lts # Possible value: 25, 26 OPENLDAP_DEFAULT?= 26 @@ -140,7 +140,7 @@ PYCRYPTOGRAPHY_DEFAULT?= rust . else PYCRYPTOGRAPHY_DEFAULT?= legacy . endif -# Possible values: 3.9, 3.10, 3.11, 3.12 +# Possible values: 3.10, 3.11, 3.12, 3.13, 3.13t, 3.14 PYTHON_DEFAULT?= 3.11 # Possible values: 2.7 PYTHON2_DEFAULT?= 2.7 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index cf5e79d53f37..ad654761fcfb 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -113,7 +113,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Default: not set. # PATCH_SITES - Primary location(s) for distribution patch files # if not found locally. -# DIST_SUBDIR - Suffix to ${DISTDIR}. If set, all ${DISTFILES} and +# DIST_SUBDIR - Suffix to ${DISTDIR}. If set to non-empty value, all ${DISTFILES} and # ${PATCHFILES} will be put in this subdirectory of # ${DISTDIR} (see below). Also they will be fetched in this # subdirectory from FreeBSD mirror sites. @@ -1007,7 +1007,7 @@ PORTSDIR?= /usr/ports LOCALBASE?= /usr/local LINUXBASE?= /compat/linux DISTDIR?= ${PORTSDIR}/distfiles -_DISTDIR?= ${DISTDIR}${DIST_SUBDIR:D/${DIST_SUBDIR}} +_DISTDIR?= ${DISTDIR}${empty(DIST_SUBDIR):?:${DIST_SUBDIR:D/${DIST_SUBDIR}}} INDEXDIR?= ${PORTSDIR} SRC_BASE?= /usr/src USESDIR?= ${PORTSDIR}/Mk/Uses @@ -2544,7 +2544,7 @@ _PATCH_SITES_ENV+= _PATCH_SITES_${_group}=${_PATCH_SITES_${_group}:Q} CKSUMFILES= ${ALLFILES} # List of all files, with ${DIST_SUBDIR} in front. Used for checksum. -. if defined(DIST_SUBDIR) +. if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR) . if defined(CKSUMFILES) && ${CKSUMFILES}!="" _CKSUMFILES?= ${CKSUMFILES:S/^/${DIST_SUBDIR}\//} . endif @@ -3910,7 +3910,7 @@ delete-distfiles: fi; \ done; \ fi) -. if defined(DIST_SUBDIR) +. if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR) -@${RMDIR} ${_DISTDIR} >/dev/null 2>&1 || ${TRUE} . endif . endif @@ -3927,7 +3927,7 @@ delete-distfiles-list: fi; \ done; \ fi -. if defined(DIST_SUBDIR) +. if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR) @${ECHO_CMD} "${RMDIR} ${_DISTDIR} 2>/dev/null || ${TRUE}" . endif . endif |