diff options
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/Features/stack_autoinit.mk | 2 | ||||
-rw-r--r-- | Mk/Scripts/cargo-crates-git-common.awk | 20 | ||||
-rw-r--r-- | Mk/Scripts/qa.sh | 2 | ||||
-rw-r--r-- | Mk/Uses/gnome.mk | 10 | ||||
-rw-r--r-- | Mk/Uses/ruby.mk | 4 | ||||
-rw-r--r-- | Mk/bsd.gecko.mk | 5 | ||||
-rw-r--r-- | Mk/bsd.port.mk | 4 | ||||
-rw-r--r-- | Mk/bsd.sites.mk | 2 |
8 files changed, 27 insertions, 22 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/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/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 f3a20128a882..0adc034f5ef8 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -710,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 |