diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index dc37e04d674..5ea732134b0 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2017/11/21 00:13:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.57 2018/06/29 09:58:56 espie Exp $
 
 COMMENT=		library for loading GLADE interface files at runtime
 
@@ -8,7 +8,7 @@ EXTRACT_SUFX=		.tar.bz2
 
 PKGNAME=		libglade2-${GNOME_VERSION}
 EPOCH=			0
-REVISION=		15
+REVISION=		16
 
 SHARED_LIBS +=  glade-2.0            1.0      # 1.0
 
diff --git a/devel/libglade2/pkg/PLIST b/devel/libglade2/pkg/PLIST
index 3a16d3a5e4c..351d47ca516 100644
--- a/devel/libglade2/pkg/PLIST
+++ b/devel/libglade2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2015/03/16 18:07:42 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.12 2018/06/29 09:58:56 espie Exp $
 bin/libglade-convert
 include/libglade-2.0/
 include/libglade-2.0/glade/
@@ -37,5 +37,4 @@ share/libxml2/libglade2.spec
 share/xml/
 share/xml/libglade/
 share/xml/libglade/glade-2.0.dtd
-@exec %D/share/libxml2/rebuild
-@unexec-delete %D/share/libxml2/rebuild
+@tag libxml2/rebuild
diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index e8c566504ec..ae92d4a3f3d 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2016/09/12 11:45:58 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2018/06/29 09:58:56 espie Exp $
 
 COMMENT-main=	toolkit for OATH/HOTP and TOTP
 COMMENT-pskc=	toolkit for RFC 6030 Portable Symmetric Key Container
@@ -8,6 +8,7 @@ DISTNAME=	oath-toolkit-$V
 PKGNAME-main=	oath-toolkit-$V
 PKGNAME-pskc=	oath-toolkit-pskc-$V
 REVISION-main=	0
+REVISION-pskc=	0
 
 SHARED_LIBS +=  oath                      0.2 # 1.3
 SHARED_LIBS +=  pskc                      0.1 # 0.1
diff --git a/security/oath-toolkit/pkg/PLIST-pskc b/security/oath-toolkit/pkg/PLIST-pskc
index 8e0516609c3..9204facf01b 100644
--- a/security/oath-toolkit/pkg/PLIST-pskc
+++ b/security/oath-toolkit/pkg/PLIST-pskc
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-pskc,v 1.5 2016/09/03 14:23:38 sthen Exp $
+@comment $OpenBSD: PLIST-pskc,v 1.6 2018/06/29 09:58:56 espie Exp $
 @bin bin/pskctool
 include/pskc/
 include/pskc/container.h
@@ -128,5 +128,4 @@ share/xml/pskc/catalog-pskc.xml
 share/xml/pskc/pskc-schema.xsd
 share/xml/pskc/xenc-schema.xsd
 share/xml/pskc/xmldsig-core-schema.xsd
-@exec %D/share/libxml2/rebuild
-@unexec-delete %D/share/libxml2/rebuild
+@tag libxml2/rebuild
diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index c55939683e3..0aa4b9ea914 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2013/03/11 11:42:41 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2018/06/29 09:58:56 espie Exp $
 
 COMMENT=	docbook XSL modular stylesheet
 
 DISTNAME=	docbook-xsl-1.68.1
-REVISION =	5
+REVISION =	6
 CATEGORIES=	textproc
 
 HOMEPAGE=	http://docbook.sourceforge.net/projects/xsl/
diff --git a/textproc/docbook-xsl/pkg/PLIST b/textproc/docbook-xsl/pkg/PLIST
index 44a700ad5ac..6ae90617800 100644
--- a/textproc/docbook-xsl/pkg/PLIST
+++ b/textproc/docbook-xsl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/03/20 17:06:45 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2018/06/29 09:58:56 espie Exp $
 share/doc/xsl/
 share/doc/xsl/docbook/
 share/doc/xsl/docbook/ChangeLog
@@ -1460,5 +1460,4 @@ share/xsl/docbook/xhtml/toc.xsl
 share/xsl/docbook/xhtml/verbatim.xsl
 share/xsl/docbook/xhtml/xref.xsl
 share/libxml2/docbook-xsl.spec
-@exec %D/share/libxml2/rebuild
-@unexec-delete %D/share/libxml2/rebuild
+@tag libxml2/rebuild
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index f0f1be3c5e6..f85c368a9fb 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.32 2015/12/03 21:24:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.33 2018/06/29 09:58:56 espie Exp $
 
 PKG_ARCH=	*
 
 COMMENT=	technical documentation XML/SGML definitions
 
 DISTNAME=	docbook-4.5
-REVISION=	1
+REVISION=	2
 DIST_SUBDIR=	docbook
 CATEGORIES=	textproc
 
diff --git a/textproc/docbook/pkg/PLIST b/textproc/docbook/pkg/PLIST
index dea757961ad..002be47584a 100644
--- a/textproc/docbook/pkg/PLIST
+++ b/textproc/docbook/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.14 2012/09/27 17:27:32 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.15 2018/06/29 09:58:56 espie Exp $
 @unexec-delete rm ${SYSCONFDIR}/xml/catalog
 share/sgml/catalog
 share/sgml/docbook/2.4.1/
@@ -298,6 +298,5 @@ share/xml/docbook/catalog
 share/xml/docbook/catalog.xml
 share/libxml2/docbook.spec
 @sample ${SYSCONFDIR}/xml/
-@exec %D/share/libxml2/rebuild
-@unexec-delete %D/share/libxml2/rebuild
+@tag libxml2/rebuild
 @exec ln -sf /var/db/xmlcatalog ${SYSCONFDIR}/xml/catalog
diff --git a/textproc/docbook2x/Makefile b/textproc/docbook2x/Makefile
index e41afb24f69..317f9d57a32 100644
--- a/textproc/docbook2x/Makefile
+++ b/textproc/docbook2x/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2016/09/13 18:52:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2018/06/29 09:58:56 espie Exp $
 
 COMMENT =	convert DocBook to man pages and Texinfo
 
 DISTNAME =	docbook2X-0.8.8
 PKGNAME =	${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	textproc
 
diff --git a/textproc/docbook2x/pkg/PLIST b/textproc/docbook2x/pkg/PLIST
index dc06199e9eb..cdb25023906 100644
--- a/textproc/docbook2x/pkg/PLIST
+++ b/textproc/docbook2x/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/05/04 14:07:18 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.2 2018/06/29 09:58:56 espie Exp $
 bin/db2x_manxml
 bin/db2x_texixml
 bin/db2x_xsltproc
@@ -179,5 +179,4 @@ share/docbook2X/xslt/texi/toc.xsl
 share/docbook2X/xslt/texi/verbatim.xsl
 share/docbook2X/xslt/texi/xref.xsl
 share/libxml2/docbook2X.spec
-@exec %D/share/libxml2/rebuild
-@unexec-delete %D/share/libxml2/rebuild
+@tag libxml2/rebuild
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 85de860bc43..5958ccfa49c 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.173 2018/03/14 08:20:49 jasper Exp $
+# $OpenBSD: Makefile,v 1.174 2018/06/29 09:58:56 espie Exp $
 
 COMMENT-main=		XML parsing library
 COMMENT-python=		Python bindings for libxml
@@ -11,6 +11,7 @@ SHARED_LIBS +=	xml2                 16.1     # 11.8
 CATEGORIES=		textproc
 MASTER_SITES=		http://gd.tuwien.ac.at/pub/libxml/ \
 			ftp://xmlsoft.org/libxml/
+REVISION-main=		0
 
 HOMEPAGE=		http://xmlsoft.org/
 
diff --git a/textproc/libxml/pkg/PLIST-main b/textproc/libxml/pkg/PLIST-main
index 65f67329e5e..e14317f4d93 100644
--- a/textproc/libxml/pkg/PLIST-main
+++ b/textproc/libxml/pkg/PLIST-main
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-main,v 1.9 2014/10/17 13:24:59 jasper Exp $
+@comment $OpenBSD: PLIST-main,v 1.10 2018/06/29 09:58:57 espie Exp $
 @pkgpath textproc/libxml
+@define-tag libxml2/rebuild at-end %D/share/libxml2/rebuild
+@tag libxml2/rebuild
 bin/xml2-config
 @bin bin/xmlcatalog
 @bin bin/xmllint
@@ -286,5 +288,4 @@ share/gtk-doc/html/libxml2/style.css
 share/gtk-doc/html/libxml2/up.png
 share/libxml2/
 share/libxml2/rebuild
-@exec %D/share/libxml2/rebuild
 @extra /var/db/xmlcatalog