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@
