diff --git a/databases/redis_exporter/Makefile b/databases/redis_exporter/Makefile
index 22c760de02eb..406b63a29fb2 100644
--- a/databases/redis_exporter/Makefile
+++ b/databases/redis_exporter/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	redis_exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.58.0
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	arcade@b1t.name
 COMMENT=	Prometheus exporter for redis stats
 WWW=		https://github.com/oliver006/redis_exporter
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.22
 
 USE_RC_SUBR=	redis_exporter
 
 GO_MODULE=	github.com/oliver006/redis_exporter
 GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}"
 
 PLIST_FILES=	bin/redis_exporter
 
 LD_FLAG_X_PREFIX=	-X main
 LD_FLAG_STRING=		${STRIP} ${LD_FLAG_X_PREFIX}.BuildVersion=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/databases/usql/Makefile b/databases/usql/Makefile
index 6e17ff9403fe..106c47f131a1 100644
--- a/databases/usql/Makefile
+++ b/databases/usql/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	usql
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.18.1
+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
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/xo/usql
 
 PLIST_FILES=	bin/usql
 
 .include <bsd.port.mk>
diff --git a/devel/cirrus-cli/Makefile b/devel/cirrus-cli/Makefile
index 274d5ea479d5..f5f692100643 100644
--- a/devel/cirrus-cli/Makefile
+++ b/devel/cirrus-cli/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	cirrus-cli
 DISTVERSION=	0.115.1
 DISTVERSIONPREFIX=	v
+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=${PORTVERSION}"
 
 SUB_FILES=	pkg-message
 
 USERS=		cirrus
 GROUPS=		cirrus
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/cirrus-worker.yml ${STAGEDIR}${PREFIX}/etc/cirrus-worker.yml.sample
 
 .include <bsd.port.mk>
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index e122e40307a1..5c4434e985ee 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,69 +1,70 @@
 PORTNAME=	gitaly
 DISTVERSIONPREFIX=	v
 DISTVERSION=	16.10.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Smart reverse proxy for GitLab
 WWW=		https://gitlab.com/gitlab-org/gitaly
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # define dependencies that are required for build and run under MY_DEPENDS
 MY_DEPENDS=	git>=2.43.0:devel/git
 BUILD_DEPENDS=	bash>0:shells/bash \
 		${LOCALBASE}/bin/cmake:devel/cmake-core \
 		pcre2>0:devel/pcre2 \
 		http-parser>0:www/http-parser \
 		${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS}
 
 USES=		cpe gmake go:modules,no_targets,1.22 iconv pkgconfig ssl
 
 CPE_VENDOR=	gitlab
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
 MAKE_ENV+=	${GO_ENV}
 
 # 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
 # ---------------------------
 FETCH_DEPENDS=	${GO_CMD}:${GO_PORT}
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitaly/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
 _USES_fetch+=	800:go-post-fetch
 go-post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
 # ---------------------------
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	(cd ${WRKSRC}/_build/bin/ && ${COPYTREE_BIN} .  ${STAGEDIR}${DATADIR}/bin && \
 	cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample  ${STAGEDIR}${DATADIR})
 
 post-install:
 	${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		/gitlab-shell-hook$$/ s#^#@(,,755) #; \
 		s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index bb8f7654a7d3..415e2ada8cc7 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	gitlab-runner
 DISTVERSIONPREFIX=	v
 DISTVERSION=	16.10.0
+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=	16-10-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 dc2a463a2a6b..0f5576b95e7d 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,79 +1,80 @@
 PORTNAME=	gitlab-shell
 PORTVERSION=	14.34.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
 
 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
 
 # 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
 # ---------------------------
 FETCH_DEPENDS=	${GO_CMD}:${GO_PORT}
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-shell/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
 _USES_fetch+=	800:go-post-fetch
 go-post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
 # ---------------------------
 
 VARLOGDIR=	/var/log/gitlab-shell
 
 PLIST_FILES+=	"@dir(git,,755) ${VARLOGDIR}"
 
 post-patch:
 	${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/dns/dnscontrol/Makefile b/dns/dnscontrol/Makefile
index daa5071dbbc5..0e02b16c006c 100644
--- a/dns/dnscontrol/Makefile
+++ b/dns/dnscontrol/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	dnscontrol
 DISTVERSIONPREFIX=v
 DISTVERSION=	4.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Synchronize your DNS to multiple providers from a simple DSL
 WWW=		https://stackexchange.github.io/dnscontrol/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.21,modules
 GO_MODULE=	github.com/StackExchange/dnscontrol/v4
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/editors/orbiton/Makefile b/editors/orbiton/Makefile
index c56180b083b5..c12b004ad509 100644
--- a/editors/orbiton/Makefile
+++ b/editors/orbiton/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	orbiton
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.65.11
+PORTREVISION=	1
 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/lang/gptscript/Makefile b/lang/gptscript/Makefile
index f9f47b61dde2..b89bd79a1d71 100644
--- a/lang/gptscript/Makefile
+++ b/lang/gptscript/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	gptscript
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.2
+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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gptscript-ai
 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/ls-lint/Makefile b/misc/ls-lint/Makefile
index c736e49135fc..b5bb806af8cf 100644
--- a/misc/ls-lint/Makefile
+++ b/misc/ls-lint/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	ls-lint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.3
+PORTREVISION=	1
 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/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index c37dbf133e89..6021353dd5b3 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	telegraf
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.30.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Time-series data collection
 WWW=		https://influxdata.com/time-series-platform/telegraf/
 
 LICENSE=	MIT
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7
 
 USES=		go:1.22,modules
 
 USE_RC_SUBR=	telegraf
 
 GO_MODULE=	github.com/influxdata/telegraf
 GO_BUILDFLAGS=	-ldflags "-X main.goos=freebsd -X main.goarch=${ARCH} -X main.version=${DISTVERSION}"
 GO_TARGET=	./cmd/telegraf
 
 SUB_FILES=	telegraf
 SUB_LIST=	TELEGRAF_USER=${TELEGRAF_USER} \
 		TELEGRAF_GROUP=${TELEGRAF_GROUP} \
 		TELEGRAF_LOGDIR=${TELEGRAF_LOGDIR}
 PLIST_SUB=	TELEGRAF_USER=${TELEGRAF_USER} \
 		TELEGRAF_GROUP=${TELEGRAF_GROUP} \
 		TELEGRAF_LOGDIR=${TELEGRAF_LOGDIR}
 
 TELEGRAF_USER=	telegraf
 TELEGRAF_GROUP=	telegraf
 
 USERS=		${TELEGRAF_USER}
 GROUPS=		${TELEGRAF_GROUP}
 
 TELEGRAF_LOGDIR=/var/log/${PORTNAME}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${TELEGRAF_LOGDIR}
 
 .include <bsd.port.mk>
diff --git a/net/frp/Makefile b/net/frp/Makefile
index a066c56873a0..f22d91a3136e 100644
--- a/net/frp/Makefile
+++ b/net/frp/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	frp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.56.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/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index dce864d4f687..de2873355cc8 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	gitlab-agent
 PORTVERSION=	16.10.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	GitLab kubernetes agent
 WWW=		https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent
 
 LICENSE=	MIT
 
 # bazel>=0:devel/bazel  \
 BUILD_DEPENDS=	git>=0:devel/git \
 		golangci-lint>=0:devel/golangci-lint
 
 USES=		go:modules,1.22
 GO_MODULE=	gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16
 
 _BUILD_DATE=	$$(date -u "+%Y-%m-%d-%H%M UTC")
 GO_BUILDFLAGS= -tags="tracer_static,tracer_static_jaeger" \
 		-ldflags=" \
 		-X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.Version=v${PORTVERSION}' \
 		-X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.Commit=${GL_TAGNAME:C/^(........).*/\1/}' \
 		-X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.BuildTime=${_BUILD_DATE}'"
 GO_TARGET=     ./cmd/kas
 
 PLIST_FILES=	bin/kas
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/kas ${STAGEDIR}${PREFIX}/bin/kas
 
 .include <bsd.port.mk>
diff --git a/net/traefik/Makefile b/net/traefik/Makefile
index dfb5d8a685f9..edd0e162c931 100644
--- a/net/traefik/Makefile
+++ b/net/traefik/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	traefik
 PORTVERSION=	2.11.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	LOCAL/riggs/${PORTNAME}
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	High availability reverse proxy and load balancer
 WWW=		https://traefik.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	go-bindata:devel/go-bindata
 
 USES=		cpe go:1.22,modules tar:xz
 
 USE_RC_SUBR=	traefik
 
 GO_BUILDFLAGS=	-ldflags "-s -w \
 		-X github.com/traefik/traefik/v2/pkg/version.Version=${DISTVERSION} \
 		-X github.com/traefik/traefik/v2/pkg/version.Codename=portbuild \
 		-X github.com/traefik/traefik/v2/pkg/version.BuildDate=`date -u '+%Y-%m-%d_%I:%M:%S%p'`"
 GO_TARGET=	./cmd/traefik
 CGO_ENABLED=	0
 
 USERS=		traefik
 GROUPS=		traefik
 
 PLIST_FILES=	bin/traefik \
 		"@sample etc/traefik.toml.sample" \
 		"@sample etc/traefik.yml.sample"
 
 # Preparing the vendor dir for a self-contained tarball now works by just
 # running 'go generate && go mod vendor' as a user and bundling the resulting
 # ${WRKSRC}/vendor directory.
 # Building the UI with node + yarn is no longer necessary.
 
 pre-build:
 	cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/traefik.sample.toml ${STAGEDIR}${PREFIX}/etc/traefik.toml.sample
 	${INSTALL_DATA} ${WRKSRC}/traefik.sample.yml ${STAGEDIR}${PREFIX}/etc/traefik.yml.sample
 
 .include <bsd.port.mk>
diff --git a/security/apg/Makefile b/security/apg/Makefile
index bb0b88edb527..27e950be0f8d 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=		apg
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.2.0
-PORTREVISION=		0
+PORTREVISION=	1
 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/git-credential-gopass/Makefile b/security/git-credential-gopass/Makefile
index d680ec9daf97..0f9f5e2defac 100644
--- a/security/git-credential-gopass/Makefile
+++ b/security/git-credential-gopass/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	git-credential-gopass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15.13
+PORTREVISION=	1
 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 34715a9b5680..303176356bf7 100644
--- a/security/gopass/Makefile
+++ b/security/gopass/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	gopass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15.13
+PORTREVISION=	1
 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/tailscale/Makefile b/security/tailscale/Makefile
index 065a9a588df6..6b948fc52111 100644
--- a/security/tailscale/Makefile
+++ b/security/tailscale/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	tailscale
 PORTVERSION=	1.64.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security net-vpn
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Mesh VPN that makes it easy to connect your devices
 WWW=		https://tailscale.com/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 
 USES=		go:1.22,modules
 
 GO_MODULE=	github.com/tailscale/tailscale
 
 USE_RC_SUBR=	tailscaled
 
 GO_TARGET=	./cmd/tailscale \
 		./cmd/tailscaled
 GO_BUILDFLAGS=	-tags xversion -ldflags "\
 		-X tailscale.com/version.longStamp=${PORTVERSION} \
 		-X tailscale.com/version.shortStamp=${PORTVERSION}"
 
 PLIST_FILES=	bin/tailscale  \
 		bin/tailscaled
 
 .include <bsd.port.mk>
diff --git a/security/trivy/Makefile b/security/trivy/Makefile
index 252b0571d336..0fd0e4b29e57 100644
--- a/security/trivy/Makefile
+++ b/security/trivy/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	trivy
 DISTVERSION=	0.50.1
 DISTVERSIONPREFIX=	v
+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/vouch-proxy/Makefile b/security/vouch-proxy/Makefile
index 266194bf5a58..fe50f1258da6 100644
--- a/security/vouch-proxy/Makefile
+++ b/security/vouch-proxy/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	vouch-proxy
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.39.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	SSO solution for Nginx using the auth_request module
 WWW=		https://github.com/vouch/vouch-proxy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MODULE=	github.com/vouch/vouch-proxy
 GO_BUILDFLAGS=	-ldflags "-X main.version=${PORTVERSION} -X main.uname=FreeBSD"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	(cd ${WRKSRC}/config && ${COPYTREE_SHARE} "config.yml*" ${STAGEDIR}${ETCDIR})
 
 .include <bsd.port.mk>
diff --git a/security/xray-core/Makefile b/security/xray-core/Makefile
index 6589f35d0997..f1a9131be64d 100644
--- a/security/xray-core/Makefile
+++ b/security/xray-core/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	xray-core
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/v2fly/geoip/releases/download/202403070031/:geoip \
 		https://github.com/v2fly/domain-list-community/releases/download/20240301033006/: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_RC_SUBR=	xray
 SUB_FILES=	pkg-message
 
 USERS=		v2ray
 GROUPS=		v2ray
 
 SUB_LIST=	GROUP="${GROUPS}" \
 		USER="${USERS}"
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 GO_MODULE=	github.com/${GH_ACCOUNT}/${PORTNAME}
 GO_TARGET=	./main:xray
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xtls
 GH_PROJECT=	Xray-core
 
 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/chaoskube/Makefile b/sysutils/chaoskube/Makefile
index 587417d028ed..444e7f74cedd 100644
--- a/sysutils/chaoskube/Makefile
+++ b/sysutils/chaoskube/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	chaoskube
 PORTVERSION=	0.32.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/terraform-switcher/Makefile b/sysutils/terraform-switcher/Makefile
index ed1d8c624815..f53cd5ff3e81 100644
--- a/sysutils/terraform-switcher/Makefile
+++ b/sysutils/terraform-switcher/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	terraform-switcher
 DISTVERSION=	1.0.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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	warrensbox
 GH_TUPLE=	\
 		agext:levenshtein:v1.2.2:agext_levenshtein/vendor/github.com/agext/levenshtein \
 		apparentlymart:go-textseg:v1.0.0:apparentlymart_go_textseg/vendor/github.com/apparentlymart/go-textseg \
 		chzyer:readline:2972be24d48e:chzyer_readline/vendor/github.com/chzyer/readline \
 		fsnotify:fsnotify:v1.7.0:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		go-ini:ini:v1.67.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
 		golang:exp:921286631fa9:golang_exp/vendor/golang.org/x/exp \
 		golang:sys:v0.18.0:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.14.0:golang_text/vendor/golang.org/x/text \
 		google:go-cmp:v0.5.9:google_go_cmp/vendor/github.com/google/go-cmp \
 		hashicorp:go-version:v1.6.0:hashicorp_go_version/vendor/github.com/hashicorp/go-version \
 		hashicorp:hcl2:fb75b3253c80:hashicorp_hcl2/vendor/github.com/hashicorp/hcl2 \
 		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
 		hashicorp:hcl:v2.0.0:hashicorp_hcl_v2/vendor/github.com/hashicorp/hcl/v2 \
 		hashicorp:terraform-config-inspect:a34142ec2a72:hashicorp_terraform_config_inspect/vendor/github.com/hashicorp/terraform-config-inspect \
 		magiconair:properties:v1.8.7:magiconair_properties/vendor/github.com/magiconair/properties \
 		manifoldco:promptui:v0.9.0:manifoldco_promptui/vendor/github.com/manifoldco/promptui \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		mitchellh:go-wordwrap:v1.0.0:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
 		mitchellh:mapstructure:v1.5.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		pborman:getopt:v1.1.0:pborman_getopt/vendor/github.com/pborman/getopt \
 		pelletier:go-toml:v2.1.0:pelletier_go_toml_v2/vendor/github.com/pelletier/go-toml/v2 \
 		sagikazarmark:locafero:v0.4.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.6.0:spf13_cast/vendor/github.com/spf13/cast \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		spf13:viper:v1.18.2:spf13_viper/vendor/github.com/spf13/viper \
 		subosito:gotenv:v1.6.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
 		uber-go:atomic:v1.9.0:uber_go_atomic/vendor/go.uber.org/atomic \
 		uber-go:multierr:v1.9.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		zclconf:go-cty:v1.1.0:zclconf_go_cty/vendor/github.com/zclconf/go-cty
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index d1f87da35531..8a76f5ca0eeb 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	gitlab-elasticsearch-indexer
 PORTVERSION=	4.8.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
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
 MAKE_ENV+=	${GO_ENV}
 
 # 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
 # ---------------------------
 FETCH_DEPENDS=	${GO_CMD}:${GO_PORT}
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
 _USES_fetch+=	800:go-post-fetch
 go-post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
 # ---------------------------
 
 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/www/adguardhome/Makefile b/www/adguardhome/Makefile
index 1eb9e2c38968..89d8bd24529e 100644
--- a/www/adguardhome/Makefile
+++ b/www/adguardhome/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	adguardhome
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.107.45
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Network-wide ads & trackers blocking DNS server
 WWW=		https://adguard.com/en/adguard-home/overview.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe go:1.22,modules
 
 GO_MODULE=	github.com/AdguardTeam/AdGuardHome
 GO_BUILDFLAGS=	-ldflags="-s -w -X github.com/AdguardTeam/AdGuardHome/internal/version.version=${DISTVERSION}" # workaround for https://github.com/AdguardTeam/AdGuardHome/issues/4774
 
 # to rebuild the deps archives:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
 #   3. upload the *-html-{build,client}* archives
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 
 USER=		root # it has to run as root because it listens on the privileged DNS port
 GROUP=		wheel
 SUB_LIST=	USER=${USER} GROUP=${GROUP}
 USE_RC_SUBR=	${PORTNAME}
 
 CPE_VENDOR=	adguard
 
 .if (${DEV_UPDATE_MODE} == "yes")
 BUILD_DEPENDS=	npm:www/npm \
 		yarn:www/yarn
 MAKE_ENV+=	NODE_OPTIONS=--openssl-legacy-provider # workaround suggested in https://github.com/AdguardTeam/AdGuardHome/issues/6585
 
 do-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} js-deps js-build && \
 		${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} build && \
 		${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-client-${DISTVERSION}${EXTRACT_SUFX} client && \
 		${ECHO} "Please upload files ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} and ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-client-${DISTVERSION}${EXTRACT_SUFX}"
 .else
 MASTER_SITES=	LOCAL/yuri/:deps
 DISTFILES=	${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX}:deps \
 		${PORTNAME}-html-client-${DISTVERSION}${EXTRACT_SUFX}:deps
 
 pre-build:
 	@${CP} -r ${WRKDIR}/build ${WRKDIR}/client ${WRKSRC}/
 .endif
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index f52643bb0332..0c4d43885c21 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	gitlab-pages
 PORTVERSION=	16.10.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Official GitLab Pages daemon
 WWW=		https://gitlab.com/gitlab-org/gitlab-pages
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules,1.22
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 USE_RC_SUBR=	gitlab_pages
 
 GO_MODULE=	gitlab.com/gitlab-org/gitlab-pages
 GO_BUILDFLAGS=	-ldflags="-X 'main.VERSION=${PORTVERSION}' -X 'main.REVISION=${GL_TAGNAME}'"
 
 USERS=		gitlab-pages
 GROUPS=		gitlab-pages
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/gitlab-pages.conf.sample
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	(cd ${WRKDIR}/bin/ && ${COPYTREE_BIN} .  ${STAGEDIR}${DATADIR}/bin)
 .for x in gitlab-pages.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DATADIR}/
 .endfor
 
 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}
 	cat ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 915380230d97..1717a2967aa8 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	gitlab-workhorse
 PORTVERSION=	16.10.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Smart reverse proxy for GitLab
 WWW=		https://gitlab.com/gitlab-org/gitlab/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BUILD_DEPENDS=	git>=2.42.0:devel/git
 RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
 
 USES=		gmake go:modules,no_targets,1.22
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 MAKE_ENV+=	${GO_ENV}
 WRKSRC_SUBDIR=	workhorse
 # found in work/gitlab-foss*/workhorse/go.mod
 #GO_MODULE=	gitlab.com/gitlab-org/gitlab/workhorse
 
-
 # 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
 # ---------------------------
 FETCH_DEPENDS=	${GO_CMD}:${GO_PORT}
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-foss/-/raw/v${DISTVERSION}/workhorse/
 DISTFILES+=	go.mod
 DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
 _USES_fetch+=	800:go-post-fetch
 go-post-fetch:
 	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
 	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
 		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
 		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
 # ---------------------------
 
 PLIST_DIRS=	${WWWDIR}
 PLIST_FILES=	bin/gitlab-resize-image \
 		bin/gitlab-workhorse \
 		bin/gitlab-zip-cat \
 		bin/gitlab-zip-metadata
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/miniflux/Makefile b/www/miniflux/Makefile
index 7ecfb2eb3920..f0b79bb20860 100644
--- a/www/miniflux/Makefile
+++ b/www/miniflux/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	miniflux
 DISTVERSION=	2.1.2
+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.1:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
 		abadojack:whatlanggo:v1.0.1:abadojack_whatlanggo/vendor/github.com/abadojack/whatlanggo \
 		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.2.0:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
 		coreos:go-oidc:v3.10.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.1: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:appengine:v1.6.8:golang_appengine/vendor/google.golang.org/appengine \
 		golang:crypto:v0.21.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:v0.22.0:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:v0.18.0:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.5.3:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sys:v0.18.0:golang_sys/vendor/golang.org/x/sys \
 		golang:term:v0.18.0:golang_term/vendor/golang.org/x/term \
 		golang:text:v0.14.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 \
 		lib:pq:v1.10.9:lib_pq/vendor/github.com/lib/pq \
 		mitchellh:mapstructure:v1.5.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		mvdan:xurls:v2.5.0:mvdan_xurls/vendor/mvdan.cc/xurls/v2 \
 		prometheus:client_golang:v1.19.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.5.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.48.0:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.12.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		protocolbuffers:protobuf-go:v1.33.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		tdewolff:minify:v2.20.19:tdewolff_minify_v2/vendor/github.com/tdewolff/minify/v2 \
 		tdewolff:parse:v2.7.12: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.0: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/x11/kitty/Makefile b/x11/kitty/Makefile
index 5ebacb61e6ac..7bcc1fc22aeb 100644
--- a/x11/kitty/Makefile
+++ b/x11/kitty/Makefile
@@ -1,127 +1,127 @@
 PORTNAME=	kitty
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.33.1
-PORTREVISION=	0
+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} \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
 		simde>=0.7.6:devel/simde \
 		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 mypy-editor-integration \
 		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_MAKE_ENV=	BUILD_DOCS=yes
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400079 || (${OSVERSION} >= 1302505 && \
 	${OSVERSION} < 1400000))
 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
 
 # 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}/|}
 
 do-install-DOCS-on:
 	${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
 	cd ${BUILD_DIR}/share/doc/kitty/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>