diff --git a/devel/clang-tools-extra/Makefile b/devel/clang-tools-extra/Makefile
index 7dc8a9853c7..69547aa88f3 100644
--- a/devel/clang-tools-extra/Makefile
+++ b/devel/clang-tools-extra/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2021/07/28 23:22:33 cwen Exp $
+# $OpenBSD: Makefile,v 1.18 2021/08/17 20:22:02 naddy Exp $
 
 # XXX
 # This port is more or less a copy from devel/llvm and it tries to
@@ -15,7 +15,7 @@ COMMENT=	Clang extra tools
 LLVM_V =	11.1.0
 DISTNAME =	llvm-${LLVM_V}.src
 PKGNAME=	clang-tools-extra-${LLVM_V}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES =	devel
 
diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile
index aa9f7b466dd..02ad885e822 100644
--- a/devel/llvm/Makefile
+++ b/devel/llvm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.281 2021/08/14 02:46:18 jca Exp $
+# $OpenBSD: Makefile,v 1.282 2021/08/17 20:22:02 naddy Exp $
 
 # XXX If broken on an architecture, remove the arch from LLVM_ARCHS.
 ONLY_FOR_ARCHS = ${LLVM_ARCHS}
@@ -18,7 +18,7 @@ PKGSPEC-main =	llvm-=${LLVM_V}
 PKGNAME-main =	llvm-${LLVM_V}
 PKGNAME-python =	py3-llvm-${LLVM_V}
 PKGNAME-lldb =	lldb-${LLVM_V}
-REVISION-main =	5
+REVISION-main =	6
 
 CATEGORIES =	devel
 
diff --git a/editors/xemacs21/stable/Makefile b/editors/xemacs21/stable/Makefile
index b39a7e62c33..729553704d5 100644
--- a/editors/xemacs21/stable/Makefile
+++ b/editors/xemacs21/stable/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.51 2021/02/06 22:08:35 naddy Exp $
+# $OpenBSD: Makefile,v 1.52 2021/08/17 20:22:02 naddy Exp $
 
 BRANCH=		21.4
 VERSION=	22
-REVISION=	29
+REVISION=	30
 
 WANTLIB=	c m curses util
 
diff --git a/lang/bootgcc/Makefile b/lang/bootgcc/Makefile
index dff51aa84d5..54fde2fb64c 100644
--- a/lang/bootgcc/Makefile
+++ b/lang/bootgcc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2021/08/03 10:04:13 pascal Exp $
+# $OpenBSD: Makefile,v 1.2 2021/08/17 20:22:02 naddy Exp $
 
 ONLY_FOR_ARCHS = ${GCC4_ARCHS}
 
@@ -7,6 +7,7 @@ DPB_PROPERTIES = parallel
 V = 8.4.0
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
+REVISION = 0
 
 COMMENT =	GNU Compiler Collection; bootstrap package
 PKGNAME =	bootgcc-${FULL_PKGVERSION}
diff --git a/lang/gcc/11/Makefile b/lang/gcc/11/Makefile
index 415554527bd..a66730d2b0e 100644
--- a/lang/gcc/11/Makefile
+++ b/lang/gcc/11/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2021/08/15 18:42:08 pascal Exp $
+# $OpenBSD: Makefile,v 1.2 2021/08/17 20:22:02 naddy Exp $
 
 #
 # When updating/switching to a new version, remember to adapt devel/llvm!
@@ -19,6 +19,7 @@ DPB_PROPERTIES = parallel
 V = 11.2.0
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
+REVISION = 0
 
 ADASTRAP-amd64 = adastrap-amd64-$V-0.tar.xz
 ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
diff --git a/lang/gcc/8/Makefile b/lang/gcc/8/Makefile
index a746f641790..65da3be502d 100644
--- a/lang/gcc/8/Makefile
+++ b/lang/gcc/8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2021/07/31 16:37:56 pascal Exp $
+# $OpenBSD: Makefile,v 1.44 2021/08/17 20:22:02 naddy Exp $
 
 ONLY_FOR_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el \
 	powerpc powerpc64 sparc64
@@ -11,7 +11,7 @@ DPB_PROPERTIES = parallel
 V = 8.4.0
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
-REVISION = 8
+REVISION = 9
 
 ADASTRAP-amd64 = adastrap-amd64-8.3.0-2.tar.xz
 ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index 4b0285615e4..e0355be2c33 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2021/08/01 14:26:43 jca Exp $
+# $OpenBSD: Makefile,v 1.14 2021/08/17 20:22:02 naddy Exp $
 
 # Should work on all other archs.
 NOT_FOR_ARCHS =	aarch64 m88k mips64 powerpc64 riscv64
 
 COMMENT =	GNU Pascal compiler
 DISTNAME =	gpc-20070904
-REVISION =	8
+REVISION =	9
 CATEGORIES =	lang
 
 HOMEPAGE =	https://www.gnu-pascal.de/gpc/h-index.html
diff --git a/lang/pcc/pcc-libs/Makefile b/lang/pcc/pcc-libs/Makefile
index c10f5812f9e..c18c192049e 100644
--- a/lang/pcc/pcc-libs/Makefile
+++ b/lang/pcc/pcc-libs/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1 2021/02/18 02:26:43 daniel Exp $
+# $OpenBSD: Makefile,v 1.2 2021/08/17 20:22:02 naddy Exp $
 
 COMMENT =	libraries for the portable C compiler
 
 DISTNAME =	pcc-libs-${DISTVER}
 PKGNAME =	pcc-libs-${PKGVER}
+REVISION =	0
 
 MASTER_SITES =	http://pcc.ludd.ltu.se/ftp/pub/pcc-libs/ \
 		ftp://pcc.ludd.ltu.se/pub/pcc-libs/
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index c9b3bd1a8cd..5105fd68547 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.89 2021/06/09 19:50:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.90 2021/08/17 20:22:02 naddy Exp $
 
 BROKEN-hppa =		undefined reference to __sync_fetch_and_add_4
 BROKEN-sparc64 =	infinite loop or aborts during build
@@ -6,7 +6,7 @@ BROKEN-sparc64 =	infinite loop or aborts during build
 COMMENT =		Prolog for the real world
 
 V =			7.6.0
-REVISION =		10
+REVISION =		11
 DISTNAME =		swipl-$V
 PKGNAME =		swi-prolog-$V
 CATEGORIES =		lang
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 81725f84306..1d736957b3d 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.122 2021/02/06 22:08:35 naddy Exp $
+# $OpenBSD: Makefile,v 1.123 2021/08/17 20:22:02 naddy Exp $
 
 COMMENT =	high-level language for numerical computations
 
 VERSION =	5.2.0
 DISTNAME =	octave-${VERSION}
-REVISION =	1
+REVISION =	2
 CATEGORIES =	math
 
 SHARED_LIBS +=	octave		13.0