sync ports with The Matrix

2023-09-28 02:05:49 +00:00 · 2023-09-28 02:05:49 +00:00 · 92bfff2b71
commit 92bfff2b71
parent 124c78849b
1237 changed files with 1829 additions and 1780 deletions
--- a/devel/xtensa-lx106-elf/gcc-bootstrap/Makefile
+++ b/devel/xtensa-lx106-elf/gcc-bootstrap/Makefile
@ -9,7 +9,7 @@ WANTLIB += ${COMPILER_LIBCXX} c gmp isl m mpc mpfr

 SUBST_VARS +=	VERSION

-SITES = 	${MASTER_SITE_GCC:=releases/gcc-$(VERSION)/}
+SITES = 	${SITE_GCC:=releases/gcc-$(VERSION)/}
 SITES.p =	https://raw.githubusercontent.com/earlephilhower/esp-quick-toolchain/master/patches/gcc10.2/
 PATCHFILES.p = 	gcc-ctype-inline-pgmread.patch \
 		gcc-eh-alloc.patch \
--- a/devel/xtensa-lx106-elf/gcc/Makefile
+++ b/devel/xtensa-lx106-elf/gcc/Makefile
@ -13,7 +13,7 @@ WANTLIB += ${COMPILER_LIBCXX} c gmp isl m mpc mpfr

 SUBST_VARS +=	VERSION

-SITES = 	${MASTER_SITE_GCC:=releases/gcc-$(VERSION)/}
+SITES = 	${SITE_GCC:=releases/gcc-$(VERSION)/}
 SITES.p =	https://raw.githubusercontent.com/earlephilhower/esp-quick-toolchain/master/patches/gcc10.2/
 PATCHFILES.p = 	gcc-ctype-inline-pgmread.patch \
 		gcc-eh-alloc.patch \
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@ -1,7 +1,7 @@
 COMMENT=	win land without colliding with 'flyers' and 'eaters'

 DISTNAME=	xonix-1.4
-REVISION = 	7
+REVISION=	9
 CATEGORIES=	games

 SITES=		ftp://ftp.interface-business.de/pub/outgoing/ \
@ -14,6 +14,8 @@ WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m

 CONFIGURE_STYLE=imake
 NO_TEST=	Yes
+DEBUG_PACKAGES=	${BUILD_PACKAGES}
+MAKE_FLAGS=	CDEBUGFLAGS="${CFLAGS}"

 post-install:
 		${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xonix
--- a/infrastructure/db/dist-tuple.pattern
+++ b/infrastructure/db/dist-tuple.pattern
@ -1,12 +1,10 @@
-# known MASTER_SITES.x
-MASTER_SITES.github ?=	https://github.com/
-MASTER_SITES.gitlab ?=	https://gitlab.com/
-MASTER_SITES.srht ?=	https://git.sr.ht/
+# known SITES.x
+SITES.github ?=	https://github.com/
+SITES.gitlab ?=	https://gitlab.com/
+SITES.srht ?=	https://git.sr.ht/

-# EXTRACT_SUFX.x for each site
-EXTRACT_SUFX.github ?=	.tar.gz
-EXTRACT_SUFX.gitlab ?=	.tar.gz
-EXTRACT_SUFX.srht ?=	.tar.gz
+# set EXTRACT_SUFX.x if different from TEMPLATE_EXTRACT_SUFX
+TEMPLATE_EXTRACT_SUFX ?=	.tar.gz

 # templates for the DISTFILES.x; the following strings are substituted based on DIST_TUPLE
 # - <account>
@ -22,7 +20,8 @@ TEMPLATE_DISTFILES.gitlab ?= \
 TEMPLATE_DISTFILES.srht ?= \
 	<account>-<project>-{~<account>/<project>/archive/}<id>${EXTRACT_SUFX.srht}

-# templates for HOMEPAGE; same substitutions as for DISTFILES.x
-TEMPLATE_HOMEPAGE.github ?=	https://github.com/<account>/<project>
-TEMPLATE_HOMEPAGE.gitlab ?=	https://gitlab.com/<account>/<project>
-TEMPLATE_HOMEPAGE.srht ?=	https://git.sr.ht/~<account>/<project>
+# template for HOMEPAGE; same substitutions as for DISTFILES.x
+# Defaults to TEMPLATE_HOMEPAGE. Set TEMPLATE_HOMEPAGE.x to use different pattern.
+# - <site> - substituted, may correspond to SITES.x
+TEMPLATE_HOMEPAGE ?=		<site><account>/<project>
+TEMPLATE_HOMEPAGE.srht ?=	<site>~<account>/<project>
--- a/infrastructure/db/network.conf
+++ b/infrastructure/db/network.conf
@ -1,24 +1,15 @@
-# $OpenBSD: network.conf,v 1.22 2023/09/05 14:02:44 espie Exp $
-
-# XXX the framework is currently converted from MASTER_SITE -> SITE
-# internally, variables like SITE_OPENBSD, SITE_GCC will be filled
-# automatically, so DO NOT USE the long version in your new Makefiles.
-#
-# Due to the way the magic is working, this file will probably be converted
-# last !
+# $OpenBSD: network.conf,v 1.23 2023/09/27 21:41:16 espie Exp $

 # List of SecBSD sites
-MASTER_SITE_SECBSD ?= \
+SITE_SECBSD?= \
 	https://mirror.secbsd.org/pub/SecBSD/distfiles/

-# FreeBSD master site
-MASTER_SITE_FREEBSD?=	\
+# FreeBSD main site
+SITE_FREEBSD?=	\
 	https://pkg.FreeBSD.org/ports-distfiles/

-MASTER_SITE_BACKUP= ${MASTER_SITE_OPENBSD}
-
-# Popular master sites, most useful sites come first.
-MASTER_SITE_GNU+=	\
+# Popular sites, most useful sites come first.
+SITE_GNU+=	\
 	https://ftpmirror.gnu.org/ \
 	https://ftp.gnu.org/gnu/ \
 	https://mirrors.dotsrc.org/gnu/ \
@ -27,7 +18,7 @@ MASTER_SITE_GNU+=	\
 	http://ftp.funet.fi/pub/gnu/prep/ \
 	http://ftp.kddilabs.jp/GNU/

-MASTER_SITE_GCC+=	\
+SITE_GCC+=	\
 	https://gcc.gnu.org/pub/gcc/ \
 	https://ftp.nluug.nl/languages/gcc/ \
 	https://www.mirrorservice.org/sites/sourceware.org/pub/gcc/ \
@ -39,21 +30,21 @@ MASTER_SITE_GCC+=	\
 	ftp://ftp.ntua.gr/pub/gnu/gcc/ \
 	http://robotlab.itk.ppke.hu/gcc/

-MASTER_SITE_XORG+=	\
+SITE_XORG+=	\
 	https://ftp.x.org/pub/individual/ \
 	https://ftp.gwdg.de/pub/x11/x.org/pub/individual/ \
 	https://ftp.mirrorservice.org/sites/ftp.x.org/pub/individual/

-MASTER_SITE_XCONTRIB+=	\
+SITE_XCONTRIB+=	\
 	https://ftp.gwdg.de/pub/x11/x.org/contrib/ \
 	ftp://ftp.x.org/contrib/ \
 	http://ftp.kddilabs.jp/X11/ftp.x.org/contrib/ \
 	ftp://ftp.uvsq.fr/pub/X11/x.org/contrib/

-MASTER_SITE_R5CONTRIB+=	\
-	${MASTER_SITE_XCONTRIB:=../R5contrib/}
+SITE_R5CONTRIB+=	\
+	${SITE_XCONTRIB:=../R5contrib/}

-MASTER_SITE_SUNSITE+=	\
+SITE_SUNSITE+=	\
 	https://www.ibiblio.org/pub/Linux/ \
 	http://ftp.uniovi.es/pub/linux/ \
 	http://ftp.lip6.fr/pub/linux/sunsite/ \
@ -69,18 +60,18 @@ MASTER_SITE_SUNSITE+=	\
 # XXX  We ought to be using full logical directory names in all the
 # sourceforge-hosted ports, rather than relying on the redirector to
 # find them.  Many of these contain embedded spaces which don't work
-# with ${MASTER_SITE_xx:=foo/} so we need something new...
-MASTER_SITE_SOURCEFORGE+=	\
+# with ${SITE_xx:=foo/} so we need something new...
+SITE_SOURCEFORGE+=	\
 	https://downloads.sourceforge.net/sourceforge/

-MASTER_SITE_OSDN_JP+=	\
+SITE_OSDN_JP+=	\
 	https://osdn.dl.osdn.jp/ \
 	https://mirrors.gigenet.com/OSDN/ \
 	https://acc.dl.osdn.jp/ \
 	https://mirrors.xtom.com/osdn/ \
 	https://rwthaachen.dl.osdn.jp/

-MASTER_SITE_GNOME+=	\
+SITE_GNOME+=	\
 	https://download.gnome.org/ \
 	https://ftp.acc.umu.se/pub/GNOME/ \
 	https://ftp.gnome.org/pub/GNOME/ \
@ -88,13 +79,13 @@ MASTER_SITE_GNOME+=	\
 	ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/

 # mirmon: http://mirrors.cpan.org/
-MASTER_SITE_PERL_CPAN+=	\
+SITE_PERL_CPAN+=	\
 	https://www.cpan.org/modules/by-module/ \
 	https://backpan.perl.org/modules/by-module/ \
 	https://cpan.metacpan.org/modules/by-module/ \
 	ftp://ftp.cpan.org/pub/CPAN/modules/by-module/

-MASTER_SITE_TEX_CTAN+=	\
+SITE_TEX_CTAN+=	\
 	http://mirror.ctan.org/ \
 	https://mirrors.dotsrc.org/ctan/ \
 	http://ftp.funet.fi/pub/TeX/CTAN/ \
@ -107,7 +98,7 @@ MASTER_SITE_TEX_CTAN+=	\
 	ftp://ftp.uvsq.fr/pub/TeX/CTAN/ \
 	http://www.ctan.org/pub/tex-archive/

-MASTER_SITE_KDE+=	\
+SITE_KDE+=	\
 	https://download.kde.org/ \
 	https://mirrors.mit.edu/kde/ \
 	https://kde.freemirror.org/kde/ftp/stable/applications/ \
@ -120,7 +111,7 @@ MASTER_SITE_KDE+=	\
 	ftp://mirrors.dotsrc.org/kde/


-MASTER_SITE_SAVANNAH+=	\
+SITE_SAVANNAH+=	\
 	https://download.savannah.nongnu.org/releases/ \
 	https://download-mirror.savannah.nongnu.org/releases/ \
 	https://ftp.cc.uoc.gr/mirrors/nongnu.org/ \
@ -130,36 +121,36 @@ MASTER_SITE_SAVANNAH+=	\
 	http://savannah.c3sl.ufpr.br/ \
 	ftp://ftp.cc.uoc.gr/mirrors/nongnu.org/

-MASTER_SITE_AFTERSTEP+=	\
+SITE_AFTERSTEP+=	\
 	ftp://ftp.afterstep.org/ \
 	http://ftp.kddilabs.jp/X11/AfterStep/

-MASTER_SITE_WINDOWMAKER+=	\
+SITE_WINDOWMAKER+=	\
 	http://www.windowmaker.org/pub/

-MASTER_SITE_FREEBSD_LOCAL+=	\
+SITE_FREEBSD_LOCAL+=	\
 	https://pkg.FreeBSD.org/local-distfiles/

-MASTER_SITE_PACKETSTORM+=	\
+SITE_PACKETSTORM+=	\
 	https://dl.packetstormsecurity.net/

-MASTER_SITE_APACHE+= \
+SITE_APACHE+= \
 	https://dlcdn.apache.org/ \
 	https://archive.apache.org/dist/

-MASTER_SITE_PYPI +=	\
+SITE_PYPI +=	\
 	https://pypi.io/packages/source/

-MASTER_SITE_RUBYGEMS += \
+SITE_RUBYGEMS += \
 	https://rubygems.org/downloads/

-MASTER_SITE_ISC +=	\
+SITE_ISC +=	\
 	https://downloads.isc.org/isc/ \
 	https://www.mirrorservice.org/sites/ftp.isc.org/isc/ \
 	http://ftp.iij.ad.jp/pub/network/isc/ \
 	ftp://ftp.nominum.com/pub/isc/

-MASTER_SITE_DEBIAN += \
+SITE_DEBIAN += \
 	https://deb.debian.org/debian/pool/ \
 	http://ftp.debian.org/debian/pool/ \
 	http://ftp.au.debian.org/debian/pool/ \
@ -169,10 +160,10 @@ MASTER_SITE_DEBIAN += \
 	http://ftp.uk.debian.org/debian/pool/ \
 	http://ftp.us.debian.org/debian/pool/

-MASTER_SITE_GNUPG += \
+SITE_GNUPG += \
 	https://www.gnupg.org/ftp/gcrypt/ \
 	https://mirrors.dotsrc.org/gcrypt/ \
 	ftp://ftp.gnupg.org/gcrypt/

-MASTER_SITE_GOOGLECODE += \
+SITE_GOOGLECODE += \
 	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.1626 2023/09/27 08:21:06 semarie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.1627 2023/09/27 21:41:16 espie Exp $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@ -1234,7 +1234,7 @@ YACC ?= yacc
 # command is expanded from a variable, as this could be a shell construct
 SETENV ?= /usr/bin/env -i

-# basic master sites configuration
+# basic sites configuration

 .include "${PORTSDIR}/infrastructure/db/network.conf"

@ -1243,33 +1243,29 @@ SETENV ?= /usr/bin/env -i
 ERRORS += "Fatal: specifying both GH_TAGNAME and GH_COMMIT is invalid"
 .  endif
 .  if !empty(GH_TAGNAME)
-MASTER_SITES_GITHUB += \
+SITES_GITHUB += \
 	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/refs/tags/${GH_TAGNAME:S/$/\//}
 .  elif !empty(GH_COMMIT)
-MASTER_SITES_GITHUB += \
+SITES_GITHUB += \
 	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/
 .  else
 ERRORS += "Fatal: if using GH_*, one of GH_TAGNAME or GH_COMMIT must be set"
 .  endif

-MASTER_SITES ?= ${MASTER_SITES_GITHUB}
+SITES ?= ${SITES_GITHUB}
 HOMEPAGE ?= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}
 .else
-# There are two types of ports with DISTFILES but no actionable (MASTER_)SITES:
+# There are two types of ports with DISTFILES but no actionable SITES:
 # - FETCH_MANUALLY
 # - orphaned port, defaults to SITES_BACKUP
-MASTER_SITES ?=
+SITES ?=
 .endif

 # I guess we're in the master distribution business! :)  As we gain mirror
-# sites for distfiles, add them to MASTER_SITE_BACKUP
+# sites for distfiles, add them to SITE_BACKUP

 _warn_checksum = :

-.for v in ${.VARIABLES:MMASTER_SITE*}
-${v:S/MASTER_//} ?= ${$v}
-.endfor
-
 .if empty(.VARIABLES)
 ERRORS += "Fatal: requires make(1) with .VARIABLES support"
 .endif
@ -3249,7 +3245,7 @@ ${DISTDIR}/$f:
 	${_PFETCH} install -d ${DISTDIR_MODE} ${@:H}; \
 	cd ${@:H}; \
 	file=$@.part; \
-	for site in ${MASTER_SITE_OPENBSD:=by_cipher/${cipher}/${value:C/(..).*/\1/}/${value}/} ${MASTER_SITE_OPENBSD:=${cipher}/${value}/}; do \
+	for site in ${SITE_OPENBSD:=by_cipher/${cipher}/${value:C/(..).*/\1/}/${value}/} ${SITE_OPENBSD:=${cipher}/${value}/}; do \
 		${ECHO_MSG} ">> Fetch $${site}$u"; \
 		if ${_PFETCH} ${FETCH_CMD} -o $$file $${site}$u; then \
 			ck=`${_size_fragment} $$file $p`; \
@ -3308,11 +3304,11 @@ ${DISTDIR}/$p: # XXX that comment works around a limitation in make
 	done; \
 	if ${_MAKESUM}; then \
 		if test -z ${$m}; then \
-				${ECHO_MSG} ">> No master site in $m"; \
+				${ECHO_MSG} ">> No site in $m"; \
 		fi; \
 		exit 1; \
 	fi; \
-	for site in ${MASTER_SITE_BACKUP}; do \
+	for site in ${SITE_BACKUP}; do \
 		${ECHO_MSG} ">> Fetch $${site}$p"; \
 		if ${_PFETCH} ${FETCH_CMD} -o $$file $${site}$p; then \
 				ck=`${_size_fragment} $$file $p`; \
--- a/infrastructure/mk/cpan.port.mk
+++ b/infrastructure/mk/cpan.port.mk
@ -1,10 +1,10 @@
-# $OpenBSD: cpan.port.mk,v 1.24 2023/07/19 11:17:11 sthen Exp $
+# $OpenBSD: cpan.port.mk,v 1.25 2023/09/27 21:41:16 espie Exp $

 PKGNAME ?=	p5-${DISTNAME}
 .if !defined(CPAN_AUTHOR)
-MASTER_SITES ?=	${MASTER_SITE_PERL_CPAN:N*backpan.perl.org*:=${DISTNAME:C/-.*$//}/}
+SITES ?=	${SITE_PERL_CPAN:N*backpan.perl.org*:=${DISTNAME:C/-.*$//}/}
 .else
-MASTER_SITES ?=	${MASTER_SITE_PERL_CPAN:S_/by-module/_/by-authors/_:=id/${CPAN_AUTHOR:C/^(.).*/\1/}/${CPAN_AUTHOR:C/^(..).*/\1/}/${CPAN_AUTHOR}/}
+SITES ?=	${SITE_PERL_CPAN:S_/by-module/_/by-authors/_:=id/${CPAN_AUTHOR:C/^(.).*/\1/}/${CPAN_AUTHOR:C/^(..).*/\1/}/${CPAN_AUTHOR}/}
 .endif

 HOMEPAGE ?=	https://metacpan.org/release/${DISTNAME:C/-[^-]*$//}
--- a/infrastructure/mk/dist-tuple.port.mk
+++ b/infrastructure/mk/dist-tuple.port.mk
@ -20,23 +20,26 @@ DIST_TUPLE ?=
 .if !empty(DIST_TUPLE)
 .  for _template _account _project _id _targetdir in ${DIST_TUPLE}

-.    if empty(MASTER_SITES.${_template})
+.    if empty(SITES.${_template})
 ERRORS += "Fatal: invalid choice for DIST_TUPLE: ${_template}"
 .    endif

 _subdir =
 .    if "${_id}" == "HASH" || "${_id:C/^[0-9a-f]{40}$/HASH/}" != "HASH"
 # set DISTNAME if not done by the port and add refs/tags/ subdir
-DISTNAME ?= ${_project}-${_id:S/^v//}
+DISTNAME ?= ${_project}-${_id:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/}
 _subdir =	refs/tags/
+WRKDIST ?= ${WRKDIR}/${_project}-${_id:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/}
+.    else
+WRKDIST ?= ${WRKDIR}/${_project}-${_id}
 .    endif

-.    for _subst in S,<account>,${_account},g:S,<project>,${_project},g:S,<id>,${_id},g:S,<subdir>,${_subdir},g
+.    for _subst in S,<account>,${_account},g:S,<project>,${_project},g:S,<id>,${_id},g:S,<subdir>,${_subdir},g:S,<site>,${SITES.${_template}},g

 DISTFILES.${_template} +=		${TEMPLATE_DISTFILES.${_template}:${_subst}}
-.      if !empty(TEMPLATE_HOMEPAGE.${_template})
+EXTRACT_SUFX.${_template} ?=		${TEMPLATE_EXTRACT_SUFX}
+TEMPLATE_HOMEPAGE.${_template} ?=	${TEMPLATE_HOMEPAGE}
 HOMEPAGE ?=	${TEMPLATE_HOMEPAGE.${_template}:${_subst}}
-.      endif

 .      if "${_targetdir}" != "."
 MODDIST-TUPLE_post-extract += \
--- a/infrastructure/templates/mk.conf.template
+++ b/infrastructure/templates/mk.conf.template
@ -1,4 +1,4 @@
-# $OpenBSD: mk.conf.template,v 1.34 2023/07/15 21:09:33 sthen Exp $
+# $OpenBSD: mk.conf.template,v 1.35 2023/09/27 21:41:16 espie Exp $

 # This file contains some mk.conf entries suitable for ports work.
 #
@ -27,7 +27,7 @@
 .poison LIB_DEPEDNS
 .poison LIB_DEPEND
 .poison LIB_DEPEMDS
-.poison MASTER_SITE_SOURCEFORGET
+.poison SITE_SOURCEFORGET
 .poison MODGCC3_ARCHES
 .poison MODGCC4_ARCHES
 .poison MODGNOME_DESKTOP_FILE
--- a/lang/erlang/erlang.port.mk
+++ b/lang/erlang/erlang.port.mk
@ -126,9 +126,9 @@ pre-build:

 # Add possibility to include additional build or test dependencies from 
 # https://hex.pm.
-MASTER_SITE_HEX =	https://repo.hex.pm/tarballs/
+SITE_HEX =		https://repo.hex.pm/tarballs/

-MASTER_SITES.erl	?= ${MASTER_SITE_HEX}
+SITES.erl ?= 		${SITE_HEX}
 MODERL_DIST_SUBDIR ?=	hex_modules

 .  for _m _v in ${MODERL_MODULES}
--- a/lang/fennel/Makefile
+++ b/lang/fennel/Makefile
@ -0,0 +1,46 @@
+COMMENT-main =	Lisp dialect that runs on Lua ${MODLUA_VERSION}
+COMMENT-docs =	Documentation for fennel
+
+V =			1.3.1
+DIST_TUPLE =		srht technomancy fennel $V .
+FULLPKGPATH-main =	lang/fennel,-main,${FLAVOR}
+FULLPKGNAME-main =	fennel-${FLAVOR}-${V}
+
+# -docs isn't flavoured, so overwrite its default name/path
+FULLPKGNAME-docs =	fennel-docs-$V
+FULLPKGPATH-docs =	${PKGPATH},-docs
+
+CATEGORIES =	lang
+
+HOMEPAGE =	https://fennel-lang.org/
+
+MAINTAINER =	Omar Polo <op@openbsd.org>
+
+# MIT
+PERMIT_PACKAGE = Yes
+
+MULTI_PACKAGES = -main -docs
+
+MODULES =	lang/lua
+
+FLAVORS =	lua51 lua52 lua53 lua54
+FLAVOR ?=	lua51
+
+PKG_ARCH =	*
+
+USE_GMAKE =	Yes
+ALL_TARGET =	build
+MAKE_FLAGS +=	LUA=${MODLUA_BIN} \
+		LUA_VERSION=${MODLUA_VERSION} \
+		LUA_LIB_DIR=${MODLUA_LIBDIR}
+FAKE_FLAGS +=	PREFIX=${TRUEPREFIX} \
+		MAN_DIR=${PREFIX}
+
+RUN_DEPENDS-main+= lang/fennel,-docs
+RUN_DEPENDS-docs =
+
+post-install:
+	chmod +x ${PREFIX}/bin/fennel
+	cd ${PREFIX}/bin && mv fennel fennel-${MODLUA_VERSION}
+
+.include <bsd.port.mk>
--- a/lang/fennel/distinfo
+++ b/lang/fennel/distinfo
@ -0,0 +1,2 @@
+SHA256 (technomancy-fennel-1.3.1.tar.gz) = gz2Qt+me3Uh0A/Uf38PLsmO/lltyqRS7u7AVbGEy1GU=
+SIZE (technomancy-fennel-1.3.1.tar.gz) = 293564
--- a/lang/fennel/patches/patch-test_irc_lua
+++ b/lang/fennel/patches/patch-test_irc_lua
@ -0,0 +1,15 @@
+don't run git during the regress suite.
+
+Index: test/irc.lua
+--- test/irc.lua.orig
+++ test/irc.lua
+@@ -5,8 +5,7 @@ local url = os.getenv("JOB_URL") or "???"
+ local origin_job_prefix = 'https://builds.sr.ht/technomancy/job/'
+ local is_origin = url:sub(1, #origin_job_prefix) == origin_job_prefix
+ 
+-local branch = io.popen("git rev-parse --abbrev-ref HEAD"):read('*a')
+-local is_main = branch == 'main'
+local is_main = false
+ 
+ -- This may fail in future if libera chat once again blocks builds.sr.ht
+ -- from connecting; it currently works after we asked them to look into it
--- a/lang/fennel/pkg/DESCR-docs
+++ b/lang/fennel/pkg/DESCR-docs
@ -0,0 +1 @@
+Manual pages for fennel.
--- a/lang/fennel/pkg/DESCR-main
+++ b/lang/fennel/pkg/DESCR-main
@ -0,0 +1,16 @@
+Fennel is a programming language that brings together the speed,
+simplicity, and reach of Lua with the flexibility of a lisp syntax and
+macro system.
+
+ - Full Lua compatibility: Easily call any Lua function or library from
+   Fennel and vice-versa.
+
+ - Zero overhead: Compiled code should be just as efficient as
+   hand-written Lua.
+
+ - Compile-time macros: Ship compiled code with no runtime dependency on
+   Fennel.
+
+ - Embeddable: Fennel is a one-file library as well as an executable.
+   Embed it in other programs to support runtime extensibility and
+   interactive development.
--- a/lang/fennel/pkg/PLIST-docs
+++ b/lang/fennel/pkg/PLIST-docs
@ -0,0 +1,4 @@
+@man man/man1/fennel.1
+@man man/man3/fennel-api.3
+@man man/man5/fennel-reference.5
+@man man/man7/fennel-tutorial.7
--- a/lang/fennel/pkg/PLIST-main
+++ b/lang/fennel/pkg/PLIST-main
@ -0,0 +1,3 @@
+@pkgpath lang/fennel
+bin/fennel-${MODLUA_VERSION}
+lib/lua/${MODLUA_VERSION}/fennel.lua
--- a/lang/php/pecl/pecl.port.mk
+++ b/lang/php/pecl/pecl.port.mk
@ -30,8 +30,8 @@ _PECLMOD ?=	${DISTNAME:S/pecl-//:C/-[0-9].*//:L}

 SUBST_VARS +=	MODPECL_DEFAULTV

-.if !defined(MASTER_SITES) && !defined(GH_PROJECT)
-MASTER_SITES ?=	https://pecl.php.net/get/
+.if !defined(SITES) && !defined(GH_PROJECT)
+SITES ?=	https://pecl.php.net/get/
 HOMEPAGE ?=	https://pecl.php.net/package/${_PECLMOD}
 EXTRACT_SUFX ?=	.tgz
 .endif
--- a/lang/ruby/ruby.port.mk
+++ b/lang/ruby/ruby.port.mk
@ -149,7 +149,7 @@ LIB_DEPENDS+=	${MODRUBY_LIB_DEPENDS}

 .if ${CONFIGURE_STYLE:L:Mgem}
 # All gems should be in the same directory on rubygems.org.
-MASTER_SITES?=	${MASTER_SITE_RUBYGEMS}
+SITES?=		${SITE_RUBYGEMS}
 EXTRACT_SUFX=	.gem

 .  if ${CONFIGURE_STYLE:L:Mext}
--- a/net/dnscontrol/Makefile
+++ b/net/dnscontrol/Makefile
@ -1,6 +1,6 @@
 COMMENT =		manage DNS configuration across any number of DNS hosts

-MODGO_VERSION =		v4.1.1
+MODGO_VERSION =		v4.4.1
 MODGO_MODNAME =		github.com/StackExchange/dnscontrol/v4

 DISTNAME =		dnscontrol-${MODGO_VERSION}
--- a/net/dnscontrol/distinfo
+++ b/net/dnscontrol/distinfo
--- a/net/dnscontrol/modules.inc
+++ b/net/dnscontrol/modules.inc
@ -1,15 +1,15 @@
 MODGO_MODULES =	\
-	cloud.google.com/go							 v0.110.0 \
-	cloud.google.com/go/compute						 v1.19.3 \
+	cloud.google.com/go							 v0.110.2 \
+	cloud.google.com/go/compute						 v1.23.0 \
 	cloud.google.com/go/compute/metadata					 v0.2.3 \
-	github.com/!azure!a!d/microsoft-authentication-library-for-go		 v1.0.0 \
-	github.com/!azure/azure-sdk-for-go/sdk/azcore				 v1.6.0 \
-	github.com/!azure/azure-sdk-for-go/sdk/azidentity			 v1.3.0 \
+	github.com/!azure!a!d/microsoft-authentication-library-for-go		 v1.1.1 \
+	github.com/!azure/azure-sdk-for-go/sdk/azcore				 v1.7.1 \
+	github.com/!azure/azure-sdk-for-go/sdk/azidentity			 v1.3.1 \
 	github.com/!azure/azure-sdk-for-go/sdk/internal				 v1.3.0 \
 	github.com/!azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns	 v1.1.0 \
 	github.com/!azure/go-autorest						 v14.2.0+incompatible \
 	github.com/!azure/go-autorest/autorest/to				 v0.4.0 \
-	github.com/!burnt!sushi/toml						 v1.2.1 \
+	github.com/!burnt!sushi/toml						 v1.3.2 \
 	github.com/!disposa!boy/!json!config!reader				 v0.0.0-20201129172854-99cf318d67e7 \
 	github.com/!g-!core/gcore-dns-sdk-go					 v0.2.6 \
 	github.com/!puerkito!bio/goquery					 v1.8.1 \
@ -18,22 +18,21 @@ MODGO_MODULES =	\
 	github.com/alecthomas/kong						 v0.2.2 \
 	github.com/andreyvit/diff						 v0.0.0-20170406064948-c7f18ee00883 \
 	github.com/andybalholm/cascadia						 v1.3.1 \
-	github.com/antihax/optional						 v1.0.0 \
 	github.com/armon/go-radix						 v0.0.0-20180808171621-7fddfc383310 \
-	github.com/aws/aws-sdk-go-v2						 v1.18.0 \
-	github.com/aws/aws-sdk-go-v2/config					 v1.18.25 \
-	github.com/aws/aws-sdk-go-v2/credentials				 v1.13.24 \
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds				 v1.13.3 \
-	github.com/aws/aws-sdk-go-v2/internal/configsources			 v1.1.33 \
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2			 v2.4.27 \
-	github.com/aws/aws-sdk-go-v2/internal/ini				 v1.3.34 \
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url		 v1.9.27 \
-	github.com/aws/aws-sdk-go-v2/service/route53				 v1.28.1 \
-	github.com/aws/aws-sdk-go-v2/service/route53domains			 v1.14.10 \
-	github.com/aws/aws-sdk-go-v2/service/sso				 v1.12.10 \
-	github.com/aws/aws-sdk-go-v2/service/ssooidc				 v1.14.10 \
-	github.com/aws/aws-sdk-go-v2/service/sts				 v1.19.0 \
-	github.com/aws/smithy-go						 v1.13.5 \
+	github.com/aws/aws-sdk-go-v2						 v1.21.0 \
+	github.com/aws/aws-sdk-go-v2/config					 v1.18.39 \
+	github.com/aws/aws-sdk-go-v2/credentials				 v1.13.37 \
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds				 v1.13.11 \
+	github.com/aws/aws-sdk-go-v2/internal/configsources			 v1.1.41 \
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2			 v2.4.35 \
+	github.com/aws/aws-sdk-go-v2/internal/ini				 v1.3.42 \
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url		 v1.9.35 \
+	github.com/aws/aws-sdk-go-v2/service/route53				 v1.29.5 \
+	github.com/aws/aws-sdk-go-v2/service/route53domains			 v1.17.3 \
+	github.com/aws/aws-sdk-go-v2/service/sso				 v1.13.6 \
+	github.com/aws/aws-sdk-go-v2/service/ssooidc				 v1.15.6 \
+	github.com/aws/aws-sdk-go-v2/service/sts				 v1.21.5 \
+	github.com/aws/smithy-go						 v1.14.2 \
 	github.com/babolivier/go-doh-client					 v0.0.0-20201028162107-a76cff4cb8b6 \
 	github.com/bgentry/speakeasy						 v0.1.0 \
 	github.com/bhendo/go-powershell						 v0.0.0-20190719160123-219e7fb4e41e \
@ -42,13 +41,14 @@ MODGO_MODULES =	\
 	github.com/cenkalti/backoff						 v2.2.1+incompatible \
 	github.com/cenkalti/backoff/v3						 v3.0.0 \
 	github.com/census-instrumentation/opencensus-proto			 v0.4.1 \
+	github.com/centralnicgroup-opensource/rtldev-middleware-go-sdk/v3	 v3.5.5 \
 	github.com/cespare/xxhash/v2						 v2.2.0 \
 	github.com/chzyer/logex							 v1.2.1 \
 	github.com/chzyer/test							 v1.0.0 \
 	github.com/client9/misspell						 v0.3.4 \
-	github.com/cloudflare/cloudflare-go					 v0.68.0 \
+	github.com/cloudflare/cloudflare-go					 v0.77.0 \
 	github.com/cncf/udpa/go							 v0.0.0-20220112060539-c52dc94e7fbe \
-	github.com/cncf/xds/go							 v0.0.0-20230310173818-32f1caf87195 \
+	github.com/cncf/xds/go							 v0.0.0-20230607035331-e9ce68804cb4 \
 	github.com/cpuguy83/go-md2man/v2					 v2.0.2 \
 	github.com/creack/pty							 v1.1.9 \
 	github.com/cyberdelia/templates						 v0.0.0-20141128023046-ca7fffd4298c \
@ -56,12 +56,12 @@ MODGO_MODULES =	\
 	github.com/decred/dcrd/crypto/blake256					 v1.0.0 \
 	github.com/decred/dcrd/dcrec/secp256k1/v4				 v4.0.0-20210816181553-5444fa50b93d \
 	github.com/deepmap/oapi-codegen						 v1.9.1 \
-	github.com/digitalocean/godo						 v1.99.0 \
+	github.com/digitalocean/godo						 v1.102.1 \
 	github.com/ditashi/jsbeautifier-go					 v0.0.0-20141206144643-2520a8026a9c \
 	github.com/dnaeon/go-vcr						 v1.2.0 \
 	github.com/dnsimple/dnsimple-go						 v1.2.0 \
-	github.com/envoyproxy/go-control-plane					 v0.11.0 \
-	github.com/envoyproxy/protoc-gen-validate				 v0.10.0 \
+	github.com/envoyproxy/go-control-plane					 v0.11.1-0.20230524094728-9239064ad72f \
+	github.com/envoyproxy/protoc-gen-validate				 v0.10.1 \
 	github.com/exoscale/egoscale						 v0.90.2 \
 	github.com/fatih/color							 v1.15.0 \
 	github.com/fatih/structs						 v1.1.0 \
@ -83,10 +83,11 @@ MODGO_MODULES =	\
 	github.com/go-playground/validator/v10					 v10.9.0 \
 	github.com/go-test/deep							 v1.0.3 \
 	github.com/gobwas/glob							 v0.2.4-0.20181002190808-e7a84e9525fe \
-	github.com/goccy/go-json						 v0.7.8 \
+	github.com/goccy/go-json						 v0.10.2 \
 	github.com/gofrs/uuid							 v4.0.0+incompatible \
 	github.com/golang-jwt/jwt						 v3.2.2+incompatible \
 	github.com/golang-jwt/jwt/v4						 v4.5.0 \
+	github.com/golang-jwt/jwt/v5						 v5.0.0 \
 	github.com/golang/glog							 v1.1.0 \
 	github.com/golang/groupcache						 v0.0.0-20210331224755-41bb18bfe9da \
 	github.com/golang/mock							 v1.1.1 \
@ -94,33 +95,32 @@ MODGO_MODULES =	\
 	github.com/golangci/lint-1						 v0.0.0-20181222135242-d2cdd8c08219 \
 	github.com/google/go-cmp						 v0.5.9 \
 	github.com/google/go-github/v35						 v35.3.0 \
+	github.com/google/go-pkcs11						 v0.2.0 \
 	github.com/google/go-querystring					 v1.1.0 \
 	github.com/google/gofuzz						 v1.0.0 \
-	github.com/google/s2a-go						 v0.1.4 \
+	github.com/google/s2a-go						 v0.1.7 \
 	github.com/google/shlex							 v0.0.0-20191202100458-e7afc7fbc510 \
-	github.com/google/uuid							 v1.3.0 \
-	github.com/googleapis/enterprise-certificate-proxy			 v0.2.3 \
-	github.com/googleapis/gax-go/v2						 v2.10.0 \
+	github.com/google/uuid							 v1.3.1 \
+	github.com/googleapis/enterprise-certificate-proxy			 v0.2.5 \
+	github.com/googleapis/gax-go/v2						 v2.12.0 \
 	github.com/gopherjs/gopherjs						 v1.17.2 \
 	github.com/gopherjs/jquery						 v0.0.0-20191017083323-73f4c7416038 \
 	github.com/gorilla/mux							 v1.8.0 \
-	github.com/grpc-ecosystem/grpc-gateway					 v1.16.0 \
 	github.com/h2non/parth							 v0.0.0-20190131123155-b4df798d6542 \
 	github.com/hashicorp/errwrap						 v1.1.0 \
 	github.com/hashicorp/go-cleanhttp					 v0.5.2 \
 	github.com/hashicorp/go-hclog						 v1.2.0 \
 	github.com/hashicorp/go-multierror					 v1.1.1 \
-	github.com/hashicorp/go-retryablehttp					 v0.7.2 \
+	github.com/hashicorp/go-retryablehttp					 v0.7.4 \
 	github.com/hashicorp/go-rootcerts					 v1.0.2 \
 	github.com/hashicorp/go-secure-stdlib/parseutil				 v0.1.6 \
 	github.com/hashicorp/go-secure-stdlib/strutil				 v0.1.2 \
 	github.com/hashicorp/go-sockaddr					 v1.0.2 \
 	github.com/hashicorp/hcl						 v1.0.0 \
-	github.com/hashicorp/vault/api						 v1.9.2 \
-	github.com/hexonet/go-sdk/v3						 v3.5.4 \
+	github.com/hashicorp/vault/api						 v1.10.0 \
 	github.com/inconshreveable/mousetrap					 v1.0.0 \
 	github.com/jarcoal/httpmock						 v1.0.8 \
-	github.com/jinzhu/copier						 v0.3.5 \
+	github.com/jinzhu/copier						 v0.4.0 \
 	github.com/jmespath/go-jmespath						 v0.4.0 \
 	github.com/jmespath/go-jmespath/internal/testify			 v1.5.1 \
 	github.com/json-iterator/go						 v1.1.12 \
@ -167,7 +167,7 @@ MODGO_MODULES =	\
 	github.com/mattn/go-colorable						 v0.1.13 \
 	github.com/mattn/go-isatty						 v0.0.19 \
 	github.com/mattn/go-runewidth						 v0.0.13 \
-	github.com/miekg/dns							 v1.1.54 \
+	github.com/miekg/dns							 v1.1.56 \
 	github.com/mitchellh/cli						 v1.0.0 \
 	github.com/mitchellh/go-homedir						 v1.1.0 \
 	github.com/mitchellh/go-wordwrap					 v1.0.0 \
@ -181,7 +181,7 @@ MODGO_MODULES =	\
 	github.com/neelance/astrewrite						 v0.0.0-20160511093645-99348263ae86 \
 	github.com/neelance/sourcemap						 v0.0.0-20200213170602-2833bce08e4c \
 	github.com/niemeyer/pretty						 v0.0.0-20200227124842-a10e7caefd8e \
-	github.com/nrdcg/goinwx							 v0.8.2 \
+	github.com/nrdcg/goinwx							 v0.8.3 \
 	github.com/nu7hatch/gouuid						 v0.0.0-20131221200532-179d4d0c4d8d \
 	github.com/olekukonko/tablewriter					 v0.0.5 \
 	github.com/oracle/oci-go-sdk/v32					 v32.0.0 \
@ -199,7 +199,6 @@ MODGO_MODULES =	\
 	github.com/qdm12/reprint						 v0.0.0-20200326205758-722754a53494 \
 	github.com/rivo/uniseg							 v0.2.0 \
 	github.com/robertkrimen/otto						 v0.2.1 \
-	github.com/rogpeppe/fastuuid						 v1.2.0 \
 	github.com/rogpeppe/go-internal						 v1.8.1 \
 	github.com/russross/blackfriday/v2					 v2.1.0 \
 	github.com/ryanuber/columnize						 v2.1.0+incompatible \
@ -217,10 +216,10 @@ MODGO_MODULES =	\
 	github.com/spf13/pflag							 v1.0.5 \
 	github.com/stretchr/objx						 v0.5.0 \
 	github.com/stretchr/testify						 v1.8.4 \
-	github.com/transip/gotransip/v6						 v6.20.0 \
+	github.com/transip/gotransip/v6						 v6.21.0 \
 	github.com/ugorji/go							 v1.2.6 \
 	github.com/ugorji/go/codec						 v1.2.6 \
-	github.com/urfave/cli/v2						 v2.25.5 \
+	github.com/urfave/cli/v2						 v2.25.7 \
 	github.com/valyala/bytebufferpool					 v1.0.0 \
 	github.com/valyala/fasttemplate						 v1.2.1 \
 	github.com/vultr/govultr/v2						 v2.17.2 \
@ -231,28 +230,27 @@ MODGO_MODULES =	\
 	github.com/xrash/smetrics						 v0.0.0-20201216005158-039620a65673 \
 	github.com/yuin/goldmark						 v1.4.13 \
 	go.opencensus.io							 v0.24.0 \
-	go.opentelemetry.io/proto/otlp						 v0.7.0 \
-	golang.org/x/crypto							 v0.9.0 \
-	golang.org/x/exp							 v0.0.0-20230522175609-2e198f4a06a1 \
+	golang.org/x/crypto							 v0.13.0 \
+	golang.org/x/exp							 v0.0.0-20230905200255-921286631fa9 \
 	golang.org/x/lint							 v0.0.0-20190313153728-d0100b6bd8b3 \
-	golang.org/x/mod							 v0.9.0 \
-	golang.org/x/net							 v0.10.0 \
-	golang.org/x/oauth2							 v0.8.0 \
-	golang.org/x/sync							 v0.2.0 \
-	golang.org/x/sys							 v0.8.0 \
-	golang.org/x/term							 v0.8.0 \
-	golang.org/x/text							 v0.9.0 \
+	golang.org/x/mod							 v0.12.0 \
+	golang.org/x/net							 v0.15.0 \
+	golang.org/x/oauth2							 v0.12.0 \
+	golang.org/x/sync							 v0.3.0 \
+	golang.org/x/sys							 v0.12.0 \
+	golang.org/x/term							 v0.12.0 \
+	golang.org/x/text							 v0.13.0 \
 	golang.org/x/time							 v0.3.0 \
-	golang.org/x/tools							 v0.7.0 \
+	golang.org/x/tools							 v0.13.0 \
 	golang.org/x/xerrors							 v0.0.0-20200804184101-5ec99f83aff1 \
-	google.golang.org/api							 v0.125.0 \
+	google.golang.org/api							 v0.141.0 \
 	google.golang.org/appengine						 v1.6.7 \
-	google.golang.org/genproto						 v0.0.0-20230530153820-e85fd2cbaebc \
-	google.golang.org/genproto/googleapis/api				 v0.0.0-20230530153820-e85fd2cbaebc \
-	google.golang.org/genproto/googleapis/bytestream			 v0.0.0-20230530153820-e85fd2cbaebc \
-	google.golang.org/genproto/googleapis/rpc				 v0.0.0-20230530153820-e85fd2cbaebc \
-	google.golang.org/grpc							 v1.55.0 \
-	google.golang.org/protobuf						 v1.30.0 \
+	google.golang.org/genproto						 v0.0.0-20230803162519-f966b187b2e5 \
+	google.golang.org/genproto/googleapis/api				 v0.0.0-20230803162519-f966b187b2e5 \
+	google.golang.org/genproto/googleapis/bytestream			 v0.0.0-20230911183012-2d3300fd4832 \
+	google.golang.org/genproto/googleapis/rpc				 v0.0.0-20230911183012-2d3300fd4832 \
+	google.golang.org/grpc							 v1.57.0 \
+	google.golang.org/protobuf						 v1.31.0 \
 	gopkg.in/check.v1							 v1.0.0-20201130134442-10cb98267c6c \
 	gopkg.in/errgo.v1							 v1.0.0-20161222125816-442357a80af5 \
 	gopkg.in/errgo.v2							 v2.1.0 \
@ -260,7 +258,7 @@ MODGO_MODULES =	\
 	gopkg.in/httprequest.v1							 v1.1.1 \
 	gopkg.in/ini.v1								 v1.66.6 \
 	gopkg.in/mgo.v2								 v2.0.0-20190816093944-a6b53ec6cb22 \
-	gopkg.in/ns1/ns1-go.v2							 v2.7.4 \
+	gopkg.in/ns1/ns1-go.v2							 v2.7.8 \
 	gopkg.in/readline.v1							 v1.0.0-20160726135117-62c6fe619375 \
 	gopkg.in/sourcemap.v1							 v1.0.5 \
 	gopkg.in/square/go-jose.v2						 v2.5.1 \
@ -275,10 +273,9 @@ MODGO_MODULES =	\

 MODGO_MODFILES =	\
 	cloud.google.com/go						 v0.26.0 \
-	cloud.google.com/go						 v0.34.0 \
 	cloud.google.com/go/compute					 v1.14.0 \
-	cloud.google.com/go/compute					 v1.18.0 \
-	cloud.google.com/go/compute/metadata				 v0.2.0 \
+	cloud.google.com/go/compute					 v1.19.1 \
+	cloud.google.com/go/compute					 v1.20.1 \
 	github.com/!azure!a!d/microsoft-authentication-library-for-go	 v0.9.0 \
 	github.com/!azure/azure-sdk-for-go/sdk/azcore			 v1.4.0 \
 	github.com/!azure/azure-sdk-for-go/sdk/azidentity		 v1.2.2 \
@ -286,20 +283,12 @@ MODGO_MODFILES =	\
 	github.com/!burnt!sushi/toml					 v0.3.1 \
 	github.com/boombuler/barcode					 v1.0.1-0.20190219062509-6c824513bacc \
 	github.com/census-instrumentation/opencensus-proto		 v0.2.1 \
-	github.com/cespare/xxhash/v2					 v2.1.1 \
 	github.com/cncf/udpa/go						 v0.0.0-20191209042840-269d4d468f6f \
-	github.com/cncf/udpa/go						 v0.0.0-20201120205902-5459f2c99403 \
-	github.com/cncf/udpa/go						 v0.0.0-20210930031921-04548b0d99d4 \
-	github.com/cncf/xds/go						 v0.0.0-20210805033703-aa0b78936158 \
-	github.com/cncf/xds/go						 v0.0.0-20210922020428-25de7278fc84 \
-	github.com/cncf/xds/go						 v0.0.0-20211011173535-cb28da3451f1 \
 	github.com/davecgh/go-spew					 v1.1.0 \
 	github.com/dnaeon/go-vcr					 v1.1.0 \
 	github.com/envoyproxy/go-control-plane				 v0.9.0 \
 	github.com/envoyproxy/go-control-plane				 v0.9.1-0.20191026205805-5f8ba28d4473 \
-	github.com/envoyproxy/go-control-plane				 v0.9.10-0.20210907150352-cf90f659a021 \
 	github.com/envoyproxy/go-control-plane				 v0.9.4 \
-	github.com/envoyproxy/go-control-plane				 v0.9.9-0.20201210154907-fd9021fe5dad \
 	github.com/envoyproxy/protoc-gen-validate			 v0.1.0 \
 	github.com/fatih/color						 v1.13.0 \
 	github.com/fatih/color						 v1.7.0 \
@ -307,8 +296,8 @@ MODGO_MODFILES =	\
 	github.com/go-playground/universal-translator			 v0.17.0 \
 	github.com/go-playground/validator/v10				 v10.4.1 \
 	github.com/go-test/deep						 v1.0.2 \
+	github.com/goccy/go-json					 v0.7.8 \
 	github.com/gofrs/uuid						 v3.2.0+incompatible \
-	github.com/golang-jwt/jwt/v4					 v4.4.3 \
 	github.com/golang/glog						 v0.0.0-20160126235308-23def4e6c14b \
 	github.com/golang/groupcache					 v0.0.0-20200121045136-8c9f03a8e57e \
 	github.com/golang/protobuf					 v1.2.0 \
@ -321,7 +310,6 @@ MODGO_MODFILES =	\
 	github.com/golang/protobuf					 v1.4.0-rc.2 \
 	github.com/golang/protobuf					 v1.4.0-rc.4.0.20200313231945-b860323f09d0 \
 	github.com/golang/protobuf					 v1.4.1 \
-	github.com/golang/protobuf					 v1.4.2 \
 	github.com/golang/protobuf					 v1.4.3 \
 	github.com/golang/protobuf					 v1.5.0 \
 	github.com/golang/protobuf					 v1.5.2 \
@ -337,10 +325,12 @@ MODGO_MODFILES =	\
 	github.com/google/go-cmp					 v0.5.7 \
 	github.com/google/go-cmp					 v0.5.8 \
 	github.com/google/go-querystring				 v1.0.0 \
-	github.com/google/s2a-go					 v0.1.3 \
+	github.com/google/s2a-go					 v0.1.4 \
 	github.com/google/uuid						 v1.1.1 \
 	github.com/google/uuid						 v1.1.2 \
-	github.com/googleapis/gax-go/v2					 v2.8.0 \
+	github.com/google/uuid						 v1.3.0 \
+	github.com/googleapis/enterprise-certificate-proxy		 v0.2.3 \
+	github.com/googleapis/gax-go/v2					 v2.11.0 \
 	github.com/gopherjs/gopherjs					 v0.0.0-20181017120253-0766667cb4d1 \
 	github.com/hashicorp/errwrap					 v1.0.0 \
 	github.com/hashicorp/go-cleanhttp				 v0.5.1 \
@ -400,10 +390,8 @@ MODGO_MODFILES =	\
 	github.com/stretchr/testify					 v1.8.0 \
 	github.com/stretchr/testify					 v1.8.1 \
 	github.com/stretchr/testify					 v1.8.2 \
-	github.com/stretchr/testify					 v1.8.3 \
 	github.com/ugorji/go						 v1.1.7 \
 	github.com/ugorji/go/codec					 v1.1.7 \
-	github.com/urfave/cli/v2					 v2.25.3 \
 	github.com/yuin/goldmark					 v1.2.1 \
 	golang.org/x/crypto						 v0.0.0-20180214000028-650f4a345ab4 \
 	golang.org/x/crypto						 v0.0.0-20190308221718-c2843e01d9a2 \
@ -415,23 +403,21 @@ MODGO_MODFILES =	\
 	golang.org/x/crypto						 v0.0.0-20210711020723-a769d52b0f97 \
 	golang.org/x/crypto						 v0.0.0-20210817164053-32db794688a5 \
 	golang.org/x/crypto						 v0.0.0-20210921155107-089bfa567519 \
-	golang.org/x/crypto						 v0.0.0-20220314234659-1baeb1ce4c0b \
+	golang.org/x/crypto						 v0.10.0 \
+	golang.org/x/crypto						 v0.12.0 \
 	golang.org/x/crypto						 v0.6.0 \
-	golang.org/x/crypto						 v0.7.0 \
+	golang.org/x/crypto						 v0.9.0 \
 	golang.org/x/exp						 v0.0.0-20190121172915-509febef88a4 \
 	golang.org/x/lint						 v0.0.0-20181026193005-c67002cb31c3 \
 	golang.org/x/lint						 v0.0.0-20190227174305-5b3e6a55c961 \
 	golang.org/x/mod						 v0.2.0 \
 	golang.org/x/mod						 v0.3.0 \
 	golang.org/x/mod						 v0.4.1 \
-	golang.org/x/mod						 v0.6.0 \
 	golang.org/x/mod						 v0.6.0-dev.0.20220419223038-86c51ed26bb4 \
-	golang.org/x/mod						 v0.7.0 \
 	golang.org/x/mod						 v0.8.0 \
 	golang.org/x/net						 v0.0.0-20180406214816-61147c48b25b \
 	golang.org/x/net						 v0.0.0-20180724234803-3673e40ba225 \
 	golang.org/x/net						 v0.0.0-20180826012351-8a410e7b638d \
-	golang.org/x/net						 v0.0.0-20190108225652-1e06a53dbb7e \
 	golang.org/x/net						 v0.0.0-20190213061140-3a22650c66bd \
 	golang.org/x/net						 v0.0.0-20190311183353-d8887717615a \
 	golang.org/x/net						 v0.0.0-20190404232315-eb5bcb51f2a3 \
@ -444,25 +430,26 @@ MODGO_MODFILES =	\
 	golang.org/x/net						 v0.0.0-20210226172049-e18ecbb05110 \
 	golang.org/x/net						 v0.0.0-20210913180222-943fd674d43e \
 	golang.org/x/net						 v0.0.0-20210916014120-12bc252f5db8 \
-	golang.org/x/net						 v0.0.0-20211112202133-69e39bad7dc2 \
 	golang.org/x/net						 v0.0.0-20220722155237-a158d28d115b \
-	golang.org/x/net						 v0.2.0 \
+	golang.org/x/net						 v0.10.0 \
+	golang.org/x/net						 v0.14.0 \
 	golang.org/x/net						 v0.7.0 \
 	golang.org/x/net						 v0.8.0 \
+	golang.org/x/net						 v0.9.0 \
 	golang.org/x/oauth2						 v0.0.0-20180821212333-d2e6202438be \
 	golang.org/x/oauth2						 v0.0.0-20190604053449-0f29369cfe45 \
-	golang.org/x/oauth2						 v0.0.0-20200107190931-bf48bf16ab8d \
 	golang.org/x/oauth2						 v0.0.0-20220411215720-9780585627b5 \
-	golang.org/x/oauth2						 v0.6.0 \
+	golang.org/x/oauth2						 v0.7.0 \
+	golang.org/x/oauth2						 v0.8.0 \
 	golang.org/x/sync						 v0.0.0-20180314180146-1d60e4601c6f \
 	golang.org/x/sync						 v0.0.0-20181108010431-42b317875d0f \
-	golang.org/x/sync						 v0.0.0-20181221193216-37e7f081c4d4 \
 	golang.org/x/sync						 v0.0.0-20190423024810-112230192c58 \
 	golang.org/x/sync						 v0.0.0-20200625203802-6e8e738ad208 \
 	golang.org/x/sync						 v0.0.0-20201020160332-67f06af15bc9 \
 	golang.org/x/sync						 v0.0.0-20210220032951-036812b2e83c \
 	golang.org/x/sync						 v0.0.0-20220722155255-886fb9371eb4 \
 	golang.org/x/sync						 v0.1.0 \
+	golang.org/x/sync						 v0.2.0 \
 	golang.org/x/sys						 v0.0.0-20180823144017-11551d06cbcc \
 	golang.org/x/sys						 v0.0.0-20180830151530-49385e6e1522 \
 	golang.org/x/sys						 v0.0.0-20190215142949-d0b11bdaac8a \
@ -484,14 +471,17 @@ MODGO_MODFILES =	\
 	golang.org/x/sys						 v0.0.0-20220715151400-c0bba94af5f8 \
 	golang.org/x/sys						 v0.0.0-20220722155257-8c9f86f7a55f \
 	golang.org/x/sys						 v0.0.0-20220811171246-fbc7d0a398ab \
-	golang.org/x/sys						 v0.1.0 \
-	golang.org/x/sys						 v0.2.0 \
+	golang.org/x/sys						 v0.11.0 \
 	golang.org/x/sys						 v0.5.0 \
 	golang.org/x/sys						 v0.6.0 \
+	golang.org/x/sys						 v0.7.0 \
+	golang.org/x/sys						 v0.8.0 \
+	golang.org/x/sys						 v0.9.0 \
 	golang.org/x/term						 v0.0.0-20201117132131-f5c789dd3221 \
 	golang.org/x/term						 v0.0.0-20201126162022-7de9c90e9dd1 \
 	golang.org/x/term						 v0.0.0-20210927222741-03fcf44c2211 \
 	golang.org/x/term						 v0.5.0 \
+	golang.org/x/text						 v0.12.0 \
 	golang.org/x/text						 v0.3.0 \
 	golang.org/x/text						 v0.3.2 \
 	golang.org/x/text						 v0.3.3 \
@ -501,6 +491,7 @@ MODGO_MODFILES =	\
 	golang.org/x/text						 v0.4.0 \
 	golang.org/x/text						 v0.7.0 \
 	golang.org/x/text						 v0.8.0 \
+	golang.org/x/text						 v0.9.0 \
 	golang.org/x/time						 v0.0.0-20200416051211-89c76fbcd5d1 \
 	golang.org/x/time						 v0.0.0-20201208040808-7e3f01d25324 \
 	golang.org/x/time						 v0.0.0-20210220033141-f8bda1e9f3ba \
@ -517,31 +508,31 @@ MODGO_MODFILES =	\
 	golang.org/x/tools						 v0.0.0-20210114065538-d78b04bdf963 \
 	golang.org/x/tools						 v0.1.12 \
 	golang.org/x/tools						 v0.1.5 \
-	golang.org/x/tools						 v0.2.0 \
-	golang.org/x/tools						 v0.3.0 \
 	golang.org/x/tools						 v0.6.0 \
 	golang.org/x/xerrors						 v0.0.0-20190717185122-a985d3407aa7 \
 	golang.org/x/xerrors						 v0.0.0-20191011141410-1b5146add898 \
 	golang.org/x/xerrors						 v0.0.0-20191204190536-9bdfabe68543 \
-	google.golang.org/api						 v0.122.0 \
-	google.golang.org/api						 v0.124.0 \
+	google.golang.org/api						 v0.126.0 \
+	google.golang.org/api						 v0.128.0 \
 	google.golang.org/appengine					 v1.1.0 \
 	google.golang.org/appengine					 v1.4.0 \
 	google.golang.org/genproto					 v0.0.0-20180817151627-c66870c02cf8 \
 	google.golang.org/genproto					 v0.0.0-20190819201941-24fa4b261c55 \
-	google.golang.org/genproto					 v0.0.0-20200513103714-09dca8ec2884 \
 	google.golang.org/genproto					 v0.0.0-20200526211855-cb27e3aa2013 \
-	google.golang.org/genproto					 v0.0.0-20230306155012-7f2fa6fef1f4 \
-	google.golang.org/genproto					 v0.0.0-20230410155749-daa745c078e1 \
-	google.golang.org/genproto					 v0.0.0-20230525234025-438c736192d0 \
+	google.golang.org/genproto					 v0.0.0-20230526161137-0005af68ea54 \
+	google.golang.org/genproto					 v0.0.0-20230530153820-e85fd2cbaebc \
+	google.golang.org/genproto/googleapis/api			 v0.0.0-20230525234035-dd9d682886f9 \
+	google.golang.org/genproto/googleapis/api			 v0.0.0-20230530153820-e85fd2cbaebc \
+	google.golang.org/genproto/googleapis/rpc			 v0.0.0-20230525234030-28d5490b6b19 \
+	google.golang.org/genproto/googleapis/rpc			 v0.0.0-20230530153820-e85fd2cbaebc \
+	google.golang.org/genproto/googleapis/rpc			 v0.0.0-20230822172742-b8732ec3820d \
 	google.golang.org/grpc						 v1.19.0 \
 	google.golang.org/grpc						 v1.23.0 \
 	google.golang.org/grpc						 v1.25.1 \
 	google.golang.org/grpc						 v1.27.0 \
-	google.golang.org/grpc						 v1.33.1 \
 	google.golang.org/grpc						 v1.33.2 \
-	google.golang.org/grpc						 v1.36.0 \
-	google.golang.org/grpc						 v1.45.0 \
+	google.golang.org/grpc						 v1.55.0 \
+	google.golang.org/grpc						 v1.56.1 \
 	google.golang.org/protobuf					 v0.0.0-20200109180630-ec00e32a8dfd \
 	google.golang.org/protobuf					 v0.0.0-20200221191635-4d8936d0db64 \
 	google.golang.org/protobuf					 v0.0.0-20200228230310-ab0ca4ff8a60 \
@ -555,6 +546,7 @@ MODGO_MODFILES =	\
 	google.golang.org/protobuf					 v1.26.0-rc.1 \
 	google.golang.org/protobuf					 v1.27.1 \
 	google.golang.org/protobuf					 v1.28.0 \
+	google.golang.org/protobuf					 v1.30.0 \
 	gopkg.in/check.v1						 v0.0.0-20161208181325-20d25e280405 \
 	gopkg.in/check.v1						 v1.0.0-20160105164936-4f90aeace3a2 \
 	gopkg.in/check.v1						 v1.0.0-20180628173108-788fd7840127 \
@ -567,7 +559,6 @@ MODGO_MODFILES =	\
 	gopkg.in/mgo.v2							 v2.0.0-20160818015218-f2b6f6c918c4 \
 	gopkg.in/yaml.v2						 v2.0.0-20170712054546-1be3d31502d6 \
 	gopkg.in/yaml.v2						 v2.2.2 \
-	gopkg.in/yaml.v2						 v2.2.3 \
 	gopkg.in/yaml.v2						 v2.2.4 \
 	gopkg.in/yaml.v2						 v2.2.8 \
 	gopkg.in/yaml.v2						 v2.3.0 \
--- a/net/dnscontrol/pkg/PLIST
+++ b/net/dnscontrol/pkg/PLIST
@ -31,6 +31,7 @@ share/doc/dnscontrol/providers/linode.md
 share/doc/dnscontrol/providers/loopia.md
 share/doc/dnscontrol/providers/luadns.md
 share/doc/dnscontrol/providers/msdns.md
+share/doc/dnscontrol/providers/mythicbeasts.md
 share/doc/dnscontrol/providers/namecheap.md
 share/doc/dnscontrol/providers/namedotcom.md
 share/doc/dnscontrol/providers/netcup.md
--- a/security/ADMsnmp/Makefile
+++ b/security/ADMsnmp/Makefile
@ -10,9 +10,9 @@ PERMIT_PACKAGE=		no license
 PERMIT_DISTFILES=	no license
 WANTLIB=		c

-MASTER_SITES=		ftp://adm.freelsd.net/pub/ADM/ \
+SITES=			ftp://adm.freelsd.net/pub/ADM/ \
 			http://adm.freelsd.net/ADM/ \
-			${MASTER_SITE_PACKETSTORM:=groups/ADM/}
+			${SITE_PACKETSTORM:=groups/ADM/}

 WRKDIST=		${WRKDIR}/ADMsnmp

--- a/security/aescrypt/Makefile
+++ b/security/aescrypt/Makefile
@ -11,8 +11,8 @@ HOMEPAGE=		http://aescrypt.sourceforge.net/
 PERMIT_PACKAGE=	Yes
 WANTLIB=		c

-MASTER_SITES=		http://aescrypt.sourceforge.net/ \
-			${MASTER_SITE_SOURCEFORGE:=aescrypt/}
+SITES=			http://aescrypt.sourceforge.net/ \
+			${SITE_SOURCEFORGE:=aescrypt/}

 AUTOCONF_VERSION=	2.13
 CONFIGURE_STYLE=	autoconf
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@ -11,7 +11,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += c m mhash pcre z

-MASTER_SITES=		https://github.com/aide/aide/releases/download/v${V}/
+SITES=			https://github.com/aide/aide/releases/download/v${V}/

 BUILD_DEPENDS=		devel/bison
 LIB_DEPENDS=		devel/pcre \
--- a/security/aircrack-ng/Makefile
+++ b/security/aircrack-ng/Makefile
@ -11,7 +11,7 @@ PERMIT_PACKAGE=	Yes
 WANTLIB+=		c pthread crypto z pcre
 WANTLIB+=		${COMPILER_LIBCXX} m sqlite3

-MASTER_SITES=		https://download.aircrack-ng.org/
+SITES=			https://download.aircrack-ng.org/

 BUILD_DEPENDS=		devel/shtool \
 			devel/pkgconf
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@ -12,7 +12,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += c crypto ssl pcre

-MASTER_SITES=	https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/
+SITES=		https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/

 LIB_DEPENDS=	devel/pcre

--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@ -10,7 +10,7 @@ HOMEPAGE=		http://www.adel.nursat.kz/apg/
 PERMIT_PACKAGE=	Yes
 WANTLIB=		c m

-MASTER_SITES=		http://www.adel.nursat.kz/apg/download/
+SITES=			http://www.adel.nursat.kz/apg/download/

 MAKE_FLAGS=		CC="${CC}" FLAGS="${CFLAGS}" \
 			LIBS="" USE_SHA=APG_USE_SHA
--- a/security/arirang/Makefile
+++ b/security/arirang/Makefile
@ -5,8 +5,8 @@ CATEGORIES =	security
 REVISION =	10
 FIX_EXTRACT_PERMISSIONS=Yes

-MASTER_SITES =	http://monkey.org/~pilot/arirang/ \
-		${MASTER_SITE_PACKETSTORM:=UNIX/cgi-scanners/}
+SITES =		http://monkey.org/~pilot/arirang/ \
+		${SITE_PACKETSTORM:=UNIX/cgi-scanners/}

 HOMEPAGE =	http://www.monkey.org/~pilot

--- a/security/bfbtester/Makefile
+++ b/security/bfbtester/Makefile
@ -2,7 +2,7 @@ COMMENT=	brute force binary tester

 DISTNAME=	bfbtester-2.0.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bfbtester/}
+SITES=		${SITE_SOURCEFORGE:=bfbtester/}

 HOMEPAGE=	http://bfbtester.sourceforge.net/

--- a/security/botan2/Makefile
+++ b/security/botan2/Makefile
@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB =		${COMPILER_LIBCXX} bz2 c lzma m z

-MASTER_SITES =		${HOMEPAGE}releases/
+SITES =			${HOMEPAGE}releases/

 SUPDISTFILES =		${DISTFILES}.asc
 EXTRACT_SUFX =		.tar.xz
--- a/security/bounix/Makefile
+++ b/security/bounix/Makefile
@ -5,7 +5,7 @@ DISTNAME=	bo121unix

 CATEGORIES=     security

-MASTER_SITES=	http://orifice.rotten.com/cDc/ \
+SITES=		http://orifice.rotten.com/cDc/ \
 		http://www.cultdeadcow.com/tools/

 PERMIT_PACKAGE=	Yes
--- a/security/burpsuite/Makefile
+++ b/security/burpsuite/Makefile
@ -14,7 +14,7 @@ HOMEPAGE =		https://portswigger.net/burp/
 PERMIT_PACKAGE =	https://portswigger.net/burp/eula/community
 PERMIT_DISTFILES =	https://portswigger.net/burp/eula/community

-MASTER_SITES =		https://portswigger.net/Burp/Releases/
+SITES =			https://portswigger.net/Burp/Releases/

 EXTRACT_ONLY =
 EXTRACT_SUFX =		.jar
--- a/security/ccid/Makefile
+++ b/security/ccid/Makefile
@ -6,7 +6,7 @@ CATEGORIES =	security

 HOMEPAGE =	https://ccid.apdu.fr/

-MASTER_SITES =	https://ccid.apdu.fr/files/
+SITES =		https://ccid.apdu.fr/files/

 EXTRACT_SUFX =	.tar.bz2

--- a/security/ccrypt/Makefile
+++ b/security/ccrypt/Makefile
@ -14,8 +14,8 @@ PERMIT_PACKAGE=	Yes

 WANTLIB=  c iconv intl

-MASTER_SITES=	${HOMEPAGE}/download/${V}/ \
-		${MASTER_SITE_SOURCEFORGE:=ccrypt/}
+SITES=		${HOMEPAGE}/download/${V}/ \
+		${SITE_SOURCEFORGE:=ccrypt/}

 MODULES=	textproc/intltool

--- a/security/chrootuid/Makefile
+++ b/security/chrootuid/Makefile
@ -12,7 +12,7 @@ HOMEPAGE=		http://www.porcupine.org/
 PERMIT_PACKAGE=	Yes
 WANTLIB=		c

-MASTER_SITES=		http://ftp.porcupine.org/pub/security/ \
+SITES=		http://ftp.porcupine.org/pub/security/ \
 		ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/chrootuid/

 ALL_TARGET=		chrootuid
--- a/security/clamav-unofficial-sigs/Makefile
+++ b/security/clamav-unofficial-sigs/Makefile
@ -12,7 +12,7 @@ HOMEPAGE =	https://github.com/extremeshok/clamav-unofficial-sigs
 # BSD
 PERMIT_PACKAGE =	Yes

-MASTER_SITES =	https://github.com/extremeshok/clamav-unofficial-sigs/archive/
+SITES =		https://github.com/extremeshok/clamav-unofficial-sigs/archive/

 RUN_DEPENDS =	net/curl \
 		net/rsync \
--- a/security/clusterssh/Makefile
+++ b/security/clusterssh/Makefile
@ -13,7 +13,7 @@ MAINTAINER=	Steven Mestdagh <steven@openbsd.org>
 # GPLv2
 PERMIT_PACKAGE=	Yes

-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clusterssh/}2.%20ClusterSSH%20Series%204/
+SITES=		${SITE_SOURCEFORGE:=clusterssh/}2.%20ClusterSSH%20Series%204/

 MODULES=	cpan
 PKG_ARCH=	*
--- a/security/corkscrew/Makefile
+++ b/security/corkscrew/Makefile
@ -10,7 +10,7 @@ HOMEPAGE=		http://www.agroman.net/corkscrew/
 PERMIT_PACKAGE=	Yes
 WANTLIB=		c

-MASTER_SITES=		http://www.agroman.net/corkscrew/
+SITES=			http://www.agroman.net/corkscrew/

 CONFIGURE_STYLE=	gnu

--- a/security/cracklib/Makefile
+++ b/security/cracklib/Makefile
@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB =  c iconv intl z

-MASTER_SITES =		https://github.com/cracklib/cracklib/releases/download/v${V}/
+SITES =		https://github.com/cracklib/cracklib/releases/download/v${V}/

 BUILD_DEPENDS =		devel/gettext,-tools
 LIB_DEPENDS =		devel/gettext,-runtime
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@ -30,7 +30,7 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 # see the COPYRIGHT file in package sources
 PERMIT_PACKAGE=	Yes

-MASTER_SITES=		https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${V}/
+SITES=			https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${V}/

 WANTLIB += c crypto

--- a/security/dante/Makefile
+++ b/security/dante/Makefile
@ -12,7 +12,7 @@ MODGNU_SHARED_LIBS=dsocks	'-all-dynamic' \

 HOMEPAGE=	https://www.inet.no/dante/

-MASTER_SITES=	${HOMEPAGE}/files/
+SITES=		${HOMEPAGE}/files/

 # BSD/CMU
 PERMIT_PACKAGE=	Yes
--- a/security/dicepassc/Makefile
+++ b/security/dicepassc/Makefile
@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 # uses pledge()
 WANTLIB =		c

-MASTER_SITES =		https://www.nul.space/pub/dicepassc/
+SITES =			https://www.nul.space/pub/dicepassc/

 NO_TEST =		Yes

--- a/security/dirb/Makefile
+++ b/security/dirb/Makefile
@ -11,7 +11,7 @@ MAINTAINER =	Jasper Lievisse Adriaanse <jasper@openbsd.org>
 # GPLv2
 PERMIT_PACKAGE =	Yes

-MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=dirb/}
+SITES =		${SITE_SOURCEFORGE:=dirb/}

 WANTLIB += c crypto curl nghttp2 ssl z

--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@ -13,7 +13,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += c util z

-MASTER_SITES=	https://matt.ucc.asn.au/dropbear/releases/
+SITES=		https://matt.ucc.asn.au/dropbear/releases/

 DEBUG_PACKAGES=	${BUILD_PACKAGES}
 CONFIGURE_STYLE= gnu
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@ -4,7 +4,7 @@ DISTNAME=	dsniff-2.3
 REVISION=	17
 CATEGORIES=	security

-MASTER_SITES=	http://monkey.org/~dugsong/dsniff/
+SITES=		http://monkey.org/~dugsong/dsniff/

 HOMEPAGE=	http://www.monkey.org/~dugsong/dsniff/

--- a/security/emldump/Makefile
+++ b/security/emldump/Makefile
@ -14,7 +14,7 @@ MAINTAINER =	Remi Pointel <rpointel@openbsd.org>
 # public domain
 PERMIT_PACKAGE =	Yes

-MASTER_SITES =	https://didierstevens.com/files/software/
+SITES =		https://didierstevens.com/files/software/

 EXTRACT_SUFX =	.zip

--- a/security/encfs/Makefile
+++ b/security/encfs/Makefile
@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB += ${COMPILER_LIBCXX} c crypto fuse intl m ssl tinyxml2

-MASTER_SITES =		https://github.com/vgough/encfs/releases/download/v$V/
+SITES =			https://github.com/vgough/encfs/releases/download/v$V/

 COMPILER =		base-clang ports-gcc

--- a/security/exploitdb/Makefile
+++ b/security/exploitdb/Makefile
@ -10,7 +10,7 @@ CATEGORIES =	security

 MAINTAINER =	Sebastian Reitenbach <sebastia@openbsd.org>

-MASTER_SITES =	https://gitlab.com/exploit-database/exploitdb/-/archive/${VERSION}/
+SITES =	https://gitlab.com/exploit-database/exploitdb/-/archive/${VERSION}/

 # GPLv2
 PERMIT_PACKAGE=	Yes
--- a/security/fcrackzip/Makefile
+++ b/security/fcrackzip/Makefile
@ -11,7 +11,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB +=	c

-MASTER_SITES =	http://home.schmorp.de/data/marc/
+SITES =		http://home.schmorp.de/data/marc/

 CONFIGURE_STYLE =	autoconf
 AUTOCONF_VERSION =	2.61
--- a/security/foremost/Makefile
+++ b/security/foremost/Makefile
@ -10,7 +10,7 @@ HOMEPAGE =		http://foremost.sourceforge.net/
 # not copyrighted; see COPYRIGHT in main.h
 PERMIT_PACKAGE =	Yes

-MASTER_SITES =		http://foremost.sourceforge.net/pkg/
+SITES =			http://foremost.sourceforge.net/pkg/

 WANTLIB +=		c

--- a/security/fragrouter/Makefile
+++ b/security/fragrouter/Makefile
@ -4,7 +4,7 @@ DISTNAME=	fragrouter-1.6
 REVISION=	3
 CATEGORIES=	security

-MASTER_SITES=	http://monkey.org/~dugsong/
+SITES=		http://monkey.org/~dugsong/

 # BSD
 PERMIT_PACKAGE=	Yes
--- a/security/fwknop/Makefile
+++ b/security/fwknop/Makefile
@ -16,7 +16,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB += assuan c gpg-error gpgme iconv intl pcap

-MASTER_SITES =		https://www.cipherdyne.org/fwknop/download/
+SITES =			https://www.cipherdyne.org/fwknop/download/

 BUILD_DEPENDS =		net/wget \
 			security/gnupg
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@ -7,7 +7,7 @@ REVISION =	1

 CATEGORIES =	security

-MASTER_SITES =	${MASTER_SITE_GNUPG:=gnupg/}
+SITES =		${SITE_GNUPG:=gnupg/}

 HOMEPAGE =	https://www.gnupg.org/

--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@ -23,7 +23,7 @@ WANTLIB += p11-kit ssl tasn1 unbound unistring z zstd

 COMPILER =		base-clang ports-gcc base-gcc

-MASTER_SITES=		https://www.gnupg.org/ftp/gcrypt/gnutls/v${V:C/^([0-9]+\.[0-9]+).*/\1/}/ \
+SITES=			https://www.gnupg.org/ftp/gcrypt/gnutls/v${V:C/^([0-9]+\.[0-9]+).*/\1/}/ \
 			ftp://ftp.gnutls.org/gcrypt/gnutls/v${V:C/^([0-9]+\.[0-9]+).*/\1/}/

 # needed for tests
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@ -15,7 +15,7 @@ WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
 WANTLIB += gpg-error gpgme gtk-x11-2.0 harfbuzz iconv intl m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread z

-MASTER_SITES = 	https://gnupg.org/ftp/gcrypt/gpa/
+SITES = 	https://gnupg.org/ftp/gcrypt/gpa/
 EXTRACT_SUFX=	.tar.bz2

 RUN_DEPENDS=	devel/desktop-file-utils
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@ -14,7 +14,7 @@ SHARED_LIBS +=  qgpgme               3.1      # 19.0

 HOMEPAGE =		https://www.gnupg.org/software/gpgme/

-MASTER_SITES =		${MASTER_SITE_GNUPG:=gpgme/}
+SITES =			${SITE_GNUPG:=gpgme/}
 EXTRACT_SUFX =		.tar.bz2

 # GPLv2 - LGPLv2.1
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@ -15,7 +15,7 @@ WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gringotts
 WANTLIB += gtk-x11-2.0 harfbuzz intl pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 popt z

-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gringotts.berlios/}
+SITES=		${SITE_SOURCEFORGE:=gringotts.berlios/}

 LIB_DEPENDS=	x11/gtk+2 \
 		security/libgringotts \
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@ -37,7 +37,7 @@ PERMIT_PACKAGE=		Yes

 MULTI_PACKAGES=		-main -devel-docs -libs

-MASTER_SITES=		https://github.com/heimdal/heimdal/releases/download/heimdal-${V}/
+SITES=	https://github.com/heimdal/heimdal/releases/download/heimdal-${V}/

 MODULES=		lang/python

--- a/security/integrit/Makefile
+++ b/security/integrit/Makefile
@ -13,7 +13,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += c

-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=integrit/}
+SITES=			${SITE_SOURCEFORGE:=integrit/}

 CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION=	2.59
--- a/security/ipguard/Makefile
+++ b/security/ipguard/Makefile
@ -5,7 +5,7 @@ CATEGORIES =	security
 REVISION =	4

 HOMEPAGE =	http://ipguard.deep.perm.ru/
-MASTER_SITES =	${HOMEPAGE}files/
+SITES =		${HOMEPAGE}files/

 # BSD-like
 PERMIT_PACKAGE =	Yes
--- a/security/isic/Makefile
+++ b/security/isic/Makefile
@ -10,7 +10,7 @@ HOMEPAGE=	http://isic.sourceforge.net/
 PERMIT_PACKAGE=	Yes
 WANTLIB=		c lib/libnet-1.1/net=11

-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isic/}
+SITES=		${SITE_SOURCEFORGE:=isic/}
 EXTRACT_SUFX=	.tgz

 LIB_DEPENDS=	net/libnet/1.1
--- a/security/jailkit/Makefile
+++ b/security/jailkit/Makefile
@ -6,7 +6,7 @@ CATEGORIES=		security sysutils

 HOMEPAGE=		http://olivier.sessink.nl/jailkit/

-MASTER_SITES=		http://olivier.sessink.nl/jailkit/
+SITES=			${HOMEPAGE}

 # BSD - LGPLv2
 PERMIT_PACKAGE=	Yes
--- a/security/john-jumbo/Makefile
+++ b/security/john-jumbo/Makefile
@ -23,7 +23,7 @@ COMPILER_LANGS =	c
 WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 smime3
 WANTLIB += nssutil3 ssl ssl3 z

-MASTER_SITES =		https://www.openwall.com/john/k/
+SITES =			https://www.openwall.com/john/k/

 LIB_DEPENDS =		security/nss

--- a/security/john/Makefile
+++ b/security/john/Makefile
@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB =		c

-MASTER_SITES =		${HOMEPAGE}/j/
+SITES =			${HOMEPAGE}/j/

 WRKSRC =		${WRKDIST}/src

--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@ -16,8 +16,7 @@ WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
 WANTLIB += Qt5Network Qt5Svg Qt5Widgets Qt5X11Extras X11 Xtst
 WANTLIB += argon2 botan-2 c m minizip qrencode readline z

-MASTER_SITES =	\
-	https://github.com/keepassxreboot/keepassxc/releases/download/${V}/
+SITES =	https://github.com/keepassxreboot/keepassxc/releases/download/${V}/
 EXTRACT_SUFX =	-src.tar.xz

 MODULES =	x11/qt5 \
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@ -17,7 +17,7 @@ HOMEPAGE =	https://keybase.io
 # BSD
 PERMIT_PACKAGE =	Yes

-MASTER_SITES =	https://github.com/keybase/client/releases/download/${V}/
+SITES =		https://github.com/keybase/client/releases/download/${V}/

 RUN_DEPENDS =	security/gnupg>=2.2.23p1

--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@ -8,7 +8,7 @@ HOMEPAGE=		https://www.funtoo.org/Keychain
 # GPLv2
 PERMIT_PACKAGE=	Yes

-MASTER_SITES=		http://www.funtoo.org/archive/keychain/
+SITES=			http://www.funtoo.org/archive/keychain/
 EXTRACT_SUFX=		.tar.bz2

 NO_BUILD=		Yes
--- a/security/keycloak/Makefile
+++ b/security/keycloak/Makefile
@ -5,7 +5,7 @@ CATEGORIES =	security
 VERSION =	22.0.1
 DISTNAME =	keycloak-${VERSION}

-MASTER_SITES =	https://github.com/keycloak/keycloak/releases/download/${VERSION}/
+SITES =	https://github.com/keycloak/keycloak/releases/download/${VERSION}/

 MAINTAINER =	Aisha Tammy <aisha@openbsd.org>

--- a/security/keyringer/Makefile
+++ b/security/keyringer/Makefile
@ -11,7 +11,7 @@ MAINTAINER =	Gregoire Jadi <gjadi@omecha.info>
 # GPLv3+
 PERMIT_PACKAGE =	Yes

-MASTER_SITES =		https://keyringer.pw/releases/
+SITES =			https://keyringer.pw/releases/
 EXTRACT_SUFX =		.tar.bz2

 RUN_DEPENDS =		devel/git \
--- a/security/kpcli/Makefile
+++ b/security/kpcli/Makefile
@ -9,7 +9,7 @@ HOMEPAGE =	https://kpcli.sourceforge.io/
 # Perl
 PERMIT_PACKAGE =	Yes

-MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=kpcli/}
+SITES =		${SITE_SOURCEFORGE:=kpcli/}

 MODULES =	perl
 NO_BUILD =	Yes
--- a/security/lastpass-cli/Makefile
+++ b/security/lastpass-cli/Makefile
@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB =	c crypto curl kvm ssl xml2

-MASTER_SITES =	${HOMEPAGE}/releases/download/v${V}/
+SITES =		${HOMEPAGE}/releases/download/v${V}/

 MODULES =	devel/cmake

--- a/security/libassuan/Makefile
+++ b/security/libassuan/Makefile
@ -13,7 +13,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += gpg-error iconv intl

-MASTER_SITES=		${MASTER_SITE_GNUPG:=libassuan/}
+SITES=			${SITE_GNUPG:=libassuan/}
 EXTRACT_SUFX=		.tar.bz2

 LIB_DEPENDS=		security/libgpg-error
--- a/security/libb2/Makefile
+++ b/security/libb2/Makefile
@ -15,7 +15,7 @@ MAINTAINER =	Bjorn Ketelaars <bket@openbsd.org>
 # CC0
 PERMIT_PACKAGE =	Yes

-MASTER_SITES =	https://github.com/BLAKE2/libb2/releases/download/v${V}/
+SITES =		https://github.com/BLAKE2/libb2/releases/download/v${V}/

 SEPARATE_BUILD =	Yes

--- a/security/libbde/Makefile
+++ b/security/libbde/Makefile
@ -11,7 +11,7 @@ CATEGORIES =		security

 HOMEPAGE =		https://github.com/libyal/libbde/

-MASTER_SITES =		https://github.com/libyal/libbde/releases/download/${VERSION}/
+SITES =		https://github.com/libyal/libbde/releases/download/${VERSION}/

 MAINTAINER =		Remi Pointel <rpointel@openbsd.org>

--- a/security/libewf/Makefile
+++ b/security/libewf/Makefile
@ -20,7 +20,7 @@ WANTLIB =  ${MODPY_WANTLIB}
 WANTLIB += bfio bz2 c crypto fuse iconv intl m pthread smdev smraw util
 WANTLIB += z

-MASTER_SITES =		https://github.com/libyal/libewf-legacy/releases/download/${VERSION}/
+SITES =	https://github.com/libyal/libewf-legacy/releases/download/${VERSION}/

 MODULES =		lang/python

--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@ -9,7 +9,7 @@ CATEGORIES=    		security
 SHARED_LIBS += fprint                    2.0 # 0.0.0

 HOMEPAGE=		https://fprint.freedesktop.org/
-MASTER_SITES=		https://gitlab.freedesktop.org/libfprint/libfprint/uploads/4272fab4f37516db5b20d07bb576a4b1/
+SITES=			https://gitlab.freedesktop.org/libfprint/libfprint/uploads/4272fab4f37516db5b20d07bb576a4b1/
 EXTRACT_SUFX=		.tar.xz

 MAINTAINER=		Robert Nagy <robert@openbsd.org>
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@ -21,7 +21,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += c gpg-error iconv intl

-MASTER_SITES=		${MASTER_SITE_GNUPG:=libgcrypt/}
+SITES=			${SITE_GNUPG:=libgcrypt/}

 LIB_DEPENDS=		security/libgpg-error

--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@ -15,7 +15,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += c iconv intl

-MASTER_SITES=		${MASTER_SITE_GNUPG:=libgpg-error/}
+SITES=			${SITE_GNUPG:=libgpg-error/}

 USE_GMAKE=		Yes

--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@ -15,7 +15,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += bz2 m mcrypt mhash z

-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gringotts.berlios/}
+SITES=		${SITE_SOURCEFORGE:=gringotts.berlios/}

 LIB_DEPENDS=	security/libmcrypt \
 		archivers/bzip2 \
--- a/security/libgsasl/Makefile
+++ b/security/libgsasl/Makefile
@ -4,7 +4,7 @@ REVISION=	0
 DISTNAME=	libgsasl-1.8.1
 CATEGORIES=	security
 HOMEPAGE=	https://www.gnu.org/software/gsasl/
-MASTER_SITES=	${MASTER_SITE_GNU:=gsasl/}
+SITES=		${SITE_GNU:=gsasl/}

 SHARED_LIBS +=  gsasl 0.0 # 14.6

--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@ -4,7 +4,7 @@ SHARED_LIBS +=	ident                     0.0 # 0.0

 DISTNAME=	libident-0.32
 CATEGORIES=	security devel net
-MASTER_SITES=	https://www.remlab.net/files/libident/
+SITES=		https://www.remlab.net/files/libident/
 REVISION=	2

 HOMEPAGE=	https://www.remlab.net/libident/
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@ -5,7 +5,7 @@ CATEGORIES = 	security

 SHARED_LIBS = 	ksba 2.0	# 22.4

-MASTER_SITES =	${MASTER_SITE_GNUPG:=libksba/}
+SITES =		${SITE_GNUPG:=libksba/}

 HOMEPAGE = 	https://www.gnupg.org/software/libksba/index.html

--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@ -14,7 +14,7 @@ MAINTAINER =		Benoit Lecocq <benoit@openbsd.org>
 # LGPLv2.1
 PERMIT_PACKAGE =	Yes

-MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=mcrypt/}
+SITES =			${SITE_SOURCEFORGE:=mcrypt/}

 CONFIGURE_STYLE = 	gnu
 CONFIGURE_ARGS +=	--enable-static
--- a/security/libmodsecurity/Makefile
+++ b/security/libmodsecurity/Makefile
@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB =		${COMPILER_LIBCXX} c crypto curl iconv lzma m ssl z \
 			maxminddb nghttp2 pcre xml2 yajl

-MASTER_SITES =		https://github.com/SpiderLabs/ModSecurity/releases/download/v${VERSION}/
+SITES =	https://github.com/SpiderLabs/ModSecurity/releases/download/v${VERSION}/

 COMPILER =		base-clang ports-gcc

--- a/security/libnettle/Makefile
+++ b/security/libnettle/Makefile
@ -17,7 +17,7 @@ PERMIT_PACKAGE=		Yes

 WANTLIB += c gmp

-MASTER_SITES=		${MASTER_SITE_GNU:=nettle/}
+SITES=			${SITE_GNU:=nettle/}

 LIB_DEPENDS=		devel/gmp

--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@ -8,7 +8,7 @@ SHARED_LIBS +=  otr                  4.1      # 6.0

 HOMEPAGE=	https://otr.cypherpunks.ca/

-MASTER_SITES=	${HOMEPAGE}
+SITES=		${HOMEPAGE}

 MAINTAINER =	Pascal Stumpf <pascal@stumpf.co>

--- a/security/libsodium/Makefile
+++ b/security/libsodium/Makefile
@ -13,7 +13,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += pthread

-MASTER_SITES=	https://download.libsodium.org/libsodium/releases/ \
+SITES=		https://download.libsodium.org/libsodium/releases/ \
 		https://download.libsodium.org/libsodium/releases/old/

 SEPARATE_BUILD=	Yes
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@ -7,7 +7,7 @@ SHARED_LIBS +=		ssh		4.2 # 4.8
 CATEGORIES =		security devel

 HOMEPAGE =		https://www.libssh.org/
-MASTER_SITES =		https://www.libssh.org/files/${V:R}/
+SITES =			https://www.libssh.org/files/${V:R}/
 EXTRACT_SUFX =		.tar.xz

 # LGPL v2.1
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB =		crypto ssl z

-MASTER_SITES =		https://www.libssh2.org/download/
+SITES =			https://www.libssh2.org/download/

 CONFIGURE_STYLE =	gnu

--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@ -14,7 +14,7 @@ PERMIT_PACKAGE=		Yes

 WANTLIB += c

-MASTER_SITES=		${MASTER_SITE_GNU:=libtasn1/}
+SITES=			${SITE_GNU:=libtasn1/}

 CONFIGURE_STYLE=	gnu

--- a/security/logsentry/Makefile
+++ b/security/logsentry/Makefile
@ -9,7 +9,7 @@ CATEGORIES=	security
 PERMIT_PACKAGE=	Yes
 WANTLIB=		c

-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sentrytools/}
+SITES=		${SITE_SOURCEFORGE:=sentrytools/}

 NO_TEST=	Yes

--- a/security/lynis/Makefile
+++ b/security/lynis/Makefile
@ -11,7 +11,7 @@ MAINTAINER=	Purple Rain <purplerain@secbsd.org>
 # GPLv3
 PERMIT_PACKAGE=	Yes

-MASTER_SITES=	https://downloads.cisofy.com/lynis/
+SITES=		https://downloads.cisofy.com/lynis/

 NO_BUILD=	Yes
 NO_TEST=	Yes
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB =		c iconv intl ltdl mcrypt mhash z

-MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=mcrypt/}
+SITES =			${SITE_SOURCEFORGE:=mcrypt/}

 USE_GMAKE =		Yes
 LIB_DEPENDS =		security/libmcrypt \
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@ -7,7 +7,7 @@ MODGNU_SHARED_LIBS=mhash ''
 LIBmhash_ALIAS=	realmhash
 REVISION=	1

-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mhash/}
+SITES=		${SITE_SOURCEFORGE:=mhash/}

 HOMEPAGE=	http://mhash.sourceforge.net/

--- a/security/netpgp/Makefile
+++ b/security/netpgp/Makefile
@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes

 WANTLIB +=		bz2 c crypto z

-MASTER_SITES =		http://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/ \
+SITES =		http://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/ \
 		ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/

 LIB_DEPENDS =		archivers/bzip2
--- a/security/nfsshell/Makefile
+++ b/security/nfsshell/Makefile
@ -7,7 +7,7 @@ CATEGORIES=	security

 WRKDIST=	${WRKDIR}/nfs

-MASTER_SITES=	ftp://ftp.cs.vu.nl/pub/leendert/
+SITES=		ftp://ftp.cs.vu.nl/pub/leendert/

 PERMIT_PACKAGE=	Yes

--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@ -18,7 +18,7 @@ HOMEPAGE=		https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 PERMIT_PACKAGE=	Yes

 #for regular releases
-MASTER_SITES=		https://ftp.mozilla.org/pub/security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src/
+SITES=			https://ftp.mozilla.org/pub/security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src/

 LIB_DEPENDS=		databases/sqlite3 \
 			devel/nspr>=${NSPR_VERSION}
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@ -12,7 +12,7 @@ SHARED_LIBS +=  pskc                      0.1 # 0.1
 CATEGORIES=	security devel

 HOMEPAGE=	http://www.nongnu.org/oath-toolkit/
-MASTER_SITES=	${MASTER_SITE_SAVANNAH:=oath-toolkit/}
+SITES=		${SITE_SAVANNAH:=oath-toolkit/}

 # libraries: LGPLv2.1+, tools: GPLv3+
 PERMIT_PACKAGE=	 Yes
--- a/Show more
+++ b/Show more