diff --git a/devel/gitsh/Makefile b/devel/gitsh/Makefile
index 6f9f3fc2238..dfaee1997fd 100644
--- a/devel/gitsh/Makefile
+++ b/devel/gitsh/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2015/01/16 00:35:14 jca Exp $
+# $OpenBSD: Makefile,v 1.3 2015/07/16 17:27:08 jeremy Exp $
 
 VERSION =		0.9
 
 COMMENT =		interactive shell for git
 
 DISTNAME =		gitsh-${VERSION}
+REVISION =		0
 
 CATEGORIES =		devel
 
diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index c79975fa414..3ddb3ef3a5a 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2015/05/09 15:08:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2015/07/16 17:27:08 jeremy Exp $
 
 COMMENT =		state machine compiler
 
 DISTNAME =		ragel-6.9
+REVISION =		0
 CATEGORIES =		devel
 
 HOMEPAGE =		http://www.colm.net/open-source/ragel/
diff --git a/devel/swig/Makefile b/devel/swig/Makefile
index b202881e30f..070e9070f0a 100644
--- a/devel/swig/Makefile
+++ b/devel/swig/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.58 2014/01/20 19:14:50 fgsch Exp $
+# $OpenBSD: Makefile,v 1.59 2015/07/16 17:27:08 jeremy Exp $
 
 COMMENT =	simplified wrapper and interface generator
 
 SUBST_VARS =	VERSION
 VERSION =	2.0.11
-REVISION =	0
+REVISION =	1
 
 DISTNAME =	swig-${VERSION}
 CATEGORIES =	devel
diff --git a/lang/ruby/ruby.port.mk b/lang/ruby/ruby.port.mk
index 25b5a444c27..b8752b94fff 100644
--- a/lang/ruby/ruby.port.mk
+++ b/lang/ruby/ruby.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: ruby.port.mk,v 1.79 2015/01/08 18:51:20 jeremy Exp $
+# $OpenBSD: ruby.port.mk,v 1.80 2015/07/16 17:27:08 jeremy Exp $
 
 # ruby module
 
@@ -46,9 +46,9 @@ FULLPKGNAME?=		${MODRUBY_PKG_PREFIX}-${PKGNAME}
 SUBST_VARS+=		GEM_BIN_SUFFIX GEM_MAN_SUFFIX
 
 FLAVOR?=
-# Without a FLAVOR, assume the use of ruby 2.1.
+# Without a FLAVOR, assume the use of ruby 2.2.
 .    if empty(FLAVOR)
-FLAVOR =		ruby21
+FLAVOR =		ruby22
 .    endif
 
 # Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
@@ -75,8 +75,8 @@ PKG_ARGS+=	-f ${PORTSDIR}/lang/ruby/ruby18.PLIST
 .endif
 
 # The default ruby version to use for non-gem/extconf ports.  Defaults to ruby
-# 2.1 for consistency with the default ruby21 FLAVOR for gem/extconf ports.
-MODRUBY_REV?=		2.1
+# 2.2 for consistency with the default ruby22 FLAVOR for gem/extconf ports.
+MODRUBY_REV?=		2.2
 
 # Because the rbx and jruby FLAVORs use same binary names but in
 # different directories, GEM_MAN_SUFFIX is used for the man pages to avoid
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 4de3605b540..6075c14d8a7 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2015/05/29 05:13:07 yasuoka Exp $
+# $OpenBSD: Makefile,v 1.10 2015/07/16 17:27:08 jeremy Exp $
 
 COMMENT=	emacs-based mail client
 
 DISTNAME=	mew-6.6
 CATEGORIES=	mail
 HOMEPAGE=	http://www.mew.org/
-REVISION=	1
+REVISION=	2
 
 MAINTAINER=	YASUOKA Masahiko <yasuoka@yasuoka.net>
 
diff --git a/misc/tpp/Makefile b/misc/tpp/Makefile
index 1540520c2e8..44e43758057 100644
--- a/misc/tpp/Makefile
+++ b/misc/tpp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2014/10/02 12:50:42 jasper Exp $
+# $OpenBSD: Makefile,v 1.16 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT =		text-based presentation program
 
 DISTNAME =		tpp-1.3.1
-REVISION =		7
+REVISION =		8
 
 CATEGORIES =		misc productivity
 
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index d4a5689de06..d6d9993768b 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.38 2015/07/02 08:30:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT=	create, alter and inspect Matroska files
 
 DISTNAME=	mkvtoolnix-8.1.0
+REVISION=	0
 CATEGORIES=	multimedia x11
 MASTER_SITES=	${HOMEPAGE}/sources/
 EXTRACT_SUFX=	.tar.xz
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index 62e7fa2fbd1..7dc1bc65b35 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.89 2015/06/10 21:42:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.90 2015/07/16 17:27:09 jeremy Exp $
 
 PORTROACH_COMMENT= rrdcached crashes at startup in 1.5.0 to at least 1.5.3
 
@@ -17,6 +17,7 @@ PKGNAME-main=	${DISTNAME}
 PKGNAME-update=	rrdupdate-${VERSION}
 PKGNAME-python= py-rrd-${VERSION}
 PKGNAME-ruby=	ruby-rrd-${VERSION}
+REVISION-ruby=	0
 
 SHARED_LIBS +=	rrd                  4.0      # 6.1
 SHARED_LIBS +=	rrd_th               4.0      # 6.1
diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index d3e2f9ca7a5..2915da28130 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2015/01/19 12:28:46 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.18 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT-main=	fast, light and extensible chat client
 COMMENT-lua=	Lua bindings for weechat
@@ -15,6 +15,8 @@ PKGNAME-python=	weechat-python-${V}
 PKGNAME-ruby=	weechat-ruby-${V}
 PKGNAME-tcl=	weechat-tcl-${V}
 
+REVISION-ruby=	0
+
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.weechat.org/
diff --git a/sysutils/god/Makefile b/sysutils/god/Makefile
index 4ad4daf4d6b..52c4c351657 100644
--- a/sysutils/god/Makefile
+++ b/sysutils/god/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2014/09/27 17:06:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.20 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT=	system monitoring framework written in Ruby
 
 DISTNAME=	god-0.7.22
 FULLPKGNAME=	${DISTNAME}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	sysutils
 
 # MIT
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
index c7a57bd8176..77dff1f6d11 100644
--- a/sysutils/mcollective/Makefile
+++ b/sysutils/mcollective/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.30 2015/06/12 18:01:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.31 2015/07/16 17:27:09 jeremy Exp $
 
 BROKEN-alpha=	SIGABRT during make fake
 COMMENT=	framework for server orchestration/parallel job execution
 
 DISTNAME=	mcollective-2.8.2
+REVISION=	0
 
 CATEGORIES=	sysutils
 
diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index 2c81c169614..9b83d2117ec 100755
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2015/06/05 06:00:22 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT-main=		Redland librdf Perl Bindings
 #COMMENT-lua=		Redland librdf Lua Bindings
@@ -16,6 +16,7 @@ PKGNAME-python=		py-librdf-$V
 PKGNAME-ruby=		ruby-librdf-$V
 REVISION-perl=		0
 REVISION-php=		2
+REVISION-ruby=		0
 
 HOMEPAGE=		http://librdf.org/bindings/
 
diff --git a/www/webkit/Makefile b/www/webkit/Makefile
index 407e53a23fd..1b087566a3b 100644
--- a/www/webkit/Makefile
+++ b/www/webkit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.140 2015/05/28 10:17:25 pascal Exp $
+# $OpenBSD: Makefile,v 1.141 2015/07/16 17:27:09 jeremy Exp $
 
 PORTROACH =	limit:^2\.4
 
@@ -13,7 +13,7 @@ EPOCH =		1
 CATEGORIES =	www
 DPB_PROPERTIES =parallel
 EXTRACT_SUFX =	.tar.xz
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://webkitgtk.org/
 MASTER_SITES =	${HOMEPAGE}/releases/
diff --git a/www/webkitgtk4/Makefile b/www/webkitgtk4/Makefile
index a9091d18b42..a3a53ff49c9 100644
--- a/www/webkitgtk4/Makefile
+++ b/www/webkitgtk4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2015/07/10 14:05:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2015/07/16 17:27:09 jeremy Exp $
 
 BROKEN-alpha =		error: Compiler GCC >= 4.7 or Clang >= 3.3 is required for C compilation
 BROKEN-hppa =		error: Compiler GCC >= 4.7 or Clang >= 3.3 is required for C compilation
@@ -12,6 +12,7 @@ COMMENT =		GTK+ port of the WebKit rendering engine
 V =			2.8.4
 DISTNAME =		webkitgtk-${V}
 PKGNAME =		webkitgtk4-${V}
+REVISION =		0
 EXTRACT_SUFX =		.tar.xz
 API =			4.0
 SUBST_VARS =		API
diff --git a/x11/gnome/code-assistance/Makefile b/x11/gnome/code-assistance/Makefile
index 3f660651e66..a202294fb4a 100644
--- a/x11/gnome/code-assistance/Makefile
+++ b/x11/gnome/code-assistance/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2015/05/03 14:16:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.17 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT=		code assistance services for GNOME
 
 GNOME_PROJECT=		gnome-code-assistance
 GNOME_VERSION=		3.16.0
+REVISION=		0
 
 CATEGORIES=		devel
 
diff --git a/x11/kde4/korundum/Makefile b/x11/kde4/korundum/Makefile
index 0ae3a52a07d..9eb99033c18 100644
--- a/x11/kde4/korundum/Makefile
+++ b/x11/kde4/korundum/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2015/05/28 10:17:28 pascal Exp $
+# $OpenBSD: Makefile,v 1.14 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT =	KDE bindings for Ruby
 DISTNAME =	korundum-${MODKDE4_VERSION}
-REVISION =	1
+REVISION =	2
 
 WANTLIB =  c m pthread ${MODRUBY_WANTLIB}
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg
diff --git a/x11/kde4/kross-interpreters/Makefile b/x11/kde4/kross-interpreters/Makefile
index 035bf3b9bb1..17ebf9458d2 100644
--- a/x11/kde4/kross-interpreters/Makefile
+++ b/x11/kde4/kross-interpreters/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2015/05/28 10:17:29 pascal Exp $
+# $OpenBSD: Makefile,v 1.12 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT-main =	KDE bindings for running interpreters
 COMMENT-java =	KDE Java bindings
@@ -6,7 +6,7 @@ DISTNAME =	kross-interpreters-${MODKDE4_VERSION}
 PKGNAME-main =	${PKGNAME}
 PKGNAME-java =	${PKGNAME:C/interpreters/java/}
 REVISION-java =	0
-REVISION-main =	0
+REVISION-main =	1
 
 MULTI_PACKAGES =	-main -java
 
diff --git a/x11/kde4/webdev/Makefile b/x11/kde4/webdev/Makefile
index 9ffee2729cb..53addc560db 100644
--- a/x11/kde4/webdev/Makefile
+++ b/x11/kde4/webdev/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2015/06/26 09:18:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT =	web development tools for KDE
 DISTNAME =	kdewebdev-${MODKDE4_VERSION}
 PKGSPEC =	kdewebdev-${MODKDE4_SPEC}
-REVISION =	2
+REVISION =	3
 
 SHARED_LIBS =	klinkstatuscommon	51.0
 SHARED_LIBS +=	kommandercore		51.0
diff --git a/x11/kde4/workspace/Makefile b/x11/kde4/workspace/Makefile
index b4418440fa4..e188a0ac2c1 100644
--- a/x11/kde4/workspace/Makefile
+++ b/x11/kde4/workspace/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.40 2015/07/02 00:10:16 zhuk Exp $
+# $OpenBSD: Makefile,v 1.41 2015/07/16 17:27:09 jeremy Exp $
 
 COMMENT =	KDE workspace
 DISTNAME =	kde-workspace-4.11.21
+REVISION =	0
 
 MASTER_SITES =	${MASTER_SITE_KDE:=stable/applications/15.04.3/src/}