diff --git a/databases/architect/Makefile b/databases/architect/Makefile
index e6c2aaef885..197bb001e6e 100644
--- a/databases/architect/Makefile
+++ b/databases/architect/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2018/09/04 12:46:09 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2019/03/24 22:24:12 sthen Exp $
 
 PKG_ARCH=		*
 
@@ -11,7 +11,7 @@ PKGNAME=		architect-${V}
 CATEGORIES=		databases
 WRKDIST=		${WRKDIR}/architect-${V}
 
-REVISION=		6
+REVISION=		7
 
 HOMEPAGE=		http://www.sqlpower.ca/page/architect
 
@@ -21,7 +21,7 @@ MAINTAINER=		Ian Darwin <ian@openbsd.org>
 PERMIT_PACKAGE_CDROM=	Yes
 
 MODULES=		java
-MODJAVA_VER =		1.6+
+MODJAVA_VER =		1.8+
 
 NO_BUILD=		Yes
 NO_TEST=		Yes
diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile
index c21dddc4282..213ba141eda 100644
--- a/databases/db/v4/Makefile
+++ b/databases/db/v4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.74 2018/11/01 08:31:26 landry Exp $
+# $OpenBSD: Makefile,v 1.75 2019/03/24 22:24:12 sthen Exp $
 
 COMMENT-java=	Java bindings for Berkeley DB, revision ${REV}
 
@@ -15,7 +15,7 @@ EPOCH-main=	0
 REVISION-main = 6
 EPOCH-java=	0
 EPOCH-tcl=	0
-REVISION-java =	7
+REVISION-java =	8
 REVISION-tcl =	3
 DBLIBDIR=	lib/db4
 
diff --git a/databases/jxplorer/Makefile b/databases/jxplorer/Makefile
index cd89ac799f7..ae5daaef392 100644
--- a/databases/jxplorer/Makefile
+++ b/databases/jxplorer/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.17 2019/03/24 22:24:12 sthen Exp $
 
 COMMENT=	standards compliant LDAP browser
 
 V=		3.2
 DISTNAME=	JXv${V}deploy
 PKGNAME=	jxplorer-${V}
-REVISION=	10
+REVISION=	11
 EXTRACT_SUFX=	.zip
 CATEGORIES=	databases net
 
@@ -18,7 +18,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jxplorer/}
 WRKDIST=	${WRKDIR}/jxplorer
 
 MODULES=	java
-MODJAVA_VER=	1.5+
+MODJAVA_VER=	1.8+
 
 RUN_DEPENDS=	java/javaPathHelper
 
diff --git a/databases/liquibase/Makefile b/databases/liquibase/Makefile
index 74464126856..4bba10da197 100644
--- a/databases/liquibase/Makefile
+++ b/databases/liquibase/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2018/09/04 12:46:10 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/24 22:24:12 sthen Exp $
 
 COMMENT =		manage SQL database schemas via config files
 
@@ -7,21 +7,21 @@ DISTNAME =		liquibase-${VERSION}-bin
 PKGNAME =		liquibase-${VERSION}
 WRKDIST =		${WRKDIR}
 CATEGORIES =		databases
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		http://liquibase.org/
-MAINTAINER =            Bryan Everly <bryan@bceassociates.com>
+MAINTAINER =		Bryan Everly <bryan@bceassociates.com>
 
 # Apache 2.0
-PERMIT_PACKAGE_CDROM=   Yes
+PERMIT_PACKAGE_CDROM=	Yes
 
 RUN_DEPENDS =		java/javaPathHelper
 
 MASTER_SITES =		https://github.com/liquibase/liquibase/releases/download/liquibase-parent-${VERSION}/
 
 MODULES =		java
-MODJAVA_VER = 		1.8
-MODJAVA_JRERUN =	yes
+# XXX when updating please confirm if this is 1.8 only or if 11 is also ok (in which case, switch to 1.8+)
+MODJAVA_VER =		1.8
 
 NO_BUILD =		Yes
 NO_TEST =		Yes
diff --git a/devel/apktool/Makefile b/devel/apktool/Makefile
index 1756af8895a..d291251bc8d 100644
--- a/devel/apktool/Makefile
+++ b/devel/apktool/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2019/03/15 10:49:42 rpointel Exp $
+# $OpenBSD: Makefile,v 1.19 2019/03/24 22:24:12 sthen Exp $
 
 COMMENT =		tool for reverse engineering Android apk files
 
 DISTNAME =		apktool_2.4.0
+REVISION =		0
 PKGNAME =		${DISTNAME:S/_/-/}
 
 CATEGORIES =		devel security java
@@ -25,7 +26,6 @@ SUBST_VARS +=		DISTNAME
 
 MODULES =		java
 MODJAVA_VER =		1.8+
-MODJAVA_JRERUN =	yes
 
 RUN_DEPENDS =		java/javaPathHelper
 
diff --git a/devel/dex2jar/Makefile b/devel/dex2jar/Makefile
index 949a564ac2e..3dc306f1505 100644
--- a/devel/dex2jar/Makefile
+++ b/devel/dex2jar/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2017/08/19 18:42:19 rpointel Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/24 22:24:12 sthen Exp $
 
 COMMENT =	tools to work with android .dex and java .class files
 
 DISTNAME =	dex2jar-2.0
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	devel security
 
@@ -19,8 +19,7 @@ MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=dex2jar/}
 EXTRACT_SUFX =	.zip
 
 MODULES =	java
-MODJAVA_VER =	1.7+
-MODJAVA_JRERUN =Yes
+MODJAVA_VER =	1.8+
 
 RUN_DEPENDS =	java/javaPathHelper
 
diff --git a/devel/jadx/Makefile b/devel/jadx/Makefile
index c8ad86d462c..29ddf2115b6 100644
--- a/devel/jadx/Makefile
+++ b/devel/jadx/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2019/02/18 21:49:14 rpointel Exp $
+# $OpenBSD: Makefile,v 1.6 2019/03/24 22:24:12 sthen Exp $
 
 COMMENT =	dex to java decompiler
 
 VERSION =	0.9.0
+REVISION =	0
 DISTNAME =	jadx-${VERSION}
 
 CATEGORIES =	devel security
@@ -20,7 +21,6 @@ EXTRACT_SUFX =	.zip
 
 MODULES =	java
 MODJAVA_VER =	1.8+
-MODJAVA_JRERUN =Yes
 
 RUN_DEPENDS =	java/javaPathHelper \
 		shells/bash
diff --git a/devel/javahelp/Makefile b/devel/javahelp/Makefile
index 5327b11824c..2f69df89490 100644
--- a/devel/javahelp/Makefile
+++ b/devel/javahelp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/24 22:24:12 sthen Exp $
 
 COMMENT =		online help system for java platform applications
 
@@ -8,14 +8,13 @@ DISTNAME =		javahelp${VERSION}
 DISTFILES =		javahelp${VERSION_}.zip
 PKGNAME =		javahelp-${VERSION}
 CATEGORIES =		devel
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://javahelp.java.net/
 MAINTAINER =		Bryan Everly <bryan@bceassociates.com>
 
 MODULES =		java
-MODJAVA_VER =		1.7+
-MODJAVA_JRERUN =	Yes
+MODJAVA_VER =		1.8+
 
 RUN_DEPENDS =		java/javaPathHelper
 
diff --git a/devel/jd-gui/Makefile b/devel/jd-gui/Makefile
index 3a54fb75226..d489e16500c 100644
--- a/devel/jd-gui/Makefile
+++ b/devel/jd-gui/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2017/04/24 03:55:45 rpointel Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/24 22:24:12 sthen Exp $
 
 COMMENT =		yet another fast Java decompiler
 
 VERSION =		1.4.0
 DISTNAME =		jd-gui-${VERSION}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		devel security
 
@@ -17,12 +17,11 @@ PERMIT_PACKAGE_CDROM =  Yes
 
 MASTER_SITES =		https://github.com/java-decompiler/jd-gui/releases/download/v${VERSION}/
 
-EXTRACT_ONLY =		
+EXTRACT_ONLY =
 EXTRACT_SUFX =		.jar
 
 MODULES =		java
-MODJAVA_VER = 		1.7+
-MODJAVA_JRERUN =	yes
+MODJAVA_VER =		1.8+
 
 RUN_DEPENDS =		java/javaPathHelper
 
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index dbb6e876ee4..893bd617148 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.201 2019/03/24 09:17:45 robert Exp $
+# $OpenBSD: Makefile,v 1.202 2019/03/24 22:24:12 sthen Exp $
 
 USE_WXNEEDED=	Yes
 
@@ -23,6 +23,7 @@ PKGNAME-java=	libreoffice-java-${VERSION}
 CATEGORIES=	editors productivity
 DPB_PROPERTIES=	parallel tag:kde4
 
+REVISION-java=	0
 EPOCH=		0
 
 MAINTAINER=	Robert Nagy <robert@openbsd.org>
@@ -265,8 +266,7 @@ WANTLIB-kde+=		harfbuzz
 
 .if ${BUILD_PACKAGES:M-java}
 MODULES+=		java
-MODJAVA_VER=		1.7+
-MODJAVA_JRERUN=		Yes
+MODJAVA_VER=		1.8+
 .endif
 LIB_DEPENDS-java=	${MODGCC4_CPPLIBDEP}
 RUN_DEPENDS-java=	${MODJAVA_RUN_DEPENDS} \
diff --git a/games/freecol/Makefile b/games/freecol/Makefile
index c297b455982..f0c667c9eb9 100644
--- a/games/freecol/Makefile
+++ b/games/freecol/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.11 2019/03/24 22:24:12 sthen Exp $
 
 COMMENT =	free Colonization clone
 DISTNAME =	freecol-0.11.6
 EXTRACT_SUFX =	.zip
 CATEGORIES =	games java x11
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://www.freecol.org/
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=freecol/}
 
 MODULES =		java
-MODJAVA_VER =		1.7+
-MODJAVA_JRERUN =	Yes
+MODJAVA_VER =		1.8+
 
 RUN_DEPENDS =	java/javaPathHelper
 
diff --git a/games/jbrickshooter/Makefile b/games/jbrickshooter/Makefile
index b4492440624..cf3544d8de8 100644
--- a/games/jbrickshooter/Makefile
+++ b/games/jbrickshooter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.15 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT =	brick shooter reflexion game
 
@@ -7,14 +7,13 @@ GH_PROJECT=	jbrickshooter
 GH_COMMIT=	0445d9171cc46462970ae8eb08f0c7294c5707df
 DISTNAME=	${GH_PROJECT}-1.6.0
 CATEGORIES=	games
-REVISION=	0
+REVISION=	1
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
 MODULES=	java
-MODJAVA_VER=	1.7+
-MODJAVA_JRERUN= Yes
+MODJAVA_VER=	1.8+
 
 BUILD_DEPENDS=	devel/apache-ant
 RUN_DEPENDS=	java/javaPathHelper
diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index 2e994f3ad51..4d5211da953 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.7 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=	lightweight game library for java
 
@@ -8,7 +8,7 @@ GH_PROJECT=	lwjgl
 GH_TAGNAME=	${GH_PROJECT}${V}
 DISTNAME=	lwjgl${V}
 PKGNAME=	lwjgl-${V}
-REVISION=	0
+REVISION=	1
 
 .if ${MACHINE_ARCH} == "i386"
 M_ARCH=		""
@@ -31,9 +31,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 WANTLIB += GL X11 Xcursor Xext Xrandr Xxf86vm m pthread
 
 MODULES=	java
-MODJAVA_VER=	1.6+
+MODJAVA_VER=	1.8+
 MODJAVA_BUILD=	ant
-MODJAVA_JRERUN=	Yes
 
 BUILD_DEPENDS=	audio/openal \
 		devel/apache-ant
diff --git a/games/minecraft/Makefile b/games/minecraft/Makefile
index 54622465347..3e1dd181b29 100644
--- a/games/minecraft/Makefile
+++ b/games/minecraft/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2018/09/03 08:14:44 solene Exp $
+# $OpenBSD: Makefile,v 1.11 2019/03/24 22:24:13 sthen 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=	6
+REVISION=	7
 
 CATEGORIES=	games
 
@@ -18,12 +18,12 @@ NO_BUILD=	Yes
 NO_TEST=	Yes
 
 MODULES=	java
-MODJAVA_VER=	1.7+
+MODJAVA_VER=	1.8+
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-RUN_DEPENDS= 	devel/desktop-file-utils \
+RUN_DEPENDS=	devel/desktop-file-utils \
 		games/lwjgl \
 		java/javaPathHelper \
 		x11/gtk+3,-guic
diff --git a/geo/jeoip/Makefile b/geo/jeoip/Makefile
index df524051dec..6248d8cf30f 100644
--- a/geo/jeoip/Makefile
+++ b/geo/jeoip/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.27 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.28 2019/03/24 22:24:13 sthen Exp $
 
-COMMENT=		Java interface to GeoIP database
+COMMENT=		Java interface to (legacy, no-longer-updated) GeoIP database
 DISTNAME=		jeoip-0.5
-REVISION=		15
+REVISION=		16
 CATEGORIES=		geo net
 PKG_ARCH=		*
 
@@ -16,8 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MASTER_SITES=		http://www.darwinsys.com/freeware/
 
 MODULES=		java
-MODJAVA_VER=		1.6+
-MODJAVA_JRERUN=		Yes
+MODJAVA_VER=		1.8+
 MODJAVA_BUILD=		ant
 MODJAVA_BUILD_TARGET_NAME =	jar docs
 
@@ -25,7 +24,7 @@ BUILD_DEPENDS=		java/junit
 TEST_DEPENDS=		net/GeoIP,-db \
 			java/junit
 RUN_DEPENDS=		net/GeoIP,-db \
- 			java/javaPathHelper
+			java/javaPathHelper
 MAKE_ENV=		CLASSPATH=${LOCALBASE}/share/java/classes/junit/junit.jar
 
 WRKDIST=		${WRKDIR}/jeoip
diff --git a/geo/traccar/Makefile b/geo/traccar/Makefile
index d7d734d296e..b2f3f660857 100644
--- a/geo/traccar/Makefile
+++ b/geo/traccar/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2019/02/04 19:52:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT =	modern GPS tracking platform
 V =		4.3
+REVISION =	0
 PKGNAME =	traccar-${V}
 DISTNAME =	traccar-other-${V}
 EXTRACT_SUFX =	.zip
@@ -18,8 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 MASTER_SITES = https://github.com/traccar/traccar/releases/download/v${V}/
 
 MODULES =               java
+# XXX if updating, please check if it works with jdk 11 and switch to "1.8+" if ok
 MODJAVA_VER =           1.8
-MODJAVA_JRERUN =        yes
 
 RUN_DEPENDS=		java/javaPathHelper
 
diff --git a/java/jBCrypt/Makefile b/java/jBCrypt/Makefile
index 11c5936f389..ce9ed30d7bb 100644
--- a/java/jBCrypt/Makefile
+++ b/java/jBCrypt/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.7 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=	BCrypt library for Java
 
 DISTNAME=	jBCrypt-0.4
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	security
 
@@ -17,8 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MASTER_SITES=	http://www.mindrot.org/files/jBCrypt/
 
 MODULES=		java
-MODJAVA_VER=		1.6+
-MODJAVA_JRERUN=		yes
+MODJAVA_VER=		1.8+
 MODJAVA_BUILD=		ant
 
 # JUnit tests exist but unsure how to handle non-ascii chars
diff --git a/java/java-getopt/Makefile b/java/java-getopt/Makefile
index bcf4c45898d..edf894da180 100644
--- a/java/java-getopt/Makefile
+++ b/java/java-getopt/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.9 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=	Java port of GNU getopt family functions
 
 DISTNAME=	java-getopt-1.0.14
 CATEGORIES=	devel
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://www.urbanophile.com/arenn/hacking/download.html
 
@@ -16,7 +16,7 @@ MASTER_SITES=	${HOMEPAGE:=/../getopt/}
 WRKDIST=	${WRKDIR}
 
 MODULES=	java
-MODJAVA_VER=	1.6+
+MODJAVA_VER=	1.8+
 MODJAVA_BUILD=	ant
 
 post-extract:
diff --git a/java/jna/Makefile b/java/jna/Makefile
index 986a5416eef..900b7c1095d 100644
--- a/java/jna/Makefile
+++ b/java/jna/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.25 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=	Java Native Access (JNA)
 
@@ -7,7 +7,7 @@ GH_ACCOUNT=	java-native-access
 GH_TAGNAME=	4.4.0
 CATEGORIES=	devel
 MAINTAINER=	Jasper Lievisse Adriaanse <jasper@openbsd.org>
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	https://github.com/java-native-access/jna
 
@@ -15,7 +15,7 @@ HOMEPAGE=	https://github.com/java-native-access/jna
 PERMIT_PACKAGE_CDROM=	Yes
 
 MODULES=	java
-MODJAVA_VER=	1.6+
+MODJAVA_VER=	1.8+
 MODJAVA_BUILD=	ant
 
 # use the system libffi
diff --git a/java/junit/Makefile b/java/junit/Makefile
index 8938244fda7..88a8e0481cd 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.30 2017/04/21 13:27:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.31 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=	regression testing utility for use with the Java language
 
 VERSION=	4.9
 DISTNAME=	junit${VERSION}
-REVISION=	2
+REVISION=	3
 PKGNAME=	junit-${VERSION}
 
 CATEGORIES=	devel
@@ -23,8 +23,7 @@ MASTER_SITES=	https://distfiles.nl/
 EXTRACT_SUFX=	.zip
 
 MODULES=	java
-MODJAVA_VER=	1.6+
-MODJAVA_JRERUN=	yes
+MODJAVA_VER=	1.8+
 
 NO_BUILD=	Yes
 NO_TEST=	Yes
diff --git a/java/tanukiwrapper/Makefile b/java/tanukiwrapper/Makefile
index 9a5fa48d416..70ae16e31d2 100644
--- a/java/tanukiwrapper/Makefile
+++ b/java/tanukiwrapper/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2018/11/22 16:04:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=	Tanuki Java Service Wrapper
 
 SVN_REV=	1780
 DISTNAME=	wrapper-code-${SVN_REV}-trunk
 PKGNAME=	java-tanukiwrapper-3.5.19.1
-REVISION=	4
+REVISION=	5
 CATEGORIES=	java
 
 HOMEPAGE=	http://wrapper.tanukisoftware.com/
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 EXTRACT_SUFX=	.zip
 
 MODULES=	java
-MODJAVA_VER=	1.6+
+MODJAVA_VER=	1.8+
 MODJAVA_BUILD=	ant
 
 .include <bsd.port.arch.mk>
diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile
index 5251d94a212..58aaae621bf 100644
--- a/lang/abcl/Makefile
+++ b/lang/abcl/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2018/04/27 18:04:21 solene Exp $
+# $OpenBSD: Makefile,v 1.13 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT =		Common Lisp dialect for the Java Virtual Machine
 V =			1.5.0
 DISTNAME =		abcl-src-${V}
-REVISION =		0
+REVISION =		1
 PKGNAME =		abcl-${V}
 PKG_ARCH =		*
 
@@ -19,10 +19,9 @@ PERMIT_PACKAGE_CDROM =	Yes
 MASTER_SITES =		${HOMEPAGE}/releases/$V/
 
 MODULES =		java
-MODJAVA_VER =		1.6+
-MODJAVA_BUILD = 	ant
+MODJAVA_VER =		1.8+
+MODJAVA_BUILD =		ant
 MODJAVA_BUILD_TARGET_NAME =	abcl.jar
-MODJAVA_JRERUN = 	Yes
 
 RUN_DEPENDS =		java/javaPathHelper \
 			misc/rlwrap
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index fbb7fd3add3..ac6872b9fc0 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.75 2019/02/19 05:23:53 jeremy Exp $
+# $OpenBSD: Makefile,v 1.76 2019/03/24 22:24:13 sthen Exp $
 
 # Runtime failures on i386 in IO#pos and IO#rewind
 ONLY_FOR_ARCHS = amd64
@@ -6,6 +6,7 @@ ONLY_FOR_ARCHS = amd64
 COMMENT =	pure-Java implementation of the Ruby language
 
 V =		9.2.6.0
+REVISION =	0
 DISTNAME =	jruby-dist-${V}-bin
 PKGNAME =	jruby-${V}
 CATEGORIES =	lang lang/ruby
@@ -26,7 +27,6 @@ MASTER_SITES1 =	${MASTER_SITE_RUBYGEMS}
 
 MODULES =	java
 MODJAVA_VER =	1.8+
-MODJAVA_JRERUN = Yes
 USE_GMAKE =	Yes
 
 WANTLIB =	c m pthread ${COMPILER_LIBCXX}
diff --git a/lang/processing/Makefile b/lang/processing/Makefile
index dc5d677959b..d8eec6f269a 100644
--- a/lang/processing/Makefile
+++ b/lang/processing/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2018/06/27 21:03:56 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=		language/IDE for images, animations and interactions
 
 V=			1.5.1
 DISTNAME=		processing-$V-linux
 PKGNAME=		${DISTNAME:S/-linux//}
-REVISION=		7
+REVISION=		8
 
 CATEGORIES=		lang graphics
 
@@ -21,7 +21,7 @@ EXTRACT_SUFX=		.tgz
 RUN_DEPENDS=		devel/desktop-file-utils
 
 MODULES=		java
-MODJAVA_VER=		1.6+
+MODJAVA_VER=		1.8+
 
 WRKDIST= 		${WRKDIR}/${DISTNAME:S/-linux//}
 
diff --git a/math/geogebra/Makefile b/math/geogebra/Makefile
index 2526723f9c1..8aa1fa786a4 100644
--- a/math/geogebra/Makefile
+++ b/math/geogebra/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2018/07/01 18:33:36 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=	educational mathematical software
 
 V=		4.2.60.0
 DISTNAME=	GeoGebra-Unixlike-Installer-${V}
 PKGNAME=	geogebra-${V}
-REVISION=	4
+REVISION=	5
 
 CATEGORIES=	math java
 
@@ -23,8 +23,7 @@ PERMIT_DISTFILE_FTP=	Yes
 MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=geogebra/}
 
 MODULES=		java
-MODJAVA_VER=		1.7+
-MODJAVA_JRERUN=		Yes
+MODJAVA_VER=		1.8+
 
 RUN_DEPENDS=		java/javaPathHelper \
 			devel/desktop-file-utils \
diff --git a/net/apache-activemq/Makefile b/net/apache-activemq/Makefile
index a019a86b2e1..b228e263071 100644
--- a/net/apache-activemq/Makefile
+++ b/net/apache-activemq/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2018/01/11 19:27:04 rpe Exp $
+# $OpenBSD: Makefile,v 1.32 2019/03/24 22:24:13 sthen Exp $
 
 PKG_ARCH=	*
 
@@ -6,7 +6,7 @@ COMMENT=	open source message broker implementing JMS 1.1
 
 V=		5.14.5
 DISTNAME=	apache-activemq-$V
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	net
 
@@ -19,7 +19,7 @@ MASTER_SITES=	${MASTER_SITE_APACHE:=activemq/${V}/}
 EXTRACT_SUFX=	-bin.tar.gz
 
 MODULES=	java
-MODJAVA_VER=	1.6+
+MODJAVA_VER=	1.8+
 
 RUN_DEPENDS=	java/javaPathHelper
 
diff --git a/net/mfi/Makefile b/net/mfi/Makefile
index ebaac7fb961..e615ef05624 100644
--- a/net/mfi/Makefile
+++ b/net/mfi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:06 rpe Exp $
+# $OpenBSD: Makefile,v 1.12 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=	Ubiquiti mfi wireless controller
 
@@ -6,7 +6,7 @@ DISTFILES=	mFi-$V{mFi.unix}.zip
 V=		2.1.2
 FW_VER=		2.1.2.1297
 PKGNAME=	mfi-$V
-REVISION=	4
+REVISION=	5
 
 CATEGORIES=	net
 
@@ -20,8 +20,7 @@ PERMIT_DISTFILES_FTP=	http://www.ubnt.com/eula/
 MASTER_SITES=	http://dl.ubnt.com/mfi/$V/
 
 MODULES=	java
-MODJAVA_VER=	1.6+
-MODJAVA_JRERUN=	yes
+MODJAVA_VER=	1.8+
 
 RUN_DEPENDS=	databases/mongodb \
 		java/javaPathHelper
diff --git a/productivity/deskzilla/Makefile b/productivity/deskzilla/Makefile
index 79b5e60e3e7..72c152c3276 100644
--- a/productivity/deskzilla/Makefile
+++ b/productivity/deskzilla/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2017/04/21 13:27:47 kurt Exp $
+# $OpenBSD: Makefile,v 1.9 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT =	desktop bugzilla browser
 
 DISTNAME =	deskzilla-lite-2_1
 PKGNAME =	${DISTNAME:S/_/./}
-REVISION =	3
+REVISION =	4
 EXTRACT_SUFX=	.zip
 
 PKG_ARCH =	*
@@ -19,7 +19,7 @@ MASTER_SITES =	http://d1.almworks.com/.files/
 PERMIT_PACKAGE_CDROM =	Yes
 
 MODULES =	java
-MODJAVA_VER =	1.7+
+MODJAVA_VER =	1.8+
 
 RUN_DEPENDS =	java/javaPathHelper
 NO_TEST =	Yes
diff --git a/productivity/projectlibre/Makefile b/productivity/projectlibre/Makefile
index b4c4cf4c25f..7b662c270c8 100644
--- a/productivity/projectlibre/Makefile
+++ b/productivity/projectlibre/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2018/06/02 12:38:05 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=		open source alternative to Microsoft Project
 
 DISTNAME=		projectlibre-1.8.0
+REVISION=		0
 CATEGORIES=		productivity
 
 MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -15,8 +16,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=projectlibre/}
 
 MODULES=	java
-MODJAVA_VER=	1.6+
-MODJAVA_JRERUN=	Yes
+MODJAVA_VER=	1.8+
 
 RUN_DEPENDS=	java/javaPathHelper
 
diff --git a/productivity/thinkingrock/Makefile b/productivity/thinkingrock/Makefile
index 216ffa09c78..67634d8da90 100644
--- a/productivity/thinkingrock/Makefile
+++ b/productivity/thinkingrock/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2017/04/21 13:27:47 kurt Exp $
+# $OpenBSD: Makefile,v 1.18 2019/03/24 22:24:13 sthen Exp $
 
 COMMENT=	collecting and processing thoughts according to GTD
 
 V=		2.2.1
 DISTNAME=	tr-$V
 PKGNAME=	thinkingrock-${V}
-REVISION=	4
+REVISION=	5
 CATEGORIES=	productivity
 
 HOMEPAGE=	http://www.trgtd.com.au/
@@ -17,8 +17,7 @@ PERMIT_PACKAGE_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=thinkingrock/}
 
 MODULES=	java
-MODJAVA_VER=	1.6+
-MODJAVA_JRERUN= Yes
+MODJAVA_VER=	1.8+
 
 RUN_DEPENDS=	java/javaPathHelper \
 		devel/xdg-utils
diff --git a/security/burpsuite/Makefile b/security/burpsuite/Makefile
index 059f5cdd5da..1fdd9e5f275 100644
--- a/security/burpsuite/Makefile
+++ b/security/burpsuite/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2018/07/30 14:07:30 rpointel Exp $
+# $OpenBSD: Makefile,v 1.26 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT =		tool for testing security of web applications
 
@@ -18,11 +18,11 @@ PERMIT_DISTFILES_FTP=   https://portswigger.net/burp/eula-free.html
 
 MASTER_SITES =		https://portswigger.net/Burp/Releases/
 
-EXTRACT_ONLY =		
+EXTRACT_ONLY =
 EXTRACT_SUFX =		.jar
 
 MODULES =		java
-MODJAVA_VER = 		1.7+
+MODJAVA_VER =		1.8+
 MODJAVA_JRERUN =	yes
 
 RUN_DEPENDS =		java/javaPathHelper
diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile
index b8895908b7c..7b796af55d6 100644
--- a/security/zaproxy/Makefile
+++ b/security/zaproxy/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2018/02/16 19:36:55 steven Exp $
+# $OpenBSD: Makefile,v 1.6 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT =		web application security tool
 
 VERSION =		2.7.0
+REVISION =		0
 DISTNAME =		ZAP_${VERSION}_Linux
 PKGNAME =		zaproxy-${VERSION}
 
@@ -10,17 +11,16 @@ CATEGORIES =		security
 
 HOMEPAGE =		https://www.owasp.org/index.php/ZAP
 
-MAINTAINER = 		sebastien dellac <shaxo@laposte.net>
+MAINTAINER =		sebastien dellac <shaxo@laposte.net>
 
 # Apache v2.0 License
 PERMIT_PACKAGE_CDROM =	Yes
 
 MASTER_SITES =		https://github.com/zaproxy/zaproxy/releases/download/${VERSION}/
-MASTER_SITES += 	${MASTER_SITE_PACKETSTORM:=web/}
+MASTER_SITES +=		${MASTER_SITE_PACKETSTORM:=web/}
 
 MODULES =               java
-MODJAVA_VER =           1.7+
-MODJAVA_JRERUN =        yes
+MODJAVA_VER =           1.8+
 
 RUN_DEPENDS =		java/javaPathHelper
 
@@ -29,7 +29,7 @@ NO_TEST =		Yes
 
 WRKDIST =		${WRKDIR}/ZAP_${VERSION}
 
-SUBST_VARS += 		VERSION
+SUBST_VARS +=		VERSION
 
 do-install:
 	cp -r ${WRKDIST} ${PREFIX}/share/zaproxy
diff --git a/sysutils/ec2-api-tools/Makefile b/sysutils/ec2-api-tools/Makefile
index 78a90e73eca..ad7f5af1c1c 100644
--- a/sysutils/ec2-api-tools/Makefile
+++ b/sysutils/ec2-api-tools/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2018/09/16 06:55:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT=		API tools for Amazon EC2 web service
 
 DISTNAME=		ec2-api-tools-1.7.5.1
-REVISION=		3
+REVISION=		4
 
 EXTRACT_SUFX=		.zip
 
@@ -22,7 +22,6 @@ MASTER_SITES=		http://s3.amazonaws.com/ec2-downloads/
 
 MODULES=		java
 MODJAVA_VER=		1.8+
-MODJAVA_JRERUN=		Yes
 
 RUN_DEPENDS=		java/javaPathHelper \
 			shells/bash
diff --git a/sysutils/logstash/Makefile b/sysutils/logstash/Makefile
index bd0516dc7c5..1a4a5644457 100644
--- a/sysutils/logstash/Makefile
+++ b/sysutils/logstash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2019/02/26 07:58:48 pvk Exp $
+# $OpenBSD: Makefile,v 1.22 2019/03/24 22:24:14 sthen Exp $
 
 ONLY_FOR_ARCHS =	amd64
 COMMENT =		tool for managing events and logs
@@ -6,6 +6,7 @@ COMMENT =		tool for managing events and logs
 V =			6.6.1
 DISTNAME =		logstash-oss-$V
 PKGNAME =		logstash-$V
+REVISION =		0
 EPOCH =			0
 
 CATEGORIES =		sysutils
@@ -26,7 +27,6 @@ EXTRACT_ONLY =		logstash-oss-$V.tar.gz
 
 MODULES =		java
 MODJAVA_VER =		1.8+
-MODJAVA_JRERUN =	Yes
 
 RUN_DEPENDS =		java/javaPathHelper \
 			lang/jruby \
diff --git a/sysutils/netshot/Makefile b/sysutils/netshot/Makefile
index 3abb74b4035..1f29ce4e269 100644
--- a/sysutils/netshot/Makefile
+++ b/sysutils/netshot/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2019/02/08 21:33:40 remi Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT =		config backup and policy check for network devices
 
 V =			0.11.0
+REVISION =		0
 DISTNAME =		netshot_${V}
 PKGNAME =		${DISTNAME:S/_/-/}
 WRKDIST =		${WRKDIR}
@@ -22,7 +23,6 @@ EXTRACT_SUFX =		.zip
 
 MODULES =		java
 MODJAVA_VER =		1.8+
-MODJAVA_JRERUN =	YES
 
 RUN_DEPENDS =		java/javaPathHelper
 
diff --git a/sysutils/riemann/Makefile b/sysutils/riemann/Makefile
index a7d14e12b74..41e6884729b 100644
--- a/sysutils/riemann/Makefile
+++ b/sysutils/riemann/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2018/11/11 08:29:42 pvk Exp $
+# $OpenBSD: Makefile,v 1.13 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT =	network event stream processing system
 
 V =		0.3.1
+REVISION =	0
 DISTNAME =	riemann-${V}
 CATEGORIES =	sysutils
 
@@ -20,7 +21,6 @@ EXTRACT_SUFX =	.tar.bz2
 
 MODULES =	java
 MODJAVA_VER =	1.8+
-MODJAVA_JRERUN = yes
 
 RUN_DEPENDS =	java/javaPathHelper \
 		lang/clojure
diff --git a/sysutils/rundeck/Makefile b/sysutils/rundeck/Makefile
index ff3d976304d..a015dc6537b 100644
--- a/sysutils/rundeck/Makefile
+++ b/sysutils/rundeck/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2018/04/26 16:25:42 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT=		job scheduler and runbook automation
 
 V=			2.6.11
 DISTNAME=		rundeck-launcher-${V}
 PKGNAME=		rundeck-${V}
-REVISION=		4
+REVISION=		5
 
 CATEGORIES=		sysutils
 
@@ -19,8 +19,7 @@ EXTRACT_SUFX=		.jar
 EXTRACT_ONLY=		# empty
 
 MODULES=		java
-MODJAVA_VER=		1.7+
-MODJAVA_JRERUN=		Yes
+MODJAVA_VER=		1.8+
 
 RUN_DEPENDS=		java/javaPathHelper
 
diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile
index c77a7f4af82..9c4db9452b0 100644
--- a/textproc/elasticsearch/Makefile
+++ b/textproc/elasticsearch/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.61 2019/02/26 07:58:18 pvk Exp $
+# $OpenBSD: Makefile,v 1.62 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT =		distributed RESTful search and analytics
 
 V =			6.6.1
+REVISION =		0
 DISTNAME =		elasticsearch-oss-$V
 PKGNAME =		elasticsearch-$V
 CATEGORIES =		textproc
@@ -18,7 +19,6 @@ MASTER_SITES =		https://artifacts.elastic.co/downloads/elasticsearch/
 
 MODULES =		java
 MODJAVA_VER =		1.8+
-MODJAVA_JRERUN =	Yes
 
 RUN_DEPENDS =		java/javaPathHelper \
 			shells/bash
diff --git a/textproc/pdftk/Makefile b/textproc/pdftk/Makefile
index 7da511ab7b6..8d2a15edcca 100644
--- a/textproc/pdftk/Makefile
+++ b/textproc/pdftk/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2018/11/17 21:16:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT=	pdf swiss army knife
 GL_COMMIT=	61981721cab4dc6adfecaa4342479c6232cf59f3
 DISTNAME=	pdftk-3.0.1
+REVISION=	0
 EXTRACT_ONLY=	pdftk-${GL_COMMIT}.tar.bz2 \
 		commons-lang3-3.8.1-bin.tar.gz
 
@@ -24,7 +25,7 @@ DISTFILES =	pdftk-${GL_COMMIT}.tar.bz2 \
 		bcprov-jdk15on-160.jar:1
 
 MODULES =	java
-MODJAVA_VER =	1.7+
+MODJAVA_VER =	1.8+
 MODJAVA_BUILD =	ant
 
 RUN_DEPENDS +=	java/javaPathHelper
diff --git a/textproc/stringtemplate/Makefile b/textproc/stringtemplate/Makefile
index 8d4589217f2..28997935228 100644
--- a/textproc/stringtemplate/Makefile
+++ b/textproc/stringtemplate/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2017/04/21 13:27:47 kurt Exp $
+# $OpenBSD: Makefile,v 1.9 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT=	Java template engine for generating source code, etc
 
 V=		4.0.4
 DISTNAME=	ST-$V
-REVISION=	2
+REVISION=	3
 PKGNAME=	stringtemplate-$V
 CATEGORIES=	textproc java
 
@@ -23,7 +23,7 @@ NO_BUILD=	Yes
 NO_TEST=	Yes
 
 MODULES=	java
-MODJAVA_VER=	1.6+
+MODJAVA_VER=	1.8+
 
 do-install:
 	${INSTALL_DATA_DIR} ${MODJAVA_JAR_DIR}
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index f26593a47c8..8c2a7885b85 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2017/04/21 13:27:47 kurt Exp $
+# $OpenBSD: Makefile,v 1.5 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT =		apache project to transform xml documents using xslt
 
@@ -8,14 +8,13 @@ DISTNAME =		xalan-j${VERSION}
 DISTFILES =		xalan-j_${VERSION_}-bin.tar.gz
 PKGNAME =		xalan-j-${VERSION}
 CATEGORIES =		textproc
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		http://xalan.apache.org/index.html
 MAINTAINER =		Bryan Everly <bryan@bceassociates.com>
 
 MODULES =		java
-MODJAVA_VER =		1.7+
-MODJAVA_JRERUN =	Yes
+MODJAVA_VER =		1.8+
 
 # Apache 2.0
 PERMIT_PACKAGE_CDROM =	Yes
diff --git a/www/tomcat/v6/Makefile b/www/tomcat/v6/Makefile
index eb2a094fcaa..ecb503f49b4 100644
--- a/www/tomcat/v6/Makefile
+++ b/www/tomcat/v6/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.41 2018/09/04 12:46:27 espie Exp $
+# $OpenBSD: Makefile,v 1.42 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT-main =	Java servlet 2.5 and Java server pages 2.1 server
-REVISION-main =	1
+REVISION-main =	2
 
 MAJ_VER =	6
 MIN_VER =	0
diff --git a/www/tomcat/v7/Makefile b/www/tomcat/v7/Makefile
index 736fda3264b..a95149b1f36 100644
--- a/www/tomcat/v7/Makefile
+++ b/www/tomcat/v7/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.53 2018/09/04 12:46:27 espie Exp $
+# $OpenBSD: Makefile,v 1.54 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT-main =	Java servlet 3.0 and Java server pages 2.2 server
-REVISION-main =	1
+REVISION-main =	2
 
 MAJ_VER =	7
 MIN_VER =	0
diff --git a/www/tomcat/v8/Makefile b/www/tomcat/v8/Makefile
index d1bec876da9..4debeb16f50 100644
--- a/www/tomcat/v8/Makefile
+++ b/www/tomcat/v8/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.30 2018/09/04 12:46:27 espie Exp $
+# $OpenBSD: Makefile,v 1.31 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT-main =	Java servlet 3.1 and Java server pages 2.3 server
-REVISION-main =	1
+REVISION-main =	2
 
 MAJ_VER =	8
 MIN_VER =	5
diff --git a/www/vnu/Makefile b/www/vnu/Makefile
index f163e2a6d0c..248ba0c46f5 100644
--- a/www/vnu/Makefile
+++ b/www/vnu/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2018/11/11 21:25:27 bentley Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/24 22:24:14 sthen Exp $
 
 COMMENT =	HTML5 validator
 
 V =		18.11.5
+REVISION =	0
 DISTNAME =	vnu.jar_$V
 PKGNAME =	vnu-$V
 
@@ -21,7 +22,6 @@ EXTRACT_SUFX =		.zip
 
 MODULES =		java
 MODJAVA_VER =		1.8+
-MODJAVA_JRERUN =	Yes
 RUN_DEPENDS =		java/javaPathHelper
 
 NO_BUILD =		Yes
diff --git a/x11/kde4/kross-interpreters/Makefile b/x11/kde4/kross-interpreters/Makefile
index fbc8d32d876..b523b60637b 100644
--- a/x11/kde4/kross-interpreters/Makefile
+++ b/x11/kde4/kross-interpreters/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2018/10/26 16:16:24 jeremy Exp $
+# $OpenBSD: Makefile,v 1.19 2019/03/24 22:24:14 sthen 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 =	2
+REVISION-java =	3
 REVISION-main =	6
 
 MULTI_PACKAGES =	-main -java
@@ -36,8 +36,7 @@ CONFIGURE_ARGS +=	-DRUBY_EXECUTABLE=${RUBY}
 CONFIGURE_ARGS +=	-DBUILD_java:Bool=No
 .else
 MODULES +=		java
-MODJAVA_VER =		1.6+
-MODJAVA_JRERUN =	Yes
+MODJAVA_VER =		1.8+
 .endif
 
 LIB_DEPENDS-main =	${LIB_DEPENDS}