diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/gstreamer.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/kde.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/luajit.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/ruby.mk | 2 | ||||
| -rw-r--r-- | Mk/Wrappers/gm4 | 2 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 6 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 |
7 files changed, 8 insertions, 16 deletions
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk index 22d1c3ea73af..221b146a2128 100644 --- a/Mk/Uses/gstreamer.mk +++ b/Mk/Uses/gstreamer.mk @@ -48,7 +48,7 @@ _GST_VER= ${_GST_VER_DEFAULT} # - multimedia/gstreamer1-rtsp-server # - multimedia/gstreamer1-vaapi # - multimedia/py-gstreamer1 -_GST1_VERSION= 1.26.2 +_GST1_VERSION= 1.26.3 _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 f46b29b8c151..812619911717 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.2 +KDE_PLASMA6_VERSION?= 6.4.3 KDE_PLASMA6_BRANCH?= stable # Legacy KDE frameworks (Qt5 based). @@ -99,7 +99,7 @@ KDE_FRAMEWORKS5_VERSION?= 5.116.0 KDE_FRAMEWORKS5_BRANCH?= stable # Current KDE Frameworks (Qt6 based). -KDE_FRAMEWORKS6_VERSION?= 6.15.0 +KDE_FRAMEWORKS6_VERSION?= 6.16.0 KDE_FRAMEWORKS6_BRANCH?= stable # Current KDE applications. Update _${PORTNAME}_PROJECT_VERSION for the following ports: diff --git a/Mk/Uses/luajit.mk b/Mk/Uses/luajit.mk index c7a15b191209..7e62c192fd77 100644 --- a/Mk/Uses/luajit.mk +++ b/Mk/Uses/luajit.mk @@ -7,7 +7,7 @@ # LUAJIT_VER: The selected luajit version # LUAJIT_INCDIR: The path to luajit's header files # LUAJIT_LUAVER: Which luajit spec version is selected -# (2.0 for luajit, else 2.1) +# (always 2.1) .if !defined(_INCLUDE_USES_LUAJIT_MK) _INCLUDE_USES_LUAJIT_MK=yes @@ -28,11 +28,7 @@ IGNORE= Invalid luajit default version ${LUAJIT_DEFAULT}: valid versions are ${V IGNORE= Invalid luajit version ${LUAJIT_VER}: valid versions are ${VALID_LUAJIT_VER} .endif -.if ${LUAJIT_VER} == luajit -LUAJIT_LUAVER= 2.0 -.else LUAJIT_LUAVER= 2.1 -.endif LIB_DEPENDS+= libluajit-5.1.so:lang/${LUAJIT_VER} LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-${LUAJIT_LUAVER} diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index 620fff71f832..249f0b8bec7e 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.4 +RUBY_DISTVERSION= 3.4.5 RUBY_PORTREVISION= 0 diff --git a/Mk/Wrappers/gm4 b/Mk/Wrappers/gm4 index ecc0796c729a..8b1e7a64f700 100644 --- a/Mk/Wrappers/gm4 +++ b/Mk/Wrappers/gm4 @@ -2,5 +2,5 @@ case " $@ " in *" --version "*) echo "m4 (GNU M4) 1.4.18" ;; -*) exec m4 -g $@ ;; +*) exec m4 -g "$@" ;; esac diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 549ad04fd4c1..51529a07afcb 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -98,11 +98,7 @@ 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-devel -. endif +LUAJIT_DEFAULT?= luajit # 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 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4553edb0072c..fb3e0cc839eb 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1007,7 +1007,7 @@ PORTSDIR?= /usr/ports LOCALBASE?= /usr/local LINUXBASE?= /compat/linux DISTDIR?= ${PORTSDIR}/distfiles -_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} +_DISTDIR?= ${DISTDIR}${DIST_SUBDIR:D/${DIST_SUBDIR}} INDEXDIR?= ${PORTSDIR} SRC_BASE?= /usr/src USESDIR?= ${PORTSDIR}/Mk/Uses |