aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cad/ifcopenshell/Makefile1
-rw-r--r--devel/dmake/Makefile2
-rw-r--r--devel/dmake/distinfo4
-rw-r--r--devel/hs-cabal-install/Makefile2
-rw-r--r--devel/hs-cabal-install/distinfo4
-rw-r--r--devel/opencl/Makefile2
-rw-r--r--dns/nss_mdns/Makefile1
-rw-r--r--editors/imhex/Makefile2
-rw-r--r--editors/imhex/distinfo4
-rw-r--r--emulators/cannonball/Makefile2
-rw-r--r--emulators/cannonball/distinfo4
-rw-r--r--finance/beancount/Makefile1
-rw-r--r--irc/soju/Makefile1
-rw-r--r--lang/tauthon/Makefile2
-rw-r--r--lang/tauthon/distinfo4
-rw-r--r--multimedia/dvdauthor/Makefile1
-rw-r--r--multimedia/kodi/Makefile2
-rw-r--r--multimedia/kodi/distinfo4
-rw-r--r--multimedia/libv4l/Makefile2
-rw-r--r--multimedia/libv4l/distinfo4
-rw-r--r--multimedia/webcamd/Makefile2
-rw-r--r--multimedia/webcamd/distinfo4
-rw-r--r--net-mgmt/nfs-exporter/Makefile3
-rw-r--r--net-mgmt/nfs-exporter/distinfo4
-rw-r--r--net/sniffit/Makefile2
-rw-r--r--net/sniffit/distinfo4
-rw-r--r--ports-mgmt/poudriere-devel/Makefile1
-rw-r--r--security/openvas/Makefile3
-rw-r--r--security/openvas/distinfo4
-rw-r--r--security/p5-openxpki/Makefile2
-rw-r--r--sysutils/datadog-integrations/Makefile1
-rw-r--r--sysutils/nmrpflash/Makefile2
-rw-r--r--sysutils/nmrpflash/distinfo4
-rw-r--r--sysutils/oc/Makefile1
-rw-r--r--sysutils/reptyr/Makefile2
-rw-r--r--sysutils/reptyr/distinfo4
-rw-r--r--sysutils/restic/Makefile2
-rw-r--r--textproc/md4c/Makefile2
-rw-r--r--textproc/md4c/distinfo4
-rw-r--r--textproc/redisearch16/Makefile1
-rw-r--r--textproc/wbxml2/Makefile3
-rw-r--r--textproc/wbxml2/distinfo4
-rw-r--r--www/deno/Makefile1
-rw-r--r--www/mod_evasive/Makefile1
-rw-r--r--www/opencart/Makefile2
45 files changed, 47 insertions, 65 deletions
diff --git a/cad/ifcopenshell/Makefile b/cad/ifcopenshell/Makefile
index 53a5b79a25e9..ec7d87e9a632 100644
--- a/cad/ifcopenshell/Makefile
+++ b/cad/ifcopenshell/Makefile
@@ -6,7 +6,6 @@ DISTVERSION= 0.6.0
DISTVERSIONSUFFIX= b0
PORTREVISION= 2
CATEGORIES= cad
-DISTNAME= ${PORTNAME}-${DISTVERSION}
MAINTAINER= lbartoletti@FreeBSD.org
COMMENT= Open source IFC library and geometry engine
diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile
index c3deea579dab..8b28e8623c73 100644
--- a/devel/dmake/Makefile
+++ b/devel/dmake/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dmake
PORTVERSION= 4.13.1
+DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= devel
@@ -16,7 +17,6 @@ USES= autoreconf
USE_GITHUB= yes
GH_ACCOUNT= jimjag
-GH_TAGNAME= v${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --datarootdir=${DATADIR}
diff --git a/devel/dmake/distinfo b/devel/dmake/distinfo
index d413ebcb794c..2e27e13be585 100644
--- a/devel/dmake/distinfo
+++ b/devel/dmake/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1608070985
-SHA256 (jimjag-dmake-4.13.1-v4.13.1_GH0.tar.gz) = 816664f5299b2c0ddbb717e9dcbd15f15438a724a174256b5eba0c6a6d15be6f
-SIZE (jimjag-dmake-4.13.1-v4.13.1_GH0.tar.gz) = 677296
+SHA256 (jimjag-dmake-v4.13.1_GH0.tar.gz) = 816664f5299b2c0ddbb717e9dcbd15f15438a724a174256b5eba0c6a6d15be6f
+SIZE (jimjag-dmake-v4.13.1_GH0.tar.gz) = 677296
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index faef8ec1b2d1..ef13256afb46 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= cabal-install
+DISTVERSIONPREFIX= ${PORTNAME}-
DISTVERSION= 3.4.0.0
CATEGORIES= devel haskell
@@ -16,7 +17,6 @@ USES= cabal:nodefault compiler:c11 python:build
USE_GITHUB= yes
GH_ACCOUNT= haskell
GH_PROJECT= cabal
-GH_TAGNAME= ${PORTNAME}-${DISTVERSION}
USE_CABAL= async-2.2.2_1 \
base16-bytestring-0.1.1.7 \
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index a5798f91ec6b..4e7bf56c3e61 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -65,5 +65,5 @@ SHA256 (cabal/zlib-0.6.2.1/zlib-0.6.2.1.tar.gz) = f0f810ff173560b60392db448455c0
SIZE (cabal/zlib-0.6.2.1/zlib-0.6.2.1.tar.gz) = 143424
SHA256 (cabal/zlib-0.6.2.1/revision/1.cabal) = d34ddf5fece4d1e9d471b5298f36335bb3cfe12cb5a1b8525c42f0b665382f45
SIZE (cabal/zlib-0.6.2.1/revision/1.cabal) = 4547
-SHA256 (cabal/haskell-cabal-3.4.0.0-cabal-install-3.4.0.0_GH0.tar.gz) = e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
-SIZE (cabal/haskell-cabal-3.4.0.0-cabal-install-3.4.0.0_GH0.tar.gz) = 2072483
+SHA256 (cabal/haskell-cabal-cabal-install-3.4.0.0_GH0.tar.gz) = e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+SIZE (cabal/haskell-cabal-cabal-install-3.4.0.0_GH0.tar.gz) = 2072483
diff --git a/devel/opencl/Makefile b/devel/opencl/Makefile
index 0a216131c133..a27b8464621e 100644
--- a/devel/opencl/Makefile
+++ b/devel/opencl/Makefile
@@ -25,7 +25,7 @@ CLHPP_TAG= 64c206f # include missing CL/opencl.hpp
NO_BUILD= yes
NO_ARCH= yes
-WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}/CL
+WRKSRC_SUBDIR= CL
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/include/CL
diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile
index 63e6471d17eb..d93efdb7e683 100644
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@@ -4,7 +4,6 @@
PORTNAME= nss_mdns
PORTVERSION= 0.14.1.20200624
CATEGORIES= dns
-DISTNAME= nss-mdns-${PORTVERSION}
MAINTAINER= ashish@FreeBSD.org
COMMENT= NSS module implementing multicast DNS name resolution
diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
index dab4478490a7..abdfe8f9f757 100644
--- a/editors/imhex/Makefile
+++ b/editors/imhex/Makefile
@@ -2,6 +2,7 @@
PORTNAME= imhex
PORTVERSION= 1.7.0
+DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= editors
@@ -29,7 +30,6 @@ USE_XORG= x11 xcb xau xdmcp
USE_GITHUB= yes
GH_ACCOUNT= WerWolv
GH_PROJECT= ImHex
-GH_TAGNAME= v${PORTVERSION}
CC= ${LOCALBASE}/bin/gcc10
CXX= ${LOCALBASE}/bin/c++10
diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo
index 03747b198c59..8cac4bc1b324 100644
--- a/editors/imhex/distinfo
+++ b/editors/imhex/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1613820150
-SHA256 (WerWolv-ImHex-1.7.0-v1.7.0_GH0.tar.gz) = 891c9268dda958922698c6fdfcba34ec7b20853f3764fe9d58c4a932a6b0d3d8
-SIZE (WerWolv-ImHex-1.7.0-v1.7.0_GH0.tar.gz) = 1189375
+SHA256 (WerWolv-ImHex-v1.7.0_GH0.tar.gz) = 891c9268dda958922698c6fdfcba34ec7b20853f3764fe9d58c4a932a6b0d3d8
+SIZE (WerWolv-ImHex-v1.7.0_GH0.tar.gz) = 1189375
diff --git a/emulators/cannonball/Makefile b/emulators/cannonball/Makefile
index b1656b1d28ba..69ff3329de3f 100644
--- a/emulators/cannonball/Makefile
+++ b/emulators/cannonball/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= cannonball
+DISTVERSIONPREFIX= v
DISTVERSION= 0.31
CATEGORIES= emulators games
@@ -25,7 +26,6 @@ CFLAGS+= -I${LOCALBASE}/include
USE_GITHUB= yes
GH_ACCOUNT= djyt
-GH_TAGNAME= v${DISTVERSION}
BUILD_WRKSRC= ${WRKSRC}/cmake
CONFIGURE_WRKSRC= ${WRKSRC}/cmake
diff --git a/emulators/cannonball/distinfo b/emulators/cannonball/distinfo
index fb8b58c662dd..7dfbcadd0aad 100644
--- a/emulators/cannonball/distinfo
+++ b/emulators/cannonball/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1615884344
-SHA256 (djyt-cannonball-0.31-v0.31_GH0.tar.gz) = 8743fcfabeeaf8820ab47196e1b29b1702c1f71b784b6336f79d5f8725bc561b
-SIZE (djyt-cannonball-0.31-v0.31_GH0.tar.gz) = 269125
+SHA256 (djyt-cannonball-v0.31_GH0.tar.gz) = 8743fcfabeeaf8820ab47196e1b29b1702c1f71b784b6336f79d5f8725bc561b
+SIZE (djyt-cannonball-v0.31_GH0.tar.gz) = 269125
diff --git a/finance/beancount/Makefile b/finance/beancount/Makefile
index 4001070e1fae..f561faf44aba 100644
--- a/finance/beancount/Makefile
+++ b/finance/beancount/Makefile
@@ -3,7 +3,6 @@
PORTNAME= beancount
PORTVERSION= 2.3.3
CATEGORIES= finance
-DISTNAME= ${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= nivit@FreeBSD.org
diff --git a/irc/soju/Makefile b/irc/soju/Makefile
index 3d062e9370e9..a06871746c60 100644
--- a/irc/soju/Makefile
+++ b/irc/soju/Makefile
@@ -4,7 +4,6 @@ PORTNAME= soju
DISTVERSION= 0.0.20201214
CATEGORIES= irc
MASTER_SITES= https://git.sr.ht/~emersion/go-scfg/archive/:goscfg
-DISTNAME= go-scfg-${GO_SCFG_REV}
DISTFILES= ${GO_SCFG_REV}.tar.gz:goscfg
MAINTAINER= ashish@FreeBSD.org
diff --git a/lang/tauthon/Makefile b/lang/tauthon/Makefile
index 507807bd106c..a7adfec69c90 100644
--- a/lang/tauthon/Makefile
+++ b/lang/tauthon/Makefile
@@ -7,6 +7,7 @@
# 'pkg-message').
# -- Olivier Certner <olce.freebsd.ports@certner.fr>
PORTNAME= tauthon
+DISTVERSIONPREFIX= v
DISTVERSION= 2.8.2
CATEGORIES= lang python
@@ -24,7 +25,6 @@ PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_GITHUB= yes
GH_ACCOUNT= naftaliharris
GH_PROJECT= tauthon
-GH_TAGNAME= v${DISTVERSION}
USE_LDCONFIG= yes
# Piggyback on Python support in shebangfix
diff --git a/lang/tauthon/distinfo b/lang/tauthon/distinfo
index 8575eaac1d54..bdd63df0f9aa 100644
--- a/lang/tauthon/distinfo
+++ b/lang/tauthon/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1604584539
-SHA256 (naftaliharris-tauthon-2.8.2-v2.8.2_GH0.tar.gz) = 9423756fcb0afb652ae1ce3c7f0ac195e731e3a4f535a703991cf76bcb3ce267
-SIZE (naftaliharris-tauthon-2.8.2-v2.8.2_GH0.tar.gz) = 17701363
+SHA256 (naftaliharris-tauthon-v2.8.2_GH0.tar.gz) = 9423756fcb0afb652ae1ce3c7f0ac195e731e3a4f535a703991cf76bcb3ce267
+SIZE (naftaliharris-tauthon-v2.8.2_GH0.tar.gz) = 17701363
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 0bca06d10180..cb8c0a1c8275 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= libdvdread.so:multimedia/libdvdread \
USE_GITHUB= yes
GH_ACCOUNT= ldo
GH_TAGNAME= d5bb0b
-WRKSRC= ${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
USES= autoreconf:build bison:alias gettext-tools \
gmake gnome iconv localbase pkgconfig
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 51a8421f58cd..63b20ea19e83 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kodi
DISTVERSION= 19.0
+DISTVERSIONSUFFIX= -${KODI_CODENAME}
CATEGORIES= multimedia java
MAINTAINER= yzrh@noema.org
@@ -50,7 +51,6 @@ KODI_CODENAME= Matrix
USE_GITHUB= yes
GH_ACCOUNT= xbmc
GH_PROJECT= xbmc
-GH_TAGNAME= ${DISTVERSION}-${KODI_CODENAME}
KODI_ARCH_aarch64= aarch64
KODI_ARCH_amd64= x86_64
diff --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo
index 1a50a2d5dd27..4fe7543c58ca 100644
--- a/multimedia/kodi/distinfo
+++ b/multimedia/kodi/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1613832956
-SHA256 (xbmc-xbmc-19.0-19.0-Matrix_GH0.tar.gz) = f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2
-SIZE (xbmc-xbmc-19.0-19.0-Matrix_GH0.tar.gz) = 52311355
+SHA256 (xbmc-xbmc-19.0-Matrix_GH0.tar.gz) = f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2
+SIZE (xbmc-xbmc-19.0-Matrix_GH0.tar.gz) = 52311355
diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile
index ee49a44d5594..33a71a1e11d4 100644
--- a/multimedia/libv4l/Makefile
+++ b/multimedia/libv4l/Makefile
@@ -4,6 +4,7 @@
PORTNAME?= libv4l
PORTVERSION= 1.20.0
+DISTVERSIONPREFIX= v4l-utils-
CATEGORIES= multimedia
MAINTAINER= multimedia@FreeBSD.org
@@ -17,7 +18,6 @@ USES= compiler:c11 tar:bzip2
USE_GITHUB= yes
GH_ACCOUNT= hselasky
GH_PROJECT= v4l-utils
-GH_TAGNAME= v4l-utils-${PORTVERSION}
GH_TUPLE= hselasky:webcamd:v5.10.6.0:webcamd \
torvalds:linux:v5.10-rc6:linux
diff --git a/multimedia/libv4l/distinfo b/multimedia/libv4l/distinfo
index bda3894d3718..dc24e83fe587 100644
--- a/multimedia/libv4l/distinfo
+++ b/multimedia/libv4l/distinfo
@@ -1,6 +1,6 @@
TIMESTAMP = 1606936269
-SHA256 (hselasky-v4l-utils-1.20.0-v4l-utils-1.20.0_GH0.tar.gz) = 1a2bcc1fa5182f718c982c6ee58d0756dca602639ab6b9a9caff021272b33646
-SIZE (hselasky-v4l-utils-1.20.0-v4l-utils-1.20.0_GH0.tar.gz) = 1620489
+SHA256 (hselasky-v4l-utils-v4l-utils-1.20.0_GH0.tar.gz) = 1a2bcc1fa5182f718c982c6ee58d0756dca602639ab6b9a9caff021272b33646
+SIZE (hselasky-v4l-utils-v4l-utils-1.20.0_GH0.tar.gz) = 1620489
SHA256 (hselasky-webcamd-v5.10.6.0_GH0.tar.gz) = e6c2627130c369fa6cb0a2b30850ccd44735f755127677be457bc5a783b7b3e2
SIZE (hselasky-webcamd-v5.10.6.0_GH0.tar.gz) = 267471
SHA256 (torvalds-linux-v5.10-rc6_GH0.tar.gz) = d139d4cc8eb8b27364adc774c0df0feac39389beb4357a36d628a48c92fed393
diff --git a/multimedia/webcamd/Makefile b/multimedia/webcamd/Makefile
index aa61f8842019..33654f54ddf7 100644
--- a/multimedia/webcamd/Makefile
+++ b/multimedia/webcamd/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= webcamd
+DISTVERSIONPREFIX= v
DISTVERSION= 5.10.6.1
PORTREVISION= 2
CATEGORIES= multimedia
@@ -21,7 +22,6 @@ SUB_FILES= webcamd.conf
USE_GITHUB= yes
GH_ACCOUNT= hselasky
GH_PROJECT= ${PORTNAME}
-GH_TAGNAME= v${DISTVERSION}
GH_TUPLE= torvalds:linux:v5.10-rc6:linux
OPTIONS_DEFINE= DEBUG VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM
diff --git a/multimedia/webcamd/distinfo b/multimedia/webcamd/distinfo
index 9f862a166cf0..7a6397be35f7 100644
--- a/multimedia/webcamd/distinfo
+++ b/multimedia/webcamd/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1612775049
-SHA256 (hselasky-webcamd-5.10.6.1-v5.10.6.1_GH0.tar.gz) = ffef7d407f7c4e7536a51ecc2e115d1e38e39257ec785d45220915ab6ad09cd8
-SIZE (hselasky-webcamd-5.10.6.1-v5.10.6.1_GH0.tar.gz) = 273201
+SHA256 (hselasky-webcamd-v5.10.6.1_GH0.tar.gz) = ffef7d407f7c4e7536a51ecc2e115d1e38e39257ec785d45220915ab6ad09cd8
+SIZE (hselasky-webcamd-v5.10.6.1_GH0.tar.gz) = 273201
SHA256 (torvalds-linux-v5.10-rc6_GH0.tar.gz) = d139d4cc8eb8b27364adc774c0df0feac39389beb4357a36d628a48c92fed393
SIZE (torvalds-linux-v5.10-rc6_GH0.tar.gz) = 185316277
diff --git a/net-mgmt/nfs-exporter/Makefile b/net-mgmt/nfs-exporter/Makefile
index 573ae0dbf3a8..25a15f7c5067 100644
--- a/net-mgmt/nfs-exporter/Makefile
+++ b/net-mgmt/nfs-exporter/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
PORTNAME= nfs-exporter
+DISTVERSIONPREFIX= v
DISTVERSION= 0.3.0
PORTREVISION= 1
CATEGORIES= net-mgmt
-DISTNAME= freebsd-nfs-exporter-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= asomers@FreeBSD.org
COMMENT= Prometheus exporter for NFS statistics
@@ -18,7 +18,6 @@ USES= cargo
USE_GITHUB= yes
GH_ACCOUNT= Axcient
GH_PROJECT= freebsd-nfs-exporter
-GH_TAGNAME= v${PORTVERSION}
USE_RC_SUBR= nfs_exporter
CARGO_CRATES= aho-corasick-0.7.13 \
diff --git a/net-mgmt/nfs-exporter/distinfo b/net-mgmt/nfs-exporter/distinfo
index 4d97d76718e7..1d8a9711a674 100644
--- a/net-mgmt/nfs-exporter/distinfo
+++ b/net-mgmt/nfs-exporter/distinfo
@@ -189,5 +189,5 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c
SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
SHA256 (rust/crates/ws2_32-sys-0.2.1.tar.gz) = d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e
SIZE (rust/crates/ws2_32-sys-0.2.1.tar.gz) = 4697
-SHA256 (Axcient-freebsd-nfs-exporter-0.3.0-v0.3.0_GH0.tar.gz) = 3c605fb3f50b0b66a6f5c19395180c6259bfdc65d3b7dec37dcae07e49de0696
-SIZE (Axcient-freebsd-nfs-exporter-0.3.0-v0.3.0_GH0.tar.gz) = 21327
+SHA256 (Axcient-freebsd-nfs-exporter-v0.3.0_GH0.tar.gz) = 3c605fb3f50b0b66a6f5c19395180c6259bfdc65d3b7dec37dcae07e49de0696
+SIZE (Axcient-freebsd-nfs-exporter-v0.3.0_GH0.tar.gz) = 21327
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 2d076f7c8b88..6afd2feab3c3 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sniffit
PORTVERSION= 0.5
+DISTVERSIONPREFIX= ${PORTNAME}-
CATEGORIES= net security
MAINTAINER= ports@FreeBSD.org
@@ -14,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES=autoreconf
USE_GITHUB= yes
GH_ACCOUNT= resurrecting-open-source-projects
-GH_TAGNAME= ${PORTNAME}-${PORTVERSION}
GNU_CONFIGURE= yes
diff --git a/net/sniffit/distinfo b/net/sniffit/distinfo
index efbad7eeb008..0d9d4ee2a718 100644
--- a/net/sniffit/distinfo
+++ b/net/sniffit/distinfo
@@ -1,5 +1,5 @@
TIMESTAMP = 1600880368
-SHA256 (resurrecting-open-source-projects-sniffit-0.5-sniffit-0.5_GH0.tar.gz) = 20514ad7b3d731d9c7a1c79791e27b2bd7a64ac6c62da2197f3c0b88a7f4d969
-SIZE (resurrecting-open-source-projects-sniffit-0.5-sniffit-0.5_GH0.tar.gz) = 60074
+SHA256 (resurrecting-open-source-projects-sniffit-sniffit-0.5_GH0.tar.gz) = 20514ad7b3d731d9c7a1c79791e27b2bd7a64ac6c62da2197f3c0b88a7f4d969
+SIZE (resurrecting-open-source-projects-sniffit-sniffit-0.5_GH0.tar.gz) = 60074
SHA256 (sniffit_0.3.7.beta-10.diff.gz) = c5cc02107d9a6947e37f1c18349cc61fe5fc4036808e6aad95a231e08805d529
SIZE (sniffit_0.3.7.beta-10.diff.gz) = 30059
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index a8b9c43a43c6..3e558ec13bd6 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -19,7 +19,6 @@ CONFLICTS_INSTALL= poudriere-[0-9]*
USE_GITHUB= yes
GH_ACCOUNT= freebsd
GH_TAGNAME= 3.3.0-542-g8bf6e594a
-#DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}
GNU_CONFIGURE= yes
ETCDIR= ${PREFIX}/etc/poudriere.d
diff --git a/security/openvas/Makefile b/security/openvas/Makefile
index 014b15e1fc6c..75d40ad73412 100644
--- a/security/openvas/Makefile
+++ b/security/openvas/Makefile
@@ -25,6 +25,7 @@ RUN_DEPENDS= redis-server:databases/redis \
${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= greenbone
+GH_PROJECT= ${PORTNAME}-scanner
USES= bison cmake gnome pkgconfig python:3.5+
USE_GNOME= glib20
@@ -32,8 +33,6 @@ USE_GNOME= glib20
USERS= gvm
GROUPS= ${USERS}
-WRKSRC= ${WRKDIR}/${PORTNAME}-scanner-${DISTVERSION}
-
post-install:
@${MKDIR} ${STAGEDIR}/var/run/ospd
diff --git a/security/openvas/distinfo b/security/openvas/distinfo
index fa23dd6cc32c..4ec365779ee2 100644
--- a/security/openvas/distinfo
+++ b/security/openvas/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1613666970
-SHA256 (greenbone-openvas-v20.8.1_GH0.tar.gz) = 37856e754e70a597a0d8227625a0145c14575168ebf7441bcedc587c36823216
-SIZE (greenbone-openvas-v20.8.1_GH0.tar.gz) = 431985
+SHA256 (greenbone-openvas-scanner-v20.8.1_GH0.tar.gz) = 37856e754e70a597a0d8227625a0145c14575168ebf7441bcedc587c36823216
+SIZE (greenbone-openvas-scanner-v20.8.1_GH0.tar.gz) = 431985
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 0b4a22fe7803..156ec14c2dcb 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -102,8 +102,6 @@ PORTEXAMPLES= *
PORTSCOUT= limitw:1,even # stay with stable versions only
-# Workaround the bug in Mk/bsd.port.mk, cf. PR#246196:
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WRKSRC_SUBDIR= core/server/
USERS= openxpki
diff --git a/sysutils/datadog-integrations/Makefile b/sysutils/datadog-integrations/Makefile
index e28de33973f1..3b330672cb74 100644
--- a/sysutils/datadog-integrations/Makefile
+++ b/sysutils/datadog-integrations/Makefile
@@ -31,7 +31,6 @@ USES= python:3.7+
USE_GITHUB= yes
GH_ACCOUNT= DataDog
GH_PROJECT= integrations-core
-GH_TAGNAME= ${DISTVERSION}
ETCDIR= ${PREFIX}/etc/datadog
diff --git a/sysutils/nmrpflash/Makefile b/sysutils/nmrpflash/Makefile
index 4139ba0c77d2..07435581b3de 100644
--- a/sysutils/nmrpflash/Makefile
+++ b/sysutils/nmrpflash/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= nmrpflash
+DISTVERSIONPREFIX= v
DISTVERSION= 0.9.15
CATEGORIES= sysutils
@@ -14,7 +15,6 @@ USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= jclehner
-GH_TAGNAME= v${DISTVERSION}
MAKE_FLAGS= VERSION=${DISTVERSION}
diff --git a/sysutils/nmrpflash/distinfo b/sysutils/nmrpflash/distinfo
index 8c109b33e543..a5e6fa8cb611 100644
--- a/sysutils/nmrpflash/distinfo
+++ b/sysutils/nmrpflash/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1611935393
-SHA256 (jclehner-nmrpflash-0.9.15-v0.9.15_GH0.tar.gz) = 334328b5c960da9527dfdc20f39a65bf0c65ce7abdbfba0d7b54f997141fa0a7
-SIZE (jclehner-nmrpflash-0.9.15-v0.9.15_GH0.tar.gz) = 39503
+SHA256 (jclehner-nmrpflash-v0.9.15_GH0.tar.gz) = 334328b5c960da9527dfdc20f39a65bf0c65ce7abdbfba0d7b54f997141fa0a7
+SIZE (jclehner-nmrpflash-v0.9.15_GH0.tar.gz) = 39503
diff --git a/sysutils/oc/Makefile b/sysutils/oc/Makefile
index a0145d906235..43c221259d05 100644
--- a/sysutils/oc/Makefile
+++ b/sysutils/oc/Makefile
@@ -5,7 +5,6 @@ PORTNAME= oc
PORTVERSION= 4.5
DISTVERSIONPREFIX= release-
CATEGORIES= sysutils
-DISTNAME= ${GIT_COMMIT}.zip
MAINTAINER= jhixson@freebsd.org
COMMENT= OpenShift Command Line
diff --git a/sysutils/reptyr/Makefile b/sysutils/reptyr/Makefile
index 44707ede923c..1006e8f45da5 100644
--- a/sysutils/reptyr/Makefile
+++ b/sysutils/reptyr/Makefile
@@ -3,6 +3,7 @@
PORTNAME= reptyr
PORTVERSION= 0.8.0
+DISTVERSIONPREFIX= reptyr-
CATEGORIES= sysutils
MAINTAINER= andoriyu@gmail.com
@@ -12,7 +13,6 @@ LICENSE= MIT
USE_GITHUB= yes
GH_ACCOUNT= nelhage
-GH_TAGNAME= reptyr-${PORTVERSION}
MAKE_ARGS= BASHCOMPDIR=${PREFIX}/share/bash-completion/completions \
MANDIR=${MANPREFIX}/man
diff --git a/sysutils/reptyr/distinfo b/sysutils/reptyr/distinfo
index e710050f064a..efe6398e6a98 100644
--- a/sysutils/reptyr/distinfo
+++ b/sysutils/reptyr/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1601416039
-SHA256 (nelhage-reptyr-0.8.0-reptyr-0.8.0_GH0.tar.gz) = 4b470ed2a0d25fed591739fa9613ce7ad3d0377891eb56cbe914e3c85db46ca8
-SIZE (nelhage-reptyr-0.8.0-reptyr-0.8.0_GH0.tar.gz) = 32239
+SHA256 (nelhage-reptyr-reptyr-0.8.0_GH0.tar.gz) = 4b470ed2a0d25fed591739fa9613ce7ad3d0377891eb56cbe914e3c85db46ca8
+SIZE (nelhage-reptyr-reptyr-0.8.0_GH0.tar.gz) = 32239
diff --git a/sysutils/restic/Makefile b/sysutils/restic/Makefile
index f3b1bbe8c462..5e7238a1cdc5 100644
--- a/sysutils/restic/Makefile
+++ b/sysutils/restic/Makefile
@@ -4,8 +4,6 @@ PORTNAME= restic
DISTVERSIONPREFIX= v
DISTVERSION= 0.12.0
CATEGORIES= sysutils
-MASTER_SITES= https://github.com/restic/restic/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
-DISTNAME= ${PORTNAME}-${DISTVERSION}
MAINTAINER= gregf@beastie.tech
COMMENT= Fast, secure, efficient backup program
diff --git a/textproc/md4c/Makefile b/textproc/md4c/Makefile
index 95a7f92d4c79..1ea9615f4d85 100644
--- a/textproc/md4c/Makefile
+++ b/textproc/md4c/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= md4c
+DISTVERSIONPREFIX= release-
DISTVERSION= 0.4.7
CATEGORIES= textproc
@@ -13,6 +14,5 @@ USES= cmake
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= mity
-GH_TAGNAME= release-${DISTVERSION}
.include <bsd.port.mk>
diff --git a/textproc/md4c/distinfo b/textproc/md4c/distinfo
index 94a6e76b445a..ccbc79a2ed7e 100644
--- a/textproc/md4c/distinfo
+++ b/textproc/md4c/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1613558190
-SHA256 (mity-md4c-0.4.7-release-0.4.7_GH0.tar.gz) = f1b12d7aeb64fcbc7092c832e1a8b137102fec168961c87222fa599aedc19035
-SIZE (mity-md4c-0.4.7-release-0.4.7_GH0.tar.gz) = 228223
+SHA256 (mity-md4c-release-0.4.7_GH0.tar.gz) = f1b12d7aeb64fcbc7092c832e1a8b137102fec168961c87222fa599aedc19035
+SIZE (mity-md4c-release-0.4.7_GH0.tar.gz) = 228223
diff --git a/textproc/redisearch16/Makefile b/textproc/redisearch16/Makefile
index afea9daaf75d..a22b930f3626 100644
--- a/textproc/redisearch16/Makefile
+++ b/textproc/redisearch16/Makefile
@@ -4,7 +4,6 @@
PORTNAME= redisearch16
DISTVERSIONPREFIX= v
DISTVERSION= 1.6.15
-DISTNAME= RediSearch-${DISTVERSION}
CATEGORIES= textproc
MAINTAINER= osa@FreeBSD.org
diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile
index 3cb9d1013569..31eb9f313d6b 100644
--- a/textproc/wbxml2/Makefile
+++ b/textproc/wbxml2/Makefile
@@ -3,8 +3,8 @@
PORTNAME= wbxml2
PORTVERSION= 0.11.7
+DISTVERSIONPREFIX= libwbxml-
CATEGORIES= textproc devel
-DISTNAME= libwbxml-${PORTVERSION}
MAINTAINER= flo@FreeBSD.org
COMMENT= Library & tools for converting wbxml<->xml
@@ -19,7 +19,6 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= libwbxml
GH_PROJECT= libwbxml
-GH_TAGNAME= libwbxml-${PORTVERSION}
DOCSDIR= ${PREFIX}/share/doc/libwbxml
diff --git a/textproc/wbxml2/distinfo b/textproc/wbxml2/distinfo
index e9abbcd06790..63474e66122b 100644
--- a/textproc/wbxml2/distinfo
+++ b/textproc/wbxml2/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1605696198
-SHA256 (libwbxml-libwbxml-0.11.7-libwbxml-0.11.7_GH0.tar.gz) = 35e2cf033066edebc0d96543c0bdde87273359e4f4e59291299d41e103bd6338
-SIZE (libwbxml-libwbxml-0.11.7-libwbxml-0.11.7_GH0.tar.gz) = 427429
+SHA256 (libwbxml-libwbxml-libwbxml-0.11.7_GH0.tar.gz) = 35e2cf033066edebc0d96543c0bdde87273359e4f4e59291299d41e103bd6338
+SIZE (libwbxml-libwbxml-libwbxml-0.11.7_GH0.tar.gz) = 427429
diff --git a/www/deno/Makefile b/www/deno/Makefile
index b79962cde777..f3ff4b7fdb99 100644
--- a/www/deno/Makefile
+++ b/www/deno/Makefile
@@ -25,7 +25,6 @@ USE_GNOME= glib20
MAKE_JOBS_UNSAFE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
RUSTY_VERS= 0.20.0
CARGO_ENV+= CLANG_BASE_PATH=/usr \
diff --git a/www/mod_evasive/Makefile b/www/mod_evasive/Makefile
index 94b98d415852..875f4f394a90 100644
--- a/www/mod_evasive/Makefile
+++ b/www/mod_evasive/Makefile
@@ -5,7 +5,6 @@ PORTNAME= mod_evasive
PORTVERSION= 1.10.1
PORTREVISION= 2
CATEGORIES= www security
-DISTNAME= mod_evasive_${PORTVERSION}
DIST_SUBDIR= apache2
MAINTAINER= kiwi@oav.net
diff --git a/www/opencart/Makefile b/www/opencart/Makefile
index c7a5c9baa345..dcb66ed64471 100644
--- a/www/opencart/Makefile
+++ b/www/opencart/Makefile
@@ -15,7 +15,7 @@ GH_ACCOUNT= opencart
USES= php
USE_PHP= filter mysqli curl mbstring gd zlib mcrypt session zip hash openssl
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/upload
+WRKSRC_SUBDIR= upload
NO_BUILD= yes
SUB_FILES= pkg-message