diff --git a/accountsservice/Makefile b/accountsservice/Makefile
index f123467f39..88cffde3f6 100644
--- a/accountsservice/Makefile
+++ b/accountsservice/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/06/06 13:52:41 krytarowski Exp $
 
 DISTNAME=	accountsservice-0.6.55
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.freedesktop.org/software/accountsservice/
 EXTRACT_SUFX=	.tar.xz
diff --git a/accountsservice/buildlink3.mk b/accountsservice/buildlink3.mk
index 083b78bada..33c58b9d49 100644
--- a/accountsservice/buildlink3.mk
+++ b/accountsservice/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	accountsservice
 ACCOUNTSSERVICE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.accountsservice+=	accountsservice>=0.6.40
+BUILDLINK_ABI_DEPENDS.accountsservice?=	accountsservice>=0.6.55nb1
 BUILDLINK_PKGSRCDIR.accountsservice?=	../../wip/accountsservice
 
 # XXX: option?
diff --git a/akonadi-calendar/Makefile b/akonadi-calendar/Makefile
index 173da9068d..d6116f6041 100644
--- a/akonadi-calendar/Makefile
+++ b/akonadi-calendar/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	akonadi-calendar-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	time
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
diff --git a/akonadi-calendar/buildlink3.mk b/akonadi-calendar/buildlink3.mk
index 97656c40d8..b8d08baa2e 100644
--- a/akonadi-calendar/buildlink3.mk
+++ b/akonadi-calendar/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	akonadi-calendar
 AKONADI_CALENDAR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.akonadi-calendar+=	akonadi-calendar>=17.12.1
+BUILDLINK_ABI_DEPENDS.akonadi-calendar?=		akonadi-calendar>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.akonadi-calendar?=		../../wip/akonadi-calendar
 
 .include "../../wip/akonadi-contacts/buildlink3.mk"
diff --git a/akonadi-contacts/Makefile b/akonadi-contacts/Makefile
index ae3b9cd5e9..9e19e46d73 100644
--- a/akonadi-contacts/Makefile
+++ b/akonadi-contacts/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	akonadi-contacts-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
diff --git a/akonadi-contacts/buildlink3.mk b/akonadi-contacts/buildlink3.mk
index 21bae9f323..a7c2c30124 100644
--- a/akonadi-contacts/buildlink3.mk
+++ b/akonadi-contacts/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	akonadi-contacts
 AKONADI_CONTACTS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.akonadi-contacts+=	akonadi-contacts>=17.12.1
+BUILDLINK_ABI_DEPENDS.akonadi-contacts?=		akonadi-contacts>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.akonadi-contacts?=		../../wip/akonadi-contacts
 
 .include "../../wip/akonadi-mime/buildlink3.mk"
diff --git a/akonadi-mime/Makefile b/akonadi-mime/Makefile
index f4e3e8a5a4..5831f2f3c3 100644
--- a/akonadi-mime/Makefile
+++ b/akonadi-mime/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	akonadi-mime-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	mail
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
diff --git a/akonadi-mime/buildlink3.mk b/akonadi-mime/buildlink3.mk
index 3461369b81..934e912c67 100644
--- a/akonadi-mime/buildlink3.mk
+++ b/akonadi-mime/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	akonadi-mime
 AKONADI_MIME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.akonadi-mime+=	akonadi-mime>=17.12.1
+BUILDLINK_ABI_DEPENDS.akonadi-mime?=	akonadi-mime>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.akonadi-mime?=	../../wip/akonadi-mime
 
 .include "../../wip/akonadi/buildlink3.mk"
diff --git a/akonadi-notes/Makefile b/akonadi-notes/Makefile
index fba0437365..a9e2fe44b7 100644
--- a/akonadi-notes/Makefile
+++ b/akonadi-notes/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	akonadi-notes-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
diff --git a/akonadi-search/Makefile b/akonadi-search/Makefile
index 72a511a2fc..e221c7e2ba 100644
--- a/akonadi-search/Makefile
+++ b/akonadi-search/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	akonadi-search-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
diff --git a/akonadi-search/buildlink3.mk b/akonadi-search/buildlink3.mk
index c205d7d86d..1b153c4372 100644
--- a/akonadi-search/buildlink3.mk
+++ b/akonadi-search/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	akonadi-search
 AKONADI_SEARCH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.akonadi-search+=	akonadi-search>=17.12.1
+BUILDLINK_ABI_DEPENDS.akonadi-search?=	akonadi-search>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.akonadi-search?=	../../wip/akonadi-search
 
 .include "../../devel/kcmutils/buildlink3.mk"
diff --git a/akonadi/Makefile b/akonadi/Makefile
index a2812cbce1..bf65b415fc 100644
--- a/akonadi/Makefile
+++ b/akonadi/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	akonadi-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	mail
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM/Akonadi
diff --git a/akonadi/buildlink3.mk b/akonadi/buildlink3.mk
index 859cea33be..0a2c468f52 100644
--- a/akonadi/buildlink3.mk
+++ b/akonadi/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	akonadi
 AKONADI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.akonadi+=	akonadi>=17.12.1
+BUILDLINK_ABI_DEPENDS.akonadi?=	akonadi>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.akonadi?=	../../wip/akonadi
 
 .include "../../devel/kio/buildlink3.mk"
diff --git a/baloo-widgets/Makefile b/baloo-widgets/Makefile
index 5974867663..37fc9305c1 100644
--- a/baloo-widgets/Makefile
+++ b/baloo-widgets/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	baloo-widgets-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 
 HOMEPAGE=	https://community.kde.org/Baloo
diff --git a/baloo-widgets/buildlink3.mk b/baloo-widgets/buildlink3.mk
index 02e40b2fb4..138c5c8c79 100644
--- a/baloo-widgets/buildlink3.mk
+++ b/baloo-widgets/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	baloo-widgets
 BALOO_WIDGETS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.baloo-widgets+=	baloo-widgets>=16.04.0
+BUILDLINK_ABI_DEPENDS.baloo-widgets?=	baloo-widgets>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.baloo-widgets?=	../../wip/baloo-widgets
 
 .include "../../sysutils/baloo5/buildlink3.mk"
diff --git a/beads/Makefile b/beads/Makefile
index 6fe075d7d6..40a5f6cc6a 100644
--- a/beads/Makefile
+++ b/beads/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	beads-1.1.13
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	http://pappso.inra.fr//downloads/
 
diff --git a/breeze/Makefile b/breeze/Makefile
index 499103ba1d..d4706b384a 100644
--- a/breeze/Makefile
+++ b/breeze/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	breeze-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	graphics
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/cinnamon-control-center/Makefile b/cinnamon-control-center/Makefile
index ccdd1038e0..3709242f61 100644
--- a/cinnamon-control-center/Makefile
+++ b/cinnamon-control-center/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
 DISTNAME=	cinnamon-control-center-4.6.2
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-control-center
diff --git a/cinnamon-desktop/Makefile b/cinnamon-desktop/Makefile
index 7981d3f9c9..be6a74d02f 100644
--- a/cinnamon-desktop/Makefile
+++ b/cinnamon-desktop/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
 
 DISTNAME=	cinnamon-desktop-4.6.4
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-desktop
diff --git a/cinnamon-desktop/buildlink3.mk b/cinnamon-desktop/buildlink3.mk
index 21ffab37aa..587752cafd 100644
--- a/cinnamon-desktop/buildlink3.mk
+++ b/cinnamon-desktop/buildlink3.mk
@@ -7,6 +7,7 @@ BUILDLINK_TREE+=	cinnamon-desktop
 CINNAMON_DESKTOP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cinnamon-desktop+=	cinnamon-desktop>=4.6.4
+BUILDLINK_ABI_DEPENDS.cinnamon-desktop?=	cinnamon-desktop>=4.6.4nb1
 BUILDLINK_PKGSRCDIR.cinnamon-desktop?=	../../wip/cinnamon-desktop
 
 .include "../../audio/pulseaudio/buildlink3.mk"
diff --git a/cinnamon-screensaver/Makefile b/cinnamon-screensaver/Makefile
index 0f3a65ace0..4c95b39b70 100644
--- a/cinnamon-screensaver/Makefile
+++ b/cinnamon-screensaver/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
 
 DISTNAME=	cinnamon-screensaver-4.6.0
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-screensaver
diff --git a/cinnamon-screensaver/buildlink3.mk b/cinnamon-screensaver/buildlink3.mk
index c6694bb9c0..2f61e4a7be 100644
--- a/cinnamon-screensaver/buildlink3.mk
+++ b/cinnamon-screensaver/buildlink3.mk
@@ -5,6 +5,7 @@ BUILDLINK_TREE+=	cinnamon-screensaver
 CINNAMON_SCREENSAVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cinnamon-screensaver+=	cinnamon-screensaver>=4.6.0
+BUILDLINK_ABI_DEPENDS.cinnamon-screensaver?=	cinnamon-screensaver>=4.6.0nb1
 BUILDLINK_PKGSRCDIR.cinnamon-screensaver?=	../../wip/cinnamon-screensaver
 
 .include "../../devel/gobject-introspection/buildlink3.mk"
diff --git a/cinnamon-settings-daemon/Makefile b/cinnamon-settings-daemon/Makefile
index 30279e0433..8a9b1dc70e 100644
--- a/cinnamon-settings-daemon/Makefile
+++ b/cinnamon-settings-daemon/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
 
 DISTNAME=	cinnamon-settings-daemon-4.6.4
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-settings-daemon
diff --git a/cinnamon/Makefile b/cinnamon/Makefile
index 66a98b1608..5e256a401c 100644
--- a/cinnamon/Makefile
+++ b/cinnamon/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
 DISTNAME=	cinnamon-4.6.7
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	Cinnamon
diff --git a/colord/Makefile b/colord/Makefile
index bfabe69310..d746683e2c 100644
--- a/colord/Makefile
+++ b/colord/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	colord-1.3.5
+PKGREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://www.freedesktop.org/software/colord/releases/
 EXTRACT_SUFX=	.tar.xz
diff --git a/courier-imap/Makefile b/courier-imap/Makefile
index 852fb1462f..5f6161139a 100644
--- a/courier-imap/Makefile
+++ b/courier-imap/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.89 2020/08/31 18:09:54 wiz Exp $
 
 DISTNAME=	courier-imap-5.0.7
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/courierpassd/Makefile b/courierpassd/Makefile
index 3dd75bec6b..d21f3f4218 100644
--- a/courierpassd/Makefile
+++ b/courierpassd/Makefile
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=		courierpassd-1.1.2
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://www.arda.homeunix.net/store/
 LICENSE=		gnu-gpl-v2
diff --git a/dmapd/Makefile b/dmapd/Makefile
index db666df752..255064d783 100644
--- a/dmapd/Makefile
+++ b/dmapd/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	dmapd-0.0.50
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net audio
 MASTER_SITES=	http://www.flyn.org/projects/dmapd/
 
diff --git a/dolphin-plugins/Makefile b/dolphin-plugins/Makefile
index b7e7d72340..dcbee94faf 100644
--- a/dolphin-plugins/Makefile
+++ b/dolphin-plugins/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	dolphin-plugins-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://kde.org/applications/system/dolphin/
diff --git a/dolphin5/Makefile b/dolphin5/Makefile
index ff6a76a396..cba98fb18f 100644
--- a/dolphin5/Makefile
+++ b/dolphin5/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	dolphin-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://kde.org/applications/system/dolphin/
diff --git a/dovecot2-fts-xapian/Makefile b/dovecot2-fts-xapian/Makefile
index d209c452b3..1b4705d271 100644
--- a/dovecot2-fts-xapian/Makefile
+++ b/dovecot2-fts-xapian/Makefile
@@ -3,6 +3,7 @@
 GITHUB_PROJECT=	fts-xapian
 DISTNAME=	1.4.4
 PKGNAME=	dovecot2-fts-xapian-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=grosjo/}
 DIST_SUBDIR=	dovecot2-fts-xapian
diff --git a/drkonqi/Makefile b/drkonqi/Makefile
index b7fe4a490e..f9b4ccebad 100644
--- a/drkonqi/Makefile
+++ b/drkonqi/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	drkonqi-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	devel
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/emacs-git/Makefile b/emacs-git/Makefile
index 2508816fe7..0b3789c2f1 100644
--- a/emacs-git/Makefile
+++ b/emacs-git/Makefile
@@ -3,6 +3,7 @@
 .include	"version.mk"
 DISTNAME=	emacs-${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
 PKGNAME=	emacs28-${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
+PKGREVISION=	1
 CATEGORIES=	editors
 GIT_REPO=	git://git.savannah.gnu.org/emacs.git
 
diff --git a/emacs-snapshot/Makefile b/emacs-snapshot/Makefile
index 0374b1a2c3..57b33f9d58 100644
--- a/emacs-snapshot/Makefile
+++ b/emacs-snapshot/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	emacs-27.0.50_2019-11-11
 PKGVERSION=	27.0.50
+PKGREVISION=	1
 MASTER_SITES=	https://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-27/
 CATEGORIES=	editors
 
diff --git a/emacs27/Makefile b/emacs27/Makefile
index da6090822c..c359604e92 100644
--- a/emacs27/Makefile
+++ b/emacs27/Makefile
@@ -2,6 +2,7 @@
 
 CONFLICTS+=	emacs27-nox11-[0-9]*
 
+PKGREVISION= 1
 .include "../../wip/emacs27/Makefile.common"
 
 
diff --git a/epson-inkjet-printer-escpr/Makefile b/epson-inkjet-printer-escpr/Makefile
index b3e2619b66..2eba2280a4 100644
--- a/epson-inkjet-printer-escpr/Makefile
+++ b/epson-inkjet-printer-escpr/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	epson-inkjet-printer-escpr-1.7.7-1lsb3.2
 PKGNAME=	epson-inkjet-printer-escpr-1.7.7
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/10/49/18/f3016be6120a7271a6d9cb64872f817bce1920b8/
 
diff --git a/etoile-services/Makefile b/etoile-services/Makefile
index 5a7b5b4e41..aa8bbb07db 100644
--- a/etoile-services/Makefile
+++ b/etoile-services/Makefile
@@ -3,6 +3,7 @@
 
 DISTNAME=	etoile-${VERSN}
 PKGNAME=	${DISTNAME:S/-/-services-/}
+PKGREVISION=	1
 CATEGORIES=	gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 VERSN=		0.4.1
diff --git a/ffmpegthumbs/Makefile b/ffmpegthumbs/Makefile
index 8f9ddf7f96..a8638038c1 100644
--- a/ffmpegthumbs/Makefile
+++ b/ffmpegthumbs/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.69 2017/12/08 08:52:58 maya Exp $
 
 DISTNAME=	ffmpegthumbs-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 
 HOMEPAGE=	https://kde.org/applications/multimedia/
diff --git a/freerdp/Makefile b/freerdp/Makefile
index 5f49f302ec..3ac5421065 100644
--- a/freerdp/Makefile
+++ b/freerdp/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	freerdp-2.0.0-rc4
 PKGNAME=	${DISTNAME:S/-rc/rc/}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=FreeRDP/}
 GITHUB_PROJECT=	FreeRDP
diff --git a/gdm/Makefile b/gdm/Makefile
index 7d1a7a2f0b..8e54a6eca3 100644
--- a/gdm/Makefile
+++ b/gdm/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2015/06/06 20:44:44 krytarowski Exp $
 
 DISTNAME=	gdm-3.36.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GITHUB:=GNOME/}
 
diff --git a/ghostscript-cidfonts-ryumin/Makefile b/ghostscript-cidfonts-ryumin/Makefile
index f04a5f810a..631aa0e9db 100644
--- a/ghostscript-cidfonts-ryumin/Makefile
+++ b/ghostscript-cidfonts-ryumin/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	ghostscript-cidfonts-ryumin-${GS_VERSION}
 DISTFILES=	# empty
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	fonts
 
 MAINTAINER=	makoto@ki.nu
diff --git a/gmic/Makefile b/gmic/Makefile
index f2018475cc..eca1b7b838 100644
--- a/gmic/Makefile
+++ b/gmic/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	gmic_1.6.8
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://gmic.eu/files/source/
 
diff --git a/gvfs/Makefile b/gvfs/Makefile
index 5e4009ad4c..2088e64dd1 100644
--- a/gvfs/Makefile
+++ b/gvfs/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	gvfs-1.30.4
-PKGREVISION=	23
+PKGREVISION=	24
 CATEGORIES?=	sysutils 
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.30/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/gvfs/buildlink3.mk b/gvfs/buildlink3.mk
index 1613645778..5400d6c525 100644
--- a/gvfs/buildlink3.mk
+++ b/gvfs/buildlink3.mk
@@ -16,6 +16,7 @@ BUILDLINK_TREE+=	gvfs
 GVFS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gvfs+=	gvfs>=1.30.4nb23
+BUILDLINK_ABI_DEPENDS.gvfs?=	gvfs>=1.30.4nb24
 BUILDLINK_PKGSRCDIR.gvfs?=	../../wip/gvfs
 
 # XXX
diff --git a/heaptrack/Makefile b/heaptrack/Makefile
index 41077affd1..c026e79101 100644
--- a/heaptrack/Makefile
+++ b/heaptrack/Makefile
@@ -4,6 +4,7 @@ GITHUB_PROJECT=	heaptrack
 GITHUB_TAG=	v1.2.0
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=KDE/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
diff --git a/hpoj/Makefile b/hpoj/Makefile
index 88677244cc..3d8bbb10db 100644
--- a/hpoj/Makefile
+++ b/hpoj/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=		hpoj-0.91
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hpoj/}
 EXTRACT_SUFX=		.tgz
diff --git a/kactivitymanagerd/Makefile b/kactivitymanagerd/Makefile
index 072fe1ced8..765f787373 100644
--- a/kactivitymanagerd/Makefile
+++ b/kactivitymanagerd/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kactivitymanagerd-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kalarmcal/Makefile b/kalarmcal/Makefile
index aed43e19fc..c02a6dbbe6 100644
--- a/kalarmcal/Makefile
+++ b/kalarmcal/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kalarmcal-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
diff --git a/kalarmcal/buildlink3.mk b/kalarmcal/buildlink3.mk
index 8dcbe18f3e..01053f3181 100644
--- a/kalarmcal/buildlink3.mk
+++ b/kalarmcal/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	kalarmcal
 KALARMCAL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kalarmcal+=	kalarmcal>=17.12.1
+BUILDLINK_ABI_DEPENDS.kalarmcal?=		kalarmcal>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.kalarmcal?=		../../wip/kalarmcal
 
 .include "../../wip/akonadi/buildlink3.mk"
diff --git a/kde-cli-tools/Makefile b/kde-cli-tools/Makefile
index e7de63b979..c15da06639 100644
--- a/kde-cli-tools/Makefile
+++ b/kde-cli-tools/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kde-cli-tools-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kde-gtk-config/Makefile b/kde-gtk-config/Makefile
index 97bf13d42f..002c887d2a 100644
--- a/kde-gtk-config/Makefile
+++ b/kde-gtk-config/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kde-gtk-config-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kde-runtime4/Makefile b/kde-runtime4/Makefile
index 294ca579a4..5c83d3b55d 100644
--- a/kde-runtime4/Makefile
+++ b/kde-runtime4/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	kde-runtime-17.08.3
 PKGNAME=	${DISTNAME:S/-1/4-1/}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Runtime requirements for the KDE integrated X11 desktop
 MASTER_SITES=	${MASTER_SITE_KDE:=applications/17.08.3/src/}
diff --git a/kdialog/Makefile b/kdialog/Makefile
index ba781ba9a6..01d5430125 100644
--- a/kdialog/Makefile
+++ b/kdialog/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.69 2017/12/08 08:52:58 maya Exp $
 
 DISTNAME=	kdialog-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://www.kde.org/
diff --git a/keditbookmarks/Makefile b/keditbookmarks/Makefile
index e4a02e88ef..3ba2ed32f4 100644
--- a/keditbookmarks/Makefile
+++ b/keditbookmarks/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.69 2017/12/08 08:52:58 maya Exp $
 
 DISTNAME=	keditbookmarks-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://www.kde.org/
diff --git a/kfind/Makefile b/kfind/Makefile
index c5a3483257..0858dcd792 100644
--- a/kfind/Makefile
+++ b/kfind/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.69 2017/12/08 08:52:58 maya Exp $
 
 DISTNAME=	kfind-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://www.kde.org/applications/utilities/kfind/
diff --git a/kgamma5/Makefile b/kgamma5/Makefile
index bb1f82feff..8f5aed94de 100644
--- a/kgamma5/Makefile
+++ b/kgamma5/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kgamma5-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kget/Makefile b/kget/Makefile
index 5c80fe29e0..00a7ad1ccb 100644
--- a/kget/Makefile
+++ b/kget/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kget-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	net
 
 HOMEPAGE=	https://kde.org/applications/internet/kget/
diff --git a/kgpg/Makefile b/kgpg/Makefile
index 0524fa83d2..09a9956c76 100644
--- a/kgpg/Makefile
+++ b/kgpg/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.69 2017/12/08 08:52:58 maya Exp $
 
 DISTNAME=	kgpg-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	security
 
 HOMEPAGE=	https://kde.org/applications/utilities/kgpg/
diff --git a/khelpcenter/Makefile b/khelpcenter/Makefile
index 54731df0aa..e287507e2d 100644
--- a/khelpcenter/Makefile
+++ b/khelpcenter/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	khelpcenter-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://kde.org/applications/utilities/kcalc/
diff --git a/khotkeys/Makefile b/khotkeys/Makefile
index b9be22bf7a..d226c4f415 100644
--- a/khotkeys/Makefile
+++ b/khotkeys/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	khotkeys-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kinfocenter/Makefile b/kinfocenter/Makefile
index cbd99a6a88..c3182cb324 100644
--- a/kinfocenter/Makefile
+++ b/kinfocenter/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kinfocenter-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kio-extras/Makefile b/kio-extras/Makefile
index ddedb5cb8b..b66db24865 100644
--- a/kio-extras/Makefile
+++ b/kio-extras/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kio-extras-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://kde.org/applications/internet/
diff --git a/kmailtransport/Makefile b/kmailtransport/Makefile
index e6beac5d27..55040afbb9 100644
--- a/kmailtransport/Makefile
+++ b/kmailtransport/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kmailtransport-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	mail
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
diff --git a/kmailtransport/buildlink3.mk b/kmailtransport/buildlink3.mk
index 4cd324d55b..b1c4576aa7 100644
--- a/kmailtransport/buildlink3.mk
+++ b/kmailtransport/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	kmailtransport
 KMAILTRANSPORT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kmailtransport+=	kmailtransport>=17.12.1
+BUILDLINK_ABI_DEPENDS.kmailtransport?=	kmailtransport>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.kmailtransport?=	../../wip/kmailtransport
 
 .include "../../wip/akonadi-mime/buildlink3.mk"
diff --git a/kmenuedit/Makefile b/kmenuedit/Makefile
index cf134d042b..7a840216f7 100644
--- a/kmenuedit/Makefile
+++ b/kmenuedit/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kmenuedit-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kmix/Makefile b/kmix/Makefile
index 0355499dbf..857a40901e 100644
--- a/kmix/Makefile
+++ b/kmix/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.69 2017/12/08 08:52:58 maya Exp $
 
 DISTNAME=	kmix-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 
 HOMEPAGE=	https://kde.org/applications/multimedia/kmix/
diff --git a/kodi/Makefile b/kodi/Makefile
index 0a7c669d65..ff95ee9e8b 100644
--- a/kodi/Makefile
+++ b/kodi/Makefile
@@ -2,6 +2,7 @@
 
 PKGNAME=	kodi-17.3
 DISTNAME=	17.3-Krypton
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.kodi.tv/releases/source/
 
diff --git a/konsole/Makefile b/konsole/Makefile
index 979782ce1c..f0e7f5203c 100644
--- a/konsole/Makefile
+++ b/konsole/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	konsole-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://kde.org/applications/system/konsole/
diff --git a/krename/Makefile b/krename/Makefile
index b82b6bcd53..332838e34b 100644
--- a/krename/Makefile
+++ b/krename/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	krename-5.0.0
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=KDE/}
 GITHUB_PROJECT=	krename
diff --git a/kronometer/Makefile b/kronometer/Makefile
index 4793b2958e..a00817d21b 100644
--- a/kronometer/Makefile
+++ b/kronometer/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	kronometer-2.2.3
+PKGREVISION=	1
 CATEGORIES=	time
 MASTER_SITES=	${MASTER_SITE_KDE:=kronometer/2.2.3/src/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/kscreen/Makefile b/kscreen/Makefile
index bb144688c5..054e4f86d7 100644
--- a/kscreen/Makefile
+++ b/kscreen/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kscreen-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kscreenlocker/Makefile b/kscreenlocker/Makefile
index c2f28ee33d..e776cb257f 100644
--- a/kscreenlocker/Makefile
+++ b/kscreenlocker/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kscreenlocker-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kscreenlocker/buildlink3.mk b/kscreenlocker/buildlink3.mk
index 7a646daf18..9097908a65 100644
--- a/kscreenlocker/buildlink3.mk
+++ b/kscreenlocker/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	kscreenlocker
 KSCREENLOCKER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kscreenlocker+=	kscreenlocker>=5.6.3
+BUILDLINK_ABI_DEPENDS.kscreenlocker?=	kscreenlocker>=5.18.5nb1
 BUILDLINK_PKGSRCDIR.kscreenlocker?=	../../wip/kscreenlocker
 
 .include "../../devel/kdeclarative/buildlink3.mk"
diff --git a/ksshaskpass/Makefile b/ksshaskpass/Makefile
index df0cd3188b..8af125bba0 100644
--- a/ksshaskpass/Makefile
+++ b/ksshaskpass/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	ksshaskpass-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	security
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/ksysguard/Makefile b/ksysguard/Makefile
index 0217113906..4c21fece12 100644
--- a/ksysguard/Makefile
+++ b/ksysguard/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	ksysguard-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://userbase.kde.org/KSysGuard
diff --git a/kwalletmanager/Makefile b/kwalletmanager/Makefile
index 44e82618f1..9ba41865e4 100644
--- a/kwalletmanager/Makefile
+++ b/kwalletmanager/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.69 2017/12/08 08:52:58 maya Exp $
 
 DISTNAME=	kwalletmanager-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	security
 
 HOMEPAGE=	https://kde.org/applications/system/kwalletmanager/
diff --git a/kwin/Makefile b/kwin/Makefile
index 4c46dcdfc7..c2ff411b64 100644
--- a/kwin/Makefile
+++ b/kwin/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kwin-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/libanimal/Makefile b/libanimal/Makefile
index a6cf2fc757..8f97dc6608 100644
--- a/libanimal/Makefile
+++ b/libanimal/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	animal-0.15.0
 PKGNAME=	lib${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=siptoolbox/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/libkdepim/Makefile b/libkdepim/Makefile
index 82f3c7bff1..9e9bd177cb 100644
--- a/libkdepim/Makefile
+++ b/libkdepim/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	libkdepim-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
diff --git a/libkdepim/buildlink3.mk b/libkdepim/buildlink3.mk
index 4dbeb39138..490ebd834f 100644
--- a/libkdepim/buildlink3.mk
+++ b/libkdepim/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libkdepim
 LIBKDEPIM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libkdepim+=	libkdepim>=17.12.1
+BUILDLINK_ABI_DEPENDS.libkdepim?=		libkdepim>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.libkdepim?=		../../wip/libkdepim
 
 .include "../../wip/akonadi-contacts/buildlink3.mk"
diff --git a/libksysguard/Makefile b/libksysguard/Makefile
index 0f3353554d..72d212cbe9 100644
--- a/libksysguard/Makefile
+++ b/libksysguard/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	libksysguard-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://userbase.kde.org/KSysGuard
diff --git a/libksysguard/buildlink3.mk b/libksysguard/buildlink3.mk
index b16da1e650..b91229990f 100644
--- a/libksysguard/buildlink3.mk
+++ b/libksysguard/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libksysguard
 LIBKSYSGUARD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libksysguard+=	libksysguard>=5.6.3
+BUILDLINK_ABI_DEPENDS.libksysguard?=	libksysguard>=5.18.5nb1
 BUILDLINK_PKGSRCDIR.libksysguard?=	../../wip/libksysguard
 
 .include "../../x11/plasma-framework/buildlink3.mk"
diff --git a/libreoffice-git/Makefile b/libreoffice-git/Makefile
index daffc411c0..bb8f1353b2 100644
--- a/libreoffice-git/Makefile
+++ b/libreoffice-git/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.68 2015/11/23 10:30:16 wiz Exp $
 
 DISTNAME=	libreoffice
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 
 GIT_REPOSITORIES=	core
diff --git a/lightdm/Makefile b/lightdm/Makefile
index 09fb0fae18..34d0768628 100644
--- a/lightdm/Makefile
+++ b/lightdm/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: $
 
 DISTNAME=	lightdm-1.30.0
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=canonical/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
diff --git a/lives/Makefile b/lives/Makefile
index ee19d1ec27..5fba296e09 100644
--- a/lives/Makefile
+++ b/lives/Makefile
@@ -4,7 +4,7 @@
 DISTNAME=	lives-0.9.9.9
 LIVESVERS=	0.9.9.9
 PKGNAME=	lives-${LIVESVERS}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lives/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lumina-desktop/Makefile b/lumina-desktop/Makefile
index de32df913b..446b939dc2 100644
--- a/lumina-desktop/Makefile
+++ b/lumina-desktop/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	lumina-1.6.0
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lumina-desktop/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/milou/Makefile b/milou/Makefile
index 7b3441bd17..e8cfc8b429 100644
--- a/milou/Makefile
+++ b/milou/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	milou-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/muffin/Makefile b/muffin/Makefile
index 47200d22be..fdb366532a 100644
--- a/muffin/Makefile
+++ b/muffin/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.17 2013/06/17 12:45:12 thomasklausner Exp $
 
 DISTNAME=	muffin-4.6.2
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	muffin
diff --git a/natali/Makefile b/natali/Makefile
index 2f49d28df9..39a9a99149 100644
--- a/natali/Makefile
+++ b/natali/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.11 2014/09/08 12:37:30 thomasklausner Exp $
 
 DISTNAME=	natali-1.25
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ppr/}
 
diff --git a/natali/buildlink3.mk b/natali/buildlink3.mk
index f5e43c1227..1fe39dc1ba 100644
--- a/natali/buildlink3.mk
+++ b/natali/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	natali
 NATALI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.natali+=	natali>=1.25
+BUILDLINK_ABI_DEPENDS.natali?=	natali>=1.25nb2
 BUILDLINK_PKGSRCDIR.natali?=	../../wip/natali
 
 .include "../../net/netatalk22/buildlink3.mk"
diff --git a/nemo/Makefile b/nemo/Makefile
index 450f1abfe4..530dd1a9a9 100644
--- a/nemo/Makefile
+++ b/nemo/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
 DISTNAME=	nemo-4.0.6
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	nemo
diff --git a/oxygen/Makefile b/oxygen/Makefile
index ad958f65a8..e525d84a8e 100644
--- a/oxygen/Makefile
+++ b/oxygen/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	oxygen-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	graphics
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/php-imagick-imagick6/Makefile b/php-imagick-imagick6/Makefile
index d9e1088ef3..d4d2b11490 100644
--- a/php-imagick-imagick6/Makefile
+++ b/php-imagick-imagick6/Makefile
@@ -7,7 +7,7 @@ CATEGORIES+=		graphics
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://pecl.php.net/package/imagick/
 COMMENT=		PHP extension for ImageMagick graphics library
-PKGREVISION=		1
+PKGREVISION=		2
 LICENSE=		php
 
 PHP_VERSIONS_ACCEPTED=	56 70
diff --git a/pimcommon/Makefile b/pimcommon/Makefile
index bf5afa8815..238e15ee1b 100644
--- a/pimcommon/Makefile
+++ b/pimcommon/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	pimcommon-${KAPPSVER}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
diff --git a/pimcommon/buildlink3.mk b/pimcommon/buildlink3.mk
index 7ea06936d9..98999ae528 100644
--- a/pimcommon/buildlink3.mk
+++ b/pimcommon/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	pimcommon
 PIMCOMMON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pimcommon+=	pimcommon>=17.12.1
+BUILDLINK_ABI_DEPENDS.pimcommon?=		pimcommon>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.pimcommon?=		../../wip/pimcommon
 
 .include "../../mail/kimap/buildlink3.mk"
diff --git a/plasma-desktop/Makefile b/plasma-desktop/Makefile
index 9b0619605b..ef67820116 100644
--- a/plasma-desktop/Makefile
+++ b/plasma-desktop/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	plasma-desktop-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/plasma-integration/Makefile b/plasma-integration/Makefile
index e986e03d29..cfefa9b4ed 100644
--- a/plasma-integration/Makefile
+++ b/plasma-integration/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	plasma-integration-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/plasma-workspace/Makefile b/plasma-workspace/Makefile
index 3b6126498a..1afd3e15b6 100644
--- a/plasma-workspace/Makefile
+++ b/plasma-workspace/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	plasma-workspace-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/plasma-workspace/buildlink3.mk b/plasma-workspace/buildlink3.mk
index 135e368995..8a7de7b172 100644
--- a/plasma-workspace/buildlink3.mk
+++ b/plasma-workspace/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	plasma-workspace
 PLASMA_WORKSPACE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.plasma-workspace+=	plasma-workspace>=5.6.3
+BUILDLINK_ABI_DEPENDS.plasma-workspace?=		plasma-workspace>=5.18.5nb1
 BUILDLINK_PKGSRCDIR.plasma-workspace?=		../../wip/plasma-workspace
 
 .include "../../devel/kcmutils/buildlink3.mk"
diff --git a/polkit-kde-agent/Makefile b/polkit-kde-agent/Makefile
index a7f5837914..b4edd2d0e2 100644
--- a/polkit-kde-agent/Makefile
+++ b/polkit-kde-agent/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	polkit-kde-agent-1-${PLASMAVER}
 PKGNAME=	polkit-kde-agent-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/powerdevil/Makefile b/powerdevil/Makefile
index a8aa03c185..9467b0bdf3 100644
--- a/powerdevil/Makefile
+++ b/powerdevil/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	powerdevil-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/ppr/Makefile b/ppr/Makefile
index c1f65d0976..1ed22e72b1 100644
--- a/ppr/Makefile
+++ b/ppr/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.13 2014/09/08 21:24:08 thomasklausner Exp $
 
 DISTNAME=		ppr-1.53
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ppr/}\
 			ftp://ppr-dist.trincoll.edu/pub/ppr/
diff --git a/pulseaudio-git/Makefile b/pulseaudio-git/Makefile
index 18daf8794d..1037db03a4 100644
--- a/pulseaudio-git/Makefile
+++ b/pulseaudio-git/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.100 2015/11/02 13:40:41 ryoon Exp $
 
 DISTNAME=		pulseaudio-9.0
+PKGREVISION=		1
 CATEGORIES=		audio
 GIT_REPOSITORIES=	pulse
 GIT_REPO.pulse=		git://github.com/pulseaudio/pulseaudio.git
diff --git a/py-PythonMagick/Makefile b/py-PythonMagick/Makefile
index f8805d8588..c6726d0a3b 100644
--- a/py-PythonMagick/Makefile
+++ b/py-PythonMagick/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	PythonMagick-0.9.12
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	python graphics
 MASTER_SITES=	http://www.imagemagick.org/download/python/
 EXTRACT_SUFX=	.tar.xz
diff --git a/py-PythonMagick/buildlink3.mk b/py-PythonMagick/buildlink3.mk
index f28a22d139..e276622df4 100644
--- a/py-PythonMagick/buildlink3.mk
+++ b/py-PythonMagick/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	py-PythonMagick
 PY_PYTHONMAGICK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-PythonMagick+=	${PYPKGPREFIX}-PythonMagick>=0.9.1
-BUILDLINK_ABI_DEPENDS.py-PythonMagick?=	py27-PythonMagick>=0.9.12nb1
+BUILDLINK_ABI_DEPENDS.py-PythonMagick?=	py37-PythonMagick>=0.9.12nb2
 BUILDLINK_PKGSRCDIR.py-PythonMagick?=	../../wip/py-PythonMagick
 
 .include "../../graphics/ImageMagick/buildlink3.mk"
diff --git a/py-openastro/Makefile b/py-openastro/Makefile
index 88bc7f50e4..acdc7e269a 100644
--- a/py-openastro/Makefile
+++ b/py-openastro/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	openastro-1.1.38
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	time
 # The DISTFILE to download is an HTTP-only attachment.
 # The getsite.sh script uses cURL download the attached file.
diff --git a/qt5-qtbase-git/Makefile b/qt5-qtbase-git/Makefile
index 0594954df8..25bfc78890 100644
--- a/qt5-qtbase-git/Makefile
+++ b/qt5-qtbase-git/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.35 2016/04/11 19:01:40 ryoon Exp $
 
 PKGNAME=		qt5-qtbase-${QTVERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 GIT_REPOSITORIES=	qtproject
 GIT_REPO.qtproject=	https://github.com/qtproject/qtbase.git
 # 5.6 will go up to 5.7 and dev automatically
diff --git a/ruby-diaspora/Makefile b/ruby-diaspora/Makefile
index 3974595f09..f0b995c261 100644
--- a/ruby-diaspora/Makefile
+++ b/ruby-diaspora/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	diaspora-0.0.3.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 # Diaspora is not a gem.  There is no release tarball.  Perhaps one
 # can get it from github via tags, but it is not clear if that is
diff --git a/ruby-redmine/Makefile b/ruby-redmine/Makefile
index 75a8df0b08..c5e1c69b1a 100644
--- a/ruby-redmine/Makefile
+++ b/ruby-redmine/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	redmine-2.5.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.redmine.org/releases/
 
diff --git a/scribus/Makefile b/scribus/Makefile
index d4e991c16a..a7733f114a 100644
--- a/scribus/Makefile
+++ b/scribus/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	scribus-1.5.5
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scribus/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/siptoolbox/Makefile b/siptoolbox/Makefile
index 779b06e7e3..5738c72e4e 100644
--- a/siptoolbox/Makefile
+++ b/siptoolbox/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	sip-0.4.0-rc1
 PKGNAME=	siptoolbox-0.4.0nb1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=siptoolbox/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/spectacle/Makefile b/spectacle/Makefile
index 5a91ada312..2b358846ef 100644
--- a/spectacle/Makefile
+++ b/spectacle/Makefile
@@ -4,6 +4,7 @@ GITHUB_PROJECT=	spectacle
 GITHUB_TAG=	v20.08.1
 DISTNAME=	v20.08.1
 PKGNAME=	${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=KDE/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
diff --git a/splix/Makefile b/splix/Makefile
index dbb74dc325..904367b3c9 100644
--- a/splix/Makefile
+++ b/splix/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.7 2012/10/07 16:23:16 asau Exp $
 
 DISTNAME=	splix-2.0.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=splix/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/synfig/Makefile b/synfig/Makefile
index 423f2113f3..ef7d6fa456 100644
--- a/synfig/Makefile
+++ b/synfig/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.7 2014/08/11 23:10:14 thomasklausner Exp $
 
 DISTNAME=	synfig-0.62.02
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=synfig/}
 
diff --git a/system-tools-backends/Makefile b/system-tools-backends/Makefile
index 2acd812d5b..3afdf43aee 100644
--- a/system-tools-backends/Makefile
+++ b/system-tools-backends/Makefile
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=		system-tools-backends-2.10.2
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_GNOME:=/sources/system-tools-backends/2.10/}
 
diff --git a/systemsettings/Makefile b/systemsettings/Makefile
index ef9b74abd2..17ae1b3c75 100644
--- a/systemsettings/Makefile
+++ b/systemsettings/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	systemsettings-${PLASMAVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/systemsettings/buildlink3.mk b/systemsettings/buildlink3.mk
index 7a91985bdd..e0087b33fc 100644
--- a/systemsettings/buildlink3.mk
+++ b/systemsettings/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	systemsettings
 SYSTEMSETTINGS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.systemsettings+=	systemsettings>=5.6.3
+BUILDLINK_ABI_DEPENDS.systemsettings?=	systemsettings>=5.18.5nb1
 BUILDLINK_PKGSRCDIR.systemsettings?=	../../wip/systemsettings
 
 .include "../../devel/kcmutils/buildlink3.mk"
diff --git a/tc-hasida-table/Makefile b/tc-hasida-table/Makefile
index 24806c679e..6b5d8466ec 100644
--- a/tc-hasida-table/Makefile
+++ b/tc-hasida-table/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2013/12/15 04:12:49 makoto Exp $
 
 DISTNAME=	hasida-table-0.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	inputmethod
 MASTER_SITES=	ftp://ftp.ki.nu/pub/
 
diff --git a/uffizi/Makefile b/uffizi/Makefile
index d34f61ea0a..5ec8985456 100644
--- a/uffizi/Makefile
+++ b/uffizi/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	uffizi
 PKGNAME=	uffizi-0.7
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www graphics perl5
 MASTER_SITES=	http://jmason.org/software/uffizi/
 EXTRACT_SUFX=	.txt
diff --git a/upower/Makefile b/upower/Makefile
index 535f1339ef..88ca7151e2 100644
--- a/upower/Makefile
+++ b/upower/Makefile
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=	upower-0.9.16
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://upower.freedesktop.org/releases/
 EXTRACT_SUFX=	.tar.xz
diff --git a/vba-m/Makefile b/vba-m/Makefile
index f96bcfdb55..2efae7fe13 100644
--- a/vba-m/Makefile
+++ b/vba-m/Makefile
@@ -3,7 +3,7 @@
 VERSION=	1159
 DISTNAME=	vbam-r${VERSION}-src
 PKGNAME=	vba-m-1.8.0.${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vbam/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/xmms2/Makefile b/xmms2/Makefile
index d6db5950d0..282ea799a4 100644
--- a/xmms2/Makefile
+++ b/xmms2/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	xmms2-0.8DrO_o
 PKGNAME=	${DISTNAME:S/DrO_o//1}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmms2/}
 EXTRACT_SUFX=	.tar.bz2