diff options
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/cabal.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/cpe.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/nodejs.mk | 10 | ||||
| -rw-r--r-- | Mk/Uses/ruby.mk | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 49d5f06d22bb..d52d3e4bfb27 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -318,7 +318,7 @@ cabal-pre-configure: . if !target(do-build) do-build: cd ${WRKSRC} && \ - ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET} + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --no-semaphore --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET} . endif . if !target(do-install) diff --git a/Mk/Uses/cpe.mk b/Mk/Uses/cpe.mk index 92d27e5aa12b..23f4a73dc266 100644 --- a/Mk/Uses/cpe.mk +++ b/Mk/Uses/cpe.mk @@ -1,7 +1,5 @@ # Include CPE information in package manifest as a CPE 2.3 formatted -# string. -# See https://csrc.nist.gov/projects/security-content-automation-protocol/specifications/cpe -# for details. +# string. See https://scap.nist.gov/specifications/cpe/ for details. # # CPE_PART Defaults to "a" for "application". # CPE_VENDOR Defaults to same as ${CPE_PRODUCT} (below). 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/ruby.mk b/Mk/Uses/ruby.mk index 1f9f55e27b52..620fff71f832 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -162,7 +162,7 @@ RUBY_PORTREVISION= 0 # # Ruby 3.4 # -RUBY_DISTVERSION= 3.4.3 +RUBY_DISTVERSION= 3.4.4 RUBY_PORTREVISION= 0 |