On Tue, May 14, 2024 at 01:59:15PM +0100, Stuart Henderson wrote:
> On 2024/05/14 08:32, Dave St.Germain wrote:
> > I've updated fossil to version 2.24, but the binary still seems to be version 2.23. 
> > I've tried removing and reinstalling, with a binary dated May 11th. Same result:
> > 
> > $ pkg_info -I fossil
> > fossil-2.24v0       simple distributed software configuration management
> > 
> > $ /usr/local/bin/fossil version
> > This is fossil version 2.23 [47362306a7] 2023-11-01 18:56:47 UTC
> > 
> 
> Upstream has an annoying name format for downloads (that wasn't called
> out in a comment in the port), so the last port update didn't actually
> change anything.
> 
> This fixes it.
> 
> DISTFILES mess needed because the file contents can't change without
> changing the name otherwise bulk builds get broken.
> 

Bah, sorry I didn't catch this before. Yes upstream has a super annoying
naming format. ok jturner@

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/fossil/Makefile,v
> diff -u -p -r1.92 Makefile
> --- Makefile	3 May 2024 16:00:05 -0000	1.92
> +++ Makefile	14 May 2024 12:57:54 -0000
> @@ -1,6 +1,15 @@
>  COMMENT =		simple distributed software configuration management
> 
> +# commit ID must be changed in DISTFILES when updating, see
> +# https://fossil-scm.org/home/uv/download.html
>  DISTNAME =		fossil-2.24
> +REVISION =		0
> +
> +#DISTFILES =		{8be0372c1051043761320c8ea8669c3cf320c406e5fe18ad36b7be5f844ca73b}${DISTNAME}${EXTRACT_SUFX}
> +# temporary, mistake in 2.24 update requires this file to be renamed.
> +# switch back to the above scheme for 2.25.
> +DISTFILES =		${DISTNAME}-1{8be0372c1051043761320c8ea8669c3cf320c406e5fe18ad36b7be5f844ca73b/${DISTNAME}}${EXTRACT_SUFX}
> +
>  CATEGORIES =		devel www
>  EPOCH =			0
> 
> @@ -8,8 +17,6 @@ MAINTAINER =		James Turner <james@calmin
> 
>  HOMEPAGE =		https://fossil-scm.org/
>  SITES =			https://fossil-scm.org/home/tarball/
> -DISTFILES =		{47362306a7dd7c6fc3cab77cebe5d25469b0a9448479d9718eb5c49c8337b29/}${DISTNAME}${EXTRACT_SUFX}
> -
> 
>  # BSD
>  PERMIT_PACKAGE =	Yes
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/fossil/distinfo,v
> diff -u -p -r1.64 distinfo
> --- distinfo	3 May 2024 16:00:05 -0000	1.64
> +++ distinfo	14 May 2024 12:57:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (fossil-2.24.tar.gz) = 7bXPKgf4FBDPUjl+DoQVWKp4qJFsYmin9xH2IXPYXMk=
> -SIZE (fossil-2.24.tar.gz) = 6798925
> +SHA256 (fossil-2.24-1.tar.gz) = lc08F2g1vrm4lwdvpYFx/jCwspH2OHu1R0nvvfqWL0w=
> +SIZE (fossil-2.24-1.tar.gz) = 6903811
>