cleanup: (ir)regular GH_TAGNAME cleanup

25 files changed, 47 insertions, 46 deletions

diff --git a/databases/postgresql-wal2json/Makefile b/databases/postgresql-wal2json/Makefile
index 1fc6676ee1ce..7a7f1343bdc6 100644
--- a/databases/postgresql-wal2json/Makefile
+++ b/databases/postgresql-wal2json/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	wal2json
-PORTVERSION=	2.5
+DISTVERSIONPREFIX=	${PORTNAME}_
+DISTVERSION=	2_5
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
@@ -14,7 +15,6 @@ USES=		gmake pgsql:11-14
 WANT_PGSQL=	server
 USE_GITHUB=	yes
 GH_ACCOUNT=	eulerto
-GH_TAGNAME=	${PORTNAME}_${PORTVERSION:S/./_/}
 
 MAKE_ARGS=	PG_CONFIG=${LOCALBASE}/bin/pg_config
 
diff --git a/databases/postgresql-wal2json/distinfo b/databases/postgresql-wal2json/distinfo
index 27c45dc415dc..eb48d2c3fe89 100644
--- a/databases/postgresql-wal2json/distinfo
+++ b/databases/postgresql-wal2json/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1692687620
-SHA256 (eulerto-wal2json-2.5-wal2json_2_5_GH0.tar.gz) = b516653575541cf221b99cf3f8be9b6821f6dbcfc125675c85f35090f824f00e
-SIZE (eulerto-wal2json-2.5-wal2json_2_5_GH0.tar.gz) = 91040
+SHA256 (eulerto-wal2json-wal2json_2_5_GH0.tar.gz) = b516653575541cf221b99cf3f8be9b6821f6dbcfc125675c85f35090f824f00e
+SIZE (eulerto-wal2json-wal2json_2_5_GH0.tar.gz) = 91040
diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index fc77088d0ceb..8a945150a3c7 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	lutok
+DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	0.4
 PORTREVISION=	9
 CATEGORIES=	devel
@@ -16,7 +17,6 @@ USES=		autoreconf libtool lua pathfix pkgconfig
 USE_CXXSTD=	gnu++11
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/devel/lutok/distinfo b/devel/lutok/distinfo
index f9bff8aba970..26471620e9f0 100644
--- a/devel/lutok/distinfo
+++ b/devel/lutok/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1704256837
-SHA256 (freebsd-lutok-0.4-lutok-0.4_GH0.tar.gz) = 475da420c75a566533f8763ee161525a533cf976f1901f089796bb867953098f
-SIZE (freebsd-lutok-0.4-lutok-0.4_GH0.tar.gz) = 37561
+SHA256 (freebsd-lutok-lutok-0.4_GH0.tar.gz) = 475da420c75a566533f8763ee161525a533cf976f1901f089796bb867953098f
+SIZE (freebsd-lutok-lutok-0.4_GH0.tar.gz) = 37561
diff --git a/devel/wasi-libc/Makefile b/devel/wasi-libc/Makefile
index 533a8d21ec39..32770ed0b0ae 100644
--- a/devel/wasi-libc/Makefile
+++ b/devel/wasi-libc/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	wasi-libc
+DISTVERSIONPREFIX=	wasi-sdk-
 DISTVERSION=	21
 CATEGORIES=	devel
 
@@ -17,7 +18,6 @@ LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 USES=		gmake llvm:min=12
 USE_GITHUB=	yes
 GH_ACCOUNT=	WebAssembly
-GH_TAGNAME=	wasi-sdk-${DISTVERSION}${DISTVERSIONSUFFIX}
 GH_TUPLE=	WebAssembly:WASI:59cbe14:wasi/tools/wasi-headers/WASI
 NO_ARCH=	yes
 
diff --git a/devel/wasi-libc/distinfo b/devel/wasi-libc/distinfo
index fec86f470d2b..123bd995cc9d 100644
--- a/devel/wasi-libc/distinfo
+++ b/devel/wasi-libc/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1704903461
-SHA256 (WebAssembly-wasi-libc-21-wasi-sdk-21_GH0.tar.gz) = 4a2a3e3b120ba1163c57f34ac79c3de720a8355ee3a753d81f1f0c58c4cf6017
-SIZE (WebAssembly-wasi-libc-21-wasi-sdk-21_GH0.tar.gz) = 1313865
+SHA256 (WebAssembly-wasi-libc-wasi-sdk-21_GH0.tar.gz) = 4a2a3e3b120ba1163c57f34ac79c3de720a8355ee3a753d81f1f0c58c4cf6017
+SIZE (WebAssembly-wasi-libc-wasi-sdk-21_GH0.tar.gz) = 1313865
 SHA256 (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 4e36c4add2421b44ccdded83d442d9aadf02ffa8b534d94016fad2bb7b781cc6
 SIZE (WebAssembly-WASI-59cbe14_GH0.tar.gz) = 162059
diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index 62ff1ca3e268..873762e6e9d0 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	nkf
-PORTVERSION=	2.1.5
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2_1_5
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	japanese
@@ -13,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/nkf.c
 USES=		iconv
 USE_GITHUB=	yes
 GH_ACCOUNT=	nurse
-GH_TAGNAME=	v${PORTVERSION:C/\./_/g}
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		ICONV_CMD="${ICONV_CMD}"
diff --git a/japanese/nkf/distinfo b/japanese/nkf/distinfo
index bf72f93062bf..92be073be4c7 100644
--- a/japanese/nkf/distinfo
+++ b/japanese/nkf/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1704649242
-SHA256 (nurse-nkf-2.1.5-v2_1_5_GH0.tar.gz) = 10cf6eb3d4d095919185ac224d5a634e9926d731e656d04bacb270e5cae0e28c
-SIZE (nurse-nkf-2.1.5-v2_1_5_GH0.tar.gz) = 250895
+SHA256 (nurse-nkf-v2_1_5_GH0.tar.gz) = 10cf6eb3d4d095919185ac224d5a634e9926d731e656d04bacb270e5cae0e28c
+SIZE (nurse-nkf-v2_1_5_GH0.tar.gz) = 250895
diff --git a/net/containernetworking-plugins/Makefile b/net/containernetworking-plugins/Makefile
index b4df5829fe99..78f780a32360 100644
--- a/net/containernetworking-plugins/Makefile
+++ b/net/containernetworking-plugins/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	containernetworking-plugins
+DISTVERSIONPREFIX=	freebsd-v
 DISTVERSION=	0.5
 PORTREVISION=	3
 CATEGORIES=	net
@@ -15,7 +16,6 @@ BUILD_DEPENDS=	bash:shells/bash
 USE_GITHUB=	yes
 GH_ACCOUNT=	dfr
 GH_PROJECT=	plugins
-GH_TAGNAME=	freebsd-v${DISTVERSION}
 GH_TUPLE=	golang:sys:v0.6.0:sys
 
 pre-patch:
diff --git a/net/containernetworking-plugins/distinfo b/net/containernetworking-plugins/distinfo
index 9c34a809eb56..176bf7e2c53a 100644
--- a/net/containernetworking-plugins/distinfo
+++ b/net/containernetworking-plugins/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1697295741
-SHA256 (dfr-plugins-0.5-freebsd-v0.5_GH0.tar.gz) = ae97b270a350a291e96a57a964df84cf7a3d82311e3a8b0476f1e0e95b9bbb7f
-SIZE (dfr-plugins-0.5-freebsd-v0.5_GH0.tar.gz) = 4198686
+SHA256 (dfr-plugins-freebsd-v0.5_GH0.tar.gz) = ae97b270a350a291e96a57a964df84cf7a3d82311e3a8b0476f1e0e95b9bbb7f
+SIZE (dfr-plugins-freebsd-v0.5_GH0.tar.gz) = 4198686
 SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
 SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/security/blst/Makefile b/security/blst/Makefile
index 8d1737f2128a..5af242aef4fc 100644
--- a/security/blst/Makefile
+++ b/security/blst/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	blst
-PORTVERSION=	0.3.11
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.3.11
 CATEGORIES=	security devel
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -11,7 +12,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	supranational
-GH_TAGNAME=	v${PORTVERSION}
 
 USE_LDCONFIG=	yes
 
diff --git a/security/blst/distinfo b/security/blst/distinfo
index dc8038c42b5d..99d3041e312e 100644
--- a/security/blst/distinfo
+++ b/security/blst/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1706466871
-SHA256 (supranational-blst-0.3.11-v0.3.11_GH0.tar.gz) = d0a6e2a69490cc45f0a531a684a225e56fe22303665157cfa397ba5605447eb9
-SIZE (supranational-blst-0.3.11-v0.3.11_GH0.tar.gz) = 564973
+SHA256 (supranational-blst-v0.3.11_GH0.tar.gz) = d0a6e2a69490cc45f0a531a684a225e56fe22303665157cfa397ba5605447eb9
+SIZE (supranational-blst-v0.3.11_GH0.tar.gz) = 564973
diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile
index 6fb6fdae1e42..ead369e4b164 100644
--- a/security/openssl-quictls/Makefile
+++ b/security/openssl-quictls/Makefile
@@ -1,7 +1,9 @@
 PORTNAME=	openssl
-PORTVERSION=	3.0.13
+DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	3.0.13
+DISTVERSIONSUFFIX=	-quic1
 CATEGORIES=	security devel
-PKGNAMESUFFIX=	-quictls
+PKGNAMESUFFIX=	-${GH_ACCOUNT}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	QUIC capable fork of OpenSSL
@@ -23,8 +25,7 @@ CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 USES=		cpe perl5
 USE_PERL5=	build
 USE_GITHUB=	yes
-GH_ACCOUNT=	${PKGNAMESUFFIX:S/-//}
-GH_TAGNAME=	${PORTNAME}-${PORTVERSION}-quic1
+GH_ACCOUNT=	quictls
 
 TEST_TARGET=	test
 
diff --git a/security/openssl-quictls/distinfo b/security/openssl-quictls/distinfo
index f41ed67dde95..3e0091590cd6 100644
--- a/security/openssl-quictls/distinfo
+++ b/security/openssl-quictls/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1706728750
-SHA256 (quictls-openssl-3.0.13-openssl-3.0.13-quic1_GH0.tar.gz) = ff99582682565d06e8b3b7763c66c107e9065b1c38e23a34c0e2f1f60e5bee6d
-SIZE (quictls-openssl-3.0.13-openssl-3.0.13-quic1_GH0.tar.gz) = 15459972
+SHA256 (quictls-openssl-openssl-3.0.13-quic1_GH0.tar.gz) = ff99582682565d06e8b3b7763c66c107e9065b1c38e23a34c0e2f1f60e5bee6d
+SIZE (quictls-openssl-openssl-3.0.13-quic1_GH0.tar.gz) = 15459972
diff --git a/security/openssl31-quictls/Makefile b/security/openssl31-quictls/Makefile
index dacf667a1b78..a907b4ec4bc1 100644
--- a/security/openssl31-quictls/Makefile
+++ b/security/openssl31-quictls/Makefile
@@ -1,5 +1,7 @@
 PORTNAME=	openssl
-PORTVERSION=	3.1.5
+DISTVERSIONPREFIX=	opernssl-
+DISTVERSION=	3.1.5
+DISTVERSIONSUFFIX=	-quic1
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	31-quictls
 
@@ -24,7 +26,6 @@ USES=		cpe perl5
 USE_PERL5=	build
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PKGNAMESUFFIX:C/.*-//}
-GH_TAGNAME=	opernssl-${PORTVERSION}-quic1
 
 TEST_TARGET=	test
 
diff --git a/security/openssl31-quictls/distinfo b/security/openssl31-quictls/distinfo
index bba8bccad175..e600d00eb8e3 100644
--- a/security/openssl31-quictls/distinfo
+++ b/security/openssl31-quictls/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1706729656
-SHA256 (quictls-openssl-3.1.5-opernssl-3.1.5-quic1_GH0.tar.gz) = 38dab789b4fa43da0e8f33da41423f5036ed0e464146d18540f04e037c147b9b
-SIZE (quictls-openssl-3.1.5-opernssl-3.1.5-quic1_GH0.tar.gz) = 15830092
+SHA256 (quictls-openssl-opernssl-3.1.5-quic1_GH0.tar.gz) = 38dab789b4fa43da0e8f33da41423f5036ed0e464146d18540f04e037c147b9b
+SIZE (quictls-openssl-opernssl-3.1.5-quic1_GH0.tar.gz) = 15830092
diff --git a/security/stoken/Makefile b/security/stoken/Makefile
index 960b878441fa..fa54a33243c8 100644
--- a/security/stoken/Makefile
+++ b/security/stoken/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	stoken
+DISTVERSIONPREFIX=	v
 DISTVERSION=	0.93
 PORTREVISION=	2
 CATEGORIES=	security
@@ -17,7 +18,6 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
-GH_TAGNAME=	v${DISTVERSION}
 GH_ACCOUNT=	stoken-dev
 INSTALL_TARGET=	install-strip
 
diff --git a/security/stoken/distinfo b/security/stoken/distinfo
index 83b11e15f43f..2db158852618 100644
--- a/security/stoken/distinfo
+++ b/security/stoken/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1689077674
-SHA256 (stoken-dev-stoken-0.93-v0.93_GH0.tar.gz) = 102e2d112b275efcdc20ef438670e4f24f08870b9072a81fda316efcc38aef9c
-SIZE (stoken-dev-stoken-0.93-v0.93_GH0.tar.gz) = 118216
+SHA256 (stoken-dev-stoken-v0.93_GH0.tar.gz) = 102e2d112b275efcdc20ef438670e4f24f08870b9072a81fda316efcc38aef9c
+SIZE (stoken-dev-stoken-v0.93_GH0.tar.gz) = 118216
diff --git a/sysutils/cardano-cli/Makefile b/sysutils/cardano-cli/Makefile
index 8120fb19c881..5171aea5f103 100644
--- a/sysutils/cardano-cli/Makefile
+++ b/sysutils/cardano-cli/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cardano-cli
-PORTVERSION=	8.20.1.0
+DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	8.20.1.0
 CATEGORIES=	sysutils net-p2p
 MASTER_SITES=	https://chap.intersectmbo.org/package/:chap
 
@@ -16,7 +17,6 @@ USES=		cabal
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	IntersectMBO
-GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 
 USE_CABAL=	Diff-0.5_1 \
 		FailT-0.1.2.0 \
diff --git a/sysutils/cardano-cli/distinfo b/sysutils/cardano-cli/distinfo
index c56003f3c3fa..21783e14bcc9 100644
--- a/sysutils/cardano-cli/distinfo
+++ b/sysutils/cardano-cli/distinfo
@@ -999,5 +999,5 @@ SHA256 (cabal/yaml-0.11.11.2/revision/2.cabal) = 6f0a1859e0fb3068e50dbc7fe9bf9a2
 SIZE (cabal/yaml-0.11.11.2/revision/2.cabal) = 5178
 SHA256 (cabal/zlib-0.7.0.0/zlib-0.7.0.0.tar.gz) = 7e43c205e1e1ff5a4b033086ec8cce82ab658879e977c8ba02a6701946ff7a47
 SIZE (cabal/zlib-0.7.0.0/zlib-0.7.0.0.tar.gz) = 369149
-SHA256 (cabal/IntersectMBO-cardano-cli-8.20.1.0-cardano-cli-8.20.1.0_GH0.tar.gz) = f813c50f724832547df55b39fc370f340ecd0296c9ff5299688a0fdb73b6b39b
-SIZE (cabal/IntersectMBO-cardano-cli-8.20.1.0-cardano-cli-8.20.1.0_GH0.tar.gz) = 1129093
+SHA256 (cabal/IntersectMBO-cardano-cli-cardano-cli-8.20.1.0_GH0.tar.gz) = f813c50f724832547df55b39fc370f340ecd0296c9ff5299688a0fdb73b6b39b
+SIZE (cabal/IntersectMBO-cardano-cli-cardano-cli-8.20.1.0_GH0.tar.gz) = 1129093
diff --git a/sysutils/py-zfs-autobackup/Makefile b/sysutils/py-zfs-autobackup/Makefile
index ea940fe9e952..a86dc9de83da 100644
--- a/sysutils/py-zfs-autobackup/Makefile
+++ b/sysutils/py-zfs-autobackup/Makefile
@@ -1,4 +1,5 @@
 PORTNAME=	zfs-autobackup
+DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.2
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,6 @@ USE_PYTHON=	autoplist distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	psy0rz
 GH_PROJECT=	zfs_autobackup
-GH_TAGNAME=	v${DISTVERSION}
 
 NO_ARCH=	yes
 
diff --git a/sysutils/py-zfs-autobackup/distinfo b/sysutils/py-zfs-autobackup/distinfo
index b95425407595..bc8df6ea038e 100644
--- a/sysutils/py-zfs-autobackup/distinfo
+++ b/sysutils/py-zfs-autobackup/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1694871100
-SHA256 (psy0rz-zfs_autobackup-3.2.2-v3.2.2_GH0.tar.gz) = 736019c61a7829c3f60124e9213e51099cffad5a2d10826e3008c8f3b788b88e
-SIZE (psy0rz-zfs_autobackup-3.2.2-v3.2.2_GH0.tar.gz) = 115708
+SHA256 (psy0rz-zfs_autobackup-v3.2.2_GH0.tar.gz) = 736019c61a7829c3f60124e9213e51099cffad5a2d10826e3008c8f3b788b88e
+SIZE (psy0rz-zfs_autobackup-v3.2.2_GH0.tar.gz) = 115708
diff --git a/sysutils/vmstated/Makefile b/sysutils/vmstated/Makefile
index 569b6fe3ba36..98606c6c44a0 100644
--- a/sysutils/vmstated/Makefile
+++ b/sysutils/vmstated/Makefile
@@ -12,7 +12,6 @@ LICENSE=	BSD2CLAUSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	christian-moerz
 GH_PROJECT=	vmstated
-GH_TAGNAME=	${DISTVERSION}
 
 post-patch:
 	${REINPLACE_CMD} "s@PREFIX@${PREFIX}@g" "${WRKSRC}/rc/vmstated"
diff --git a/www/mod_authz_unixgroup24/Makefile b/www/mod_authz_unixgroup24/Makefile
index 2d83d920fae1..4019eb9de0ef 100644
--- a/www/mod_authz_unixgroup24/Makefile
+++ b/www/mod_authz_unixgroup24/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mod_authz_unixgroup
-PORTVERSION=	1.1.0
+DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	1.1.0
 CATEGORIES=	www
 PKGNAMESUFFIX=	24
 DIST_SUBDIR=	apache24
@@ -15,7 +16,6 @@ USES=		apache cpe
 USE_GITHUB=	yes
 GH_ACCOUNT=	phokz
 GH_PROJECT=	mod-auth-external
-GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
 CPE_VENDOR=	${GH_PROJECT}_project
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_authz_unixgroup24/distinfo b/www/mod_authz_unixgroup24/distinfo
index 883ec41f75c8..567c99bccf62 100644
--- a/www/mod_authz_unixgroup24/distinfo
+++ b/www/mod_authz_unixgroup24/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1692881865
-SHA256 (apache24/phokz-mod-auth-external-1.1.0-mod_authz_unixgroup-1.1.0_GH0.tar.gz) = d91c7124afdbdc9373f297af8d4d9c2fb6afce483ce8a6f656dc07d8042d290b
-SIZE (apache24/phokz-mod-auth-external-1.1.0-mod_authz_unixgroup-1.1.0_GH0.tar.gz) = 10085
+SHA256 (apache24/phokz-mod-auth-external-mod_authz_unixgroup-1.1.0_GH0.tar.gz) = d91c7124afdbdc9373f297af8d4d9c2fb6afce483ce8a6f656dc07d8042d290b
+SIZE (apache24/phokz-mod-auth-external-mod_authz_unixgroup-1.1.0_GH0.tar.gz) = 10085