diff --git a/lang/go/Makefile b/lang/go/Makefile
index 326d818beeb..f40a3c8c9c1 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -23,10 +23,8 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		c pthread
 
-MASTER_SITES =		https://golang.org/dl/
-MASTER_SITES0 =		https://download.exigere.com.au/pub/go/
-
-DISTFILES =		${DISTNAME}${EXTRACT_SUFX}
+SITES =			https://golang.org/dl/
+SITES.bootstrap =	https://download.exigere.com.au/pub/go/
 
 BUILD_DEPENDS =		shells/bash
 
@@ -69,10 +67,10 @@ MAKE_ENV +=		TMPDIR="${WRKBUILD}"
 MAKE_ENV +=		GO386=softfloat
 
 .for arch in ${BIN_BOOTSTRAP_GOARCHS}
-SUPDISTFILES +=		go-openbsd-${arch}-bootstrap-${BIN_BOOTSTRAP_VERSION}${EXTRACT_SUFX}:0
+SUPDISTFILES.bootstrap += go-openbsd-${arch}-bootstrap-${BIN_BOOTSTRAP_VERSION}${EXTRACT_SUFX}
 
 .if ${GOARCH} == ${arch} && !${FLAVOR:Mnative_bootstrap}
-DISTFILES +=		go-openbsd-${GOARCH}-bootstrap-${BIN_BOOTSTRAP_VERSION}${EXTRACT_SUFX}:0
+DISTFILES.bootstrap +=	go-openbsd-${GOARCH}-bootstrap-${BIN_BOOTSTRAP_VERSION}${EXTRACT_SUFX}
 GOROOT_BOOTSTRAP =	${WRKDIR}/go-openbsd-${GOARCH}-bootstrap
 .endif
 .endfor
diff --git a/misc/wordnet/Makefile b/misc/wordnet/Makefile
index aef737de623..4e404d1404a 100644
--- a/misc/wordnet/Makefile
+++ b/misc/wordnet/Makefile
@@ -1,13 +1,13 @@
 COMMENT=		browser for a large lexical database of English
 
 DISTNAME=		WordNet-3.0
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} wn3.1.dict.tar.gz:0
+DISTFILES.dict=		wn3.1.dict.tar.gz
 PKGNAME=		wordnet-3.1
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		misc
 
-HOMEPAGE=		http://wordnet.princeton.edu/
+HOMEPAGE=		https://wordnet.princeton.edu/
 
 # BSD
 PERMIT_PACKAGE=	Yes
@@ -15,29 +15,29 @@ PERMIT_PACKAGE=	Yes
 WANTLIB += X11 Xau Xdmcp Xext Xft Xrender Xss c expat fontconfig
 WANTLIB += freetype m xcb z ${MODTK_WANTLIB}
 
-MASTER_SITES=		http://wordnetcode.princeton.edu/3.0/
-MASTER_SITES0=		http://wordnetcode.princeton.edu/
+SITES=		https://wordnetcode.princeton.edu/3.0/
+SITES.dict=	https://wordnetcode.princeton.edu/
 
-MODULES=		x11/tk
+MODULES=	x11/tk
 
-RUN_DEPENDS +=		devel/desktop-file-utils
-LIB_DEPENDS +=		${MODTK_LIB_DEPENDS}
+RUN_DEPENDS +=	devel/desktop-file-utils
+LIB_DEPENDS +=	${MODTK_LIB_DEPENDS}
 
 CONFIGURE_STYLE=	simple
 
-CONFIGURE_ARGS=		--prefix='${PREFIX}/share/wordnet' \
-			--exec-prefix='${PREFIX}' \
-			--sysconfdir='${SYSCONFDIR}' \
-			--mandir='${PREFIX}/man' \
-			--includedir='${PREFIX}/include' \
-			--with-tcl=${MODTCL_LIBDIR} \
-			--with-tk=${MODTK_LIBDIR}
+CONFIGURE_ARGS=	--prefix='${PREFIX}/share/wordnet' \
+		--exec-prefix='${PREFIX}' \
+		--sysconfdir='${SYSCONFDIR}' \
+		--mandir='${PREFIX}/man' \
+		--includedir='${PREFIX}/include' \
+		--with-tcl=${MODTCL_LIBDIR} \
+		--with-tk=${MODTK_LIBDIR}
 
-CFLAGS+=		-I${MODTK_INCDIR} -I${MODTCL_INCDIR}
+CFLAGS+=	-I${MODTK_INCDIR} -I${MODTCL_INCDIR}
 
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 
-NO_TEST=		Yes
+NO_TEST=	Yes
 
 pre-configure:
 	@${SUBST_CMD} ${WRKSRC}/include/wn.h ${WRKSRC}/src/wnb
diff --git a/net/arp-scan/Makefile b/net/arp-scan/Makefile
index da9fc700bb6..83df0b8822a 100644
--- a/net/arp-scan/Makefile
+++ b/net/arp-scan/Makefile
@@ -13,11 +13,9 @@ CATEGORIES=	net
 
 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 
-MASTER_SITES=	https://github.com/royhills/arp-scan/releases/download/$V/
-MASTER_SITES0=	https://spacehopper.org/mirrors/
-
-DISTFILES=	${DISTNAME}.tar.gz \
-		oui-iab-$M.tar.xz:0
+SITES=		https://github.com/royhills/arp-scan/releases/download/$V/
+SITES.iab=	https://spacehopper.org/mirrors/
+DISTFILES.iab=	oui-iab-$M.tar.xz
 
 # GPLv3+
 PERMIT_PACKAGE=	Yes
diff --git a/net/guacamole/client/Makefile b/net/guacamole/client/Makefile
index e5581c2e273..1b37817c871 100644
--- a/net/guacamole/client/Makefile
+++ b/net/guacamole/client/Makefile
@@ -1,4 +1,4 @@
-MASTER_SITES=	${MASTER_SITE_APACHE:=guacamole/$V/binary/}
+SITES=		${SITE_APACHE:=guacamole/$V/binary/}
 DISTNAME=	guacamole-$V
 DISTFILES=	guacamole-$V.war
 
@@ -24,8 +24,8 @@ EXTRACT_ONLY+=	guacamole-$a-$V.tar.gz
 PKGNAME-$a=	guacamole-$a-$V
 .endfor
 
-MASTER_SITES0=	https://
-
+# yes this is intentional
+SITES.multi=	https://
 # hold at 9.x MS driver; 10.x defaults to using TLS encryption and needs
 # a connection string to disable, but guacamole-auth-jdbc-sqlserver doesn't
 # allow setting this, only host/user/pass.
@@ -33,7 +33,7 @@ MASTER_SITES0=	https://
 	github.com/microsoft/mssql-jdbc/releases/download/v9.4.1 mssql-jdbc -9.4.1.jre8 \
 	jdbc.postgresql.org/download postgresql -42.3.3 \
 	downloads.mariadb.com/Connectors/java/connector-java-2.7.3 mariadb-java-client -2.7.3
-DISTFILES+=	{${liburl}/}${libjar}${libver}.jar:0
+DISTFILES.multi+= {${liburl}/}${libjar}${libver}.jar
 LIBS+=		${libjar}${libver}.jar ${libjar}.jar
 .endfor
 
diff --git a/net/guacamole/server/Makefile b/net/guacamole/server/Makefile
index 0d00ff8d740..165016b6988 100644
--- a/net/guacamole/server/Makefile
+++ b/net/guacamole/server/Makefile
@@ -1,4 +1,4 @@
-MASTER_SITES=	${MASTER_SITE_APACHE:=guacamole/$V/source/}
+SITES=		${MASTER_SITE_APACHE:=guacamole/$V/source/}
 DISTNAME=	guacamole-server-$V
 COMMENT=	clientless remote desktop gateway
 
diff --git a/net/lldpd/Makefile b/net/lldpd/Makefile
index 494e588bad6..55379fc2ace 100644
--- a/net/lldpd/Makefile
+++ b/net/lldpd/Makefile
@@ -15,8 +15,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += c curses event_core event_extra pthread readline
 
-MASTER_SITES=	https://media.luffy.cx/files/lldpd/
-MASTER_SITES0=	https://www.ieee802.org/1/files/public/MIBs/
+SITES=		https://media.luffy.cx/files/lldpd/
 
 FLAVORS=	snmp
 FLAVOR?=
diff --git a/net/unifi/Makefile.inc b/net/unifi/Makefile.inc
index a4c2ae5cf3f..e69834e39af 100644
--- a/net/unifi/Makefile.inc
+++ b/net/unifi/Makefile.inc
@@ -2,20 +2,20 @@
 COMMENT =	controller for Ubiquiti uniFi (wifi/routing/switching/voip)
 
 _BV =		${BUILD_V:C/^http[^-]*-([0-9a-f]{10}).*/-\1/}
-MASTER_SITES ?=	https://dl.ui.com/unifi/${V}${_BV}/
-MASTER_SITES0 =	https://spacehopper.org/mirrors/
-MASTER_SITES1 =	https://dl.ubnt-ut.com/snmp/
+SITES ?=	https://dl.ui.com/unifi/${V}${_BV}/
+DISTFILES =	unifi-$V{UniFi.unix}.zip \
+		unifi_sh_api-$V{unifi_sh_api}
+
+SITES.sh =	https://spacehopper.org/mirrors/
 
 LOG4J_V =	2.17.1
-MASTER_SITES2 =	https://dlcdn.apache.org/logging/log4j/${LOG4J_V}/
+SITES.log4j =	${SITE_APACHE:=logging/log4j/${LOG4J_V}/}
 
 COMMONSTEXT_V =	1.10.0
-MASTER_SITES3 =	https://dlcdn.apache.org/commons/text/binaries/
+SITES.commons =	${SITE_APACHE:=commons/text/binaries/}
 
-DISTFILES +=	unifi-$V{UniFi.unix}.zip \
-		unifi_sh_api-$V{unifi_sh_api} \
-		UBNT-MIB:1 \
-		UBNT-UniFi-MIB:1
+SITES.snmp =	https://dl.ubnt-ut.com/snmp/
+DISTFILES.snmp = UBNT-MIB UBNT-UniFi-MIB
 
 EXTRACT_ONLY =	unifi-$V.zip
 PKGNAME =	unifi-$V
@@ -26,16 +26,16 @@ PKGNAME =	unifi-$V
 #
 # typical symptom of failure: APs stuck in "adopting".
 SNAPPY_S ?=	-libc++.9.0
-DISTFILES +=	snappy-java-${SNAPPY_V}${SNAPPY_S}.jar:0
+DISTFILES.sh +=	snappy-java-${SNAPPY_V}${SNAPPY_S}.jar
 
 REPLACE_LOG4J ?= No
 .if ${REPLACE_LOG4J} == Yes
-DISTFILES +=	apache-log4j-${LOG4J_V}-bin.tar.gz:2
+DISTFILES.log4j += apache-log4j-${LOG4J_V}-bin.tar.gz
 EXTRACT_ONLY +=	apache-log4j-${LOG4J_V}-bin.tar.gz
 .endif
 REPLACE_COMMONSTEXT ?= No
 .if ${REPLACE_COMMONSTEXT} == Yes
-DISTFILES +=	commons-text-${COMMONSTEXT_V}-bin.tar.gz:3
+DISTFILES.commons += commons-text-${COMMONSTEXT_V}-bin.tar.gz
 EXTRACT_ONLY +=	commons-text-${COMMONSTEXT_V}-bin.tar.gz
 .endif
 
diff --git a/textproc/pdftk/Makefile b/textproc/pdftk/Makefile
index 63a85e7cbf4..3d5f02dfd59 100644
--- a/textproc/pdftk/Makefile
+++ b/textproc/pdftk/Makefile
@@ -19,12 +19,11 @@ PERMIT_PACKAGE=	Yes
 
 HOMEPAGE=	https://gitlab.com/pdftk-java/
 
-MASTER_SITES=	https://gitlab.com/pdftk-java/pdftk/-/archive/v$V/
-MASTER_SITES0=	${MASTER_SITE_APACHE:=commons/lang/binaries/}
-MASTER_SITES1=	https://www.bouncycastle.org/download/
-DISTFILES=	pdftk-v$V.tar.gz \
-		commons-lang3-${CL3}-bin.tar.gz:0 \
-		bcprov-jdk18on-${BC}.jar:1
+SITES=		https://gitlab.com/pdftk-java/pdftk/-/archive/v$V/
+SITES.comm=	${SITE_APACHE:=commons/lang/binaries/}
+DISTFILES.comm=	commons-lang3-${CL3}-bin.tar.gz
+SITES.bc=	https://www.bouncycastle.org/download/
+DISTFILES.bc=	bcprov-jdk18on-${BC}.jar
 
 MODULES=	java
 MODJAVA_VER=	1.8+
diff --git a/textproc/py-sphinx_rtd_theme/Makefile b/textproc/py-sphinx_rtd_theme/Makefile
index b6034adcf50..7b4c671f43e 100644
--- a/textproc/py-sphinx_rtd_theme/Makefile
+++ b/textproc/py-sphinx_rtd_theme/Makefile
@@ -8,8 +8,9 @@ GH_PROJECT =		sphinx_rtd_theme
 GH_TAGNAME =		${MODPY_EGG_VERSION}
 
 PKGNAME =		py-${DISTNAME}
-DISTFILES =		${DISTNAME}.tar.gz \
-			sphinx-rtd-theme_${MODPY_EGG_VERSION}+dfsg-1.debian.tar.xz:0
+
+SITES.deb =		${SITE_DEBIAN:=main/s/sphinx-rtd-theme/}
+DISTFILES.deb =		sphinx-rtd-theme_${MODPY_EGG_VERSION}+dfsg-1.debian.tar.xz
 
 CATEGORIES =		textproc
 
@@ -21,7 +22,6 @@ BUILD_DEPENDS =		textproc/py-sphinxcontrib/jquery${MODPY_FLAVOR}
 RUN_DEPENDS =		textproc/py-sphinxcontrib/jquery${MODPY_FLAVOR}
 
 MODPY_PYBUILD =		setuptools
-MASTER_SITES0 =		${MASTER_SITE_DEBIAN:=main/s/sphinx-rtd-theme/}
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/x11/tigervnc/Makefile b/x11/tigervnc/Makefile
index f6f751bc2e8..be05778ff66 100644
--- a/x11/tigervnc/Makefile
+++ b/x11/tigervnc/Makefile
@@ -6,8 +6,7 @@ GH_TAGNAME=	v1.13.1
 REVISION=	0
 
 # update the post-patch target if moving to a new major branch of xorg-server
-DISTFILES=	${GH_DISTFILE} \
-		xorg-server-21.1.1.tar.xz:0
+DISTFILES.x=	xorg-server-21.1.1.tar.xz
 
 CATEGORIES=	x11 net
 EPOCH=		0
@@ -28,15 +27,15 @@ WANTLIB += iconv idn2 intl jpeg kvm m nettle p11-kit
 WANTLIB += pixman-1 swscale tasn1 unistring xcb xshmfence
 WANTLIB += z zstd
 
-MASTER_SITES0=	https://www.x.org/releases/individual/xserver/
+MASTER_SITES.x=	https://www.x.org/releases/individual/xserver/
 
 # the vncserver script in 1.11.0+ is no longer useful for us (systemd/pam
 # dependencies) so fetch an old working one from the v1.10.1 tag.
 SCRIPTV=	1.10.1
-MASTER_SITES1=	https://raw.githubusercontent.com/TigerVNC/tigervnc/v${SCRIPTV}/unix/
+MASTER_SITES.t=	https://raw.githubusercontent.com/TigerVNC/tigervnc/v${SCRIPTV}/unix/
 EXTRACT_ONLY=	${GH_DISTFILE} xorg-server-21.1.1.tar.xz
-DISTFILES+=	tigervnc-vncserver-${SCRIPTV}.pl{vncserver}:1 \
-		tigervnc-vncserver-${SCRIPTV}.man{vncserver.man}:1
+DISTFILES.t=	tigervnc-vncserver-${SCRIPTV}.pl{vncserver} \
+		tigervnc-vncserver-${SCRIPTV}.man{vncserver.man}
 
 # main parts use cmake, Xvnc uses autoconf
 # Xvnc requires files generated in the cmake build stage that aren't