diff options
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/kde.mk | 3 | ||||
| -rw-r--r-- | Mk/Uses/linux.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/nodejs.mk | 10 | ||||
| -rw-r--r-- | Mk/Uses/python.mk | 4 |
4 files changed, 11 insertions, 12 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/linux.mk b/Mk/Uses/linux.mk index bf62f887899a..dae71fc94289 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -189,11 +189,7 @@ _linux_rl9_qtxmlpatterns= linux-rl9-qt5-qtxmlpatterns>0:textproc/linux-rl9-qt5- _linux_${linux_ARGS}_sdl12= linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12 _linux_${linux_ARGS}_sdl12-extralibs= linux-${linux_ARGS}-sdl12-extralibs>0:misc/linux-${linux_ARGS}-sdl12-extralibs _linux_${linux_ARGS}_sdl20= linux-${linux_ARGS}-sdl20>0:devel/linux-${linux_ARGS}-sdl20 -_linux_${linux_ARGS}_sdl2gfx= linux-${linux_ARGS}-sdl2_gfx>0:graphics/linux-${linux_ARGS}-sdl2_gfx -_linux_${linux_ARGS}_sdl2image= linux-${linux_ARGS}-sdl2_image>0:graphics/linux-${linux_ARGS}-sdl2_image -_linux_${linux_ARGS}_sdl2mixer= linux-${linux_ARGS}-sdl2_mixer>0:audio/linux-${linux_ARGS}-sdl2_mixer -_linux_${linux_ARGS}_sdl2ttf= linux-${linux_ARGS}-sdl2_ttf>0:graphics/linux-${linux_ARGS}-sdl2_ttf -_linux_${linux_ARGS}_sdl2sound= linux-${linux_ARGS}-sdl2_sound>0:audio/linux-${linux_ARGS}-sdl2_sound +_linux_${linux_ARGS}_sdl20-extralibs= linux-${linux_ARGS}-sdl20-extralibs>0:misc/linux-${linux_ARGS}-sdl20-extralibs _linux_rl9_shaderc= linux-rl9-shaderc>0:graphics/linux-rl9-shaderc _linux_rl9_spirv-tools= linux-rl9-spirv-tools>0:graphics/linux-rl9-spirv-tools _linux_${linux_ARGS}_sqlite3= linux-${linux_ARGS}-sqlite>0:databases/linux-${linux_ARGS}-sqlite3 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..aba9c48df38c 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -319,6 +319,8 @@ .if !defined(_INCLUDE_USES_PYTHON_MK) _INCLUDE_USES_PYTHON_MK= yes +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. @@ -615,7 +617,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 |