aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Features/ssp.mk3
-rw-r--r--Mk/Scripts/qa.sh2
-rw-r--r--Mk/Uses/cabal.mk4
-rw-r--r--Mk/Uses/cargo.mk2
-rw-r--r--Mk/Uses/display.mk6
-rw-r--r--Mk/Uses/go.mk5
-rw-r--r--Mk/Uses/java.mk11
-rw-r--r--Mk/Uses/kde.mk8
-rw-r--r--Mk/Uses/linux.mk4
-rw-r--r--Mk/Uses/meson.mk9
-rw-r--r--Mk/Uses/mlt.mk2
-rw-r--r--Mk/Uses/mysql.mk1
-rw-r--r--Mk/Uses/nodejs.mk10
-rw-r--r--Mk/Uses/python.mk2
-rw-r--r--Mk/Uses/qt-dist.mk2
-rw-r--r--Mk/Uses/ruby.mk15
-rw-r--r--Mk/Uses/ssl.mk2
-rw-r--r--Mk/Uses/xlibre-cat.mk70
-rw-r--r--Mk/bsd.default-versions.mk10
-rw-r--r--Mk/bsd.gecko.mk7
-rw-r--r--Mk/bsd.options.mk11
-rw-r--r--Mk/bsd.port.mk22
22 files changed, 111 insertions, 97 deletions
diff --git a/Mk/Features/ssp.mk b/Mk/Features/ssp.mk
index b6be18ce35e8..31069b3d0273 100644
--- a/Mk/Features/ssp.mk
+++ b/Mk/Features/ssp.mk
@@ -12,8 +12,7 @@
_SSP_MK_INCLUDED= yes
SSP_Include_MAINTAINER= portmgr@FreeBSD.org
-. if !defined(SSP_UNSAFE) && \
- (! ${ARCH:Mmips*})
+. if !defined(SSP_UNSAFE)
# Overridable as a user may want to use -fstack-protector-all
SSP_CFLAGS?= -fstack-protector-strong
CFLAGS+= ${SSP_CFLAGS}
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
index de2174de5bd4..523519e08a2f 100644
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -622,7 +622,7 @@ proxydeps_suggest_uses() {
# ssl
# When updating this, please also update the versions list in
# bsd.default-versions.mk and ssl.mk!
- elif [ ${pkg} = "security/openssl" -o ${pkg} = "security/openssl111" \
+ elif [ ${pkg} = "security/openssl" \
-o ${pkg} = "security/openssl34" -o ${pkg} = "security/openssl35" \
-o ${pkg} = "security/openssl36" \
-o ${pkg} = "security/libressl" -o ${pkg} = "security/libressl-devel" \
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index 922db6acf547..46844bd76417 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -239,7 +239,9 @@ cabal-build: check-cabal
# Generates USE_CABAL= ... line ready to be pasted into the port based on the plan.json file generated by cabal configure.
make-use-cabal: check-cabal2tuple
- @${ECHO_MSG} "===> Processing plan.json"
+ @if [ -e /dev/stderr ]; then \
+ ${ECHO_MSG} "===> Processing plan.json" > /dev/stderr; \
+ fi
@${_CABAL2TUPLE_CMD} ${CABAL2TUPLE_ARGS} ${WRKSRC} || (${ECHO_CMD} "Did you forget to make cabal-configure ?" ; exit 1)
. if ${_hackage_is_default} == yes
@if ${GREP} -q 'x-revision' ${WRKSRC}/*.cabal; then \
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index a7c807932db4..348bb186497b 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -109,7 +109,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc}
CARGO_BUILDDEP?= yes
. if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.94.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.95.0:lang/${RUST_DEFAULT}
. elif ${CARGO_BUILDDEP:tl} == "any-version"
BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
. endif
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk
index b5471b95a8ce..ac6b0cc97ee1 100644
--- a/Mk/Uses/display.mk
+++ b/Mk/Uses/display.mk
@@ -48,5 +48,11 @@ start-display:
stop-display:
pkill -15 -F ${XVFBPIDFILE}
+. else
+# DISPLAY is already defined, which means we're running in an existing session
+TEST_ENV+= DISPLAY="${DISPLAY}"
+. if defined(XAUTHORITY)
+TEST_ENV+= XAUTHORITY="${XAUTHORITY}"
+. endif
. endif
.endif
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index 6286aa15add0..c398144ade80 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -90,6 +90,9 @@
# GO_BUILDFLAGS
# Additional build arguments to be passed to the `go build` command
#
+# GO_LDFLAGS
+# Additional LDFLAGS variables to be passed to the `go build` command
+#
# GO_TESTFLAGS
# Additional build arguments to be passed to the `go test` command
#
@@ -148,7 +151,7 @@ GO_BUILDFLAGS+= -buildmode=exe
. endif
GO_BUILDFLAGS+= -v -trimpath
. if !defined(WITH_DEBUG) && empty(GO_BUILDFLAGS:M-ldflags*)
-GO_BUILDFLAGS+= -ldflags=-s
+GO_BUILDFLAGS+= -ldflags '-s ${GO_LDFLAGS}'
. endif
GO_BUILDFLAGS+= -buildvcs=false
GO_TESTFLAGS+= -v -buildvcs=false
diff --git a/Mk/Uses/java.mk b/Mk/Uses/java.mk
index cbb8624eddf5..24ce2916af53 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[+]
-# 21[+] 23[+] 24[+] 25[+] 26[+])
+# 21[+] 24[+] 25[+] 26[+])
# JAVA_DEFAULT (Mk/bsd.default-versions.mk) is used if this
# variable is omitted or if JAVA_DEFAULT is part of the range.
# Otherwise the latest LTS from the range is preferred over
@@ -205,7 +205,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}"
. endif
# The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST= 8 11 17 21 23 24 25 26
+__JAVA_VERSION_LIST= 8 11 17 21 24 25 26
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= openjdk oracle
@@ -220,8 +220,6 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/
VERSION=17 OS=native VENDOR=openjdk
_JAVA_PORT_NATIVE_OPENJDK_JDK_21_INFO= PORT=java/openjdk21 HOME=${LOCALBASE}/openjdk21 \
VERSION=21 OS=native VENDOR=openjdk
-_JAVA_PORT_NATIVE_OPENJDK_JDK_23_INFO= PORT=java/openjdk23 HOME=${LOCALBASE}/openjdk23 \
- 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 \
@@ -248,8 +246,7 @@ __JAVA_PORTS_NATIVE_LTS= \
JAVA_PORT_NATIVE_OPENJDK_JDK_8
__JAVA_PORTS_NATIVE_NON_LTS= \
JAVA_PORT_NATIVE_OPENJDK_JDK_26 \
- JAVA_PORT_NATIVE_OPENJDK_JDK_24 \
- JAVA_PORT_NATIVE_OPENJDK_JDK_23
+ JAVA_PORT_NATIVE_OPENJDK_JDK_24
__JAVA_PORTS_ALL= \
${__JAVA_PORTS_NATIVE_LTS} \
${__JAVA_PORTS_NATIVE_NON_LTS} \
@@ -316,7 +313,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 21+/:S/^21+/21 23+/:S/^23+/23 24+/:S/^24+/24 25+/:S/^25+/25 26+/:S/^26+/26/}
+_JAVA_VERSION= ${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 21+/:S/^21+/21 24+/:S/^24+/24 25+/:S/^25+/25 26+/:S/^26+/26/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index a3c9afdea1ee..ebc109f28a2d 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.6.4
+KDE_PLASMA6_VERSION?= 6.6.5
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.25.0
+KDE_FRAMEWORKS6_VERSION?= 6.26.0
KDE_FRAMEWORKS6_BRANCH?= stable
# Current KDE applications.
@@ -107,8 +107,8 @@ KDE_FRAMEWORKS6_BRANCH?= stable
# - check and update if needed _${PORTNAME}_PROJECT_VERSION for the following ports:
# audio/audiocd-kio, devel/kdevelop, games/libkdegames, games/libkmahjongg, graphics/kgraphviewer
# - bump SHLIB_VER for editors/calligra.
-KDE_APPLICATIONS6_VERSION?= 26.04.0
-KDE_APPLICATIONS6_SHLIB_VER?= 6.7.0
+KDE_APPLICATIONS6_VERSION?= 26.04.1
+KDE_APPLICATIONS6_SHLIB_VER?= 6.7.1
# G as in KDE Gear, and as in "don't make the variable name longer than required".
KDE_APPLICATIONS6_SHLIB_G_VER?= ${KDE_APPLICATIONS6_VERSION}
KDE_APPLICATIONS6_BRANCH?= stable
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 929310a2e744..3b53c89daa74 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -306,7 +306,9 @@ DISTFILES_aarch64?= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_aarch64}:aarch64/} \
. if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \
&& empty(NOT_FOR_ARCHS:Mamd64)
. ifndef DISTFILES_amd64
-. if ${linux_ARGS} == c7
+. if ${linux_ARGS} == c7 \
+ && !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
+ && empty(NOT_FOR_ARCHS:Mi386)
DISTFILES_amd64= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/}
. endif
diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk
index f1b41cbdbceb..3a5aa9d7eba9 100644
--- a/Mk/Uses/meson.mk
+++ b/Mk/Uses/meson.mk
@@ -25,13 +25,17 @@ _INCLUDE_USES_MESON_MK= yes
_valid_ARGS= muon
-# Sanity check
+# Sanity checks
. for _arg in ${meson_ARGS}
. if empty(_valid_ARGS:M${_arg})
IGNORE= 'USES+= meson:${meson_ARGS}' usage: argument [${_arg}] is not recognized
. endif
. endfor
+. if defined(CONFIGURE_ARGS)
+IGNORE= Please use MESON_ARGS instead of CONFIGURE_ARGS for Meson based ports
+. endif
+
. if !empty(meson_ARGS:Mmuon)
BUILD_DEPENDS+= muon:devel/muon
. else
@@ -49,7 +53,8 @@ USE_LOCALE?= en_US.UTF-8
CONFIGURE_ARGS+= meson
. endif
-CONFIGURE_ARGS+= --prefix ${PREFIX} \
+CONFIGURE_ARGS+= setup \
+ --prefix ${PREFIX} \
--localstatedir /var \
--infodir ${INFO_PATH}
diff --git a/Mk/Uses/mlt.mk b/Mk/Uses/mlt.mk
index 47c144dc9c6b..508a261cfe67 100644
--- a/Mk/Uses/mlt.mk
+++ b/Mk/Uses/mlt.mk
@@ -37,7 +37,7 @@ _MLT_NODEPEND= yes
. endif
# Library dependencies
-_MLT7_VERSION= 7.36.1
+_MLT7_VERSION= 7.38.0
_MLT7_PORTNAME= mlt7
_MLT7_LIB= libmlt-7.so
_MLT7_MELT= ${LOCALBASE}/bin/melt-7
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index f4c7912c1a74..a3e76118610f 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
MYSQL96_LIBVER= 24
+MYSQL97_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 4f0d904ab722..3708b26f6fa5 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, 20, 22, 24, 25
+# - version available version: lts, current, 20, 22, 24, 25, 26
#
# Note:
# - The supported versions follow upstream release schedule
# https://github.com/nodejs/Release/blob/main/README.md#release-schedule
# - lts is 24 now
-# - current is 25 now
+# - current is 26 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= 20 22 24 25 current lts
+_VALID_NODEJS_VERSIONS= 20 22 24 25 26 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:N25)
+. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N20:N22:N24:N25:N26)
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|25|:S|lts|24|}
+NODEJS_VERSION= ${_NODEJS_VER:S|current|26|:S|lts|24|}
NODEJS_SUFFIX= -node${NODEJS_VERSION}
. if ${nodejs_ARGS:M*build*}
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 558b7703b48d..1c4bd3da4b17 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -341,7 +341,7 @@ 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.
-_PYTHON_VERSIONS= 3.11 3.12 3.13 3.13t 3.14 3.10 2.7 # preferred first
+_PYTHON_VERSIONS= 3.11 3.12 3.13 3.13t 3.14 3.15 3.10 2.7 # preferred first
_PYTHON_PORTBRANCH= 3.11 # ${_PYTHON_VERSIONS:[1]}
_PYTHON_BASECMD= ${LOCALBASE}/bin/python
_PYTHON_RELPORTDIR= lang/python
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
index 309513fdda63..4fdbc8587bde 100644
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -265,7 +265,7 @@ _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_fe
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
-. if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang))
+. if ${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)
_EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk
index d4534999ca10..d800db2afde7 100644
--- a/Mk/Uses/ruby.mk
+++ b/Mk/Uses/ruby.mk
@@ -15,7 +15,7 @@
# [variables that a user may define]
#
# RUBY_VER - (See below)
-# RUBY_DEFAULT_VER - Set to (e.g.) "3.2" if you want to refer to "ruby32"
+# RUBY_DEFAULT_VER - Set to (e.g.) "3.3" if you want to refer to "ruby33"
# just as "ruby".
# RUBY_ARCH - (See below)
#
@@ -140,13 +140,7 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX}
. if defined(RUBY_VER)
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-. if ${RUBY_VER} == 3.2
-#
-# Ruby 3.2
-#
-RUBY_DISTVERSION= 3.2.11
-
-. elif ${RUBY_VER} == 3.3
+. if ${RUBY_VER} == 3.3
#
# Ruby 3.3
#
@@ -162,7 +156,7 @@ RUBY_DISTVERSION= 3.4.9
#
# Ruby 4.0
#
-RUBY_DISTVERSION= 4.0.3
+RUBY_DISTVERSION= 4.0.4
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
@@ -170,7 +164,7 @@ RUBY_DISTVERSION= 4.0.3
#
# Other versions
#
-IGNORE= Only ruby 3,2, 3.3, 3.4 and 4.0 are supported
+IGNORE= Only ruby 3.3, 3.4 and 4.0 are supported
_INVALID_RUBY_VER= 1
. endif
RUBY_PORTEPOCH= 1
@@ -179,7 +173,6 @@ RUBY_VERSION= ${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
. if !defined(_INVALID_RUBY_VER)
-RUBY32?= "@comment "
RUBY33?= "@comment "
RUBY34?= "@comment "
RUBY40?= "@comment "
diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
index 0c7d4c60239e..dd0a5dee3ed0 100644
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -10,7 +10,7 @@
#
# When updating this, please also update the same list in bsd.default-versions.mk
# and the checks for USES=ssl in qa.sh!
-# Variants being base, openssl, openssl111, openssl34, openssl35,
+# Variants being base, openssl, openssl34, openssl35,
# openssl36, libressl, and libressl-devel.
#
# The Makefile sets these variables:
diff --git a/Mk/Uses/xlibre-cat.mk b/Mk/Uses/xlibre-cat.mk
index 2a8bf55cd966..548da3d44e7a 100644
--- a/Mk/Uses/xlibre-cat.mk
+++ b/Mk/Uses/xlibre-cat.mk
@@ -7,24 +7,25 @@
# Usage: USES=xlibre-cat:category[,buildsystem]
#
# category is one of:
-# * driver depends on xorgproto at least
+# * driver Depends on xorgproto at least
+# * server Sets the upstream for X servers, nothing much.
#
-# Bleow are the old freedesktop.org categories and their comments
-# XLibre only hosts the driver category and the xserver, these
-# categoryes are disabled now, but kept in a commented state for
-# if they be added to XLibre in the future.
+# Below are the old freedesktop.org categories and their comments.
+# XLibre only hosts the driver category and the server. These
+# categories are disabled now, but kept in a commented state for
+# if they get added to XLibre in the future.
#
# * app Installs applications, no shared libraries.
# * data Installs only data.
-# * doc no particular notes
-# * font don't install .pc file
+# * doc No particular notes.
+# * font Don't install .pc file.
# * lib various dependencies, install .pc file, needs
-# pathfix
-# * proto install .pc file, needs pathfix, most only needed at
+# pathfix.
+# * proto Install .pc file, needs pathfix, most only needed at
# build time.
-# * util no particular notes
+# * util No particular notes.
#
-# These categories has to match upstream categories. Don't invent
+# These categories have to match upstream categories. Don't invent
# your own.
#
# builsystem is one of:
@@ -84,11 +85,7 @@ _XLIBRE_BUILDSYS= autotools
EXTRACT_SUFX?= .tar.bz2
. endif
-DIST_SUBDIR= xlibre/${_XLIBRE_CAT}
-# Do not set the DIST_SUBDIR to xlibre for XLibre flavors of 3rd party ports.
-. if !empty(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == xlibre- && ${_XLIBRE_CAT} == driver
-DIST_SUBDIR= xorg/${_XLIBRE_CAT}
-. endif
+DIST_SUBDIR?= xlibre/${_XLIBRE_CAT}
. if ${_XLIBRE_BUILDSYS} == meson
.include "${USESDIR}/meson.mk"
@@ -99,45 +96,37 @@ GNU_CONFIGURE= yes
IGNORE= unknown build system specified via xlibre-cat:${xlibre-cat_ARGS:ts,}
. endif
-# Set up things for fetching from XLibre GitHub.
-# This can be overridden using normal GH_* macros in the ports Makefile.
-# We make a best guess for GH_PROJECT.
+# Set up variables for fetching from XLibre GitHub.
+# These can be overridden using normal GH_* macros in the port's Makefile.
+# We are just making a best guess for these variables.
USE_GITHUB?= yes
GH_ACCOUNT?= X11Libre
-# Do not do the bellow for XLibre flavors of 3rd party ports.
-. if empty(PKGNAMEPREFIX) || ${PKGNAMEPREFIX} != xlibre-
-# Set the GitHub upstream.
-. if ${_XLIBRE_CAT} == driver
+. if ${_XLIBRE_CAT} == driver
# Removes the xlibre- suffix from the PORTNAME
-GH_PROJECT?= ${PORTNAME:tl:C/xlibre-//}
+GH_PROJECT?= ${PORTNAME:tl:C/xlibre-//}
GH_TAGNAME?= ${PORTNAME}-${PORTVERSION}
-. elif ${_XLIBRE_CAT} == server
-GH_PROJECT?= xserver
+. elif ${_XLIBRE_CAT} == server
+GH_PROJECT?= xserver
GH_TAGNAME?= xlibre-xserver-${PORTVERSION}
-. else
-GH_PROJECT?= ${PORTNAME:tl}
-. endif
-# Add conflicts between X.Org and XLibre variants of X drivers:
-CONFLICTS= ${PORTNAME:tl:C/xlibre-//}
. endif
. if ${_XLIBRE_BUILDSYS} == meson
# Set up meson stuff here
. else
-# Things from GitHub doesn't come with pre-generated configure, add dependency
+# Repos from GitHub don't come with pre-generated configure, add dependency
# on autoreconf and run it, if we're using autotools.
.include "${USESDIR}/autoreconf.mk"
. endif
#
-# All xlibre ports needs pkgconfig to build, but some ports look for pkgconfig
+# All XLibre ports needs pkgconfig to build, but some ports look for pkgconfig
# and then continue the build.
#
.include "${USESDIR}/pkgconfig.mk"
#
-# All xlibre ports need xorg-macros except for the server.
+# All XLibre ports need xorg-macros except for the servers.
#
. if ${PORTNAME} != xorg-macros && ${_XLIBRE_CAT} != server
USE_XLIBRE+= xlibre-macros
@@ -152,14 +141,16 @@ USE_XLIBRE+= xlibre-macros
#. elif ${_XLIBRE_CAT} == driver
. if ${_XLIBRE_CAT} == driver
-.include "../../x11-servers/xlibre-server/Makefile.version"
-MODULEDIR=lib/xorg/modules/xlibre-${XLIBRE_MJR_VER}
USE_XLIBRE+= xlibre-server
-USE_XORG+= xi xorgproto
+USE_XORG+= xorgproto
CFLAGS+= -Werror=uninitialized
+
+# Sets the XLibre module directory based on server version.
+.include "../../x11-servers/xlibre-server/Makefile.version"
+MODULEDIR= lib/xorg/modules/xlibre-${XLIBRE_MJR_VER}
PLIST_SUB+= MODULEDIR=${MODULEDIR}
. if ${_XLIBRE_BUILDSYS} == meson
-# Put special stuff for meson here
+# Put special stuff for driver meson here
. else
CONFIGURE_ENV+= PKG_CONFIG_PATH=${PREFIX}/libdata/pkgconfig/ \
DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
@@ -169,6 +160,9 @@ libtool_ARGS?= # empty
INSTALL_TARGET= install-strip
. endif
+# Add conflicts between X.Org and XLibre variants of X drivers:
+CONFLICTS= ${PORTNAME:tl:C/xlibre-//}
+
. elif ${_XLIBRE_CAT} == server
# For common flags across servers.
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index c56a47e73864..29b9471add9a 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, 21, 23, 24, 25
+# Possible values: 8, 11, 17, 21, 24, 25
. if ${ARCH:Marmv*} || ${ARCH} == powerpc
JAVA_DEFAULT?= 11
. elif ${ARCH:Mi386}
@@ -111,11 +111,11 @@ LUAJIT_DEFAULT?= luajit
. endif
# Possible values: 5.10, 5.20, 6.8
MONO_DEFAULT?= 5.20
-# Possible values: 8.0, 8.4, 9.6, 10.6m, 10.11m, 11.4m, 11.8m
+# Possible values: 8.0, 8.4, 9.6, 9.7, 10.6m, 10.11m, 11.4m, 11.8m
MYSQL_DEFAULT?= 8.4
# Possible values: ninja, samurai
NINJA_DEFAULT?= ninja
-# Possible value: 20, 22, 24, 25, current, lts (Note: current = 25 and lts = 24)
+# Possible value: 20, 22, 24, 25, 26, current, lts (Note: current = 26 and lts = 24)
NODEJS_DEFAULT?= lts
# Possible value: 25, 26
OPENLDAP_DEFAULT?= 26
@@ -150,7 +150,7 @@ PYCRYPTOGRAPHY_DEFAULT?= legacy
PYTHON_DEFAULT?= 3.11
# Possible values: 2.7
PYTHON2_DEFAULT?= 2.7
-# Possible values: 3.2, 3.3, 3.4, 4.0
+# Possible values: 3.3, 3.4, 4.0
RUBY_DEFAULT?= 3.4
# Possible values: rust, rust-nightly
RUST_DEFAULT?= rust
@@ -158,7 +158,7 @@ RUST_DEFAULT?= rust
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!
-# Possible values: base, openssl, openssl111, openssl34, openssl35,
+# Possible values: base, openssl, openssl34, openssl35,
# openssl36, libressl, libressl-devel
. if !defined(SSL_DEFAULT)
# If no preference was set, check for an installed base version
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 2b93bb32c348..2eb06744e114 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -77,7 +77,7 @@ ELF_FEATURES+= +wxneeded:dist/bin/${MOZILLA} +wxneeded:dist/bin/${MOZILLA}-bin
BUNDLE_LIBS= yes
BUILD_DEPENDS+= rust-cbindgen>=0.29.1:devel/rust-cbindgen \
- ${RUST_DEFAULT}>=1.94.0:lang/${RUST_DEFAULT}
+ ${RUST_DEFAULT}>=1.95.0:lang/${RUST_DEFAULT}
LIB_DEPENDS+= libdrm.so:graphics/libdrm
RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci
LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim
@@ -363,6 +363,11 @@ gecko-post-patch:
# Disable vendor checksums like lang/rust
@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
${MOZSRC}/third_party/rust/*/.cargo-checksum.json
+# Thunderbird has rust crates in the comm dir
+ @if [ -d ${MOZSRC}/comm/third_party/rust ] ; then \
+ ${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
+ ${MOZSRC}/comm/third_party/rust/*/.cargo-checksum.json; \
+ fi
pre-configure-script:
# Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index 38f1492f0dbd..eb5511aeddf8 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -24,6 +24,8 @@
# OPTIONS_RADIO_${NAME} - List of OPTIONS grouped as radio choice (for
# the radio named as ${NAME} as defined in
# OPTIONS_RADIO)
+# OPTIONS_RADIO_${NAME}_${ARCH} - List of OPTIONS to append to the radio group
+# named ${NAME} on architecture ${ARCH}
# OPTIONS_MULTI_${NAME} - List of OPTIONS grouped as multiple-choice
# (for the multi named as ${NAME} as defined in
# OPTIONS_MULTI)
@@ -219,6 +221,15 @@ OPTIONS_DEFINE+= ${opt}
. endif
. endfor
+# Add per arch radio options
+. for radio in ${OPTIONS_RADIO}
+. for opt in ${OPTIONS_RADIO_${radio}_${ARCH}}
+. if empty(OPTIONS_RADIO_${radio}:M${opt})
+OPTIONS_RADIO_${radio}+= ${opt}
+. endif
+. endfor
+. endfor
+
# Add per arch defaults
. if defined(OPTIONS_DEFAULT_${ARCH})
OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${ARCH}}
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 4c10b7fff842..3d480d0346cb 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -163,12 +163,12 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# IGNORE_${ARCH} - Port should be ignored on ${ARCH}.
# IGNORE_${OPSYS} - Port should be ignored on ${OPSYS}.
# IGNORE_${OPSYS}_${OSREL:R} - Port should be ignored on a single
-# release of ${OPSYS}, e.g IGNORE_FreeBSD_13
-# would affect all point releases of FreeBSD 13.
+# release of ${OPSYS}, e.g IGNORE_FreeBSD_14
+# would affect all point releases of FreeBSD 14.
# IGNORE_${OPSYS}_${OSREL:R}_${ARCH} - Port should be ignored on a
# single release of ${OPSYS} and specific architecture,
-# e.g IGNORE_FreeBSD_13_i386 would affect all point
-# releases of FreeBSD 13 in i386.
+# e.g IGNORE_FreeBSD_14_i386 would affect all point
+# releases of FreeBSD 14 in i386.
# BROKEN - Port is believed to be broken. Package builds can
# still be attempted using TRYBROKEN to test this
# assumption.
@@ -179,13 +179,13 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# can still be attempted using TRYBROKEN to
# test this assumption.
# BROKEN_${OPSYS}_${OSREL:R} - Port is believed to be broken on a single
-# release of ${OPSYS}, e.g BROKEN_FreeBSD_13
-# would affect all point releases of FreeBSD 13
+# release of ${OPSYS}, e.g BROKEN_FreeBSD_14
+# would affect all point releases of FreeBSD 14
# unless TRYBROKEN is also set.
# BROKEN_${OPSYS}_${OSREL:R}_${ARCH} - Port is believed to be broken on a
# single release of ${OPSYS} and specific architecture,
-# e.g BROKEN_FreeBSD_13 would affect all point
-# releases of FreeBSD 13 in i386
+# e.g BROKEN_FreeBSD_14 would affect all point
+# releases of FreeBSD 14 in i386
# unless TRYBROKEN is also set.
# DEPRECATED - Port is deprecated to install. Advisory only.
# EXPIRATION_DATE
@@ -1165,7 +1165,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
. endif
_EXPORTED_VARS+= OSVERSION
-. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1305000 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1403000))
+. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1403000
_UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\
are guaranteed to build on this system. Please upgrade to a supported release.
. if defined(ALLOW_UNSUPPORTED_SYSTEM)
@@ -2213,11 +2213,7 @@ PKG_SUFX= .pkg
. if defined(PKG_NOCOMPRESS)
PKG_COMPRESSION_FORMAT?= tar
. else
-. if ${OSVERSION} > 1400000
PKG_COMPRESSION_FORMAT?= tzst
-. else
-PKG_COMPRESSION_FORMAT?= txz
-. endif
. endif
# where pkg(8) stores its data
generated by cgit v1.3 (git 2.53.0) at 2026-05-14 06:02:27 +0000