summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/azurepy.mk2
-rw-r--r--Mk/Uses/display.mk33
-rw-r--r--Mk/Uses/gstreamer.mk7
-rw-r--r--Mk/Uses/java.mk7
-rw-r--r--Mk/Uses/luajit.mk2
-rw-r--r--Mk/Uses/mysql.mk1
-rw-r--r--Mk/Uses/nodejs.mk6
-rw-r--r--Mk/Uses/pyqt.mk4
-rw-r--r--Mk/Uses/python.mk2
-rw-r--r--Mk/Uses/samba.mk12
-rw-r--r--Mk/bsd.default-versions.mk10
-rw-r--r--Mk/bsd.port.mk14
12 files changed, 66 insertions, 34 deletions
diff --git a/Mk/Uses/azurepy.mk b/Mk/Uses/azurepy.mk
index bb3955549e9d..1434bfb84160 100644
--- a/Mk/Uses/azurepy.mk
+++ b/Mk/Uses/azurepy.mk
@@ -1,7 +1,7 @@
# Shared namespace for py-azure-* ports
# Feature: azurepy
# Usage: USES= azurepy
-# MAINTAINER: dbaio@FreeBSD.org
+# MAINTAINER: ports@FreeBSD.org
.if !defined(_INCLUDE_USES_AZUREPY_MK)
_INCLUDE_USES_AZUREPY_MK= yes
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk
index e46fb10d1bba..b5471b95a8ce 100644
--- a/Mk/Uses/display.mk
+++ b/Mk/Uses/display.mk
@@ -1,6 +1,6 @@
# Feature: display
# Usage: USES=display or USES=display:ARGS
-# Valid ARGS: install (default, implicit), any target
+# Valid ARGS: install (default, implicit), configure, build
#
# Except the target where the DISPLAY is needed
#
@@ -14,24 +14,39 @@ display_ARGS= install
. endif
. if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:x11-servers/xorg-server@xvfb \
+
+. if ${display_ARGS:Mconfigure}
+DISPLAY_DEPENDS= BUILD_DEPENDS
+CONFIGURE_ENV+= DISPLAY=":${XVFBPORT}"
+. elif ${display_ARGS:Mbuild}
+DISPLAY_DEPENDS= BUILD_DEPENDS
+MAKE_ENV+= DISPLAY=":${XVFBPORT}"
+. elif ${display_ARGS:Mtest}
+DISPLAY_DEPENDS= TEST_DEPENDS
+TEST_ENV+= DISPLAY=":${XVFBPORT}"
+.else
+IGNORE= USES=display: invalid arguments: ${display_ARGS}
+.endif
+
+${DISPLAY_DEPENDS}+= \
+ Xvfb:x11-servers/xorg-server@xvfb \
${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:x11-fonts/xorg-fonts-miscbitmaps \
${LOCALBASE}/share/fonts/misc/fonts.alias:x11-fonts/font-alias \
${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
xkbcomp:x11/xkbcomp
-XVFBPORT!= port=0; while test -S /tmp/.X11-unix/X$${port} ; do port=$$(( port + 1 )) ; done ; ${ECHO_CMD} $$port
-PREV_XVFBPORT!= ${ECHO_CMD} $$(( ${XVFBPORT} - 1))
-XVFBPIDFILE= /tmp/.xvfb-${XVFBPORT}.pid
-PREV_XVFBPIDFILE= /tmp/.xvfb-${PREV_XVFBPORT}.pid
-MAKE_ENV+= DISPLAY=":${XVFBPORT}"
+XVFBPORT?= 0
+XVFBPIDFILE= /tmp/.xvfb-${XVFBPORT}-display-mk.pid
-_USES_${display_ARGS}+= 290:start-display 860:stop-display
+. for t in ${display_ARGS}
+_USES_${t}+= 290:start-display 860:stop-display
+. endfor
start-display:
+ pkill -15 -F ${XVFBPIDFILE} || ${TRUE}
daemon -p ${XVFBPIDFILE} Xvfb :${XVFBPORT}
stop-display:
- pkill -15 -F ${PREV_XVFBPIDFILE}
+ pkill -15 -F ${XVFBPIDFILE}
. endif
.endif
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
index 192ca386d268..6f3489b79432 100644
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@@ -10,7 +10,8 @@
# version: 1 -- default (this may be omitted since there is
# currently only one supported version)
# _internal: Only intended for use by multimedia/gstreamer1 to
-# define specific variables so as not depend on itself
+# define specific variables like _GST1_VERSION so that
+# it does not depend on itself
#
# MAINTAINER: multimedia@FreeBSD.org
@@ -41,7 +42,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.6
+_GST1_VERSION= 1.26.7
_GST1_LIB_VER= 1.0
_GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0
@@ -70,7 +71,7 @@ _GST1_PLUGINS_www= neon srt
_GST1_PLUGINS_x11= x ximagesrc
_GST1_PLUGINS_x11-toolkits= gtk pango qt5 qt6
-# == Unversioned information
+#== Unversioned information
# Gather all available plugins for the chosen version
_GST_PLUGINS_BASE= bad core good ugly libgstreamer plugins
diff --git a/Mk/Uses/java.mk b/Mk/Uses/java.mk
index 8588884e51c5..ff5d35556f0c 100644
--- a/Mk/Uses/java.mk
+++ b/Mk/Uses/java.mk
@@ -30,7 +30,7 @@
# JAVA_VERSION List of space-separated suitable java versions for the
# port. An optional "+" allows you to specify a range of
# versions. (allowed values: 8[+] 11[+] 17[+] 18[+] 19[+]
-# 20[+] 21[+] 22[+] 23[+] 24[+])
+# 20[+] 21[+] 22[+] 23[+] 24[+] 25[+])
#
# JAVA_OS List of space-separated suitable JDK port operating systems
# for the port. (allowed values: native linux)
@@ -228,6 +228,8 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_23_INFO= PORT=java/openjdk23 HOME=${LOCALBASE}/
VERSION=23 OS=native VENDOR=openjdk
_JAVA_PORT_NATIVE_OPENJDK_JDK_24_INFO= PORT=java/openjdk24 HOME=${LOCALBASE}/openjdk24 \
VERSION=24 OS=native VENDOR=openjdk
+_JAVA_PORT_NATIVE_OPENJDK_JDK_25_INFO= PORT=java/openjdk25 HOME=${LOCALBASE}/openjdk25 \
+ VERSION=25 OS=native VENDOR=openjdk
_JAVA_PORT_LINUX_ORACLE_JDK_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \
VERSION=8 OS=linux VENDOR=oracle
@@ -251,6 +253,7 @@ __JAVA_PORTS_ALL= \
JAVA_PORT_NATIVE_OPENJDK_JDK_22 \
JAVA_PORT_NATIVE_OPENJDK_JDK_23 \
JAVA_PORT_NATIVE_OPENJDK_JDK_24 \
+ JAVA_PORT_NATIVE_OPENJDK_JDK_25 \
JAVA_PORT_LINUX_ORACLE_JDK_8
_JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \
JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \
@@ -314,7 +317,7 @@ check-makevars::
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
-_JAVA_VERSION= ${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23 24+/:S/^24+/24/}
+_JAVA_VERSION= ${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23 24+/:S/^24+/24 25+/:S/^25+/25/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif
diff --git a/Mk/Uses/luajit.mk b/Mk/Uses/luajit.mk
index 7e62c192fd77..4f53fd7dc87b 100644
--- a/Mk/Uses/luajit.mk
+++ b/Mk/Uses/luajit.mk
@@ -20,7 +20,7 @@ LUAJIT_VER= ${LUAJIT_DEFAULT}
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync
-VALID_LUAJIT_VER= luajit luajit-devel luajit-openresty
+VALID_LUAJIT_VER= luajit luajit-openresty
.if empty(VALID_LUAJIT_VER:M${LUAJIT_DEFAULT})
IGNORE= Invalid luajit default version ${LUAJIT_DEFAULT}: valid versions are ${VALID_LUAJIT_VER}
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index 8062734165a7..1931a0635e16 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -62,6 +62,7 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//}
MYSQL80_LIBVER= 21
MYSQL84_LIBVER= 24
MYSQL91_LIBVER= 24
+MYSQL94_LIBVER= 24
. for v in 106 1011 114 118
MYSQL${v}m_LIBVER= 3
diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
index c1666835554a..e342647140f4 100644
--- a/Mk/Uses/nodejs.mk
+++ b/Mk/Uses/nodejs.mk
@@ -7,7 +7,7 @@
# - 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, 20, 22, 24
+# - version available version: lts, current, 20, 22, 24, 25
#
# Note:
# - The supported versions follow upstream release schedule
@@ -22,13 +22,13 @@
.if !defined(_INCLUDE_USES_NODEJS_MK)
_INCLUDE_USES_NODEJS_MK= yes
-_VALID_NODEJS_VERSIONS= 20 22 24 current lts
+_VALID_NODEJS_VERSIONS= 20 22 24 25 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:N20:N22:N24)
+. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N20:N22:N24:N25)
IGNORE= USES=nodejs has invalid arguments ${nodejs_ARGS}
. endif
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index af659b76d8cc..54fff0299196 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -108,9 +108,9 @@ MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
# below, should have a suitable epoch appended to the version.
# Qt version-agnostic components
-PYQTBUILDER_VERSION= 1.18.2
+PYQTBUILDER_VERSION= 1.19.0
QSCI2_VERSION= 2.14.1
-SIP_VERSION= 6.12.0 # ,1
+SIP_VERSION= 6.13.1 # ,1
# Qt 5 components
PYQT5SIP_VERSION= 12.17.0
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index c96b633f1254..3ceacc7c115d 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -870,7 +870,7 @@ PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAV
# Common Python modules that can be needed but only for some versions of Python.
. if ${PYTHON_REL} < 31100
PY_EXCEPTIONGROUP= ${PYTHON_PKGNAMEPREFIX}exceptiongroup>=1.1.1:devel/py-exceptiongroup@${PY_FLAVOR}
-PY_TOMLI= ${PYTHON_PKGNAMEPREFIX}tomli>=2.2.1<3:textproc/py-tomli@${PY_FLAVOR}
+PY_TOMLI= ${PYTHON_PKGNAMEPREFIX}tomli>=2.3<3:textproc/py-tomli@${PY_FLAVOR}
PY_TYPING_EXTENSIONS= ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
. endif
diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
index fb949887c604..e40db0b0e5bd 100644
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -18,7 +18,7 @@ samba_ARGS= build run
IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
. endif
-. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20
+. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20 && ${SAMBA_DEFAULT} != 4.22
IGNORE= Invalid version of samba: ${SAMBA_DEFAULT}
. endif
@@ -39,11 +39,21 @@ SAMBA_LDB_PORT_420= databases/ldb29
SAMBA_TALLOC_PORT_420= devel/talloc242
SAMBA_TDB_PORT_420= databases/tdb1410
SAMBA_TEVENT_PORT_420= devel/tevent016
+SAMBA_PORT_422= net/samba422
+SAMBA_TALLOC_PORT_422= devel/talloc243
+SAMBA_TDB_PORT_422= databases/tdb1413
+SAMBA_TEVENT_PORT_422= devel/tevent017
SAMBA_PORT= ${SAMBA_PORT_${SAMBA_SUFFIX}}
SAMBA_INCLUDEDIR= ${LOCALBASE}/include/samba4
SAMBA_LIBDIR= ${LOCALBASE}/lib/samba4
+# Only define SAMBA_LDB_PORT if SAMBA_LDB_PORT_${SAMBA_SUFFIX} is set. Samba
+# requires ldb to be bundled since version 4.22, so it makes no sense to set
+# SAMBA_LDB_PORT in that case. By not setting SAMBA_LDB_PORT, we allow ports to
+# detect the lack of a separate ldb port more easily.
+. if !empty(SAMBA_LDB_PORT_${SAMBA_SUFFIX})
SAMBA_LDB_PORT= ${SAMBA_LDB_PORT_${SAMBA_SUFFIX}}
+. endif
SAMBA_TALLOC_PORT= ${SAMBA_TALLOC_PORT_${SAMBA_SUFFIX}}
SAMBA_TDB_PORT= ${SAMBA_TDB_PORT_${SAMBA_SUFFIX}}
SAMBA_TEVENT_PORT= ${SAMBA_TEVENT_PORT_${SAMBA_SUFFIX}}
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 95ddfa318c14..e3b2d4878cd1 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -73,7 +73,7 @@ GUILE_DEFAULT?= 2.2
# Format: version[-flavor]
# Examples: 6-nox11, 7
IMAGEMAGICK_DEFAULT?= 7
-# Possible values: 8, 11, 17, 18, 19, 20, 21, 22, 23, 24
+# Possible values: 8, 11, 17, 18, 19, 20, 21, 22, 23, 24, 25
JAVA_DEFAULT?= 8
# Possible values: 4.2, 4.99
. if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64}
@@ -97,7 +97,7 @@ LINUX_DEFAULT?= rl9
LLVM_DEFAULT?= 19
# Possible values: 5.1, 5.2, 5.3, 5.4
LUA_DEFAULT?= 5.4
-# Possible values: luajit, luajit-devel, luajit-openresty
+# Possible values: luajit, luajit-openresty
. if ${ARCH:Mpowerpc64*}
LUAJIT_DEFAULT?= luajit-openresty
. else
@@ -105,11 +105,11 @@ 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.6m, 10.11m, 11.4m, 11.8m
+# Possible values: 8.0, 8.4, 9.1, 9.4, 10.6m, 10.11m, 11.4m, 11.8m
MYSQL_DEFAULT?= 8.0
# Possible values: ninja, samurai
NINJA_DEFAULT?= ninja
-# Possible value: 20, 22, 24, current, lts (Note: current = 24 and lts = 22)
+# Possible value: 20, 22, 24, 25, current, lts (Note: current = 24 and lts = 22)
NODEJS_DEFAULT?= lts
# Possible value: 25, 26
OPENLDAP_DEFAULT?= 26
@@ -148,7 +148,7 @@ PYTHON2_DEFAULT?= 2.7
RUBY_DEFAULT?= 3.3
# Possible values: rust, rust-nightly
RUST_DEFAULT?= rust
-# Possible values: 4.16, 4.19, 4.20
+# Possible values: 4.16, 4.19, 4.20, 4.22
SAMBA_DEFAULT?= 4.16
# When updating this, please also update the same list in ssl.mk and the checks
# for USES=ssl in qa.sh!
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 6c780d5628ff..ad654761fcfb 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -113,7 +113,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# Default: not set.
# PATCH_SITES - Primary location(s) for distribution patch files
# if not found locally.
-# DIST_SUBDIR - Suffix to ${DISTDIR}. If set, all ${DISTFILES} and
+# DIST_SUBDIR - Suffix to ${DISTDIR}. If set to non-empty value, all ${DISTFILES} and
# ${PATCHFILES} will be put in this subdirectory of
# ${DISTDIR} (see below). Also they will be fetched in this
# subdirectory from FreeBSD mirror sites.
@@ -1007,7 +1007,7 @@ PORTSDIR?= /usr/ports
LOCALBASE?= /usr/local
LINUXBASE?= /compat/linux
DISTDIR?= ${PORTSDIR}/distfiles
-_DISTDIR?= ${DISTDIR}${DIST_SUBDIR:D/${DIST_SUBDIR}}
+_DISTDIR?= ${DISTDIR}${empty(DIST_SUBDIR):?:${DIST_SUBDIR:D/${DIST_SUBDIR}}}
INDEXDIR?= ${PORTSDIR}
SRC_BASE?= /usr/src
USESDIR?= ${PORTSDIR}/Mk/Uses
@@ -2544,7 +2544,7 @@ _PATCH_SITES_ENV+= _PATCH_SITES_${_group}=${_PATCH_SITES_${_group}:Q}
CKSUMFILES= ${ALLFILES}
# List of all files, with ${DIST_SUBDIR} in front. Used for checksum.
-. if defined(DIST_SUBDIR)
+. if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
. if defined(CKSUMFILES) && ${CKSUMFILES}!=""
_CKSUMFILES?= ${CKSUMFILES:S/^/${DIST_SUBDIR}\//}
. endif
@@ -3910,7 +3910,7 @@ delete-distfiles:
fi; \
done; \
fi)
-. if defined(DIST_SUBDIR)
+. if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
-@${RMDIR} ${_DISTDIR} >/dev/null 2>&1 || ${TRUE}
. endif
. endif
@@ -3927,7 +3927,7 @@ delete-distfiles-list:
fi; \
done; \
fi
-. if defined(DIST_SUBDIR)
+. if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
@${ECHO_CMD} "${RMDIR} ${_DISTDIR} 2>/dev/null || ${TRUE}"
. endif
. endif
@@ -5331,7 +5331,9 @@ show-warnings:
@${ECHO_MSG} "${m}" | ${FMT_80}
@${ECHO_MSG}
. endfor
+. if ${WARNING_WAIT} != 0
@sleep ${WARNING_WAIT}
+. endif
. endif
. if defined(ERROR)
@@ -5357,7 +5359,7 @@ show-dev-warnings:
. endfor
. if defined(DEV_WARNING_FATAL)
@${FALSE}
-. else
+. elif ${DEV_WARNING_WAIT} != 0
@sleep ${DEV_WARNING_WAIT}
. endif
. endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-29 05:11:56 +0000