diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/gssapi.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/gstreamer.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/kde.mk | 10 | ||||
| -rw-r--r-- | Mk/Uses/llvm.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/python.mk | 16 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 8 |
6 files changed, 17 insertions, 25 deletions
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index fecf29895a5a..b419a8fe27ff 100644 --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -86,7 +86,7 @@ _local:= ${_A} . if ${SSL_DEFAULT} != base IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value . endif -. if exists(/usr/libexec/krb5kdc) +. if exists(/usr/libdata/pkgconfig/mit-krb5.pc) # Base has MIT KRB5 installed KRB5_HOME?= /usr GSSAPIBASEDIR= ${KRB5_HOME} @@ -94,7 +94,7 @@ GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib GSSAPIINCDIR= ${GSSAPIBASEDIR}/include _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" -GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 +GSSAPILIBS= -lkrb5 -lgssapi_krb5 GSSAPILDFLAGS= . else # Base has Heimdal KRB5 installed diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk index bdc0b836195c..edc677b9f663 100644 --- a/Mk/Uses/gstreamer.mk +++ b/Mk/Uses/gstreamer.mk @@ -41,7 +41,7 @@ _GST_VER= ${_GST_VER_DEFAULT} # When modifying _GST1_VERSION, run `make -C ${PORTSDIR}/multimedia/gstreamer1 makesum-all` # to update the distinfo files for the entire suite. -_GST1_VERSION= 1.26.4 +_GST1_VERSION= 1.26.5 _GST1_LIB_VER= 1.0 _GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0 diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 812619911717..0a9a9e70a8b4 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.3 +KDE_PLASMA6_VERSION?= 6.4.4 KDE_PLASMA6_BRANCH?= stable # Legacy KDE frameworks (Qt5 based). @@ -331,7 +331,7 @@ _USE_PLASMA6_ALL= activities activities-stats activitymanagerd \ _USE_PLASMA_ALL= ${_USE_PLASMA${_KDE_VERSION}_ALL} # List of frequently used components of the KDE Gears distribution. -_USE_GEAR5_ALL= libkdcraw libkexiv2 +_USE_GEAR5_ALL= libkdcraw _USE_GEAR6_ALL= baloo-widgets kate kosm kpublictransport \ libkcddb libkcompactdisc libkdcraw \ libkdegames libkeduvocdocument libkexiv2 \ @@ -982,10 +982,8 @@ kde-libkdegames_LIB= libKDEGames${_KDE_VERSION}.so kde-libkeduvocdocument_PORT= misc/libkeduvocdocument kde-libkeduvocdocument_LIB= libKEduVocDocument.so -kde-libkexiv2_PORT= graphics/libkexiv2@qt${_KDE_VERSION} -kde-libkexiv2_LIB5= libKF${_KDE_VERSION}KExiv2.so -kde-libkexiv2_LIB6= libKExiv2Qt${_KDE_VERSION}.so -kde-libkexiv2_LIB= ${kde-libkexiv2_LIB${_KDE_VERSION}} +kde-libkexiv2_PORT= graphics/libkexiv2 +kde-libkexiv2_LIB= libKExiv2Qt6.so kde-libksane_PORT= graphics/libksane kde-libksane_LIB= libKSaneWidgets${_KDE_VERSION}.so diff --git a/Mk/Uses/llvm.mk b/Mk/Uses/llvm.mk index d6108a998882..38e04295b970 100644 --- a/Mk/Uses/llvm.mk +++ b/Mk/Uses/llvm.mk @@ -37,7 +37,7 @@ .if !defined(_INCLUDE_USES_LLVM_MK) _INCLUDE_USES_LLVM_MK= YES -_LLVM_MK_VALID_VERSIONS= 11 12 13 14 15 16 17 18 19 20 +_LLVM_MK_VALID_VERSIONS= 11 12 13 14 15 16 17 18 19 20 21 _LLVM_MK_VALID_CONSTRAINTS= min max _LLVM_MK_VALID_MODES= build run lib _LLVM_MK_VALID_EXPORTS= export noexport diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 79047db2fff1..c96b633f1254 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -144,8 +144,6 @@ # # pytest - Run tests with latest pytest (devel/py-pytest) # -# pytest4 - Run tests with pytest 4.x (devel/py-pytest4) -# # unittest - Run tests with unittest # # unittest2 - Run tests with unittest2 (devel/py-unittest2) @@ -371,7 +369,6 @@ _VALID_PYTHON_FEATURES= allflavors \ pep517 \ py3kplist \ pytest \ - pytest4 \ pythonprefix \ unittest \ unittest2 @@ -389,9 +386,6 @@ IGNORE= uses unknown USE_PYTHON features: ${_INVALID_PYTHON_FEATURES} . for var in ${USE_PYTHON} _PYTHON_FEATURE_${var:C/=.*$//:tu}= ${var:C/.*=//:S/,/ /g} . endfor -. if defined(_PYTHON_FEATURE_PYTEST) && defined(_PYTHON_FEATURE_PYTEST4) -IGNORE= uses either USE_PYTHON=pytest or USE_PYTHON=pytest4, not both of them -. endif # distutils automatically generates flavors depending on the supported # versions. @@ -781,10 +775,6 @@ TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose2>=0:devel/py-nose2@${PY_FLAVOR} # pytest support . if defined(_PYTHON_FEATURE_PYTEST) TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest>=7,1:devel/py-pytest@${PY_FLAVOR} -. elif defined(_PYTHON_FEATURE_PYTEST4) -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest4>=4.6,1:devel/py-pytest4@${PY_FLAVOR} -. endif -. if defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4) PYTEST_BROKEN_TESTS?= # empty PYTEST_IGNORED_TESTS?= # empty _PYTEST_SKIPPED_TESTS?= # empty @@ -797,7 +787,7 @@ _PYTEST_SKIPPED_TESTS+= ${PYTEST_IGNORED_TESTS} . endif . endif # !defined(PYTEST_ENABLE_ALL_TESTS) _PYTEST_FILTER_EXPRESSION= ${_PYTEST_SKIPPED_TESTS:C/^(.)/and not \1/:tW:C/^and //} -. endif # defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4) +. endif # defined(_PYTHON_FEATURE_PYTEST) # unittest2 support . if defined(_PYTHON_FEATURE_UNITTEST2) @@ -1031,12 +1021,12 @@ do-test: . endif . endif # defined(_PYTHON_FEATURE_NOSE2) -. if defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4) +. if defined(_PYTHON_FEATURE_PYTEST) . if !target(do-test) do-test: cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -k '${_PYTEST_FILTER_EXPRESSION}' -rs -v -o addopts= ${TEST_ARGS:NDESTDIR=*} . endif -. endif # defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4) +. endif # defined(_PYTHON_FEATURE_PYTEST) . if defined(_PYTHON_FEATURE_UNITTEST) . if !target(do-test) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 3192f9cf5ce5..7affcca5dff0 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -75,7 +75,7 @@ GUILE_DEFAULT?= 2.2 IMAGEMAGICK_DEFAULT?= 7 # Possible values: 8, 11, 17, 18, 19, 20, 21, 22, 23, 24 JAVA_DEFAULT?= 8 -# Possible values: 4.0, 4.99 +# Possible values: 4.2, 4.99 . if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64} LAZARUS_DEFAULT?= 4.99 . else @@ -93,12 +93,16 @@ LINUX_DEFAULT?= c7 . else LINUX_DEFAULT?= rl9 . endif -# Possible values: 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, -devel (to be used when non-base compiler is required) +# Possible values: 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -devel (to be used when non-base compiler is required) LLVM_DEFAULT?= 19 # Possible values: 5.1, 5.2, 5.3, 5.4 LUA_DEFAULT?= 5.4 # Possible values: luajit, luajit-devel, luajit-openresty +. if ${ARCH:Mpowerpc64*} +LUAJIT_DEFAULT?= luajit-openresty +. else 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.5m, 10.6m, 10.11m, 11.4m |