summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Features/ssp.mk1
-rw-r--r--Mk/Features/stack_autoinit.mk2
-rw-r--r--Mk/Scripts/cargo-crates-git-common.awk20
-rw-r--r--Mk/Scripts/check_have_symbols.sh1
-rw-r--r--Mk/Scripts/qa.sh2
-rw-r--r--Mk/Uses/cargo.mk2
-rw-r--r--Mk/Uses/gnome.mk10
-rw-r--r--Mk/Uses/go.mk2
-rw-r--r--Mk/Uses/gssapi.mk17
-rw-r--r--Mk/Uses/gstreamer.mk15
-rw-r--r--Mk/Uses/kde.mk16
-rw-r--r--Mk/Uses/llvm.mk2
-rw-r--r--Mk/Uses/luajit.mk6
-rw-r--r--Mk/Uses/mlt.mk2
-rw-r--r--Mk/Uses/mysql.mk2
-rw-r--r--Mk/Uses/nodejs.mk6
-rw-r--r--Mk/Uses/pathfix.mk3
-rw-r--r--Mk/Uses/perl5.mk6
-rw-r--r--Mk/Uses/php.mk20
-rw-r--r--Mk/Uses/python.mk16
-rw-r--r--Mk/Uses/ruby.mk6
-rw-r--r--Mk/Uses/xorg-cat.mk7
-rw-r--r--Mk/Wrappers/gm42
-rw-r--r--Mk/bsd.default-versions.mk18
-rw-r--r--Mk/bsd.gecko.mk5
-rw-r--r--Mk/bsd.port.mk41
-rw-r--r--Mk/bsd.sites.mk24
27 files changed, 105 insertions, 149 deletions
diff --git a/Mk/Features/ssp.mk b/Mk/Features/ssp.mk
index 2af92acd1d8e..b6be18ce35e8 100644
--- a/Mk/Features/ssp.mk
+++ b/Mk/Features/ssp.mk
@@ -17,6 +17,5 @@ SSP_Include_MAINTAINER= portmgr@FreeBSD.org
# Overridable as a user may want to use -fstack-protector-all
SSP_CFLAGS?= -fstack-protector-strong
CFLAGS+= ${SSP_CFLAGS}
-LDFLAGS+= ${SSP_CFLAGS}
. endif
.endif
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/check_have_symbols.sh b/Mk/Scripts/check_have_symbols.sh
index ee3095dabf74..652c975109dd 100644
--- a/Mk/Scripts/check_have_symbols.sh
+++ b/Mk/Scripts/check_have_symbols.sh
@@ -1,7 +1,6 @@
#!/bin/sh
set -eu
-set -o pipefail
# the 3 implementations of readelf we can use have different output, but they all have a similarity
# for the .gnu.version_d section they all have the symbol version in last element of their output
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/cargo.mk b/Mk/Uses/cargo.mk
index 19b0ac1e294e..f5325f39afdb 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc}
CARGO_BUILDDEP?= yes
. if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.87.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.88.0:lang/${RUST_DEFAULT}
. elif ${CARGO_BUILDDEP:tl} == "any-version"
BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
. endif
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/go.mk b/Mk/Uses/go.mk
index f56114da9973..5bb8b245644c 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -70,7 +70,7 @@ _INCLUDE_USES_GO_MK= yes
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-GO_VALID_VERSIONS= 1.20 1.21 1.22 1.23 1.24 1.25-devel
+GO_VALID_VERSIONS= 1.20 1.21 1.22 1.23 1.24 1.25 1.26-devel
# Check arguments sanity
. if !empty(go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun)
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
index 46eea2d10071..b419a8fe27ff 100644
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk
@@ -86,6 +86,18 @@ _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/libdata/pkgconfig/mit-krb5.pc)
+ # Base has MIT KRB5 installed
+KRB5_HOME?= /usr
+GSSAPIBASEDIR= ${KRB5_HOME}
+GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib
+GSSAPIINCDIR= ${GSSAPIBASEDIR}/include
+_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h
+GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}"
+GSSAPILIBS= -lkrb5 -lgssapi_krb5
+GSSAPILDFLAGS=
+. else
+ # Base has Heimdal KRB5 installed
HEIMDAL_HOME= /usr
GSSAPIBASEDIR= ${HEIMDAL_HOME}
GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib
@@ -94,7 +106,9 @@ _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}"
GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5
GSSAPILDFLAGS=
+. endif
. elif ${_local} == "heimdal"
+ # Heimdal port selected
HEIMDAL_HOME?= ${LOCALBASE}
GSSAPIBASEDIR= ${HEIMDAL_HOME}
GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib/heimdal
@@ -111,11 +125,12 @@ GSSAPILIBS= -lkrb5 -lgssapi
GSSAPILDFLAGS= -L"${GSSAPILIBDIR}"
_RPATH= ${GSSAPILIBDIR}
. elif ${_local} == "mit"
+ # MIT KRB5 port selected
KRB5_HOME?= ${LOCALBASE}
GSSAPIBASEDIR= ${KRB5_HOME}
GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib
GSSAPIINCDIR= ${GSSAPIBASEDIR}/include
-_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
+_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h
. if !defined(_KRB_BOOTSTRAP)
BUILD_DEPENDS+= ${_MITKRB5_DEPENDS}
RUN_DEPENDS+= ${_MITKRB5_DEPENDS}
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
index 22d1c3ea73af..edc677b9f663 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.2
+# 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.5
_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 2db876e02ad8..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.1
+KDE_PLASMA6_VERSION?= 6.4.4
KDE_PLASMA6_BRANCH?= stable
# Legacy KDE frameworks (Qt5 based).
@@ -99,13 +99,13 @@ 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:
# devel/kdevelop, games/libkdegames, games/libkmahjongg, graphics/kgraphviewer
-KDE_APPLICATIONS6_VERSION?= 25.04.2
-KDE_APPLICATIONS6_SHLIB_VER?= 6.4.2
+KDE_APPLICATIONS6_VERSION?= 25.04.3
+KDE_APPLICATIONS6_SHLIB_VER?= 6.4.3
# 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
@@ -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/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/mlt.mk b/Mk/Uses/mlt.mk
index da70a759d558..2cf044dcad0a 100644
--- a/Mk/Uses/mlt.mk
+++ b/Mk/Uses/mlt.mk
@@ -37,7 +37,7 @@ _MLT_NODEPEND= yes
. endif
# Library dependencies
-_MLT7_VERSION= 7.30.0
+_MLT7_VERSION= 7.32.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 fa63b6cf465c..8062734165a7 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -63,7 +63,7 @@ MYSQL80_LIBVER= 21
MYSQL84_LIBVER= 24
MYSQL91_LIBVER= 24
-. for v in 105 106 1011 114 118
+. for v in 106 1011 114 118
MYSQL${v}m_LIBVER= 3
. endfor
diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
index d758bba2adcb..e8987827fe2e 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, 18, 20, 22, 23, 24
+# - version available version: lts, current, 18, 20, 22, 24
#
# 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= 18 20 22 23 24 current lts
+_VALID_NODEJS_VERSIONS= 18 20 22 24 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:N18:N20:N22:N23:N24)
+. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N22:N24)
IGNORE= USES=nodejs has invalid arguments ${nodejs_ARGS}
. endif
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/perl5.mk b/Mk/Uses/perl5.mk
index 61ca6a5a4668..4e5883bb59d0 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -46,6 +46,8 @@ USE_PERL5?= run build
.include "${PORTSDIR}/lang/perl5.38/version.mk"
. elif ${PERL5_DEFAULT} == 5.40
.include "${PORTSDIR}/lang/perl5.40/version.mk"
+. elif ${PERL5_DEFAULT} == 5.42
+.include "${PORTSDIR}/lang/perl5.42/version.mk"
. elif ${PERL5_DEFAULT} == devel
.include "${PORTSDIR}/lang/perl5-devel/version.mk"
# Force PERL_PORT here in case two identical PERL_VERSION.
@@ -79,7 +81,9 @@ PERL_ARCH?= mach
# perl5_default file, or up there in the default versions selection.
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-. if ${PERL_LEVEL} >= 504000
+. if ${PERL_LEVEL} >= 504200
+PERL_PORT?= perl5.42
+. elif ${PERL_LEVEL} >= 504000
PERL_PORT?= perl5.40
. else # ${PERL_LEVEL} < 504000
PERL_PORT?= perl5.38
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index 9d5568e05047..c1f8a0061abd 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -110,7 +110,7 @@ DIST_SUBDIR= PECL
PHPBASE?= ${LOCALBASE}
-_ALL_PHP_VERSIONS= 81 82 83 84
+_ALL_PHP_VERSIONS= 81 82 83 84 85
# Make the already installed PHP the default one.
. if exists(${PHPBASE}/etc/php.conf)
@@ -179,7 +179,10 @@ PHP_VER= ${FLAVOR:S/^php//}
(${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]})
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-. if ${PHP_VER} == 84
+. if ${PHP_VER} == 85
+PHP_EXT_DIR= 20240925
+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
. elif ${PHP_VER} == 83
@@ -375,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 \
@@ -383,10 +386,11 @@ _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
bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR}
@@ -473,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/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/Uses/ruby.mk b/Mk/Uses/ruby.mk
index 620fff71f832..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
@@ -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/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/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 4f67b9cd6ab0..9fa1c3a4ae42 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -63,7 +63,7 @@ GCC_DEFAULT?= 13
GHOSTSCRIPT_DEFAULT?= 10
# Possible values: mesa-libs, mesa-devel
GL_DEFAULT?= mesa-libs
-# Possible values: 1.20, 1.21, 1.22, 1.23, 1.24, 1.25-devel
+# Possible values: 1.20, 1.21, 1.22, 1.23, 1.24, 1.25, 1.26-devel
GO_DEFAULT?= 1.24
# Possible values: 1.8, 2.2, 3.0
GUILE_DEFAULT?= 2.2
@@ -75,11 +75,11 @@ 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
-LAZARUS_DEFAULT?= 4.0
+LAZARUS_DEFAULT?= 4.2
. endif
# Possible values: rust, legacy
. if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
@@ -93,7 +93,7 @@ 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
@@ -101,19 +101,19 @@ LUA_DEFAULT?= 5.4
. if ${ARCH:Mpowerpc64*}
LUAJIT_DEFAULT?= luajit-openresty
. else
-LUAJIT_DEFAULT?= luajit-devel
+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
+# Possible values: 8.0, 8.4, 9.1, 10.6m, 10.11m, 11.4m, 11.8m
MYSQL_DEFAULT?= 8.0
# Possible values: ninja, samurai
NINJA_DEFAULT?= ninja
-# Possible value: 18, 20, 22, 23, 24, current, lts (Note: current = 24 and lts = 22)
+# Possible value: 18, 20, 22, 24, current, lts (Note: current = 24 and lts = 22)
NODEJS_DEFAULT?= lts
# Possible value: 25, 26
OPENLDAP_DEFAULT?= 26
-# Possible values: 5.38, 5.40, devel
+# Possible values: 5.38, 5.40, 5.42, devel
. if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
defined(PACKAGE_BUILDING))
# When changing the default here, make sure the DEPRECATED/EXPIRATION lines in
@@ -132,7 +132,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R}
. endif
# Possible values: 13, 14, 15, 16, 17
PGSQL_DEFAULT?= 17
-# Possible values: 8.1, 8.2, 8.3, 8.4
+# Possible values: 8.1, 8.2, 8.3, 8.4, 8.5
PHP_DEFAULT?= 8.3
# Possible values: rust, legacy
. if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 85e3a8900654..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.87.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 343dc63683f0..0aa79aed7ed0 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
@@ -1165,7 +1165,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
. endif
_EXPORTED_VARS+= OSVERSION
-. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1304000 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1402000))
+. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1305000 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1402000))
_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)
@@ -1203,14 +1203,6 @@ _OSVERSION_MAJOR= ${OSVERSION:C/([0-9]?[0-9])([0-9][0-9])[0-9]{3}/\1/}
. if !defined(_PKG_VERSION)
_PKG_VERSION!= ${PKG_BIN} -v
. endif
-# XXX hack for smooth transition towards pkg 1.17
-_PKG_BEFORE_PKGEXT!= ${PKG_BIN} version -t ${_PKG_VERSION:C/-.*//g} 1.17.0
-. if ${_PKG_BEFORE_PKGEXT} == "<"
-_PKG_TRANSITIONING_TO_NEW_EXT= yes
-_EXPORTED_VARS+= _PKG_TRANSITIONING_TO_NEW_EXT
-WARNING+= "It is strongly recommended to upgrade to a newer version of pkg first"
-. endif
-# XXX End of hack
_PKG_STATUS!= ${PKG_VERSION} -t ${_PKG_VERSION:C/-.*//g} ${MINIMAL_PKG_VERSION}
. if ${_PKG_STATUS} == "<"
IGNORE= pkg(8) must be version ${MINIMAL_PKG_VERSION} or greater, but you have ${_PKG_VERSION}. You must upgrade the ${PKG_ORIGIN} port first
@@ -2208,20 +2200,11 @@ TMPPLIST?= ${WRKDIR}/.PLIST.mktmp
_PLIST?= ${WRKDIR}/.PLIST
# backward compatibility for users
-. if defined(_PKG_TRANSITIONING_TO_NEW_EXT)
-. if defined(PKG_NOCOMPRESS)
-PKG_SUFX?= .tar
-. else
-PKG_SUFX?= .txz
-. endif
-PKG_COMPRESSION_FORMAT?= ${PKG_SUFX:S/.//}
-. else
-. if defined(PKG_SUFX)
+. if defined(PKG_SUFX)
PKG_COMPRESSION_FORMAT?= ${PKG_SUFX:S/.//}
WARNING+= "PKG_SUFX is defined, it should be replaced with PKG_COMPRESSION_FORMAT"
-. endif
-PKG_SUFX= .pkg
. endif
+PKG_SUFX= .pkg
. if defined(PKG_NOCOMPRESS)
PKG_COMPRESSION_FORMAT?= tar
. else
@@ -3456,18 +3439,6 @@ _EXTRA_PACKAGE_TARGET_DEP+= ${PKGLATESTFILE}
${PKGLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY}
${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE}
-. if !defined(_PKG_TRANSITIONING_TO_NEW_EXT) && ${PKG_COMPRESSION_FORMAT} == txz
-_EXTRA_PACKAGE_TARGET_DEP+= ${PKGOLDLATESTFILE} ${PKGOLDSIGFILE}
-
-${PKGOLDLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY}
- ${INSTALL} -l rs ${PKGFILE} ${PKGOLDLATESTFILE}
-
-# Temporary workaround to be deleted once every supported version of FreeBSD
-# have a bootstrap which handles the pkg extension.
-
-${PKGOLDSIGFILE}: ${PKGLATESTREPOSITORY}
- ${INSTALL} -l rs pkg.pkg.sig ${PKGOLDSIGFILE}
-. endif
. endif
. endif
@@ -3629,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-15 05:22:35 +0000