diff --git a/databases/usql/Makefile b/databases/usql/Makefile
index 15d6f8c0ee89..a9c9e6227ab2 100644
--- a/databases/usql/Makefile
+++ b/databases/usql/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	usql
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.19.12
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Universal command-line interface for SQL databases
 WWW=		https://github.com/xo/usql
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libresvg.so:graphics/resvg-capi
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/xo/usql
 
 PLIST_FILES=	bin/usql
 
 .include <bsd.port.mk>
diff --git a/devel/athens/Makefile b/devel/athens/Makefile
index 2f6c74225b0a..39f2fde02371 100644
--- a/devel/athens/Makefile
+++ b/devel/athens/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	athens
 DISTVERSION=	0.15.4
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Proxy server for the Go Modules download API
 WWW=		https://github.com/gomods/athens
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 BUILD_DATE=	2024-11-04-00:00:00-UTC
 
 GO_MODULE=	github.com/gomods/${PORTNAME}
 GO_TARGET=	./cmd/proxy
 GO_BUILDFLAGS=	-ldflags " \
 		-X github.com/gomods/${PORTNAME}/pkg/build.version=${DISTVERSION} \
 		-X github.com/gomods/${PORTNAME}/pkg/build.buildDate=${BUILD_DATE}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/proxy ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/cirrus-cli/Makefile b/devel/cirrus-cli/Makefile
index a654edfe309c..9002410b21f9 100644
--- a/devel/cirrus-cli/Makefile
+++ b/devel/cirrus-cli/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	cirrus-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.129.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Command line interface for Cirrus CI
 WWW=		https://github.com/cirruslabs/cirrus-cli
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MODULE=	github.com/cirruslabs/cirrus-cli
 GO_TARGET=	./cmd/cirrus
 GO_BUILDFLAGS=	-ldflags="-X github.com/cirruslabs/cirrus-cli/internal/version.Version=${DISTVERSION}"
 
 SUB_FILES=	pkg-message
 
 USERS=		cirrus
 GROUPS=		cirrus
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/cirrus-worker.yml ${STAGEDIR}${PREFIX}/etc/cirrus-worker.yml.sample
 
 .if defined(MAINTAINER_MODE)
 GO_ENV+=	GOTOOLCHAIN=go1.22.6
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index 1ad2be859e70..21f403e31173 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	gitlab-runner
 DISTVERSIONPREFIX=	v
 DISTVERSION=	17.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
 		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm
 DISTFILES=	prebuilt-x86_64.tar.xz:dockerx64 \
 		prebuilt-arm.tar.xz:dockerarm
 
 #PATCH_SITES=	https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/
 #PATCHFILES+=	4551.patch:-p1 # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4551, Allow FreeBSD to be used with Docker builds
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Official GitLab Runner written in Go
 WWW=		https://gitlab.com/gitlab-org/gitlab-runner
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	go-bindata:devel/go-bindata
 RUN_DEPENDS=	bash:shells/bash \
 		ca_root_nss>=0:security/ca_root_nss \
 		git:devel/git
 
 USES=		go:modules,1.22
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 USE_RC_SUBR=	gitlab_runner
 
 GITBRANCH=	17-5-stable
 GO_MODULE=	gitlab.com/gitlab-org/gitlab-runner
 
 _BUILD_DATE=	$$(date -u +%Y-%m-%dT%H:%M:%S%z)
 GO_BUILDFLAGS= -ldflags=" \
 		-X gitlab.com/gitlab-org/gitlab-runner/commands.ROOTCONFIGDIR=${ETCDIR} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=${PORTVERSION} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.REVISION=${DISTVERSION} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.BUILT=${_BUILD_DATE} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.BRANCH=${GITBRANCH} \
 		-s -w"
 
 # for go dependencies
 # Gitlab hosts there dependencies on their own platform and not on go-proxy
 # so we download the required go.mod file from gitlab
 # lines are taken from go.mk
 # ---------------------------
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-runner/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//:Nprebuilt*:}
 # ---------------------------
 
 USERS=		gitlab-runner
 GROUPS=		gitlab-runner
 
 PLIST_FILES=	bin/gitlab-runner
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/
 
 pre-build:
 	@cd ${WRKSRC} && go-bindata \
 		-pkg docker \
 		-nocompress \
 		-nomemcopy \
 		-nometadata \
 		-prefix out/docker/ \
 		-o executors/docker/bindata.go \
 		out/docker/prebuilt-x86_64.tar.xz \
 		out/docker/prebuilt-arm.tar.xz
 
 .include <bsd.port.mk>
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 809fcfd77137..22a3855ad5d0 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	gitlab-shell
 PORTVERSION=	14.39.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	GitLab Shell handles git commands for GitLab
 WWW=		https://gitlab.com/gitlab-org/gitlab-shell
 
 LICENSE=	MIT
 
 # GSSAPI support can maybe be removed by disable CGO:
 # https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/720
 #BUILD_DEPENDS=	heimdal>=0:security/heimdal
 
 USES=		gmake go:modules,no_targets,1.22 pkgconfig
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GO_MOD_DIST=	gitlab
 GO_MODULE=	gitlab.com/gitlab-org/gitlab-shell/v14
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
 MAKE_ENV+=	${GO_ENV}
 ALL_TARGET=	build
 
 USERS=		git
 GROUPS=		git
 
 VARLOGDIR=	/var/log/gitlab-shell
 
 PLIST_FILES+=	"@dir(git,,755) ${VARLOGDIR}"
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.yml.example
 	${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample
 	${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml
 	${REINPLACE_CMD} -e 's|VERSION_STRING :=.*|VERSION_STRING := v${PORTVERSION}|g' ${WRKSRC}/Makefile
 
 pre-install:
 	${RM} -rf ${WRKSRC}/config.yml
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	(cd ${WRKSRC}/bin/ && ${COPYTREE_BIN} .  ${STAGEDIR}${DATADIR}/bin)
 .for x in CHANGELOG LICENSE README.md VERSION config.yml.sample
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DATADIR}/
 .endfor
 .for x in support
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${x}
 	(cd ${WRKSRC}/${x} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${x})
 .endfor
 	@${MKDIR} ${STAGEDIR}${VARLOGDIR}
 
 post-install:
 	${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index 69eca46486f9..f057797d88bd 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.26.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	go-
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Go Tools
 WWW=		https://godoc.org/golang.org/x/tools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.22
 GO_MODULE=	golang.org/x/tools
 GO_TARGET=	./cmd/auth/cookieauth \
 		./cmd/auth/gitauth \
 		./cmd/auth/netrcauth \
 		./cmd/bisect \
 		./cmd/bundle \
 		./cmd/callgraph \
 		./cmd/compilebench \
 		./cmd/deadcode \
 		./cmd/digraph \
 		./cmd/eg \
 		./cmd/file2fuzz \
 		./cmd/fiximports \
 		./cmd/go-contrib-init \
 		./cmd/godex \
 		./cmd/godoc \
 		./cmd/goimports \
 		./cmd/gomvpkg \
 		./cmd/gonew \
 		./cmd/gotype \
 		./cmd/goyacc \
 		./cmd/html2article \
 		./cmd/present \
 		./cmd/present2md \
 		./cmd/signature-fuzzer/fuzz-driver \
 		./cmd/signature-fuzzer/fuzz-runner \
 		./cmd/splitdwarf \
 		./cmd/ssadump \
 		./cmd/stress \
 		./cmd/stringer \
 		./cmd/toolstash
 
 CONFLICTS_INSTALL=	easygit rubygem-bundler
 
 PLIST_FILES=	${GO_TARGET:T:S,^,bin/,}
 
 OPTIONS_DEFINE=	RARE
 RARE_DESC=	install rarely used tools
 RARE_VARS=	GO_TARGET+=" \
 		./cmd/auth/authtest \
 		./cmd/benchcmp
 
 .include <bsd.port.mk>
diff --git a/devel/gomigrate/Makefile b/devel/gomigrate/Makefile
index 70715e837da6..2bfc841d8f2c 100644
--- a/devel/gomigrate/Makefile
+++ b/devel/gomigrate/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	migrate
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.18.1
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	go
 
 MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	CLI for performing database migrations
 WWW=		https://github.com/golang-migrate/migrate
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 CONFLICTS_INSTALL=	migrate
 
 GO_MODULE=	github.com/golang-migrate/migrate/v4
 GO_TARGET=	./cmd/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/lazygit/Makefile b/devel/lazygit/Makefile
index 34ed905fe0ec..4e3973a82f9a 100644
--- a/devel/lazygit/Makefile
+++ b/devel/lazygit/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	lazygit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.44.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Simple terminal UI for git commands
 WWW=		https://github.com/jesseduffield/lazygit
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/jesseduffield/lazygit
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/lefthook/Makefile b/devel/lefthook/Makefile
index d9ce0970a64e..1d12e2322a1a 100644
--- a/devel/lefthook/Makefile
+++ b/devel/lefthook/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	lefthook
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast and powerful Git hooks manager for any type of projects
 WWW=		https://github.com/evilmartians/lefthook
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/evilmartians/lefthook
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/task/Makefile b/devel/task/Makefile
index bf6dc2bb74c5..a93dd4e21a0c 100644
--- a/devel/task/Makefile
+++ b/devel/task/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	task
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.39.2
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Task runner / simpler Make alternative written in Go
 WWW=		https://taskfile.dev/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	go-task
 GH_TUPLE=	\
 		Ladicle:tabwriter:v1.0.0:ladicle_tabwriter/vendor/github.com/Ladicle/tabwriter \
 		Masterminds:semver:v3.3.0:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
 		alecthomas:chroma:v2.14.0:alecthomas_chroma_v2/vendor/github.com/alecthomas/chroma/v2 \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dlclark:regexp2:v1.11.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
 		dominikbraun:graph:v0.23.0:dominikbraun_graph/vendor/github.com/dominikbraun/graph \
 		fatih:color:v1.17.0:fatih_color/vendor/github.com/fatih/color \
 		go-check:check:788fd7840127:go_check_check/vendor/gopkg.in/check.v1 \
 		go-task:slim-sprig:v3.0.0:go_task_slim_sprig_v3/vendor/github.com/go-task/slim-sprig/v3 \
 		go-task:template:v0.1.0:go_task_template/vendor/github.com/go-task/template \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
 		golang:sync:v0.8.0:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:v0.25.0:golang_sys/vendor/golang.org/x/sys \
 		golang:term:v0.24.0:golang_term/vendor/golang.org/x/term \
 		joho:godotenv:v1.5.1:joho_godotenv/vendor/github.com/joho/godotenv \
 		klauspost:cpuid:v2.0.9:klauspost_cpuid_v2/vendor/github.com/klauspost/cpuid/v2 \
 		mattn:go-colorable:v0.1.13:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-zglob:v0.0.6:mattn_go_zglob/vendor/github.com/mattn/go-zglob \
 		mitchellh:hashstructure:v2.0.2:mitchellh_hashstructure_v2/vendor/github.com/mitchellh/hashstructure/v2 \
 		muesli:cancelreader:v0.2.2:muesli_cancelreader/vendor/github.com/muesli/cancelreader \
 		mvdan:sh:v3.9.0:mvdan_sh/vendor/mvdan.cc/sh/v3 \
 		otiai10:copy:v1.14.0:otiai10_copy/vendor/github.com/otiai10/copy \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		radovskyb:watcher:v1.0.7:radovskyb_watcher/vendor/github.com/radovskyb/watcher \
 		sajari:fuzzy:v1.0.0:sajari_fuzzy/vendor/github.com/sajari/fuzzy \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		stretchr:objx:v0.5.2:stretchr_objx/vendor/github.com/stretchr/objx \
 		stretchr:testify:v1.9.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		zeebo:xxh3:v1.0.2:zeebo_xxh3/vendor/github.com/zeebo/xxh3
 
 GO_TARGET=	./cmd/task
 
 PLIST_FILES=	bin/task
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/treefmt/Makefile b/devel/treefmt/Makefile
index 476fa5ee12eb..6160c14479cf 100644
--- a/devel/treefmt/Makefile
+++ b/devel/treefmt/Makefile
@@ -1,68 +1,69 @@
 PORTNAME=	treefmt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	One CLI to format the code tree
 WWW=		https://treefmt.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	numtide
 GH_TUPLE=	\
 		BurntSushi:toml:v1.4.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		Microsoft:go-winio:v0.6.2:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
 		ProtonMail:go-crypto:v1.0.0:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \
 		adrg:xdg:v0.5.0:adrg_xdg/vendor/github.com/adrg/xdg \
 		alecthomas:kong:v0.9.0:alecthomas_kong/vendor/github.com/alecthomas/kong \
 		aymanbagabas:go-osc52:v2.0.1:aymanbagabas_go_osc52_v2/vendor/github.com/aymanbagabas/go-osc52/v2 \
 		charmbracelet:lipgloss:v0.10.0:charmbracelet_lipgloss/vendor/github.com/charmbracelet/lipgloss \
 		charmbracelet:log:v0.4.0:charmbracelet_log/vendor/github.com/charmbracelet/log \
 		cloudflare:circl:v1.3.8:cloudflare_circl/vendor/github.com/cloudflare/circl \
 		cyphar:filepath-securejoin:v0.2.5:cyphar_filepath_securejoin/vendor/github.com/cyphar/filepath-securejoin \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		emirpasic:gods:v1.18.1:emirpasic_gods/vendor/github.com/emirpasic/gods \
 		etcd-io:bbolt:v1.3.11:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
 		go-git:gcfg:3a3c6141e376:go_git_gcfg/vendor/github.com/go-git/gcfg \
 		go-git:go-billy:9b484184bdcc:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \
 		go-git:go-git:6d583524d3e1:go_git_go_git_v5/vendor/github.com/go-git/go-git/v5 \
 		go-logfmt:logfmt:v0.6.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \
 		go-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
 		gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
 		golang:crypto:v0.26.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:exp:8a7402abbf56:golang_exp/vendor/golang.org/x/exp \
 		golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
 		golang:net:v0.28.0:golang_net/vendor/golang.org/x/net \
 		golang:sync:v0.8.0:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:v0.24.0:golang_sys/vendor/golang.org/x/sys \
 		imdario:mergo:v1.0.0:imdario_mergo/vendor/dario.cat/mergo \
 		jbenet:go-context:d14ea06fba99:jbenet_go_context/vendor/github.com/jbenet/go-context \
 		kevinburke:ssh_config:v1.2.0:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \
 		lucasb-eyer:go-colorful:v1.2.0:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
 		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-runewidth:v0.0.15:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		muesli:reflow:v0.3.0:muesli_reflow/vendor/github.com/muesli/reflow \
 		muesli:termenv:v0.15.2:muesli_termenv/vendor/github.com/muesli/termenv \
 		otiai10:copy:v1.14.0:otiai10_copy/vendor/github.com/otiai10/copy \
 		pjbgf:sha1cd:v0.3.0:pjbgf_sha1cd/vendor/github.com/pjbgf/sha1cd \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		rivo:uniseg:v0.4.7:rivo_uniseg/vendor/github.com/rivo/uniseg \
 		sergi:go-diff:5b0b94c5c0d3:sergi_go_diff/vendor/github.com/sergi/go-diff \
 		skeema:knownhosts:v1.3.0:skeema_knownhosts/vendor/github.com/skeema/knownhosts \
 		stretchr:testify:v1.9.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		vmihailenco:msgpack:v5.4.1:vmihailenco_msgpack_v5/vendor/github.com/vmihailenco/msgpack/v5 \
 		vmihailenco:tagparser:v2.0.0:vmihailenco_tagparser_v2/vendor/github.com/vmihailenco/tagparser/v2 \
 		xanzy:ssh-agent:v0.3.3:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent
 
 PLIST_FILES=	bin/${PORTNAME}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/editors/orbiton/Makefile b/editors/orbiton/Makefile
index 8affdd814566..335504f5bc56 100644
--- a/editors/orbiton/Makefile
+++ b/editors/orbiton/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	orbiton
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.65.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Small, fast and limited text editor in Go
 WWW=		https://orbiton.zip/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/xyproto/orbiton/v2
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/ftp/sftpgo/Makefile b/ftp/sftpgo/Makefile
index 2784051397e6..a373bedc0e48 100644
--- a/ftp/sftpgo/Makefile
+++ b/ftp/sftpgo/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	sftpgo
 PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp www
 MASTER_SITES=	https://github.com/drakkan/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}_src_with_deps
 
 MAINTAINER=	skozlov@FreeBSD.org
 COMMENT=	Fully featured and highly configurable SFTP, FTP/S, and WebDAV server
 WWW=		https://github.com/drakkan/sftpgo
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules tar:xz
 USE_RC_SUBR=	${PORTNAME}
 
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=		BASH FISH ZSH MANPAGES
 OPTIONS_DEFAULT=	BASH FISH ZSH MANPAGES
 OPTIONS_SUB=		yes
 
 USERS=		sftpgo
 GROUPS=		sftpgo
 
 post-patch:
 	${REINPLACE_CMD} -e 's|"templates"|"${DATADIR}/templates"|; \
 		s|"static"|"${DATADIR}/static"|; \
 		s|"sftpgo.db"|"/var/db/${PORTNAME}/${PORTNAME}.db"|' \
 		${WRKSRC}/${PORTNAME}.json
 
 post-build-BASH-on:
 	${GO_WRKDIR_BIN}/${PORTNAME} gen completion bash > ${WRKDIR}/bash_completions
 
 post-build-FISH-on:
 	${GO_WRKDIR_BIN}/${PORTNAME} gen completion fish > ${WRKDIR}/fish_completions
 
 post-build-ZSH-on:
 	${GO_WRKDIR_BIN}/${PORTNAME} gen completion zsh > ${WRKDIR}/zsh_completions
 
 post-build-MANPAGES-on:
 	${MKDIR} ${WRKDIR}/manpages
 	${GO_WRKDIR_BIN}/${PORTNAME} gen man --dir ${WRKDIR}/manpages
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && \
 		${COPYTREE_SHARE} templates ${STAGEDIR}${DATADIR} && \
 		${COPYTREE_SHARE} static ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.json ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.json.sample
 
 post-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKDIR}/bash_completions ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
 
 post-install-FISH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
 	${INSTALL_DATA} ${WRKDIR}/fish_completions ${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish
 
 post-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKDIR}/zsh_completions ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
 
 post-install-MANPAGES-on:
 	${FIND} ${WRKDIR}/manpages -type f -execdir ${INSTALL_MAN} {} ${STAGEDIR}${PREFIX}/share/man/man1 \;
 
 .include <bsd.port.mk>
diff --git a/ftp/wush/Makefile b/ftp/wush/Makefile
index 154b209100ae..ab9dff187c6c 100644
--- a/ftp/wush/Makefile
+++ b/ftp/wush/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	wush
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	ftp
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Command-line file transfer tool over wireguard
 WWW=		https://github.com/coder/wush
 
 LICENSE=	CC0-1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/coder/wush
 GO_TARGET=	./cmd/wush
 PLIST_FILES=	bin/wush
 
 .include <bsd.port.mk>
diff --git a/irc/ergo/Makefile b/irc/ergo/Makefile
index 706205e74017..52f9185d8530 100644
--- a/irc/ergo/Makefile
+++ b/irc/ergo/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	ergo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.14.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 PKGNAMESUFFIX=	-irc-server
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modern IRC server (daemon/ircd) written in Go
 WWW=		https://ergo.chat/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ergochat
 GH_TUPLE=	golang:sys:v0.6.0:sys
 
 CONFLICTS_INSTALL=	ergo
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 pre-patch:
 	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
 	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
 
 .include <bsd.port.mk>
diff --git a/lang/gptscript/Makefile b/lang/gptscript/Makefile
index 2594b2f9f6c6..510b0d7d3e15 100644
--- a/lang/gptscript/Makefile
+++ b/lang/gptscript/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	gptscript
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	lang
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Natural Programming Language
 WWW=		https://gptscript.ai/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.22
 
 GO_MODULE=	github.com/gptscript-ai/gptscript
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	${REINPLACE_CMD} -e 's/0.0.0-dev/${PORTVERSION}/1' \
 		${WRKSRC}/pkg/version/version.go
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/misc/gollama/Makefile b/misc/gollama/Makefile
index 5653a8ba912b..a2f1f9bd5cd1 100644
--- a/misc/gollama/Makefile
+++ b/misc/gollama/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	gollama
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.27.15
+PORTREVISION=	1
 CATEGORIES=	misc # machine learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Go manage your Ollama models
 WWW=		https://github.com/sammcj/gollama
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/sammcj/gollama
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/misc/ls-lint/Makefile b/misc/ls-lint/Makefile
index 0b199ac73f15..fbd047117c73 100644
--- a/misc/ls-lint/Makefile
+++ b/misc/ls-lint/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	ls-lint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Directory and filename linter
 WWW=		https://ls-lint.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/loeffel-io/ls-lint/v2
 GO_TARGET=	./cmd/ls_lint
 
 PLIST_FILES=	bin/ls_lint
 
 .include <bsd.port.mk>
diff --git a/misc/ollama/Makefile b/misc/ollama/Makefile
index 724bc72feceb..50f3b0e6b95b 100644
--- a/misc/ollama/Makefile
+++ b/misc/ollama/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	ollama
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Run Llama 2, Mistral, and other large language models
 WWW=		https://ollama.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	bundled patched llama-cpp is placed into the arch-specific path
 
 BUILD_DEPENDS=	bash:shells/bash \
 		cmake:devel/cmake-core \
 		glslc:graphics/shaderc \
 		vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
 USES=		go:1.22,modules pkgconfig
 
 CONFLICTS_BUILD=	llama-cpp
 
 GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}
 GO_TARGET=	.
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	ggerganov:llama.cpp:1e6f6554aa11fa10160a5fda689e736c3c34169f:llama_cpp/llm/llama.cpp \
 		blabber:go-freebsd-sysctl:503969f:go_sysctl/vendor.x/github.com/blabber/go-freebsd-sysctl
 
 MAKE_ENV=	PATH=${PATH}:${WRKSRC}/llm/build/bsd/x86_64_static/bin # workaround to find vulkan-shaders-gen
 
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/ollama-limit-gpu-layers
 
 post-patch: # workaround for https://github.com/ollama/ollama/issues/6259 (use of extenral libllama.so)
 	@${REINPLACE_CMD} \
 		-e '\
 			s| llama | llama ${LOCALBASE}/lib/libvulkan.so omp pthread |; \
 			s| llama | ${WRKSRC}/llm/build/bsd/x86_64_static/src/libllama.a |; \
 			s| ggml | ${WRKSRC}/llm/build/bsd/x86_64_static/ggml/src/libggml.a |; \
 		' \
 		${WRKSRC}/llm/ext_server/CMakeLists.txt
 	# move vendor.x to vendor
 	@(cd ${WRKSRC}/vendor.x && ${TAR} cf - .) | (cd ${WRKSRC}/vendor && ${TAR} xf -)
 
 pre-build:
 	@${CP} ${WRKSRC}/app/store/store_linux.go ${WRKSRC}/app/store/store_bsd.go
 	@cd ${GO_WRKSRC} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} generate ${GO_BUILDFLAGS} \
 			./...
 
 post-install: # pending https://github.com/ollama/ollama/issues/6407
 	${INSTALL_SCRIPT} ${FILESDIR}/ollama-limit-gpu-layers ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/misc/py-wandb/Makefile b/misc/py-wandb/Makefile
index 62e1e556d89b..fce2c07a74d3 100644
--- a/misc/py-wandb/Makefile
+++ b/misc/py-wandb/Makefile
@@ -1,61 +1,62 @@
 PORTNAME=	wandb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.9
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	CLI and library for interacting with the Weights and Biases API
 WWW=		https://wandb.ai/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	compilation fails: Go fails: cannot use math.MaxInt64 (untyped int constant 9223372036854775807) as int value in argument to strconv.Itoa (overflows)
 BROKEN_i386=	compilation fails: Go fails: cannot use math.MaxInt64 (untyped int constant 9223372036854775807) as int value in argument to strconv.Itoa (overflows)
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		go122:lang/go122
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.3:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docker-pycreds>=0.4.0:security/py-docker-pycreds@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=1.0.0:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathtools>0:devel/py-pathtools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>0:devel/py-platformdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.19.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.0.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0,<3:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sentry-sdk>=1.0.0:devel/py-sentry-sdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>0:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bokeh>0:www/py-bokeh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbclient>0:devel/py-nbclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-flask>0:devel/py-pytest-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>=1.10.4:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	pep517 concurrent autoplist pytest # tests fail because some test dependencies are missing, see https://github.com/wandb/wandb/issues/7826
 USE_GITHUB=	yes
 
 SHEBANG_GLOB=	*.py
 
 BINARY_ALIAS=	go=go122
 
 .include <bsd.port.mk>
diff --git a/net-im/dissent/Makefile b/net-im/dissent/Makefile
index 35771cdbdc03..538f1342edd9 100644
--- a/net-im/dissent/Makefile
+++ b/net-im/dissent/Makefile
@@ -1,79 +1,80 @@
 PORTNAME=	dissent
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.30
+PORTREVISION=	1
 CATEGORIES=	net-im
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tiny native Discord app
 WWW=		https://github.com/diamondburned/dissent
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libgraphene-1.0.so:graphics/graphene \
 		libspelling-1.so:x11-toolkits/libspelling
 
 USES=		gnome go:1.22,modules pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk40 gtksourceview5 libadwaita
 GH_ACCOUNT=	diamondburned
 GH_TUPLE=	KarpelesLab:weak:v0.1.1:karpeleslab_weak/vendor/github.com/KarpelesLab/weak \
 		alecthomas:chroma:v0.10.0:alecthomas_chroma/vendor/github.com/alecthomas/chroma \
 		alessio:shellescape:v1.4.2:alessio_shellescape/vendor/github.com/alessio/shellescape \
 		danieljoos:wincred:v1.2.1:danieljoos_wincred/vendor/github.com/danieljoos/wincred \
 		diamondburned:adaptive:fa139be203a8:diamondburned_adaptive/vendor/github.com/diamondburned/adaptive \
 		diamondburned:arikawa:v3.4.0:diamondburned_arikawa_v3/vendor/github.com/diamondburned/arikawa/v3 \
 		diamondburned:chatkit:5788b19145bc:diamondburned_chatkit/vendor/github.com/diamondburned/chatkit \
 		diamondburned:ctxt:2db38a5d3c12:diamondburned_ctxt/vendor/libdb.so/ctxt \
 		diamondburned:go-emoji:39776eee41ac:diamondburned_go_emoji/vendor/libdb.so/go-emoji \
 		diamondburned:gotk4-adwaita:824c3ce8a5f4:diamondburned_gotk4_adwaita_pkg/vendor/github.com/diamondburned/gotk4-adwaita \
 		diamondburned:gotk4-sourceview:98263515a466:diamondburned_gotk4_sourceview/vendor/libdb.so/gotk4-sourceview \
 		diamondburned:gotk4-spelling:ee26db878626:diamondburned_gotk4_spelling/vendor/libdb.so/gotk4-spelling \
 		diamondburned:gotk4:v0.3.1:diamondburned_gotk4_pkg/vendor/github.com/diamondburned/gotk4 \
 		diamondburned:gotkit:aa2fb5bc486d:diamondburned_gotkit/vendor/github.com/diamondburned/gotkit \
 		diamondburned:ningen:f1a24c0da3d8:diamondburned_ningen_v3/vendor/github.com/diamondburned/ningen/v3 \
 		dlclark:regexp2:v1.11.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
 		dustin:go-humanize:v1.0.1:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		enescakir:emoji:v1.0.0:enescakir_emoji/vendor/github.com/enescakir/emoji \
 		go4org:go4:214862532bf5:go4org_go4/vendor/go4.org \
 		go4org:unsafe-assume-no-moving-gc:b99613f794b6:go4org_unsafe_assume_no_moving_gc/vendor/go4.org/unsafe/assume-no-moving-gc \
 		godbus:dbus:v5.1.0:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
 		gofrs:flock:v0.12.1:gofrs_flock/vendor/github.com/gofrs/flock \
 		golang:crypto:v0.25.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:sync:v0.7.0:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:v0.22.0:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.16.0:golang_text/vendor/golang.org/x/text \
 		golang:time:v0.6.0:golang_time/vendor/golang.org/x/time \
 		gorilla:schema:v1.4.1:gorilla_schema/vendor/github.com/gorilla/schema \
 		gorilla:websocket:v1.5.3:gorilla_websocket/vendor/github.com/gorilla/websocket \
 		ianlancetaylor:cgosymbolizer:581a3f7c677f:ianlancetaylor_cgosymbolizer/vendor/github.com/ianlancetaylor/cgosymbolizer \
 		leonelquinteros:gotext:v1.6.0:leonelquinteros_gotext/vendor/github.com/leonelquinteros/gotext \
 		lmittmann:tint:v1.0.4:lmittmann_tint/vendor/github.com/lmittmann/tint \
 		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		puzpuzpuz:xsync:v3.1.0:puzpuzpuz_xsync_v3/vendor/github.com/puzpuzpuz/xsync/v3 \
 		sahilm:fuzzy:v0.1.1:sahilm_fuzzy/vendor/github.com/sahilm/fuzzy \
 		twmb:murmur3:v1.1.8:twmb_murmur3/vendor/github.com/twmb/murmur3 \
 		yalue:merged_fs:v1.3.0:yalue_merged_fs/vendor/github.com/yalue/merged_fs \
 		yuin:goldmark:v1.7.1:yuin_goldmark/vendor/github.com/yuin/goldmark \
 		zalando:go-keyring:v0.2.4:zalando_go_keyring/vendor/github.com/zalando/go-keyring
 CGO_LDFLAGS+=	-Wl,--as-needed # gtk4 deps
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/so.libdb.dissent.desktop \
 		share/dbus-1/services/so.libdb.dissent.service \
 		share/icons/hicolor/scalable/apps/so.libdb.dissent.svg \
 		share/metainfo/so.libdb.dissent.metainfo.xml
 
 post-patch:
 	@${REINPLACE_CMD} 's,/usr/bin,${PREFIX}/bin,' ${WRKSRC}/nix/*.service
 
 post-install:
 # Install extras similar to Nix flake
 .for f in nix/*.desktop nix/*.service *.metainfo.xml \
 		internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}:H}
 	${INSTALL_DATA} ${WRKSRC}/${f} \
 		${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/frp/Makefile b/net/frp/Makefile
index bff4dbaac7b0..d7cd032ba604 100644
--- a/net/frp/Makefile
+++ b/net/frp/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	frp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.61.0
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Reverse proxy to expose local server behind NAT/firewall to Internet
 WWW=		https://github.com/fatedier/frp
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 USE_GITHUB=	nodefault
 GH_TUPLE=	golang:net:v0.8.0:net \
 		golang:sys:v0.6.0:sys \
 		golang:text:v0.8.0:text
 
 GO_MODULE=	github.com/fatedier/frp
 GO_TARGET=	./cmd/frpc ./cmd/frps
 
 SUB_LIST=	DAEMON_USER=${DAEMON_USER}
 USE_RC_SUBR=	${PORTNAME}s
 
 OPTIONS_RADIO=			DAEMON_USER # also see https://github.com/fatedier/frp/issues/3417
 OPTIONS_RADIO_DAEMON_USER=	ROOT NOBODY
 OPTIONS_DEFAULT=		ROOT # to allow frp to read certificates
 
 ROOT_VARS=	DAEMON_USER=root
 NOBODY_VARS=	DAEMON_USER=nobody
 
 DAEMON_USER_DESC=	Daemon user
 
 ROOT_DESC=	Run as root
 NOBODY_DESC=	Run as nobody
 
 pre-patch:
 .for m in net sys test
 	${RM} -r ${WRKSRC}/vendor/golang.org/x/$m
 	${LN} -s ${WRKDIR}/$m-* ${WRKSRC}/vendor/golang.org/x/$m
 .endfor
 
 post-install:
 .for f in frpc.toml frps.toml
 	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${STAGEDIR}${PREFIX}/etc/${f}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/gotify-cli/Makefile b/net/gotify-cli/Makefile
index cd0e7b7904be..be4af5fef100 100644
--- a/net/gotify-cli/Makefile
+++ b/net/gotify-cli/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	gotify
 PORTVERSION=	2.3.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-cli
 DISTNAME=	cli
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	CLI to send message to gotify server
 WWW=		https://github.com/gotify/cli
 
 LICENSE=	MIT
 
 USES=		go:modules,1.22
 GO_MODULE=	github.com/gotify/cli/v2
 
 _BUILD_DATE=	$$(date -u "+%Y-%m-%d-%H%M UTC")
 #GO_TARGET=     ./
 GO_BUILDFLAGS=	-buildmode=pie -modcacherw \
 		-ldflags=" \
 		-X 'main.Version=${PORTVERSION}' \
 		-X 'main.Commit=${GL_TAGNAME:C/^(........).*/\1/}' \
 		-X 'main.BuildDate=${_BUILD_DATE}'"
 
 PLIST_FILES=	bin/gotify
 
 .include <bsd.port.mk>
diff --git a/net/gotify-server/Makefile b/net/gotify-server/Makefile
index a300037b5f1f..2cf0629d390c 100644
--- a/net/gotify-server/Makefile
+++ b/net/gotify-server/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	gotify-server
 PORTVERSION=	2.5.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/mfechner/freebsd-net-gotify-server/raw/refs/heads/main/:yarn_cache
 DISTNAME=	server
 DISTFILES=	${PORTNAME}-yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Simple server for sending and receiving messages
 WWW=		https://github.com/gotify/server
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
 		
 USES=		go:modules,1.22 nodejs:build
 USE_RC_SUBR=	gotify_server
 GO_MODULE=	github.com/gotify/server/v2
 
 _BUILD_DATE=	$$(date -u "+%Y-%m-%d-%H%M UTC")
 #GO_TARGET=     ./
 GO_BUILDFLAGS=	-buildmode=pie -modcacherw \
 		-ldflags=" \
 		-X 'main.Version=${PORTVERSION}' \
 		-X 'main.Commit=${GL_TAGNAME:C/^(........).*/\1/}' \
 		-X 'main.BuildDate=${_BUILD_DATE}' \
 		-X 'main.Mode=prod'"
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000
 MAKE_ENV+=	 NODE_OPTIONS=--openssl-legacy-provider
 .endif
 
 USERS=		gotify
 GROUPS=		gotify
 
 PLIST_FILES=	bin/gotify-server
 
 post-patch:
 	# setup yarnrc for offline node_modules installatio
 	@${ECHO_CMD} 'yarn-offline-mirror "${WRKDIR}/yarn-offline-cache"' >> ${WRKSRC}/ui/.yarnrc
 	
 pre-build:
 	@cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} HOME=${WRKDIR} PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true yarn install --offline
 	@cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} yarn build
 	#${RM} -r ${STAGEDIR}${PREFIX}/share/.cache
 
-
 pre-install:
 	@${RM} ${WRKSRC}/.yarnrc
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKDIR}/bin/gotify-server ${STAGEDIR}${PREFIX}/bin/gotify-server
 	@${MV} ${WRKSRC}/config.example.yml ${WRKSRC}/config.yml.sample
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 .for x in config.yml.sample
 	@${CP} ${WRKSRC}/${x} ${STAGEDIR}${ETCDIR}/${x}
 .endfor
 	@${MKDIR} ${STAGEDIR}/var/db/gotify
 
 post-install:
 	@${ECHO} "@sample ${ETCDIR}/config.yml.sample" >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner gotify" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group gotify" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir /var/db/gotify" >> ${TMPPLIST}
 	#@${ECHO_CMD} "@dir /var/db/gotify/certs" >> ${TMPPLIST}
 
 make-yarn-cache: patch
 	${RM} -r ${WRKDIR}/yarn-offline-cache
 	cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true yarn --frozen-lockfile --ignore-scripts
 	cd ${WRKDIR} && ${TAR} -czf ${PORTNAME}-yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX} yarn-offline-cache
 	@${ECHO_CMD} upload ${PORTNAME}-yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}
 
 .include <bsd.port.post.mk>
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 05821e95d639..fccc4b2e04c1 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -1,63 +1,64 @@
 PORTNAME=	syncthing
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.28.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-source-${DISTVERSIONFULL}
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Encrypted file sync tool
 WWW=		https://syncthing.net/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/${PORTNAME}/LICENSE
 
 USES=		cpe go:1.22,modules
 
 USE_RC_SUBR=	syncthing syncthing-discosrv syncthing-relaysrv \
 		syncthing-relaypoolsrv
 
 BINS=		syncthing stdiscosrv strelaysrv strelaypoolsrv
 
 .for x in ${BINS}
 PLIST_FILES+=	bin/${x}
 .endfor
 
 PORTDOCS=	*
 
 USERS=		syncthing
 GROUPS=		syncthing
 
 # Anonymize
 MAKE_ENV+=	BUILD_HOST=freebsd \
 		BUILD_USER=ports
 
 OPTIONS_DEFINE=	DOCS
 
 NO_WRKSUBDIR=	yes
 
 do-build:
 	@( cd ${WRKSRC}/${PORTNAME} ; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build ; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build stdiscosrv; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build strelaysrv; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build strelaypoolsrv; \
 		)
 
 do-test:
 	@( cd ${WRKSRC}/${PORTNAME} ; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade test ; \
 		)
 
 do-install:
 .for x in ${BINS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${x} \
 		${STAGEDIR}${PREFIX}/bin/
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in AUTHORS LICENSE README.md
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${x} \
 		${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/security/apg/Makefile b/security/apg/Makefile
index c0a74012abea..799a23941d4c 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=		apg
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=		1
 CATEGORIES=		security sysutils
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Automated Password Generator written in Go
 WWW=		https://github.com/wneessen/apg-go
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	wneessen
 GH_PROJECT=	apg-go
 GH_TUPLE=	wneessen:go-hibp:v1.0.6:wneessen_go_hibp/vendor/github.com/wneessen/go-hibp
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GO_TARGET=	./cmd/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/aws-iam-authenticator/Makefile b/security/aws-iam-authenticator/Makefile
index 9214ff30a2c2..e588991ff354 100644
--- a/security/aws-iam-authenticator/Makefile
+++ b/security/aws-iam-authenticator/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	aws-iam-authenticator
 PORTVERSION=	0.6.27
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Use AWS IAM credentials to authenticate to a Kubernetes cluster
 WWW=		https://github.com/kubernetes-sigs/aws-iam-authenticator
 
 LICENSE=	APACHE20
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/kubernetes-sigs/${PORTNAME}
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags="-X sigs.k8s.io/aws-iam-authenticator/pkg.Version=${PORTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile
index 07b0f5366ab3..db063d6e7452 100644
--- a/security/boringssl/Makefile
+++ b/security/boringssl/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	boringssl
 PORTVERSION=	0.0.0.0.2024.11.06.01
+PORTREVISION=	1
 CATEGORIES=	security
 EXTRACT_ONLY=	${GH_ACCOUNT}-${PORTNAME}-${PORTVERSION}-${GH_TAGNAME}_GH0.tar.gz
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Fork of OpenSSL
 WWW=		https://boringssl.googlesource.com/boringssl/
 
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:insource cpe go:no_targets,1.22 localbase perl5
 
 CONFLICTS_INSTALL=	libressl libressl-devel openssl openssl111 \
 			openssl3[1234] openssl-quictls openssl31-quictls
 
 CPE_VENDOR=	google
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 GH_TAGNAME=	52a2c00
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=1
 
 CFLAGS_i386=	-msse2
 USE_LDCONFIG=	yes
 LDFLAGS+=	-Wl,-rpath,${LOCALBASE}/lib
 TEST_TARGET=	run_tests
 MAKE_ENV+=	GOFLAGS=-mod=readonly \
 		GOPROXY=file://${DISTDIR}
 
 .include <bsd.port.pre.mk>
 
 .if ${.TARGETS} == "makesum" || ${.TARGETS} == "test"
 MASTER_SITES+=	https://proxy.golang.org/:gomods
 DISTFILES+=	filippo.io/edwards25519/@v/v1.1.0.zip:gomods \
 		filippo.io/edwards25519/@v/v1.1.0.mod:gomods \
 		filippo.io/mlkem768/@v/v0.0.0-20240821141156-859a9b3f2ff6.zip:gomods \
 		filippo.io/mlkem768/@v/v0.0.0-20240821141156-859a9b3f2ff6.mod:gomods \
 		golang.org/x/crypto/@v/v0.26.0.zip:gomods \
 		golang.org/x/crypto/@v/v0.26.0.mod:gomods \
 		golang.org/x/net/@v/v0.27.0.zip:gomods \
 		golang.org/x/net/@v/v0.27.0.mod:gomods \
 		golang.org/x/sys/@v/v0.24.0.zip:gomods \
 		golang.org/x/sys/@v/v0.24.0.mod:gomods \
 		golang.org/x/term/@v/v0.23.0.zip:gomods \
 		golang.org/x/term/@v/v0.23.0.mod:gomods
 .endif
 
 post-install:
 	${LN} -sf libcrypto.so.1 ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1.0.0
 	${LN} -sf libssl.so.1 ${STAGEDIR}${PREFIX}/lib/libssl.so.1.0.0
 
 .include <bsd.port.post.mk>
diff --git a/security/crowdsec/Makefile b/security/crowdsec/Makefile
index 641c97f30adf..5aef95abf790 100644
--- a/security/crowdsec/Makefile
+++ b/security/crowdsec/Makefile
@@ -1,176 +1,176 @@
 PORTNAME=	crowdsec
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	marco@crowdsec.net
 COMMENT=	CrowdSec lightweight and collaborative security engine
 WWW=		https://github.com/crowdsecurity/crowdsec
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libre2.so:devel/re2
 
 USES=		go:1.22,modules pkgconfig
 _COMMIT=	4851945a
 _BUILD_DATE=	$$(date -u "+%F_%T")
 USE_RC_SUBR=	crowdsec
 
 GO_MODULE=	github.com/crowdsecurity/crowdsec
 GO_TARGET=	./cmd/crowdsec \
 		./cmd/crowdsec-cli \
 		./cmd/notification-email \
 		./cmd/notification-http \
 		./cmd/notification-sentinel \
 		./cmd/notification-slack \
 		./cmd/notification-splunk
 
 GO_BUILDFLAGS=	-v -trimpath -tags netgo,osusergo,sqlite_omit_load_extension,re2_cgo \
 		-ldflags="\
 		-a -s -w \
 		-X github.com/crowdsecurity/go-cs-lib/version.Version=${DISTVERSIONPREFIX}${DISTVERSION} \
 		-X github.com/crowdsecurity/go-cs-lib/version.BuildDate=${_BUILD_DATE} \
 		-X github.com/crowdsecurity/go-cs-lib/version.Tag=${_COMMIT} \
 		-X ${GO_MODULE}/pkg/cwversion.Codename=alphaga \
 		-X ${GO_MODULE}/pkg/csconfig.defaultConfigDir=${PREFIX}/etc/crowdsec \
 		-X ${GO_MODULE}/pkg/csconfig.defaultDataDir=/var/db/crowdsec/data \
 		-X ${GO_MODULE}/pkg/cwversion.Libre2=C++"
 
 SUB_FILES=	pkg-deinstall pkg-install pkg-message crowdsec.cron upgrade-hub
 
 OPTIONS_DEFINE=	FIREWALL_BOUNCER
 OPTIONS_DEFAULT=
 
 FIREWALL_BOUNCER_DESC=	Depend on security/crowdsec-firewall-bouncer
 FIREWALL_BOUNCER_RUN_DEPENDS=	crowdsec-firewall-bouncer>=0.0.27:security/crowdsec-firewall-bouncer
 
 PLUGIN_DIR=	${PREFIX}/lib/crowdsec/plugins
 STAGE_PLUGINS=	${STAGEDIR}${PLUGIN_DIR}
 STAGE_BIN=	${STAGEDIR}${PREFIX}/bin
 
 post-patch:
 	@${REINPLACE_CMD} 's,/etc/crowdsec/,${ETCDIR}/,g' \
 		${WRKSRC}/config/config.yaml
 
 	@${REINPLACE_CMD} 's,/var/lib/,/var/db/,g' \
 		${WRKSRC}/config/config.yaml
 
 do-install:
 	#
 	# Binaries
 	#
 
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/crowdsec ${STAGE_BIN}/
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/crowdsec-cli ${STAGE_BIN}/cscli
 
 	# keep this around for compatibility
 	${LN} -s cscli ${STAGE_BIN}/crowdsec-cli
 
 	@${MKDIR} ${STAGE_PLUGINS}
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/notification-email ${STAGE_PLUGINS}/
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/notification-http ${STAGE_PLUGINS}/
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/notification-sentinel ${STAGE_PLUGINS}/
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/notification-slack ${STAGE_PLUGINS}/
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/notification-splunk ${STAGE_PLUGINS}/
 
 	#
 	# Configuration
 	#
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@(cd ${WRKSRC}/config && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR})
 
 	@${MV} ${STAGEDIR}${ETCDIR}/acquis.yaml \
 		${STAGEDIR}${ETCDIR}/acquis.yaml.sample
 
 	@${MV} ${STAGEDIR}${ETCDIR}/config.yaml \
 		${STAGEDIR}${ETCDIR}/config.yaml.sample
 
 	@${MV} ${STAGEDIR}${ETCDIR}/console.yaml \
 		${STAGEDIR}${ETCDIR}/console.yaml.sample
 
 	@${MV} ${STAGEDIR}${ETCDIR}/profiles.yaml \
 		${STAGEDIR}${ETCDIR}/profiles.yaml.sample
 
 	# managed by "cscli simulation"
 	@${MV} ${STAGEDIR}${ETCDIR}/simulation.yaml \
 		${STAGEDIR}${ETCDIR}/simulation.yaml.sample
 
 	#
 	# Plugin configuration
 	#
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/notifications
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/notifications/email
 	@${MV} ${WRKSRC}/cmd/notification-email/email.yaml \
 		${STAGEDIR}${ETCDIR}/notifications/email.yaml.sample
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/notifications/http
 	@${MV} ${WRKSRC}/cmd/notification-http/http.yaml \
 		${STAGEDIR}${ETCDIR}/notifications/http.yaml.sample
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/notifications/sentinel
 	@${MV} ${WRKSRC}/cmd/notification-sentinel/sentinel.yaml \
 		${STAGEDIR}${ETCDIR}/notifications/sentinel.yaml.sample
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/notifications/slack
 	@${MV} ${WRKSRC}/cmd/notification-slack/slack.yaml \
 		${STAGEDIR}${ETCDIR}/notifications/slack.yaml.sample
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/notifications/splunk
 	@${MV} ${WRKSRC}/cmd/notification-splunk/splunk.yaml \
 		${STAGEDIR}${ETCDIR}/notifications/splunk.yaml.sample
 
 	# updated by "cscli machines" at first service start
 	@${MV} ${STAGEDIR}${ETCDIR}/local_api_credentials.yaml \
 		${STAGEDIR}${ETCDIR}/local_api_credentials.yaml.sample
 
 	# updated by "cscli capi" at first service start
 	@${MV} ${STAGEDIR}${ETCDIR}/online_api_credentials.yaml \
 		${STAGEDIR}${ETCDIR}/online_api_credentials.yaml.sample
 
 	#
 	# Data
 	#
 
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/hub
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/acquis.d
 	@${MKDIR} ${STAGEDIR}/var/db/crowdsec/data
 	@${MKDIR} ${STAGEDIR}/var/db/crowdsec/data/trace
 
 	#
 	# Cron
 	#
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/crowdsec
 	${INSTALL_DATA} ${WRKDIR}/upgrade-hub \
 		${STAGEDIR}${PREFIX}/libexec/crowdsec/upgrade-hub
 
 	#
 	# Cleanup
 	#
 
 	@${RM} ${STAGEDIR}${ETCDIR}/acquis_win.yaml
 	@${RM} ${STAGEDIR}${ETCDIR}/config_win_no_lapi.yaml
 	@${RM} ${STAGEDIR}${ETCDIR}/config_win.yaml
 	@${RM} ${STAGEDIR}${ETCDIR}/crowdsec.cron.daily
 	@${RM} ${STAGEDIR}${ETCDIR}/crowdsec.service
 	@${RM} ${STAGEDIR}${ETCDIR}/context.yaml
 	@${RM} ${STAGEDIR}${ETCDIR}/detect.yaml
 	@${RM} ${STAGEDIR}${ETCDIR}/dev.yaml
 	@${RM} ${STAGEDIR}${ETCDIR}/user.yaml
 	@${RMDIR} ${STAGEDIR}${ETCDIR}/notifications/email
 	@${RMDIR} ${STAGEDIR}${ETCDIR}/notifications/http
 	@${RMDIR} ${STAGEDIR}${ETCDIR}/notifications/sentinel
 	@${RMDIR} ${STAGEDIR}${ETCDIR}/notifications/slack
 	@${RMDIR} ${STAGEDIR}${ETCDIR}/notifications/splunk
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/cron.d
 	${INSTALL_DATA} ${WRKDIR}/crowdsec.cron ${STAGEDIR}${PREFIX}/etc/cron.d/crowdsec
 
 .include <bsd.port.mk>
diff --git a/security/git-credential-gopass/Makefile b/security/git-credential-gopass/Makefile
index cfdfe32bb57b..24b70326e664 100644
--- a/security/git-credential-gopass/Makefile
+++ b/security/git-credential-gopass/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	git-credential-gopass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Manage git credentials using gopass
 WWW=		https://github.com/gopasspw/git-credential-gopass
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	gopasspw
 
 GO_MODULE=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 PLIST_FILES=	bin/git-credential-gopass
 
 .include <bsd.port.mk>
diff --git a/security/gopass/Makefile b/security/gopass/Makefile
index b4490fc86962..798e921fbedd 100644
--- a/security/gopass/Makefile
+++ b/security/gopass/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	gopass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Rewrite of the pass password manager in Go
 WWW=		https://www.gopass.pw/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7
 ONLY_FOR_ARCHS_REASON=	upstream only supports ${ONLY_FOR_ARCHS}
 
 RUN_DEPENDS=	git:devel/git \
 		gpg2:security/gnupg
 
 USES=		go:1.22,modules
 
 # Usage examples are in a separate repo
 USE_GITHUB=	nodefault
 GH_TUPLE=	gopasspw:password-store-example:8db75ba3b69c:password_store_example
 
 GO_MODULE=	github.com/gopasspw/gopass
 
 PORTDOCS=	README.md docs/*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-build:
 .for SHELL in bash fish zsh
 	${GO_WRKDIR_BIN}/${PORTNAME} completion ${SHELL} > ${WRKSRC}/${SHELL}
 .endfor
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}.sh
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
 	${INSTALL_DATA} ${WRKSRC}/fish \
 		${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/zsh \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC_password_store_example} && ${COPYTREE_SHARE} "README.md secrets templates" ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/security/local-php-security-checker/Makefile b/security/local-php-security-checker/Makefile
index 6b9ab12608e0..1674d144d7a4 100644
--- a/security/local-php-security-checker/Makefile
+++ b/security/local-php-security-checker/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	local-php-security-checker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	GH
 
 MAINTAINER=	einar@isnic.is
 COMMENT=	Tool to check PHP composer dependencies for vulnerabilities
 WWW=		https://github.com/fabpot/local-php-security-checker
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fabpot
 GH_TUPLE=	davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
 		hashicorp:go-version:v1.6.0:hashicorp_go_version/vendor/github.com/hashicorp/go-version \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		stretchr:testify:v1.9.0:stretchr_testify/vendor/github.com/stretchr/testify
 
 PLIST_FILES=	bin/local-php-security-checker
 
 .include <bsd.port.mk>
diff --git a/security/openbao/Makefile b/security/openbao/Makefile
index 0396ce0cb302..b748609f124c 100644
--- a/security/openbao/Makefile
+++ b/security/openbao/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	openbao
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES+=	https://raw.githubusercontent.com/${PORTNAME}/${PORTNAME}/${DISTVERSIONFULL}/
 DISTFILES=	go.mod \
 		api/go.mod \
 		api/auth/approle/go.mod \
 		api/auth/kubernetes/go.mod \
 		api/auth/userpass/go.mod \
 		sdk/go.mod
 
 MAINTAINER=	jake@metalrip.com
 COMMENT=	Tool for securely accessing secrets
 WWW=		https://openbao.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 USE_GITHUB=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}
 GO_TARGET=	:${BIN_NAME}
 GO_BUILDFLAGS=	-ldflags="-s \
 		-X ${GO_MODULE}/version.GitCommit=${GITID} \
 		-X ${GO_MODULE}/version.BuildDate=${SOURCE_DATE_EPOCH} \
 		-X ${GO_MODULE}/version.fullVersion=${DISTVERSION}"
 
 SUB_FILES=	pkg-message
 SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 PLIST_FILES=	bin/${BIN_NAME}
 
 BIN_NAME=		bao
 GITID=			88383dece6b4ff1b3b242280a54aeabef8101495
 SOURCE_DATE_EPOCH=	${TIMEEPOCHNOW:gmtime}
 TIMEEPOCHNOW=		%Y-%m-%dT%H:%M:%SZ
 
 .include <bsd.port.mk>
diff --git a/security/step-certificates/Makefile b/security/step-certificates/Makefile
index 91cab11a2632..dd3daf6c32a2 100644
--- a/security/step-certificates/Makefile
+++ b/security/step-certificates/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	step-certificates
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.27.5
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	mw@wipp.bayern
 COMMENT=	Smallstep step-ca certificates server
 WWW=		https://smallstep.com/certificates/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	pcsc-lite>0:devel/pcsc-lite
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 RUN_DEPENDS=	step:security/step-cli
 
 USES=		go:1.22,modules
 
 USE_RC_SUBR=	step-ca
 
 GO_MODULE=	github.com/smallstep/certificates
 
 GO_TARGET=	./cmd/step-ca:${PREFIX}/sbin/step-ca
 
 GO_BUILDFLAGS=	-ldflags "-w -X main.Version=${PORTVERSION}"
 
 USERS=		step
 GROUPS=		step
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/step
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${INSTALL_MAN} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/CONTRIBUTING.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/SECURITY.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/step-cli/Makefile b/security/step-cli/Makefile
index f417c17e9e0a..63fee1dc928b 100644
--- a/security/step-cli/Makefile
+++ b/security/step-cli/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	step-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.27.5
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	mw@wipp.bayern
 COMMENT=	Smallstep step-ca command line client
 WWW=		https://smallstep.com/cli/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules shebangfix
 
 SHEBANG_FILES=	autocomplete/bash_autocomplete
 
 GO_MODULE=	github.com/smallstep/cli
 GO_TARGET=	./cmd/step
 GO_BUILDFLAGS=	-ldflags "-w -X main.Version=${PORTVERSION}"
 
 PLIST_FILES=	bin/step \
 		etc/bash_completion.d/step-completion.bash \
 		share/zsh/site-functions/_step
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${CP} ${WRKSRC}/autocomplete/bash_autocomplete ${STAGEDIR}${PREFIX}/etc/bash_completion.d/step-completion.bash
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${CP} ${WRKSRC}/autocomplete/zsh_autocomplete ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_step
 
 .include <bsd.port.mk>
diff --git a/security/tfsec/Makefile b/security/tfsec/Makefile
index 20a3511a18e7..5238cb4d318a 100644
--- a/security/tfsec/Makefile
+++ b/security/tfsec/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	tfsec
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.28.11
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Security scanner for Terraform
 WWW=		https://aquasecurity.github.io/tfsec
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=	tfsec now is party of security/trivy
 EXPIRATION_DATE=2024-11-26
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/aquasecurity/tfsec
 GO_TARGET=	./cmd/${PORTNAME}
 
 GO_BUILDFLAGS=	-ldflags="version.Version=${DISTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/trivy/Makefile b/security/trivy/Makefile
index 0eed3fbfa68d..75e629e251fe 100644
--- a/security/trivy/Makefile
+++ b/security/trivy/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	trivy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.57.0
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Security scanner written in go
 WWW=		https://github.com/aquasecurity/trivy
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.22
 
 GO_MODULE=	github.com/aquasecurity/trivy
 GO_TARGET=	./cmd/trivy
 GO_BUILDFLAGS= -ldflags=" \
 		-extldflags '-static' \
 		-X github.com/aquasecurity/trivy/pkg/version.ver=${DISTVERSION} \
 		-s -w"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/*.tpl ${STAGEDIR}${DATADIR}/
 	${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST}
 	cat ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/security/vault/Makefile b/security/vault/Makefile
index 9382d51bfd06..e598215fb9a5 100644
--- a/security/vault/Makefile
+++ b/security/vault/Makefile
@@ -1,69 +1,70 @@
 PORTNAME=	vault
 DISTVERSION=	1.18.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/vault/${DISTVERSIONFULL}/ \
 		LOCAL/bofh/security/${PORTNAME}/:web_ui
 DISTFILES=	go.mod \
 		api/go.mod \
 		api/auth/approle/go.mod \
 		api/auth/kubernetes/go.mod \
 		api/auth/userpass/go.mod \
 		sdk/go.mod \
 		${PORTNAME}-web_ui-${DISTVERSION}${EXTRACT_SUFX}:web_ui
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tool for securely accessing secrets
 WWW=		https://vaultproject.io/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .if defined(MAINTAINER_MODE)
 EXTRACT_DEPENDS=npm-node20>0:www/npm-node20 \
 		yarn-node20>0:www/yarn-node20
 .endif
 
 USES=		cpe go:1.22,modules
 CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 USE_RC_SUBR=	vault
 
 GO_MODULE=	github.com/hashicorp/vault
 GO_BUILDFLAGS=	-ldflags="-s \
 		-X github.com/hashicorp/vault/version.GitCommit=${GITID} \
 		-X github.com/hashicorp/vault/version.BuildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}} \
 		" -tags "vault ui"
 
 SUB_FILES=	pkg-message
 
 USERS=		vault
 GROUPS=		vault
 
 PLIST_FILES=	bin/${PORTNAME}
 
 GITID=	4d0c53e84094b8017d32b6e5b7f8142035c8837f
 
 .include <bsd.port.pre.mk>
 
 # Bring DISTINFO_FILE into scope so we can get the timestamp.
 SOURCE_DATE_EPOCH_CMD=	date -ur \
 			$$(${GREP} -m1 TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \
 			'+%Y-%m-%dT%H:%M:%SZ'
 
 post-patch:
 	${CP} -Rf ${WRKDIR}/web_ui ${WRKSRC}/http/
 
 .if defined(MAINTAINER_MODE)
 _make-web_ui: extract
 	cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} yarn
 	cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} npm rebuild node-sass
 	cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} yarn run build
 	cd ${WRKDIR} && ${TAR} -czf \
 		${PORTNAME}-web_ui-${DISTVERSION}${EXTRACT_SUFX} -C ${WRKSRC}/http web_ui
 	scp ${WRKDIR}/${PORTNAME}-web_ui-${DISTVERSION}${EXTRACT_SUFX} \
 		bofh@freefall.freebsd.org:public_distfiles/security/${PORTNAME}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/xray-core/Makefile b/security/xray-core/Makefile
index 131f4d53ea6c..eee1d8921d1b 100644
--- a/security/xray-core/Makefile
+++ b/security/xray-core/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	xray-core
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/v2fly/geoip/releases/download/202407110044/:geoip \
 		https://github.com/v2fly/domain-list-community/releases/download/20240713050854/:geosite
 DISTFILES=	geoip.dat:geoip \
 		dlc.dat:geosite
 EXTRACT_ONLY=	v${DISTVERSION}.zip \
 		xtls-Xray-core-v${DISTVERSION}_GH0.tar.gz
 
 MAINTAINER=	kirill@drlebedev.com
 COMMENT=	Set of network penetration tools
 WWW=		https://github.com/XTLS/Xray-core
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.22
 USE_GITHUB=	yes
 GH_ACCOUNT=	xtls
 GH_PROJECT=	Xray-core
 USE_RC_SUBR=	xray
 
 GO_MODULE=	github.com/${GH_ACCOUNT}/${PORTNAME}
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 GO_TARGET=	./main:xray
 
 SUB_FILES=	pkg-message
 SUB_LIST=	GROUP="${GROUPS}" \
 		USER="${USERS}"
 
 USERS=		v2ray
 GROUPS=		v2ray
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/geoip.dat ${STAGEDIR}${DATADIR}/geoip.dat
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/dlc.dat ${STAGEDIR}${DATADIR}/geosite.dat
 	${INSTALL_DATA} ${FILESDIR}/*.json.sample ${STAGEDIR}${ETCDIR}/
 
 .include <bsd.port.mk>
diff --git a/sysutils/alloy/Makefile b/sysutils/alloy/Makefile
index 168b2828429b..6135dbc4c489 100644
--- a/sysutils/alloy/Makefile
+++ b/sysutils/alloy/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	alloy
 PORTVERSION=	1.2.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	zach.leslie@grafana.com
 COMMENT=	OpenTelemetry Collector distribution with programmable pipelines
 WWW=		https://github.com/grafana/alloy
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	git:devel/git
 
 USES=		go:1.22,modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grafana
 GH_PROJECT=	alloy
 
 USE_RC_SUBR=	alloy
 
 GO_MODULE=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GO_TARGET=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GO_BUILDFLAGS=	-ldflags='-X github.com/grafana/alloy/internal/build.Version=v${PORTVERSION}'
 
 post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME}/syntax dependency";
 	(cd ${DISTDIR}/${DIST_SUBDIR}; [ -e syntax/go.mod ] || (\
 		${MKDIR} syntax/; \
 		${TAR} -xzf ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-${PORTVERSION}/syntax/go.mod; \
 		${CP} ${PORTNAME}-${PORTVERSION}/syntax/go.mod syntax/go.mod))
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME}/internal/etc/datadogreceiver dependency";
 	(cd ${DISTDIR}/${DIST_SUBDIR}; [ -e internal/etc/datadogreceiver/go.mod ] || (\
 		${MKDIR} internal/etc/datadogreceiver/; \
 		${TAR} -xzf ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-${PORTVERSION}/internal/etc/datadogreceiver/go.mod; \
 		${CP} ${PORTNAME}-${PORTVERSION}/internal/etc/datadogreceiver/go.mod internal/etc/datadogreceiver/go.mod))
 
 post-extract:
 	${CP} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION}/syntax ${GO_WRKSRC}/syntax;
 	${MKDIR} ${GO_WRKSRC}/internal/etc
 	${CP} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION}/internal/etc/datadogreceiver ${GO_WRKSRC}/internal/etc/datadogreceiver;
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/alloy ${STAGEDIR}${PREFIX}/bin/alloy
 	${INSTALL_DATA} ${WRKSRC}/example-config.alloy ${STAGEDIR}${PREFIX}/etc/alloy.flow.sample
 	${MKDIR} ${STAGEDIR}/var/alloy
 
 .include <bsd.port.mk>
diff --git a/sysutils/chaoskube/Makefile b/sysutils/chaoskube/Makefile
index 962e827262b1..7519e36f8ee0 100644
--- a/sysutils/chaoskube/Makefile
+++ b/sysutils/chaoskube/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	chaoskube
 PORTVERSION=	0.33.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Chaoskube periodically kills random pods in your Kubernetes cluster
 WWW=		https://github.com/linki/chaoskube
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 GO_MODULE=	github.com/linki/chaoskube
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/choria/Makefile b/sysutils/choria/Makefile
index 85166b4fbf9f..97e50dfdc063 100644
--- a/sysutils/choria/Makefile
+++ b/sysutils/choria/Makefile
@@ -1,180 +1,181 @@
 PORTNAME=	choria
 PORTVERSION=	0.29.4
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Server to host Choria agents, networks, federations and discovery
 WWW=		https://choria.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	choria-io
 GH_PROJECT=	go-choria
 USE_RC_SUBR=	choria-broker choria-server
 
 GH_TUPLE=	\
 		AlecAivazis:survey:v2.3.7:alecaivazis_survey_v2/vendor/github.com/AlecAivazis/survey/v2 \
 		Freman:eventloghook:e4d803b6b48b:freman_eventloghook/vendor/github.com/Freman/eventloghook \
 		HdrHistogram:hdrhistogram-go:v1.1.2:hdrhistogram_hdrhistogram_go/vendor/github.com/HdrHistogram/hdrhistogram-go \
 		Masterminds:goutils:v1.1.1:masterminds_goutils/vendor/github.com/Masterminds/goutils \
 		Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \
 		Masterminds:semver:v3.3.0:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
 		Masterminds:sprig:v3.3.0:masterminds_sprig_v3/vendor/github.com/Masterminds/sprig/v3 \
 		OneOfOne:xxhash:v1.2.8:oneofone_xxhash/vendor/github.com/OneOfOne/xxhash \
 		achanda:go-sysctl:6be7678c45d2:achanda_go_sysctl/vendor/github.com/achanda/go-sysctl \
 		adrg:xdg:v0.5.0:adrg_xdg/vendor/github.com/adrg/xdg \
 		agnivade:levenshtein:v1.1.1:agnivade_levenshtein/vendor/github.com/agnivade/levenshtein \
 		alessio:shellescape:v1.5.0:alessio_shellescape/vendor/al.essio.dev/pkg/shellescape \
 		awesome-gocui:gocui:v1.1.0:awesome_gocui_gocui/vendor/github.com/awesome-gocui/gocui \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		blang:semver:v4.0.0:blang_semver_v4/vendor/github.com/blang/semver \
 		brutella:dnssd:v1.2.12:brutella_dnssd/vendor/github.com/brutella/dnssd \
 		brutella:hc:v1.2.5:brutella_hc/vendor/github.com/brutella/hc \
 		cespare:xxhash:v2.3.0:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
 		cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \
 		choria-io:appbuilder:v0.10.0:choria_io_appbuilder/vendor/github.com/choria-io/appbuilder \
 		choria-io:fisk:v0.6.4:choria_io_fisk/vendor/github.com/choria-io/fisk \
 		choria-io:go-updater:v0.1.0:choria_io_go_updater/vendor/github.com/choria-io/go-updater \
 		choria-io:goform:v0.0.3:choria_io_goform/vendor/github.com/choria-io/goform \
 		choria-io:scaffold:v0.0.2:choria_io_scaffold/vendor/github.com/choria-io/scaffold \
 		choria-io:tokens:a929d9325d48:choria_io_tokens/vendor/github.com/choria-io/tokens \
 		cloudevents:sdk-go:v2.15.2:cloudevents_sdk_go_v2/vendor/github.com/cloudevents/sdk-go \
 		dustin:go-humanize:v1.0.1:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		emicklei:dot:v1.6.2:emicklei_dot/vendor/github.com/emicklei/dot \
 		expr-lang:expr:v1.16.9:expr_lang_expr/vendor/github.com/expr-lang/expr \
 		fatih:color:v1.17.0:fatih_color/vendor/github.com/fatih/color \
 		fatih:structtag:v1.2.0:fatih_structtag/vendor/github.com/fatih/structtag \
 		gdamore:encoding:v1.0.1:gdamore_encoding/vendor/github.com/gdamore/encoding \
 		gdamore:tcell:v2.7.4:gdamore_tcell_v2/vendor/github.com/gdamore/tcell/v2 \
 		ghodss:yaml:v1.0.0:ghodss_yaml/vendor/github.com/ghodss/yaml \
 		go-ini:ini:v1.67.0:go_ini_ini/vendor/github.com/go-ini/ini \
 		go-logr:logr:v1.4.2:go_logr_logr/vendor/github.com/go-logr/logr \
 		go-logr:stdr:v1.2.2:go_logr_stdr/vendor/github.com/go-logr/stdr \
 		go-task:slim-sprig:v3.0.0:go_task_slim_sprig_v3/vendor/github.com/go-task/slim-sprig/v3 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
 		gofrs:uuid:v4.4.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
 		golang-jwt:jwt:v4.5.0:golang_jwt_jwt_v4/vendor/github.com/golang-jwt/jwt/v4 \
 		golang:crypto:v0.26.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:exp:9b4947da3948:golang_exp/vendor/golang.org/x/exp \
 		golang:mock:v1.6.0:golang_mock/vendor/github.com/golang/mock \
 		golang:mod:v0.20.0:golang_mod/vendor/golang.org/x/mod \
 		golang:net:v0.28.0:golang_net/vendor/golang.org/x/net \
 		golang:sync:v0.8.0:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:v0.24.0:golang_sys/vendor/golang.org/x/sys \
 		golang:term:v0.23.0:golang_term/vendor/golang.org/x/term \
 		golang:text:v0.17.0:golang_text/vendor/golang.org/x/text \
 		golang:time:v0.6.0:golang_time/vendor/golang.org/x/time \
 		golang:tools:v0.24.0:golang_tools/vendor/golang.org/x/tools \
 		google:go-cmp:v0.6.0:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:pprof:da1f7e9f2b25:google_pprof/vendor/github.com/google/pprof \
 		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
 		google:uuid:v1.6.0:google_uuid/vendor/github.com/google/uuid \
 		gorilla:mux:v1.8.1:gorilla_mux/vendor/github.com/gorilla/mux \
 		goss-org:GOnetstat:22be0bd9e64d:goss_org_gonetstat/vendor/github.com/goss-org/GOnetstat \
 		goss-org:go-ps:7b318e6a56e5:goss_org_go_ps/vendor/github.com/goss-org/go-ps \
 		goss-org:goss:v0.4.8:goss_org_goss/vendor/github.com/goss-org/goss \
 		gosuri:uilive:v0.0.4:gosuri_uilive/vendor/github.com/gosuri/uilive \
 		gosuri:uiprogress:v0.0.1:gosuri_uiprogress/vendor/github.com/gosuri/uiprogress \
 		guptarohit:asciigraph:v0.7.2:guptarohit_asciigraph/vendor/github.com/guptarohit/asciigraph \
 		hashicorp:logutils:v1.0.0:hashicorp_logutils/vendor/github.com/hashicorp/logutils \
 		huandu:xstrings:v1.5.0:huandu_xstrings/vendor/github.com/huandu/xstrings \
 		imdario:mergo:v1.0.1:imdario_mergo/vendor/dario.cat/mergo \
 		itchyny:gojq:v0.12.16:itchyny_gojq/vendor/github.com/itchyny/gojq \
 		itchyny:timefmt-go:v0.1.6:itchyny_timefmt_go/vendor/github.com/itchyny/timefmt-go \
 		jedib0t:go-pretty:v6.5.9:jedib0t_go_pretty_v6/vendor/github.com/jedib0t/go-pretty/v6 \
 		json-iterator:go:v1.1.12:json_iterator_go/vendor/github.com/json-iterator/go \
 		kballard:go-shellquote:95032a82bc51:kballard_go_shellquote/vendor/github.com/kballard/go-shellquote \
 		klauspost:compress:v1.17.9:klauspost_compress/vendor/github.com/klauspost/compress \
 		kubernetes-sigs:yaml:v1.4.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
 		looplab:fsm:v1.0.2:looplab_fsm/vendor/github.com/looplab/fsm \
 		lucasb-eyer:go-colorful:v1.2.0:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
 		mattn:go-colorable:v0.1.13:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-runewidth:v0.0.16:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		mgutz:ansi:d51e80ef957d:mgutz_ansi/vendor/github.com/mgutz/ansi \
 		miekg:dns:v1.1.62:miekg_dns/vendor/github.com/miekg/dns \
 		miekg:pkcs11:v1.1.1:miekg_pkcs11/vendor/github.com/miekg/pkcs11 \
 		minio:highwayhash:v1.0.3:minio_highwayhash/vendor/github.com/minio/highwayhash \
 		mitchellh:copystructure:v1.2.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
 		mitchellh:mapstructure:v1.5.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		mitchellh:reflectwalk:v1.0.2:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
 		moby:sys:mountinfo/v0.7.2:moby_sys_mountinfo/vendor/github.com/moby/sys \
 		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
 		modern-go:reflect2:v1.0.2:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
 		munnerz:goautoneg:a7dc8b61c822:munnerz_goautoneg/vendor/github.com/munnerz/goautoneg \
 		nats-io:jsm.go:v0.1.2:nats_io_jsm_go/vendor/github.com/nats-io/jsm.go \
 		nats-io:jwt:v2.5.8:nats_io_jwt_v2/vendor/github.com/nats-io/jwt \
 		nats-io:nats-server:v2.10.20:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \
 		nats-io:nats.go:v1.37.0:nats_io_nats_go/vendor/github.com/nats-io/nats.go \
 		nats-io:natscli:v0.1.5:nats_io_natscli/vendor/github.com/nats-io/natscli \
 		nats-io:nkeys:v0.4.7:nats_io_nkeys/vendor/github.com/nats-io/nkeys \
 		nats-io:nuid:v1.0.1:nats_io_nuid/vendor/github.com/nats-io/nuid \
 		oleiade:reflections:v1.0.1:oleiade_reflections/vendor/github.com/oleiade/reflections \
 		onsi:ginkgo:v2.20.2:onsi_ginkgo_v2/vendor/github.com/onsi/ginkgo/v2 \
 		onsi:gomega:v1.34.2:onsi_gomega/vendor/github.com/onsi/gomega \
 		open-policy-agent:opa:v0.68.0:open_policy_agent_opa/vendor/github.com/open-policy-agent/opa \
 		open-telemetry:opentelemetry-go:v1.29.0:open_telemetry_opentelemetry_go/vendor/go.opentelemetry.io/otel \
 		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		prometheus:client_golang:v1.20.2:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.6.1:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.57.0:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.15.1:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		protocolbuffers:protobuf-go:v1.34.2:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		rcrowley:go-metrics:cf1acfcdf475:rcrowley_go_metrics/vendor/github.com/rcrowley/go-metrics \
 		rivo:uniseg:v0.4.7:rivo_uniseg/vendor/github.com/rivo/uniseg \
 		robfig:cron:v1.2.0:robfig_cron/vendor/github.com/robfig/cron \
 		samber:lo:v1.47.0:samber_lo/vendor/github.com/samber/lo \
 		santhosh-tekuri:jsonschema:v5.3.1:santhosh_tekuri_jsonschema_v5/vendor/github.com/santhosh-tekuri/jsonschema/v5 \
 		segmentio:ksuid:v1.0.4:segmentio_ksuid/vendor/github.com/segmentio/ksuid \
 		shopspring:decimal:v1.4.0:shopspring_decimal/vendor/github.com/shopspring/decimal \
 		sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		spf13:cast:v1.7.0:spf13_cast/vendor/github.com/spf13/cast \
 		tadglines:go-pkgs:b983b20f54f9:tadglines_go_pkgs/vendor/github.com/tadglines/go-pkgs \
 		tchap:go-patricia:v2.3.1:tchap_go_patricia_v2/vendor/github.com/tchap/go-patricia/v2 \
 		tidwall:gjson:v1.17.3:tidwall_gjson/vendor/github.com/tidwall/gjson \
 		tidwall:match:v1.1.1:tidwall_match/vendor/github.com/tidwall/match \
 		tidwall:pretty:v1.2.1:tidwall_pretty/vendor/github.com/tidwall/pretty \
 		tylertreat:hdrhistogram-writer:2e440612a39f:tylertreat_hdrhistogram_writer/vendor/github.com/tylertreat/hdrhistogram-writer \
 		uber-go:multierr:v1.11.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		uber-go:zap:v1.27.0:uber_go_zap/vendor/go.uber.org/zap \
 		vishvananda:netlink:v1.3.0:vishvananda_netlink/vendor/github.com/vishvananda/netlink \
 		vishvananda:netns:v0.0.4:vishvananda_netns/vendor/github.com/vishvananda/netns \
 		xeipuuv:gojsonpointer:02993c407bfb:xeipuuv_gojsonpointer/vendor/github.com/xeipuuv/gojsonpointer \
 		xeipuuv:gojsonreference:bd5ef7bd5415:xeipuuv_gojsonreference/vendor/github.com/xeipuuv/gojsonreference \
 		xiam:to:d60d31e03561:xiam_to/vendor/github.com/xiam/to \
 		xlab:tablewriter:80b567a11ad5:xlab_tablewriter/vendor/github.com/xlab/tablewriter \
 		yashtewari:glob-intersection:v0.2.0:yashtewari_glob_intersection/vendor/github.com/yashtewari/glob-intersection
 
 x-post-extract:
 	@${RM} -r ${WRKSRC}/vendor/github.com/nats-io/jwt/v2
 	@${RLN} ${WRKSRC_nats_io_jwt_v2}/v2 ${WRKSRC}/vendor/github.com/nats-io/jwt/v2
 
 post-patch:
 	${REINPLACE_CMD} -e 's/{{cpkg_name}}/choria-broker/' \
 		${WRKSRC}/packager/templates/debian/global/broker.conf
 	${REINPLACE_CMD} -e 's/{{cpkg_name}}/choria-server/' \
 		${WRKSRC}/packager/templates/debian/global/server.conf
 
 pre-build:
 	(cd ${GO_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate ${GO_BUILDFLAGS} -run plugin)
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/choria
 	${INSTALL_DATA} ${WRKSRC}/packager/templates/debian/global/broker.conf ${STAGEDIR}${PREFIX}/etc/choria/broker.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/packager/templates/debian/global/server.conf ${STAGEDIR}${PREFIX}/etc/choria/server.conf.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/choria
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${STAGEDIR}${PREFIX}/bin/choria completion --zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_choria
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${STAGEDIR}${PREFIX}/bin/choria completion --bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/choria
 
 .include <bsd.port.mk>
diff --git a/sysutils/cloud-nuke/Makefile b/sysutils/cloud-nuke/Makefile
index c6d8964c8ee7..5ac67fc945c5 100644
--- a/sysutils/cloud-nuke/Makefile
+++ b/sysutils/cloud-nuke/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	cloud-nuke
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.37.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Cleaning up your cloud accounts
 WWW=		https://github.com/gruntwork-io/cloud-nuke
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cpe go:1.22,modules
 
 CPE_VENDOR=	gruntwork-io
 GO_MODULE=	github.com/gruntwork-io/cloud-nuke
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
 		-X main.VERSION=${DISTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 81ac55376035..70cb8682aa61 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	consul
 DISTVERSION=	1.20.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/
 DISTFILES=	go.mod \
 		api/go.mod \
 		envoyextensions/go.mod \
 		proto-public/go.mod \
 		sdk/go.mod \
 		troubleshoot/go.mod
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
 WWW=		https://www.consul.io/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:1.22,modules
 CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 USE_RC_SUBR=	consul
 
 GO_MODULE=	github.com/hashicorp/consul
 GO_BUILDFLAGS=	-ldflags="-s \
 		-X github.com/hashicorp/consul/version.GitCommit=${GITID} \
 		-X github.com/hashicorp/consul/version.BuildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}} \
 		"
 
 ETCDIR=		${PREFIX}/etc/consul.d
 SUB_LIST=	CONSUL_DBDIR=${CONSUL_DBDIR} \
 		GROUP=${CONSUL_GROUP} \
 		USER=${CONSUL_USER}
 
 USERS=		${CONSUL_USER}
 GROUPS=		${CONSUL_GROUP}
 
 PLIST_FILES=	bin/consul
 
 CONSUL_USER?=	consul
 CONSUL_GROUP?=	consul
 CONSUL_DBDIR?=	/var/db/${PORTNAME}
 
 GITID=		920cc7c
 
 # Bring DISTINFO_FILE into scope so we can get the timestamp.
 .include <bsd.port.pre.mk>
 
 SOURCE_DATE_EPOCH_CMD=	date -ur \
 			$$(${GREP} -m1 TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \
 			'+%Y-%m-%dT%H:%M:%SZ'
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/doctl/Makefile b/sysutils/doctl/Makefile
index 09159aa7145f..cb6cddba097c 100644
--- a/sysutils/doctl/Makefile
+++ b/sysutils/doctl/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	doctl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.116.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/digitalocean/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Command line tool for DigitalOcean services
 WWW=		https://github.com/digitalocean/doctl
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		go:1.22,modules
 
 GO_TARGET=	./cmd/${PORTNAME}
 
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/doctl
 
 .include <bsd.port.mk>
diff --git a/sysutils/gomplate/Makefile b/sysutils/gomplate/Makefile
index 4ac7c4aef5da..eb314f5ffca4 100644
--- a/sysutils/gomplate/Makefile
+++ b/sysutils/gomplate/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	gomplate
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Command-line tool for rendering templates before executing binaries
 WWW=		https://github.com/hairyhenderson/gomplate
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/hairyhenderson/gomplate/v4
 GH_TAG_COMMIT=	fba3b4d
 GO_TARGET=	./cmd/gomplate
 GO_BUILDFLAGS=	-ldflags "\
 		-w -s \
 		-X github.com/hairyhenderson/gomplate/v4/version.GitCommit=${GH_TAG_COMMIT} \
 		-X github.com/hairyhenderson/gomplate/v4/version.Version=${DISTVERSION}"
 
 PLIST_FILES=	bin/gomplate
 
 .include <bsd.port.mk>
diff --git a/sysutils/helm/Makefile b/sysutils/helm/Makefile
index 42b82ea0fe47..2d1cd00089d6 100644
--- a/sysutils/helm/Makefile
+++ b/sysutils/helm/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	helm
 PORTVERSION=	3.16.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Kubernetes Package Manager
 WWW=		https://helm.sh
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	kubectl:sysutils/kubectl
 
 USES=		cpe go:1.22,modules tar:xz
 
 GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}/v3
 GO_PKGNAME=	k8s.io/helm
 GO_BUILDFLAGS=	-ldflags="-X helm.sh/helm/v3/internal/version.version=v${PORTVERSION} \
 		-X helm.sh/helm/v3/internal/version.gitCommit=13654a52f7c70a143b1dd51416d633e1071faffb"
 GO_TARGET=	./cmd/${PORTNAME}
 
 PLIST_FILES=	${GO_TARGET:C/.\/cmd/bin/}
 
 OPTIONS_DEFINE=		BASH FISH ZSH
 OPTIONS_DEFAULT=	BASH FISH ZSH
 
 BASH_PLIST_FILES=	share/bash-completion/completions/helm
 FISH_PLIST_FILES=	share/fish/vendor_functions.d/helm.fish
 ZSH_PLIST_FILES=	share/zsh/site-functions/_helm
 
 post-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${STAGEDIR}${PREFIX}/bin/helm completion bash > ${STAGEDIR}${PREFIX}/share/bash-completion/completions/helm
 
 post-install-FISH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_functions.d
 	${STAGEDIR}${PREFIX}/bin/helm completion fish > ${STAGEDIR}${PREFIX}/share/fish/vendor_functions.d/helm.fish
 
 post-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${STAGEDIR}${PREFIX}/bin/helm completion zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_helm
 
 .include <bsd.port.mk>
diff --git a/sysutils/helmfile/Makefile b/sysutils/helmfile/Makefile
index 7090d465603d..901cf4c82ba8 100644
--- a/sysutils/helmfile/Makefile
+++ b/sysutils/helmfile/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	helmfile
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.167.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	timp87@gmail.com
 COMMENT=	Helmfile is a declarative spec for deploying helm charts
 WWW=		https://github.com/helmfile/helmfile
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	helm:sysutils/helm
 
 USES=		go:1.22,modules
 GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags="-X go.szostok.io/version.version=v${PORTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/infracost/Makefile b/sysutils/infracost/Makefile
index 04e10230975f..f991b1906476 100644
--- a/sysutils/infracost/Makefile
+++ b/sysutils/infracost/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	infracost
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.39
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Cloud cost estimates for Terraform
 WWW=		https://github.com/infracost/infracos
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le riscv64
 ONLY_FOR_ARCHS_REASON=	Requires 64-bit processor
 
 RUN_DEPENDS=	terraform:sysutils/terraform \
 		terragrunt:sysutils/terragrunt
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}
 
 GO_BUILDFLAGS=	-ldflags="-X github.com/infracost/infracost/internal/version.Version=v${PORTVERSION}"
 GO_TARGET=	./cmd/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/kapp/Makefile b/sysutils/kapp/Makefile
index 3754af2a8d53..b9689284c73a 100644
--- a/sysutils/kapp/Makefile
+++ b/sysutils/kapp/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	kapp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.63.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	timp87@gmail.com
 COMMENT=	Simple deployment tool for Kubernetes
 WWW=		https://github.com/carvel-dev/kapp
 
 LICENSE=	APACHE20
 
 USES=		go:1.22,modules
 GO_MODULE=	github.com/carvel-dev/${PORTNAME}
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags="-X carvel.dev/kapp/pkg/kapp/version.Version=v${DISTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/kopia/Makefile b/sysutils/kopia/Makefile
index 15e7713ff6d0..b52ade2bad62 100644
--- a/sysutils/kopia/Makefile
+++ b/sysutils/kopia/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	kopia
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Fast and secure open-source backup/restore tool
 WWW=		https://kopia.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 GO_MODULE=	github.com/kopia/kopia
 GO_BUILDFLAGS=	-ldflags "\
 		-X github.com/kopia/kopia/repo.BuildVersion=${DISTVERSION} \
 		-X github.com/kopia/kopia/repo.BuildInfo="`date +%Y%m%d`""
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
 post-build:
 	${GO_WRKDIR_BIN}/${PORTNAME} --log-dir="" --help-man > ${WRKSRC}/${PORTNAME}.1
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/kops/Makefile b/sysutils/kops/Makefile
index e5158b8134e6..fc31bd5c482a 100644
--- a/sysutils/kops/Makefile
+++ b/sysutils/kops/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	kops
 PORTVERSION=	1.30.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Kubernetes Operations
 WWW=		https://github.com/kubernetes/kops
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	go-bindata:devel/go-bindata
 
 USES=		go:1.22,modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kubernetes
 
 GO_PKGNAME=	k8s.io/${PORTNAME}
 GO_TARGET=	${GO_PKGNAME}/cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags=all="-X k8s.io/kops.Version=${PORTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 pre-build:
 	cd ${WRKSRC} && \
 		${LOCALBASE}/bin/go-bindata -o upup/models/bindata.go -pkg models \
 		-prefix upup/models/ upup/models/...
 
 .include <bsd.port.mk>
diff --git a/sysutils/kubectl/Makefile b/sysutils/kubectl/Makefile
index f19f9edd2154..c4357192076c 100644
--- a/sysutils/kubectl/Makefile
+++ b/sysutils/kubectl/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	kubectl
 PORTVERSION=	1.31.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Kubernetes command-line tool
 WWW=		https://github.com/kubernetes/kubectl
 
 LICENSE=	APACHE20
 
 USES=		cpe go:1.22,modules
 CPE_VENDOR=	jenkins
 CPE_PRODUCT=	kubernetes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kubernetes
 GH_PROJECT=	kubernetes
 
 GO_PKGNAME=	k8s.io/kubernetes
 GO_TARGET=	${GO_PKGNAME}/cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags="-X k8s.io/component-base/version.gitMajor=${PORTVERSION:R:R} \
 		-X k8s.io/component-base/version.gitMinor=${PORTVERSION:R:E} \
 		-X k8s.io/component-base/version.buildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ') \
 		-X k8s.io/component-base/version.gitCommit="" \
 		-X k8s.io/component-base/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION} \
 		-X k8s.io/client-go/pkg/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 OPTIONS_DEFINE=		BASH ZSH
 OPTIONS_DEFAULT=	BASH ZSH
 
 BASH_PLIST_FILES=	share/bash-completion/completions/${PORTNAME}
 ZSH_PLIST_FILES=	share/zsh/site-functions/_${PORTNAME}
 
 post-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${STAGEDIR}${PREFIX}/bin/${PORTNAME} completion bash > ${STAGEDIR}${PREFIX}/share/bash-completion/completions/${PORTNAME}
 
 post-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${STAGEDIR}${PREFIX}/bin/${PORTNAME} completion zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/kubo-go/Makefile b/sysutils/kubo-go/Makefile
index 2b50c4e4073a..a443c70d6e08 100644
--- a/sysutils/kubo-go/Makefile
+++ b/sysutils/kubo-go/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	kubo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.29.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-go
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	IPFS implementation in Go
 WWW=		https://github.com/ipfs/kubo
 
 LICENSE=	MIT APACHE20
 LICENSE_COMB=	dual
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 
 USES=		cpe go:1.22,modules
 
 CONFLICTS_INSTALL?=	ipfs-go-*
 
 CPE_VENDOR=	protocol
 
 GO_MODULE=	github.com/ipfs/kubo
 GO_TARGET=	./cmd/ipfs:kubo
 
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_FILES=	${FULLNAME}
 SUB_LIST=	KUBO_USER=${KUBO_USER} \
 		KUBO_GROUP=${KUBO_GROUP} \
 		KUBO_HOME=${KUBO_HOME}
 PLIST_SUB=	KUBO_USER=${KUBO_USER} \
 		KUBO_GROUP=${KUBO_GROUP} \
 		KUBO_HOME=${KUBO_HOME}
 
 KUBO_USER?=	${FULLNAME}
 KUBO_GROUP?=	${FULLNAME}
 KUBO_HOME?=	/var/db/${FULLNAME}
 
 USERS=		${KUBO_USER}
 GROUPS=		${KUBO_GROUP}
 
 FULLNAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${KUBO_HOME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/minikube/Makefile b/sysutils/minikube/Makefile
index 225a84ffff25..eec17017d48a 100644
--- a/sysutils/minikube/Makefile
+++ b/sysutils/minikube/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	minikube
 PORTVERSION=	1.34.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Run Kubernetes locally
 WWW=		https://github.com/kubernetes/minikube
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	go-bindata:devel/go-bindata
 
 USES=		cpe go:1.22,modules
 CPE_VENDOR=	kubernetes
 
 GO_MODULE=	github.com/kubernetes/${PORTNAME}
 
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags="-X k8s.io/minikube/pkg/version.version=v${PORTVERSION} \
 		-X k8s.io/minikube/pkg/version.isoVersion=v1.34.0 \
 		-X k8s.io/minikube/pkg/version.storageProvisionerVersion=v5 \
 		-X k8s.io/minikube/pkg/version.isoPath=minikube/iso"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 SUB_FILES=	pkg-message
 
 pre-build:
 	cd ${WRKSRC} && \
 		${LOCALBASE}/bin/go-bindata -nomemcopy \
 		-o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... && \
 		${LOCALBASE}/bin/go-bindata -nomemcopy \
 		-o pkg/minikube/translate/translations.go -pkg translate translations/... && \
 		${LOCALBASE}/bin/gofmt${GO_SUFFIX} -s -w pkg/minikube/translate/translations.go
 
 .include <bsd.port.mk>
diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile
index 2248d807fe47..91517c79fe50 100644
--- a/sysutils/nomad/Makefile
+++ b/sysutils/nomad/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	nomad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/nomad/${DISTVERSIONFULL}/
 DISTFILES=	go.mod \
 		api/go.mod
 
 PATCH_SITES=	https://github.com/hashicorp/nomad/commit/
 PATCHFILES=	2c86fe02834dc17a518d6e485aed66e971f7ed68.patch:-p1 \
 		ed748105c9284e7c1d0feec20bb450d1d3c7007d.patch:-p1
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Cluster manager and scheduler
 WWW=		https://www.nomadproject.io/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:1.22,modules
 CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 USE_RC_SUBR=	nomad
 
 GO_MODULE=	github.com/hashicorp/nomad
 GO_BUILDFLAGS=	-tags ui \
 		-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}"
 
 USERS=		nomad
 GROUPS=		nomad
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad
 	${INSTALL_DATA} ${WRKSRC}/demo/vagrant/client1.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client1.hcl.sample
 	${INSTALL_DATA} ${WRKSRC}/demo/vagrant/client2.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client2.hcl.sample
 	${INSTALL_DATA} ${WRKSRC}/demo/vagrant/server.hcl ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample
 
 # Bring DISTINFO_FILE into scope so we can get the timestamp.
 .include <bsd.port.pre.mk>
 
 SOURCE_DATE_EPOCH_CMD=	date -ur \
 			$$(${GREP} -m1 TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \
 			'+%Y-%m-%dT%H:%M:%SZ'
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/popeye/Makefile b/sysutils/popeye/Makefile
index 9e0d56f4536b..bd8c11610d74 100644
--- a/sysutils/popeye/Makefile
+++ b/sysutils/popeye/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	popeye
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.21.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Kubernetes cluster resource sanitizer
 WWW=		https://popeye.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 _BUILD_DATE=	$$(date -u +"%FT%T%z")
 _BUILD_HASH=	f736e64
 
 GO_MODULE=	github.com/derailed/popeye
 GO_BUILDFLAGS=	-ldflags "\
 		-w \
 		-X ${GO_MODULE}/cmd.version=${DISTVERSION} \
 		-X ${GO_MODULE}/cmd.commit=${_BUILD_HASH} \
 		-X ${GO_MODULE}/cmd.date=${_BUILD_DATE}" \
 		-a -tags netgo
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/superfile/Makefile b/sysutils/superfile/Makefile
index fa2f7b3d849c..63494e16600d 100644
--- a/sysutils/superfile/Makefile
+++ b/sysutils/superfile/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	superfile
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Terminal file manager
 WWW=		https://github.com/MHNightCat/superfile
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.22
 
 GO_MODULE=	github.com/MHNightCat/superfile
 
 PLIST_FILES=	bin/superfile bin/spf
 
 post-install:
 	${LN}	${STAGEDIR}${PREFIX}/bin/superfile ${STAGEDIR}${PREFIX}/bin/spf
 
 .include <bsd.port.mk>
diff --git a/sysutils/terraform-docs/Makefile b/sysutils/terraform-docs/Makefile
index 1828a0a46993..83597a2b303a 100644
--- a/sysutils/terraform-docs/Makefile
+++ b/sysutils/terraform-docs/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	terraform-docs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.19.0
+PORTREVISION=	1
 CATEGORIES=	sysutils textproc
 
 MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Generate documentation from Terraform modules
 WWW=		https://github.com/terraform-docs/terraform-docs
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 GO_MODULE=	github.com/terraform-docs/terraform-docs
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/terraform-switcher/Makefile b/sysutils/terraform-switcher/Makefile
index e6069c8211b4..13e5b700bf95 100644
--- a/sysutils/terraform-switcher/Makefile
+++ b/sysutils/terraform-switcher/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	terraform-switcher
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Tool to switch between different versions of terraform
 WWW=		https://tfswitch.warrensbox.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=	go:1.22,modules
 
 GO_MODULE=	github.com/warrensbox/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-X main.version=${DISTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile
index 3b898b9ef58a..68c97450ee4b 100644
--- a/sysutils/terraform/Makefile
+++ b/sysutils/terraform/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	terraform
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provides a common configuration to launch infrastructure
 WWW=		https://terraform.io/
 
 USES=		cpe go:1.22,modules
 
 LICENSE_NAME=	Business Source License 1.1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror pkg-mirror pkg-sell auto-accept
 
 CPE_VENDOR=	hashicorp
 GO_MODULE=	github.com/hashicorp/terraform
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/tflint/Makefile b/sysutils/tflint/Makefile
index 9fa668c7dce9..914e1a8de874 100644
--- a/sysutils/tflint/Makefile
+++ b/sysutils/tflint/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	tflint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.53.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Terraform Linter
 WWW=		https://github.com/terraform-linters/tflint
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/terraform-linters/tflint
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/textproc/consul-template/Makefile b/textproc/consul-template/Makefile
index e30a6aac3b25..8c3c2817bd82 100644
--- a/textproc/consul-template/Makefile
+++ b/textproc/consul-template/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	consul-template
 DISTVERSION=	0.39.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Generic template rendering and notifications with Consul
 WWW=		https://github.com/hashicorp/consul-template
 
 LICENSE=	MPL20
 
 USES=		go:1.22,modules
 USE_RC_SUBR=	consul-template
 
 GO_MODULE=	github.com/hashicorp/consul-template
 GO_BUILDFLAGS=	-ldflags='\
 		-s -w -X github.com/hashicorp/consul-template/version.Name=${PORTNAME} \
 		-X github.com/hashicorp/consul-template/version.GitCommit=release'
 
 PLIST_FILES=	bin/consul-template
 
 .include <bsd.port.mk>
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index 6351580dae62..67fb1f2de7ab 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	gitlab-elasticsearch-indexer
 PORTVERSION=	5.3.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Elasticsearch indexer for GitLab
 WWW=		https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	git>=2.38.1:devel/git
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu
 #RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
 
 USES=		gmake go:modules,no_targets,1.22 pkgconfig
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GO_MOD_DIST=	gitlab
 GO_MODULE=	gitlab.com/gitlab-org/gitlab-elasticsearch-indexer
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
 MAKE_ENV+=	${GO_ENV}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 # add a git tag, as that is required by the build script
 pre-build:
 	cd ${WRKSRC} && \
 		git init && \
 		git config user.email "${MAINTAINER}" && \
 		git config user.name "Matthias Fechner" && \
 		git add . && \
 		git commit -m "tag" && \
 		git tag v${PORTVERSION}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/textproc/jqp/Makefile b/textproc/jqp/Makefile
index 1163ceec9dee..014f5e333edb 100644
--- a/textproc/jqp/Makefile
+++ b/textproc/jqp/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	jqp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	TUI playground to experiment with jq
 WWW=		https://github.com/noahgorstein/jqp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/noahgorstein/jqp
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/textproc/ytt/Makefile b/textproc/ytt/Makefile
index 4d2c660867d0..2278c57a0d5b 100644
--- a/textproc/ytt/Makefile
+++ b/textproc/ytt/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	ytt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.49.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	YAML templating tool that works on YAML structure instead of text
 WWW=		https://carvel.dev/ytt/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/carvel-dev/ytt
 GO_TARGET=	./cmd/ytt/
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/forgejo7/Makefile b/www/forgejo7/Makefile
index ac76cc489965..16587e93b232 100644
--- a/www/forgejo7/Makefile
+++ b/www/forgejo7/Makefile
@@ -1,90 +1,91 @@
 PORTNAME=	forgejo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.0.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 PKGNAMESUFFIX=	7
 DISTNAME=	forgejo-src-${DISTVERSION}
 
 MAINTAINER=	marko.cupac@mimar.rs
 COMMENT=	Compact self-hosted Git service
 WWW=		https://forgejo.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git
 
 USES=		cpe gmake go:1.22,no_targets
 USE_RC_SUBR=	forgejo
 
 CONFLICTS_INSTALL=	forgejo forgejo[0-689]*
 
 EXTRACT_AFTER_ARGS=	--strip-components 1
 SUB_FILES=	app.ini.sample pkg-message
 SUB_LIST=	GITUSER=${USERS}
 
 NO_WRKSUBDIR=	yes
 
 USERS=		git
 GROUPS=		git
 
 PORTDATA=	*
 
 OPTIONS_DEFINE=		BINDATA GIT_LFS PAM SQLITE
 OPTIONS_DEFAULT=	BINDATA GIT_LFS PAM SQLITE
 OPTIONS_SUB=		yes
 
 BINDATA_DESC=	Build a single monolithic binary, with all assets included
 GIT_LFS_DESC=	Support for Git Large File Storage (LFS)
 PAM_DESC=	Enable support for PAM
 
 BINDATA_VARS=		GO_TAGS+=bindata
 GIT_LFS_RUN_DEPENDS=	git-lfs:devel/git-lfs
 PAM_VARS=		GO_TAGS+=pam
 SQLITE_VARS=		GO_TAGS+="sqlite sqlite_unlock_notify"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 DAEMONARGS=	-S -l \$${forgejo_facility} -s \$${forgejo_priority} -T \
 		\$${name}
 .else
 DAEMONARGS=	-f
 .endif
 
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
 SSP_UNSAFE=	true
 LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'"
 LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/forgejo"'"
 MAKE_ARGS=	GOPATH=${WRKDIR} \
 		TAGS="${GO_TAGS}" \
 		GOFLAGS="-buildvcs=false"
 ALL_TARGET=	backend
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	${ECHO_CMD} ${DISTVERSION} >${WRKSRC}/VERSION
 
 # Too lazy to figure out why go install won't work.
 do-install:
 # Go binary is statically linked and cannot be stripped, so use
 # INSTALL_SCRIPT.
 	${INSTALL_SCRIPT} ${WRKSRC}/gitea \
 		${STAGEDIR}${PREFIX}/sbin/forgejo
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf
 	${INSTALL_DATA} ${WRKDIR}/app.ini.sample \
 		${STAGEDIR}${ETCDIR}/conf/app.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/custom/conf/app.example.ini \
 		${STAGEDIR}${ETCDIR}/conf/app.ini.defaults
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}/var/db/forgejo/data
 	${MKDIR} ${STAGEDIR}/var/db/forgejo/forgejo-repositories
 	${MKDIR} ${STAGEDIR}/var/log/forgejo
 
 do-install-BINDATA-off:
 	cd ${WRKSRC} && \
 		${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index 0ed8bb4eb040..2e1dd94a288b 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	gitea
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.22.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ \
 		https://dl.gitea.io/gitea/${DISTVERSION}/
 DISTNAME=	gitea-src-${DISTVERSION}
 
 MAINTAINER=	stb@lassitu.de
 COMMENT=	Compact self-hosted Git service
 WWW=		https://gitea.io/en-US/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git
 
 USES=		cpe gmake go:1.22,no_targets
 USE_RC_SUBR=	gitea
 
 EXTRACT_AFTER_ARGS=	--strip-components 1 # since 1.17.0, archive includes gitea-src-VERSION directory
 SUB_FILES+=	app.ini.sample pkg-message
 SUB_LIST+=	GITUSER=${USERS}
 
 NO_WRKSUBDIR=	yes
 
 USERS=		git
 GROUPS=		git
 
 PORTDATA=	*
 
 OPTIONS_DEFINE=	BINDATA GIT_LFS PAM SQLITE
 OPTIONS_DEFAULT=	GIT_LFS PAM SQLITE
 OPTIONS_SUB=	yes
 
 BINDATA_DESC=	Build a single monolithic binary, with all assets included
 GIT_LFS_DESC=	Support for Git Large File Storage (LFS)
 PAM_DESC=	Enable support for PAM
 
 BINDATA_VARS=	GO_TAGS+=bindata
 GIT_LFS_RUN_DEPENDS=	git-lfs:devel/git-lfs
 PAM_VARS=	GO_TAGS+=pam
 SQLITE_VARS=	GO_TAGS+="sqlite sqlite_unlock_notify"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 DAEMONARGS=	-S -l \$${gitea_facility} -s \$${gitea_priority} -T \$${name}
 .else
 DAEMONARGS=	-f
 .endif
 
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
 SSP_UNSAFE=	true
 LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/gitea"'"
 LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/gitea"'"
 MAKE_ARGS=	GOPATH=${WRKDIR} TAGS="${GO_TAGS}" GOFLAGS="-buildvcs=false"
 ALL_TARGET=	backend
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	${ECHO_CMD} ${DISTVERSION} >${WRKSRC}/VERSION
 
 # Too lazy to figure out why go install won't work.
 do-install:
 	# Go binary is statically linked and cannot be stripped, so use
 	# INSTALL_SCRIPT.
 	${INSTALL_SCRIPT} ${WRKSRC}/gitea ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf
 	${INSTALL_DATA} ${WRKDIR}/app.ini.sample ${STAGEDIR}${ETCDIR}/conf/app.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/custom/conf/app.example.ini ${STAGEDIR}${ETCDIR}/conf/app.ini.defaults
 
 do-install-BINDATA-off:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index b33919892445..600b20f29c15 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,10 +1,10 @@
 GITLAB_VERSION=		17.5.1
-GITLAB_PORTREVISION=	2
+GITLAB_PORTREVISION=	3
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
 # and from https://gitlab.com/gitlab-org/git/-/tags
 GITLAB_GIT_VERSION=	2.47.0
 # return something like x.yy
 GITLAB_GIT_VERSION_SHORT=	${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
 
diff --git a/www/mattermost-server/Makefile b/www/mattermost-server/Makefile
index 990fc1ad6542..2365d21222a6 100644
--- a/www/mattermost-server/Makefile
+++ b/www/mattermost-server/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	mattermost
 PORTVERSION=	9.11.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/decke
 PKGNAMESUFFIX=	-server
 
 # implicit-approval+ for decke
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Open source Slack-alternative in Golang and React
 WWW=		https://mattermost.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		mattermost-webapp>=${PORTVERSION}:www/mattermost-webapp
 
 USES=		go:1.22,modules tar:xz
 USE_RC_SUBR=	mattermostd
 
 GO_TARGET=	./cmd/mattermost ./cmd/mmctl ./scripts/config_generator
 GO_BUILDFLAGS=	-ldflags=" \
 		-X github.com/mattermost/mattermost/server/public/model.BuildNumber=${PORTVERSION} \
 		-X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=none \
 		-X github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=false"
 
 WRKSRC_SUBDIR=	server
 WWWDIR=		${PREFIX}/www/mattermost
 
 MATTERMOSTD_USER=	mattermost
 MATTERMOSTD_GROUP=	mattermost
 
 USERS=		${MATTERMOSTD_USER}
 GROUPS=		${MATTERMOSTD_GROUP}
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/mattermost ${STAGEDIR}${PREFIX}/bin/mattermostd
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mattermost
 	${SETENV} OUTPUT_CONFIG=${WRKSRC}/config/default.json ${WRKDIR}/bin/config_generator
 	${INSTALL_DATA} ${WRKSRC}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample
 	${RM} ${STAGEDIR}${PREFIX}/bin/config_generator
 	${MKDIR} ${STAGEDIR}${WWWDIR}/templates
 	cd ${GO_WRKSRC} && ${COPYTREE_SHARE} 'fonts i18n' ${STAGEDIR}${WWWDIR}
 	cd ${GO_WRKSRC}/templates && ${CP} *.html *.js ${STAGEDIR}${WWWDIR}/templates
 
 .include <bsd.port.mk>
diff --git a/www/miniflux/Makefile b/www/miniflux/Makefile
index 6e7f62d918f2..cb69b690f57c 100644
--- a/www/miniflux/Makefile
+++ b/www/miniflux/Makefile
@@ -1,74 +1,75 @@
 PORTNAME=	miniflux
 DISTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Self-hosted software to read RSS/Atom/JSON feeds
 WWW=		https://miniflux.app/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		go:modules,1.22
 
 USE_GITHUB=	yes
 GH_PROJECT=	v2
 GH_TUPLE=	\
 		PuerkitoBio:goquery:v1.9.2:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
 		abadojack:whatlanggo:v1.0.1:abadojack_whatlanggo/vendor/github.com/abadojack/whatlanggo \
 		andybalholm:brotli:v1.1.0:andybalholm_brotli/vendor/github.com/andybalholm/brotli \
 		andybalholm:cascadia:v1.3.2:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		cespare:xxhash:v2.3.0:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
 		coreos:go-oidc:v3.11.0:coreos_go_oidc_v3/vendor/github.com/coreos/go-oidc/v3 \
 		fxamacker:cbor:v2.6.0:fxamacker_cbor_v2/vendor/github.com/fxamacker/cbor/v2 \
 		go-jose:go-jose:v4.0.2:go_jose_go_jose_v4/vendor/github.com/go-jose/go-jose/v4 \
 		go-webauthn:webauthn:v0.10.2:go_webauthn_webauthn/vendor/github.com/go-webauthn/webauthn \
 		go-webauthn:x:v0.1.9:go_webauthn_x/vendor/github.com/go-webauthn/x \
 		golang-jwt:jwt:v5.2.1:golang_jwt_jwt_v5/vendor/github.com/golang-jwt/jwt/v5 \
 		golang:crypto:v0.26.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:v0.28.0:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:v0.22.0:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:sys:v0.23.0:golang_sys/vendor/golang.org/x/sys \
 		golang:term:v0.23.0:golang_term/vendor/golang.org/x/term \
 		golang:text:v0.17.0:golang_text/vendor/golang.org/x/text \
 		google:go-tpm:v0.9.0:google_go_tpm/vendor/github.com/google/go-tpm \
 		google:uuid:v1.6.0:google_uuid/vendor/github.com/google/uuid \
 		gorilla:mux:v1.8.1:gorilla_mux/vendor/github.com/gorilla/mux \
 		klauspost:compress:v1.17.9:klauspost_compress/vendor/github.com/klauspost/compress \
 		lib:pq:v1.10.9:lib_pq/vendor/github.com/lib/pq \
 		mitchellh:mapstructure:v1.5.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		munnerz:goautoneg:a7dc8b61c822:munnerz_goautoneg/vendor/github.com/munnerz/goautoneg \
 		mvdan:xurls:v2.5.0:mvdan_xurls/vendor/mvdan.cc/xurls/v2 \
 		prometheus:client_golang:v1.20.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.6.1:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.55.0:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.15.1:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		protocolbuffers:protobuf-go:v1.34.2:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		tdewolff:minify:v2.20.37:tdewolff_minify_v2/vendor/github.com/tdewolff/minify/v2 \
 		tdewolff:parse:v2.7.15:tdewolff_parse_v2/vendor/github.com/tdewolff/parse/v2 \
 		x448:float16:v0.8.4:x448_float16/vendor/github.com/x448/float16 \
 		yuin:goldmark:v1.7.4:yuin_goldmark/vendor/github.com/yuin/goldmark
 USE_RC_SUBR=	miniflux
 
 GO_PKGNAME=	miniflux.app
 GO_TARGET=	:${PORTNAME}
 GO_BUILDFLAGS=	-ldflags="-X miniflux.app/version.Version=${DISTVERSION} \
 		-X miniflux.app/version.BuildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ')"
 
 USERS=		miniflux
 GROUPS=		miniflux
 
 OPTIONS_DEFINE=		PGSQL_SERVER
 PGSQL_SERVER_DESC=	Install the PostgreSQL Server Component
 PGSQL_SERVER_USES=	pgsql
 PGSQL_SERVER_VARS=	WANT_PGSQL+="server contrib"
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/miniflux.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_DATA} ${FILESDIR}/miniflux.env.sample \
 		${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/www/nginx-prometheus-exporter/Makefile b/www/nginx-prometheus-exporter/Makefile
index 7ed266f2fbfe..79362f7b772e 100644
--- a/www/nginx-prometheus-exporter/Makefile
+++ b/www/nginx-prometheus-exporter/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	nginx-prometheus-exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	arcade@b1t.name
 COMMENT=	Prometheus exporter for NGINX and NGINX Plus stats
 WWW=		https://github.com/nginxinc/nginx-prometheus-exporter
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.22
 
 USE_RC_SUBR=	${PORTNAME}
 GO_MODULE=	github.com/nginxinc/nginx-prometheus-exporter
 GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}"
 
 LD_FLAG_X_PREFIX=	-X main
 LD_FLAG_STRING=		${STRIP} ${LD_FLAG_X_PREFIX}.version=${DISTVERSION}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/oauth2-proxy/Makefile b/www/oauth2-proxy/Makefile
index 13eea5712f03..5c8e875aa7a9 100644
--- a/www/oauth2-proxy/Makefile
+++ b/www/oauth2-proxy/Makefile
@@ -1,135 +1,136 @@
 PORTNAME=	oauth2-proxy
 PORTVERSION=	7.7.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	freebsd@rheinwolf.de
 COMMENT=	OAuth 2.0 proxy server
 WWW=		https://github.com/oauth2-proxy/oauth2-proxy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.22
 
 USE_GITHUB=	yes
 GH_TUPLE=	\
 		Bose:minisentinel:917c5a9223bb:bose_minisentinel/vendor/github.com/Bose/minisentinel \
 		a8m:envsubst:v1.4.2:a8m_envsubst/vendor/github.com/a8m/envsubst \
 		alicebob:gopher-json:906a9b012302:alicebob_gopher_json/vendor/github.com/alicebob/gopher-json \
 		alicebob:miniredis:v2.33.0:alicebob_miniredis_v2/vendor/github.com/alicebob/miniredis/v2 \
 		benbjohnson:clock:v1.3.5:benbjohnson_clock/vendor/github.com/benbjohnson/clock \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		bitly:go-simplejson:v0.5.1:bitly_go_simplejson/vendor/github.com/bitly/go-simplejson \
 		bmizerany:assert:b7ed37b82869:bmizerany_assert/vendor/github.com/bmizerany/assert \
 		bsm:redislock:v0.9.4:bsm_redislock/vendor/github.com/bsm/redislock \
 		census-instrumentation:opencensus-go:v0.24.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
 		cespare:xxhash:v2.3.0:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
 		coreos:go-oidc:v3.11.0:coreos_go_oidc_v3/vendor/github.com/coreos/go-oidc/v3 \
 		davecgh:go-spew:d8f796af33cc:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dgryski:go-rendezvous:9f7001d12a5f:dgryski_go_rendezvous/vendor/github.com/dgryski/go-rendezvous \
 		felixge:httpsnoop:v1.0.4:felixge_httpsnoop/vendor/github.com/felixge/httpsnoop \
 		fsnotify:fsnotify:v1.7.0:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		ghodss:yaml:d8423dcdf344:ghodss_yaml/vendor/github.com/ghodss/yaml \
 		go-ini:ini:v1.67.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
 		go-jose:go-jose:v3.0.3:go_jose_go_jose_v3/vendor/github.com/go-jose/go-jose/v3 \
 		go-jose:go-jose:v4.0.4:go_jose_go_jose_v4/vendor/github.com/go-jose/go-jose/v4 \
 		go-logr:logr:v1.4.2:go_logr_logr/vendor/github.com/go-logr/logr \
 		go-logr:stdr:v1.2.2:go_logr_stdr/vendor/github.com/go-logr/stdr \
 		go-task:slim-sprig:v3.0.0:go_task_slim_sprig_v3/vendor/github.com/go-task/slim-sprig/v3 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		golang-jwt:jwt:v5.2.1:golang_jwt_jwt_v5/vendor/github.com/golang-jwt/jwt/v5 \
 		golang:crypto:v0.27.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:exp:701f63a606c0:golang_exp/vendor/golang.org/x/exp \
 		golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
 		golang:net:v0.29.0:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:v0.23.0:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:sync:v0.8.0:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:v0.25.0:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.18.0:golang_text/vendor/golang.org/x/text \
 		golang:tools:v0.25.0:golang_tools/vendor/golang.org/x/tools \
 		google:go-cmp:v0.6.0:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:go-genproto:9d4c2d233b61:google_go_genproto/vendor/google.golang.org/genproto \
 		google:pprof:a0b0bb1d4134:google_pprof/vendor/github.com/google/pprof \
 		google:s2a-go:v0.1.8:google_s2a_go/vendor/github.com/google/s2a-go \
 		google:uuid:v1.6.0:google_uuid/vendor/github.com/google/uuid \
 		googleapis:enterprise-certificate-proxy:v0.3.4:googleapis_enterprise_certificate_proxy/vendor/github.com/googleapis/enterprise-certificate-proxy \
 		googleapis:gax-go:v2.13.0:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
 		googleapis:google-api-go-client:v0.198.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
 		googleapis:google-cloud-go:auth/v0.9.4:googleapis_google_cloud_go_auth/vendor/cloud.google.com/go \
 		googleapis:google-cloud-go:auth/oauth2adapt/v0.2.4:googleapis_google_cloud_go/vendor/cloud.google.com/go/auth/oauth2adapt \
 		googleapis:google-cloud-go:compute/metadata/v0.5.2:googleapis_google_cloud_go_1/vendor/cloud.google.com/go/compute/metadata \
 		gorilla:mux:v1.8.1:gorilla_mux/vendor/github.com/gorilla/mux \
 		grpc:grpc-go:v1.67.0:grpc_grpc_go/vendor/google.golang.org/grpc \
 		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
 		justinas:alice:v1.2.0:justinas_alice/vendor/github.com/justinas/alice \
 		klauspost:compress:v1.17.10:klauspost_compress/vendor/github.com/klauspost/compress \
 		kubernetes:apimachinery:v0.31.1:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
 		kubernetes:gengo:a0386bf69313:kubernetes_gengo/vendor/k8s.io/gengo \
 		kubernetes:klog:v2.130.1:kubernetes_klog/vendor/k8s.io/klog/v2 \
 		kylelemons:godebug:v1.1.0:kylelemons_godebug/vendor/github.com/kylelemons/godebug \
 		magiconair:properties:v1.8.7:magiconair_properties/vendor/github.com/magiconair/properties \
 		mbland:hmacauth:44256dfd4bfa:mbland_hmacauth/vendor/github.com/mbland/hmacauth \
 		mitchellh:mapstructure:v1.5.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		munnerz:goautoneg:a7dc8b61c822:munnerz_goautoneg/vendor/github.com/munnerz/goautoneg \
 		natefinch:lumberjack:v2.2.1:natefinch_lumberjack/vendor/gopkg.in/natefinch/lumberjack.v2 \
 		nxadm:tail:v1.4.11:nxadm_tail/vendor/github.com/nxadm/tail \
 		oauth2-proxy:mockoidc:caebfff84d25:oauth2_proxy_mockoidc/vendor/github.com/oauth2-proxy/mockoidc \
 		oauth2-proxy:tools:d3b50d1a591a:oauth2_proxy_tools_reference_gen/vendor/github.com/oauth2-proxy/tools \
 		ohler55:ojg:v1.24.1:ohler55_ojg/vendor/github.com/ohler55/ojg \
 		onsi:ginkgo:v1.16.5:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
 		onsi:ginkgo:v2.20.2:onsi_ginkgo_v2/vendor/github.com/onsi/ginkgo/v2 \
 		onsi:gomega:v1.34.2:onsi_gomega/vendor/github.com/onsi/gomega \
 		open-telemetry:opentelemetry-go-contrib:v1.30.0:open_telemetry_opentelemetry_go_contrib/vendor/go.opentelemetry.io/contrib \
 		open-telemetry:opentelemetry-go:v1.30.0:open_telemetry_opentelemetry_go/vendor/go.opentelemetry.io/otel \
 		pelletier:go-toml:v2.2.3:pelletier_go_toml_v2/vendor/github.com/pelletier/go-toml/v2 \
 		pierrec:lz4:v4.1.21:pierrec_lz4_v4/vendor/github.com/pierrec/lz4/v4 \
 		pmezard:go-difflib:5d4384ee4fb2:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		prometheus:client_golang:v1.20.4:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.6.1:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.59.1:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.15.1:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		protocolbuffers:protobuf-go:v1.34.2:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		redis:go-redis:v9.6.1:redis_go_redis_v9/vendor/github.com/redis/go-redis/v9 \
 		sagikazarmark:locafero:v0.6.0:sagikazarmark_locafero/vendor/github.com/sagikazarmark/locafero \
 		sagikazarmark:slog-shim:v0.1.0:sagikazarmark_slog_shim/vendor/github.com/sagikazarmark/slog-shim \
 		sourcegraph:conc:v0.3.0:sourcegraph_conc/vendor/github.com/sourcegraph/conc \
 		spf13:afero:v1.11.0:spf13_afero/vendor/github.com/spf13/afero \
 		spf13:cast:v1.7.0:spf13_cast/vendor/github.com/spf13/cast \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		spf13:viper:v1.19.0:spf13_viper/vendor/github.com/spf13/viper \
 		stretchr:testify:v1.9.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		subosito:gotenv:v1.6.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
 		uber-go:multierr:v1.11.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		vmihailenco:msgpack:v5.4.1:vmihailenco_msgpack_v5/vendor/github.com/vmihailenco/msgpack/v5 \
 		vmihailenco:tagparser:v2.0.0:vmihailenco_tagparser_v2/vendor/github.com/vmihailenco/tagparser/v2 \
 		yuin:gopher-lua:v1.1.1:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
 
 USE_RC_SUBR=	oauth2_proxy
 
 GO_BUILDFLAGS=	-v -ldflags="-s -X github.com/${PORTNAME}/${PORTNAME}/v7/pkg/version.VERSION=${PORTVERSION}"
 
 USER=		www
 GROUP=		www
 
 VAR_DIR?=	/var
 LOG_DIR?=	${VAR_DIR}/log/${PORTNAME}
 RUN_DIR?=	${VAR_DIR}/run/${PORTNAME}
 
 SUB_LIST+=	GROUP=${GROUP} \
 		LOG_DIR=${LOG_DIR} \
 		PORTNAME=${PORTNAME} \
 		PREFIX=${PREFIX} \
 		RUN_DIR=${RUN_DIR} \
 		USER=${USER}
 
 post-extract:
 	${CP} ${FILESDIR}/modules.txt ${WRKSRC}/vendor
 
 post-install:
 	${MKDIR} ${STAGEDIR}${LOG_DIR}
 	${MKDIR} ${STAGEDIR}${RUN_DIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${PORTNAME}.cfg.example ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg.sample
 
 .include <bsd.port.mk>
diff --git a/www/shiori/Makefile b/www/shiori/Makefile
index 4b99bd3012e7..9421e7dbeda8 100644
--- a/www/shiori/Makefile
+++ b/www/shiori/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	shiori
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Simple bookmark manager built with Go
 WWW=		https://github.com/go-shiori/shiori
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/go-shiori/shiori
 
 PLIST_FILES=	bin/${PORTNAME}
 
 BUILD_DATE=	%FT%T
 
 # fix `shiori version` output
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's/"dev"/"${DISTVERSION}"/1' \
 		-e 's/"none"/"${OPSYS}"/1' \
 		-e 's/"unknown"/"${BUILD_DATE:gmtime}"/1' \
 		${WRKSRC}/main.go \
 		${WRKSRC}/internal/model/main.go
 
 .include <bsd.port.mk>
diff --git a/www/tgpt/Makefile b/www/tgpt/Makefile
index 34c2357c8256..e5b599f39ba0 100644
--- a/www/tgpt/Makefile
+++ b/www/tgpt/Makefile
@@ -1,69 +1,70 @@
 PORTNAME=	tgpt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	nxjoseph@protonmail.com
 COMMENT=	AI Chatbots in terminal without needing API keys
 WWW=		https://github.com/aandrew-me/tgpt
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.22,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	aandrew-me
 GH_TUPLE=	andybalholm:brotli:v1.1.0:andybalholm_brotli/vendor/github.com/andybalholm/brotli \
 		atotto:clipboard:v0.1.4:atotto_clipboard/vendor/github.com/atotto/clipboard \
 		aymanbagabas:go-osc52:v2.0.1:aymanbagabas_go_osc52_v2/vendor/github.com/aymanbagabas/go-osc52/v2 \
 		bogdanfinn:fhttp:v0.5.28:bogdanfinn_fhttp/vendor/github.com/bogdanfinn/fhttp \
 		bogdanfinn:tls-client:v1.7.7:bogdanfinn_tls_client/vendor/github.com/bogdanfinn/tls-client \
 		bogdanfinn:utls:v1.6.1:bogdanfinn_utls/vendor/github.com/bogdanfinn/utls \
 		c-bata:go-prompt:v0.2.6:c_bata_go_prompt/vendor/github.com/c-bata/go-prompt \
 		charmbracelet:bubbles:v0.18.0:charmbracelet_bubbles/vendor/github.com/charmbracelet/bubbles \
 		charmbracelet:bubbletea:v0.27.0:charmbracelet_bubbletea/vendor/github.com/charmbracelet/bubbletea \
 		charmbracelet:lipgloss:v0.12.1:charmbracelet_lipgloss/vendor/github.com/charmbracelet/lipgloss \
 		charmbracelet:x:ansi/v0.1.4:charmbracelet_x_ansi/vendor/github.com/charmbracelet/x \
 		charmbracelet:x:input/v0.1.0:charmbracelet_x_input/vendor/github.com/charmbracelet/x/input \
 		charmbracelet:x:term/v0.1.1:charmbracelet_x_term \
 		cloudflare:circl:v1.3.6:cloudflare_circl/vendor/github.com/cloudflare/circl \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		erikgeiser:coninput:1c3628e74d0f:erikgeiser_coninput/vendor/github.com/erikgeiser/coninput \
 		fatih:color:v1.17.0:fatih_color/vendor/github.com/fatih/color \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
 		golang:crypto:v0.26.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:mod:v0.20.0:golang_mod/vendor/golang.org/x/mod \
 		golang:net:v0.28.0:golang_net/vendor/golang.org/x/net \
 		golang:sync:v0.8.0:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:v0.24.0:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.17.0:golang_text/vendor/golang.org/x/text \
 		klauspost:compress:v1.17.9:klauspost_compress/vendor/github.com/klauspost/compress \
 		kr:text:v0.2.0:kr_text/vendor/github.com/kr/text \
 		lucasb-eyer:go-colorful:v1.2.0:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
 		mattn:go-colorable:v0.1.13:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-localereader:v0.0.1:mattn_go_localereader/vendor/github.com/mattn/go-localereader \
 		mattn:go-runewidth:v0.0.16:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		mattn:go-tty:v0.0.7:mattn_go_tty/vendor/github.com/mattn/go-tty \
 		muesli:ansi:276c6243b2f6:muesli_ansi/vendor/github.com/muesli/ansi \
 		muesli:cancelreader:v0.2.2:muesli_cancelreader/vendor/github.com/muesli/cancelreader \
 		muesli:termenv:v0.15.2:muesli_termenv/vendor/github.com/muesli/termenv \
 		olekukonko:ts:78ecb04241c0:olekukonko_ts/vendor/github.com/olekukonko/ts \
 		pkg:term:v1.2.0-beta.2:pkg_term/vendor/github.com/pkg/term \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		quic-go:quic-go:v0.37.4:quic_go_quic_go/vendor/github.com/quic-go/quic-go \
 		rivo:uniseg:v0.4.7:rivo_uniseg/vendor/github.com/rivo/uniseg \
 		rogpeppe:go-internal:v1.12.0:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal \
 		stretchr:testify:v1.9.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		tam7t:hpkp:2b70b4024ed5:tam7t_hpkp/vendor/github.com/tam7t/hpkp \
 		xo:terminfo:abceb7e1c41e:xo_terminfo/vendor/github.com/xo/terminfo
 
 GO_BUILDFLAGS=	-ldflags="-s -w"
 
 PLIST_FILES=	bin/tgpt
 
 post-extract:
 	@${RM} -r ${WRKSRC}/vendor/github.com/charmbracelet/x/term
 	@${RLN} ${WRKSRC_charmbracelet_x_term}/term ${WRKSRC}/vendor/github.com/charmbracelet/x/term
 
 .include <bsd.port.mk>
diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
index 8acca37ab5b8..4e2ca76ef3fe 100644
--- a/x11/kitty/Makefile
+++ b/x11/kitty/Makefile
@@ -1,129 +1,130 @@
 PORTNAME=	kitty
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.36.4
+PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Cross-platform, fast, featureful, GPU-based terminal emulator
 WWW=		https://sw.kovidgoyal.net/kitty/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \
 		nerd-fonts>=3.1.1:x11-fonts/nerd-fonts \
 		simde>=0.7.6:devel/simde \
 		sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
 		urw-base35-fonts>=20200910:x11-fonts/urw-base35-fonts \
 		wayland-protocols>=0:graphics/wayland-protocols
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libdbus-1.so:devel/dbus \
 		libepoll-shim-interpose.so:devel/libepoll-shim \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		librsync.so:net/librsync \
 		libwayland-client.so:graphics/wayland \
 		libwayland-cursor.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxxhash.so:devel/xxhash
 
 USES=		compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \
 		go:1.22,modules magick pkgconfig python shebangfix ssl tar:xz \
 		terminfo xorg
 CPE_VENDOR=	kitty_project
 
 USE_GL=		gl
 USE_XORG=	x11 xcb xcursor xi xinerama xrandr
 
 SHEBANG_FILES=	build-terminfo count-lines-of-code update-on-ox
 SHEBANG_GLOB=	*.py
 
 GO_MODULE=	github.com/kovidgoyal/kitty
 
 MAKE_ENV=	PYTHONDONTWRITEBYTECODE=1
 TEST_ENV=	PATH="${STAGEDIR}${PREFIX}/bin:${PATH}"
 TEST_TARGET=	test
 
 CPPFLAGS+=	`pkg-config --cflags epoll-shim-interpose`
 LDFLAGS+=	`pkg-config --libs epoll-shim-interpose`
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
 
 BUILD_DIR=	${WRKSRC}/${OPSYS:tl}-package
 
 INSTALL_WRKSRC=	${WRKSRC}/linux-package
 
 _STRIP_TARGETS=	kitty/fast_data_types.so kitty/glfw-x11.so \
 		kitty/glfw-wayland.so kittens/transfer/rsync.so
 
 _EMPTY_DIRS=	kittens/choose kittens/diff kittens/unicode_input kittens kitty
 
 OPTIONS_DEFINE=		DOCS
 DOCS_BUILD_DEPENDS=	roboto-fonts-ttf>=2.134:x11-fonts/roboto-fonts-ttf
 DOCS_MAKE_ENV=		BUILD_DOCS=yes
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=invalid-utf8 -Winvalid-utf8
 .endif
 
 .if ${ARCH:Mriscv64*}
 MAKE_ENV+=	KITTY_NO_LTO=1
 .endif
 
 # ncursesw and tinfo >= 6.1 seem to be neededd
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400035
 USES+=		ncurses:port
 .else
 USES+=		ncurses
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -E \
 		-e "s:'go':'${GO_CMD}':1" \
 		-e "s:(dirs_exist_ok=True):\1, ignore=shutil.ignore_patterns('*.orig', '*.bak'):1" \
 		${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:1" \
 		${WRKSRC}/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
 	${REINPLACE_CMD} -e "s:^\(go \)1.23:\1${GO_VERSION}:1" \
 		${WRKSRC}/go.mod
 
 # For librsync, we need to set header and library path
 do-build:
 	(cd ${WRKSRC} && \
 	        ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -OO setup.py \
 			--extra-include-dirs ${LOCALBASE}/include \
 			--extra-library-dirs ${LOCALBASE}/lib \
 			--libdir-name share \
 			--prefix ${BUILD_DIR:T} \
 			--update-check-interval 0 \
 			linux-package)
 
 do-install:
 	cd ${BUILD_DIR} && \
 		${INSTALL_PROGRAM} bin/kitty bin/kitten ${STAGEDIR}${PREFIX}/bin && \
 		${INSTALL_DATA} share/applications/* ${STAGEDIR}${DESKTOPDIR} && \
 	cd ${BUILD_DIR}/share/icons/hicolor && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icons/hicolor
 	cd ${BUILD_DIR}/share/kitty && \
 	       	${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/terminfo/kitty.terminfo \
 		${STAGEDIR}${PREFIX}/share/misc/
 	${STRIP_CMD} ${_STRIP_TARGETS:S|^|${STAGEDIR}${DATADIR}/|}
 	${INSTALL_MAN} ${BUILD_DIR}/share/man/man1/kitty.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${BUILD_DIR}/share/man/man5/kitty.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5
 
 do-install-DOCS-on:
 	cd ${BUILD_DIR}/share/doc/kitty/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 			"-not ( -name .buildinfo -or -name .nojekyll )"
 
 .include <bsd.port.mk>
diff --git a/x11/wallutils/Makefile b/x11/wallutils/Makefile
index b52767c80c90..f9350f6d2cd8 100644
--- a/x11/wallutils/Makefile
+++ b/x11/wallutils/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	wallutils
 DISTVERSION=	5.12.9
+PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Utilities for handling monitors, resolutions, wallpapers and timed wallpapers
 WWW=		https://github.com/xyproto/wallutils
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libX11.so:x11/libX11
 
 USES=		go:1.22,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	xyproto
 GH_TUPLE=	antchfx:xmlquery:v1.3.8:antchfx_xmlquery/vendor/github.com/antchfx/xmlquery \
 		antchfx:xpath:v1.2.0:antchfx_xpath/vendor/github.com/antchfx/xpath \
 		anthonynsimon:bild:v0.14.0:anthonynsimon_bild/vendor/github.com/anthonynsimon/bild \
 		cpuguy83:go-md2man:v2.0.4:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
 		fatih:color:v1.17.0:fatih_color/vendor/github.com/fatih/color \
 		golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
 		golang:image:v0.18.0:golang_image/vendor/golang.org/x/image \
 		golang:net:58aab5ef257a:golang_net/vendor/golang.org/x/net \
 		golang:sys:v0.18.0:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.16.0:golang_text/vendor/golang.org/x/text \
 		mattn:go-colorable:v0.1.13:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		russross:blackfriday:v2.1.0:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
 		stretchr:powerwalk:bceb9d014549:stretchr_powerwalk/vendor/github.com/stretchr/powerwalk \
 		urfave:cli:v1.22.15:urfave_cli/vendor/github.com/urfave/cli \
 		xyproto:env:v2.2.5:xyproto_env_v2/vendor/github.com/xyproto/env \
 		xyproto:heic:v1.0.0:xyproto_heic/vendor/github.com/xyproto/heic
 GL_TUPLE=	https://gitlab.howett.net:go:plist:1454fab16a0642638feb0ae98c41f79eccb2a20a:go_plist/vendor/howett.net/plist
 GO_TARGET=	./cmd/getdpi \
 		./cmd/lscollection \
 		./cmd/lsmon \
 		./cmd/lstimed \
 		./cmd/lswallpaper \
 		./cmd/setcollection \
 		./cmd/setrandom \
 		./cmd/settimed \
 		./cmd/setwallpaper \
 		./cmd/timedinfo \
 		./cmd/vram \
 		./cmd/wayinfo \
 		./cmd/xinfo \
 		./cmd/xml2stw \
 		${NULL}
 PLIST_FILES=	${GO_TARGET:S,./cmd,bin,} \
 		share/man/man1/getdpi.1.gz \
 		share/man/man1/vram.1.gz
 
 OPTIONS_DEFINE=		HEIF
 OPTIONS_DEFAULT=	HEIF
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_USES=		pkgconfig
 HEIF_VARS=		GO_TARGET+=./cmd/heic2stw
 
 post-patch:
 # Respect PREFIX for wallpapers
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/cmd/heic2stw/main.go \
 		${WRKSRC}/collections.go
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/cmd/getdpi/getdpi.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/cmd/vram/vram.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>