diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/kde.mk | 3 | ||||
| -rw-r--r-- | Mk/Uses/nodejs.mk | 10 | ||||
| -rw-r--r-- | Mk/Uses/python.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index cdeb7ff7ed77..ba70acfacf22 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -99,7 +99,7 @@ KDE_FRAMEWORKS5_VERSION?= 5.116.0 KDE_FRAMEWORKS5_BRANCH?= stable # Current KDE Frameworks (Qt6 based). -KDE_FRAMEWORKS6_VERSION?= 6.13.0 +KDE_FRAMEWORKS6_VERSION?= 6.14.0 KDE_FRAMEWORKS6_BRANCH?= stable # Current KDE applications. Update _${PORTNAME}_PROJECT_VERSION for the following ports: @@ -223,6 +223,7 @@ MASTER_SITES?= KDE/${KDE_FRAMEWORKS_BRANCH}/frameworks/${KDE_FRAMEWORKS_VERSION . endif DIST_SUBDIR?= KDE/frameworks/${KDE_FRAMEWORKS_VERSION} . if ${_KDE_VERSION:M6} +DIST_SUBDIR= KDE/frameworks/${KDE_FRAMEWORKS_VERSION:R} DESCR= ${.CURDIR:H:H}/x11/kf6-frameworks/pkg-descr . endif . else diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk index 89a528ddc43e..d758bba2adcb 100644 --- a/Mk/Uses/nodejs.mk +++ b/Mk/Uses/nodejs.mk @@ -7,13 +7,13 @@ # - 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, 18, 20, 22, 23 +# - version available version: lts, current, 18, 20, 22, 23, 24 # # Note: # - The supported versions follow upstream release schedule # https://github.com/nodejs/Release/blob/main/README.md#release-schedule # - lts is 22 now -# - current is 23 now +# - current is 24 now # - USES=nodejs means USES=nodejs:build,run # - If you define a version, you must provide run and/or build # @@ -22,13 +22,13 @@ .if !defined(_INCLUDE_USES_NODEJS_MK) _INCLUDE_USES_NODEJS_MK= yes -_VALID_NODEJS_VERSIONS= 18 20 22 23 current lts +_VALID_NODEJS_VERSIONS= 18 20 22 23 24 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:N18:N20:N22:N23) +. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N22:N23:N24) IGNORE= USES=nodejs has invalid arguments ${nodejs_ARGS} . endif @@ -47,7 +47,7 @@ _NODEJS_VER= ${version} _NODEJS_VER= ${NODEJS_DEFAULT} . endif -NODEJS_VERSION= ${_NODEJS_VER:S|current|23|:S|lts|22|} +NODEJS_VERSION= ${_NODEJS_VER:S|current|24|:S|lts|22|} NODEJS_SUFFIX= -node${NODEJS_VERSION} . if ${nodejs_ARGS:M*build*} diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index d2b787504316..a26f984e3c11 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -615,7 +615,7 @@ _PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp # cryptography* support . if ${PYCRYPTOGRAPHY_DEFAULT} == rust -CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=44.0.2,1:security/py-cryptography@${PY_FLAVOR} +CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=44.0.3,1:security/py-cryptography@${PY_FLAVOR} . else CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-legacy>=3.4.8_3,1:security/py-cryptography-legacy@${PY_FLAVOR} . endif diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 772d28798aa0..50d8a4ef789c 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -109,7 +109,7 @@ MONO_DEFAULT?= 5.20 MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja -# Possible value: 18, 20, 22, 23, current, lts (Note: current = 23 and lts = 22) +# Possible value: 18, 20, 22, 23, 24, current, lts (Note: current = 24 and lts = 22) NODEJS_DEFAULT?= lts # Possible value: 25, 26 OPENLDAP_DEFAULT?= 26 |