diff --git a/devel/tl-expected/Makefile b/devel/tl-expected/Makefile
index eadeff14a97..a34811a03ac 100644
--- a/devel/tl-expected/Makefile
+++ b/devel/tl-expected/Makefile
@@ -7,11 +7,11 @@ PKGNAME =		tl-${DISTNAME}
 CATEGORIES =		devel
 
 DIST_SUBDIR =		tl-expected
-MASTER_SITES0 =		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/
+MASTER_SITES.pr =	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/
 # pending "Added packaged Catch2 support and switched to v3"
-PATCHFILES =		use-system-catch2-{pull/}141.patch:0
+PATCHFILES.pr =		use-system-catch2-{pull/}141.patch
 # pending "Fixed version number in exported CMake configs"
-PATCHFILES +=		fix-version-{pull/}142.patch:0
+PATCHFILES.pr +=	fix-version-{pull/}142.patch
 
 PATCH_DIST_STRIP =	-p1
 
diff --git a/editors/vis/Makefile b/editors/vis/Makefile
index 14fcf4a9787..3ba0c181462 100644
--- a/editors/vis/Makefile
+++ b/editors/vis/Makefile
@@ -19,10 +19,9 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += c curses iconv intl m termkey tre ${MODLUA_WANTLIB}
 
 MASTER_SITES =		${HOMEPAGE}/releases/download/v${V}/
-MASTER_SITES0 =		${HOMEPAGE}-test/releases/download/v${TEST_V}/
-
-DISTFILES =		${DISTNAME}${EXTRACT_SUFX} \
-			${TEST_DISTNAME}${EXTRACT_SUFX}:0
+MASTER_SITES.test =	${HOMEPAGE}-test/releases/download/v${TEST_V}/
+DISTFILES =		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES.test =	${TEST_DISTNAME}${EXTRACT_SUFX}
 
 MODULES =		lang/lua
 MODLUA_VERSION =	5.3
diff --git a/net/dino/Makefile b/net/dino/Makefile
index d1f1f2b5667..7d56fc5566f 100644
--- a/net/dino/Makefile
+++ b/net/dino/Makefile
@@ -12,10 +12,10 @@ SHARED_LIBS +=	xmpp-vala                 3.0 # 0.1
 HOMEPAGE=	https://dino.im/
 
 MASTER_SITES=	https://github.com/dino/dino/releases/download/v${VERSION}/
-MASTER_SITES0=	https://github.com/dino/dino/commit/
+MASTER_SITES.fix= https://github.com/dino/dino/commit/
 # "Always export symbols to fix startup on BSDs" merged in master but not (yet)
 # into the "v0.4" release branch: https://github.com/dino/dino/issues/438
-PATCHFILES=	b75b6062abc07b25d0dcd6717e168aa85be7cf4e.patch:0
+PATCHFILES.fix=	b75b6062abc07b25d0dcd6717e168aa85be7cf4e.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	Klemens Nanni <kn@openbsd.org>
diff --git a/net/libnice/Makefile b/net/libnice/Makefile
index 1c1e0068a30..06db73d5c7c 100644
--- a/net/libnice/Makefile
+++ b/net/libnice/Makefile
@@ -12,11 +12,11 @@ WANTLIB += gupnp-igd-1.6
 HOMEPAGE =		https://libnice.freedesktop.org
 DIST_SUBDIR =		libnice
 MASTER_SITES =		https://libnice.freedesktop.org/releases/
-MASTER_SITES0 =		https://gitlab.freedesktop.org/libnice/libnice/-/
+MASTER_SITES.pr =	https://gitlab.freedesktop.org/libnice/libnice/-/
 # merged "Fix build with clang"
-PATCHFILES +=		fix-clang15-build-{commit/}f4e2838f.patch:0
+PATCHFILES.pr =		fix-clang15-build-{commit/}f4e2838f.patch
 # merged "Use ifr_index to fix build on OpenBSD"
-PATCHFILES +=		use-ifr_index-{merge_requests/}251.patch:0
+PATCHFILES.pr +=	use-ifr_index-{merge_requests/}251.patch
 
 PATCH_DIST_STRIP =	-p1