RE: git: afae5957dd8c - main - Mk/bsd.sites.mk: fix index building

Baptiste Daroussin <bapt_at_FreeBSD.org> wrote on
Date: Tue, 10 Jun 2025 16:10:20 UTC :

> The branch main has been updated by bapt:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=afae5957dd8c841977ed9cffa3051797e4a03937
> 
> commit afae5957dd8c841977ed9cffa3051797e4a03937
> Author: Baptiste Daroussin <bapt@FreeBSD.org>
> AuthorDate: 2025-06-10 16:09:15 +0000
> Commit: Baptiste Daroussin <bapt@FreeBSD.org>
> CommitDate: 2025-06-10 16:10:14 +0000
> 
> Mk/bsd.sites.mk: fix index building

It looks to me like the one and only use of
${_gnome_ver} like notation could end up with
_gnome_ver not having been assigned previously
when empty(MASTER_SITES:M*/archive/*) is the
case and DISVERSION is undefined or does not
match the digit sequence pattern. See the last
_GNOME_PATH assignment below.

Is there some guaranteed relationship between
DISVERSION content and MASTER_SITES content
that covers the combination in order to make
this a non-issue? 


.if !defined(IGNORE_MASTER_SITE_GNOME)
.  if defined(DISTVERSION) && ${DISTVERSION:M[0-9]*}
_version_major=	${DISTVERSION:C|^([0-9]+).*|\1|}
_version_minor=	${DISTVERSION:C|^([0-9]+)\.([0-9]+).*|\2|}

.    if ${_version_major} >= 10
_gnome_ver=	${_version_major}
.    else
_gnome_ver=	${_version_major}.${_version_minor}
.    endif
.  endif

.  if !empty(MASTER_SITES:M*/archive/*)
_GNOME_PATH=	%SUBDIR%
.  else
_GNOME_PATH=	%SUBDIR%/${_gnome_ver}
.  endif

. . .

===
Mark Millard
marklmi at yahoo.com