Wednesday, July 13, 2022

Re: x11/gnome/gdm: use GH_DISTFILE

OK.


Antoine

> On 13 Jul 2022, at 17:35, Klemens Nanni <kn@openbsd.org> wrote:
>
> Another port predating GH_DISTFILE which screams to get out of sync with
> bsd.port.mk ;)
>
> This port also demonstrates another use case we currently don't support:
> adding to EXTRACT_ONLY with DISTFILES patterns.
>
> I came here to look for potential fallout/fixes in case of the
> MASTER_SITES_GITHUB changes, but this EXTRACT_ONLY issue(?) already
> exists completely on its own.
>
> So I'll put this in a different mail, trying to improve on EXTRACT_SUFX.
>
>
> In the meantime, this diff cleans up the port and makes sure that it
> would keep working with my proposed patch.
>
> OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/gnome/gdm/Makefile,v
> retrieving revision 1.315
> diff -u -p -r1.315 Makefile
> --- Makefile 17 Apr 2022 10:28:58 -0000 1.315
> +++ Makefile 13 Jul 2022 15:26:48 -0000
> @@ -9,9 +9,10 @@ GH_PROJECT= gdm
> GH_COMMIT= 864881c9ff9629711d782071fa959f76f2d8c3a7
> EXTRACT_SUFX= .tar.gz
>
> -# bsd.port.mk:1288
> -DISTFILES= ${DISTNAME}-${GH_COMMIT:C/(........).*/\1/}${EXTRACT_SUFX}{${GH_COMMIT}${EXTRACT_SUFX}} \
> +DISTFILES= ${GH_DISTFILE} \
> gdm-puffy.png:0
> +# XXX can't use GH_DISTFILE since EXTRACT_ONLY expects filenames instead of
> +# DISTFILES filename{url}sufx patterns
> EXTRACT_ONLY= ${DISTNAME}-${GH_COMMIT:C/(........).*/\1/}${EXTRACT_SUFX}
>
> MASTER_SITES= ${MASTER_SITES_GITHUB}

No comments:

Post a Comment