diff --git a/databases/architect/Makefile b/databases/architect/Makefile
index 03fc6d6bb4e..8e6da71c20c 100644
--- a/databases/architect/Makefile
+++ b/databases/architect/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2015/08/24 23:42:45 bentley Exp $
+# $OpenBSD: Makefile,v 1.21 2017/04/21 13:27:46 kurt Exp $
 
 PKG_ARCH=		*
 
@@ -11,7 +11,7 @@ PKGNAME=		architect-${V}
 CATEGORIES=		databases
 WRKDIST=		${WRKDIR}/architect-${V}/
 
-REVISION=		3
+REVISION=		4
 
 HOMEPAGE=		http://www.sqlpower.ca/page/architect
 
diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile
index c680736e9e8..e286888c4f5 100644
--- a/databases/db/v4/Makefile
+++ b/databases/db/v4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2017/04/10 11:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.69 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT-java=	Java bindings for Berkeley DB, revision ${REV}
 
@@ -15,7 +15,7 @@ EPOCH-main=	0
 REVISION-main = 3
 EPOCH-java=	0
 EPOCH-tcl=	0
-REVISION-java =	4
+REVISION-java =	5
 REVISION-tcl =	1
 DBLIBDIR=	lib/db4
 
diff --git a/databases/jxplorer/Makefile b/databases/jxplorer/Makefile
index 4b9acf89ed0..cd89ac799f7 100644
--- a/databases/jxplorer/Makefile
+++ b/databases/jxplorer/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2015/07/18 21:11:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.16 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	standards compliant LDAP browser
 
 V=		3.2
 DISTNAME=	JXv${V}deploy
 PKGNAME=	jxplorer-${V}
-REVISION=	9
+REVISION=	10
 EXTRACT_SUFX=	.zip
 CATEGORIES=	databases net
 
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 5b2d8f4152c..dd4f79c6867 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2016/05/02 11:53:49 jasper Exp $
+# $OpenBSD: Makefile,v 1.40 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=        build tool for java applications
 
 DISTNAME=	apache-ant-1.9.7
 CATEGORIES=	devel
+REVISION=	0
 
 HOMEPAGE=	http://ant.apache.org/
 
diff --git a/devel/apktool/Makefile b/devel/apktool/Makefile
index aef840744c3..e9ade0794f6 100644
--- a/devel/apktool/Makefile
+++ b/devel/apktool/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2016/11/15 12:51:02 rpointel Exp $
+# $OpenBSD: Makefile,v 1.11 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT =		tool for reverse engineering Android apk files
 
 DISTNAME =		apktool_2.2.1
 PKGNAME =		${DISTNAME:S/_/-/}
+REVISION =		0
 
 CATEGORIES =		devel security java
 
diff --git a/devel/dex2jar/Makefile b/devel/dex2jar/Makefile
index 6f53c30b265..2f249d7f921 100644
--- a/devel/dex2jar/Makefile
+++ b/devel/dex2jar/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2016/06/15 19:49:40 rpointel Exp $
+# $OpenBSD: Makefile,v 1.2 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT =	tools to work with android .dex and java .class files
 
 DISTNAME =	dex2jar-2.0
+REVISION =	0
 
 CATEGORIES =	devel security
 
diff --git a/devel/javahelp/Makefile b/devel/javahelp/Makefile
index dc75710b513..5327b11824c 100644
--- a/devel/javahelp/Makefile
+++ b/devel/javahelp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2015/07/04 20:14:43 kurt Exp $
+# $OpenBSD: Makefile,v 1.3 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT =		online help system for java platform applications
 
@@ -8,6 +8,7 @@ DISTNAME =		javahelp${VERSION}
 DISTFILES =		javahelp${VERSION_}.zip
 PKGNAME =		javahelp-${VERSION}
 CATEGORIES =		devel
+REVISION =		0
 
 HOMEPAGE =		https://javahelp.java.net/
 MAINTAINER =		Bryan Everly <bryan@bceassociates.com>
diff --git a/devel/jd-gui/Makefile b/devel/jd-gui/Makefile
index 8dec7b04129..d3c5d43c788 100644
--- a/devel/jd-gui/Makefile
+++ b/devel/jd-gui/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2016/06/15 19:12:33 rpointel Exp $
+# $OpenBSD: Makefile,v 1.2 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT =		yet another fast Java decompiler
 
 VERSION =		1.4.0
 DISTNAME =		jd-gui-${VERSION}
+REVISION =		0
 
 CATEGORIES =		devel security
 
diff --git a/devel/jdk/Makefile b/devel/jdk/Makefile
index 9970dbba7c4..a79f5a135fd 100644
--- a/devel/jdk/Makefile
+++ b/devel/jdk/Makefile
@@ -1,7 +1,6 @@
-# $OpenBSD: Makefile,v 1.26 2015/06/17 17:16:04 kurt Exp $
+# $OpenBSD: Makefile,v 1.27 2017/04/21 13:27:46 kurt Exp $
 
 SUBDIR =
-SUBDIR += 1.7
 SUBDIR += 1.8
 
 .include <bsd.port.subdir.mk>
diff --git a/devel/jdk/java.port.mk b/devel/jdk/java.port.mk
index 341b1421f8d..120dbfd9181 100644
--- a/devel/jdk/java.port.mk
+++ b/devel/jdk/java.port.mk
@@ -1,9 +1,9 @@
-# $OpenBSD: java.port.mk,v 1.34 2015/06/17 17:16:04 kurt Exp $
+# $OpenBSD: java.port.mk,v 1.35 2017/04/21 13:27:46 kurt Exp $
 
 # Set MODJAVA_VER to x.y or x.y+ based on the version
 # of the jdk needed for the port. x.y  means any x.y jdk.
 # x.y+ means any x.y jdk or higher version. Valid values
-# for x.y are 1.3, 1.4, 1.5, 1.6, 1.7 or 1.8
+# for x.y are 1.4, 1.5, 1.6, 1.7 or 1.8
 
 MODJAVA_VER?=
 
@@ -25,7 +25,7 @@ MODJAVA_JRERUN?=no
 #
 # NOTE: All source built java ports must properly set
 # javac -source and -target build arguments. Depending
-# on the architecture a 1.3, 1.4 or 1.5 level port may be
+# on the architecture a 1.4 or 1.5 level port may be
 # built by a 1.6 jdk. The JAVA_HOME variable points to the
 # build jdk not the default RUN_DEPEND jdk, so it
 # should not be used to set a default jdk to run with.
@@ -33,34 +33,18 @@ MODJAVA_JRERUN?=no
 # default JAVA_HOME or JAVACMD vars for a package.
 #
 
-.if ${MODJAVA_VER} == "1.3" || ${MODJAVA_VER} == "1.4" || ${MODJAVA_VER} == "1.5" || ${MODJAVA_VER} == "1.6"
+.if ${MODJAVA_VER} == "1.4" || ${MODJAVA_VER} == "1.5" || ${MODJAVA_VER} == "1.6" || ${MODJAVA_VER} == "1.7"
     BROKEN=MODJAVA_VER=${MODJAVA_VER} only ports are not supported
-.elif ${MODJAVA_VER} == "1.3+" || ${MODJAVA_VER} == "1.4+" || ${MODJAVA_VER} == "1.5+" || ${MODJAVA_VER} == "1.6+"
+.elif ${MODJAVA_VER} == "1.4+" || ${MODJAVA_VER} == "1.5+" || ${MODJAVA_VER} == "1.6+" || ${MODJAVA_VER} == "1.7+"
    ONLY_FOR_ARCHS?= i386 amd64
 .  if ${NO_BUILD:L} != "yes"
-     JAVA_HOME= ${LOCALBASE}/jdk-1.7.0
-     BUILD_DEPENDS+= jdk->=1.7.0,<1.8v0:devel/jdk/1.7
+     JAVA_HOME= ${LOCALBASE}/jdk-1.8.0
+     BUILD_DEPENDS+= jdk->=1.8v0,<1.9v0:devel/jdk/1.8
 .  endif
 .  if ${MODJAVA_JRERUN:L} == "yes"
-     MODJAVA_RUN_DEPENDS= jdk->=1.7.0|jre->=1.7.0:devel/jdk/1.7
+     MODJAVA_RUN_DEPENDS= jdk->=1.8v0|jre->=1.8v0:devel/jdk/1.8
 .  else
-     MODJAVA_RUN_DEPENDS= jdk->=1.7.0:devel/jdk/1.7
-.  endif
-.elif ${MODJAVA_VER:S/+//} == "1.7"
-   ONLY_FOR_ARCHS?= i386 amd64
-.  if ${NO_BUILD:L} != "yes"
-     JAVA_HOME= ${LOCALBASE}/jdk-1.7.0
-     BUILD_DEPENDS+= jdk->=1.7.0,<1.8v0:devel/jdk/1.7
-.  endif
-.  if ${MODJAVA_JRERUN:L} == "yes"
-     _MODJAVA_RUNDEP= jdk->=1.7.0,<1.8v0|jre->=1.7.0,<1.8v0
-.  else
-     _MODJAVA_RUNDEP= jdk->=1.7.0,<1.8v0
-.  endif
-.  if ${MODJAVA_VER} == "1.7+"
-     MODJAVA_RUN_DEPENDS= ${_MODJAVA_RUNDEP:S/,<1.8v0//g}:devel/jdk/1.7
-.  else
-     MODJAVA_RUN_DEPENDS= ${_MODJAVA_RUNDEP}:devel/jdk/1.7
+     MODJAVA_RUN_DEPENDS= jdk->=1.8v0:devel/jdk/1.8
 .  endif
 .elif ${MODJAVA_VER:S/+//} == "1.8"
    ONLY_FOR_ARCHS?= i386 amd64
diff --git a/devel/jenkins/devel/Makefile b/devel/jenkins/devel/Makefile
index 5921a85215a..51a6605bcff 100644
--- a/devel/jenkins/devel/Makefile
+++ b/devel/jenkins/devel/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2016/10/11 05:51:03 jasper Exp $
+# $OpenBSD: Makefile,v 1.21 2017/04/21 13:27:46 kurt Exp $
 
 VERSION =	1.656
 MASTER_SITES =	http://mirrors.jenkins-ci.org/war/${VERSION}/
 DIST_SUBDIR =	jenkins-devel
-REVISION =	1
+REVISION =	2
 
 .include <bsd.port.mk>
 
diff --git a/devel/jenkins/stable/Makefile b/devel/jenkins/stable/Makefile
index 4d0522d026e..bd96270de04 100644
--- a/devel/jenkins/stable/Makefile
+++ b/devel/jenkins/stable/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2016/10/11 05:51:03 jasper Exp $
+# $OpenBSD: Makefile,v 1.20 2017/04/21 13:27:46 kurt Exp $
 
 VERSION =	1.651.2
 MASTER_SITES =	http://mirrors.jenkins-ci.org/war-stable/${VERSION}/
 DIST_SUBDIR =	jenkins-stable
-REVISION =	1
+REVISION =	2
 
 .include <bsd.port.mk>
 
diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index da08ecd5d02..97d4b3536a9 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2015/07/29 07:59:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	software project management and comprehension tool
 
@@ -6,6 +6,7 @@ V=		3.3.1
 DISTNAME=	apache-maven-$V
 PKGNAME=	${DISTNAME:S/apache-//}
 CATEGORIES=	devel
+REVISION=	0
 
 HOMEPAGE=	http://maven.apache.org/
 
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index ba00fd2671b..61cee090779 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.156 2017/04/12 18:12:33 landry Exp $
+# $OpenBSD: Makefile,v 1.157 2017/04/21 13:27:46 kurt Exp $
 
 USE_WXNEEDED=	Yes
 
@@ -20,6 +20,7 @@ PKGNAME-java=	libreoffice-java-${VERSION}
 CATEGORIES=	editors productivity
 DPB_PROPERTIES=	parallel tag:kde4
 REVISION=	1
+REVISION-java=	1
 
 EPOCH=		0
 
diff --git a/games/freecol/Makefile b/games/freecol/Makefile
index dd133dbad96..c297b455982 100644
--- a/games/freecol/Makefile
+++ b/games/freecol/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2015/10/31 22:46:00 benoit Exp $
+# $OpenBSD: Makefile,v 1.10 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT =	free Colonization clone
 DISTNAME =	freecol-0.11.6
 EXTRACT_SUFX =	.zip
 CATEGORIES =	games java x11
+REVISION =	0
 
 HOMEPAGE =	http://www.freecol.org/
 
diff --git a/games/jbrickshooter/Makefile b/games/jbrickshooter/Makefile
index 768f2a839a0..b4492440624 100644
--- a/games/jbrickshooter/Makefile
+++ b/games/jbrickshooter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2017/01/24 20:40:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT =	brick shooter reflexion game
 
@@ -7,6 +7,7 @@ GH_PROJECT=	jbrickshooter
 GH_COMMIT=	0445d9171cc46462970ae8eb08f0c7294c5707df
 DISTNAME=	${GH_PROJECT}-1.6.0
 CATEGORIES=	games
+REVISION=	0
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index 4646438e0a4..2e994f3ad51 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/03/18 23:12:17 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	lightweight game library for java
 
@@ -8,6 +8,7 @@ GH_PROJECT=	lwjgl
 GH_TAGNAME=	${GH_PROJECT}${V}
 DISTNAME=	lwjgl${V}
 PKGNAME=	lwjgl-${V}
+REVISION=	0
 
 .if ${MACHINE_ARCH} == "i386"
 M_ARCH=		""
diff --git a/games/minecraft/Makefile b/games/minecraft/Makefile
index b3c5984a824..24dfcdb524a 100644
--- a/games/minecraft/Makefile
+++ b/games/minecraft/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2015/07/16 05:17:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2017/04/21 13:27:46 kurt Exp $
 
 PORTROACH=	skipv:0.1
 PORTROACH_COMMENT=version 0.1 is actually older than 0.0.4
@@ -10,7 +10,7 @@ GH_PROJECT=	minecraft
 GH_ACCOUNT=	qbit
 GH_TAGNAME=	${GH_PROJECT}-${V}
 DISTNAME=	${GH_TAGNAME}
-REVISION=	3
+REVISION=	4
 
 CATEGORIES=	games
 
diff --git a/geo/jeoip/Makefile b/geo/jeoip/Makefile
index 98680731d5a..df524051dec 100644
--- a/geo/jeoip/Makefile
+++ b/geo/jeoip/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.26 2016/03/06 18:50:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=		Java interface to GeoIP database
 DISTNAME=		jeoip-0.5
-REVISION=		14
+REVISION=		15
 CATEGORIES=		geo net
 PKG_ARCH=		*
 
diff --git a/java/jBCrypt/Makefile b/java/jBCrypt/Makefile
index 8e54b5db066..11c5936f389 100644
--- a/java/jBCrypt/Makefile
+++ b/java/jBCrypt/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2015/02/06 14:11:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	BCrypt library for Java
 
 DISTNAME=	jBCrypt-0.4
+REVISION=	0
 
 CATEGORIES=	security
 
diff --git a/java/java-getopt/Makefile b/java/java-getopt/Makefile
index cadd237a5af..bcf4c45898d 100644
--- a/java/java-getopt/Makefile
+++ b/java/java-getopt/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2014/09/27 17:23:45 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	Java port of GNU getopt family functions
 
 DISTNAME=	java-getopt-1.0.14
 CATEGORIES=	devel
+REVISION=	0
 
 HOMEPAGE=	http://www.urbanophile.com/arenn/hacking/download.html
 
diff --git a/java/java-getopt/pkg/PLIST b/java/java-getopt/pkg/PLIST
index 2895b1e99af..7317eafdd52 100644
--- a/java/java-getopt/pkg/PLIST
+++ b/java/java-getopt/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2014/05/07 15:42:16 kurt Exp $
+@comment $OpenBSD: PLIST,v 1.4 2017/04/21 13:27:46 kurt Exp $
 share/java/
 share/java/classes/
 share/java/classes/gnu.getopt.jar
@@ -20,9 +20,4 @@ share/java/doc/getopt/index-all.html
 share/java/doc/getopt/index.html
 share/java/doc/getopt/overview-tree.html
 share/java/doc/getopt/package-list
-share/java/doc/getopt/resources/
-share/java/doc/getopt/resources/background.gif
-share/java/doc/getopt/resources/tab.gif
-share/java/doc/getopt/resources/titlebar.gif
-share/java/doc/getopt/resources/titlebar_end.gif
 share/java/doc/getopt/stylesheet.css
diff --git a/java/jna/Makefile b/java/jna/Makefile
index 081ea3cdb40..986a5416eef 100644
--- a/java/jna/Makefile
+++ b/java/jna/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2017/03/26 12:45:27 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	Java Native Access (JNA)
 
@@ -7,6 +7,7 @@ GH_ACCOUNT=	java-native-access
 GH_TAGNAME=	4.4.0
 CATEGORIES=	devel
 MAINTAINER=	Jasper Lievisse Adriaanse <jasper@openbsd.org>
+REVISION=	0
 
 HOMEPAGE=	https://github.com/java-native-access/jna
 
diff --git a/java/jna/pkg/PLIST b/java/jna/pkg/PLIST
index f9cdd9dc6c5..4a207ed3c76 100644
--- a/java/jna/pkg/PLIST
+++ b/java/jna/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2017/03/26 12:45:27 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.7 2017/04/21 13:27:46 kurt Exp $
 share/java/
 share/java/classes/
 share/java/classes/jna-min.jar
@@ -1030,11 +1030,7 @@ share/java/doc/javadoc/overview-frame.html
 share/java/doc/javadoc/overview-summary.html
 share/java/doc/javadoc/overview-tree.html
 share/java/doc/javadoc/package-list
-share/java/doc/javadoc/resources/
-share/java/doc/javadoc/resources/background.gif
-share/java/doc/javadoc/resources/tab.gif
-share/java/doc/javadoc/resources/titlebar.gif
-share/java/doc/javadoc/resources/titlebar_end.gif
+share/java/doc/javadoc/script.js
 share/java/doc/javadoc/serialized-form.html
 share/java/doc/javadoc/stylesheet.css
 share/java/doc/jna/
diff --git a/java/junit/Makefile b/java/junit/Makefile
index 80ab15df1ad..8938244fda7 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2015/11/24 09:11:05 jasper Exp $
+# $OpenBSD: Makefile,v 1.30 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	regression testing utility for use with the Java language
 
 VERSION=	4.9
 DISTNAME=	junit${VERSION}
-REVISION=	1
+REVISION=	2
 PKGNAME=	junit-${VERSION}
 
 CATEGORIES=	devel
diff --git a/java/tanukiwrapper/Makefile b/java/tanukiwrapper/Makefile
index 1e7ee8f0b37..6d6f5689114 100644
--- a/java/tanukiwrapper/Makefile
+++ b/java/tanukiwrapper/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2016/09/13 15:29:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	Tanuki Java Service Wrapper
 
 SVN_REV=	1780
 DISTNAME=	wrapper-code-${SVN_REV}-trunk
 PKGNAME=	java-tanukiwrapper-3.5.19.1
-REVISION=	2
+REVISION=	3
 CATEGORIES=	java
 
 HOMEPAGE=	http://wrapper.tanukisoftware.com/
diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile
index 21b8432bc20..61453fc42b0 100644
--- a/lang/abcl/Makefile
+++ b/lang/abcl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2016/11/01 10:25:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT =		Common Lisp dialect for the Java Virtual Machine
 
@@ -6,6 +6,7 @@ V =			1.4.0
 DISTNAME =		abcl-src-${V}
 PKGNAME =		abcl-${V}
 PKG_ARCH =		*
+REVISION =		0
 
 CATEGORIES =		lang
 
diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile
index 688f0b94644..fc1317d507c 100644
--- a/lang/clojure/Makefile
+++ b/lang/clojure/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.28 2016/01/30 09:31:59 jasper Exp $
+# $OpenBSD: Makefile,v 1.29 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT =		Lisp-1 dialect for the Java Virtual Machine
 
 GH_ACCOUNT =		clojure
 GH_PROJECT =		clojure
 GH_TAGNAME =		${GH_PROJECT}-1.8.0
-REVISION =		0
+REVISION =		1
 DISTNAME =		${GH_TAGNAME}
 
 PKG_ARCH =		*
diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile
index 2703251a6db..702ca368119 100644
--- a/lang/kawa/Makefile
+++ b/lang/kawa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2015/12/06 20:01:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2017/04/21 13:27:46 kurt Exp $
 
 BROKEN-i386= java
 
@@ -6,6 +6,7 @@ COMMENT=		Scheme and language framework for the Java platform
 
 DISTNAME=		kawa-2.1
 CATEGORIES=		lang java
+REVISION=		0
 
 HOMEPAGE=		https://www.gnu.org/software/kawa/
 
diff --git a/lang/processing/Makefile b/lang/processing/Makefile
index 45473becd5f..0c2e3179572 100644
--- a/lang/processing/Makefile
+++ b/lang/processing/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=		language/IDE for images, animations and interactions
 
 V=			1.5.1
 DISTNAME=		processing-$V-linux
 PKGNAME=		${DISTNAME:S/-linux//}
-REVISION=		5
+REVISION=		6
 
 CATEGORIES=		lang graphics
 
diff --git a/lang/scala/Makefile b/lang/scala/Makefile
index d572a60b4c2..4f46f7870c3 100644
--- a/lang/scala/Makefile
+++ b/lang/scala/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2014/05/07 15:42:16 kurt Exp $
+# $OpenBSD: Makefile,v 1.9 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	general purpose multi-paradigm programming language
 
 DISTNAME=	scala-2.10.1
 CATEGORIES=	lang
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://www.scala-lang.org/
 
diff --git a/math/geogebra/Makefile b/math/geogebra/Makefile
index 06834965422..7fe730be0c7 100644
--- a/math/geogebra/Makefile
+++ b/math/geogebra/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT=	educational mathematical software
 
 V=		4.2.60.0
 DISTNAME=	GeoGebra-Unixlike-Installer-${V}
 PKGNAME=	geogebra-${V}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	math java
 
diff --git a/net/aircontrol/Makefile b/net/aircontrol/Makefile
index e94daa0268a..d89a919134a 100644
--- a/net/aircontrol/Makefile
+++ b/net/aircontrol/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2015/07/15 19:49:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2017/04/21 13:27:46 kurt Exp $
 
 COMMENT =	management tool for Ubiquiti wireless devices
 
 DISTNAME =	aircontrol-1.4.2-beta
 PKGNAME =	${DISTNAME:S/-beta/beta/}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	net
 
diff --git a/net/apache-activemq/Makefile b/net/apache-activemq/Makefile
index 7c1ade4eed3..d511d5130a4 100644
--- a/net/apache-activemq/Makefile
+++ b/net/apache-activemq/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2017/04/20 19:15:45 jasper Exp $
+# $OpenBSD: Makefile,v 1.30 2017/04/21 13:27:47 kurt Exp $
 
 PKG_ARCH=	*
 
@@ -6,6 +6,7 @@ COMMENT=	open source message broker implementing JMS 1.1
 
 V=		5.14.5
 DISTNAME=	apache-activemq-$V
+REVISION=	0
 
 CATEGORIES=	net
 
diff --git a/net/mfi/Makefile b/net/mfi/Makefile
index ce419fa6c5f..cb04d65aa73 100644
--- a/net/mfi/Makefile
+++ b/net/mfi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2014/12/18 20:15:27 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT=	Ubiquiti mfi wireless controller
 
@@ -6,6 +6,7 @@ DISTFILES=	mFi-$V{mFi.unix}.zip
 V=		2.1.2
 FW_VER=		2.1.2.1297
 PKGNAME=	mfi-$V
+REVISION=	0
 
 CATEGORIES=	net
 
diff --git a/productivity/deskzilla/Makefile b/productivity/deskzilla/Makefile
index e052f4518e5..79b5e60e3e7 100644
--- a/productivity/deskzilla/Makefile
+++ b/productivity/deskzilla/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2013/03/11 11:37:54 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT =	desktop bugzilla browser
 
 DISTNAME =	deskzilla-lite-2_1
 PKGNAME =	${DISTNAME:S/_/./}
-REVISION =	2
+REVISION =	3
 EXTRACT_SUFX=	.zip
 
 PKG_ARCH =	*
diff --git a/productivity/projectlibre/Makefile b/productivity/projectlibre/Makefile
index 47470e35ba0..5377076b3b7 100644
--- a/productivity/projectlibre/Makefile
+++ b/productivity/projectlibre/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/01/29 11:54:30 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT=		open source alternative to Microsoft Project
 
 DISTNAME=		projectlibre-1.7.0
 CATEGORIES=		productivity
+REVISION=		0
 
 MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
 
diff --git a/productivity/thinkingrock/Makefile b/productivity/thinkingrock/Makefile
index 1ba31134af9..216ffa09c78 100644
--- a/productivity/thinkingrock/Makefile
+++ b/productivity/thinkingrock/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2014/05/07 15:42:16 kurt Exp $
+# $OpenBSD: Makefile,v 1.17 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT=	collecting and processing thoughts according to GTD
 
 V=		2.2.1
 DISTNAME=	tr-$V
 PKGNAME=	thinkingrock-${V}
-REVISION=	3
+REVISION=	4
 CATEGORIES=	productivity
 
 HOMEPAGE=	http://www.trgtd.com.au/
diff --git a/security/burpsuite/Makefile b/security/burpsuite/Makefile
index 02172f6d894..dae61f057c0 100644
--- a/security/burpsuite/Makefile
+++ b/security/burpsuite/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2017/01/07 13:01:05 rpointel Exp $
+# $OpenBSD: Makefile,v 1.15 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT =		tool for testing security of web applications
 
 VERSION =		1.7.15
 DISTNAME =		burpsuite_free_v${VERSION}
 PKGNAME =		burpsuite-${VERSION}
+REVISION =		0
 
 DISTFILES=${DISTNAME}${EXTRACT_SUFX}{Download?productId=100\&version=${VERSION}\&type=Jar}
 
diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile
index bcfdb09cb80..bd2d7a59d45 100644
--- a/security/zaproxy/Makefile
+++ b/security/zaproxy/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2016/06/19 14:29:03 rpointel Exp $
+# $OpenBSD: Makefile,v 1.3 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT =		web application security tool
 
 VERSION =		2.5.0
 DISTNAME =		ZAP_${VERSION}_Linux
 PKGNAME =		zaproxy-${VERSION}
+REVISION =		0
 
 CATEGORIES =		security
 
diff --git a/sysutils/ec2-api-tools/Makefile b/sysutils/ec2-api-tools/Makefile
index 8d7d9ec2bbd..05fcd3d28d4 100644
--- a/sysutils/ec2-api-tools/Makefile
+++ b/sysutils/ec2-api-tools/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2016/01/07 14:55:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT=		API tools for Amazon EC2 web service
 
 DISTNAME=		ec2-api-tools-1.7.5.1
+REVISION=		0
 
 DISTFILES=		ec2-api-tools${EXTRACT_SUFX}
 EXTRACT_SUFX=		.zip
diff --git a/sysutils/rundeck/Makefile b/sysutils/rundeck/Makefile
index ba2d72e3e35..2ab7a908477 100644
--- a/sysutils/rundeck/Makefile
+++ b/sysutils/rundeck/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2017/01/24 20:40:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT=		job scheduler and runbook automation
 
 V=			2.6.11
 DISTNAME=		rundeck-launcher-${V}
 PKGNAME=		rundeck-${V}
+REVISION=		0
 
 CATEGORIES=		sysutils
 
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 05e6e862acd..018ae399a8f 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2017/04/16 13:18:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2017/04/21 13:27:47 kurt Exp $
 
 ONLY_FOR_ARCHS-java =	i386 amd64
 
@@ -12,6 +12,7 @@ DISTNAME =		link-grammar-${VERSION}
 PKGNAME-main =		${DISTNAME}
 PKGNAME-java =		link-grammar-java-${VERSION}
 PKGNAME-python =	py-link-grammar-${VERSION}
+REVISION-java =		0
 
 SHARED_LIBS +=  link-grammar         4.0      # 8.7
 SHARED_LIBS +=  link-grammar-java    4.0      # 8.7
diff --git a/textproc/stringtemplate/Makefile b/textproc/stringtemplate/Makefile
index e79458469f1..8d4589217f2 100644
--- a/textproc/stringtemplate/Makefile
+++ b/textproc/stringtemplate/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2015/11/24 09:11:06 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT=	Java template engine for generating source code, etc
 
 V=		4.0.4
 DISTNAME=	ST-$V
-REVISION=	1
+REVISION=	2
 PKGNAME=	stringtemplate-$V
 CATEGORIES=	textproc java
 
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index fe240dab6da..f26593a47c8 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2015/06/25 20:04:15 kurt Exp $
+# $OpenBSD: Makefile,v 1.4 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT =		apache project to transform xml documents using xslt
 
@@ -8,6 +8,7 @@ DISTNAME =		xalan-j${VERSION}
 DISTFILES =		xalan-j_${VERSION_}-bin.tar.gz
 PKGNAME =		xalan-j-${VERSION}
 CATEGORIES =		textproc
+REVISION =		0
 
 HOMEPAGE =		http://xalan.apache.org/index.html
 MAINTAINER =		Bryan Everly <bryan@bceassociates.com>
diff --git a/textproc/xerces/Makefile b/textproc/xerces/Makefile
index 11bc741aa87..388a039c43f 100644
--- a/textproc/xerces/Makefile
+++ b/textproc/xerces/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2016/12/19 16:44:50 kurt Exp $
+# $OpenBSD: Makefile,v 1.43 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT=	xml parser for Java
 
@@ -6,6 +6,7 @@ V=		2.11.0
 DISTNAME=	Xerces-J-bin.${V}
 PKGNAME=	xerces-${V}
 CATEGORIES=	textproc
+REVISION=	0
 
 HOMEPAGE=	http://xml.apache.org/xerces2-j/index.html
 
diff --git a/www/icedtea-web/Makefile b/www/icedtea-web/Makefile
index fed84723658..caada49f7a4 100644
--- a/www/icedtea-web/Makefile
+++ b/www/icedtea-web/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2017/04/11 12:45:36 giovanni Exp $
+# $OpenBSD: Makefile,v 1.22 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT =	Java web browser plugin
 DISTNAME =	icedtea-web-1.6.2
 REVISION =	0
 CATEGORIES =	www
+REVISION =	0
 
 MAINTAINER =	Giovanni Bechis <giovanni@openbsd.org>
 
diff --git a/www/tomcat/v6/Makefile b/www/tomcat/v6/Makefile
index 0eae7ff8b86..34a192a3200 100644
--- a/www/tomcat/v6/Makefile
+++ b/www/tomcat/v6/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.37 2017/03/23 18:35:29 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.38 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT-main =	Java servlet 2.5 and Java server pages 2.1 server
 
 MAJ_VER =	6
 MIN_VER =	0
 MICRO_VER =	51
+REVISION-main =	0
 
 RUN_DEPENDS-examples =www/tomcat/v${MAJ_VER},-main>=${MAJ_VER},<7
 
diff --git a/www/tomcat/v7/Makefile b/www/tomcat/v7/Makefile
index bbbc8c3e39a..7896bda10aa 100644
--- a/www/tomcat/v7/Makefile
+++ b/www/tomcat/v7/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.48 2017/03/23 18:35:30 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.49 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT-main =	Java servlet 3.0 and Java server pages 2.2 server
 
 MAJ_VER =	7
 MIN_VER =	0
 MICRO_VER =	76
+REVISION-main =	0
 
 .include <bsd.port.mk>
diff --git a/www/tomcat/v8/Makefile b/www/tomcat/v8/Makefile
index ba00e416f16..a9dda19ea72 100644
--- a/www/tomcat/v8/Makefile
+++ b/www/tomcat/v8/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2017/03/23 18:35:30 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.26 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT-main =	Java servlet 3.1 and Java server pages 2.3 server
 
 MAJ_VER =	8
 MIN_VER =	5
 MICRO_VER =	12
+REVISION-main =	0
 
 .include <bsd.port.mk>
diff --git a/x11/kde4/kross-interpreters/Makefile b/x11/kde4/kross-interpreters/Makefile
index 993aeaa63f9..dcd6840845c 100644
--- a/x11/kde4/kross-interpreters/Makefile
+++ b/x11/kde4/kross-interpreters/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2016/09/06 15:37:53 jeremy Exp $
+# $OpenBSD: Makefile,v 1.15 2017/04/21 13:27:47 kurt Exp $
 
 COMMENT-main =	KDE bindings for running interpreters
 COMMENT-java =	KDE Java bindings
 DISTNAME =	kross-interpreters-${MODKDE4_VERSION}
 PKGNAME-main =	${PKGNAME}
 PKGNAME-java =	${PKGNAME:C/interpreters/java/}
-REVISION-java =	0
+REVISION-java =	1
 REVISION-main =	3
 
 MULTI_PACKAGES =	-main -java