Hi,
Apply the same treatmenent to DIST_TUPLE pattern for fdo than for
gitlab: For ports with a real release in their gitlab, fetch a
distfile which doesn't include the commit hash in the top-level
directory name. And fix the affected ports. Ports which have a tag or
a commit hash don't need a change.
ok ?
Index: infrastructure/db/dist-tuple.pattern
===================================================================
RCS file: /cvs/ports/infrastructure/db/dist-tuple.pattern,v
diff -u -p -u -r1.14 dist-tuple.pattern
--- infrastructure/db/dist-tuple.pattern 1 Nov 2026 08:33:26 -0000
1.14
+++ infrastructure/db/dist-tuple.pattern 1 Nov 2026 09:05:41 -0000
@@ -19,7 +19,7 @@ TEMPLATE_DISTFILES.codeberg ?= \
<account>-<project>-{<account>/<project>/archive/}<id>${EXTRACT_SUFX.codeberg}
TEMPLATE_DISTFILES.fdo ?= \
-
<account>-<project>-{<account>/<project>/-/archive/<id>/}<id>${EXTRACT_SUFX.fdo}
+
<account>-{<account>/<project>/-/archive/<id>/}<project>-<id>${EXTRACT_SUFX.fdo}
TEMPLATE_DISTFILES.github ?= \
<account>-<project>-{<account>/<project>/archive/<subdir>}<id>${EXTRACT_SUFX.github}
Index: devel/vali/Makefile
===================================================================
RCS file: /cvs/ports/devel/vali/Makefile,v
diff -u -p -u -r1.1.1.1 Makefile
--- devel/vali/Makefile 6 Apr 2026 10:09:17 -0000 1.1.1.1
+++ devel/vali/Makefile 1 Nov 2026 09:05:41 -0000
@@ -1,8 +1,8 @@
COMMENT = Varlink C implementation and code generator
V = 0.1.1
-COMMIT = bd4b709430eef9a1252198f9a0ea4a05930eda26
DIST_TUPLE = fdo emersion vali v${V} .
+REVISION = 0
SHARED_LIBS += vali 0.0 # 0.0
CATEGORIES = devel
@@ -20,6 +20,6 @@ MODULES = devel/meson
LIB_DEPENDS = devel/aml \
devel/json-c
-WRKDIST = ${WRKDIR}/vali-v${V}-${COMMIT}
+WRKDIST = ${WRKDIR}/vali-v${V}
.include <bsd.port.mk>
Index: multimedia/gstreamer1/plugins-rs/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/gstreamer1/plugins-rs/Makefile,v
diff -u -p -u -r1.17 Makefile
--- multimedia/gstreamer1/plugins-rs/Makefile 23 Sep 2026 17:31:46 -0000
1.17
+++ multimedia/gstreamer1/plugins-rs/Makefile 1 Nov 2026 09:05:41 -0000
@@ -2,8 +2,8 @@ COMMENT= GStreamer bindings for Rust
V= 0.15.4
DIST_TUPLE= fdo gstreamer gst-plugins-rs ${V} .
-WRKDIST=
${WRKDIR}/gst-plugins-rs-${V}-1afff3711855238433862c0ce3bf34918e500386
-REVISION= 0
+WRKDIST= ${WRKDIR}/gst-plugins-rs-${V}
+REVISION= 1
# see patch-Cargo_toml;
# grep git+https Cargo.lock | sort -u
Index: multimedia/gstreamer1/plugins-rs/distinfo
===================================================================
RCS file: /cvs/ports/multimedia/gstreamer1/plugins-rs/distinfo,v
diff -u -p -u -r1.12 distinfo
--- multimedia/gstreamer1/plugins-rs/distinfo 23 Sep 2026 17:21:37 -0000
1.12
+++ multimedia/gstreamer1/plugins-rs/distinfo 1 Nov 2026 09:05:42 -0000
@@ -1046,7 +1046,7 @@ SHA256 (gstreamer/../cargo/zstd-sys-2.1.
SHA256 (gstreamer/../cargo/zune-core-0.5.3.tar.gz) =
1WN3/UY2iYShcLxarFVn5Syl2odMqmC+o5/Lynj7ZYs=
SHA256 (gstreamer/../cargo/zune-inflate-0.2.54.tar.gz) =
c6szL+L2aABo81grFqJPkK1wltXTm5dNHAr/ASURbwI=
SHA256 (gstreamer/../cargo/zune-jpeg-0.5.15.tar.gz) =
J7ydW4FbwQPxQqoFT1YdkYfRkWkux8LR4rRzf429cpY=
-SHA256 (gstreamer/gstreamer-gst-plugins-rs-0.15.4.tar.gz) =
eLevGuJkHeVpkDNG3uaFxjnpOiFez/QqLKgnJ5hy73I=
+SHA256 (gstreamer/gstreamer-gst-plugins-rs-0.15.4.tar.gz) =
LBntgxZpV4K3ghNbo1YBp4iG4W9Rl5Zaq2bSb0d1NO0=
SHA256
(gstreamer/gstreamer-gstreamer-rs-50d71e64ce6153a4dda06fc03f09eb2755fb9285.tar.gz)
= LNxTRh+755EAvXuIYuzDzzU05dTlScLJT11HPXGQoDE=
SHA256
(gstreamer/gtk-rs-gtk-rs-core-08a30b9cccafc82194cb24df13806a176f20b0ae.tar.gz)
= YX1tWDAenGGunzF52y+JQ4N4zhT6gI5lv3nP9pEdyfE=
SHA256
(gstreamer/gtk-rs-gtk4-rs-2fcbc1544689df84b4f607d4dd6e7be668482494.tar.gz) =
5FGWKguWvkIrHppKjbN3i9W5p//65RhBUHJYlum5ftc=
@@ -2100,7 +2100,7 @@ SIZE (gstreamer/../cargo/zstd-sys-2.1.0+
SIZE (gstreamer/../cargo/zune-core-0.5.3.tar.gz) = 30419
SIZE (gstreamer/../cargo/zune-inflate-0.2.54.tar.gz) = 37973
SIZE (gstreamer/../cargo/zune-jpeg-0.5.15.tar.gz) = 88879
-SIZE (gstreamer/gstreamer-gst-plugins-rs-0.15.4.tar.gz) = 3506122
+SIZE (gstreamer/gstreamer-gst-plugins-rs-0.15.4.tar.gz) = 3502887
SIZE
(gstreamer/gstreamer-gstreamer-rs-50d71e64ce6153a4dda06fc03f09eb2755fb9285.tar.gz)
= 1650054
SIZE
(gstreamer/gtk-rs-gtk-rs-core-08a30b9cccafc82194cb24df13806a176f20b0ae.tar.gz)
= 1069159
SIZE
(gstreamer/gtk-rs-gtk4-rs-2fcbc1544689df84b4f607d4dd6e7be668482494.tar.gz) =
12027116
Index: wayland/kanshi/Makefile
===================================================================
RCS file: /cvs/ports/wayland/kanshi/Makefile,v
diff -u -p -u -r1.2 Makefile
--- wayland/kanshi/Makefile 6 Apr 2026 10:23:21 -0000 1.2
+++ wayland/kanshi/Makefile 1 Nov 2026 09:05:41 -0000
@@ -3,8 +3,7 @@ COMMENT = dynamic display configuration
V = 1.9.0
CATEGORIES = wayland
DIST_TUPLE = fdo emersion kanshi v${V} .
-KANSHI_COMMIT = 424f454329ec48f7f078b9225a6e3c7b7d8185ae
-REVISION = 0
+REVISION = 1
# MIT
PERMIT_PACKAGE = Yes
@@ -20,7 +19,7 @@ LIB_DEPENDS = devel/libscfg \
devel/vali \
wayland/wayland
-WRKDIST = ${WRKDIR}/kanshi-v${V}-${KANSHI_COMMIT}
+WRKDIST = ${WRKDIR}/kanshi-v${V}
WANTLIB += c json-c m scfg vali wayland-client
Index: wayland/kanshi/distinfo
===================================================================
RCS file: /cvs/ports/wayland/kanshi/distinfo,v
diff -u -p -u -r1.1.1.1 distinfo
--- wayland/kanshi/distinfo 6 Apr 2026 07:44:56 -0000 1.1.1.1
+++ wayland/kanshi/distinfo 1 Nov 2026 09:05:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (emersion-kanshi-v1.9.0.tar.gz) =
BIg3pqt5/0MLCsJYaJDwPcUmXXlJwBC9lxFTLKr9Zuw=
-SIZE (emersion-kanshi-v1.9.0.tar.gz) = 24062
+SHA256 (emersion-kanshi-v1.9.0.tar.gz) =
KmHCdlBV0phh47q2OSIgMzWOxUfVh4IpkIS62G9b1ic=
+SIZE (emersion-kanshi-v1.9.0.tar.gz) = 24045
Index: wayland/wayback/Makefile
===================================================================
RCS file: /cvs/ports/wayland/wayback/Makefile,v
diff -u -p -u -r1.4 Makefile
--- wayland/wayback/Makefile 13 Jun 2026 13:41:33 -0000 1.4
+++ wayland/wayback/Makefile 1 Nov 2026 09:05:41 -0000
@@ -1,13 +1,14 @@
COMMENT = X11 compat layer for running full X11 desktop environments
V = 0.3
+REVISION = 0
DISTNAME = wayback-${V}
CATEGORIES = wayland
REVISION = 0
-SITES = ${HOMEPAGE}/wayback/-/archive/${V}/
+DIST_TUPLE = fdo wayback wayback ${V} .
-HOMEPAGE = https://gitlab.freedesktop.org/wayback
+HOMEPAGE = https://wayback.freedesktop.org/
# MIT
PERMIT_PACKAGE = Yes
Index: wayland/wayback/distinfo
===================================================================
RCS file: /cvs/ports/wayland/wayback/distinfo,v
diff -u -p -u -r1.2 distinfo
--- wayland/wayback/distinfo 28 Dec 2025 07:25:52 -0000 1.2
+++ wayland/wayback/distinfo 1 Nov 2026 09:05:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (wayback-0.3.tar.gz) = 4j8ad9ANsUrw9P0RvARuIZP0rrhRgyFzpQYmdqyQHoo=
-SIZE (wayback-0.3.tar.gz) = 24823
+SHA256 (wayback-wayback-0.3.tar.gz) =
4j8ad9ANsUrw9P0RvARuIZP0rrhRgyFzpQYmdqyQHoo=
+SIZE (wayback-wayback-0.3.tar.gz) = 24823
--
Matthieu Herrb
