diff --git a/databases/pear-MDB2-mysqli/Makefile b/databases/pear-MDB2-mysqli/Makefile
index 6a404992b48..778f939e1a4 100644
--- a/databases/pear-MDB2-mysqli/Makefile
+++ b/databases/pear-MDB2-mysqli/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2015/06/05 06:00:21 robert Exp $
+# $OpenBSD: Makefile,v 1.14 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	MySQLi database abstraction layer for PHP
 
@@ -10,7 +10,7 @@ CATEGORIES =	net databases
 MAINTAINER =	Giovanni Bechis <giovanni@openbsd.org>
 MODULES =	lang/php www/pear
 
-REVISION =	6
+REVISION =	7
 
 # PHP License
 PERMIT_PACKAGE_CDROM =	Yes
diff --git a/databases/pear-MDB2-pgsql/Makefile b/databases/pear-MDB2-pgsql/Makefile
index 1cfd9072bc1..fca2996d791 100644
--- a/databases/pear-MDB2-pgsql/Makefile
+++ b/databases/pear-MDB2-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2015/06/05 06:00:21 robert Exp $
+# $OpenBSD: Makefile,v 1.6 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	PostgreSQL database abstraction layer for PHP
 
@@ -7,7 +7,7 @@ DISTNAME =	MDB2_Driver_pgsql-${V}
 PKGNAME =	pear-MDB2-pgsql-${V}
 CATEGORIES =	net databases
 MAINTAINER =	Johan Huldtgren <jhuldtgren@gmail.com>
-REVISION =	2
+REVISION =	3
 
 MODULES =	lang/php www/pear
 
diff --git a/databases/pg_stats_reporter/Makefile b/databases/pg_stats_reporter/Makefile
index 14747a5cb56..1a4a37a0b43 100644
--- a/databases/pg_stats_reporter/Makefile
+++ b/databases/pg_stats_reporter/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2016/05/13 22:30:25 landry Exp $
+# $OpenBSD: Makefile,v 1.6 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	graphical report tool for PostgreSQL
 
 DISTNAME =	pg_stats_reporter-3.2.1
+REVISION =	0
 CATEGORIES =	databases www
 
 HOMEPAGE =	http://pgstatsinfo.sourceforge.net/
diff --git a/databases/pgfouine/Makefile b/databases/pgfouine/Makefile
index 233dc526d57..e5413249b6d 100644
--- a/databases/pgfouine/Makefile
+++ b/databases/pgfouine/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2015/07/18 21:11:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.15 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	PostgreSQL log analyzer
 
 DISTNAME =	pgfouine-1.2
 CATEGORIES =	databases
 
-REVISION =	6
+REVISION =	7
 
 HOMEPAGE =	http://pgfouine.projects.postgresql.org/
 
diff --git a/devel/boris/Makefile b/devel/boris/Makefile
index 1bf4db2411e..3217160d050 100644
--- a/devel/boris/Makefile
+++ b/devel/boris/Makefile
@@ -1,14 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2017/04/28 15:37:27 benoit Exp $
+# $OpenBSD: Makefile,v 1.12 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =		read-eval-print loop for PHP
 
-V =			1.0.10
-
 GH_ACCOUNT =		d11wtq
 GH_PROJECT =		boris
-GH_TAGNAME =		v$V
-
-DISTNAME =		${GH_PROJECT}-$V
+GH_TAGNAME =		v1.0.10
+REVISION =		0
 
 CATEGORIES =		devel
 
diff --git a/mail/z-push/Makefile b/mail/z-push/Makefile
index 39f212fe855..5464b881d28 100644
--- a/mail/z-push/Makefile
+++ b/mail/z-push/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.53 2018/04/28 14:05:15 robert Exp $
+# $OpenBSD: Makefile,v 1.54 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	ActiveSync protocol implementation
 
 V=		2.4.1
 DISTNAME=	z-push-${V}
+REVISION=	0
 
 CATEGORIES=	mail www
 
diff --git a/multimedia/yle-dl/Makefile b/multimedia/yle-dl/Makefile
index a48d5f8933b..81ae27dbad0 100644
--- a/multimedia/yle-dl/Makefile
+++ b/multimedia/yle-dl/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2018/05/13 07:13:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.16 2018/05/22 08:18:08 sthen Exp $
 
 GH_ACCOUNT =		aajanki
 GH_PROJECT =		yle-dl
 GH_TAGNAME =		2.28
 MODPY_EGG_VERSION =	${GH_TAGNAME}
-REVISION =		0
+REVISION =		1
 
 COMMENT =		download videos from YLE Areena
 
diff --git a/net/icinga/web/Makefile b/net/icinga/web/Makefile
index 67a2985f2f8..14058ef6576 100644
--- a/net/icinga/web/Makefile
+++ b/net/icinga/web/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.36 2017/12/20 15:11:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	web UI for icinga
 
 GH_ACCOUNT =	Icinga
 GH_PROJECT =	icinga-web
 GH_TAGNAME =	v1.14.1
+REVISION =	0
 
 MODULES=	lang/php
 
diff --git a/net/icinga/web2-module-director/Makefile b/net/icinga/web2-module-director/Makefile
index 29d111a4d8b..6b2e44f3e5b 100644
--- a/net/icinga/web2-module-director/Makefile
+++ b/net/icinga/web2-module-director/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2018/02/12 14:36:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	web-based config deployment tool for Icinga 2
 
 GH_ACCOUNT =	Icinga
 GH_PROJECT =	icingaweb2-module-director
 GH_TAGNAME =	v1.4.3
+REVISION =	0
 PKGNAME =	${DISTNAME:S/icingaweb2/icinga-web2/}
 
 MODULES=	lang/php
diff --git a/net/icinga/web2/Makefile b/net/icinga/web2/Makefile
index c2aaf0407d7..eac4f764927 100644
--- a/net/icinga/web2/Makefile
+++ b/net/icinga/web2/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2018/05/10 12:50:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	next-generation web UI for icinga
 
 GH_ACCOUNT =	Icinga
 GH_PROJECT =	icingaweb2
 GH_TAGNAME =	v2.5.3
+REVISION =	0
 PKGNAME =	icinga-web2-${GH_TAGNAME:S/v//}
 
 MODULES=	lang/php
diff --git a/net/nfsen/Makefile b/net/nfsen/Makefile
index 9717466ccf6..386f9b3c7ef 100644
--- a/net/nfsen/Makefile
+++ b/net/nfsen/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.38 2018/01/11 19:27:07 rpe Exp $
+# $OpenBSD: Makefile,v 1.39 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=		web-based front end for the nfdump netflow tools
 
 V=			1.3.8
-REVISION=		1
+REVISION=		2
 DISTNAME=		nfsen-$V
 CATEGORIES=		net www
 HOMEPAGE=		http://nfsen.sourceforge.net/
diff --git a/net/pear-Net-DNS/Makefile b/net/pear-Net-DNS/Makefile
index 6b960e73dca..ee750972a1a 100644
--- a/net/pear-Net-DNS/Makefile
+++ b/net/pear-Net-DNS/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2015/06/05 06:00:22 robert Exp $
+# $OpenBSD: Makefile,v 1.18 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	resolver library used to communicate with a DNS server
 
 DISTNAME=	Net_DNS-1.0.7
 CATEGORIES=	net
-REVISION=	0
+REVISION=	1
 
 MODULES=	lang/php www/pear
 
diff --git a/net/pear-Net-LDAP/Makefile b/net/pear-Net-LDAP/Makefile
index f47f57a27c2..9fa80092fda 100644
--- a/net/pear-Net-LDAP/Makefile
+++ b/net/pear-Net-LDAP/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2015/06/05 06:00:22 robert Exp $
+# $OpenBSD: Makefile,v 1.20 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	pear ldap
 
 DISTNAME=	Net_LDAP-1.1.5
-REVISION=	6
+REVISION=	7
 CATEGORIES=	net
 
 MODULES=	lang/php www/pear
diff --git a/net/pear-Net-LDAP2/Makefile b/net/pear-Net-LDAP2/Makefile
index 33f9f55d070..80388fafd6d 100644
--- a/net/pear-Net-LDAP2/Makefile
+++ b/net/pear-Net-LDAP2/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2016/04/25 15:06:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	PHP classes for LDAP, based on Net::LDAP
 
 DISTNAME=	Net_LDAP2-2.2.0
+REVISION=	0
 CATEGORIES=	net
 
 MODULES=	lang/php www/pear
diff --git a/net/php-weathermap/Makefile b/net/php-weathermap/Makefile
index 4382a53c0c7..5948909fcec 100644
--- a/net/php-weathermap/Makefile
+++ b/net/php-weathermap/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2015/06/05 06:00:22 robert Exp $
+# $OpenBSD: Makefile,v 1.18 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	graphical network traffic map
 
 DISTNAME=	php-weathermap-0.97c
 EXTRACT_SUFX=	.zip
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	net www
 
diff --git a/net/zabbix/Makefile b/net/zabbix/Makefile
index bfccde6d0ce..954baae4a03 100644
--- a/net/zabbix/Makefile
+++ b/net/zabbix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.140 2018/05/10 12:17:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.141 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT-main =		network and application monitoring - agent
 COMMENT-server =	network and application monitoring - server
@@ -16,7 +16,8 @@ FULLPKGNAME-web =	zabbix-web-${VERSION}
 FULLPKGPATH-web =	net/zabbix,-web
 CATEGORIES =		net
 
-REVISION-proxy =	0
+REVISION-proxy =	1
+REVISION-web =		0
 
 MAJV =			${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
@@ -87,6 +88,7 @@ LIB_DEPENDS-proxy =	${LIB_DEPENDS} \
 			security/libssh2 \
 			textproc/libxml
 WANTLIB-proxy =		${WANTLIB} netsnmp ssh2 xml2
+RUN_DEPENDS-proxy =	# empty
 
 FLAVOR ?=		no_server
 .if empty(FLAVOR)
diff --git a/productivity/baikal/Makefile b/productivity/baikal/Makefile
index 544d81996e8..e9f13cea815 100644
--- a/productivity/baikal/Makefile
+++ b/productivity/baikal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2018/02/27 21:47:38 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	lightweight CalDAV and CardDAV server
 
@@ -7,7 +7,7 @@ DISTNAME=	baikal-${VERSION}
 MASTER_SITES=	https://github.com/fruux/Baikal/releases/download/${VERSION}/
 DISTFILES=	${DISTNAME}.zip
 CATEGORIES=	productivity www
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://sabre.io/baikal/
 
diff --git a/productivity/davical/Makefile b/productivity/davical/Makefile
index d2f45bde328..1398f46ed87 100644
--- a/productivity/davical/Makefile
+++ b/productivity/davical/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/03/24 18:29:37 landry Exp $
+# $OpenBSD: Makefile,v 1.20 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	CalDAV/CardDav calendar/contacts server
 
@@ -7,7 +7,7 @@ GITLAB_ACCOUNT = davical-project
 GITLAB_TAG =	r1.1.3.1
 DISTNAME =	${GITLAB_PROJECT}-${GITLAB_TAG:S/r//}
 CATEGORIES =	productivity net
-REVISION =	3
+REVISION =	4
 
 HOMEPAGE =	http://www.davical.org/
 
diff --git a/textproc/tcpdf/Makefile b/textproc/tcpdf/Makefile
index 8a18c79b770..0b88ee4c2ff 100644
--- a/textproc/tcpdf/Makefile
+++ b/textproc/tcpdf/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.33 2016/08/27 17:26:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	PHP class for generating PDF documents
 DISTNAME =	tcpdf_6_2_13
 PKGNAME =	tcpdf-6.2.13
+REVISION =	0
 CATEGORIES=	textproc
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcpdf/}
diff --git a/www/awl/Makefile b/www/awl/Makefile
index 713a9ee7b9d..d2a65f75dfe 100644
--- a/www/awl/Makefile
+++ b/www/awl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2016/02/12 10:54:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	Andrews web libraries for PHP
 
@@ -9,7 +9,7 @@ DISTNAME =	${GITLAB_PROJECT}-${GITLAB_TAG:S/r//}
 PKGNAME =	php-${DISTNAME}
 CATEGORIES =	www
 PKG_ARCH =	*
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	https://gitlab.com/${GITLAB_ACCOUNT}/${GITLAB_PROJECT}
 
diff --git a/www/composer/Makefile b/www/composer/Makefile
index baf1ab30252..1dfd8c7a650 100644
--- a/www/composer/Makefile
+++ b/www/composer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2018/03/02 17:24:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	dependency manager for PHP
 
@@ -6,6 +6,7 @@ CATEGORIES=	www devel
 
 V=		1.6.3
 EPOCH=		0
+REVISION=	0
 MASTER_SITES=	https://getcomposer.org/download/$V/
 DISTNAME=	composer-$V
 DISTFILES=	composer-$V{composer}.phar
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index e5e1ae6771c..18d80d2bbd9 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2018/05/11 20:12:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	standards compliant, simple to use Wiki
 
 VERSION =	2017-02-19e
-REVISION =	1
+REVISION =	2
 DISTNAME =	dokuwiki-${VERSION}
 PKGNAME =	dokuwiki-${VERSION:S/-/./g}
 CATEGORIES =	www
diff --git a/www/drupal7/core7/Makefile b/www/drupal7/core7/Makefile
index 5466e11782b..405ca0e092d 100644
--- a/www/drupal7/core7/Makefile
+++ b/www/drupal7/core7/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2018/04/25 17:01:35 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	powerful content management system
 
 DISTNAME =	drupal-7.59
 PKGNAME =	drupal-7.59
+REVISION =	0
 DISTFILES =	${DISTNAME}${EXTRACT_SUFX}
 
 MODULES =	lang/php
diff --git a/www/drush/Makefile b/www/drush/Makefile
index 38f8c6c5db3..e9c64621745 100644
--- a/www/drush/Makefile
+++ b/www/drush/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2016/02/27 17:15:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =	command line access to most of Drupal
 
 CATEGORIES =	www devel
 
 V=		8.0.3
+REVISION=	0
 DISTNAME=	drush-$V
 EXTRACT_SUFX=	-deps.tar.xz
 
diff --git a/www/mollify/Makefile b/www/mollify/Makefile
index b654cd7f6de..8ce15dd8bab 100644
--- a/www/mollify/Makefile
+++ b/www/mollify/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2016/10/01 11:54:17 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	simple and clean multi-user web file manager
 
 DISTNAME=	mollify_1.8.9.3
-REVISION=	2
+REVISION=	3
 PKGNAME=	${DISTNAME:S/_/-/}
 EXTRACT_SUFX=	.zip
 CATEGORIES=	www
diff --git a/www/pear/Makefile b/www/pear/Makefile
index d58aec6a912..6c10d1a371c 100644
--- a/www/pear/Makefile
+++ b/www/pear/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2016/04/01 18:46:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT-main=	base classes for common PHP tasks
 COMMENT-utils=	utilities for managing pear extensions
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.phar
 EXTRACT_ONLY=
 PKGNAME-main=	pear-${VERSION}
 PKGNAME-utils=	pear-utils-${VERSION}
+REVISION=	0
 WRKDIST=	${WRKDIR}
 CATEGORIES=	www devel
 
diff --git a/www/php-markdown/Makefile b/www/php-markdown/Makefile
index cdc4af486d2..c842d63740e 100644
--- a/www/php-markdown/Makefile
+++ b/www/php-markdown/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2017/05/11 20:50:55 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=		Markdown implementation for PHP
 
 V =			1.6.0
 DISTNAME =		php-markdown-lib-$V
 PKGNAME =		${DISTNAME:S/-lib//}
+REVISION =		0
 CATEGORIES=		www
 
 HOMEPAGE =		https://michelf.ca/projets/php-markdown/
diff --git a/www/php-openid/Makefile b/www/php-openid/Makefile
index 528fc7f049d..f8a13dd821f 100644
--- a/www/php-openid/Makefile
+++ b/www/php-openid/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2015/06/05 06:00:23 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=		OpenID authentication for PHP
 
 DISTNAME=		php-openid-2.1.2
-REVISION=		6
+REVISION=		7
 CATEGORIES=		www security
 
 # Apache 2.0 license
diff --git a/www/php-predis/Makefile b/www/php-predis/Makefile
index 8e336429137..ae1c7efca3c 100644
--- a/www/php-predis/Makefile
+++ b/www/php-predis/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2016/06/20 09:44:06 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.29 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT =		PHP client library for the Redis key-value database
 
 DISTNAME =		Predis-1.1.1
 PKGNAME =		${DISTNAME:S/^P/php-p/}
+REVISION =		0
 CATEGORIES =		www databases
 
 HOMEPAGE =		http://wiki.github.com/nrk/predis
diff --git a/www/phpldapadmin/Makefile b/www/phpldapadmin/Makefile
index ec69f40e4b5..6e8c978cde7 100644
--- a/www/phpldapadmin/Makefile
+++ b/www/phpldapadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2015/09/12 08:09:05 robert Exp $
+# $OpenBSD: Makefile,v 1.45 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	web-based LDAP browser to manage LDAP servers
 
@@ -6,7 +6,7 @@ VERSION=	1.2.3
 DISTNAME=	phpldapadmin-${VERSION}
 CATEGORIES=	www
 HOMEPAGE=	http://phpldapadmin.sourceforge.net/
-REVISION=	3
+REVISION=	4
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/www/phpmyadmin/Makefile b/www/phpmyadmin/Makefile
index 924e1e65923..9d87b4b62a5 100644
--- a/www/phpmyadmin/Makefile
+++ b/www/phpmyadmin/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.128 2017/02/01 08:52:36 giovanni Exp $
+# $OpenBSD: Makefile,v 1.129 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	tool to handle the administration of MySQL over the web
 
 V=		4.6.6
+REVISION=	0
 
 PKGNAME=	phpMyAdmin-$V
 DISTNAME=	phpMyAdmin-$V-all-languages
diff --git a/www/phppgadmin/Makefile b/www/phppgadmin/Makefile
index 53afaf8cbea..c3ffb9f215e 100644
--- a/www/phppgadmin/Makefile
+++ b/www/phppgadmin/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.26 2015/06/05 06:00:23 robert Exp $
+# $OpenBSD: Makefile,v 1.27 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=	tool to handle the administration of PostgreSQL over the web
 
 DISTNAME=	phpPgAdmin-5.1
 CATEGORIES=	www databases
 HOMEPAGE=	http://phppgadmin.sourceforge.net/
-REVISION=	1
+REVISION=	2
 
 MAINTAINER=	Pierre-Emmanuel Andre <pea@openbsd.org>
 
diff --git a/www/phpvirtualbox/Makefile b/www/phpvirtualbox/Makefile
index 119cfa44add..ae6efe38de6 100644
--- a/www/phpvirtualbox/Makefile
+++ b/www/phpvirtualbox/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2016/01/09 07:34:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT=		web-based VirtualBox front-end
 	
 V=			5.0-5
 DISTNAME=		phpvirtualbox-${V}
 PKGNAME=		phpvirtualbox-${V:S/-/./}
+REVISION=		0
 EXTRACT_SUFX=		.zip
 
 CATEGORIES=		www sysutils
diff --git a/www/pnp4nagios/Makefile b/www/pnp4nagios/Makefile
index 226720cc98b..5002c8a79a2 100644
--- a/www/pnp4nagios/Makefile
+++ b/www/pnp4nagios/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2018/01/11 19:27:11 rpe Exp $
+# $OpenBSD: Makefile,v 1.10 2018/05/22 08:18:08 sthen Exp $
 
 COMMENT-main =	Nagios/Icinga addon which graphs performance data
 COMMENT-cgi =	pnp4nagios CGI scripts
@@ -8,6 +8,7 @@ DISTNAME =	pnp4nagios-${V}
 PKGNAME-main =	${DISTNAME}
 PKGNAME-cgi =	pnp4nagios-cgi-${V}
 REVISION-main = 1
+REVISION-cgi =	0
 
 CATEGORIES =	www
 
diff --git a/www/sabredav/Makefile b/www/sabredav/Makefile
index 13f44579459..342028f84b3 100644
--- a/www/sabredav/Makefile
+++ b/www/sabredav/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2018/01/04 06:32:58 bentley Exp $
+# $OpenBSD: Makefile,v 1.18 2018/05/22 08:18:09 sthen Exp $
 
 V =		1.8.7
 COMMENT =	php5 WebDAV server
@@ -7,7 +7,7 @@ PKGNAME =	${DISTNAME:L}
 PKG_ARCH =	*
 EXTRACT_SUFX =	.zip
 CATEGORIES =	www
-REVISION =	2
+REVISION =	3
 
 HOMEPAGE =	http://sabre.io/dav/
 
diff --git a/www/selfoss/Makefile b/www/selfoss/Makefile
index 748999b4ddc..7a04343457f 100755
--- a/www/selfoss/Makefile
+++ b/www/selfoss/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2018/04/29 09:37:07 rpe Exp $
+# $OpenBSD: Makefile,v 1.22 2018/05/22 08:18:09 sthen Exp $
 
 COMMENT=		rss reader, live stream, mashup, aggregation webapp
 
 V=			2.18
 DISTNAME=		selfoss-$V
+REVISION=		0
 
 CATEGORIES=		www
 
diff --git a/www/syweb/Makefile b/www/syweb/Makefile
index 9a69a095a27..d3729454aff 100644
--- a/www/syweb/Makefile
+++ b/www/syweb/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.23 2017/07/05 10:22:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2018/05/22 08:18:09 sthen Exp $
 
 COMMENT=	web frontend to symon
 DISTNAME=	syweb-0.65
-REVISION=	5
+REVISION=	6
 CATEGORIES=	www sysutils
 
 HOMEPAGE=	http://www.xs4all.nl/~wpd/symon
diff --git a/www/wp-cli/Makefile b/www/wp-cli/Makefile
index 0fd879e62eb..e6b19ac2335 100644
--- a/www/wp-cli/Makefile
+++ b/www/wp-cli/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/12/10 16:44:01 abieber Exp $
+# $OpenBSD: Makefile,v 1.2 2018/05/22 08:18:09 sthen Exp $
 
 COMMENT =	command line tool for wordpress
 
 GH_ACCOUNT =	wp-cli
 GH_PROJECT =	wp-cli
 GH_TAGNAME =	v1.4.1
+REVISION =	0
 
 EXTRACT_ONLY =
 EXTRACT_SUFX =	.phar
diff --git a/x11/kde4/kcachegrind/Makefile b/x11/kde4/kcachegrind/Makefile
index b6842c8a63a..62c6d89aa64 100644
--- a/x11/kde4/kcachegrind/Makefile
+++ b/x11/kde4/kcachegrind/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/27 11:57:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/05/22 08:18:09 sthen Exp $
 
 COMMENT =	KDE GUI for profilers
 DISTNAME =	kcachegrind-${MODKDE4_VERSION}
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	devel
 HOMEPAGE =	http://projects.kde.org/projects/kde/kdesdk/kcachegrind