On Thu, Oct 22, 2026 at 04:56:18PM -0700, Thomas Frohwein wrote:
> On Thu, 22 Oct 2026 22:48:32 +0200
> Matthieu Herrb <[email protected]> wrote:
>
> > On Thu, Oct 22, 2026 at 02:56:22PM +0100, Stuart Henderson wrote:
> > > > V = 1.2.0
> > > > REV = 35b87f3cb5f18a1a5c07447560d4a02cc501a83e
> > > > DIST_TUPLE = gitlab severin-lemaignan retex ${V} .
> > > ..
> > > > WRKDIST = ${WRKDIR}/retex-${V}-${REV}
> > >
> > > it's so annoying that gitlab does this!
> >
> > By fixing TEMPLATE_DISTFILES.gitlab, for projects with a release we
> > can get rid of it. And a quick test shows that for ports with only a
> > commit id or a tag it doesn't change.
> >
> > But still all ports with actal releases need a patch to remove the
> > commit Id and WRKDIST override..
> >
> > Index: infrastructure/db/dist-tuple.pattern
> > ===================================================================
> > RCS file: /cvs/ports/infrastructure/db/dist-tuple.pattern,v
> > diff -u -p -u -r1.13 dist-tuple.pattern
> > --- infrastructure/db/dist-tuple.pattern 16 Jan 2026 06:12:28
> > -0000 1.13 +++ infrastructure/db/dist-tuple.pattern 22
> > Oct 2026 20:47:39 -0000 @@ -25,7 +25,7 @@ TEMPLATE_DISTFILES.github
> > ?= \
> > <account>-<project>-{<account>/<project>/archive/<subdir>}<id>${EXTRACT_SUFX.github}
> >
> > TEMPLATE_DISTFILES.gitlab ?= \
> > -
> > <account>-<project>-{<account>/<project>/-/archive/<id>/}<id>${EXTRACT_SUFX.gitlab}
> > +
> > <account>-<project>-{<account>/<project>/-/archive/<id>/}<project>-<id>${EXTRACT_SUFX.gitlab}
> >
> > TEMPLATE_DISTFILES.gnome ?= \
> >
> > <account>-<project>-{<account>/<project>/-/archive/<id>/}<project>-<id>${EXTRACT_SUFX.gnome}
> >
> >
>
> This looks correct. Same as TEMPLATES_DISTFILES.gnome, from what I see
> and it matches how the release distfiles on gitlab look now. ok thfr@
>
This is the full diff I have. Only issue is that I had to leave
telephony/linphone alone because their gitlab server is down
currently.
Also I'm not sure the REVISION bumps are needed.
ok?
Index: emulators/es-de/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/emulators/es-de/Makefile,v
diff -u -p -u -r1.13 Makefile
--- emulators/es-de/Makefile 14 Oct 2026 07:39:35 -0000 1.13
+++ emulators/es-de/Makefile 24 Oct 2026 10:09:50 -0000
@@ -2,7 +2,7 @@ COMMENT = emulator frontend
PKGNAME = es-de-$V
V = 3.5.0
-REV = 50e4b600ae533d772bae3ff880d11a09b05dbe84
+REVISION = 0
DIST_TUPLE += gitlab es-de emulationstation-de v$V .
@@ -38,7 +38,7 @@ LIB_DEPENDS = devel/libgit2/libgit2 \
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-WRKDIST = ${WRKDIR}/emulationstation-de-v$V-${REV}
+WRKDIST = ${WRKDIR}/emulationstation-de-v$V
post-install:
gunzip ${PREFIX}/man/man6/es-de.6.gz
Index: emulators/es-de/distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/emulators/es-de/distinfo,v
diff -u -p -u -r1.10 distinfo
--- emulators/es-de/distinfo 14 Oct 2026 07:39:35 -0000 1.10
+++ emulators/es-de/distinfo 24 Oct 2026 10:09:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (es-de-emulationstation-de-v3.5.0.tar.gz) =
FdVvRjhlbIKYN9mf3H5cuaRNOnLNdrE36XzqhARYipc=
-SIZE (es-de-emulationstation-de-v3.5.0.tar.gz) = 77546207
+SHA256 (es-de-emulationstation-de-v3.5.0.tar.gz) =
PzWq669lqyZ9NH0JVwKK9Q4EEzIyd/iuK3T8+4Nsb38=
+SIZE (es-de-emulationstation-de-v3.5.0.tar.gz) = 77522945
Index: fonts/marelle/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/fonts/marelle/Makefile,v
diff -u -p -u -r1.1.1.1 Makefile
--- fonts/marelle/Makefile 6 May 2026 13:38:57 -0000 1.1.1.1
+++ fonts/marelle/Makefile 24 Oct 2026 10:10:04 -0000
@@ -3,6 +3,7 @@ COMMENT-web = cursive font for school te
MODFONT_FAMILY = marelle
MODFONT_VERSION = 1.004
+REVISION = 0
SITES.gitlab = https://forge.apps.education.fr/
DIST_TUPLE += gitlab marelle marelle.forge.apps.education.fr
v${MODFONT_VERSION} .
@@ -18,7 +19,7 @@ PERMIT_PACKAGE = Yes
NO_BUILD = Yes
NO_TEST = Yes
-WRKDIST =
${WRKDIR}/marelle.forge.apps.education.fr-v${MODFONT_VERSION}-93887d1b4da2530114a55bc68555b2e6a5d9ada8
+WRKDIST = ${WRKDIR}/marelle.forge.apps.education.fr-v${MODFONT_VERSION}
MODFONT_FONTFILES = fonts/ttf/*.ttf \
fonts/otf/*.otf
Index: fonts/marelle/distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/fonts/marelle/distinfo,v
diff -u -p -u -r1.1.1.1 distinfo
--- fonts/marelle/distinfo 6 May 2026 13:38:57 -0000 1.1.1.1
+++ fonts/marelle/distinfo 24 Oct 2026 10:10:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (marelle-marelle.forge.apps.education.fr-v1.004.tar.gz) =
TG/Y5zic+SOQfMH64+3vzQzkBLoLf/lq08GiXMQCkb0=
-SIZE (marelle-marelle.forge.apps.education.fr-v1.004.tar.gz) = 16654217
+SHA256 (marelle-marelle.forge.apps.education.fr-v1.004.tar.gz) =
0ILR335Oo6sP0yS0vFminLy0o/Q7HTkKJ6ZlHy10GR0=
+SIZE (marelle-marelle.forge.apps.education.fr-v1.004.tar.gz) = 16654313
Index: infrastructure/db/dist-tuple.pattern
===================================================================
RCS file: /cvs/OpenBSD/ports/infrastructure/db/dist-tuple.pattern,v
diff -u -p -u -r1.13 dist-tuple.pattern
--- infrastructure/db/dist-tuple.pattern 16 Jan 2026 06:12:28 -0000
1.13
+++ infrastructure/db/dist-tuple.pattern 24 Oct 2026 10:11:50 -0000
@@ -25,7 +25,7 @@ TEMPLATE_DISTFILES.github ?= \
<account>-<project>-{<account>/<project>/archive/<subdir>}<id>${EXTRACT_SUFX.github}
TEMPLATE_DISTFILES.gitlab ?= \
-
<account>-<project>-{<account>/<project>/-/archive/<id>/}<id>${EXTRACT_SUFX.gitlab}
+
<account>-{<account>/<project>/-/archive/<id>/}<project>-<id>${EXTRACT_SUFX.gitlab}
TEMPLATE_DISTFILES.gnome ?= \
<account>-<project>-{<account>/<project>/-/archive/<id>/}<project>-<id>${EXTRACT_SUFX.gnome}
Index: lang/rsm/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/lang/rsm/Makefile,v
diff -u -p -u -r1.7 Makefile
--- lang/rsm/Makefile 21 Feb 2026 08:46:13 -0000 1.7
+++ lang/rsm/Makefile 24 Oct 2026 10:12:09 -0000
@@ -1,8 +1,8 @@
COMMENT = Reference Standard M, implementation of M/MUMPS
V = 1.82.4
-HASH = 92e8f0f87dec9e5185594cffe5ac996dfba4289e
PKGNAME = rsm-${V}
+REVISION = 0
DIST_TUPLE += gitlab Reference-Standard-M rsm v${V} .
CATEGORIES = lang
@@ -14,7 +14,7 @@ WANTLIB += c m
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/rsm-v${V}-${HASH}
+WRKDIST = ${WRKDIR}/rsm-v${V}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/rsm
Index: lang/rsm/distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/lang/rsm/distinfo,v
diff -u -p -u -r1.4 distinfo
--- lang/rsm/distinfo 21 Feb 2026 08:46:13 -0000 1.4
+++ lang/rsm/distinfo 24 Oct 2026 10:12:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (Reference-Standard-M-rsm-v1.82.4.tar.gz) =
vwwmFNMzuVBqYcxDslvSU/ViW/CVtkxowYKQ4+PjOKU=
-SIZE (Reference-Standard-M-rsm-v1.82.4.tar.gz) = 454579
+SHA256 (Reference-Standard-M-rsm-v1.82.4.tar.gz) =
gcKoZmJPdZIdaXff3G0PCrafgql1Agd5qIhH3QQ6ejg=
+SIZE (Reference-Standard-M-rsm-v1.82.4.tar.gz) = 453610
Index: net/libaccounts-qt/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/net/libaccounts-qt/Makefile,v
diff -u -p -u -r1.10 Makefile
--- net/libaccounts-qt/Makefile 17 Aug 2025 06:42:41 -0000 1.10
+++ net/libaccounts-qt/Makefile 24 Oct 2026 10:13:49 -0000
@@ -28,7 +28,7 @@ QT_VERSION = qt6
LIB_DEPENDS = net/libaccounts-glib \
devel/glib2
-WRKDIST =
${WRKDIR}/libaccounts-qt-${V}-c8fdd05f1a1ff5886f4649d24f2ba8c5f61cfa3a
+WRKDIST = ${WRKDIR}/libaccounts-qt-${V}
TEST_TARGET = check
TEST_IS_INTERACTIVE = Yes
Index: net/libaccounts-qt/distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/net/libaccounts-qt/distinfo,v
diff -u -p -u -r1.3 distinfo
--- net/libaccounts-qt/distinfo 17 Apr 2024 15:05:28 -0000 1.3
+++ net/libaccounts-qt/distinfo 24 Oct 2026 10:13:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (accounts-sso-libaccounts-qt-VERSION_1.17.tar.gz) =
il2kCN6Yiq7xUaLZlKcCPu+nE2Gtoy7byuyUXaQmmng=
-SIZE (accounts-sso-libaccounts-qt-VERSION_1.17.tar.gz) = 65495
+SHA256 (accounts-sso-libaccounts-qt-VERSION_1.17.tar.gz) =
btPpdhM5YsHIj2xmkoug0KF6VwhDV30x54PciRZZ5dg=
+SIZE (accounts-sso-libaccounts-qt-VERSION_1.17.tar.gz) = 65415
Index: print/retex/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/print/retex/Makefile,v
diff -u -p -u -r1.1.1.1 Makefile
--- print/retex/Makefile 22 Oct 2026 20:52:58 -0000 1.1.1.1
+++ print/retex/Makefile 24 Oct 2026 10:14:53 -0000
@@ -1,7 +1,7 @@
COMMENT = Rust reimplementation of lualatex
V = 1.2.0
-REV = 35b87f3cb5f18a1a5c07447560d4a02cc501a83e
+REVISION = 0
DIST_TUPLE = gitlab severin-lemaignan retex ${V} .
DISTNAME = retex-${V}
@@ -17,8 +17,6 @@ WANTLIB = $(MODCARGO_WANTLIB) m
MODULES = devel/cargo
CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
-
-WRKDIST = ${WRKDIR}/retex-${V}-${REV}
NO_TEST =
Index: print/retex/distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/print/retex/distinfo,v
diff -u -p -u -r1.2 distinfo
--- print/retex/distinfo 22 Oct 2026 20:58:28 -0000 1.2
+++ print/retex/distinfo 24 Oct 2026 10:14:54 -0000
@@ -126,7 +126,7 @@ SHA256 (cargo/zerofrom-0.1.8.tar.gz) = D
SHA256 (cargo/zerofrom-derive-0.1.8.tar.gz) =
91tGg/bH9FJI1NZAVqJCmMYoHgmTNW19G0oali7xDUo=
SHA256 (cargo/zlib-rs-0.6.8.tar.gz) =
smjljnxpPXwnH5P/xLo7OAQSVUIxyFv2HKevkQQqQRI=
SHA256 (cargo/zmij-1.0.23.tar.gz) =
KWZtCrv60ePcTc9hRHMN06OrIlu72sgzGTRbG0TM/Bs=
-SHA256 (severin-lemaignan-retex-1.2.0.tar.gz) =
1TnHmd5NOGH8LQmDkotqu9xzTlKSemhY0EepqPA2dIo=
+SHA256 (severin-lemaignan-retex-1.2.0.tar.gz) =
dA8pffxpjBZVQeTDbl9rU2jPDwioMqCRBChQF+Bns0E=
SIZE (cargo/adler2-2.0.1.tar.gz) = 13366
SIZE (cargo/aho-corasick-1.1.5.tar.gz) = 184315
SIZE (cargo/arrayref-0.3.9.tar.gz) = 9186
@@ -255,4 +255,4 @@ SIZE (cargo/zerofrom-0.1.8.tar.gz) = 615
SIZE (cargo/zerofrom-derive-0.1.8.tar.gz) = 8834
SIZE (cargo/zlib-rs-0.6.8.tar.gz) = 215857
SIZE (cargo/zmij-1.0.23.tar.gz) = 28612
-SIZE (severin-lemaignan-retex-1.2.0.tar.gz) = 12424700
+SIZE (severin-lemaignan-retex-1.2.0.tar.gz) = 12421143
Index: sysutils/duplicity/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/sysutils/duplicity/Makefile,v
diff -u -p -u -r1.76 Makefile
--- sysutils/duplicity/Makefile 15 Oct 2026 13:24:32 -0000 1.76
+++ sysutils/duplicity/Makefile 24 Oct 2026 10:15:54 -0000
@@ -1,10 +1,11 @@
COMMENT = encrypted backup using rsync algorithm
MODPY_DISTV = 3.0.6
+REVISION = 0
DISTNAME = duplicity-${MODPY_DISTV}
DIST_TUPLE = gitlab duplicity duplicity rel.${MODPY_DISTV} .
-WRKDIST =
${WRKDIR}/duplicity-rel.${MODPY_DISTV}-f92abcb2339e0dfe4640e5e3a6428396eb4bd3d9
+WRKDIST = ${WRKDIR}/duplicity-rel.${MODPY_DISTV}
CATEGORIES = sysutils
Index: sysutils/duplicity/distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/sysutils/duplicity/distinfo,v
diff -u -p -u -r1.43 distinfo
--- sysutils/duplicity/distinfo 23 Dec 2025 10:06:38 -0000 1.43
+++ sysutils/duplicity/distinfo 24 Oct 2026 10:15:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (duplicity-duplicity-rel.3.0.6.tar.gz) =
Bw4dr+QpVgmuCEau0gnDtv9orBpPN1VCZxX+j4IIQ/Q=
-SIZE (duplicity-duplicity-rel.3.0.6.tar.gz) = 1499185
+SHA256 (duplicity-duplicity-rel.3.0.6.tar.gz) =
/FLEnmexD40apvW5BOP5PpQW8M/ve0hEdocmdMpHt2g=
+SIZE (duplicity-duplicity-rel.3.0.6.tar.gz) = 1497651
--
Matthieu Herrb
