diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index abaa9fc5e403..2d74855aa913 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gqrx
 PORTVERSION=	2.12.1
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio
@@ -31,7 +32,6 @@ USES=		gl pkgconfig qmake qt:5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	csete
-GH_TAGNAME=	v${PORTVERSION:S/.0$//}
 USE_GL=		gl
 USE_QT=		buildtools_build core gui svg network widgets
 
diff --git a/comms/gqrx/distinfo b/comms/gqrx/distinfo
index caa54b752bcf..2230fa2e4c92 100644
--- a/comms/gqrx/distinfo
+++ b/comms/gqrx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581370600
-SHA256 (csete-gqrx-2.12.1-v2.12.1_GH0.tar.gz) = 7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9
-SIZE (csete-gqrx-2.12.1-v2.12.1_GH0.tar.gz) = 1334839
+TIMESTAMP = 1583242123
+SHA256 (csete-gqrx-v2.12.1_GH0.tar.gz) = 7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9
+SIZE (csete-gqrx-v2.12.1_GH0.tar.gz) = 1334839
diff --git a/databases/py-peewee_migrate/Makefile b/databases/py-peewee_migrate/Makefile
index 5e79fbbe858c..680919c97ca7 100644
--- a/databases/py-peewee_migrate/Makefile
+++ b/databases/py-peewee_migrate/Makefile
@@ -24,7 +24,6 @@ USE_GITHUB=	yes # tests not shipped with sdist
 USE_PYTHON=	autoplist concurrent distutils
 
 GH_ACCOUNT=	klen
-GH_TAGNAME=	${PORTVERSION}
 TEST_ENV=	PYTHONPATH=${WRKSRC}/src
 
 NO_ARCH=	yes
diff --git a/devel/libddoc/Makefile b/devel/libddoc/Makefile
index 3ce4f9789295..e75e2d1ec5f6 100644
--- a/devel/libddoc/Makefile
+++ b/devel/libddoc/Makefile
@@ -18,9 +18,6 @@ BUILD_DEPENDS=	ldmd2:lang/ldc \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dlang-community
-# Note that beta.1 is a perfectly acceptable version, this is not required at
-# all.
-GH_TAGNAME=	${DISTVERSIONFULL:S/beta/beta./}
 
 DUB_CMD=	${LOCALBASE}/bin/dub build --build=release
 D_INCLUDE_DIR=	${PREFIX}/include/d
diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index 0a8769a6e346..90581c4bd364 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Coin
 PORTVERSION=	4.0.0
+DISTVERSIONPREFIX=	Coin-
 CATEGORIES=	graphics
 
 MAINTAINER=	cmt@FreeBSD.org
@@ -15,10 +16,9 @@ LIB_DEPENDS=	libsimage.so:graphics/simage
 
 USES=		gl openal:al libtool pathfix xorg
 
-USE_GITHUB=     yes
+USE_GITHUB=	yes
 GH_ACCOUNT=	coin3d
 GH_PROJECT=	coin
-GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 
 USE_GL=		gl
 USE_XORG=	ice sm x11 xext xt
diff --git a/graphics/Coin/distinfo b/graphics/Coin/distinfo
index 74486458cc3b..3897ce86b7a2 100644
--- a/graphics/Coin/distinfo
+++ b/graphics/Coin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579131604
-SHA256 (coin3d-coin-4.0.0-Coin-4.0.0_GH0.tar.gz) = b00d2a8e9d962397cf9bf0d9baa81bcecfbd16eef675a98c792f5cf49eb6e805
-SIZE (coin3d-coin-4.0.0-Coin-4.0.0_GH0.tar.gz) = 6788294
+TIMESTAMP = 1583241959
+SHA256 (coin3d-coin-Coin-4.0.0_GH0.tar.gz) = b00d2a8e9d962397cf9bf0d9baa81bcecfbd16eef675a98c792f5cf49eb6e805
+SIZE (coin3d-coin-Coin-4.0.0_GH0.tar.gz) = 6788294
diff --git a/lang/J/Makefile b/lang/J/Makefile
index 5cccf00daeab..2166775a19ef 100644
--- a/lang/J/Makefile
+++ b/lang/J/Makefile
@@ -2,6 +2,8 @@
 
 PORTNAME=	J
 PORTVERSION=	${JVERSION:S/^j//:S/-release//}
+DISTVERSIONPREFIX=	j
+DISTVERSIONSUFFIX=	-release
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang math
@@ -28,7 +30,6 @@ SUB_FILES=	jconsole profile.ijs
 USE_GITHUB=	yes
 GH_ACCOUNT=	jsoftware
 GH_PROJECT=	jsource
-GH_TAGNAME=	${JVERSION}
 
 # J is released with ports-unfriendly versioning
 JVERSION=	j807-release
diff --git a/lang/J/distinfo b/lang/J/distinfo
index 206da8ed1fa5..5b21d640aab7 100644
--- a/lang/J/distinfo
+++ b/lang/J/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1546772563
-SHA256 (jsoftware-jsource-807-j807-release_GH0.tar.gz) = 324ff0b046c9f7f24f18a72fa8a4253ad54c99a48c397fd2c724392f5e097d7f
-SIZE (jsoftware-jsource-807-j807-release_GH0.tar.gz) = 2398318
+SHA256 (jsoftware-jsource-j807-release_GH0.tar.gz) = 324ff0b046c9f7f24f18a72fa8a4253ad54c99a48c397fd2c724392f5e097d7f
+SIZE (jsoftware-jsource-j807-release_GH0.tar.gz) = 2398318
diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
index dd689c417db0..9e1e38779c29 100644
--- a/security/openvpn-auth-ldap/Makefile
+++ b/security/openvpn-auth-ldap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openvpn-auth-ldap
 PORTVERSION=	2.0.4
+DISTVERSIONPREFIX=	auth-ldap-
 CATEGORIES=	security net-vpn
 
 MAINTAINER=	mandree@FreeBSD.org
@@ -31,7 +32,6 @@ CONFIGURE_ARGS+=	--with-openldap=${LOCALBASE} \
 USE_GITHUB=	yes
 GH_ACCOUNT=	threerings
 GH_PROJECT=	openvpn-auth-ldap
-GH_TAGNAME=	auth-ldap-${PORTVERSION}
 
 PORTDOCS=	README
 PORTEXAMPLES=	auth-ldap.conf
diff --git a/security/openvpn-auth-ldap/distinfo b/security/openvpn-auth-ldap/distinfo
index 02778f118d30..76ecb9773108 100644
--- a/security/openvpn-auth-ldap/distinfo
+++ b/security/openvpn-auth-ldap/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1581341930
-SHA256 (threerings-openvpn-auth-ldap-2.0.4-auth-ldap-2.0.4_GH0.tar.gz) = 81f600cdc88adb2258f57df1ed2d87f0afa945f66cbf8897ad50e76f42509168
-SIZE (threerings-openvpn-auth-ldap-2.0.4-auth-ldap-2.0.4_GH0.tar.gz) = 209800
+SHA256 (threerings-openvpn-auth-ldap-auth-ldap-2.0.4_GH0.tar.gz) = 81f600cdc88adb2258f57df1ed2d87f0afa945f66cbf8897ad50e76f42509168
+SIZE (threerings-openvpn-auth-ldap-auth-ldap-2.0.4_GH0.tar.gz) = 209800