diff --git a/fonts/jaldi/Makefile b/fonts/jaldi/Makefile
index d47aa6a50e3..6808ffa1a63 100644
--- a/fonts/jaldi/Makefile
+++ b/fonts/jaldi/Makefile
@@ -2,10 +2,13 @@ COMMENT =	libre Devanagari typeface family
 
 MODFONT_FAMILY =	jaldi
 MODFONT_VERSION =	1.007
-REVISION =	0
 
-DISTFILES =	${MODFONT_VERSION}.zip
-SITES =		https://github.com/Omnibus-Type/Jaldi/archive/refs/tags/
+GH_ACCOUNT =	Omnibus-Type
+GH_PROJECT =	Jaldi
+GH_TAGNAME =	${MODFONT_VERSION}
+WRKSRC =	${WRKDIST}/Fonts
+
+REVISION =	0
 
 MAINTAINER =	George Rosamond <george@nycbug.org>
 
@@ -17,6 +20,4 @@ MODULES =	font
 NO_BUILD =	Yes
 NO_TEST =	Yes
 
-WRKSRC =	${WRKDIST}/Jaldi-${MODFONT_VERSION}/Fonts
-
 .include <bsd.port.mk>
diff --git a/fonts/jaldi/distinfo b/fonts/jaldi/distinfo
index 14c807cc4be..d9c3709e85c 100644
--- a/fonts/jaldi/distinfo
+++ b/fonts/jaldi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (1.007.zip) = 57vq8B57u86ikdch+VuiBdrlyL7sinKGcWsN1xs4O1I=
-SIZE (1.007.zip) = 6242265
+SHA256 (Jaldi-1.007.zip) = 57vq8B57u86ikdch+VuiBdrlyL7sinKGcWsN1xs4O1I=
+SIZE (Jaldi-1.007.zip) = 6242265
diff --git a/games/liberalcrimesquad/Makefile b/games/liberalcrimesquad/Makefile
index 912fda6bbd5..99913f2238c 100644
--- a/games/liberalcrimesquad/Makefile
+++ b/games/liberalcrimesquad/Makefile
@@ -1,6 +1,8 @@
-V =		4.10.0
 COMMENT =	politics and government game with liberal bias
-DISTNAME =	liberalcrimesquad-${V}{v${V}}
+V =		4.10.0
+GH_ACCOUNT =	Kamal-Sadek
+GH_PROJECT =	Liberal-Crime-Squad
+GH_TAGNAME =	v${V}
 PKGNAME =	liberalcrimesquad-${V}
 CATEGORIES =	games
 REVISION =	3
@@ -12,8 +14,6 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} c curses iconv m
 
-SITES =		https://github.com/Kamal-Sadek/Liberal-Crime-Squad/archive/
-
 # C++11
 COMPILER =	base-clang ports-gcc base-gcc
 
@@ -31,6 +31,4 @@ CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 AUTOCONF_VERSION =	2.69
 AUTOMAKE_VERSION =	1.15
 
-WRKDIST =	${WRKDIR}/Liberal-Crime-Squad-${V}
-
 .include <bsd.port.mk>
diff --git a/games/liberalcrimesquad/distinfo b/games/liberalcrimesquad/distinfo
index 06e5a506a64..2664c84e7d0 100644
--- a/games/liberalcrimesquad/distinfo
+++ b/games/liberalcrimesquad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liberalcrimesquad-4.10.0.tar.gz) = 4rK7YvZ95R/17XQAdADBB+3jjez/43Wy3GPd69Y6qRY=
-SIZE (liberalcrimesquad-4.10.0.tar.gz) = 68809306
+SHA256 (Liberal-Crime-Squad-4.10.0.tar.gz) = 4rK7YvZ95R/17XQAdADBB+3jjez/43Wy3GPd69Y6qRY=
+SIZE (Liberal-Crime-Squad-4.10.0.tar.gz) = 68809306
diff --git a/games/stockfish/Makefile b/games/stockfish/Makefile
index 7c929e40c77..690e3157d2c 100644
--- a/games/stockfish/Makefile
+++ b/games/stockfish/Makefile
@@ -1,5 +1,8 @@
 V =		16.1
 COMMENT =	open source chess engine
+GH_ACCOUNT =	official-stockfish
+GH_PROJECT =	Stockfish
+GH_TAGNAME =	sf_${V}
 PKGNAME =	stockfish-${V}
 NNUE_BIG =	nn-b1a57edbea57.nnue
 NNUE_SMALL =	nn-baff1ede1f90.nnue
@@ -13,10 +16,8 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} c m
 
-SITES =		https://github.com/official-stockfish/Stockfish/archive/
 SITES.a =	https://tests.stockfishchess.org/api/nn/
-DISTFILES =	sf_${V}.tar.gz
-DISTFILES.a = 	${NNUE_BIG} ${NNUE_SMALL}
+DISTFILES.a =	${NNUE_BIG} ${NNUE_SMALL}
 EXTRACT_ONLY =	${DISTFILES}
 
 # C++17
@@ -45,7 +46,6 @@ MAKE_ENV =	ARCH=general-32
 
 NO_TEST =	Yes
 
-WRKDIST =	${WRKDIR}/Stockfish-sf_${V}
 WRKSRC =	${WRKDIST}/src
 
 post-extract:
diff --git a/games/stockfish/distinfo b/games/stockfish/distinfo
index c7117c90c4f..c710a018823 100644
--- a/games/stockfish/distinfo
+++ b/games/stockfish/distinfo
@@ -1,6 +1,6 @@
+SHA256 (Stockfish-sf_16.1.tar.gz) = pflHk7XUFVMQOXuonpxCZlcO8PJM1H3kGpEDVW+BG4I=
 SHA256 (nn-b1a57edbea57.nnue) = saV+2+pXTKi4jWg3RzhFeRvrU9iF+H+G1czdVln787I=
 SHA256 (nn-baff1ede1f90.nnue) = uv8e3h+Qwd0bT3cvHv8phIghgB6BhjRdp/DrQSG9b2M=
-SHA256 (sf_16.1.tar.gz) = pflHk7XUFVMQOXuonpxCZlcO8PJM1H3kGpEDVW+BG4I=
+SIZE (Stockfish-sf_16.1.tar.gz) = 176846
 SIZE (nn-b1a57edbea57.nnue) = 65429575
 SIZE (nn-baff1ede1f90.nnue) = 3480122
-SIZE (sf_16.1.tar.gz) = 176846
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index 758775b79ee..8f84167c262 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -1,11 +1,9 @@
 COMMENT=		free cross-platform real-time strategy gaming engine.
 
-V=			3.3.2
-DISTNAME=		stratagus-$V
+GH_ACCOUNT=		Wargus
+GH_PROJECT=		stratagus
+GH_TAGNAME=		v3.3.2
 CATEGORIES=		games
-SITES=			https://github.com/Wargus/stratagus/archive/refs/tags/
-DISTFILES=		stratagus-{v}${V}${EXTRACT_SUFX}
-EXTRACT_SUFX=		.tar.gz
 
 HOMEPAGE=		http://stratagus.com/stratagus.html
 
diff --git a/games/war1gus/Makefile b/games/war1gus/Makefile
index 153c3d8c3e3..9d8ccfe8ebf 100644
--- a/games/war1gus/Makefile
+++ b/games/war1gus/Makefile
@@ -1,10 +1,9 @@
 COMMENT=		Warcraft Orcs and Humans Mod
 
-V=			3.3.2
-DISTNAME=		war1gus-$V
+GH_ACCOUNT=		Wargus
+GH_PROJECT=		war1gus
+GH_TAGNAME=		v3.3.2
 CATEGORIES=		games
-SITES=			https://github.com/Wargus/war1gus/archive/refs/tags/
-DISTFILES=		war1gus-{v}${V}${EXTRACT_SUFX}
 
 HOMEPAGE=		https://stratagus.com/war1gus.html
 
@@ -30,8 +29,6 @@ RUN_DEPENDS=		archivers/innoextract \
 
 CONFIGURE_ARGS+=	-DGAMEDIR=${LOCALBASE}/bin/
 
-WRKDIST=		${WRKDIR}/war1gus-${V}
-
 post-install:
 	${MODPY_COMPILEALL} \
 		${PREFIX}/share/games/stratagus/war1gus/scripts/
diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index 0e39096845d..2ec9e3dbb6f 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -1,17 +1,16 @@
 COMMENT=		Warcraft 2 Mod
 
-V=			3.3.2
-DISTNAME=		wargus-$V
+GH_ACCOUNT=		Wargus
+GH_PROJECT=		wargus
+GH_TAGNAME=		v3.3.2
 CATEGORIES=		games
-SITES=			https://github.com/Wargus/wargus/archive/refs/tags/
-DISTFILES=		wargus-{v}${V}${EXTRACT_SUFX}
 
 HOMEPAGE=		http://stratagus.com/
 
 # GPLv2+
 PERMIT_PACKAGE=		Yes
 
-WANTLIB+= 		${COMPILER_LIBCXX} bz2 c m png pthread z
+WANTLIB +=		${COMPILER_LIBCXX} bz2 c m png pthread z
 
 MODULES=		devel/cmake
 
@@ -34,8 +33,6 @@ MODCMAKE_POLICY_VERSION_OVERRIDE = Yes
 
 MODCMAKE_LDFLAGS+=	-L${LOCALBASE}/lib
 
-WRKDIST=		${WRKDIR}/wargus-${V}
-
 FIX_CRLF_FILES=		StormLib/src/FileStream.cpp
 
 pre-configure:
diff --git a/graphics/py-sane/Makefile b/graphics/py-sane/Makefile
index 1c9ba45216d..acc5023cc16 100644
--- a/graphics/py-sane/Makefile
+++ b/graphics/py-sane/Makefile
@@ -1,12 +1,14 @@
 COMMENT=	Python SANE module
 
 MODPY_DISTV=	2.9.2
-DISTNAME=	Sane-${MODPY_DISTV}
-DISTFILES=	${DISTNAME}{v${MODPY_DISTV}}.tar.gz
+REVISION=	0
+GH_ACCOUNT=	python-pillow
+GH_PROJECT=	Sane
+GH_TAGNAME=	v${MODPY_DISTV}
 PKGNAME=	py-${DISTNAME:L}
 CATEGORIES=	graphics
 
-HOMEPAGE=	http://python-pillow.github.io/
+HOMEPAGE=	https://github.com/python-pillow/Sane
 
 # PIL Software License
 # Permission to use, copy, modify and distribute freely.
@@ -14,8 +16,6 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += sane
 
-SITES=         	https://github.com/python-pillow/Sane/archive/
-
 MODULES=	lang/python
 
 SUBST_VARS=	MODPY_SITEPKG
diff --git a/lang/nekovm/Makefile b/lang/nekovm/Makefile
index 866f9dffde2..3c3657d5531 100644
--- a/lang/nekovm/Makefile
+++ b/lang/nekovm/Makefile
@@ -1,7 +1,9 @@
 COMMENT =	Neko scripting language runtime and virtual machine
 
 V =		2.3.0
-DISTNAME =	v${V:S/./-/g}
+GH_ACCOUNT =	HaxeFoundation
+GH_PROJECT =	neko
+GH_TAGNAME =	v${V:S/./-/g}
 PKGNAME =	nekovm-${V}
 REVISION =	0
 SHARED_LIBS =	neko	0.0	# 2.3.0
@@ -14,7 +16,6 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB += c gc m pthread z
 
-SITES =			https://github.com/HaxeFoundation/neko/archive/
 MODULES =		devel/cmake
 BUILD_DEPENDS =		devel/git
 LIB_DEPENDS =		devel/boehm-gc,-main
@@ -30,7 +31,6 @@ CONFIGURE_ARGS =	-DNEKO_JIT_DISABLE=ON \
 			-DWITH_UI=OFF
 
 NO_TEST =		Yes
-WRKDIST =		${WRKDIR}/neko-${V:S/./-/g}
 
 MODCMAKE_POLICY_VERSION_OVERRIDE = Yes
 
diff --git a/lang/nekovm/distinfo b/lang/nekovm/distinfo
index 7c2064252fa..43eb3e913e9 100644
--- a/lang/nekovm/distinfo
+++ b/lang/nekovm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (v2-3-0.tar.gz) = hQ5+MXva8k7WUu/v+JwcshOAyhnyDmiilshPa61O6ZU=
-SIZE (v2-3-0.tar.gz) = 514044
+SHA256 (neko-2-3-0.tar.gz) = hQ5+MXva8k7WUu/v+JwcshOAyhnyDmiilshPa61O6ZU=
+SIZE (neko-2-3-0.tar.gz) = 514044
diff --git a/math/rstudio/Makefile b/math/rstudio/Makefile
index 43faf07d18e..ca651205126 100644
--- a/math/rstudio/Makefile
+++ b/math/rstudio/Makefile
@@ -5,15 +5,26 @@ BROKEN =	doesnt build with boost 1.87, needs update
 
 # XXX: patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp
 # must be kept in sync with math/R shlib bumps.
+# ??? is this actually needed? dlopen doesn't need a version
 
 # Upstream says no more 32-bit support.
 # Not really an issue because qtwebengine is a bigger problem.
 ONLY_FOR_ARCHS =	${LP64_ARCHS}
 
-V =		1.3.959
 COMMENT =	Integrated Development Environment (IDE) for R
-PKGNAME =	rstudio-${V}
+
+GH_ACCOUNT =	rstudio
+GH_PROJECT =	rstudio
+GH_TAGNAME =	v1.3.959
 REVISION =	14
+
+SITES.a =	https://s3.amazonaws.com/rstudio-buildtools/dictionaries/
+SITES.b =	https://s3.amazonaws.com/rstudio-buildtools/
+DISTFILES.a =	core-dictionaries.zip
+DISTFILES.b =	gin-${GIN_VERSION}.zip \
+		gwt-${GWT_VERSION}.zip \
+		mathjax-27.zip
+
 CATEGORIES =	math x11
 
 HOMEPAGE =	https://www.rstudio.com/
@@ -31,16 +42,6 @@ WANTLIB += boost_program_options-mt boost_random-mt boost_regex-mt
 WANTLIB += boost_thread-mt c crypto m pam ssl
 WANTLIB += util uuid z lib/R/lib/R lib/inotify/inotify
 
-# XXX: Ports does not permit GH_* and SITES together.
-SITES =		https://github.com/rstudio/rstudio/archive/
-SITES.a =	https://s3.amazonaws.com/rstudio-buildtools/dictionaries/
-SITES.b =	https://s3.amazonaws.com/rstudio-buildtools/
-DISTFILES =	rstudio-${V}{v${V}}.tar.gz
-DISTFILES.a = 	core-dictionaries.zip
-DISTFILES.b = 	gin-${GIN_VERSION}.zip \
-		gwt-${GWT_VERSION}.zip \
-		mathjax-27.zip
-
 # CMake looks for qmake-qt5 during configure...
 MODULES =	devel/cmake \
 		java \
@@ -76,8 +77,6 @@ MODCMAKE_LDFLAGS = 		-L${LOCALBASE}/lib/inotify -linotify -rpath ${LOCALBASE}/li
 
 NO_TEST =	Yes
 
-WRKDIST =	${WRKDIR}/rstudio-${V}
-
 GIN_VERSION =	2.1.2
 GWT_VERSION =	2.8.1