diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 95cea3ddd0c..9078628e1dd 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -2,6 +2,7 @@ COMMENT-main=		ncurses-based music player
 COMMENT-ffmpeg=		ffmpeg input plugin for cmus (.aac, .mp4...)
 
 V=			2.12.0
+REVISION-main=		0
 
 GH_ACCOUNT=		cmus
 GH_PROJECT=		cmus
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 8b02c97a9ae..afba3f62de5 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -3,7 +3,7 @@ COMMENT =	console audio player
 DIST_TUPLE+=	gitlab tomaszg mocp fb0a63b564b40fa861204e2f804b696c6ee573da .
 PKGNAME =	moc-2.6alpha3
 CATEGORIES =	audio
-REVISION =	3
+REVISION =	4
 
 # GPLv3+
 PERMIT_PACKAGE = Yes
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index 9a9b9a8f76f..0e80511ac37 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -3,13 +3,15 @@ BROKEN-sparc64= SocketAddress.hxx:16:10: fatal error: span: No such file or dire
 COMMENT=		curses based frontend for mpd
 
 VER=			0.52
+REVISION=		0
 DISTNAME=		ncmpc-${VER}
-EPOCH=			0
 CATEGORIES=		audio
 
 MAINTAINER =		Landry Breuil <landry@openbsd.org>
 HOMEPAGE=		https://www.musicpd.org/clients/ncmpc/
 
+EPOCH=			0
+
 # GPLv2
 PERMIT_PACKAGE=	Yes
 
diff --git a/audio/nncmpp/Makefile b/audio/nncmpp/Makefile
index 645e9062cea..97e9f1584f3 100644
--- a/audio/nncmpp/Makefile
+++ b/audio/nncmpp/Makefile
@@ -1,6 +1,7 @@
 COMMENT=		terminal/X11 MPD client
 
 V=			2.1.1
+REVISION=		0
 DISTNAME=		nncmpp-${V}
 EXTRACT_SUFX=		.tar.zst
 CATEGORIES=		audio
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 7bbd34ec8c6..0b305566936 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -3,6 +3,7 @@ BROKEN-alpha =	arctar.c:384: internal compiler error: in extract_insn, at recog.
 COMMENT =	UNIX port of Open Cubic Player
 
 DISTNAME =	ocp-3.1.2
+REVISION =	0
 CATEGORIES =	audio
 
 HOMEPAGE =	https://stian.cubic.org/project-ocp.php
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index 9233b51dcbf..f9222f13c79 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	intelligent phonetic input method library
 
 V =		0.7.0
+REVISION =	0
 DISTNAME =	libchewing-$V
 PKGNAME =	zh-libchewing-$V
 
diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile
index dd326d3651e..4efff144f70 100644
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@@ -1,7 +1,7 @@
 COMMENT=	BBS terminal program
 
 DISTNAME=	syncterm-1.6
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	comms net
 
diff --git a/databases/pspg/Makefile b/databases/pspg/Makefile
index 2b80fb7bfe5..35fd27bfcfc 100644
--- a/databases/pspg/Makefile
+++ b/databases/pspg/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	UNIX pager optimized for tabular data
 
 DIST_TUPLE =	github okbob pspg 5.8.14 .
+REVISION =	0
 
 CATEGORIES =	databases
 
diff --git a/devel/tig/Makefile b/devel/tig/Makefile
index c47f95427bb..06f3f2e2bdd 100644
--- a/devel/tig/Makefile
+++ b/devel/tig/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	ncurses Git repository browser
 
 V =		2.6.0
+REVISION =	0
 DISTNAME =	tig-$V
 
 CATEGORIES =	devel
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 83f4424471b..3aa7aa7fd0c 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,6 +1,7 @@
 COMMENT=	simple editor, inspired by Pico
 
 DISTNAME=	nano-8.7
+REVISION=	0
 CATEGORIES=	editors
 HOMEPAGE=	https://www.nano-editor.org/
 
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 7c9470ff182..8ae85544a2a 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,5 +1,6 @@
 COMMENT=	VI Editor Like Emacs
 DISTNAME=	vile-9.8y
+REVISION=	0
 CATEGORIES=	editors
 HOMEPAGE=	https://invisible-island.net/vile/
 
diff --git a/editors/vis/Makefile b/editors/vis/Makefile
index e0015d6d3ae..f03d13119c6 100644
--- a/editors/vis/Makefile
+++ b/editors/vis/Makefile
@@ -1,8 +1,8 @@
 COMMENT =		vi-like editor with sam-style structural regex support
-REVISION =		0
 
 DIST_TUPLE =		github martanne vis      v0.9	.
 DIST_TUPLE +=		github martanne vis-test v0.5	test
+REVISION =		1
 
 CATEGORIES =		editors
 
diff --git a/games/cataclysm-dda/Makefile b/games/cataclysm-dda/Makefile
index 2007ba9b996..6f145fc027f 100644
--- a/games/cataclysm-dda/Makefile
+++ b/games/cataclysm-dda/Makefile
@@ -1,15 +1,16 @@
 COMMENT=		rogue-like zombie survival game
 CATEGORIES=		games
 
-V= 			0.H-RELEASE
+V=			0.H-RELEASE
 DIST_TUPLE+=		github CleverRaven Cataclysm-DDA ${V} .
 PKGNAME=		cataclysm-dda-${V:S/-RELEASE//}
-EPOCH=			0
-REVISION=		0
+REVISION=		1
 
 HOMEPAGE=		https://cataclysmdda.org
 MAINTAINER=		Kirill Bychkov <kirby@openbsd.org>
 
+EPOCH=			0
+
 # Creative Commons 3.0
 PERMIT_PACKAGE=	Yes
 
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 943aa1fd2ec..519766fb0d8 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,10 +1,11 @@
 BROKEN-sparc64=	relocation truncated to fit: R_SPARC_GOT13 against symbol
 
 V =			2.54
+REVISION=		0
 COMMENT=		interpreter for Infocom-compatible games
 
 DISTNAME=		frotz-${V}
-CATEGORIES=     	games
+CATEGORIES=		games
 
 HOMEPAGE=		https://davidgriffith.gitlab.io/frotz/
 MAINTAINER=		Brian Callahan <bcallah@openbsd.org>
diff --git a/games/stone-soup/Makefile b/games/stone-soup/Makefile
index 8f409f48d41..c1abeb65638 100644
--- a/games/stone-soup/Makefile
+++ b/games/stone-soup/Makefile
@@ -1,17 +1,17 @@
 BROKEN-hppa =	ICE on dgn-shoals.cc:638
 
-COMMENT = 	dungeon crawl stone soup
+COMMENT =	dungeon crawl stone soup
 
-VERSION = 	0.32.0
+VERSION =	0.32.0
+REVISION=	2
 TAGNAME =	Gods and Makers
 
 DISTNAME=	stone_soup-${VERSION}-nodeps
 PKGNAME=	stone-soup-${VERSION}
-REVISION=	1
 
-CATEGORIES = 	games
+CATEGORIES =	games
 
-HOMEPAGE = 	https://crawl.develz.org/
+HOMEPAGE =	https://crawl.develz.org/
 
 MAINTAINER =	Stefan Moran <ssm@howdoesmycode.work>
 
@@ -24,16 +24,16 @@ SITES =		https://github.com/crawl/crawl/releases/download/${VERSION}/
 EXTRACT_SUFX=	.tar.xz
 
 COMPILER =	base-clang ports-gcc
-MODULES = 	lang/python \
+MODULES =	lang/python \
 		lang/lua
 
-MODLUA_VERSION = 	5.1
+MODLUA_VERSION =	5.1
 
 BUILD_DEPENDS = graphics/pngcrush \
 		textproc/py-yaml
-LIB_DEPENDS = 	databases/sqlite3
+LIB_DEPENDS =	databases/sqlite3
 
-MAKE_FLAGS = 	CC="${CC}" GCC="${GCC}" GXX="${CXX}" \
+MAKE_FLAGS =	CC="${CC}" GCC="${GCC}" GXX="${CXX}" \
 		CXX="${CXX}" HOSTCXX="${CXX}" \
 		LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
 		LUA_LIB=${MODLUA_LIB} \
@@ -45,30 +45,30 @@ MAKE_FLAGS = 	CC="${CC}" GCC="${GCC}" GXX="${CXX}" \
 		NO_YACC=1 V=1 \
 		SRC_VERSION=${VERSION} RECENT_TAG="${TAGNAME}"
 
-USE_GMAKE = 	Yes
+USE_GMAKE =	Yes
 CONFIGURE_STYLE = none
 
-MODPY_RUN_DEPENDS = 	No
+MODPY_RUN_DEPENDS =	No
 MODPY_ADJ_FILES =	util/species-gen.py \
 			util/tag-35-upgrade.py
 
-FLAVORS = 	no_x11
+FLAVORS =	no_x11
 FLAVOR ?=
 
 .if ${FLAVOR:Mno_x11}
-WANTLIB += 	curses pthread z
-MAKE_FLAGS += 	USE_UNICODE=y UNICODE_LOCALE=y
+WANTLIB +=	curses pthread z
+MAKE_FLAGS +=	USE_UNICODE=y UNICODE_LOCALE=y
 .else
 # This should be automatically set during "gmake -C rltiles..." but isn't...
 CFLAGS +=	-DUSE_TILE
 CXXFLAGS +=	-DUSE_TILE
 
-MAKE_FLAGS += 	TILES=y \
+MAKE_FLAGS +=	TILES=y \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
 		-lSDL2 -lSDL2_image -lpng -pthread"
-WANTLIB += 	GL GLU SDL2 SDL2_image freetype png pthread z
+WANTLIB +=	GL GLU SDL2 SDL2_image freetype png pthread z
 RUN_DEPENDS =	devel/desktop-file-utils
-LIB_DEPENDS += 	devel/sdl2 \
+LIB_DEPENDS +=	devel/sdl2 \
 		devel/sdl2-image \
 		databases/sqlite3 \
 		graphics/png
@@ -76,11 +76,11 @@ LIB_DEPENDS += 	devel/sdl2 \
 
 NO_TEST =	Yes
 
-CFLAGS += 	-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2
-CXXFLAGS += 	-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2
+CFLAGS +=	-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2
+CXXFLAGS +=	-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2
 
-WRKDIST = 	${WRKDIR}/stone_soup-${VERSION}
-WRKSRC = 	${WRKDIST}/source
+WRKDIST =	${WRKDIR}/stone_soup-${VERSION}
+WRKSRC =	${WRKDIST}/source
 
 post-install:
 	mv ${PREFIX}/bin/crawl ${PREFIX}/bin/crawl-ss
diff --git a/games/trader/Makefile b/games/trader/Makefile
index 0530ddb5810..a571c82b18d 100644
--- a/games/trader/Makefile
+++ b/games/trader/Makefile
@@ -1,7 +1,7 @@
 COMMENT =	simple text-based game of interstellar trading
 
 DISTNAME =	trader-7.20
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	games
 
diff --git a/graphics/radeontop/Makefile b/graphics/radeontop/Makefile
index 658ccbc9abd..8aefb00c3a0 100644
--- a/graphics/radeontop/Makefile
+++ b/graphics/radeontop/Makefile
@@ -3,7 +3,7 @@ COMMENT =	monitor GPU utilization for R600 and up
 GH_ACCOUNT =	clbr
 GH_PROJECT =	radeontop
 GH_TAGNAME =	v1.4
-REVISION =	0
+REVISION =	1
 
 SHARED_LIBS =	radeontop_xcb		0.0	# 1.3
 
diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index 40c53246a95..eb7565e0f75 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -1,5 +1,6 @@
 COMMENT =	Algol 68 Genie compiler-interpreter
 DISTNAME =	algol68g-3.5.14
+REVISION =	0
 CATEGORIES =	lang
 
 HOMEPAGE =	https://jmvdveer.home.xs4all.nl/algol.html
diff --git a/lang/python/3/Makefile b/lang/python/3/Makefile
index b21c82ef7b2..e257616fa6f 100644
--- a/lang/python/3/Makefile
+++ b/lang/python/3/Makefile
@@ -10,7 +10,7 @@ PORTROACH =		limit:^3\.12
 
 # XXX keep REVISION-main above 7.8-stable and do not sync the
 # XXX @conflict or @pkgpath for glade/py-bsddb3
-REVISION-main =		1
+REVISION-main =		2
 
 AUTOCONF_VERSION =	2.71
 
diff --git a/misc/gnuwatch/Makefile b/misc/gnuwatch/Makefile
index 5399f176c48..81694070f0a 100644
--- a/misc/gnuwatch/Makefile
+++ b/misc/gnuwatch/Makefile
@@ -1,6 +1,7 @@
 COMMENT=	GNU watch command
 
 DISTNAME=	procps-ng-4.0.5
+REVISION=	0
 PKGNAME=	${DISTNAME:S/procps-ng/gnuwatch/}
 EXTRACT_SUFX=	.tar.xz
 CATEGORIES=	misc
diff --git a/net/lagrange/Makefile b/net/lagrange/Makefile
index 1c2b5c126e9..1976007d2e0 100644
--- a/net/lagrange/Makefile
+++ b/net/lagrange/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	SDL multi protocol (gemini, gopher) navigator
-VERSION =	1.19.4
 
+VERSION =	1.19.4
+REVISION =	0
 DISTNAME =	lagrange-${VERSION}
 
 CATEGORIES =	net x11
diff --git a/net/liboping/Makefile b/net/liboping/Makefile
index 1f84ae30f04..abde5f740a7 100644
--- a/net/liboping/Makefile
+++ b/net/liboping/Makefile
@@ -1,7 +1,7 @@
 COMMENT =	library and tools to generate ICMP echo requests
 
 DISTNAME =	liboping-1.10.0
-REVISION =	1
+REVISION =	2
 
 SHARED_LIBS +=	oping 0.1 # 3.0
 
diff --git a/net/pidgin/Makefile b/net/pidgin/Makefile
index 2925636d982..9831a78b4eb 100644
--- a/net/pidgin/Makefile
+++ b/net/pidgin/Makefile
@@ -4,6 +4,7 @@ COMMENT-libpurple= multi-protocol instant messaging library
 COMMENT-bonjour= Bonjour protocol support for libpurple
 
 VERSION=	2.14.14
+REVISION=	1
 DISTNAME=	pidgin-${VERSION}
 PKGNAME-main=	pidgin-${VERSION}
 PKGNAME-finch=	finch-${VERSION}
@@ -16,10 +17,6 @@ FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}
 CATEGORIES=	net
 SITES=		${SITE_SOURCEFORGE:=pidgin/}
 EXTRACT_SUFX=	.tar.bz2
-REVISION-bonjour=0
-REVISION-finch=	0
-REVISION-libpurple=0
-REVISION-main=	0
 
 SHARED_LIBS=	jabber		0.0 \
 		purple		7.1 \
diff --git a/net/profanity/Makefile b/net/profanity/Makefile
index eb0ac117830..393175c2f08 100644
--- a/net/profanity/Makefile
+++ b/net/profanity/Makefile
@@ -1,5 +1,6 @@
 COMMENT =	console based XMPP client
 DISTNAME =	profanity-0.15.1
+REVISION =	0
 CATEGORIES =	net
 
 HOMEPAGE =	https://profanity-im.github.io/
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 344725d12bf..6ba1cf00823 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -2,6 +2,7 @@ COMMENT =		ncurses BitTorrent client based on libTorrent
 
 DISTNAME =		rtorrent-0.15.7
 CATEGORIES =		net
+REVISION =		0
 
 HOMEPAGE =		https://rakshasa.github.io/rtorrent/
 
diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 461697b4e97..13d876d149d 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -5,6 +5,7 @@ COMMENT-ruby=	Ruby bindings for weechat
 COMMENT-tcl=	Tcl bindings for weechat
 
 V=		4.8.1
+REVISION-main=	0
 DISTNAME=	weechat-${V}
 
 PKGNAME-main=	weechat-${V}
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index 1592e47e3d0..0ffa2064ddc 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -2,7 +2,7 @@ COMMENT =	binary newsreader supporting NZB files
 
 DIST_TUPLE +=	github nzbgetcom nzbget v25.4 .
 DIST_TUPLE +=	github nzbgetcom par2cmdline-turbo v1.3.0-20250808 par2cmdline-turbo
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	news
 
diff --git a/productivity/calcurse/Makefile b/productivity/calcurse/Makefile
index 826b83ce2cd..61e0eeb4208 100644
--- a/productivity/calcurse/Makefile
+++ b/productivity/calcurse/Makefile
@@ -1,12 +1,14 @@
 COMMENT=	text-based calendar and scheduling application
 
 DISTNAME=	calcurse-4.8.2
-EPOCH=		0
+REVISION=	0
 
 CATEGORIES=	productivity
 
 HOMEPAGE=	https://calcurse.org/
 
+EPOCH=		0
+
 # BSD
 PERMIT_PACKAGE=	Yes
 
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index bcc9aa481c1..60ef90b69d5 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -8,7 +8,7 @@ DISTNAME = 	pinentry-${VERSION}
 CATEGORIES = 	security
 EXTRACT_SUFX =	.tar.bz2
 
-REVISION-main =	1
+REVISION-main =	2
 REVISION-qt5 =	0
 REVISION-qt6 =	0
 
diff --git a/sysutils/crust/Makefile b/sysutils/crust/Makefile
index 7244081c658..7d47b361ce7 100644
--- a/sysutils/crust/Makefile
+++ b/sysutils/crust/Makefile
@@ -5,6 +5,7 @@ COMMENT=	libre SCP firmware for Allwinner sunxi SoCs
 GH_ACCOUNT=	crust-firmware
 GH_PROJECT=	crust
 GH_TAGNAME=	v0.6
+REVISION=	0
 
 CATEGORIES=	sysutils
 
diff --git a/sysutils/fdupes/Makefile b/sysutils/fdupes/Makefile
index b80b45c37e5..79988697b41 100644
--- a/sysutils/fdupes/Makefile
+++ b/sysutils/fdupes/Makefile
@@ -3,6 +3,7 @@ COMMENT=	identify or delete duplicate files
 V=		2.4.0
 DISTNAME=	fdupes-$V
 CATEGORIES=	sysutils
+REVISION=	0
 
 HOMEPAGE=	https://github.com/adrianlopezroche/fdupes
 SITES=		${HOMEPAGE}/releases/download/v$V/
diff --git a/sysutils/ncdu/Makefile b/sysutils/ncdu/Makefile
index c420bab97b2..bf2f75b3325 100644
--- a/sysutils/ncdu/Makefile
+++ b/sysutils/ncdu/Makefile
@@ -4,6 +4,7 @@ COMMENT=		ncurses-based du(1)
 
 DISTNAME=		ncdu-1.22
 CATEGORIES=		sysutils
+REVISION=		0
 
 HOMEPAGE=		https://dev.yorhel.nl/ncdu/
 
diff --git a/sysutils/nnn/Makefile b/sysutils/nnn/Makefile
index 4029f05681c..ebf4742d76e 100644
--- a/sysutils/nnn/Makefile
+++ b/sysutils/nnn/Makefile
@@ -3,6 +3,7 @@ COMMENT =		the missing terminal file browser for X
 V =			5.1
 DISTNAME =		nnn-v${V}
 PKGNAME =		nnn-${V}
+REVISION =		0
 
 CATEGORIES =		sysutils
 
diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index 6160a0ab71d..5f7d1c6b346 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,6 +1,7 @@
 COMMENT =		high-performance HTTP accelerator
 
 DISTNAME =		varnish-8.0.0
+REVISION =		0
 
 CATEGORIES =		www