git: 0619748960cb - main - *: regular cleanup for GH_TAGNAME bad usage

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Wed, 24 May 2023 16:34:46 UTC
The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0619748960cb07bc181ffe4addf08bc47c4b79ec

commit 0619748960cb07bc181ffe4addf08bc47c4b79ec
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2023-05-24 16:33:52 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2023-05-24 16:34:10 +0000

    *: regular cleanup for GH_TAGNAME bad usage
---
 cad/xyce/Makefile                           | 2 +-
 cad/xyce/distinfo                           | 4 ++--
 databases/pg.el/Makefile                    | 1 -
 databases/pg_filedump/Makefile              | 4 ++--
 databases/pg_filedump/distinfo              | 4 ++--
 databases/pgbackrest/Makefile               | 2 +-
 databases/pgbackrest/distinfo               | 4 ++--
 databases/postgresql-promscale/Makefile     | 1 -
 devel/avrdude/Makefile                      | 2 +-
 devel/avrdude/distinfo                      | 4 ++--
 devel/glibd/Makefile                        | 2 +-
 devel/glibd/distinfo                        | 4 ++--
 devel/hs-cabal-install/Makefile             | 2 +-
 devel/hs-cabal-install/distinfo             | 4 ++--
 devel/libcuckoo/Makefile                    | 2 +-
 devel/libcuckoo/distinfo                    | 4 ++--
 devel/libdispatch/Makefile                  | 3 ++-
 devel/libdispatch/distinfo                  | 4 ++--
 devel/librcc/Makefile                       | 2 +-
 devel/librcc/distinfo                       | 4 ++--
 devel/nextpnr/Makefile                      | 2 +-
 devel/nextpnr/distinfo                      | 4 ++--
 emulators/pcsx2/Makefile                    | 2 +-
 emulators/pcsx2/distinfo                    | 4 ++--
 games/exult-devel/Makefile                  | 2 +-
 games/exult-devel/distinfo                  | 4 ++--
 games/exult/Makefile                        | 1 -
 graphics/wings/Makefile                     | 3 ++-
 graphics/wings/distinfo                     | 4 ++--
 lang/gir-to-d/Makefile                      | 2 +-
 lang/gir-to-d/distinfo                      | 4 ++--
 mail/dovecot-fts-elastic/Makefile           | 1 -
 math/mdal/Makefile                          | 2 +-
 math/mdal/distinfo                          | 4 ++--
 math/ntpoly/Makefile                        | 3 +--
 math/ntpoly/distinfo                        | 4 ++--
 misc/pinfo/Makefile                         | 2 +-
 misc/pinfo/distinfo                         | 4 ++--
 misc/trurl/Makefile                         | 2 +-
 misc/trurl/distinfo                         | 4 ++--
 multimedia/mkclean/Makefile                 | 2 +-
 multimedia/mkclean/distinfo                 | 4 ++--
 net-im/dendrite/Makefile                    | 3 +--
 net-im/dendrite/distinfo                    | 4 ++--
 net/dshell/Makefile                         | 2 +-
 net/dshell/distinfo                         | 4 ++--
 net/gost/Makefile                           | 2 +-
 net/gost/distinfo                           | 4 ++--
 net/libndp/Makefile                         | 2 +-
 net/libndp/distinfo                         | 4 ++--
 net/mosh/Makefile                           | 2 +-
 net/mosh/distinfo                           | 4 ++--
 net/py-pyvmomi/Makefile                     | 2 +-
 net/py-pyvmomi/distinfo                     | 4 ++--
 net/quiche/Makefile                         | 1 -
 net/slurm/Makefile                          | 2 +-
 net/slurm/distinfo                          | 4 ++--
 security/cargo-audit/Makefile               | 3 +--
 security/cargo-audit/distinfo               | 4 ++--
 security/crowdsec-blocklist-mirror/Makefile | 2 +-
 security/crowdsec-blocklist-mirror/distinfo | 4 ++--
 security/monkeysphere/Makefile              | 2 +-
 security/monkeysphere/distinfo              | 4 ++--
 security/unhide/Makefile                    | 2 +-
 security/unhide/distinfo                    | 4 ++--
 sysutils/amazon-ssm-plugin/Makefile         | 1 -
 sysutils/bulk_extractor/Makefile            | 2 +-
 sysutils/bulk_extractor/distinfo            | 4 ++--
 sysutils/py-ioztat/Makefile                 | 2 +-
 sysutils/py-ioztat/distinfo                 | 4 ++--
 www/davix/Makefile                          | 4 ++--
 www/davix/distinfo                          | 4 ++--
 x11/dmenu2/Makefile                         | 1 -
 x11/xlupe/Makefile                          | 1 -
 74 files changed, 103 insertions(+), 112 deletions(-)

diff --git a/cad/xyce/Makefile b/cad/xyce/Makefile
index ba259d1392af..228f4fc29aaa 100644
--- a/cad/xyce/Makefile
+++ b/cad/xyce/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	xyce
+DISTVERSIONPREFIX=	Release-
 DISTVERSION=	7.6.0
 PORTREVISION=	3
 CATEGORIES=	cad
@@ -32,7 +33,6 @@ USE_PERL5=	test
 USE_GITHUB=	yes
 GH_ACCOUNT=	Xyce
 GH_PROJECT=	Xyce
-GH_TAGNAME=	Release-${DISTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	LEX=/usr/bin/flex \
diff --git a/cad/xyce/distinfo b/cad/xyce/distinfo
index 83896354a942..e76ab6e7b107 100644
--- a/cad/xyce/distinfo
+++ b/cad/xyce/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1668286152
-SHA256 (Xyce-Xyce-7.6.0-Release-7.6.0_GH0.tar.gz) = fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c
-SIZE (Xyce-Xyce-7.6.0-Release-7.6.0_GH0.tar.gz) = 23269498
+SHA256 (Xyce-Xyce-Release-7.6.0_GH0.tar.gz) = fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c
+SIZE (Xyce-Xyce-Release-7.6.0_GH0.tar.gz) = 23269498
diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile
index 2a5f83d2a25d..dff7e7136774 100644
--- a/databases/pg.el/Makefile
+++ b/databases/pg.el/Makefile
@@ -16,7 +16,6 @@ USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	emarsden
 GH_PROJECT=	pg-el
-GH_TAGNAME=	${DISTVERSIONPREFIX}${DISTVERSION}
 
 CONFLICTS_INSTALL=	pg.el pg.el-emacs_* # share/doc/pg.el/README
 
diff --git a/databases/pg_filedump/Makefile b/databases/pg_filedump/Makefile
index 3134e0741897..32720bb9f741 100644
--- a/databases/pg_filedump/Makefile
+++ b/databases/pg_filedump/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pg_filedump
-PORTVERSION=	14.1
+DISTVERSIONPREFIX= REL_
+DISTVERSION=	14_1
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -16,7 +17,6 @@ WANT_PGSQL=	lib server
 PLIST_FILES=	bin/pg_filedump
 
 GH_ACCOUNT=	df7cb
-GH_TAGNAME=	REL_${PORTVERSION:R}_${PORTVERSION:E}
 USE_GITHUB=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/pg_filedump/distinfo b/databases/pg_filedump/distinfo
index f328d214c174..6beb45bceead 100644
--- a/databases/pg_filedump/distinfo
+++ b/databases/pg_filedump/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1649423662
-SHA256 (df7cb-pg_filedump-14.1-REL_14_1_GH0.tar.gz) = fa8246e42c54e113beed0ed689c885dab750472bed776432f86246b47ecccf90
-SIZE (df7cb-pg_filedump-14.1-REL_14_1_GH0.tar.gz) = 39524
+SHA256 (df7cb-pg_filedump-REL_14_1_GH0.tar.gz) = fa8246e42c54e113beed0ed689c885dab750472bed776432f86246b47ecccf90
+SIZE (df7cb-pg_filedump-REL_14_1_GH0.tar.gz) = 39524
diff --git a/databases/pgbackrest/Makefile b/databases/pgbackrest/Makefile
index c4a4ac8f1e58..342aa2f6b975 100644
--- a/databases/pgbackrest/Makefile
+++ b/databases/pgbackrest/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	pgbackrest
+DISTVERSIONPREFIX=	release/
 DISTVERSION=	2.35
 PORTREVISION=	2
 CATEGORIES=	databases
@@ -18,7 +19,6 @@ USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
-GH_TAGNAME=	release/${DISTVERSION}
 
 WRKSRC_SUBDIR=	src
 
diff --git a/databases/pgbackrest/distinfo b/databases/pgbackrest/distinfo
index 886df3c856ee..8dab00c1536e 100644
--- a/databases/pgbackrest/distinfo
+++ b/databases/pgbackrest/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1634325390
-SHA256 (pgbackrest-pgbackrest-2.35-release-2.35_GH0.tar.gz) = ecaf8fc8ec68ac59143a7b4c0c53fded28d1e1396771a9456bb3fdca327e5718
-SIZE (pgbackrest-pgbackrest-2.35-release-2.35_GH0.tar.gz) = 5720761
+SHA256 (pgbackrest-pgbackrest-release-2.35_GH0.tar.gz) = ecaf8fc8ec68ac59143a7b4c0c53fded28d1e1396771a9456bb3fdca327e5718
+SIZE (pgbackrest-pgbackrest-release-2.35_GH0.tar.gz) = 5720761
diff --git a/databases/postgresql-promscale/Makefile b/databases/postgresql-promscale/Makefile
index c42a20d4c2bb..7b595cf7ffc9 100644
--- a/databases/postgresql-promscale/Makefile
+++ b/databases/postgresql-promscale/Makefile
@@ -20,7 +20,6 @@ USES=		cargo gmake pgsql:12+
 USE_GITHUB=	yes
 GH_ACCOUNT=	timescale
 GH_PROJECT=	promscale_extension
-GH_TAGNAME=	${PORTVERSION}
 
 WANT_PGSQL=	server
 
diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index d98caaa46aee..a98361f3b2db 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	avrdude
 PORTVERSION=	7.1
+DISTVERSIONPREFIX=	v
 #PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -14,7 +15,6 @@ USES=		libtool localbase readline cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	avrdudes
 GH_PROJECT=	avrdude
-GH_TAGNAME=	v${PORTVERSION}
 
 OPTIONS_DEFINE=		FTDI PARPORT
 OPTIONS_DEFAULT=	FTDI
diff --git a/devel/avrdude/distinfo b/devel/avrdude/distinfo
index d6c99c0a5e41..797c0b8b12f7 100644
--- a/devel/avrdude/distinfo
+++ b/devel/avrdude/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1673299439
-SHA256 (avrdudes-avrdude-7.1-v7.1_GH0.tar.gz) = 016a5c95746fadc169cfb3009f6aa306ccdea2ff279fdb6fddcbe7526d84e5eb
-SIZE (avrdudes-avrdude-7.1-v7.1_GH0.tar.gz) = 2496230
+SHA256 (avrdudes-avrdude-v7.1_GH0.tar.gz) = 016a5c95746fadc169cfb3009f6aa306ccdea2ff279fdb6fddcbe7526d84e5eb
+SIZE (avrdudes-avrdude-v7.1_GH0.tar.gz) = 2496230
diff --git a/devel/glibd/Makefile b/devel/glibd/Makefile
index ed09791d83ed..5c5620d621cf 100644
--- a/devel/glibd/Makefile
+++ b/devel/glibd/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	glibd
 PORTVERSION=	2.4.2
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	devel
 
@@ -22,6 +23,5 @@ USE_GNOME=	glib20 introspection
 USE_GITHUB=	yes
 GH_ACCOUNT=	gtkd-developers
 GH_PROJECT=	GlibD
-GH_TAGNAME=	v${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/glibd/distinfo b/devel/glibd/distinfo
index 7ffd9472ff87..74b75d178ff2 100644
--- a/devel/glibd/distinfo
+++ b/devel/glibd/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1681798077
-SHA256 (gtkd-developers-GlibD-2.4.2-v2.4.2_GH0.tar.gz) = 103758578ff48598f4cf54a76177cc79b44b0cdc7118972767d22f531075f75a
-SIZE (gtkd-developers-GlibD-2.4.2-v2.4.2_GH0.tar.gz) = 36051
+SHA256 (gtkd-developers-GlibD-v2.4.2_GH0.tar.gz) = 103758578ff48598f4cf54a76177cc79b44b0cdc7118972767d22f531075f75a
+SIZE (gtkd-developers-GlibD-v2.4.2_GH0.tar.gz) = 36051
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 0ade49700bcb..d3e2354b538a 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cabal-install
 PORTVERSION=	3.10.1.0
+DISTVERSIONPREFIX=	${PORTNAME}-v
 PORTREVISION=	1
 CATEGORIES=	devel haskell
 EXTRACT_ONLY=	${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX}
@@ -15,7 +16,6 @@ USES=		cabal:nodefault compiler:c11 python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	haskell
 GH_PROJECT=	cabal
-GH_TAGNAME=	${PORTNAME}-v${PORTVERSION}
 
 USE_CABAL=	async-2.2.4_2 \
 		base16-bytestring-1.0.2.0 \
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index 055413bfaee3..b364e6c030ef 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -77,5 +77,5 @@ SHA256 (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 9eaa989ad4534438b5beb51c1d3a4c
 SIZE (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 369595
 SHA256 (cabal/zlib-0.6.3.0/revision/1.cabal) = 9adce39e4ca0b7a87d45df0a243134816c57059a08e28cff5469c98ae1f54dfc
 SIZE (cabal/zlib-0.6.3.0/revision/1.cabal) = 5367
-SHA256 (cabal/haskell-cabal-3.10.1.0-cabal-install-v3.10.1.0_GH0.tar.gz) = 93436d22b6934413ee0e3ec9d1220e94237a7d62d5989fee19e314672bce6216
-SIZE (cabal/haskell-cabal-3.10.1.0-cabal-install-v3.10.1.0_GH0.tar.gz) = 2256581
+SHA256 (cabal/haskell-cabal-cabal-install-v3.10.1.0_GH0.tar.gz) = 93436d22b6934413ee0e3ec9d1220e94237a7d62d5989fee19e314672bce6216
+SIZE (cabal/haskell-cabal-cabal-install-v3.10.1.0_GH0.tar.gz) = 2256581
diff --git a/devel/libcuckoo/Makefile b/devel/libcuckoo/Makefile
index 581779bcc917..621c456387bf 100644
--- a/devel/libcuckoo/Makefile
+++ b/devel/libcuckoo/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libcuckoo
 PORTVERSION=	0.3.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -13,7 +14,6 @@ USES=		cmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	efficient
-GH_TAGNAME=	v${PORTVERSION}
 
 NO_ARCH=	yes
 
diff --git a/devel/libcuckoo/distinfo b/devel/libcuckoo/distinfo
index 8e513b7bd8f6..ed49540482bd 100644
--- a/devel/libcuckoo/distinfo
+++ b/devel/libcuckoo/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1657221316
-SHA256 (efficient-libcuckoo-0.3.1-v0.3.1_GH0.tar.gz) = a87122b963ef6b7eadca3e41cb4b533f3b6ad9b588ab2f2140eb6ab0db9a7ba8
-SIZE (efficient-libcuckoo-0.3.1-v0.3.1_GH0.tar.gz) = 163580
+SHA256 (efficient-libcuckoo-v0.3.1_GH0.tar.gz) = a87122b963ef6b7eadca3e41cb4b533f3b6ad9b588ab2f2140eb6ab0db9a7ba8
+SIZE (efficient-libcuckoo-v0.3.1_GH0.tar.gz) = 163580
diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile
index e8c4fd09609e..644cd1f81443 100644
--- a/devel/libdispatch/Makefile
+++ b/devel/libdispatch/Makefile
@@ -1,5 +1,7 @@
 PORTNAME=	libdispatch
+DISTVERSIONPREFIX=	swift-
 DISTVERSION=	5.5
+DISTVERSIONSUFFIX=	-RELEASE
 PORTEPOCH=	1
 CATEGORIES=	devel
 
@@ -15,7 +17,6 @@ USE_CXXSTD=	c++17
 USE_GITHUB=	yes
 GH_ACCOUNT=	apple
 GH_PROJECT=	swift-corelibs-libdispatch
-GH_TAGNAME=	swift-${DISTVERSION}-RELEASE
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/libdispatch/distinfo b/devel/libdispatch/distinfo
index addabed1af96..89a5a363a7dc 100644
--- a/devel/libdispatch/distinfo
+++ b/devel/libdispatch/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1667817651
-SHA256 (apple-swift-corelibs-libdispatch-5.5-swift-5.5-RELEASE_GH0.tar.gz) = 5efdfa1d2897c598acea42fc00776477bb3713645686774f5ff0818b26649e62
-SIZE (apple-swift-corelibs-libdispatch-5.5-swift-5.5-RELEASE_GH0.tar.gz) = 592054
+SHA256 (apple-swift-corelibs-libdispatch-swift-5.5-RELEASE_GH0.tar.gz) = 5efdfa1d2897c598acea42fc00776477bb3713645686774f5ff0818b26649e62
+SIZE (apple-swift-corelibs-libdispatch-swift-5.5-RELEASE_GH0.tar.gz) = 592054
diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 0bc9b2c4bbee..429741a76694 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	librcc
+DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	0.2.13
 PORTREVISION=	1
 CATEGORIES=	devel
@@ -22,7 +23,6 @@ USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 GH_ACCOUNT=	RusXMMS
-GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk1
diff --git a/devel/librcc/distinfo b/devel/librcc/distinfo
index 00a22a835853..8e468578df45 100644
--- a/devel/librcc/distinfo
+++ b/devel/librcc/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1666394574
-SHA256 (RusXMMS-librcc-0.2.13-librcc-0.2.13_GH0.tar.gz) = 112b2e6ea465e34bd28d34d39a9982da16a1cc2b016966123e12075b52833920
-SIZE (RusXMMS-librcc-0.2.13-librcc-0.2.13_GH0.tar.gz) = 190213
+SHA256 (RusXMMS-librcc-librcc-0.2.13_GH0.tar.gz) = 112b2e6ea465e34bd28d34d39a9982da16a1cc2b016966123e12075b52833920
+SIZE (RusXMMS-librcc-librcc-0.2.13_GH0.tar.gz) = 190213
diff --git a/devel/nextpnr/Makefile b/devel/nextpnr/Makefile
index 9bf1c002356e..335246a77343 100644
--- a/devel/nextpnr/Makefile
+++ b/devel/nextpnr/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	nextpnr
+DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	0.4
 PORTREVISION=	1
 PORTEPOCH=	1
@@ -27,7 +28,6 @@ USE_QT=		buildtools:build core gui opengl qmake:build widgets
 USE_GL=		gl glu
 USE_GITHUB=	yes
 GH_ACCOUNT=	YosysHQ
-GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
 GH_TUPLE=	YosysHQ:nextpnr-tests:00c55a9e:tests/tests
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
diff --git a/devel/nextpnr/distinfo b/devel/nextpnr/distinfo
index cb4eac6dc202..e367ede00cb9 100644
--- a/devel/nextpnr/distinfo
+++ b/devel/nextpnr/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1671525390
-SHA256 (YosysHQ-nextpnr-0.4-nextpnr-0.4_GH0.tar.gz) = ae8e01496c3bb6607cef0e2501b8cf00aba564e9b116dd323887575ab82757c0
-SIZE (YosysHQ-nextpnr-0.4-nextpnr-0.4_GH0.tar.gz) = 4460419
+SHA256 (YosysHQ-nextpnr-nextpnr-0.4_GH0.tar.gz) = ae8e01496c3bb6607cef0e2501b8cf00aba564e9b116dd323887575ab82757c0
+SIZE (YosysHQ-nextpnr-nextpnr-0.4_GH0.tar.gz) = 4460419
 SHA256 (YosysHQ-nextpnr-tests-00c55a9e_GH0.tar.gz) = 2240aa0c61211a62ca307ef8d8b0f58c4ebb59ecb61334c45bf586daf69d964b
 SIZE (YosysHQ-nextpnr-tests-00c55a9e_GH0.tar.gz) = 1039171
diff --git a/emulators/pcsx2/Makefile b/emulators/pcsx2/Makefile
index 6795adfc921f..ee09f40b5634 100644
--- a/emulators/pcsx2/Makefile
+++ b/emulators/pcsx2/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pcsx2
 PORTVERSION=	1.7.4097
+DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	emulators
 
@@ -38,7 +39,6 @@ USES=		cmake desktop-file-utils gl pkgconfig qt:6 sdl xorg
 
 USE_GITHUB=	yes
 GH_PROJECT=	pcsx2
-GH_TAGNAME=	v${PORTVERSION}
 .include "${.CURDIR}/Makefile.tuples"
 
 USE_GL=		egl
diff --git a/emulators/pcsx2/distinfo b/emulators/pcsx2/distinfo
index c812bd0ebdf2..858e3ab69441 100644
--- a/emulators/pcsx2/distinfo
+++ b/emulators/pcsx2/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1676582077
-SHA256 (pcsx2-pcsx2-1.7.4097-v1.7.4097_GH0.tar.gz) = 0dd25d4b4dd864f2d695f0704b3122668c1f0ecf55457cc5fbe6c27ce72458c6
-SIZE (pcsx2-pcsx2-1.7.4097-v1.7.4097_GH0.tar.gz) = 9195636
+SHA256 (pcsx2-pcsx2-v1.7.4097_GH0.tar.gz) = 0dd25d4b4dd864f2d695f0704b3122668c1f0ecf55457cc5fbe6c27ce72458c6
+SIZE (pcsx2-pcsx2-v1.7.4097_GH0.tar.gz) = 9195636
 SHA256 (rtissera-libchdr-5de1a59019815ccdbba0fe07c71b31406d023248_GH0.tar.gz) = e0df9f88cd93e673d384cbf7cf28ea396aba96c769b41ec149a259768b27b00c
 SIZE (rtissera-libchdr-5de1a59019815ccdbba0fe07c71b31406d023248_GH0.tar.gz) = 414409
 SHA256 (biojppm-rapidyaml-213b201d264139cd1b887790197e08850af628e3_GH0.tar.gz) = c206d4565ccfa721991a8df90821d1a1f747e68385a0f3f5b9ab995e191c06be
diff --git a/games/exult-devel/Makefile b/games/exult-devel/Makefile
index 20133ccd52ac..7172c3d414d9 100644
--- a/games/exult-devel/Makefile
+++ b/games/exult-devel/Makefile
@@ -1,4 +1,4 @@
-DISTVERSIONPREFIX=	v
+DISTVERSIONPREFIX=	snapshot-v
 DISTVERSION=	1.9.0.20230415
 PORTREVISION=	1
 PKGNAMESUFFIX=	-devel
diff --git a/games/exult-devel/distinfo b/games/exult-devel/distinfo
index a9cc49c14bbc..b239b7034ccc 100644
--- a/games/exult-devel/distinfo
+++ b/games/exult-devel/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1681648099
-SHA256 (exult-exult-v1.9.0.20230415-snapshot-v1.9.0.20230415_GH0.tar.gz) = b3c6fcbf3a17bb9cd0d73c72e613562eb340bd050b589bf51350a03c2e204314
-SIZE (exult-exult-v1.9.0.20230415-snapshot-v1.9.0.20230415_GH0.tar.gz) = 19304789
+SHA256 (exult-exult-snapshot-v1.9.0.20230415_GH0.tar.gz) = b3c6fcbf3a17bb9cd0d73c72e613562eb340bd050b589bf51350a03c2e204314
+SIZE (exult-exult-snapshot-v1.9.0.20230415_GH0.tar.gz) = 19304789
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 15fd1b2e4cea..c9fe7e380030 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -39,7 +39,6 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-version.cc \
 		${PATCHDIR}/extra-patch-configure.ac
 .else
 USE_GITHUB=	yes
-GH_TAGNAME=	snapshot-${DISTVERSIONPREFIX}${DISTVERSION}
 .endif
 
 OPTIONS_DEFINE=		ALSA DEBUG DOCS FLUIDSYNTH GIMP STUDIO
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index 2cc7c47677b6..7b347bbae889 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	wings
+DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.9
 PORTREVISION=	1
 CATEGORIES=	graphics
@@ -33,7 +34,7 @@ SUB_FILES=	${PORTNAME}.sh
 USE_GITHUB=	yes
 GH_ACCOUNT=	dgud
 GH_PROJECT=	wings libigl:igl
-GH_TAGNAME=	v${DISTVERSION} v2.1.0:igl
+GH_TAGNAME=	v2.1.0:igl
 
 USE_GL=		gl glu
 
diff --git a/graphics/wings/distinfo b/graphics/wings/distinfo
index 8954cd4df882..12845c7c049f 100644
--- a/graphics/wings/distinfo
+++ b/graphics/wings/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1645984710
-SHA256 (erlang/dgud-wings-2.2.9-v2.2.9_GH0.tar.gz) = 413449a6270cfbc24e241d9f44c55383d6bb8c7892dec73c9214527b874bf40b
-SIZE (erlang/dgud-wings-2.2.9-v2.2.9_GH0.tar.gz) = 3828073
+SHA256 (erlang/dgud-wings-v2.2.9_GH0.tar.gz) = 413449a6270cfbc24e241d9f44c55383d6bb8c7892dec73c9214527b874bf40b
+SIZE (erlang/dgud-wings-v2.2.9_GH0.tar.gz) = 3828073
 SHA256 (erlang/dgud-libigl-v2.1.0_GH0.tar.gz) = 816ec64b6b2fbabcb1c6353c7df8a2fc1ad5bf4c607b332871a6ab8b29c89dbc
 SIZE (erlang/dgud-libigl-v2.1.0_GH0.tar.gz) = 976016
diff --git a/lang/gir-to-d/Makefile b/lang/gir-to-d/Makefile
index 77f7db53ea15..d91f5d65ee38 100644
--- a/lang/gir-to-d/Makefile
+++ b/lang/gir-to-d/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gir-to-d
 PORTVERSION=	0.23.1
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	lang
 
@@ -20,7 +21,6 @@ USE_GNOME=	introspection
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gtkd-developers
-GH_TAGNAME=	v${DISTVERSION}
 
 # a workaround for https://github.com/ldc-developers/ldc/issues/4000
 CONFIGURE_ENV=	DFLAGS=--allinst
diff --git a/lang/gir-to-d/distinfo b/lang/gir-to-d/distinfo
index 19c409f35525..390295769842 100644
--- a/lang/gir-to-d/distinfo
+++ b/lang/gir-to-d/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1681797967
-SHA256 (gtkd-developers-gir-to-d-0.23.1-v0.23.1_GH0.tar.gz) = 17b0f0879490cd042b754239a4c8cee91a84f98ee66dd375c9b6890bfbe8b6ec
-SIZE (gtkd-developers-gir-to-d-0.23.1-v0.23.1_GH0.tar.gz) = 42284
+SHA256 (gtkd-developers-gir-to-d-v0.23.1_GH0.tar.gz) = 17b0f0879490cd042b754239a4c8cee91a84f98ee66dd375c9b6890bfbe8b6ec
+SIZE (gtkd-developers-gir-to-d-v0.23.1_GH0.tar.gz) = 42284
diff --git a/mail/dovecot-fts-elastic/Makefile b/mail/dovecot-fts-elastic/Makefile
index 775a96191b09..2d8417cb4fb4 100644
--- a/mail/dovecot-fts-elastic/Makefile
+++ b/mail/dovecot-fts-elastic/Makefile
@@ -18,7 +18,6 @@ USES=		autoreconf libtool
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	filiphanes
-GH_TAGNAME=     ${PORTVERSION}
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/math/mdal/Makefile b/math/mdal/Makefile
index 1f05eecad45a..adf4b914f010 100644
--- a/math/mdal/Makefile
+++ b/math/mdal/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	mdal
+DISTVERSIONPREFIX=	release-
 DISTVERSION=	1.0.1
 PORTREVISION=	1
 CATEGORIES=	math geography
@@ -31,7 +32,6 @@ PLIST_FILES=	bin/mdal_translate \
 USE_GITHUB=	yes
 GH_ACCOUNT=	lutraconsulting
 GH_PROJECT=	MDAL
-GH_TAGNAME=	release-${DISTVERSION}
 
 CMAKE_ARGS=	-DSQLITE3_INCLUDE_DIRS="${LOCALBASE}/include" \
 		-DSQLITE3_LIBRARY="${LOCALBASE}/lib/libsqlite3.so"
diff --git a/math/mdal/distinfo b/math/mdal/distinfo
index 0b906b67ddd7..1143fae69c24 100644
--- a/math/mdal/distinfo
+++ b/math/mdal/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1672404315
-SHA256 (lutraconsulting-MDAL-1.0.1-release-1.0.1_GH0.tar.gz) = 120d40f610339f7c4aae36fc8ff392922f996cf6999b8c2b8fcc03f657644077
-SIZE (lutraconsulting-MDAL-1.0.1-release-1.0.1_GH0.tar.gz) = 85449320
+SHA256 (lutraconsulting-MDAL-release-1.0.1_GH0.tar.gz) = 120d40f610339f7c4aae36fc8ff392922f996cf6999b8c2b8fcc03f657644077
+SIZE (lutraconsulting-MDAL-release-1.0.1_GH0.tar.gz) = 85449320
diff --git a/math/ntpoly/Makefile b/math/ntpoly/Makefile
index 807796adb9bb..231d9272c9fb 100644
--- a/math/ntpoly/Makefile
+++ b/math/ntpoly/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	NTPoly
 DISTVERSION=	2.7.1
+DISTVERSIONPREFIX=	${PORTNAME:tl}-v
 PORTREVISION=	1
-DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -19,7 +19,6 @@ TEST_DEPENDS=	${PYNUMPY}	\
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	william-dawson
-GH_TAGNAME=	${PORTNAME:tl}-${DISTVERSIONPREFIX}${DISTVERSION}
 
 USES=		blaslapack:openblas cmake fortran mpi python
 FFLAGS+=	-fopenmp -fallow-argument-mismatch
diff --git a/math/ntpoly/distinfo b/math/ntpoly/distinfo
index 20ccd0889940..1c9784063112 100644
--- a/math/ntpoly/distinfo
+++ b/math/ntpoly/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1666081148
-SHA256 (william-dawson-NTPoly-v2.7.1-ntpoly-v2.7.1_GH0.tar.gz) = c15d9f51ac054b4ef0565ce5c4c8589c10bdbab4dc3442ebd109691e2bbfc7e2
-SIZE (william-dawson-NTPoly-v2.7.1-ntpoly-v2.7.1_GH0.tar.gz) = 281935
+SHA256 (william-dawson-NTPoly-ntpoly-v2.7.1_GH0.tar.gz) = c15d9f51ac054b4ef0565ce5c4c8589c10bdbab4dc3442ebd109691e2bbfc7e2
+SIZE (william-dawson-NTPoly-ntpoly-v2.7.1_GH0.tar.gz) = 281935
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index d638a58f174e..edccee3b04d2 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	pinfo
+DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.13
 PORTREVISION=	1
 CATEGORIES=	misc
@@ -19,7 +20,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		autoreconf gettext-tools libtool localbase makeinfo ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	baszoetekouw
-GH_TAGNAME=	v${DISTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-curses=${NCURSESBASE}
diff --git a/misc/pinfo/distinfo b/misc/pinfo/distinfo
index 70c265a3476b..e4c1a3d2571c 100644
--- a/misc/pinfo/distinfo
+++ b/misc/pinfo/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1684014464
-SHA256 (baszoetekouw-pinfo-0.6.13-v0.6.13_GH0.tar.gz) = 9dc5e848a7a86cb665a885bc5f0fdf6d09ad60e814d75e78019ae3accb42c217
-SIZE (baszoetekouw-pinfo-0.6.13-v0.6.13_GH0.tar.gz) = 157103
+SHA256 (baszoetekouw-pinfo-v0.6.13_GH0.tar.gz) = 9dc5e848a7a86cb665a885bc5f0fdf6d09ad60e814d75e78019ae3accb42c217
+SIZE (baszoetekouw-pinfo-v0.6.13_GH0.tar.gz) = 157103
 SHA256 (fc67ceacd81f0c74fcab85447c23a532ae482827.patch) = c11ec086f73e7b2bf38a5cc07c64c4cbee06da270d9eb0f4c86403e7df7a021c
 SIZE (fc67ceacd81f0c74fcab85447c23a532ae482827.patch) = 860
 SHA256 (ab604fdb67296dad27f3a25f3c9aabdd2fb8c3fa.patch) = 7690ed298a139b82b763979e59998afdac88b4265d867f746811e317a152f57d
diff --git a/misc/trurl/Makefile b/misc/trurl/Makefile
index 7ceecbbdc6d6..0159d2c61ace 100644
--- a/misc/trurl/Makefile
+++ b/misc/trurl/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	trurl
+DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	0.6
 CATEGORIES=	misc www
 
@@ -13,7 +14,6 @@ LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	curl
-GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
 
 MAKE_ARGS=	CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/misc/trurl/distinfo b/misc/trurl/distinfo
index f71de50b0efb..cd53110eb60c 100644
--- a/misc/trurl/distinfo
+++ b/misc/trurl/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1682851129
-SHA256 (curl-trurl-0.6-trurl-0.6_GH0.tar.gz) = 4564dff7441d33a29aa02fe64bea7ef0809d9fabc1609ac5b50ca5503e81caa6
-SIZE (curl-trurl-0.6-trurl-0.6_GH0.tar.gz) = 30517
+SHA256 (curl-trurl-trurl-0.6_GH0.tar.gz) = 4564dff7441d33a29aa02fe64bea7ef0809d9fabc1609ac5b50ca5503e81caa6
+SIZE (curl-trurl-trurl-0.6_GH0.tar.gz) = 30517
diff --git a/multimedia/mkclean/Makefile b/multimedia/mkclean/Makefile
index de3aeaada160..33031c5f1ab9 100644
--- a/multimedia/mkclean/Makefile
+++ b/multimedia/mkclean/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mkclean
 PORTVERSION=	0.9.0
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports@FreeBSD.org
@@ -23,7 +24,6 @@ CPE_VENDOR=	matroska
 USE_GITHUB=	yes
 GH_ACCOUNT=	Matroska-Org
 GH_PROJECT=	foundation-source
-GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 
 NO_INSTALL=	yes
 
diff --git a/multimedia/mkclean/distinfo b/multimedia/mkclean/distinfo
index 3102b82ba4bf..5a3345875993 100644
--- a/multimedia/mkclean/distinfo
+++ b/multimedia/mkclean/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1645167021
-SHA256 (Matroska-Org-foundation-source-0.9.0-mkclean-0.9.0_GH0.tar.gz) = d42123ceb22be6f682105fd4fc28b6657ca86ab2bb9450f753054bf17b65ad1e
-SIZE (Matroska-Org-foundation-source-0.9.0-mkclean-0.9.0_GH0.tar.gz) = 718527
+SHA256 (Matroska-Org-foundation-source-mkclean-0.9.0_GH0.tar.gz) = d42123ceb22be6f682105fd4fc28b6657ca86ab2bb9450f753054bf17b65ad1e
+SIZE (Matroska-Org-foundation-source-mkclean-0.9.0_GH0.tar.gz) = 718527
diff --git a/net-im/dendrite/Makefile b/net-im/dendrite/Makefile
index 47935989838a..c10e4ee57ff4 100644
--- a/net-im/dendrite/Makefile
+++ b/net-im/dendrite/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dendrite
-DISTVERSIONPREFIX=	v
+DISTVERSIONPREFIX=	helm-dendrite-
 DISTVERSION=	0.12.3
 CATEGORIES=	net-im
 
@@ -29,7 +29,6 @@ GO_TARGET+=	./cmd/$f:${PREFIX}/dendrite/bin/$f
 USE_GITHUB=	yes
 USE_GITLAB=	nodefault
 GH_ACCOUNT=	matrix-org
-GH_TAGNAME=	helm-dendrite-${DISTVERSION}
 GH_TUPLE=	Arceliar:ironwood:45b4281814c2:arceliar_ironwood/vendor/github.com/Arceliar/ironwood \
 		Arceliar:phony:dde1a8dca979:arceliar_phony/vendor/github.com/Arceliar/phony \
 		DATA-DOG:go-sqlmock:v1.5.0:data_dog_go_sqlmock/vendor/github.com/DATA-DOG/go-sqlmock \
diff --git a/net-im/dendrite/distinfo b/net-im/dendrite/distinfo
index 693934ff6444..d1df48da744f 100644
--- a/net-im/dendrite/distinfo
+++ b/net-im/dendrite/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1683055045
-SHA256 (matrix-org-dendrite-v0.12.3-helm-dendrite-0.12.3_GH0.tar.gz) = 627b567f36f35f00cfba93fe3c49b76135fec136d59ca89398e8aab6b74d116a
-SIZE (matrix-org-dendrite-v0.12.3-helm-dendrite-0.12.3_GH0.tar.gz) = 1229329
+SHA256 (matrix-org-dendrite-helm-dendrite-0.12.3_GH0.tar.gz) = 627b567f36f35f00cfba93fe3c49b76135fec136d59ca89398e8aab6b74d116a
+SIZE (matrix-org-dendrite-helm-dendrite-0.12.3_GH0.tar.gz) = 1229329
 SHA256 (Arceliar-ironwood-45b4281814c2_GH0.tar.gz) = c94ea93f6b155781a9ad57be2cfac6e72b86a0f54a0e8e0d082164a6bc4e685f
 SIZE (Arceliar-ironwood-45b4281814c2_GH0.tar.gz) = 42065
 SHA256 (Arceliar-phony-dde1a8dca979_GH0.tar.gz) = bcc79621c9da979c1d357a29f1924d73c86c57c0e901652312d742cbc39e5962
diff --git a/net/dshell/Makefile b/net/dshell/Makefile
index a7c409b17d89..80a39e8171b2 100644
--- a/net/dshell/Makefile
+++ b/net/dshell/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dshell
 PORTVERSION=	3.2.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -28,7 +29,6 @@ NO_ARCH=	yes
 
 GH_ACCOUNT=	USArmyResearchLab
 GH_PROJECT=	Dshell
-GH_TAGNAME=	v${PORTVERSION}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
diff --git a/net/dshell/distinfo b/net/dshell/distinfo
index 7e0767941c7f..ccecf1a20c4d 100644
--- a/net/dshell/distinfo
+++ b/net/dshell/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1678529542
-SHA256 (USArmyResearchLab-Dshell-3.2.2-v3.2.2_GH0.tar.gz) = 8aae3f679640356c450ab57d9e14e483af10a38f43f20c702962d92712844d6a
-SIZE (USArmyResearchLab-Dshell-3.2.2-v3.2.2_GH0.tar.gz) = 190315
+SHA256 (USArmyResearchLab-Dshell-v3.2.2_GH0.tar.gz) = 8aae3f679640356c450ab57d9e14e483af10a38f43f20c702962d92712844d6a
+SIZE (USArmyResearchLab-Dshell-v3.2.2_GH0.tar.gz) = 190315
diff --git a/net/gost/Makefile b/net/gost/Makefile
index ed1abeb2714a..4e4302248ee2 100644
--- a/net/gost/Makefile
+++ b/net/gost/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	gost
+DISTVERSIONPREFIX=	v
 DISTVERSION=	2.11.5
 CATEGORIES=	net
 
@@ -13,7 +14,6 @@ USES=		go:1.19,modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ginuerzh
-GH_TAGNAME=	v${DISTVERSION}
 
 GH_TUPLE=	FiloSottile:edwards25519:390f27c3be20:filosottile_edwards25519/vendor/filippo.io/edwards25519 \
 		LiamHaworth:go-tproxy:ef7efd7f24ed:liamhaworth_go_tproxy/vendor/github.com/LiamHaworth/go-tproxy \
diff --git a/net/gost/distinfo b/net/gost/distinfo
index f45fc6322695..2cfdd8bd15d1 100644
--- a/net/gost/distinfo
+++ b/net/gost/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1684701408
-SHA256 (ginuerzh-gost-2.11.5-v2.11.5_GH0.tar.gz) = dab48b785f4d2df6c2f5619a4b9a2ac6e8b708f667a4d89c7d08df67ad7c5ca7
-SIZE (ginuerzh-gost-2.11.5-v2.11.5_GH0.tar.gz) = 189348
+SHA256 (ginuerzh-gost-v2.11.5_GH0.tar.gz) = dab48b785f4d2df6c2f5619a4b9a2ac6e8b708f667a4d89c7d08df67ad7c5ca7
+SIZE (ginuerzh-gost-v2.11.5_GH0.tar.gz) = 189348
 SHA256 (FiloSottile-edwards25519-390f27c3be20_GH0.tar.gz) = 7c6d366447a2dd9d2f2ead98d9eb9f52f7f14a1f6f767670b4a2a45fec136989
 SIZE (FiloSottile-edwards25519-390f27c3be20_GH0.tar.gz) = 39893
 SHA256 (LiamHaworth-go-tproxy-ef7efd7f24ed_GH0.tar.gz) = dfa13a22d6329716cc74c97c59d7515d698edf153cfa5cd67cd81b7218cdc8a2
diff --git a/net/libndp/Makefile b/net/libndp/Makefile
index b5a010672312..6ff0df340d4d 100644
--- a/net/libndp/Makefile
+++ b/net/libndp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libndp
 PORTVERSION=	1.8
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -16,6 +17,5 @@ USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jpirko
-GH_TAGNAME=	v${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/net/libndp/distinfo b/net/libndp/distinfo
index 9497b9359526..49e6711850ca 100644
--- a/net/libndp/distinfo
+++ b/net/libndp/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1678114865
-SHA256 (jpirko-libndp-1.8-v1.8_GH0.tar.gz) = c3ea76e253def89869651686a827da75b56896fe94fabd87d8c14b1d4588fd05
-SIZE (jpirko-libndp-1.8-v1.8_GH0.tar.gz) = 29145
+SHA256 (jpirko-libndp-v1.8_GH0.tar.gz) = c3ea76e253def89869651686a827da75b56896fe94fabd87d8c14b1d4588fd05
+SIZE (jpirko-libndp-v1.8_GH0.tar.gz) = 29145
diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 9b90ffaf1257..2424791cc5ad 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mosh
 PORTVERSION=	1.4.0
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	net
 
 MAINTAINER=	zi@FreeBSD.org
@@ -21,7 +22,6 @@ USE_CXXSTD=	c++11
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mobile-shell
-GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 
 CONFLICTS_INSTALL=	mosh-0.[2-9].*
 
diff --git a/net/mosh/distinfo b/net/mosh/distinfo
index 72692276e999..58f780d79e02 100644
--- a/net/mosh/distinfo
+++ b/net/mosh/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1666882635
-SHA256 (mobile-shell-mosh-1.4.0-mosh-1.4.0_GH0.tar.gz) = ae581fbddf038730af9eee4d319a483288395a0722d0c94c7efb7fdbdbb0dbac
-SIZE (mobile-shell-mosh-1.4.0-mosh-1.4.0_GH0.tar.gz) = 229899
+SHA256 (mobile-shell-mosh-mosh-1.4.0_GH0.tar.gz) = ae581fbddf038730af9eee4d319a483288395a0722d0c94c7efb7fdbdbb0dbac
+SIZE (mobile-shell-mosh-mosh-1.4.0_GH0.tar.gz) = 229899
diff --git a/net/py-pyvmomi/Makefile b/net/py-pyvmomi/Makefile
index 3db641fc0642..f3c45130b516 100644
--- a/net/py-pyvmomi/Makefile
+++ b/net/py-pyvmomi/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	pyvmomi
+DISTVERSIONPREFIX=	v
 DISTVERSION=	7.0.3
 CATEGORIES=	net python
 
@@ -9,7 +10,6 @@ WWW=		https://github.com/vmware/pyvmomi
 USE_GITHUB=     yes
 GH_ACCOUNT=     vmware
 GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	v${PORTVERSION}
 
 LICENSE=	APACHE20
 
diff --git a/net/py-pyvmomi/distinfo b/net/py-pyvmomi/distinfo
index 4d8ccbf7e39d..7445b6b6023c 100644
--- a/net/py-pyvmomi/distinfo
+++ b/net/py-pyvmomi/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1637315472
-SHA256 (vmware-pyvmomi-7.0.3-v7.0.3_GH0.tar.gz) = 45e1f3a158e9a47d6e9e7fb7d4d2244637b1af9e1349829be7637d8351ced77a
-SIZE (vmware-pyvmomi-7.0.3-v7.0.3_GH0.tar.gz) = 595354
+SHA256 (vmware-pyvmomi-v7.0.3_GH0.tar.gz) = 45e1f3a158e9a47d6e9e7fb7d4d2244637b1af9e1349829be7637d8351ced77a
+SIZE (vmware-pyvmomi-v7.0.3_GH0.tar.gz) = 595354
diff --git a/net/quiche/Makefile b/net/quiche/Makefile
index ed4d686b71c1..27b7ee3155bb 100644
--- a/net/quiche/Makefile
+++ b/net/quiche/Makefile
@@ -14,7 +14,6 @@ USES=		cargo
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	cloudflare
-GH_TAGNAME=	${PORTVERSION}
 GH_TUPLE=	google:boringssl:f1c75347d:boringssl/quiche/deps/boringssl
 
 CARGO_CRATES=	aho-corasick-0.7.18 \
diff --git a/net/slurm/Makefile b/net/slurm/Makefile
index 3d0eefc2be33..0745de67790c 100644
--- a/net/slurm/Makefile
+++ b/net/slurm/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	slurm
+DISTVERSIONPREFIX=	upstream/
 DISTVERSION=	0.4.4
 PORTREVISION=	1
 CATEGORIES=	net
@@ -13,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		meson ncurses pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	mattthias
-GH_TAGNAME=	upstream/${DISTVERSION}
 
 PORTDOCS=	AUTHORS COPYING COPYRIGHT ChangeLog FAQ KEYS README.md THANKS \
 		THEMES.txt TODO
diff --git a/net/slurm/distinfo b/net/slurm/distinfo
index 9e4ffc81ef43..f6118c2fa962 100644
--- a/net/slurm/distinfo
+++ b/net/slurm/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1674408229
-SHA256 (mattthias-slurm-0.4.4-upstream-0.4.4_GH0.tar.gz) = 2f846c9aa16f86cc0d3832c5cd1122b9d322a189f9e6acf8e9646dee12f9ac02
-SIZE (mattthias-slurm-0.4.4-upstream-0.4.4_GH0.tar.gz) = 76154
+SHA256 (mattthias-slurm-upstream-0.4.4_GH0.tar.gz) = 2f846c9aa16f86cc0d3832c5cd1122b9d322a189f9e6acf8e9646dee12f9ac02
+SIZE (mattthias-slurm-upstream-0.4.4_GH0.tar.gz) = 76154
diff --git a/security/cargo-audit/Makefile b/security/cargo-audit/Makefile
index 96b5b6a23d29..7d13357c9cd4 100644
--- a/security/cargo-audit/Makefile
+++ b/security/cargo-audit/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cargo-audit
-DISTVERSIONPREFIX=	v
+DISTVERSIONPREFIX=	${PORTNAME}/v
 DISTVERSION=	0.17.5
 PORTREVISION=	1
 CATEGORIES=	security
@@ -20,7 +20,6 @@ USES=		cargo localbase ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	RustSec
 GH_PROJECT=	rustsec
-GH_TAGNAME=	${PORTNAME}/v${DISTVERSION}
 
 NO_TEST=	yes
 
diff --git a/security/cargo-audit/distinfo b/security/cargo-audit/distinfo
index 77d4de393bd4..c3ee20d80a23 100644
--- a/security/cargo-audit/distinfo
+++ b/security/cargo-audit/distinfo
@@ -583,5 +583,5 @@ SHA256 (rust/crates/xml-rs-0.8.4.crate) = d2d7d3948613f75c98fd9328cfdcc45acc4d36
 SIZE (rust/crates/xml-rs-0.8.4.crate) = 52690
 SHA256 (rust/crates/zeroize-1.6.0.crate) = 2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9
 SIZE (rust/crates/zeroize-1.6.0.crate) = 19049
-SHA256 (RustSec-rustsec-v0.17.5-cargo-audit-v0.17.5_GH0.tar.gz) = 7fe9998fe5ec6c45c44cc05a07d266f4ef5cdebfdb71a8445dcb337df5778b57
-SIZE (RustSec-rustsec-v0.17.5-cargo-audit-v0.17.5_GH0.tar.gz) = 978380
+SHA256 (RustSec-rustsec-cargo-audit-v0.17.5_GH0.tar.gz) = 7fe9998fe5ec6c45c44cc05a07d266f4ef5cdebfdb71a8445dcb337df5778b57
+SIZE (RustSec-rustsec-cargo-audit-v0.17.5_GH0.tar.gz) = 978380
diff --git a/security/crowdsec-blocklist-mirror/Makefile b/security/crowdsec-blocklist-mirror/Makefile
index 1ee0c7a8830b..3c315dc94e56 100644
--- a/security/crowdsec-blocklist-mirror/Makefile
+++ b/security/crowdsec-blocklist-mirror/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	crowdsec-blocklist-mirror
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.2
+DISTVERSIONSUFFIX=	-freebsd
 CATEGORIES=	security
 
 MAINTAINER=	marco@crowdsec.net
@@ -17,7 +18,6 @@ USES=		gmake go:no_targets
 USE_GITHUB=	yes
 GH_ACCOUNT=	crowdsecurity
 GH_PROJECT=	cs-blocklist-mirror
-GH_TAGNAME=	${DISTVERSIONFULL}-freebsd
 _BUILD_TAG=	60597cec
 USE_RC_SUBR=	crowdsec_mirror
 
diff --git a/security/crowdsec-blocklist-mirror/distinfo b/security/crowdsec-blocklist-mirror/distinfo
index 02ef043ff963..d8a5917006ae 100644
--- a/security/crowdsec-blocklist-mirror/distinfo
+++ b/security/crowdsec-blocklist-mirror/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1683209648
-SHA256 (crowdsecurity-cs-blocklist-mirror-v0.0.2-v0.0.2-freebsd_GH0.tar.gz) = 6d7a820407484500c79a224af623b8fa7b3868a9c294ddd2cf6ba207fb68ded5
-SIZE (crowdsecurity-cs-blocklist-mirror-v0.0.2-v0.0.2-freebsd_GH0.tar.gz) = 2602290
+SHA256 (crowdsecurity-cs-blocklist-mirror-v0.0.2-freebsd_GH0.tar.gz) = 6d7a820407484500c79a224af623b8fa7b3868a9c294ddd2cf6ba207fb68ded5
+SIZE (crowdsecurity-cs-blocklist-mirror-v0.0.2-freebsd_GH0.tar.gz) = 2602290
diff --git a/security/monkeysphere/Makefile b/security/monkeysphere/Makefile
index 2bf0fb742e29..b4002dc45d28 100644
--- a/security/monkeysphere/Makefile
+++ b/security/monkeysphere/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	monkeysphere
 PORTVERSION=	0.43
+DISTVERSIONPREFIX=	${PORTNAME}_
 CATEGORIES=	security
 
 MAINTAINER=	egypcio@FreeBSD.org
@@ -20,7 +21,6 @@ RUN_DEPENDS=	gpg2:security/gnupg \
 USES=		gmake perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	dkg
-GH_TAGNAME=	${PORTNAME}_${PORTVERSION}
 
 SHEBANG_FILES=	src/monkeysphere* \
 		src/share/c* src/share/defaultenv src/share/keytrans \
diff --git a/security/monkeysphere/distinfo b/security/monkeysphere/distinfo
index aa59049ee6f1..484f4ae9ef6a 100644
--- a/security/monkeysphere/distinfo
+++ b/security/monkeysphere/distinfo
*** 162 LINES SKIPPED ***