summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Features/stack_autoinit.mk2
-rw-r--r--Mk/Scripts/cargo-crates-git-common.awk20
-rw-r--r--Mk/Scripts/qa.sh2
-rw-r--r--Mk/Uses/gnome.mk10
-rw-r--r--Mk/Uses/gstreamer.mk15
-rw-r--r--Mk/Uses/kde.mk2
-rw-r--r--Mk/Uses/pathfix.mk3
-rw-r--r--Mk/Uses/php.mk14
-rw-r--r--Mk/Uses/ruby.mk4
-rw-r--r--Mk/Uses/xorg-cat.mk7
-rw-r--r--Mk/bsd.default-versions.mk6
-rw-r--r--Mk/bsd.gecko.mk5
-rw-r--r--Mk/bsd.port.mk4
-rw-r--r--Mk/bsd.sites.mk24
14 files changed, 51 insertions, 67 deletions
diff --git a/Mk/Features/stack_autoinit.mk b/Mk/Features/stack_autoinit.mk
index 4d79416dbcce..627b785b6ee0 100644
--- a/Mk/Features/stack_autoinit.mk
+++ b/Mk/Features/stack_autoinit.mk
@@ -7,7 +7,7 @@
#
# WITH_STACK_AUTOINIT Enable for all ports.
# WITH_STACK_AUTOINIT_PORTS Enable for specified category/port-name
-# STACK_AUTOINIT_TYPE Valid options: zero (default), pattern, unitialized
+# STACK_AUTOINIT_TYPE Valid options: zero (default), pattern, uninitialized
#
.if !defined(_STACK_AUTOINIT_MK_INCLUDED)
diff --git a/Mk/Scripts/cargo-crates-git-common.awk b/Mk/Scripts/cargo-crates-git-common.awk
index 36eb0027d3d7..e2263f94678a 100644
--- a/Mk/Scripts/cargo-crates-git-common.awk
+++ b/Mk/Scripts/cargo-crates-git-common.awk
@@ -73,6 +73,26 @@ function split_git_url(info, git_url, url, path, account, project, commit, i, d
info["dir"] = sprintf("%s-%s", project, dir_ver)
return 1
+ } else if (url["host"] == "codeberg.org") {
+ split(url["path"], path, "/")
+ account = path[2]
+ project = path[3]
+ sub(/\.[gG][iI][tT]$/, "", project)
+ commit = commit_from_git_url(url)
+
+ delete url
+ url["scheme"] = "https"
+ url["host"] = "codeberg.org"
+ url["path"] = sprintf("/%s/%s/archive/%s.tar.gz", account, project, commit)
+ url["query"] = "dummy"
+ url["query", "dummy"] = "/"
+ info["site"] = join_url(url)
+
+ info["filename"] = sprintf("%s-%s-%s_CB0.tar.gz", account, project, commit)
+
+ info["dir"] = sprintf("%s", project)
+
+ return 1
} else if (gitlab_hosts[url["host"]]) {
split(url["path"], path, "/")
account = path[2]
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
index 781143db972e..9c351420f607 100644
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -371,7 +371,6 @@ proxydeps_suggest_uses() {
${pkg} = "graphics/cairomm" -o \
${pkg} = "devel/dconf" -o \
${pkg} = "devel/gconf2" -o \
- ${pkg} = "devel/gconfmm26" -o \
${pkg} = "devel/glib20" -o \
${pkg} = "devel/glibmm" -o \
${pkg} = "audio/gsound" -o \
@@ -386,7 +385,6 @@ proxydeps_suggest_uses() {
${pkg} = "x11-toolkits/gtksourceviewmm3" -o \
${pkg} = "databases/libgda5" -o \
${pkg} = "databases/libgda5-ui" -o \
- ${pkg} = "databases/libgdamm5" -o \
${pkg} = "devel/libglade2" -o \
${pkg} = "graphics/libgnomecanvas" -o \
${pkg} = "x11/libgnomekbd" -o \
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 7d99d5df0bd0..59d070c747f8 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -83,8 +83,8 @@ _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
_USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5 gnomedesktop4 nautilus4
# C++ bindings
-_USE_GNOME_ALL+=atkmm cairomm cairomm11 gconfmm26 glibmm glibmm26 gtkmm24 \
- gtkmm30 gtkmm40 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \
+_USE_GNOME_ALL+=atkmm cairomm cairomm11 glibmm glibmm26 gtkmm24 \
+ gtkmm30 gtkmm40 gtksourceviewmm3 libxml++26 libsigc++20 \
libsigc++30 pangomm pangomm24
# glib-mkenums often fails with C locale
@@ -116,9 +116,6 @@ cairomm_USE_GNOME_IMPL= cairo libsigc++20
cairomm11_LIB_DEPENDS= libcairomm-1.16.so:graphics/cairomm11
cairomm11_USE_GNOME_IMPL= cairo libsigc++30
-gconfmm26_LIB_DEPENDS= libgconfmm-2.6.so:devel/gconfmm26
-gconfmm26_USE_GNOME_IMPL= glibmm gconf2
-
glibmm_LIB_DEPENDS= libglibmm-2.4.so:devel/glibmm
glibmm_USE_GNOME_IMPL= libsigc++20 glib20
@@ -142,9 +139,6 @@ gtkmm40_USE_GNOME_IMPL= cairomm11 gdkpixbuf glibmm26 gtk40 pangomm24
gtksourceviewmm3_LIB_DEPENDS= libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3
gtksourceviewmm3_USE_GNOME_IMPL= gtkmm30 gtksourceview3
-libgdamm5_LIB_DEPENDS= libgdamm-5.0.so:databases/libgdamm5
-libgdamm5_USE_GNOME_IMPL= libgda5 glibmm
-
libsigc++20_LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20
libsigc++30_LIB_DEPENDS= libsigc-3.0.so:devel/libsigc++30
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
index 221b146a2128..bdc0b836195c 100644
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@@ -39,16 +39,9 @@ _GST_VER= ${_GST_VER_DEFAULT}
#== Component setup
-# When modifying _GST1_VERSION, be sure to also update distinfo for the
-# following ports:
-# - multimedia/gstreamer1
-# - multimedia/gstreamer1-editing-services
-# - multimedia/gstreamer1-libav
-# - multimedia/gstreamer1-plugins (via `make makesum-gst1`)
-# - multimedia/gstreamer1-rtsp-server
-# - multimedia/gstreamer1-vaapi
-# - multimedia/py-gstreamer1
-_GST1_VERSION= 1.26.3
+# 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_LIB_VER= 1.0
_GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0
@@ -355,7 +348,7 @@ gst-rtsp-server_IMPL= #
gst-rust_PORT= multimedia/gstreamer${_GST_VER}-plugins-rust
gst-rust_IMPL= #
-gst-rust_GST1_VERSION= 0.13.6
+gst-rust_GST1_VERSION= 0.14.0
gst-rust_VERSION= ${gst-rust_GST${_GST_VER}_VERSION}
gst-smoothstreaming_PORT= multimedia/gstreamer${_GST_VER}-plugins-smoothstreaming
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 812619911717..71980d8f867e 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).
diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk
index 049224a15621..57c734f93cb3 100644
--- a/Mk/Uses/pathfix.mk
+++ b/Mk/Uses/pathfix.mk
@@ -54,8 +54,7 @@ pathfix:
s|[{]datadir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[(]prefix[)]/share/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
- s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \
- s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
+ s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g'
. endfor
. endif
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index d6b59898cb5b..c1f8a0061abd 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -181,7 +181,7 @@ PHP_VER= ${FLAVOR:S/^php//}
# Mk/bsd.default-versions.mk in sync.
. if ${PHP_VER} == 85
PHP_EXT_DIR= 20240925
-PHP_EXT_INC= hash json openssl pcre random spl
+PHP_EXT_INC= hash json opcache openssl pcre random spl
. elif ${PHP_VER} == 84
PHP_EXT_DIR= 20240924
PHP_EXT_INC= hash json openssl pcre random spl
@@ -378,7 +378,7 @@ add-plist-phpext:
_USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \
enchant exif ffi fileinfo filter ftp gd gettext gmp \
hash iconv igbinary imap intl json ldap mbstring mcrypt \
- memcache memcached mysqli odbc opcache \
+ memcache memcached mysqli odbc \
openssl pcntl pcre pdo pdo_dblib pdo_firebird pdo_mysql \
pdo_odbc pdo_pgsql pdo_sqlite phar pgsql posix \
pspell radius random readline redis session shmop simplexml snmp \
@@ -386,10 +386,10 @@ _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \
tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zephir_parser \
zip zlib
# version specific components
-_USE_PHP_VER81= ${_USE_PHP_ALL}
-_USE_PHP_VER82= ${_USE_PHP_ALL}
-_USE_PHP_VER83= ${_USE_PHP_ALL}
-_USE_PHP_VER84= ${_USE_PHP_ALL}
+_USE_PHP_VER81= ${_USE_PHP_ALL} opcache
+_USE_PHP_VER82= ${_USE_PHP_ALL} opcache
+_USE_PHP_VER83= ${_USE_PHP_ALL} opcache
+_USE_PHP_VER84= ${_USE_PHP_ALL} opcache
_USE_PHP_VER85= ${_USE_PHP_ALL}
bcmath_DEPENDS= math/php${PHP_VER}-bcmath
@@ -477,9 +477,11 @@ RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension:S/:build//}.so:${${e
. endif
. else
. if ${ext:tl} != "yes" && !defined(_IGNORE_PHP_SET)
+. if empty(PHP_EXT_INC:M${extension:S/:build//})
check-makevars::
@${ECHO_CMD} "Unknown extension ${extension:S/:build//} for PHP ${PHP_VER}."
@${FALSE}
+. endif
. endif
. endif
. endfor
diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk
index 249f0b8bec7e..55bb74a50fd7 100644
--- a/Mk/Uses/ruby.mk
+++ b/Mk/Uses/ruby.mk
@@ -147,14 +147,14 @@ RUBY?= ${LOCALBASE}/bin/ruby${RUBY_SUFFIX}
#
# Ruby 3.2
#
-RUBY_DISTVERSION= 3.2.8
+RUBY_DISTVERSION= 3.2.9
RUBY_PORTREVISION= 0
. elif ${RUBY_VER} == 3.3
#
# Ruby 3.3
#
-RUBY_DISTVERSION= 3.3.8
+RUBY_DISTVERSION= 3.3.9
RUBY_PORTREVISION= 0
diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk
index 0853fd6b3e3c..b81972b4ae5f 100644
--- a/Mk/Uses/xorg-cat.mk
+++ b/Mk/Uses/xorg-cat.mk
@@ -14,8 +14,6 @@
# * font don't install .pc file
# * lib various dependencies, install .pc file, needs
# pathfix
-# * proto install .pc file, needs pathfix, most only needed at
-# build time.
# * util no particular notes
#
# These categories has to match upstream categories. Don't invent
@@ -34,7 +32,7 @@
.if !defined(_INCLUDE_USES_XORG_CAT_MK)
_INCLUDE_USES_XORG_CAT_MK=yes
-_XORG_CATEGORIES= app data doc driver font lib proto util
+_XORG_CATEGORIES= app data doc driver font lib util
_XORG_BUILDSYSTEMS= autotools meson
_XORG_CAT= # empty
@@ -158,9 +156,6 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS+=--enable-malloc0returnsnull
. endif
-. elif ${_XORG_CAT} == proto
-.include "${USESDIR}/pathfix.mk"
-
. endif # ${_XORG_CAT} == <category>
# We only need to include xorg.mk if we want USE_XORG modules
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 51529a07afcb..db84d8cd8ead 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -79,7 +79,7 @@ JAVA_DEFAULT?= 8
. if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64}
LAZARUS_DEFAULT?= 4.99
. else
-LAZARUS_DEFAULT?= 4.0
+LAZARUS_DEFAULT?= 4.2
. endif
# Possible values: rust, legacy
. if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
@@ -98,7 +98,11 @@ 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
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index fd1813ab8662..3e47b64ad63a 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -61,7 +61,7 @@ MOZILLA_VER?= ${PORTVERSION}
MOZILLA_BIN?= ${PORTNAME}-bin
MOZILLA_EXEC_NAME?=${MOZILLA}
USES+= compiler:c++17-lang cpe elfctl gl gmake gnome iconv \
- llvm:min=17,noexport localbase \
+ llvm:min=17,noexport localbase nodejs:24,build,env \
pkgconfig python:build desktop-file-utils
CPE_VENDOR?=mozilla
USE_GL= gl
@@ -77,8 +77,7 @@ ELF_FEATURES+= +wxneeded:dist/bin/${MOZILLA} +wxneeded:dist/bin/${MOZILLA}-bin
BUNDLE_LIBS= yes
BUILD_DEPENDS+= rust-cbindgen>=0.28.0:devel/rust-cbindgen \
- ${RUST_DEFAULT}>=1.88.0:lang/${RUST_DEFAULT} \
- node:www/node
+ ${RUST_DEFAULT}>=1.88.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
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index fb3e0cc839eb..0aa79aed7ed0 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3600,10 +3600,6 @@ install-ldconfig-file:
fixup-lib-pkgconfig:
@if [ -d ${STAGEDIR}${PREFIX}/lib/pkgconfig ]; then \
if [ -z "$$(${FIND} ${STAGEDIR}${PREFIX}/lib/pkgconfig -maxdepth 0 -empty)" ]; then \
- if [ -n "${DEVELOPER:Dyes}" ]; then \
- ${ECHO_MSG} "===> File(s) found in lib/pkgconfig while correct path is libdata/pkgconfig"; \
- ${ECHO_MSG} " Applying fix but consider using USES= pathfix or adjust install path"; \
- fi; \
${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \
${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/* ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \
fi; \
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 93f2b6f4325c..0adc034f5ef8 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -40,8 +40,7 @@ MASTER_SITE_PORTS_JP+= \
.if !defined(IGNORE_MASTER_SITE_AFTERSTEP)
MASTER_SITE_AFTERSTEP+= \
- ftp://ftp.afterstep.org/%SUBDIR%/ \
- ftp://ftp.kddlabs.co.jp/X11/AfterStep/%SUBDIR%/
+ ftp://ftp.afterstep.org/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_APACHE)
@@ -51,7 +50,6 @@ MASTER_SITE_APACHE+= \
https://mirror.its.dal.ca/apache/%SUBDIR%/ \
http://mirror.cogentco.com/pub/apache/%SUBDIR%/ \
http://mirror.navercorp.com/apache/%SUBDIR%/ \
- http://ftp.kddi-research.jp/infosystems/apache/%SUBDIR%/ \
http://miroir.univ-lorraine.fr/apache/%SUBDIR%/
.endif
@@ -591,25 +589,16 @@ _gnome_ver= ${_version_major}.${_version_minor}
. endif
. endif
-. if !empty(MASTER_SITES:M*/archive/*)
-_GNOME_PATH= %SUBDIR%
-. else
_GNOME_PATH= %SUBDIR%/${_gnome_ver}
-. endif
MASTER_SITE_GNOME+= \
- https://download.gnome.org/${_GNOME_PATH}/ \
- http://ftp.belnet.be/mirror/ftp.gnome.org/gnomeftp/${_GNOME_PATH}/ \
- https://ftp.acc.umu.se/pub/GNOME/${_GNOME_PATH}/ \
- https://fr2.rpmfind.net/linux/gnome.org/${_GNOME_PATH}/ \
- https://gitlab.gnome.org/GNOME/${PORTNAME}/-/archive/${PORTVERSION}/
-
+ https://download.gnome.org/${_GNOME_PATH}/
.endif
.if !defined(IGNORE_MASTER_SITE_GIMP)
MASTER_SITE_GIMP+= \
- http://gimp.mirrors.hoobly.com/pub/%SUBDIR%/ \
- http://gimp.afri.cc/pub/%SUBDIR%/ \
+ https://ftp.gwdg.de/pub/misc/grafik/%SUBDIR%/ \
+ https://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
https://download.gimp.org/pub/%SUBDIR%/
.endif
@@ -621,7 +610,6 @@ MASTER_SITE_GNU+= \
https://www.nic.funet.fi/pub/gnu/gnu/%SUBDIR%/ \
http://mirror.navercorp.com/gnu/%SUBDIR%/ \
http://ftp.halifax.rwth-aachen.de/gnu/%SUBDIR%/ \
- http://ftp.kddilabs.jp/GNU/gnu/%SUBDIR%/ \
ftp://mirrors.rit.edu/gnu/%SUBDIR%/ \
ftp://ftp.fu-berlin.de/unix/gnu/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/ftp.gnu.org/gnu/%SUBDIR%/ \
@@ -722,8 +710,6 @@ MASTER_SITE_MOZILLA_ADDONS+= \
.if !defined(IGNORE_MASTER_SITE_MYSQL)
MASTER_SITE_MYSQL+= \
- ftp://ftp.fi.muni.cz/pub/mysql/Downloads/%SUBDIR%/ \
- ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/%SUBDIR%/ \
https://dev.mysql.com/get/Downloads/%SUBDIR%/
.endif
@@ -812,7 +798,6 @@ MASTER_SITE_PERL_CPAN_BY+= \
https://cpan.metacpan.org/modules/by-module/%SUBDIRPLUS%/ \
https://www.cpan.org/%CPANSORT%/%SUBDIR%/ \
ftp://ftp.cpan.org/pub/CPAN/%CPANSORT%/%SUBDIR%/ \
- ftp://ftp.kddlabs.co.jp/lang/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
http://ftp.jaist.ac.jp/pub/CPAN/%CPANSORT%/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/cpan.perl.org/CPAN/%CPANSORT%/%SUBDIR%/ \
ftp://ftp.auckland.ac.nz/pub/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
@@ -971,7 +956,6 @@ MASTER_SITE_SUNSITE+= \
.if !defined(IGNORE_MASTER_SITE_TCLTK)
MASTER_SITE_TCLTK+= \
ftp://ftp.tcl.tk/pub/tcl/%SUBDIR%/ \
- ftp://ftp.kddlabs.co.jp/lang/tcl/ftp.scriptics.com/%SUBDIR%/ \
ftp://ftp.mirrorservice.org/sites/ftp.tcl.tk/pub/tcl/%SUBDIR%/ \
ftp://ftp.funet.fi/pub/languages/tcl/tcl/%SUBDIR%/
.endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 21:01:51 +0000