From: Bjorn Ketelaars <bket@openbsd.org>
Subject: Unbreak borgbackup/2.0 build
To: ports@openbsd.org
Cc: tb@openbsd.org
Date: Wed, 9 Oct 2024 14:29:58 +0200

tb@ pointed out that the recent update of borgbackup/2.0
(2.0.0b9->2.0.0b12) causes pkg tools to think the version went
backwards. Issue is caused by me thinking that 'b' is supported as
special version string. As a result from lexicographically sorting
2.0.0b9 is seen as newer than 2.0.0b12.

Solution has also been pointed out by tb@: Fix this by setting PKGNAME
to include the supported 'beta' string and setting EPOCH.

Tested by upgrading from 2.0.0b9 and 2.0.0b12.

OK?


diff --git 2.0/Makefile 2.0/Makefile
index 7284180be78..c7d983ff02f 100644
--- 2.0/Makefile
+++ 2.0/Makefile
@@ -4,6 +4,8 @@ USE_NOEXECONLY=		Yes
 .endif
 
 MODPY_EGG_VERSION =	2.0.0b12
+PKGNAME =		borgbackup-${MODPY_EGG_VERSION:S/b/beta/}
+EPOCH =			0
 
 # OpenSSL used for EVP_aes_256_ocb. It is linked statically to avoid conflicting
 # with shared libcrypto from the base OS pulled in via dependencies.