Clean up after java/openjdk6 and java/openjdk6-jre removal

java/openjdk6 support was removed from Mk/bsd.java.mk (r512662) and java/openjdk6 and java/openjdk6-jre were removed from the ports tree (r512663). Now this patch completely removes remaining stuff from the ports tree. PR: 241953 (exp-run) Reviewed by: glewis Approved by: portmgr (antoine) Differential Revision: https://reviews.freebsd.org/D22342
author: Jung-uk Kim <jkim@FreeBSD.org> 2019-11-26 21:46:12 +0000
committer: Jung-uk Kim <jkim@FreeBSD.org> 2019-11-26 21:46:12 +0000
commit: 5a52a082347653e46a7330eb60d51230c01183ef (patch)
tree: 175d5bf406b7321a3c965d241cd3f2b32e2c8ca1
parent: bb21effd9b960e4613fbf599abcde1f3e655d817 (diff)
download: ports-5a52a082347653e46a7330eb60d51230c01183ef.tar.gz
ports-5a52a082347653e46a7330eb60d51230c01183ef.zip
443 files changed, 188 insertions, 637 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index 57623384faee..560f0a713925 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -162,7 +162,7 @@ SUB_LIST+=		JAVA_OS="${JAVA_OS}"
 .		endif
 
 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	6 7 8 11 12 13
+__JAVA_VERSION_LIST=	7 8 11 12 13
 _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
 _JAVA_VENDOR_LIST=		openjdk oracle
@@ -270,7 +270,7 @@ JAVA_RUN=	jre
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
 .		if defined(JAVA_VERSION)
-_JAVA_VERSION=	${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/6+/7+/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
+_JAVA_VERSION=	${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
 .		else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .		endif
diff --git a/archivers/javatar/Makefile b/archivers/javatar/Makefile
index d642b0712452..f42c1a71c42e 100644
--- a/archivers/javatar/Makefile
+++ b/archivers/javatar/Makefile
@@ -14,7 +14,6 @@ LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 
diff --git a/archivers/jzlib/Makefile b/archivers/jzlib/Makefile
index 8e3b77c2a6d3..a77ba092d914 100644
--- a/archivers/jzlib/Makefile
+++ b/archivers/jzlib/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_ARCH=	yes
 
 JAR_FILE=	${WRKSRC}/src/main/java/${PORTNAME}.jar
diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile
index f196957cc5ab..f36a576ad609 100644
--- a/archivers/snappy-java/Makefile
+++ b/archivers/snappy-java/Makefile
@@ -35,7 +35,6 @@ GH_PROJECT=	snappy-java
 
 USES=		gmake
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USE_LDCONFIG=	yes
 MAKE_ARGS+=	Default_CXX=${CXX}
 
diff --git a/astro/gpsprune/Makefile b/astro/gpsprune/Makefile
index 424d2c4edebc..1f0926087dbc 100644
--- a/astro/gpsprune/Makefile
+++ b/astro/gpsprune/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gpsprune
 PORTVERSION=	19.2
+PORTREVISION=	1
 CATEGORIES=	astro java
 MASTER_SITES=	http://activityworkshop.net/software/${PORTNAME}/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -20,7 +21,6 @@ NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	gpsprune.sh
 SUB_LIST=	JARNAME=${DISTNAME}
diff --git a/astro/gpsprune/files/gpsprune.sh.in b/astro/gpsprune/files/gpsprune.sh.in
index 5a91e4813542..6de0b4957942 100644
--- a/astro/gpsprune/files/gpsprune.sh.in
+++ b/astro/gpsprune/files/gpsprune.sh.in
@@ -4,6 +4,5 @@
 
 JAVA="%%LOCALBASE%%/bin/java"
 JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
 
 exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@"
diff --git a/astro/osmosis/Makefile b/astro/osmosis/Makefile
index c40ec3c0e233..58d34dacaf1a 100644
--- a/astro/osmosis/Makefile
+++ b/astro/osmosis/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/copying.txt
 NO_WRKSUBDIR=	yes
 USES=		tar:tgz
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/audio/atunes/Makefile b/audio/atunes/Makefile
index 83064a5e0b5b..f2341810190c 100644
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	atunes
 PORTVERSION=	3.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 SUB_FILES=	atunes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/atunes/files/atunes.in b/audio/atunes/files/atunes.in
index 951b65ad1bcb..18bb592c7e6d 100644
--- a/audio/atunes/files/atunes.in
+++ b/audio/atunes/files/atunes.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \
+exec %%LOCALBASE%%/bin/java \
     -Dsubstancelaf.windowRoundedCorners=false \
     -Dinsubstantial.looseTableCellRenderers=true -Djava.library.path=./ \
     -Xms128m -Xmx256m -splash:splash.gif \
diff --git a/audio/gervill/Makefile b/audio/gervill/Makefile
index 2468d078665a..9a2b26aa1460 100644
--- a/audio/gervill/Makefile
+++ b/audio/gervill/Makefile
@@ -17,7 +17,6 @@ BROKEN_armv7=		fails to package: find: *: No such file or directory
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 NO_ARCH=	yes
 
diff --git a/audio/jid3lib/Makefile b/audio/jid3lib/Makefile
index 3b37878d9095..9471d30a4725 100644
--- a/audio/jid3lib/Makefile
+++ b/audio/jid3lib/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java ID3 Tag Library
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/jid3lib.jar
diff --git a/audio/musiccontrol/Makefile b/audio/musiccontrol/Makefile
index 1322301ddddf..a6e36f851481 100644
--- a/audio/musiccontrol/Makefile
+++ b/audio/musiccontrol/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	${LOCALBASE}/bin/mpg123:audio/mpg123 \
 		${LOCALBASE}/bin/simplemod:audio/simplemod
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 PLIST_FILES=	share/java/classes/MusicControl-${PORTVERSION}.jar bin/musiccontrol
 
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 48f022803a1b..d32007096d4e 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -35,7 +35,6 @@ CPE_VENDOR=	herac
 USE_JAVA=	yes
 USE_ANT=	yes
 USE_LDCONFIG=	yes
-JAVA_VERSION=	1.6+
 NO_CCACHE=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/TuxGuitar
diff --git a/benchmarks/linux-vdbench/Makefile b/benchmarks/linux-vdbench/Makefile
index 010628f4d1aa..8613bb452f8c 100644
--- a/benchmarks/linux-vdbench/Makefile
+++ b/benchmarks/linux-vdbench/Makefile
@@ -22,7 +22,6 @@ USES=		linux shebangfix uniquefiles:dirs zip
 USE_JAVA=	yes
 
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
-JAVA_VERSION=	1.7+
 JAVA_OS=	linux
 NO_BUILD=	yes
 PLIST_SUB=	LINUX_ARCH=${LINUX_ARCH}
diff --git a/benchmarks/scimark2/Makefile b/benchmarks/scimark2/Makefile
index f366c29f37e6..faac7e44a17f 100644
--- a/benchmarks/scimark2/Makefile
+++ b/benchmarks/scimark2/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Java benchmark for scientific and numerical computing
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NEED_JAVAC=	yes
 JAVAC_OPTS?=	-O
 
diff --git a/biology/artemis/Makefile b/biology/artemis/Makefile
index 3e836b927562..79c498c7b28e 100644
--- a/biology/artemis/Makefile
+++ b/biology/artemis/Makefile
@@ -20,7 +20,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	sanger-pathogens
 SHEBANG_FILES=	act art bamview dnaplotter test/*.sh etc/go_associations.pl
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 ALL_TARGET=	jar
 NO_ARCH=	yes
 
diff --git a/biology/cytoscape/Makefile b/biology/cytoscape/Makefile
index cbca017ebc0a..7a0fa2963432 100644
--- a/biology/cytoscape/Makefile
+++ b/biology/cytoscape/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS=	bash:shells/bash
 USES=		shebangfix
 SHEBANG_FILES=	gui-distribution/assembly/src/main/bin/cytoscape.sh
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USE_GITHUB=	yes
 GH_TUPLE=	${PORTNAME}:${PORTNAME}-parent:${DISTVERSION}:p/parent \
 		${PORTNAME}:${PORTNAME}-api:${DISTVERSION}:a/api \
diff --git a/biology/jalview/Makefile b/biology/jalview/Makefile
index 19f3540e74a2..3eb8c2fbb697 100644
--- a/biology/jalview/Makefile
+++ b/biology/jalview/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jalview
 PORTVERSION=	2.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology java
 MASTER_SITES=	http://www.jalview.org/source/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/}
@@ -12,7 +12,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Viewer and editor for multiple sequence alignments
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	makejars
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/biology/jalview/files/jalview.sh.in b/biology/jalview/files/jalview.sh.in
index 0444e47656ea..d14f2a8833ef 100644
--- a/biology/jalview/files/jalview.sh.in
+++ b/biology/jalview/files/jalview.sh.in
@@ -4,4 +4,4 @@
 
 # Shell script to launch jalview using our javavm wrapper
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" -cp "%%DATADIR%%/jalview.jar" jalview.bin.Jalview
+"%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" -cp "%%DATADIR%%/jalview.jar" jalview.bin.Jalview
diff --git a/biology/trimmomatic/Makefile b/biology/trimmomatic/Makefile
index b180fe8b3e96..ed58ce869808 100644
--- a/biology/trimmomatic/Makefile
+++ b/biology/trimmomatic/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		zip
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 86c35d61a797..30a22100755e 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	electric
 PORTVERSION=	9.07
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	GNU \
 		http://www.staticfreesoft.com/:1 \
@@ -20,7 +21,6 @@ LICENSE=	GPLv3
 EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 SUB_LIST+=	LIBFILES="${LIBFILES}" \
 		JARFILE="${JARFILE}"
diff --git a/cad/electric-ng/files/electric-ng.in b/cad/electric-ng/files/electric-ng.in
index b419239d7d36..8a60831ec501 100644
--- a/cad/electric-ng/files/electric-ng.in
+++ b/cad/electric-ng/files/electric-ng.in
@@ -6,7 +6,6 @@
 set JAVA = "%%LOCALBASE%%/bin/java"
 set LIBFILES = "%%LIBFILES%%"
 set JARPATH = "%%JAVALIBDIR%%"
-setenv JAVA_VERSION "%%JAVA_VERSION%%"
 
 if ( "${LIBFILES}" != "" ) then
 	set CLASSPATH = :`echo ${LIBFILES} | sed -E -e 's,[[:space:]]+,:,g'`
diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile
index 4cf990567130..761dc35546fa 100644
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fidocadj
 PORTVERSION=	0.24.6
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/:src SF/${PORTNAME}/manuals/:docs
 DISTFILES=	${PORTNAME}.jar:src
@@ -23,7 +23,6 @@ NO_BUILD=	yes
 
 SUB_FILES=	${PORTNAME}.sh
 
-JAVA_VERSION=	1.6+
 USE_JAVA=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/cad/fidocadj/files/fidocadj.sh.in b/cad/fidocadj/files/fidocadj.sh.in
index 71c4e3ec855f..b3b57c70e257 100644
--- a/cad/fidocadj/files/fidocadj.sh.in
+++ b/cad/fidocadj/files/fidocadj.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@"
diff --git a/cad/impact/Makefile b/cad/impact/Makefile
index af5193acbdc3..21a1801d9a3d 100644
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	impact
 PORTVERSION=	0.7.06.038
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION} \
@@ -24,7 +24,6 @@ WRKSRC=		${WRKDIR}/Impact
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/Impact
diff --git a/cad/impact/files/impact.in b/cad/impact/files/impact.in
index 11391407ed44..b99cdbcf062f 100644
--- a/cad/impact/files/impact.in
+++ b/cad/impact/files/impact.in
@@ -3,5 +3,5 @@
 # $FreeBSD$
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:doc:bin run.Impact "$@"
+"%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:doc:bin run.Impact "$@"
 cd -
diff --git a/cad/impact/files/impactgui.in b/cad/impact/files/impactgui.in
index 187e2a0b9abf..28e4b02ab2c8 100644
--- a/cad/impact/files/impactgui.in
+++ b/cad/impact/files/impactgui.in
@@ -3,5 +3,5 @@
 # $FreeBSD$
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:bin:doc:lib/jogl.jar:lib/gluegen-rt.jar:lib/patbinfree153.jar:lib/LogDB.jar:lib/mysql-connector-java-5.1.11-bin.jar gui.ImpactGUI
+"%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:bin:doc:lib/jogl.jar:lib/gluegen-rt.jar:lib/patbinfree153.jar:lib/LogDB.jar:lib/mysql-connector-java-5.1.11-bin.jar gui.ImpactGUI
 cd -
diff --git a/cad/logisim/Makefile b/cad/logisim/Makefile
index 6791cdffab55..d722f1e1a1b0 100644
--- a/cad/logisim/Makefile
+++ b/cad/logisim/Makefile
@@ -16,7 +16,6 @@ LICENSE=	GPLv2
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_RUN=	yes
-JAVA_VERSION=	1.6+
 
 PLIST_FILES=	${DATADIR_REL}/${PORTNAME}-generic-${PORTVERSION}${EXTRACT_SUFX} \
 		bin/${PORTNAME}
diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index 79ba118a2c1d..e24768576067 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sweethome3d
 PORTVERSION=	5.4
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
@@ -20,7 +21,6 @@ USES=		zip
 NO_ARCH=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 ALL_TARGET=	jarExecutable
 JARNAME=	SweetHome3D-${PORTVERSION}.jar
diff --git a/cad/sweethome3d/files/sweethome3d.sh.in b/cad/sweethome3d/files/sweethome3d.sh.in
index 5380e161581c..98b88265f4d3 100644
--- a/cad/sweethome3d/files/sweethome3d.sh.in
+++ b/cad/sweethome3d/files/sweethome3d.sh.in
@@ -4,6 +4,5 @@
 
 JAVA="%%LOCALBASE%%/bin/java"
 JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
 
 exec "${JAVA}" -Xmx1024m -jar "${JARPATH}/%%JARNAME%%" "$@"
diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile
index 28fe0054ae27..9a2206bdbcf6 100644
--- a/comms/rxtx/Makefile
+++ b/comms/rxtx/Makefile
@@ -21,7 +21,6 @@ NOT_FOR_ARCHS_REASON=	Java not available for this architecture
 USES=		gmake libtool zip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
diff --git a/comms/yaac/Makefile b/comms/yaac/Makefile
index 454693e54838..e60b5a12344d 100644
--- a/comms/yaac/Makefile
+++ b/comms/yaac/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	yaac
 PORTVERSION=	1.0b114
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/yetanotheraprsc/
 DISTNAME=	YAACsrc_20170920
@@ -15,7 +16,6 @@ LICENSE=	LGPL3
 
 BROKEN_armv7=	fails to package: yaac/build.xml:205: yaac/work/yaac/YAAC/site does not exist
 
-JAVA_VERSION=	1.6+
 USES=		zip
 USE_ANT=	yes
 USE_JAVA=	yes
diff --git a/comms/yaac/files/yaac.sh.in b/comms/yaac/files/yaac.sh.in
index 3ecd4a9e117a..d25ea62404fc 100644
--- a/comms/yaac/files/yaac.sh.in
+++ b/comms/yaac/files/yaac.sh.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 
 cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/YAAC.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/YAAC.jar" "$@"
diff --git a/databases/apache-commons-dbutils/Makefile b/databases/apache-commons-dbutils/Makefile
index 3d4d1c7ac05e..fa2659e235c7 100644
--- a/databases/apache-commons-dbutils/Makefile
+++ b/databases/apache-commons-dbutils/Makefile
@@ -15,7 +15,6 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/databases/c3p0/Makefile b/databases/c3p0/Makefile
index 8834e291c936..27362a711fbf 100644
--- a/databases/c3p0/Makefile
+++ b/databases/c3p0/Makefile
@@ -15,7 +15,6 @@ LICENSE_COMB=	dual
 USES=		tar:tgz
 USE_JAVA=	yes
 NO_BUILD=	yes
-JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_ARCH=	yes
 
diff --git a/databases/db6/Makefile b/databases/db6/Makefile
index a99aa00702d9..ca597a31ecf4 100644
--- a/databases/db6/Makefile
+++ b/databases/db6/Makefile
@@ -54,7 +54,7 @@ L10N_CONFIGURE_ENABLE=	localization
 SQL_CONFIGURE_ENABLE=	sql sql_codegen
 SQL_VARS=		DBLIBS+=libdb_sql
 JAVA_USE=		java
-JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION=1.6+
+JAVA_VARS=		DBLIBS+=libdb_java
 JAVA_CONFIGURE_ENABLE=	java
 JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
 JAVA_CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
diff --git a/databases/frontbase-jdbc/Makefile b/databases/frontbase-jdbc/Makefile
index 70ab1544d1ba..b64c031c302b 100644
--- a/databases/frontbase-jdbc/Makefile
+++ b/databases/frontbase-jdbc/Makefile
@@ -13,7 +13,6 @@ MAINTAINER?=	ports@FreeBSD.org
 COMMENT=	The Java JDBC implementation for FrontBase
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 JARFILE=	frontbasejdbc.jar
diff --git a/databases/hbase/Makefile b/databases/hbase/Makefile
index 75165b669cdb..eb03010c9d9f 100644
--- a/databases/hbase/Makefile
+++ b/databases/hbase/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS=	bash:shells/bash \
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-XX:MaxPermSize=256m"
 
 OPTIONS_DEFINE=	DOCS
diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile
index c553132c4497..6cffbc5cc36f 100644
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Embeddable SQL database written in Java
 LICENSE=	BSD3CLAUSE
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile
index c0897b94fc58..e34ab0f8e328 100644
--- a/databases/isql-viewer/Makefile
+++ b/databases/isql-viewer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	isql-viewer
 PORTVERSION=	2.1.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases java
 MASTER_SITES=	SF/isql/Stand%20Alone%20Jars/Version%20${PORTVERSION}:isql \
 		APACHE/ws/soap/version-2.2:bsf
@@ -19,7 +19,6 @@ RUN_DEPENDS=	${JYTHON_PREFIX}/${JYTHON_JAR}:lang/jython \
 		${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 ISQL=		iSQL-Viewer
@@ -45,7 +44,6 @@ CLASSPATH=	"${JARFILES:S,^,${JAVAJARDIR}/,}:${JYTHON_PREFIX}/${JYTHON_JAR}:${JAR
 
 do-configure:
 	@${SED} -e 's|%%CLASSPATH%%|${CLASSPATH:C,[[:space:]],:,g}|g'	\
-		-e 's|%%JAVA_VERSION%%|${JAVA_VERSION}|g'	\
 		${FILESDIR}/iSQL-Viewer.sh > ${WRKDIR}/iSQL-Viewer.sh
 
 do-install:
diff --git a/databases/isql-viewer/files/iSQL-Viewer.sh b/databases/isql-viewer/files/iSQL-Viewer.sh
index f6881037c040..cc0e394eec41 100644
--- a/databases/isql-viewer/files/iSQL-Viewer.sh
+++ b/databases/isql-viewer/files/iSQL-Viewer.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-JAVA_VERSION=%%JAVA_VERSION%% \
-	java -classpath %%CLASSPATH%% \
-	     org.isqlviewer.core.Launcher
+java -classpath %%CLASSPATH%% org.isqlviewer.core.Launcher
diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile
index 9217bb09e3e5..b2e08940d543 100644
--- a/databases/jasperreports/Makefile
+++ b/databases/jasperreports/Makefile
@@ -26,7 +26,6 @@ OPTIONS_DEFAULT=MYSQL PGSQL
 HSQLDB_DESC=	Install libraries required for HSQLDB
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
diff --git a/databases/jrobin/Makefile b/databases/jrobin/Makefile
index 8b254b8f3c9c..29b8b54b2d9e 100644
--- a/databases/jrobin/Makefile
+++ b/databases/jrobin/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pure Java alternative to RRDTool
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 CLASSES=	jrobin
diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile
index c000dc0da87c..cc7da9417c8c 100644
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@@ -14,7 +14,6 @@ LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 USES=		libtool
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index 79dceeb0adf7..baa95dfa74c8 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -95,7 +95,6 @@ CONFIGURE_ARGS+=	--without-mdb
 
 .if ${LIBGDA5_SLAVE}==jdbc
 USE_JAVA=		yes
-JAVA_VERSION=		1.6+
 JAVA_VENDOR=		bsdjava openjdk
 CFLAGS+=		-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 .else
diff --git a/databases/postgis-jdbc/Makefile b/databases/postgis-jdbc/Makefile
index 62756a6f6efd..c2e280c95d7e 100644
--- a/databases/postgis-jdbc/Makefile
+++ b/databases/postgis-jdbc/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc
 
 USES=		zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/databases/powerarchitect/Makefile b/databases/powerarchitect/Makefile
index 11124ec2e8be..e88885b82003 100644
--- a/databases/powerarchitect/Makefile
+++ b/databases/powerarchitect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	powerarchitect
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.sqlpower.ca/architect/1.0.8/community/
 DISTNAME=	SQL-Power-Architect-generic-jdbc-${PORTVERSION}
@@ -13,7 +14,6 @@ COMMENT=	Data modeling and profiling tool
 LICENSE=	GPLv3
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PORTDOCS=	*
diff --git a/databases/powerarchitect/files/powerarchitect.in b/databases/powerarchitect/files/powerarchitect.in
index 2f3fbd24fc26..d40379b2b47c 100644
--- a/databases/powerarchitect/files/powerarchitect.in
+++ b/databases/powerarchitect/files/powerarchitect.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/architect.jar
+exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/architect.jar
diff --git a/databases/puppetdb5/Makefile b/databases/puppetdb5/Makefile
index da314e766298..2edc81258499 100644
--- a/databases/puppetdb5/Makefile
+++ b/databases/puppetdb5/Makefile
@@ -30,7 +30,6 @@ SHEBANG_FILES=	ext/bin/puppetdb \
 USE_JAVA=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
-JAVA_VERSION=	1.7+
 
 USERS=		puppetdb
 GROUPS=		puppetdb
diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile
index 42af00a6f626..f8366605896b 100644
--- a/databases/puppetdb6/Makefile
+++ b/databases/puppetdb6/Makefile
@@ -30,7 +30,6 @@ SHEBANG_FILES=	ext/bin/puppetdb \
 USE_JAVA=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
-JAVA_VERSION=	1.7+
 
 USERS=		puppetdb
 GROUPS=		puppetdb
diff --git a/deskutils/docear/Makefile b/deskutils/docear/Makefile
index d64eae949521..360866ad9230 100644
--- a/deskutils/docear/Makefile
+++ b/deskutils/docear/Makefile
@@ -20,7 +20,6 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 USES=		desktop-file-utils shared-mime-info
 USE_JAVA=	yes
 JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 JDATADIR=	${JAVASHAREDIR}/${PORTNAME}
 icon=		${DATADIR}/${PORTNAME}-icon48x48.png
diff --git a/deskutils/freemind/Makefile b/deskutils/freemind/Makefile
index d5094236ed35..3592c0e0cc87 100644
--- a/deskutils/freemind/Makefile
+++ b/deskutils/freemind/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	freemind
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils editors java
 MASTER_SITES=	SF
@@ -18,7 +19,6 @@ BUILD_DEPENDS=	zip:archivers/zip
 
 USES=		cpe zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
 DATAFILES=	accessories browser doc lib plugins patterns.xml
diff --git a/deskutils/freemind/files/freemind.sh.in b/deskutils/freemind/files/freemind.sh.in
index f10881d84f76..308d47f7104c 100644
--- a/deskutils/freemind/files/freemind.sh.in
+++ b/deskutils/freemind/files/freemind.sh.in
@@ -6,4 +6,4 @@ CLASSPATH="${ADD_JARS}:${CLASSPATH}:`find "%%DATADIR%%/lib" -name \*.jar | tr "\
 FILE="lib/freemind.jar"
 
 cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "${CLASSPATH}" -jar "${FILE}"
+"%%LOCALBASE%%/bin/java" -cp "${CLASSPATH}" -jar "${FILE}"
diff --git a/deskutils/freeplane/Makefile b/deskutils/freeplane/Makefile
index 4dde9b667eaa..974e480e3328 100644
--- a/deskutils/freeplane/Makefile
+++ b/deskutils/freeplane/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 USES=		cpe zip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_ARCH=	yes
 NO_BUILD=	yes
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile
index 6725d4b2a560..ac80211d888d 100644
--- a/deskutils/ganttproject/Makefile
+++ b/deskutils/ganttproject/Makefile
@@ -19,7 +19,6 @@ SHEBANG_FILES=	ganttproject
 bash_CMD=	/bin/sh
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/deskutils/projectlibre/Makefile b/deskutils/projectlibre/Makefile
index d0a35673abd9..53f26b802133 100644
--- a/deskutils/projectlibre/Makefile
+++ b/deskutils/projectlibre/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	projectlibre
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	deskutils editors java
 MASTER_SITES=	SF/${PORTNAME}/ProjectLibre/${PORTVERSION:S/.0$//} \
 		LOCAL/cpm/projectlibre/:icons
@@ -17,7 +18,6 @@ COMMENT=	Open source desktop alternative to Microsoft Project
 LICENSE=	CPAL-1.0
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/deskutils/projectlibre/files/projectlibre.sh.in b/deskutils/projectlibre/files/projectlibre.sh.in
index c19dbf183f86..39c81fd5b1a4 100644
--- a/deskutils/projectlibre/files/projectlibre.sh.in
+++ b/deskutils/projectlibre/files/projectlibre.sh.in
@@ -5,6 +5,6 @@
 PROJECTLIBRE_HOME="%%DATADIR%%"
 export PROJECTLIBRE_HOME
 cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "$PROJECTLIBRE_HOME/projectlibre.jar" "$@" > /dev/null 2>&1
+"%%LOCALBASE%%/bin/java" -jar "$PROJECTLIBRE_HOME/projectlibre.jar" "$@" > /dev/null 2>&1
 
 # eof
diff --git a/deskutils/thinkingrock/Makefile b/deskutils/thinkingrock/Makefile
index 59cf6b8244f9..716b51e89e64 100644
--- a/deskutils/thinkingrock/Makefile
+++ b/deskutils/thinkingrock/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:devel/xdg-utils \
 		${LOCALBASE}/bin/xdg-email:devel/xdg-utils
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index 337e4e7222dd..89e37425036e 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	antlr
 PORTVERSION=	2.7.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.antlr2.org/download/
 
diff --git a/devel/antlr/files/antlr.sh.in b/devel/antlr/files/antlr.sh.in
index 1065d73c14fb..3bc897c6cbf5 100644
--- a/devel/antlr/files/antlr.sh.in
+++ b/devel/antlr/files/antlr.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/antlr.jar" antlr.Tool "$@"
+"%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/antlr.jar" antlr.Tool "$@"
diff --git a/devel/antlr3/Makefile b/devel/antlr3/Makefile
index 5a063dd1fa4e..8ec63aac7b3c 100644
--- a/devel/antlr3/Makefile
+++ b/devel/antlr3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	antlr3
 PORTVERSION=	3.5.2
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.antlr3.org/download/
 DISTNAME=	antlr-${PORTVERSION}-complete
@@ -17,7 +18,6 @@ LICENSE=	BSD3CLAUSE
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 INSTALL_JAR=	${DISTFILES}
 SUB_LIST=	INSTALL_JAR=${INSTALL_JAR}
 SUB_FILES=	antlr.sh
diff --git a/devel/antlr3/files/antlr.sh.in b/devel/antlr3/files/antlr.sh.in
index ffed4c4ae806..28202fc3a3be 100644
--- a/devel/antlr3/files/antlr.sh.in
+++ b/devel/antlr3/files/antlr.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/%%INSTALL_JAR%%" org.antlr.Tool "$@"
+"%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/%%INSTALL_JAR%%" org.antlr.Tool "$@"
diff --git a/devel/apache-commons-configuration/Makefile b/devel/apache-commons-configuration/Makefile
index 7098bc2bb98f..05c1c7402c9a 100644
--- a/devel/apache-commons-configuration/Makefile
+++ b/devel/apache-commons-configuration/Makefile
@@ -22,7 +22,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 OPTIONS_DEFINE=	DOCS
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PORTDOCS=	*
diff --git a/devel/apache-commons-daemon/Makefile b/devel/apache-commons-daemon/Makefile
index 587c8d3872df..bed71e522be7 100644
--- a/devel/apache-commons-daemon/Makefile
+++ b/devel/apache-commons-daemon/Makefile
@@ -18,7 +18,6 @@ LICENSE=	APACHE20
 OPTIONS_DEFINE=	DOCS
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-java=${JAVA_HOME}
diff --git a/devel/apache-commons-io/Makefile b/devel/apache-commons-io/Makefile
index 0621d5111dde..1c52475110df 100644
--- a/devel/apache-commons-io/Makefile
+++ b/devel/apache-commons-io/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Collection of I/O utilities for Java
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USE_JAVA=	1.7+
+USE_JAVA=	yes
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/devel/apache-commons-jxpath/Makefile b/devel/apache-commons-jxpath/Makefile
index 6e795139ecf7..7358f585b579 100644
--- a/devel/apache-commons-jxpath/Makefile
+++ b/devel/apache-commons-jxpath/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for manipulating Java Beans using the XPath syntax
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
diff --git a/devel/apache-commons-modeler/Makefile b/devel/apache-commons-modeler/Makefile
index f16d0d84a701..8192cbe05898 100644
--- a/devel/apache-commons-modeler/Makefile
+++ b/devel/apache-commons-modeler/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Mechanisms to create Model MBeans compatible with JMX specification
 LICENSE=	APACHE20
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index 20411fb51cbe..2989d59ff753 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	argouml
 PORTVERSION=	0.34
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	http://argouml-downloads.tigris.org/nonav/argouml-${PORTVERSION}/
 DISTNAME=	ArgoUML-${PORTVERSION}
@@ -24,10 +24,8 @@ PORTSCOUT=	limitw:1,even \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	argouml.sh
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
 PORTDOCS=	manual-${PORTVERSION}.pdf quickguide-${PORTVERSION}.pdf
 
 OPTIONS_DEFINE=	DOCS
diff --git a/devel/argouml/files/argouml.sh.in b/devel/argouml/files/argouml.sh.in
index cb517b269680..8c141a378ed9 100644
--- a/devel/argouml/files/argouml.sh.in
+++ b/devel/argouml/files/argouml.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%"  "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
diff --git a/devel/astah-community/Makefile b/devel/astah-community/Makefile
index b330c349e03f..e8187a5662ea 100644
--- a/devel/astah-community/Makefile
+++ b/devel/astah-community/Makefile
@@ -21,7 +21,6 @@ RESTRICTED=	License restrictions -- See http://astah.net/faq/community/enduser-l
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 REVISION=	b4c6e9
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX:S!-!_!}
diff --git a/devel/avalon-framework/Makefile b/devel/avalon-framework/Makefile
index 769b4f50cc4e..3f66679827b0 100644
--- a/devel/avalon-framework/Makefile
+++ b/devel/avalon-framework/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Apache Avalon core framework for component programming
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index 8f1712c9b0dc..74753adfeccf 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -22,7 +22,6 @@ OPTIONS_DEFINE=	DOCS
 USES=		dos2unix zip
 DOS2UNIX_GLOB=	build.xml Makefile.freebsd.txt *.c *.java
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	clean makeDLL dist
 
diff --git a/devel/doctorj/Makefile b/devel/doctorj/Makefile
index 4406f45bc274..2f1fa66159ae 100644
--- a/devel/doctorj/Makefile
+++ b/devel/doctorj/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for analyzing Java code and documentation
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 ALL_TARGET=	jarfile
diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile
index c32d2d882226..1fbe21448a4a 100644
--- a/devel/flex-sdk/Makefile
+++ b/devel/flex-sdk/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Adobe Flex SDK
 CONFLICTS=	ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.*
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 SUB_FILES=	${SCRIPTS:C/\$/.sh/g}
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile
index d3f9f9dbb156..49cb56e60b07 100644
--- a/devel/flex-sdk35/Makefile
+++ b/devel/flex-sdk35/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Adobe Flex SDK
 CONFLICTS=	ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk-4.*
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 SUB_FILES=	${SCRIPTS:C/\$/.sh/g}
 PLIST_SUB=	PORTNAME=${PORTNAME}
 SUB_LIST=	PORTNAME=${PORTNAME}
diff --git a/devel/flexjson/Makefile b/devel/flexjson/Makefile
index 3d436302b5e5..85aeac099d52 100644
--- a/devel/flexjson/Makefile
+++ b/devel/flexjson/Makefile
@@ -13,7 +13,6 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/devel/gitblit/Makefile b/devel/gitblit/Makefile
index 727bbc01fb0d..160429e8d874 100644
--- a/devel/gitblit/Makefile
+++ b/devel/gitblit/Makefile
@@ -23,7 +23,6 @@ USERS=		www
 GROUPS=		www
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 SUB_FILES=	pkg-message
 PLIST_SUB+=	GB_DATAHOME=${PREFIX}/${PORTNAME} \
diff --git a/devel/gogland-eap/Makefile b/devel/gogland-eap/Makefile
index 4d7af6546d1d..f0feb4f1d290 100644
--- a/devel/gogland-eap/Makefile
+++ b/devel/gogland-eap/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier \
 USES=		python:run shebangfix
 SHEBANG_FILES=	bin/printenv.py bin/restart.py
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/devel/gradle4/Makefile b/devel/gradle4/Makefile
index 717a1d01708c..17d5a357c2c4 100644
--- a/devel/gradle4/Makefile
+++ b/devel/gradle4/Makefile
@@ -15,7 +15,6 @@ LICENSE=	APACHE20
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 NO_ARCH=	yes
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index feda8aa6fc73..6f6ff8a046a1 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -27,7 +27,6 @@ CONFLICTS_INSTALL=	hadoop2-2*
 USES=		cpe libtool ssl:build
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USE_ANT=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LDCONFIG=	yes
diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile
index 53cf125dc1c6..8dc77785dd11 100644
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@@ -39,7 +39,6 @@ CONFLICTS_INSTALL=	hadoop-1* yarn
 USES=		cpe shebangfix
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc
diff --git a/devel/hive/Makefile b/devel/hive/Makefile
index d85e00433779..b50bb7b3d5d4 100644
--- a/devel/hive/Makefile
+++ b/devel/hive/Makefile
@@ -25,7 +25,6 @@ RUN_DEPENDS=	bash:shells/bash \
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}-src
 
 HIVE_USER=	hive
diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index c446fdbdbb99..8a3aadcf5c0a 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ireport
 PORTVERSION=	3.7.6
+PORTREVISION=	1
 CATEGORIES=	devel databases java
 MASTER_SITES=	SF/${PORTNAME}/iReport/iReport-${PORTVERSION}
 DISTNAME=	iReport-${PORTVERSION}
@@ -12,7 +13,6 @@ COMMENT=	A visual report builder/designer for JasperReports
 
 USES=		dos2unix
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 DOS2UNIX_GLOB=	*.txt
 NO_BUILD=	yes
 
@@ -75,7 +75,7 @@ pre-configure:
 		s|zip |zip|g; s|jar |jar|g' \
 		-e 's|%%JAVA_HOME%%|${JAVA_HOME}|; \
 		s|%%DATADIR%%|${DATADIR}|g; \
-		s|^java |JAVA_VERSION="${JAVA_VERSION}" ${LOCALBASE}/bin/java |' \
+		s|^java |${LOCALBASE}/bin/java |' \
 		${WRKSRC}/bin/startup.sh
 	${REINPLACE_CMD} -e 's|/bin/grep|/usr/bin/grep|' \
 		${WRKSRC}/platform9/lib/nbexec
diff --git a/devel/itext/Makefile b/devel/itext/Makefile
index 0fa1846f0bda..5a18ac0258d8 100644
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@@ -26,7 +26,6 @@ OPTIONS_DEFINE=	DOCS
 USES=		dos2unix tar:bzip2
 DOS2UNIX_GLOB=	*.java
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	jar jar.rtf jar.rups
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
diff --git a/devel/java-findbugs/Makefile b/devel/java-findbugs/Makefile
index ec963c4aef0a..fc125bb1c6f7 100644
--- a/devel/java-findbugs/Makefile
+++ b/devel/java-findbugs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	findbugs
 PORTVERSION=	1.3.9
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	java-
diff --git a/devel/java-findbugs/files/patch-findbugs2 b/devel/java-findbugs/files/patch-findbugs2
index 23bc4179f9d9..77bf2f57287c 100644
--- a/devel/java-findbugs/files/patch-findbugs2
+++ b/devel/java-findbugs/files/patch-findbugs2
@@ -1,6 +1,6 @@
---- bin/findbugs2.orig	2010-12-26 13:57:04.000000000 -0800
-+++ bin/findbugs2	2010-12-26 14:00:48.000000000 -0800
-@@ -27,27 +27,11 @@
+--- bin/findbugs2.orig	2009-08-21 20:39:53 UTC
++++ bin/findbugs2
+@@ -27,27 +27,11 @@ done
  dir=`dirname "$program"`
  findbugs_home="$dir/.."
  
@@ -28,7 +28,7 @@
  if [ ! -d "$findbugs_home" ]; then
  	echo "The path $findbugs_home,"
  	echo "which is where I think FindBugs is located,"
-@@ -56,14 +40,7 @@
+@@ -56,14 +40,7 @@ if [ ! -d "$findbugs_home" ]; then
  fi
  
  # Choose default java binary
@@ -44,7 +44,7 @@
  
  # Default UI is GUI2
  fb_launchui="2"
-@@ -133,7 +110,7 @@
+@@ -133,7 +110,7 @@ while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; d
  			jvm_user_props="-D$1 $jvm_user_props"
  			shift
  			;;
@@ -53,7 +53,7 @@
  		-D*=*)
  			jvm_user_props="$1 $user_props"
  			shift
-@@ -158,17 +135,9 @@
+@@ -158,18 +135,10 @@ while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; d
  
  done
  
@@ -67,9 +67,8 @@
  #
  # Launch JVM
  #
--exec "$fb_javacmd" \
+ exec "$fb_javacmd" \
 -	-classpath "$fb_appjar$fb_pathsep$CLASSPATH" \
-+JAVA_VERSION="1.6+" exec "$fb_javacmd" \
  	-Dfindbugs.home="$findbugs_home" \
  	$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \
  	-Dfindbugs.launchUI=$fb_launchui \
diff --git a/devel/jcmdline/Makefile b/devel/jcmdline/Makefile
index 68850a7cc644..13f680823ddd 100644
--- a/devel/jcmdline/Makefile
+++ b/devel/jcmdline/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MPL11
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/devel/jiic/Makefile b/devel/jiic/Makefile
index a0d09bf85cbe..617b1841a3eb 100644
--- a/devel/jiic/Makefile
+++ b/devel/jiic/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	${JAVALIBDIR}/sabre.jar:devel/sabre
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 ALL_TARGET=	jar
diff --git a/devel/jsap/Makefile b/devel/jsap/Makefile
index 7d802757e0ba..67419bbdd31d 100644
--- a/devel/jsap/Makefile
+++ b/devel/jsap/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java package to parse command-line arguments
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/devel/leiningen/Makefile b/devel/leiningen/Makefile
index 92936558251b..52f09a391dc8 100644
--- a/devel/leiningen/Makefile
+++ b/devel/leiningen/Makefile
@@ -18,7 +18,6 @@ GH_ACCOUNT=	technomancy
 
 USES=		shebangfix
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_ARCH=	yes
 NO_BUILD=	yes
 
diff --git a/devel/libvirt-java/Makefile b/devel/libvirt-java/Makefile
index a63977c1a6d6..8d3dcff79940 100644
--- a/devel/libvirt-java/Makefile
+++ b/devel/libvirt-java/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	jna>=4.0:devel/jna \
 		junit>=4.8.2:java/junit
 
 USE_JAVA=	YES
-JAVA_VERSION=	1.6+
 USE_ANT=	YES
 ALL_TARGET=	jar
 
diff --git a/devel/looks/Makefile b/devel/looks/Makefile
index 33096f85fc1f..a14e25cc6f10 100644
--- a/devel/looks/Makefile
+++ b/devel/looks/Makefile
@@ -15,7 +15,6 @@ LICENSE=	BSD3CLAUSE
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/jgoodies-${PORTNAME}-${PORTVERSION}
diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index e9570068ef92..ef1db8463e7f 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	maven
 DISTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
@@ -19,7 +20,6 @@ USE_JAVA=	yes
 
 CPE_PRODUCT=	maven
 CPE_VENDOR=	apache
-JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 NO_ARCH=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/devel/maven/files/mvn.sh.in b/devel/maven/files/mvn.sh.in
index b137c948686b..cb8111acfea2 100644
--- a/devel/maven/files/mvn.sh.in
+++ b/devel/maven/files/mvn.sh.in
@@ -38,7 +38,7 @@ concat_lines()
 MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
+exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
 	-classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \
 	"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
 	"-Dmaven.home=${M2_HOME}" \
diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile
index 78d8043c6630..e238a357259e 100644
--- a/devel/maven3/Makefile
+++ b/devel/maven3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	maven3
 DISTVERSION=	3.0.5
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
@@ -19,7 +20,6 @@ CPE_PRODUCT=	maven
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
diff --git a/devel/maven3/files/mvn.sh.in b/devel/maven3/files/mvn.sh.in
index 770a780b7d8a..9171f0081a96 100644
--- a/devel/maven3/files/mvn.sh.in
+++ b/devel/maven3/files/mvn.sh.in
@@ -12,7 +12,7 @@ fi
 
 M2_HOME=${M2_HOME:-"%%DATADIR%%"}
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
+exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
 	-classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \
 	"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
 	"-Dmaven.home=${M2_HOME}" org.codehaus.classworlds.Launcher "$@"
diff --git a/devel/maven31/Makefile b/devel/maven31/Makefile
index c6765da4982d..c31bdec6b424 100644
--- a/devel/maven31/Makefile
+++ b/devel/maven31/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	maven31
 DISTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
@@ -20,7 +20,6 @@ CPE_PRODUCT=	maven
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
diff --git a/devel/maven31/files/mvn.sh.in b/devel/maven31/files/mvn.sh.in
index 68198ccd3b6b..a821a2570999 100644
--- a/devel/maven31/files/mvn.sh.in
+++ b/devel/maven31/files/mvn.sh.in
@@ -12,7 +12,7 @@ fi
 
 M2_HOME=${M2_HOME:-"%%DATADIR%%"}
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
+exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
 	-classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \
 	"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
 	"-Dmaven.home=${M2_HOME}" org.codehaus.classworlds.Launcher "$@"
diff --git a/devel/maven33/Makefile b/devel/maven33/Makefile
index 92e45f1fe849..441d14a2686d 100644
--- a/devel/maven33/Makefile
+++ b/devel/maven33/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	maven33
 DISTVERSION=	3.3.9
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
@@ -18,7 +19,6 @@ CPE_PRODUCT=	maven
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
diff --git a/devel/maven33/files/mvn.sh.in b/devel/maven33/files/mvn.sh.in
index b3a8b896c5ce..403679cbd5b5 100644
--- a/devel/maven33/files/mvn.sh.in
+++ b/devel/maven33/files/mvn.sh.in
@@ -37,7 +37,7 @@ concat_lines() {
 MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
+exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \
 	-classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \
 	"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
 	"-Dmaven.home=${M2_HOME}" \
diff --git a/devel/netscape-java40/Makefile b/devel/netscape-java40/Makefile
index 007f71419365..947edcdb93f7 100644
--- a/devel/netscape-java40/Makefile
+++ b/devel/netscape-java40/Makefile
@@ -17,7 +17,6 @@ LICENSE_FILE=	${WRKSRC}/License
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror auto-accept
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile
index 15e6c6b53f27..e464a7cef90d 100644
--- a/devel/ocaml-camljava/Makefile
+++ b/devel/ocaml-camljava/Makefile
@@ -13,7 +13,6 @@ COMMENT=	OCaml-Java library interface
 
 USE_OCAML=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,^\(JAVAC=\).*,\1${JAVAC},g" \
diff --git a/devel/oozie/Makefile b/devel/oozie/Makefile
index 8c4f50f00b42..7be96bed1b99 100644
--- a/devel/oozie/Makefile
+++ b/devel/oozie/Makefile
@@ -29,7 +29,6 @@ RUN_DEPENDS=	bash:shells/bash \
 
 USES=		shebangfix
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 TOMCAT_VERSION=	6.0.43
 HADOOP_VERSION=	2.7.2		# Matches devel/hadoop2
 SHEBANG_FILES=	client/src/main/bin/oozie distro/src/main/bin/addtowar.sh distro/src/main/bin/oozied.sh distro/src/main/bin/oozie-setup.sh distro/src/main/bin/oozie-sys.sh tools/src/main/bin/ooziedb.sh core/src/main/conf/oozie-env.sh
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index de07ac7ef745..8b079161c3b2 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	p5-Inline>=0.68:devel/p5-Inline \
 		p5-Inline-C>=0.62:devel/p5-Inline-C
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile
index fb2de12aca74..3718e65407eb 100644
--- a/devel/p5-Java/Makefile
+++ b/devel/p5-Java/Makefile
@@ -15,7 +15,6 @@ USE_RC_SUBR=	javaserver
 USES=		perl5
 USE_PERL5=	configure
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 post-patch:
 	${RM} ${WRKSRC}/java_server_install.pl
diff --git a/devel/pig/Makefile b/devel/pig/Makefile
index 7f768880f217..7e54b773195a 100644
--- a/devel/pig/Makefile
+++ b/devel/pig/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS=	bash:shells/bash \
 BROKEN=		tries to make outbound http connection during build phase breaking tinderbox.  Software itself does not have known issues, remove this BROKEN line and build your own package
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index 99cc3fd7a696..415f0863a02c 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -16,7 +16,6 @@ LICENSE_COMB=	dual
 USES=		zip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
diff --git a/devel/py-jcc/Makefile b/devel/py-jcc/Makefile
index bb1929f7bd15..cad5ba9f06a4 100644
--- a/devel/py-jcc/Makefile
+++ b/devel/py-jcc/Makefile
@@ -24,7 +24,6 @@ USES=		python:-3.6
 USE_PYTHON=	distutils autoplist
 PYDISTUTILS_PKGNAME=	JCC
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_VENDOR=	openjdk
 
 JCC_INCLUDES=	'${JAVA_HOME}/include;${JAVA_HOME}/include/freebsd'
diff --git a/devel/py-jep/Makefile b/devel/py-jep/Makefile
index d58523b83060..c7149e710a89 100644
--- a/devel/py-jep/Makefile
+++ b/devel/py-jep/Makefile
@@ -19,7 +19,6 @@ USE_PYTHON=	distutils
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USE_LDCONFIG=	yes
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
diff --git a/devel/pycharm-ce/Makefile b/devel/pycharm-ce/Makefile
index 05adebcc64fa..75498d604a29 100644
--- a/devel/pycharm-ce/Makefile
+++ b/devel/pycharm-ce/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier \
 USES=		python:run shebangfix
 SHEBANG_FILES=	bin/printenv.py bin/restart.py
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/devel/sabre/Makefile b/devel/sabre/Makefile
index c1aaa8527c2b..e5d5dccafe8d 100644
--- a/devel/sabre/Makefile
+++ b/devel/sabre/Makefile
@@ -16,7 +16,6 @@ WRKSRC=		${WRKDIR}/Simple\ API\ for\ Binary\ REpresentations\ \(SABRE\)
 USES=		dos2unix zip
 DOS2UNIX_GLOB=	*.xml *.java
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	dist
 
diff --git a/devel/simian/Makefile b/devel/simian/Makefile
index 477bf4182805..47df5d6f2333 100644
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@@ -39,7 +39,6 @@ OPTIONS_DEFAULT=	JAVA
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 PLIST_SUB+=	JAVA=""
 SUB_LIST+=	JAVA=""
 .else
diff --git a/devel/smc/Makefile b/devel/smc/Makefile
index 47efdba7160d..cb5aebec9cb5 100644
--- a/devel/smc/Makefile
+++ b/devel/smc/Makefile
@@ -13,7 +13,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The State Machine Compiler
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PORTEXAMPLES=	*
diff --git a/devel/soapui/Makefile b/devel/soapui/Makefile
index 460c9df65ee8..58f3a8021c77 100644
--- a/devel/soapui/Makefile
+++ b/devel/soapui/Makefile
@@ -25,7 +25,7 @@ LICENSE_PERMS_EUPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cpe
 CPE_VENDOR=	smartbear
-USE_JAVA=	1.7+
+USE_JAVA=	yes
 WRKSRC=		${WRKDIR}/SoapUI-${PORTVERSION}
 REINPLACE_ARGS=	-i ''
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/devel/sonar-ant-task/Makefile b/devel/sonar-ant-task/Makefile
index a76da387b5b0..dd48cba74bc5 100644
--- a/devel/sonar-ant-task/Makefile
+++ b/devel/sonar-ant-task/Makefile
@@ -25,7 +25,6 @@ USES=		cpe
 CPE_VENDOR=	sonarsource
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	${DATADIR_REL}/sonar-ant-task.jar
diff --git a/devel/sonar-scanner-cli/Makefile b/devel/sonar-scanner-cli/Makefile
index 6782654adfb6..1ba509fa6079 100644
--- a/devel/sonar-scanner-cli/Makefile
+++ b/devel/sonar-scanner-cli/Makefile
@@ -22,7 +22,6 @@ USES=		cpe zip
 CPE_VENDOR=	sonarsource
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 SR=		sonar-runner
 SQ_CLI=		sonar-scanner
diff --git a/devel/sonarqube/Makefile b/devel/sonarqube/Makefile
index cde4a4a0ef48..6fb0e8e82e90 100644
--- a/devel/sonarqube/Makefile
+++ b/devel/sonarqube/Makefile
@@ -29,7 +29,6 @@ CPE_VENDOR=	sonarsource
 DOS2UNIX_GLOB=	*.properties *.conf
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 SQ_FILE=	sonar.sh
 SQ_HOME=	${PREFIX}/share/${PORTNAME}
diff --git a/devel/spark/Makefile b/devel/spark/Makefile
index e90949459941..bcafb13329e5 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -25,7 +25,6 @@ RUN_DEPENDS=	bash:shells/bash \
 
 USES=		python:2.7 shebangfix
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=512m"
 SHEBANG_FILES=	bin/sparkR
 
diff --git a/devel/statcvs/Makefile b/devel/statcvs/Makefile
index 25e7571572cd..6deafde4ec80 100644
--- a/devel/statcvs/Makefile
+++ b/devel/statcvs/Makefile
@@ -20,7 +20,6 @@ BROKEN_armv7=		fails to compile: build.xml: compilation failed
 USES=		zip
 USE_JAVA=	yes
 USE_ANT=	yes
-JAVA_VERSION=	1.6+
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile
index 60e652b602f1..e2fc146dd301 100644
--- a/devel/statsvn/Makefile
+++ b/devel/statsvn/Makefile
@@ -21,7 +21,6 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 USES=		zip
 USE_JAVA=	yes
 USE_ANT=	yes
-JAVA_VERSION=	1.6+
 NO_ARCH=	yes
 
 ALL_TARGET=	dist
diff --git a/devel/swank-clojure/Makefile b/devel/swank-clojure/Makefile
index ae5954fc6d1f..14bd8958d704 100644
--- a/devel/swank-clojure/Makefile
+++ b/devel/swank-clojure/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Swank/SLIME support for Clojure
 USE_GITHUB=	yes
 GH_ACCOUNT=	technomancy
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 PLIST_FILES=	%%JAVAJARDIR%%/swank-clojure-1.2.1.jar
 
diff --git a/devel/tijmp/Makefile b/devel/tijmp/Makefile
index f2cd3eac8b37..c99e925f8752 100644
--- a/devel/tijmp/Makefile
+++ b/devel/tijmp/Makefile
@@ -18,7 +18,6 @@ CONFIGURE_ENV=	JAVA_HOME="${JAVA_HOME}"
 INSTALL_TARGET=	install-strip
 USES=		gmake libtool
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 JAVA_BUILD=	jdk
 USE_LDCONFIG=	yes
diff --git a/devel/tinylaf/Makefile b/devel/tinylaf/Makefile
index f36c350f8d6d..7f5505cbd4a5 100644
--- a/devel/tinylaf/Makefile
+++ b/devel/tinylaf/Makefile
@@ -13,7 +13,6 @@ OPTIONS_DEFINE=	DOCS
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 JARFILE=	${PORTNAME}.jar tinycp.jar
diff --git a/devel/violet/Makefile b/devel/violet/Makefile
index 53bf1796a6c0..9ae7356316b5 100644
--- a/devel/violet/Makefile
+++ b/devel/violet/Makefile
@@ -15,7 +15,6 @@ COMMENT=	Violet is a easy to learn and use UML editor
 LICENSE=	GPLv2
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	YES
 
diff --git a/dns/crossip/Makefile b/dns/crossip/Makefile
index 80411030358f..74b40c6f05ca 100644
--- a/dns/crossip/Makefile
+++ b/dns/crossip/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	crossip
 DISTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	dns java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CrossIP%20${PORTVERSION}
 
@@ -14,7 +14,6 @@ LICENSE=	GPLv2
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 
diff --git a/dns/crossip/files/crossip.sh.in b/dns/crossip/files/crossip.sh.in
index 466beb932974..660db4c55b21 100644
--- a/dns/crossip/files/crossip.sh.in
+++ b/dns/crossip/files/crossip.sh.in
@@ -2,5 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" \
-	exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/CrossIP.jar" "${@}"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/CrossIP.jar" "${@}"
diff --git a/dns/dnsjava/Makefile b/dns/dnsjava/Makefile
index 5b55bc1b05e7..868e5f391a79 100644
--- a/dns/dnsjava/Makefile
+++ b/dns/dnsjava/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_GITHUB=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	7+
 USE_ANT=	yes
 ALL_TARGET=	jar
 NO_ARCH=	yes
diff --git a/editors/drjava/Makefile b/editors/drjava/Makefile
index 1c5bce6e9da8..6876491a7d52 100644
--- a/editors/drjava/Makefile
+++ b/editors/drjava/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	drjava
 DISTVERSION=	20140826-r5761
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	editors java
 MASTER_SITES=	SF/${PORTNAME}/1.%20DrJava%20Stable%20Releases/${PORTNAME}-stable-${DISTVERSION}
 DISTNAME=	${PORTNAME}-stable-${PORTVERSION:S|.|-|g}
@@ -15,7 +15,6 @@ COMMENT=	Lightweight IDE for writing Java programs
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	DRJAVAJAR=${DRJAVAJAR}
diff --git a/editors/drjava/files/drjava.in b/editors/drjava/files/drjava.in
index 9031fb1e25b1..4f58824cda13 100644
--- a/editors/drjava/files/drjava.in
+++ b/editors/drjava/files/drjava.in
@@ -1,4 +1,3 @@
 #!/bin/sh
 # $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%"	\
 exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/%%DRJAVAJAR%% "$@"
diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile
index f833cb3baffd..78652d061658 100644
--- a/editors/jedit/Makefile
+++ b/editors/jedit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jedit
 PORTVERSION=	5.5.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors java
 MASTER_SITES=	SF
@@ -23,7 +24,6 @@ OPTIONS_SUB=	yes
 USES=		cpe xorg
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 USE_XORG=	x11
 NO_BUILD=	yes
diff --git a/editors/jedit/files/jedit.sh.in b/editors/jedit/files/jedit.sh.in
index 80b01341093d..ca126ada3331 100644
--- a/editors/jedit/files/jedit.sh.in
+++ b/editors/jedit/files/jedit.sh.in
@@ -4,4 +4,4 @@
 # Java heap size, in megabytes
 JAVA_HEAP_SIZE=32
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"
+"%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"
diff --git a/editors/omegaT/Makefile b/editors/omegaT/Makefile
index 3abece16712b..e7096d5e267c 100644
--- a/editors/omegaT/Makefile
+++ b/editors/omegaT/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	omegaT
 DISTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	editors java x11
 MASTER_SITES=	SF/${PORTNAME:tl}/OmegaT%20-%20Standard/OmegaT%20${DISTVERSION}%20update%204/
 DISTNAME=	OmegaT_${DISTVERSION}_04_Source
@@ -24,7 +25,6 @@ kaptain_CMD=	${LOCALBASE}/bin/kaptain
 USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.7+
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 NO_WRKSUBDIR=	yes
diff --git a/editors/omegaT/files/omegaT.sh.in b/editors/omegaT/files/omegaT.sh.in
index 9bd8c462711d..547f6b6465c4 100644
--- a/editors/omegaT/files/omegaT.sh.in
+++ b/editors/omegaT/files/omegaT.sh.in
@@ -9,4 +9,4 @@ if [ ! -f ${HOME}/.omegat/omegat.prefs ] ; then
   cp "%%DATADIR%%/omegat.prefs" ${HOME}/.omegat && chmod 644 ${HOME}/.omegat/omegat.prefs
 fi
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/OmegaT.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/OmegaT.jar" "$@"
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index ff894250a46a..665112460341 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -105,7 +105,6 @@ USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
 JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.6+
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 		xinerama xrandr xrender xt
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 460246acb497..4c84bc766eec 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -108,7 +108,6 @@ USE_JAVA=	yes
 JAVA_BUILD=	jdk
 JAVA_RUN=	jdk
 JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.6+
 USE_PERL5=	build
 USE_XORG=	ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
 		xinerama xrandr xrender xt
diff --git a/editors/treeform/Makefile b/editors/treeform/Makefile
index 1ec6065f66fa..bb7f307333fb 100644
--- a/editors/treeform/Makefile
+++ b/editors/treeform/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Linguistic Syntax/Semantics tree drawing editor
 USES=		zip
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 SUB_FILES=	treeform
 
 WRKSRC=		${WRKDIR}/TreeForm
diff --git a/emulators/javatari/Makefile b/emulators/javatari/Makefile
index 856623b559de..683d5b31cd28 100644
--- a/emulators/javatari/Makefile
+++ b/emulators/javatari/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	javatari
 PORTVERSION=	4.1
+PORTREVISION=	1
 CATEGORIES=	emulators java
 MASTER_SITES=	http://javatari.org/java/files/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -19,7 +20,6 @@ LICENSE=	AGPLv3
 EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 PLIST_FILES=	%%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \
 		bin/javatari
diff --git a/emulators/javatari/files/javatari.in b/emulators/javatari/files/javatari.in
index 556c8a1fa02b..637ec42fd65f 100644
--- a/emulators/javatari/files/javatari.in
+++ b/emulators/javatari/files/javatari.in
@@ -3,6 +3,5 @@
 
 set JAVA = "%%LOCALBASE%%/bin/java"
 set JARPATH = "%%JAVALIBDIR%%"
-setenv JAVA_VERSION "%%JAVA_VERSION%%"
 
 exec "${JAVA}" -jar %%JAVAJARDIR%%/%%JARFILE%%
diff --git a/finance/jgnash/Makefile b/finance/jgnash/Makefile
index d337e30e8824..415e1616b1dd 100644
--- a/finance/jgnash/Makefile
+++ b/finance/jgnash/Makefile
@@ -20,7 +20,6 @@ PLIST_SUB+=	DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_VENDOR=	openjdk
 
 NO_BUILD=	yes
diff --git a/finance/venice/Makefile b/finance/venice/Makefile
index f0adeef389dc..72f527611147 100644
--- a/finance/venice/Makefile
+++ b/finance/venice/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	venice
 DISTVERSION=	0.751beta
+PORTREVISION=	1
 CATEGORIES=	finance java
 MASTER_SITES=	SF/mov/${PORTNAME}/0.751%20beta/ \
 		SF/nemysisfreebsdp/:icons
@@ -17,7 +18,6 @@ LICENSE=	GPLv2
 
 USES=		gnome
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PORTDOCS=	*
diff --git a/finance/venice/files/venice.in b/finance/venice/files/venice.in
index 7759472641cd..3a68ca69c0c0 100644
--- a/finance/venice/files/venice.in
+++ b/finance/venice/files/venice.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/venice.jar" "${@}"
diff --git a/ftp/jftp/Makefile b/ftp/jftp/Makefile
index 49066b82462f..a99765a15192 100644
--- a/ftp/jftp/Makefile
+++ b/ftp/jftp/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Java Network Browser
 
 LICENSE=	GPLv2
 
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 USE_JAVA=	yes
 WRKSRC=		${WRKDIR}/j-ftp
diff --git a/games/blackjackclient/Makefile b/games/blackjackclient/Makefile
index c85ef501c2bc..302e85d1d8e1 100644
--- a/games/blackjackclient/Makefile
+++ b/games/blackjackclient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	BlackjackClient
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	SF/t-blackjack/
 DISTNAME=	t-blackjack-beta
@@ -14,7 +15,6 @@ LICENSE=	GPLv2
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 PLIST_FILES=	bin/${PORTNAME} \
 		${JAVAJARDIR}/${PORTNAME}.jar
 SUB_FILES=	${PORTNAME}.sh
diff --git a/games/blackjackclient/files/BlackjackClient.sh.in b/games/blackjackclient/files/BlackjackClient.sh.in
index 03fbe19cc410..e8290e473b1f 100644
--- a/games/blackjackclient/files/BlackjackClient.sh.in
+++ b/games/blackjackclient/files/BlackjackClient.sh.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/BlackjackClient.jar"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/BlackjackClient.jar"
diff --git a/games/castlevox/Makefile b/games/castlevox/Makefile
index 8590c4374d29..43cf94949fdf 100644
--- a/games/castlevox/Makefile
+++ b/games/castlevox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	CastleVox
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games java
 MASTER_SITES=	http://sillysoft.net/download/
 DISTNAME=	${PORTNAME}-linux
@@ -14,7 +14,6 @@ COMMENT=	Fast world domination game
 BROKEN=		unfetchable
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/games/castlevox/files/CastleVox.in b/games/castlevox/files/CastleVox.in
index b172a695b295..212854bfe301 100644
--- a/games/castlevox/files/CastleVox.in
+++ b/games/castlevox/files/CastleVox.in
@@ -2,7 +2,5 @@
 #
 # $FreeBSD$
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/VoxCore.jar" "${@}"
diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile
index 3d39c1933580..e7d768eb84be 100644
--- a/games/dmjava/Makefile
+++ b/games/dmjava/Makefile
@@ -16,7 +16,6 @@ EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 do-install:
diff --git a/games/domination/Makefile b/games/domination/Makefile
index 51f331987c89..57435e327d87 100644
--- a/games/domination/Makefile
+++ b/games/domination/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	domination
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME:S/d/D/}/${PORTVERSION}/:game \
 		http://domination.sourceforge.net/maps/
@@ -19,7 +20,6 @@ LICENSE=	GPLv3
 USES=		dos2unix zip:infozip
 DOS2UNIX_GLOB=	*.txt *.ini *.htm *.cards *.map
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:S/d/D/}
diff --git a/games/domination/files/domination-FlashGUI.in b/games/domination/files/domination-FlashGUI.in
index a08e233b672f..f096ce30f941 100644
--- a/games/domination/files/domination-FlashGUI.in
+++ b/games/domination/files/domination-FlashGUI.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -cp Domination.jar net.yura.domination.ui.flashgui.MainMenu "${@}"
diff --git a/games/domination/files/domination-Increment1GUI.in b/games/domination/files/domination-Increment1GUI.in
index ecdb1a119abc..273a09f655e5 100644
--- a/games/domination/files/domination-Increment1GUI.in
+++ b/games/domination/files/domination-Increment1GUI.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -cp Domination.jar net.yura.domination.ui.increment1gui.Increment1Frame "${@}"
diff --git a/games/domination/files/domination-SimpleGUI.in b/games/domination/files/domination-SimpleGUI.in
index 94da64833d50..f2475d8283f2 100644
--- a/games/domination/files/domination-SimpleGUI.in
+++ b/games/domination/files/domination-SimpleGUI.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -cp Domination.jar net.yura.domination.ui.simplegui.RiskGUI "${@}"
diff --git a/games/domination/files/domination-SwingGUI.in b/games/domination/files/domination-SwingGUI.in
index 93893d3ae09d..aa457f202589 100644
--- a/games/domination/files/domination-SwingGUI.in
+++ b/games/domination/files/domination-SwingGUI.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -cp Domination.jar net.yura.domination.ui.swinggui.SwingGUIFrame "${@}"
diff --git a/games/freecol/Makefile b/games/freecol/Makefile
index 18cce9d9e138..343ac77174b0 100644
--- a/games/freecol/Makefile
+++ b/games/freecol/Makefile
@@ -17,7 +17,6 @@ USES=		zip
 NO_BUILD=	yes
 SUB_FILES=	freecol
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 PLIST_FILES=	bin/freecol \
 		${DESKTOPDIR:S,^${PREFIX}/,,}/freecol.desktop
diff --git a/games/java-games-suite/Makefile b/games/java-games-suite/Makefile
index 5b3755f5fa5d..668ce0768ab6 100644
--- a/games/java-games-suite/Makefile
+++ b/games/java-games-suite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	java-games-suite
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	SF/javagamessuite
 
@@ -13,7 +14,6 @@ USE_JAVA=	yes
 
 NO_ARCH=	yes
 
-JAVA_VERSION=	1.6+
 PLIST_FILES=	bin/java-games-suite \
 		${JAVAJARDIR}/MM.jar \
 		${JAVAJARDIR}/reversi.jar \
diff --git a/games/java-games-suite/files/java-games-suite.sh.in b/games/java-games-suite/files/java-games-suite.sh.in
index b40581e68a3a..05338b6205ce 100644
--- a/games/java-games-suite/files/java-games-suite.sh.in
+++ b/games/java-games-suite/files/java-games-suite.sh.in
@@ -2,22 +2,22 @@
 
 case "$1" in
 	mastermind) 
-		JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/MM.jar"
+		"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/MM.jar"
 		;;
 	reversi) 
-		JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/reversi.jar"
+		"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/reversi.jar"
 		;;
 	mine) 
-		JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Mine.jar"
+		"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Mine.jar"
 		;;
 	tetris) 
-		JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Tetris.jar"
+		"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Tetris.jar"
 		;;
 	rt) 
-		JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/RT.jar"
+		"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/RT.jar"
 		;;
 	number) 
-		JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Number.jar"
+		"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Number.jar"
 		;;
 	*) 
 		echo $"Usage: $0 {mastermind|reversi|mine|tetris|rt|number}"
diff --git a/games/jchessboard/Makefile b/games/jchessboard/Makefile
index 48358d06ac11..7029b7909e48 100644
--- a/games/jchessboard/Makefile
+++ b/games/jchessboard/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jchessboard
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games java
 MASTER_SITES=	SF
 DISTNAME=	JChessBoard-${PORTVERSION}
@@ -16,7 +16,6 @@ LICENSE=	GPLv2
 USES=		tar:tgz
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_LOCALE=	en_US.ISO8859-1
 NO_ARCH=	yes
 
diff --git a/games/jchessboard/files/jchessboard.in b/games/jchessboard/files/jchessboard.in
index 9e8df1122d8f..479e3eb53304 100644
--- a/games/jchessboard/files/jchessboard.in
+++ b/games/jchessboard/files/jchessboard.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVASHAREDIR%%/%%PORTNAME%%/%%JARFILE%%"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVASHAREDIR%%/%%PORTNAME%%/%%JARFILE%%"
diff --git a/games/jin/Makefile b/games/jin/Makefile
index 81dd71d454b2..feacc9f5bdd0 100644
--- a/games/jin/Makefile
+++ b/games/jin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jin
 PORTVERSION=	2.14.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -25,8 +25,7 @@ USE_ANT=	yes
 MAKE_ARGS+=	-lib ${JAVAJARDIR}/bsh.jar
 
 SUB_FILES=	${PORTNAME}
-SUB_LIST=	JINJAR=${JINJAR:Q} \
-		JAVA_VERSION=${JAVA_PORT_VERSION:R:C/^([^1])/1.\1/}
+SUB_LIST=	JINJAR=${JINJAR:Q}
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
diff --git a/games/jin/files/jin.in b/games/jin/files/jin.in
index 34a379b72b3d..de3c80167274 100644
--- a/games/jin/files/jin.in
+++ b/games/jin/files/jin.in
@@ -1,5 +1,4 @@
 #!/bin/sh
 # $FreeBSD$
 cd %%DATADIR%%
-export JAVA_VERSION="%%JAVA_VERSION%%+"
 exec "%%LOCALBASE%%/bin/java" -cp %%JAVAJARDIR%%/bsh.jar:%%JINJAR%% free.jin.JinApplication "$@"
diff --git a/games/jinput/Makefile b/games/jinput/Makefile
index f221db1f9554..8360011aeefd 100644
--- a/games/jinput/Makefile
+++ b/games/jinput/Makefile
@@ -17,7 +17,6 @@ BROKEN_armv7=		fails to compile: build.xml: compilation failed
 
 USES=		tar:bzip2
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
 USE_ANT=	yes
diff --git a/games/jtans/Makefile b/games/jtans/Makefile
index cd83510d5aa3..ef1f1ffaa718 100644
--- a/games/jtans/Makefile
+++ b/games/jtans/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jtans
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_appli-${PORTVERSION}
@@ -19,7 +19,6 @@ EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	.
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 SUB_FILES=	jtans.sh
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/games/jtans/files/jtans.sh.in b/games/jtans/files/jtans.sh.in
index 54b5eb612bf0..294749152922 100644
--- a/games/jtans/files/jtans.sh.in
+++ b/games/jtans/files/jtans.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar"
diff --git a/games/jutils/Makefile b/games/jutils/Makefile
index 95daac4e90b2..32a19e63654e 100644
--- a/games/jutils/Makefile
+++ b/games/jutils/Makefile
@@ -18,7 +18,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	voidanix
 GL_COMMIT=	3b2f176fdb76126c831a695b579267cf351624f5
 
-USE_JAVA=	6+
+USE_JAVA=	yes
 
 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
 PLIST_DIRS=	${JAVAJARDIR}/${PORTNAME}
diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index 0eebd2276865..3e7fee9059f0 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -29,7 +29,6 @@ USES=		dos2unix zip xorg
 DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
-JAVA_VERSION=	1.7+
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
 USE_ANT=	yes
diff --git a/games/moagg/Makefile b/games/moagg/Makefile
index 61402187c848..b7f2b06b4d09 100644
--- a/games/moagg/Makefile
+++ b/games/moagg/Makefile
@@ -22,7 +22,6 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PORTDOCS=	AUTHORS README.txt
diff --git a/games/pcgen/Makefile b/games/pcgen/Makefile
index 8a2e7e09c4aa..50ffdfc3e955 100644
--- a/games/pcgen/Makefile
+++ b/games/pcgen/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pcgen
 PORTVERSION=	6.06.01
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	https://github.com/PCGen/${PORTNAME}/releases/download/${PORTVERSION}/
 DISTNAME=	pcgen-${PORTVERSION}-full
@@ -14,7 +15,6 @@ LICENSE=	LGPL21
 USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/games/pcgen/files/pcgen.sh.in b/games/pcgen/files/pcgen.sh.in
index cb626c00b07c..705dc40e29e8 100644
--- a/games/pcgen/files/pcgen.sh.in
+++ b/games/pcgen/files/pcgen.sh.in
@@ -4,4 +4,4 @@
 
 [ \! -d "${HOME}/.pcgen" ] && mkdir "${HOME}/.pcgen"
 cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" ${PCGEN_OPTS} -jar ./pcgen.jar "$@"
+exec "%%LOCALBASE%%/bin/java" ${PCGEN_OPTS} -jar ./pcgen.jar "$@"
diff --git a/games/rescue/Makefile b/games/rescue/Makefile
index 0e1aa7e6a2c0..adecb8ff99c9 100644
--- a/games/rescue/Makefile
+++ b/games/rescue/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rescue
 PORTVERSION=	1.0.0.3
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME:S/r/R/}%21%20Max/${PORTVERSION}/
 DISTNAME=	${PORTNAME:S/r/R/}_${PORTVERSION}
@@ -17,7 +18,6 @@ LICENSE_FILE=	${WRKSRC}/gpl.txt
 USES=		dos2unix zip:infozip
 DOS2UNIX_GLOB=	*.txt *.htm *.css *.ini *.xml
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:S/r/R/}
diff --git a/games/rescue/files/rescue.in b/games/rescue/files/rescue.in
index 205c080273a3..200eb591d3ed 100644
--- a/games/rescue/files/rescue.in
+++ b/games/rescue/files/rescue.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -jar "%%DATADIR%%/Rescue.jar" "${@}"
diff --git a/games/robocode-naval/Makefile b/games/robocode-naval/Makefile
index f8e17575a917..25ab345b264a 100644
--- a/games/robocode-naval/Makefile
+++ b/games/robocode-naval/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	robocode
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-setup
 CATEGORIES=	games java
 MASTER_SITES=	SF/${PORTNAME}/naval-robocode/${PORTVERSION}
@@ -19,7 +20,6 @@ PORTSCOUT=	limit:^\d+\.\d+\.\d+$$
 USES=		dos2unix zip
 DOS2UNIX_GLOB=	*.css *.team *.properties package-list MANIFEST.MF
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_EXTRACT=	yes
 JAVA_RUN=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/robocode-naval/files/robocode-NavalRobocode.in b/games/robocode-naval/files/robocode-NavalRobocode.in
index 485455ab88ed..419eae5818a7 100644
--- a/games/robocode-naval/files/robocode-NavalRobocode.in
+++ b/games/robocode-naval/files/robocode-NavalRobocode.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
 -cp "libs/robocode.jar" robocode.NavalRobocode "${@}"
diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index e87d3327bbb9..a2902eba382a 100644
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	robocode
 PORTVERSION=	1.9.3.7
+PORTREVISION=	1
 CATEGORIES=	games java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${DISTVERSION}-setup.jar
@@ -18,7 +19,6 @@ LICENSE_FILE=	${WRKSRC}/license/epl-v10.html
 USES=		dos2unix zip:infozip
 DOS2UNIX_GLOB=	*.css *.team *.properties package-list MANIFEST.MF
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_EXTRACT=	yes
 JAVA_RUN=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/robocode/files/robocode-MeleeRumble.in b/games/robocode/files/robocode-MeleeRumble.in
index aaf841419c3e..68195f06821f 100644
--- a/games/robocode/files/robocode-MeleeRumble.in
+++ b/games/robocode/files/robocode-MeleeRumble.in
@@ -3,8 +3,6 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx1024M \
 -cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \
 roborumble.RoboRumbleAtHome ./roborumble/meleerumble.txt "${@}"
diff --git a/games/robocode/files/robocode-RoboRumble.in b/games/robocode/files/robocode-RoboRumble.in
index f435b4f37728..7198612eda04 100644
--- a/games/robocode/files/robocode-RoboRumble.in
+++ b/games/robocode/files/robocode-RoboRumble.in
@@ -3,8 +3,6 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
 -cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \
 roborumble.RoboRumbleAtHome ./roborumble/roborumble.txt "${@}"
diff --git a/games/robocode/files/robocode-Robocode.in b/games/robocode/files/robocode-Robocode.in
index ba2645a19fd4..d4546cbfb6e2 100644
--- a/games/robocode/files/robocode-Robocode.in
+++ b/games/robocode/files/robocode-Robocode.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
 -cp "libs/robocode.jar" robocode.Robocode "${@}"
diff --git a/games/robocode/files/robocode-TeamRumble.in b/games/robocode/files/robocode-TeamRumble.in
index f435b4f37728..7198612eda04 100644
--- a/games/robocode/files/robocode-TeamRumble.in
+++ b/games/robocode/files/robocode-TeamRumble.in
@@ -3,8 +3,6 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
 -cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \
 roborumble.RoboRumbleAtHome ./roborumble/roborumble.txt "${@}"
diff --git a/games/robocode/files/robocode-TwinDuel.in b/games/robocode/files/robocode-TwinDuel.in
index 910a136ca357..d2f2b3163941 100644
--- a/games/robocode/files/robocode-TwinDuel.in
+++ b/games/robocode/files/robocode-TwinDuel.in
@@ -3,8 +3,6 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
 -cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \
 roborumble.RoboRumbleAtHome ./roborumble/twinduel.txt "${@}"
diff --git a/games/spicetrade/Makefile b/games/spicetrade/Makefile
index 725694ba7ebe..a916d9429b40 100644
--- a/games/spicetrade/Makefile
+++ b/games/spicetrade/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spicetrade
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Spice%20Trade%20v${PORTVERSION}
 DISTNAME=	Spicetrade-${PORTVERSION}
@@ -14,7 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Colourful 14th century Arab spice trading game
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/games/spicetrade/files/spicetrade.in b/games/spicetrade/files/spicetrade.in
index 4d14a4d8b01c..613dc8b5af84 100644
--- a/games/spicetrade/files/spicetrade.in
+++ b/games/spicetrade/files/spicetrade.in
@@ -2,5 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" \
-	exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@"
diff --git a/games/stendhal/Makefile b/games/stendhal/Makefile
index d991e28fadf5..fe8fc5ce7b27 100644
--- a/games/stendhal/Makefile
+++ b/games/stendhal/Makefile
@@ -16,7 +16,6 @@ LICENSE_COMB=		multi
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_JAVA=		yes
-JAVA_VERSION=		1.6+
 USE_ANT=		yes
 USES=			shebangfix
 
diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index b24d04980db7..721223090f0f 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aoi
 PORTVERSION=	3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/ArtOfIllusion/${PORTVERSION} \
 		SF/${PORTNAME}/ArtOfIllusion-manual/${PORTVERSION}:docs
@@ -21,7 +21,6 @@ LIB_DEPENDS=	libjogl.so:graphics/jogl
 USES=		zip
 DOS2UNIX_FILES=	../AoI_Manual/*.html # USES=dos2unix is optional
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g}
diff --git a/graphics/aoi/files/aoi.in b/graphics/aoi/files/aoi.in
index 1dd580b25f96..816444ceaaed 100644
--- a/graphics/aoi/files/aoi.in
+++ b/graphics/aoi/files/aoi.in
@@ -2,7 +2,5 @@
 #
 # $FreeBSD$
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -jar "%%DATADIR%%/ArtOfIllusion.jar" "${@}"
diff --git a/graphics/barbecue/Makefile b/graphics/barbecue/Makefile
index c3e5511e327f..b59e0d344b16 100644
--- a/graphics/barbecue/Makefile
+++ b/graphics/barbecue/Makefile
@@ -16,7 +16,6 @@ LICENSE=	BSD3CLAUSE
 RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 JARFILES=	${PORTNAME}-${DISTVERSION}.jar
diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile
index 78a0539b95ff..6a1d784d7a53 100644
--- a/graphics/batik/Makefile
+++ b/graphics/batik/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 CPE_VENDOR=	apache
 
 USES=		cpe
-USE_JAVA=	1.7+
+USE_JAVA=	yes
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/graphics/cbviewer/Makefile b/graphics/cbviewer/Makefile
index 09c2c7165df4..aed064d23c56 100644
--- a/graphics/cbviewer/Makefile
+++ b/graphics/cbviewer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cbviewer
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CBViewer%200.8/ \
 		SF/nemysisfreebsdp/graphics/:icons
@@ -23,7 +23,6 @@ RUN_DEPENDS=	unrar:archivers/unrar
 USES=		dos2unix zip
 DOS2UNIX_GLOB=	CREDITS
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/graphics/cbviewer/files/cbviewer.in b/graphics/cbviewer/files/cbviewer.in
index 7be1937f6085..419df5a4e527 100644
--- a/graphics/cbviewer/files/cbviewer.in
+++ b/graphics/cbviewer/files/cbviewer.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -jar "%%DATADIR%%/CBViewer.jar" "${@}"
diff --git a/graphics/cosmoplayer/Makefile b/graphics/cosmoplayer/Makefile
index b54386b6882d..3e55e3e81406 100644
--- a/graphics/cosmoplayer/Makefile
+++ b/graphics/cosmoplayer/Makefile
@@ -22,7 +22,6 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror auto-accept
 RUN_DEPENDS=	${JAVALIBDIR}/java40.jar:devel/netscape-java40
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/graphics/ditaa/Makefile b/graphics/ditaa/Makefile
index 1d316d37d6e1..a470959618ce 100644
--- a/graphics/ditaa/Makefile
+++ b/graphics/ditaa/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKDIR}/COPYING
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index d605849930a8..ff4a72249397 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 USES=		zip
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/jalbum/Makefile b/graphics/jalbum/Makefile
index 77afea621215..31b8e3b169b0 100644
--- a/graphics/jalbum/Makefile
+++ b/graphics/jalbum/Makefile
@@ -16,7 +16,6 @@ USES=		zip
 NO_BUILD=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 SUB_FILES=	jalbum.sh
diff --git a/graphics/jave6/Makefile b/graphics/jave6/Makefile
index 929ba5f42139..bc3807bec028 100644
--- a/graphics/jave6/Makefile
+++ b/graphics/jave6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jave6
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics java
 MASTER_SITES=	http://www.jave.de/developer/\
 		http://ikaria.informatik.uni-rostock.de/public_bsd/FreeBSD/
@@ -16,11 +16,9 @@ EXTRACT_AFTER_ARGS=	-d ${WRKDIR}/${DISTNAME}
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 SUB_FILES=	jave6 pkg-message
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 do-install:
diff --git a/graphics/jave6/files/jave6.in b/graphics/jave6/files/jave6.in
index 7b60edec299e..3a37127f5762 100644
--- a/graphics/jave6/files/jave6.in
+++ b/graphics/jave6/files/jave6.in
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar jave.jar "${@}"
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile
index f61bfc5c01e8..ffce5eee8fe6 100644
--- a/graphics/jdraw/Makefile
+++ b/graphics/jdraw/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jdraw
 PORTVERSION=	1.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
@@ -22,7 +22,7 @@ PLASTIC3D_DESC=		Use Plastic3DLook&Feel
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 SUB_FILES=	${PORTNAME}
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION} JDRAWJAR=${JDRAWJAR} PLASTIC3D=${PLASTIC3D}
+SUB_LIST=	JDRAWJAR=${JDRAWJAR} PLASTIC3D=${PLASTIC3D}
 
 JDRAWJAR=	${DATADIR}/${DISTFILES}
 
@@ -37,6 +37,5 @@ do-install:
 PLASTIC3D=	"-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
 RUN_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/looks
 .endif
-JAVA_VERSION=	1.6+
 
 .include <bsd.port.mk>
diff --git a/graphics/jdraw/files/jdraw.in b/graphics/jdraw/files/jdraw.in
index fdf78202b420..db25833ce358 100644
--- a/graphics/jdraw/files/jdraw.in
+++ b/graphics/jdraw/files/jdraw.in
@@ -1,10 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-if [ -z "${JAVA_VERSION}" ]; then
-	JAVA_VERSION="%%JAVA_VERSION%%"
-fi
-
 LOOK_AND_FEEL="%%PLASTIC3D%%"
 
 exec "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%" ${LOOK_AND_FEEL} -jar "%%JDRAWJAR%%" "$@"
diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile
index ddd0f9ad3bd2..9b53f85e4134 100644
--- a/graphics/jogl/Makefile
+++ b/graphics/jogl/Makefile
@@ -35,7 +35,6 @@ USE_ANT=	yes
 USE_LDCONFIG=	yes
 USE_LOCALE=	en_US.UTF-8
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 BUILD_WRKSRC=	${WRKSRC}/jogl/make
 BUILD_BINPATH=	${WRKSRC}/bin
diff --git a/graphics/jpatch/Makefile b/graphics/jpatch/Makefile
index 54027a679bbe..b5b9985607a8 100644
--- a/graphics/jpatch/Makefile
+++ b/graphics/jpatch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jpatch
 DISTVERSION=	0.4p1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/JPatch%200.4%20PREVIEW%201
 DISTNAME=	${PORTNAME}0_4preview1
@@ -13,7 +13,6 @@ COMMENT=	Spline based 3D modeling tool
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}${DISTVERSION}
 
diff --git a/graphics/jpatch/files/jpatch.sh.in b/graphics/jpatch/files/jpatch.sh.in
index 9f6eda7db431..14f134a46969 100644
--- a/graphics/jpatch/files/jpatch.sh.in
+++ b/graphics/jpatch/files/jpatch.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@"
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 1edaca258faa..d5f0330dbc3b 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -38,7 +38,6 @@ OPTIONS_SUB=	yes
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 CONFIGURE_ARGS+=	--with-java=${JAVA_HOME}
 .else
diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile
index 3ef931c85508..e7099d125097 100644
--- a/graphics/lightzone/Makefile
+++ b/graphics/lightzone/Makefile
@@ -41,7 +41,6 @@ USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.6+
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 INSTALLS_ICONS=	yes
diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index 181f9411aba9..f67642961455 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mapyrus
 PORTVERSION=	1.801
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics print java
 MASTER_SITES=	SF
 
@@ -15,8 +15,6 @@ LICENSE_FILE=	${WRKSRC}/userdoc/COPYING
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-JAVA_VERSION=	1.6+
-
 MAPYRUSDOCS=	${PORTNAME}.pdf
 MAPYRUSJAR=	${PORTNAME}.jar
 
diff --git a/graphics/mapyrus/files/mapyrus.in b/graphics/mapyrus/files/mapyrus.in
index b9f54ed5ee69..eaa13e166d94 100644
--- a/graphics/mapyrus/files/mapyrus.in
+++ b/graphics/mapyrus/files/mapyrus.in
@@ -9,5 +9,4 @@ if [ -z "$1" ]; then
 else
     MAPYRUS_ARGS="$@"
 fi
-JAVA_VERSION="%%JAVA_VERSION%%" \
-	exec "%%LOCALBASE%%/bin/java" ${JAVA_AWT_HEADLESS} -jar "%%DATADIR%%/mapyrus.jar" ${MAPYRUS_ARGS}
+exec "%%LOCALBASE%%/bin/java" ${JAVA_AWT_HEADLESS} -jar "%%DATADIR%%/mapyrus.jar" ${MAPYRUS_ARGS}
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 1a348d1ec212..acd8d4da411c 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -53,7 +53,6 @@ CONFIGURE_ARGS+=	--without-netcdf
 .if defined(WITH_JAVA)
 ONLY_FOR_ARCHS=	i386
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 BUILD_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
 RUN_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
 CONFIGURE_ARGS+=	--with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \
diff --git a/graphics/tintfu/Makefile b/graphics/tintfu/Makefile
index 6606b8964e0d..daef7a183c6c 100644
--- a/graphics/tintfu/Makefile
+++ b/graphics/tintfu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tintfu
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}
@@ -18,7 +18,6 @@ EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	.
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 PLIST_FILES=	%%JAVAJARDIR%%/${DISTNAME}.jar \
 		bin/tintfu
diff --git a/graphics/tintfu/files/tintfu.sh.in b/graphics/tintfu/files/tintfu.sh.in
index c766004fc83c..4f773c697d41 100644
--- a/graphics/tintfu/files/tintfu.sh.in
+++ b/graphics/tintfu/files/tintfu.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar"
diff --git a/graphics/xmlgraphics-commons/Makefile b/graphics/xmlgraphics-commons/Makefile
index 48845676610b..fb5785c89aaf 100644
--- a/graphics/xmlgraphics-commons/Makefile
+++ b/graphics/xmlgraphics-commons/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Several reusable components used by Apache Batik and FOP
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_JAVA=	1.6+
+USE_JAVA=	yes
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/java/apache-commons-cli/Makefile b/java/apache-commons-cli/Makefile
index 3c8f8fef617b..131a2bd0faaa 100644
--- a/java/apache-commons-cli/Makefile
+++ b/java/apache-commons-cli/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Java library for command line arguments and options
 LICENSE=	APACHE20
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/java/apache-commons-lang/Makefile b/java/apache-commons-lang/Makefile
index 1dc30a7a3b81..1b95e5124fa3 100644
--- a/java/apache-commons-lang/Makefile
+++ b/java/apache-commons-lang/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Apache library with helper utilities for the java.lang API
 LICENSE=	APACHE20
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	jar
 
diff --git a/java/apache-commons-lang3/Makefile b/java/apache-commons-lang3/Makefile
index 96ff0d0b4fde..566491aa4b18 100644
--- a/java/apache-commons-lang3/Makefile
+++ b/java/apache-commons-lang3/Makefile
@@ -15,7 +15,6 @@ LICENSE=	APACHE20
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/java/apache-commons-logging/Makefile b/java/apache-commons-logging/Makefile
index d11312f4134b..00571432d085 100644
--- a/java/apache-commons-logging/Makefile
+++ b/java/apache-commons-logging/Makefile
@@ -18,7 +18,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 OPTIONS_DEFINE=	DOCS
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 JARFILE=	${PORTNAME}-${PORTVERSION}.jar
diff --git a/java/apache-commons-primitives/Makefile b/java/apache-commons-primitives/Makefile
index d0f90bd72722..562e93f0efdc 100644
--- a/java/apache-commons-primitives/Makefile
+++ b/java/apache-commons-primitives/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Library supporting Java primitive types
 LICENSE=	APACHE20
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/java/aparapi/Makefile b/java/aparapi/Makefile
index de225ad655f5..b6ac82eb2295 100644
--- a/java/aparapi/Makefile
+++ b/java/aparapi/Makefile
@@ -22,7 +22,6 @@ ONLY_FOR_ARCHS=	amd64
 USE_GITHUB=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USE_ANT=	yes
 ALL_TARGET=	dist
 
diff --git a/java/avis/Makefile b/java/avis/Makefile
index 0924d530d57d..7e7327c73dec 100644
--- a/java/avis/Makefile
+++ b/java/avis/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Elvin Publish/Subscribe Message Bus server based on the Elvin protocol
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if !defined(WITHOUT_COMPILE)
diff --git a/java/berkeley-db/Makefile b/java/berkeley-db/Makefile
index f4cfc92b8c77..a7302913f2f6 100644
--- a/java/berkeley-db/Makefile
+++ b/java/berkeley-db/Makefile
@@ -19,7 +19,6 @@ BROKEN_armv7=		fails to build: build.xml: Java returned: 1
 OPTIONS_DEFINE=	DOCS EXAMPLES TEST
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USE_ANT=	yes
 MAKE_ENV+=	JAVALIBDIR="${JAVALIBDIR}"
 MAKE_ARGS+=	-cp ${JAVALIBDIR}/junit.jar
diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile
index ea5443b5d2cd..798cb82d43b2 100644
--- a/java/bouncycastle/Makefile
+++ b/java/bouncycastle/Makefile
@@ -23,7 +23,6 @@ CPE_PRODUCT=	legion-of-the-bouncy-castle-java-crytography-api
 CPE_VENDOR=	${PORTNAME}
 USE_JAVA=	yes
 USES=		cpe
-JAVA_VERSION=	1.6+
 JDKMVERSION=	1.6 # ${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/}
 JDKNVERSION=	16 # ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/}
 USE_ANT=	yes
diff --git a/java/bouncycastle15/Makefile b/java/bouncycastle15/Makefile
index 2bfdb5af955f..15630b18731f 100644
--- a/java/bouncycastle15/Makefile
+++ b/java/bouncycastle15/Makefile
@@ -30,7 +30,6 @@ CPE_PRODUCT=	legion-of-the-bouncy-castle-java-crytography-api
 CPE_VENDOR=	${PORTNAME}
 USE_JAVA=	yes
 USES=		cpe
-JAVA_VERSION=	1.6+
 JDKMVERSION=	1.5
 JDKNVERSION=	15
 USE_ANT=	yes
diff --git a/java/castor/Makefile b/java/castor/Makefile
index b52405493184..7bbdcd04f4e5 100644
--- a/java/castor/Makefile
+++ b/java/castor/Makefile
@@ -16,7 +16,6 @@ LICENSE=	APACHE20
 
 USES=		cpe
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-anttasks.jar \
diff --git a/java/cryptix-jce/Makefile b/java/cryptix-jce/Makefile
index 83ae733e9347..65031c9c52ea 100644
--- a/java/cryptix-jce/Makefile
+++ b/java/cryptix-jce/Makefile
@@ -12,7 +12,6 @@ COMMENT=	JCE (Java Cryptography Extension) by Cryptix
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/java/dbvis/Makefile b/java/dbvis/Makefile
index 599a3ac80c8c..e1d6f5ae6720 100644
--- a/java/dbvis/Makefile
+++ b/java/dbvis/Makefile
@@ -16,7 +16,6 @@ LICENSE_TEXT=	Full license can be found at http://www.dbvis.com/eula/
 LICENSE_PERMS=	auto-accept
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 JAVA_VENDOR=	openjdk
 NO_BUILD=	yes
 RESTRICTED=	Redistribution is not permitted
diff --git a/java/eclipse-drjava/Makefile b/java/eclipse-drjava/Makefile
index 8a20d5d0bec7..16f2236135c3 100644
--- a/java/eclipse-drjava/Makefile
+++ b/java/eclipse-drjava/Makefile
@@ -19,7 +19,6 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 
 DATADIR=	${PREFIX}/lib/eclipse/plugins
diff --git a/java/eclipse-ecj/Makefile b/java/eclipse-ecj/Makefile
index 886cf167dff1..21e53222c2a8 100644
--- a/java/eclipse-ecj/Makefile
+++ b/java/eclipse-ecj/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ecj
 PORTVERSION=	4.4.2
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.eclipse.org/eclipse/downloads/drops4/R-${PORTVERSION}-${DROPDATE}/
 PKGNAMEPREFIX=	eclipse-
@@ -20,7 +21,6 @@ EXTRACT_AFTER_ARGS=	-C ${WRKSRC}
 
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 SUB_FILES=	ecj.sh
 SUB_LIST=	PORTVERSION=${PORTVERSION}
 NO_WRKSUBDIR=	yes
diff --git a/java/eclipse-ecj/files/ecj.sh.in b/java/eclipse-ecj/files/ecj.sh.in
index bfbba17fc3d2..c46240556ed9 100644
--- a/java/eclipse-ecj/files/ecj.sh.in
+++ b/java/eclipse-ecj/files/ecj.sh.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/ecj-%%PORTVERSION%%.jar" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}"
+"%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/ecj-%%PORTVERSION%%.jar" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}"
diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile
index 740dd0d75edc..be8ffd027c21 100644
--- a/java/eclipse-findbugs/Makefile
+++ b/java/eclipse-findbugs/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	eclipse:java/eclipse
 USES=		zip
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 
 PLIST_SUB=	\
diff --git a/java/eclipse-shelled/Makefile b/java/eclipse-shelled/Makefile
index 3eded7ba4199..f045c6fa10e1 100644
--- a/java/eclipse-shelled/Makefile
+++ b/java/eclipse-shelled/Makefile
@@ -19,7 +19,6 @@ USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 
 do-install:
diff --git a/java/infobus/Makefile b/java/infobus/Makefile
index dd27b44f5c9b..6ff2a6ed081c 100644
--- a/java/infobus/Makefile
+++ b/java/infobus/Makefile
@@ -14,7 +14,6 @@ OPTIONS_DEFINE=		DOCS EXAMPLES
 
 USES=		zip
 USE_JAVA=	YES
-JAVA_VERSION=	1.6+
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/java/jai/Makefile b/java/jai/Makefile
index 38bdc7c7192d..0d4e9f8519cc 100644
--- a/java/jai/Makefile
+++ b/java/jai/Makefile
@@ -14,7 +14,6 @@ COMMENT=	High performance image processing libraries for Java
 USES=		cpe zip
 CPE_VENDOR=	oracle
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 NO_BUILD=	yes
 
diff --git a/java/jakarta-bcel/Makefile b/java/jakarta-bcel/Makefile
index 1959b05d358a..fed96ec38cde 100644
--- a/java/jakarta-bcel/Makefile
+++ b/java/jakarta-bcel/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Library for generating Java bytecode
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_ARCH=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/bcel.jar
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index c099069efeb3..c4205acbd512 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -23,7 +23,6 @@ USES=		dos2unix
 USE_JAVA=	yes
 USE_ANT=	yes
 DOS2UNIX_FILES=	build.xml
-JAVA_VERSION=	1.6+
 ALL_TARGET=	dist
 MAKE_ARGS+=	-Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
 		-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar
diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile
index 3720edc4c3a3..405b07860ad1 100644
--- a/java/jakarta-commons-discovery/Makefile
+++ b/java/jakarta-commons-discovery/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Java library for locating resources (including classes)
 
 USE_JAVA=	YES
-JAVA_VERSION=	1.6+
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile
index 1b682d7f3837..2a63aeb6aaad 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/jakarta-commons-httpclient/Makefile
@@ -24,7 +24,6 @@ OPTIONS_DEFINE=	DOCS
 USES+=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 NO_ARCH=	yes
diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile
index 4a33a2c56954..2ae24b11558e 100644
--- a/java/jakarta-oro/Makefile
+++ b/java/jakarta-oro/Makefile
@@ -14,7 +14,6 @@ LICENSE=	APACHE20
 
 USE_JAVA=	yes
 USE_ANT=	yes
-JAVA_VERSION=	1.6+
 ALL_TARGET=	jar javadocs
 
 JAVALIBNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile
index f6ad47c0e16c..bb39230895f5 100644
--- a/java/jakarta-regexp/Makefile
+++ b/java/jakarta-regexp/Makefile
@@ -16,7 +16,6 @@ BROKEN_armv6=		fails to build: build.xml: Java returned: 1
 BROKEN_armv7=		fails to build: build.xml: Java returned: 1
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	test package
 MAKE_ARGS=	-Djakarta-site.dir=${WRKSRC}
diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile
index 19ec224c06ab..386acf8bdcce 100644
--- a/java/jasmin/Makefile
+++ b/java/jasmin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jasmin
 PORTVERSION=	2.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -14,7 +15,6 @@ USES=		dos2unix zip
 USE_ANT=	yes
 ALL_TARGET=	jasmin
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 DOS2UNIX_REGEX=	.*\.(txt|xml|j|class|java|mf|css|bnf|html)
 
 SUB_FILES=	jasmin.sh
diff --git a/java/jasmin/files/jasmin.sh.in b/java/jasmin/files/jasmin.sh.in
index ef28eddd96a5..05c2e77b04bb 100644
--- a/java/jasmin/files/jasmin.sh.in
+++ b/java/jasmin/files/jasmin.sh.in
@@ -2,5 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" \
-	exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jasmin.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jasmin.jar" "$@"
diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile
index b65a79bb6157..cbff8884823a 100644
--- a/java/java-subversion/Makefile
+++ b/java/java-subversion/Makefile
@@ -10,7 +10,6 @@ COMMENT=	Java bindings for Version control system
 USES+=		compiler
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 JAVA_OS=	native
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index 54245cab2607..188bf8752c87 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -21,7 +21,6 @@ USES=		gl tar:bzip2 xorg
 USE_JAVA=	yes
 USE_GL=		gl
 USE_XORG=	xt
-JAVA_VERSION=	1.6+
 JAVA_VENDOR=	openjdk
 USE_ANT=	yes
 LLD_UNSAFE=	yes
diff --git a/java/javahelp/Makefile b/java/javahelp/Makefile
index a9ebff59daa4..ab5cb9912587 100644
--- a/java/javahelp/Makefile
+++ b/java/javahelp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	javahelp
 PORTVERSION=	2.0.05.20170719
+PORTREVISION=	1
 CATEGORIES=	java devel
 
 MAINTAINER=	makc@FreeBSD.org
@@ -19,7 +20,6 @@ GH_TAGNAME=	3ca862d
 USE_JAVA=	yes
 USE_ANT=	yes
 
-JAVA_VER=	1.${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/}
 TOMCAT_VER?=	8.5
 TOMCAT_PORT=	www/tomcat${TOMCAT_VER:S/.0//:S/.//}
 TOMCAT_DIR=	${LOCALBASE}/apache-tomcat-${TOMCAT_VER}
@@ -30,14 +30,11 @@ MAKE_ARGS=	-Djsp-jar=${TOMCAT_jsp} \
 		-Dfile.reference.jsp-api.jar=${TOMCAT_jsp} \
 		-Dservlet-jar=${TOMCAT_servlet} \
 		-Dfile.reference.servlet-api.jar=${TOMCAT_servlet} \
-		-Djavac.target=${JAVA_VER} \
-		-Ddefault.javac.target=${JAVA_VER} \
 		-Dtomcat-zip-present=true
 
 BUILD_WRKSRC=	${WRKSRC}/javahelp_nbproject
 SUB_FILES=	jhindexer \
 		jhsearch
-SUB_LIST=	JAVA_VER=${JAVA_VER}+
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/jhindexer ${WRKDIR}/jhsearch ${STAGEDIR}${PREFIX}/bin/
diff --git a/java/javahelp/files/jhindexer.in b/java/javahelp/files/jhindexer.in
index 59ee27424484..48334eb3025c 100644
--- a/java/javahelp/files/jhindexer.in
+++ b/java/javahelp/files/jhindexer.in
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-export JAVA_VERSION=%%JAVA_VER%%
-
 exec java -cp %%JAVALIBDIR%%/jhall.jar com.sun.java.help.search.Indexer "$@"
diff --git a/java/javahelp/files/jhsearch.in b/java/javahelp/files/jhsearch.in
index 36c5a2ff8258..d6cc3d45df6c 100644
--- a/java/javahelp/files/jhsearch.in
+++ b/java/javahelp/files/jhsearch.in
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-export JAVA_VERSION=%%JAVA_VER%%
-
 exec java -cp %%JAVALIBDIR%%/jhall.jar com.sun.java.help.search.QueryEngine "$@"
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index ca8f2ee07ce5..f8712174f36f 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	javavmwrapper
-PORTVERSION=	2.7.3
+PORTVERSION=	2.7.4
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1
index eb366c0d8cef..efe3e195204d 100644
--- a/java/javavmwrapper/src/javavm.1
+++ b/java/javavmwrapper/src/javavm.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 24, 2005
+.Dd November 12, 2019
 .Os
 .Dt JAVAVM 1
 .Sh NAME
@@ -112,16 +112,12 @@ to a version, any Java VM with a version greater than or
 equal to the given version will be used.
 .Pp
 Currently allowed versions are
-.Ql 1.6 ,
-.Ql 1.6+ ,
 .Ql 1.7 ,
 .Ql 1.7+ ,
 .Ql 1.8 ,
 .Ql 1.8+ ,
 .Ql 1.9 ,
 .Ql 1.9+ ,
-.Ql 6 ,
-.Ql 6+ ,
 .Ql 7 ,
 .Ql 7+ ,
 .Ql 8 ,
@@ -202,8 +198,8 @@ Execute MyApp with the most up to date native Java VM that is registered
 with
 .Nm .
 This is necessary if MyApp uses JNI, for instance.
-.It Ev JAVA_VERSION="6 8" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
-Execute MyApp with either a Java VM that is either version 6 or version 8.
+.It Ev JAVA_VERSION="8 11" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
+Execute MyApp with either a Java VM that is either version 8 or version 11.
 .It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java
 Don't invoke the Java VM, but print out information about what would have
 been done.
diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh
index 2dc2995bf2f7..321623b16ec7 100644
--- a/java/javavmwrapper/src/javavmwrapper.sh
+++ b/java/javavmwrapper/src/javavmwrapper.sh
@@ -173,8 +173,7 @@ sortConfiguration () {
             _VM=`dirname "${_VM}"`
             _VM=`dirname "${_VM}"`
             _VM=`basename "${_VM}"`
-            # Consistent version numbering for various install directory names
-            # including 'openjdk6', 'jdk1.6.0', 'linux-sun-jdk1.6.0', etc.
+            # Consistent version numbering for various install directory names.
             VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' \
                                       -e 's|1\.\([0-9][0-9]*\)|\1|' \
                                       -e 's|\([0-9][0-9]*\)\.[0-9]|\1|' \
@@ -506,9 +505,6 @@ setJavaHome() {
         _JAVAVM_VERSION=
         for version in ${JAVA_VERSION}; do
             case "${version}" in
-                *6+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 6 7 8 9 10 11 12"
-                    ;;
                 *7+)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12"
                     ;;
@@ -527,9 +523,6 @@ setJavaHome() {
                 12+)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
                     ;;
-                1.6)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 6"
-                    ;;
                 1.7)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 7"
                     ;;
diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1
index 8ee1022f0b1c..a621bc4c981e 100644
--- a/java/javavmwrapper/src/manvm.1
+++ b/java/javavmwrapper/src/manvm.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 12, 2006
+.Dd November 12, 2019
 .Os
 .Dt MANVM 1
 .Sh NAME
@@ -100,16 +100,12 @@ to a version, the on-line manual pages from any Java VM with a version
 greater than or equal to the given version will be used.
 .Pp
 Currently allowed versions are
-.Ql 1.6 ,
-.Ql 1.6+ ,
 .Ql 1.7 ,
 .Ql 1.7+ ,
 .Ql 1.8 ,
 .Ql 1.8+ ,
 .Ql 1.9 ,
 .Ql 1.9+ ,
-.Ql 6 ,
-.Ql 6+ ,
 .Ql 7 ,
 .Ql 7+ ,
 .Ql 8 ,
diff --git a/java/javavmwrapper/src/registervm.1 b/java/javavmwrapper/src/registervm.1
index 4ab769dc41db..16a73859e3c5 100644
--- a/java/javavmwrapper/src/registervm.1
+++ b/java/javavmwrapper/src/registervm.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 24, 2005
+.Dd November 12, 2019
 .Os
 .Dt REGISTERVM 1
 .Sh NAME
@@ -58,12 +58,12 @@ The location of the Java VM wrapper configuration file.
 .El
 .Sh EXAMPLES
 .Bl -tag -width indent
-.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/jdk1.6.0/bin/java
-Register %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
+.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/openjdk11/bin/java
+Register %%LOCALBASE%%/openjdk11/bin/java as a possible choice of
 Java VM for
 .Nm javavm .
-.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/jdk1.6.0/bin/java
-Remove %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
+.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/openjdk11/bin/java
+Remove %%LOCALBASE%%/openjdk11/bin/java as a possible choice of
 Java VM for
 .Nm javavm .
 .El
diff --git a/java/jaxen/Makefile b/java/jaxen/Makefile
index b6ea26babec5..d858659e3b0c 100644
--- a/java/jaxen/Makefile
+++ b/java/jaxen/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java XPath Engine
 
 USE_JAVA=	YES
-JAVA_VERSION=	1.6+
 NO_BUILD=	YES
 
 JARFILES=	jaxen-core.jar jaxen-dom.jar jaxen-dom4j.jar jaxen-exml.jar jaxen-full.jar jaxen-jdom.jar lib/saxpath.jar
diff --git a/java/jcalendar/Makefile b/java/jcalendar/Makefile
index d39e528e960a..d0a1bf302b12 100644
--- a/java/jcalendar/Makefile
+++ b/java/jcalendar/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Java Date Chooser
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 WRKSRC=		${WRKDIR}/src
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile
index 3fdd1ad19099..ca5269768a58 100644
--- a/java/jcommon/Makefile
+++ b/java/jcommon/Makefile
@@ -16,7 +16,6 @@ BROKEN_armv7=		fails to package: find: *: No such file or directory
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 OPTIONS_DEFINE=	COMPILE DOCS
 OPTIONS_DEFAULT=COMPILE
diff --git a/java/jd-gui/Makefile b/java/jd-gui/Makefile
index 64fb789c3305..fb686d22d030 100644
--- a/java/jd-gui/Makefile
+++ b/java/jd-gui/Makefile
@@ -19,7 +19,6 @@ USES=		desktop-file-utils
 USE_GITHUB=	yes
 GH_ACCOUNT=	java-decompiler
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile
index 0f47c44ab6bd..1f2cfd779116 100644
--- a/java/jdbcpool/Makefile
+++ b/java/jdbcpool/Makefile
@@ -13,7 +13,6 @@ COMMENT=	JDBC connection pool
 BROKEN=		unfetchable
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PORTDOCS=	CHANGES LICENSE README
diff --git a/java/jdom/Makefile b/java/jdom/Makefile
index f49bb1f30aab..9cdf709132c2 100644
--- a/java/jdom/Makefile
+++ b/java/jdom/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Java library for accessing and manipulating XML documents
 RUN_DEPENDS=	${JAVALIBDIR}/jaxen-jdom.jar:java/jaxen
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	package
 
diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile
index f3d6161748d1..62bd0d5e1ff9 100644
--- a/java/jfreechart/Makefile
+++ b/java/jfreechart/Makefile
@@ -14,7 +14,6 @@ LICENSE=	LGPL21
 RUN_DEPENDS=	${JAVALIBDIR}/jcommon.jar:java/jcommon
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 OPTIONS_DEFINE=	COMPILE DOCS
 OPTIONS_DEFAULT=COMPILE
diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile
index cd1606b4b49f..4b1bf2aab984 100644
--- a/java/jgraph/Makefile
+++ b/java/jgraph/Makefile
@@ -22,7 +22,6 @@ COMPILE_DESC=	Compile from source instead of using prebuilt binaries
 USES=		zip
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 
 .include <bsd.port.options.mk>
diff --git a/java/jmf/Makefile b/java/jmf/Makefile
index 917cfbf2a4c5..eedb6d446e94 100644
--- a/java/jmf/Makefile
+++ b/java/jmf/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Java Media Framework
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	YES
 
 WRKSRC=		${WRKDIR}/JMF-${PORTVERSION}
diff --git a/java/jode/Makefile b/java/jode/Makefile
index b3580fd439df..ea0325aeb178 100644
--- a/java/jode/Makefile
+++ b/java/jode/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 VENDOR_VERSION=	1.1.2-pre1
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NEED_JAVAC=	yes
 GNU_CONFIGURE=	yes
 USES=		gmake perl5 shebangfix
diff --git a/java/jomp/Makefile b/java/jomp/Makefile
index 03af8eae3739..ce195bf1e058 100644
--- a/java/jomp/Makefile
+++ b/java/jomp/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Prototype OpenMP implementation for Java
 BROKEN=		unfetchable
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/java/jta/Makefile b/java/jta/Makefile
index fbb315eda7cd..8ef86333d885 100644
--- a/java/jta/Makefile
+++ b/java/jta/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Java Transaction API (JTA)
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 NO_CDROM=	See the license
diff --git a/java/jump/Makefile b/java/jump/Makefile
index bdc592147315..b67d07b4745e 100644
--- a/java/jump/Makefile
+++ b/java/jump/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java library for arbitrary precision computations
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	jar
 
diff --git a/java/mx4j/Makefile b/java/mx4j/Makefile
index 392a6865759d..eb68abf20005 100644
--- a/java/mx4j/Makefile
+++ b/java/mx4j/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source implementation of the Java Management Extensions (JMX)
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 JARFILES=	mx4j-examples.jar mx4j-impl.jar mx4j-jmx.jar \
diff --git a/java/servingxml/Makefile b/java/servingxml/Makefile
index 52c9f3a63767..9e3a4b09966d 100644
--- a/java/servingxml/Makefile
+++ b/java/servingxml/Makefile
@@ -13,7 +13,6 @@ BUILD_DEPENDS=	${ANT_CMD}:devel/apache-ant
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 ANT_CMD?=	${LOCALBASE}/bin/ant
 ANT=	${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD}
 ANT_TARGETS=	dist
diff --git a/java/springframework/Makefile b/java/springframework/Makefile
index 717e4bf68271..255337a9c866 100644
--- a/java/springframework/Makefile
+++ b/java/springframework/Makefile
@@ -17,7 +17,6 @@ CONFLICTS=	springframework-3.1.*
 NO_BUILD=	yes
 USE_JAVA=	yes
 USES=		zip
-JAVA_VERSION=	1.6+
 
 OPTIONS_DEFINE=	DOCS RESRCS
 RESRCS_DESC=	Install resource files
diff --git a/java/springframework31/Makefile b/java/springframework31/Makefile
index e90bfd8cfdd4..4c2a648c08b8 100644
--- a/java/springframework31/Makefile
+++ b/java/springframework31/Makefile
@@ -20,7 +20,6 @@ CONFLICTS=	springframework-3.2.*
 NO_BUILD=	yes
 USE_JAVA=	yes
 USES=		zip
-JAVA_VERSION=	1.6+
 
 OPTIONS_DEFINE=	DOCS RESRCS
 RESRCS_DESC=	Install resource files
diff --git a/java/sqlitejdbc/Makefile b/java/sqlitejdbc/Makefile
index 89a040dbac01..4daf9e54a3e3 100644
--- a/java/sqlitejdbc/Makefile
+++ b/java/sqlitejdbc/Makefile
@@ -16,7 +16,6 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USES=		gmake tar:tgz
 MAKE_ENV=	JAVA_HOME="${JAVA_HOME}"
 ALL_TARGET=	native
diff --git a/java/trove4j/Makefile b/java/trove4j/Makefile
index e49c12b15e05..857c463ae2b1 100644
--- a/java/trove4j/Makefile
+++ b/java/trove4j/Makefile
@@ -13,7 +13,6 @@ COMMENT=	High performance collections API for Java
 BROKEN=		unfetchable
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PORTDOCS=	javadocs AUTHORS.txt CHANGES.txt LICENSE.txt README-idea-devel.txt \
diff --git a/java/wildfly10/Makefile b/java/wildfly10/Makefile
index 8ecc2783dc95..995d96659be5 100644
--- a/java/wildfly10/Makefile
+++ b/java/wildfly10/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wildfly10
 PORTVERSION=	10.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java www
 MASTER_SITES=	http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
 DISTNAME=	wildfly-${WILDFLY_VERSION}
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 
 USE_RC_SUBR=	wildfly10
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
diff --git a/java/wildfly10/files/patch-bin_add-user.sh b/java/wildfly10/files/patch-bin_add-user.sh
deleted file mode 100644
index 72faebc8d863..000000000000
--- a/java/wildfly10/files/patch-bin_add-user.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/add-user.sh.orig	2015-10-23 18:57:02 UTC
-+++ bin/add-user.sh
-@@ -7,6 +7,8 @@
- #
- 
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
- 
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
diff --git a/java/wildfly10/files/wildfly10.in b/java/wildfly10/files/wildfly10.in
index bb4ae95e94f3..e837d1c934b6 100644
--- a/java/wildfly10/files/wildfly10.in
+++ b/java/wildfly10/files/wildfly10.in
@@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%"
 status_cmd="%%APP_SHORTNAME%%_status"
 
 WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
 
 %%APP_SHORTNAME%%_start ()
 {
diff --git a/java/wildfly11/Makefile b/java/wildfly11/Makefile
index 246e0a3bc0e5..97253239ee60 100644
--- a/java/wildfly11/Makefile
+++ b/java/wildfly11/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	wildfly11
 PORTVERSION=	11.0.0
+PORTREVISION=	1
 CATEGORIES=	java www
 MASTER_SITES=	http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
 DISTNAME=	wildfly-${WILDFLY_VERSION}
@@ -14,7 +15,6 @@ LICENSE=	GPLv2
 
 USE_RC_SUBR=	wildfly11
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
diff --git a/java/wildfly11/files/patch-bin_add-user.sh b/java/wildfly11/files/patch-bin_add-user.sh
deleted file mode 100644
index 72faebc8d863..000000000000
--- a/java/wildfly11/files/patch-bin_add-user.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/add-user.sh.orig	2015-10-23 18:57:02 UTC
-+++ bin/add-user.sh
-@@ -7,6 +7,8 @@
- #
- 
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
- 
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
diff --git a/java/wildfly11/files/wildfly11.in b/java/wildfly11/files/wildfly11.in
index bb4ae95e94f3..e837d1c934b6 100644
--- a/java/wildfly11/files/wildfly11.in
+++ b/java/wildfly11/files/wildfly11.in
@@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%"
 status_cmd="%%APP_SHORTNAME%%_status"
 
 WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
 
 %%APP_SHORTNAME%%_start ()
 {
diff --git a/java/wildfly12/Makefile b/java/wildfly12/Makefile
index ec3f6047f9c5..6699ad5e2499 100644
--- a/java/wildfly12/Makefile
+++ b/java/wildfly12/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	wildfly12
 PORTVERSION=	12.0.0
+PORTREVISION=	1
 CATEGORIES=	java www
 MASTER_SITES=	http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
 DISTNAME=	wildfly-${WILDFLY_VERSION}
@@ -14,7 +15,6 @@ LICENSE=	GPLv2
 
 USE_RC_SUBR=	wildfly12
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
diff --git a/java/wildfly12/files/patch-bin_add-user.sh b/java/wildfly12/files/patch-bin_add-user.sh
deleted file mode 100644
index 72faebc8d863..000000000000
--- a/java/wildfly12/files/patch-bin_add-user.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/add-user.sh.orig	2015-10-23 18:57:02 UTC
-+++ bin/add-user.sh
-@@ -7,6 +7,8 @@
- #
- 
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
- 
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
diff --git a/java/wildfly12/files/wildfly12.in b/java/wildfly12/files/wildfly12.in
index bb4ae95e94f3..e837d1c934b6 100644
--- a/java/wildfly12/files/wildfly12.in
+++ b/java/wildfly12/files/wildfly12.in
@@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%"
 status_cmd="%%APP_SHORTNAME%%_status"
 
 WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
 
 %%APP_SHORTNAME%%_start ()
 {
diff --git a/java/wildfly13/Makefile b/java/wildfly13/Makefile
index c68d8215587e..2a4e60e4bb94 100644
--- a/java/wildfly13/Makefile
+++ b/java/wildfly13/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	wildfly13
 PORTVERSION=	13.0.0
+PORTREVISION=	1
 CATEGORIES=	java www
 MASTER_SITES=	http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
 DISTNAME=	wildfly-${WILDFLY_VERSION}
@@ -13,7 +14,6 @@ LICENSE=	GPLv2
 
 USE_RC_SUBR=	wildfly13
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
diff --git a/java/wildfly13/files/patch-bin_add-user.sh b/java/wildfly13/files/patch-bin_add-user.sh
deleted file mode 100644
index 72faebc8d863..000000000000
--- a/java/wildfly13/files/patch-bin_add-user.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/add-user.sh.orig	2015-10-23 18:57:02 UTC
-+++ bin/add-user.sh
-@@ -7,6 +7,8 @@
- #
- 
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
- 
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
diff --git a/java/wildfly13/files/wildfly13.in b/java/wildfly13/files/wildfly13.in
index 250bdd0eb1a9..60e30678e6d5 100644
--- a/java/wildfly13/files/wildfly13.in
+++ b/java/wildfly13/files/wildfly13.in
@@ -40,9 +40,6 @@ pidfile="%%PID_FILE%%"
 status_cmd="%%APP_SHORTNAME%%_status"
 
 WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
 
 %%APP_SHORTNAME%%_start ()
 {
diff --git a/java/wildfly90/Makefile b/java/wildfly90/Makefile
index 421a029ea359..32ae5f102132 100644
--- a/java/wildfly90/Makefile
+++ b/java/wildfly90/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wildfly90
 PORTVERSION=	9.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java www
 MASTER_SITES=	http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
 DISTNAME=	wildfly-${WILDFLY_VERSION}
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 
 USE_RC_SUBR=	wildfly90
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USER=		www
 GROUP=		www
 VAR_DIR?=	/var
diff --git a/java/wildfly90/files/patch-bin-add-user.sh b/java/wildfly90/files/patch-bin-add-user.sh
deleted file mode 100644
index e1a33428d0e5..000000000000
--- a/java/wildfly90/files/patch-bin-add-user.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/add-user.sh	2014-02-12 05:43:24.000000000 +0100
-+++ /usr/local/wildfly-9.0.0/bin/add-user.sh	2014-05-11 10:53:59.000000000 +0200
-@@ -7,6 +7,8 @@
- #
- 
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
- 
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
diff --git a/java/wildfly90/files/wildfly90.in b/java/wildfly90/files/wildfly90.in
index bb4ae95e94f3..e837d1c934b6 100644
--- a/java/wildfly90/files/wildfly90.in
+++ b/java/wildfly90/files/wildfly90.in
@@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%"
 status_cmd="%%APP_SHORTNAME%%_status"
 
 WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
 
 %%APP_SHORTNAME%%_start ()
 {
diff --git a/java/xdoclet/Makefile b/java/xdoclet/Makefile
index 93b39075abe3..324d9eaab06d 100644
--- a/java/xdoclet/Makefile
+++ b/java/xdoclet/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	${LOCALBASE}/bin/ant:devel/apache-ant
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile
index 5b5e7ea76647..e22c6ab223c8 100644
--- a/lang/abcl/Makefile
+++ b/lang/abcl/Makefile
@@ -21,7 +21,6 @@ SUB_LIST+=	JAVAJARDIR="${JAVAJARDIR}"
 SUB_FILES=	abcl
 
 USE_JAVA=	yes
-JAVA_VERSION=	7+
 USE_ANT=	yes
 
 do-install:
diff --git a/lang/apache-commons-jelly/Makefile b/lang/apache-commons-jelly/Makefile
index f69eba1efeb2..04923d06d005 100644
--- a/lang/apache-commons-jelly/Makefile
+++ b/lang/apache-commons-jelly/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	commons-jelly
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	lang devel java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	apache-
@@ -13,7 +14,6 @@ COMMENT=	XML based scripting engine
 LICENSE=	APACHE20
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/lang/apache-commons-jelly/files/jelly.sh.in b/lang/apache-commons-jelly/files/jelly.sh.in
index bcc7cc0427a1..54d220fcc3bd 100644
--- a/lang/apache-commons-jelly/files/jelly.sh.in
+++ b/lang/apache-commons-jelly/files/jelly.sh.in
@@ -6,7 +6,7 @@ JELLY_HOME="${JELLY_HOME:-"%%DATADIR%%"}"
 CLASSPATH="${CLASSPATH}:${JELLY_HOME}/lib/forehead-1.0-beta-5.jar"
 FOREHEAD_CONF="${FOREHEAD_CONF:-"${JELLY_HOME}/bin/forehead.conf"}"
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" \
+"%%LOCALBASE%%/bin/java" \
 	-classpath "${CLASSPATH}" \
 	-Dforehead.conf.file="${FOREHEAD_CONF}" \
 	-Djelly.home="${JELLY_HOME}" \
diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile
index 3ad2fda1811d..b97faaa72725 100644
--- a/lang/bsh/Makefile
+++ b/lang/bsh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bsh
 DISTVERSION=	2.0b6
+PORTREVISION=	1
 CATEGORIES=	lang java
 
 MAINTAINER=	pfg@FreeBSD.org
@@ -15,7 +16,6 @@ GH_ACCOUNT=	beanshell
 GH_PROJECT=	beanshell
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 USE_ANT=	yes
 ALL_TARGET=	jarall
diff --git a/lang/bsh/files/bsh.sh.in b/lang/bsh/files/bsh.sh.in
index a49b83c2fd5b..f6bb6efb71ed 100644
--- a/lang/bsh/files/bsh.sh.in
+++ b/lang/bsh/files/bsh.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%JARNAME%%" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%JARNAME%%" "$@"
diff --git a/lang/ceylon/Makefile b/lang/ceylon/Makefile
index a662dcbb1249..e543c9e20a5a 100644
--- a/lang/ceylon/Makefile
+++ b/lang/ceylon/Makefile
@@ -16,7 +16,6 @@ USES=		zip
 NO_BUILD=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 JAVA_RUN=	yes
 
 PORTDATA=	*
diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile
index 44831b1b651f..272bd6affcbc 100644
--- a/lang/groovy/Makefile
+++ b/lang/groovy/Makefile
@@ -15,8 +15,6 @@ LICENSE=	APACHE20
 USES=		zip
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.7+
-
 NO_ARCH=	yes
 NO_BUILD=	yes
 
diff --git a/lang/jython/Makefile b/lang/jython/Makefile
index 44beb2fd884f..bcb8f8ffdceb 100644
--- a/lang/jython/Makefile
+++ b/lang/jython/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS=	bash:shells/bash
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions \
 			LICENSE.txt LICENSE_Apache.txt
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 NO_ARCH=	yes
 REINPLACE_ARGS=	-i ""
diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile
index 7af5b6422a44..4e27704acbe2 100644
--- a/lang/linux-j/Makefile
+++ b/lang/linux-j/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	j
 PORTVERSION=	504b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang linux java
 MASTER_SITES=	http://www.jsoftware.com/download/
 PKGNAMEPREFIX=	linux-
@@ -20,7 +20,6 @@ LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror
 
 USES=		linux
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/lang/linux-j/files/jw.sh.in b/lang/linux-j/files/jw.sh.in
index b799b75abaf7..262acf40ea25 100644
--- a/lang/linux-j/files/jw.sh.in
+++ b/lang/linux-j/files/jw.sh.in
@@ -6,4 +6,4 @@ if [ ! -d ${HOME}/J ]
 then
 	cp -r ${JPATHj%%PORTVERSION%%}/user ${HOME}/J
 fi
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%PREFIX%%/lib/j/j.jar "$@"
+exec %%LOCALBASE%%/bin/java -jar %%PREFIX%%/lib/j/j.jar "$@"
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile
index a7b211511ef8..b1a051d269e2 100644
--- a/lang/rhino/Makefile
+++ b/lang/rhino/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rhino
 DISTVERSION=	1_7R4
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	GHC \
 		LOCAL/nivit/${PORTNAME}/:swingex \
@@ -22,8 +23,6 @@ ALL_TARGET=	jar
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-JAVA_VERSION=	1.6+
-
 LINEDIT_DESC=	Enable line editing in the Rhino shell
 LINEDIT_RUN_DEPENDS=	${JLINEJAR}:devel/jline
 LINEDIT_USE=	java=yes ant=yes
diff --git a/lang/rhino/files/rhinoc.in b/lang/rhino/files/rhinoc.in
index ebbde1a376a1..15968d5db791 100644
--- a/lang/rhino/files/rhinoc.in
+++ b/lang/rhino/files/rhinoc.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 #
 # Rhino compiler
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.jsc.Main $@
+"%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.jsc.Main $@
diff --git a/lang/rhino/files/rhinodbg.in b/lang/rhino/files/rhinodbg.in
index faa68d569f19..da40bb72256a 100644
--- a/lang/rhino/files/rhinodbg.in
+++ b/lang/rhino/files/rhinodbg.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 #
 # Rhino debugger
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.debugger.Main $@
+"%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.debugger.Main $@
diff --git a/lang/rhino/files/rhinosh.in b/lang/rhino/files/rhinosh.in
index 8fb62b47d453..01b25c3b31b9 100644
--- a/lang/rhino/files/rhinosh.in
+++ b/lang/rhino/files/rhinosh.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 #
 # Rhino shell
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%:%%JLINEJAR%%" org.mozilla.javascript.tools.shell.Main $@
+"%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%:%%JLINEJAR%%" org.mozilla.javascript.tools.shell.Main $@
diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile
index a86aaafb46c2..832499e078a6 100644
--- a/lang/sisc/Makefile
+++ b/lang/sisc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sisc
 PORTVERSION=	1.16.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang scheme java
 MASTER_SITES=	SF/${PORTNAME}/SISC/${PORTVERSION}
 
@@ -14,7 +14,6 @@ LICENSE=	MPL11 GPLv2+
 LICENSE_COMB=	dual
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
@@ -24,7 +23,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(SISC_HOME=\).*$$|\1${DATADIR}|' \
-		-e 's|\(JAVA=\)java|\1"${LOCALBASE}/bin/java" ; export JAVA_VERSION="${JAVA_VERSION}"|' \
+		-e 's|\(JAVA=\)java|\1"${LOCALBASE}/bin/java"|' \
 		${WRKSRC}/sisc
 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' \
 		${WRKSRC}/scheme-src/srfi-22/srfi-22.sh
diff --git a/lang/starlogo/Makefile b/lang/starlogo/Makefile
index 47bfeddc28fa..571eef38f8f7 100644
--- a/lang/starlogo/Makefile
+++ b/lang/starlogo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	starlogo
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang java
 MASTER_SITES=	http://education.mit.edu/starlogo/download/
 DISTNAME=	${PORTNAME}-2.0
@@ -15,7 +15,6 @@ BROKEN=		unfetchable
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/lang/starlogo/files/starlogo.sh.in b/lang/starlogo/files/starlogo.sh.in
index 70248e4c8d3b..2d1556c3f2bf 100644
--- a/lang/starlogo/files/starlogo.sh.in
+++ b/lang/starlogo/files/starlogo.sh.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 
 cd %%DATADIR%%/sample-projects && \
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@"
+"%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@"
diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index cd1e04f7f32f..c313135f8f36 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -18,7 +18,6 @@ DOS2UNIX_FILES=	build.xml
 NO_ARCH=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 ALL_TARGET=	release
 # 5.3.1
 REVISION=	3079
diff --git a/mail/james/Makefile b/mail/james/Makefile
index c90becf5c5f5..b4a59b8b0147 100644
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	james
 PORTVERSION=	2.3.2.1
+PORTREVISION=	1
 CATEGORIES=	mail java
 MASTER_SITES=	APACHE/${PORTNAME}/server/
 DISTNAME=	${PORTNAME}-binary-${PORTVERSION}
@@ -16,7 +17,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_ARCH=	yes
 NO_BUILD=	yes
 
diff --git a/mail/james/files/james.in b/mail/james/files/james.in
index 75b52265471a..da1575314875 100644
--- a/mail/james/files/james.in
+++ b/mail/james/files/james.in
@@ -44,7 +44,6 @@
 #
 
 james_enable="${james_enable:-"NO"}"
-james_java_version="${james_java_version:-"%%JAVA_VERSION%%"}"
 james_home="${james_home:-"%%JAMES_HOME%%"}"
 james_base="${james_base:-"%%JAMES_HOME%%"}"
 james_tmpdir="${james_tmpdir:-"/tmp"}"
diff --git a/mail/mime4j/Makefile b/mail/mime4j/Makefile
index b2dde935dcd6..37a58ae15630 100644
--- a/mail/mime4j/Makefile
+++ b/mail/mime4j/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 OPTIONS_DEFINE=	DOCS
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
 
diff --git a/mail/openemm2013/Makefile b/mail/openemm2013/Makefile
index 7fcf579d2efe..c7f76e521484 100644
--- a/mail/openemm2013/Makefile
+++ b/mail/openemm2013/Makefile
@@ -30,7 +30,6 @@ LIB_DEPENDS=	libslang.so:devel/libslang2 \
 USES=	dos2unix gmake python:2.7,run
 USE_RC_SUBR=	openemm2013
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 DOS2UNIX_GLOB=	*.c *.cpp *.h *.java *.xml *.properties
 CC=	clang
diff --git a/mail/openemm2013/files/openemm2013.in b/mail/openemm2013/files/openemm2013.in
index 5989216d6fe6..3eaf84776533 100644
--- a/mail/openemm2013/files/openemm2013.in
+++ b/mail/openemm2013/files/openemm2013.in
@@ -44,9 +44,6 @@ tomcat_pidfile="tomcat8.pid" # todo replace dynamic with current version
 sendmail_pidfile="sendmail.pid"
 
 OPENEMM_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
 
 %%APP_SHORTNAME%%_start ()
 {
diff --git a/mail/openemm2015/Makefile b/mail/openemm2015/Makefile
index 3b51c7267507..575d27f639cb 100644
--- a/mail/openemm2015/Makefile
+++ b/mail/openemm2015/Makefile
@@ -28,7 +28,6 @@ RUN_DEPENDS=	${TOMCATHOME}/bin/bootstrap.jar:www/tomcat85 \
 USES=	dos2unix gmake python:2.7,run
 USE_RC_SUBR=	openemm2015
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 DOS2UNIX_GLOB=	*.c *.cpp *.h *.java *.xml *.properties
 CC=	clang
diff --git a/math/cvc4/Makefile b/math/cvc4/Makefile
index 7d640fcb1b34..4538ff8e8cc7 100644
--- a/math/cvc4/Makefile
+++ b/math/cvc4/Makefile
@@ -84,7 +84,7 @@ CMAKE_ARGS+=		-DENABLE_GPL:BOOL=ON
 post-extract:
 	@${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr3.jar
 	@${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/antlr3
-	@${ECHO_CMD} "JAVA_VERSION=1.7+ exec \"${LOCALBASE}/bin/java\" -classpath \"${WRKDIR}/antlr3.jar\" org.antlr.Tool \"\$$@\"" >> ${WRKDIR}/antlr3
+	@${ECHO_CMD} "exec \"${LOCALBASE}/bin/java\" -classpath \"${WRKDIR}/antlr3.jar\" org.antlr.Tool \"\$$@\"" >> ${WRKDIR}/antlr3
 	@${CHMOD} +x ${WRKDIR}/antlr3
 
 post-patch:
diff --git a/math/geonext/Makefile b/math/geonext/Makefile
index fcc13b42cab5..ea9a8bedc0a7 100644
--- a/math/geonext/Makefile
+++ b/math/geonext/Makefile
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/geonext_install
 NO_BUILD=	yes
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 DATA=	cacerts didmat.crt geonext-batik.jar geonext.html geonext.jar \
 	help.jar help_de.jar help_fr.jar help_gr.jar help_it.jar \
diff --git a/math/jakarta-commons-math3/Makefile b/math/jakarta-commons-math3/Makefile
index c99a1963ef9d..5e885ab3e9ad 100644
--- a/math/jakarta-commons-math3/Makefile
+++ b/math/jakarta-commons-math3/Makefile
@@ -24,7 +24,6 @@ BROKEN_armv7=		fails to compile: PowellOptimizer.java:301: error: Illegal static
 
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_LOCALE=	en_US.ISO8859-1
 
 ALL_TARGET=	jar
diff --git a/math/jeuclid/Makefile b/math/jeuclid/Makefile
index 4b79bdfa741b..bafdf4f359fc 100644
--- a/math/jeuclid/Makefile
+++ b/math/jeuclid/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Java based MathML rendering solution
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 NO_BUILD=	yes
 
diff --git a/math/jlatexmath/Makefile b/math/jlatexmath/Makefile
index 9d485bbeb5fc..3e4b7f6e3824 100644
--- a/math/jlatexmath/Makefile
+++ b/math/jlatexmath/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
 
-USE_JAVA=	1.7+
+USE_JAVA=	yes
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/math/matlab-installer/Makefile b/math/matlab-installer/Makefile
index f274fc0677d3..4887793b6a05 100644
--- a/math/matlab-installer/Makefile
+++ b/math/matlab-installer/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	mount_cd9660_image:sysutils/diskimage-tools \
 USES=		linux tar:xz
 USE_LINUX=	dri devtools
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	linux
 JAVA_RUN=	yes
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index f677fc7480e0..96f303263c91 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -47,7 +47,6 @@ USES=		charsetfix fortran gmake libtool perl5 pkgconfig readline \
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-JAVA_VERSION=	1.7+
 USE_QT=		core gui help network opengl \
 		qmake_build buildtools_build linguist_build \
 		printsupport sql widgets \
diff --git a/math/plman/Makefile b/math/plman/Makefile
index b9e2735c10f2..2b2664474576 100644
--- a/math/plman/Makefile
+++ b/math/plman/Makefile
@@ -17,7 +17,6 @@ NO_BUILD=	yes
 USES=		zip
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.6+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 REPLACE_FILES=	${WRKSRC}/bin/${PORTNAME}
 WRKSRC=	${WRKDIR}/${PORTNAME}
diff --git a/math/truthtable/Makefile b/math/truthtable/Makefile
index 64556b6d2b61..eaf54f6d7855 100644
--- a/math/truthtable/Makefile
+++ b/math/truthtable/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	truthtable
 PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math java
 MASTER_SITES=	http://www.kinostudios.com/java/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
@@ -17,7 +17,6 @@ COMMENT=	Truth Tables generator (written in Java)
 BROKEN=		unfetchable
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/math/truthtable/files/truthtable.in b/math/truthtable/files/truthtable.in
index f5c3097ec616..f156dbfcc61b 100644
--- a/math/truthtable/files/truthtable.in
+++ b/math/truthtable/files/truthtable.in
@@ -1,4 +1,3 @@
 #!/bin/sh
 # $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" \
-	exec "%%LOCALBASE%%/bin/java" -jar "%%TRUTHTABLEJAR%%" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%TRUTHTABLEJAR%%" "$@"
diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index 45a5ab24932d..1d101534f6df 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/doc/COPYING
 RUN_DEPENDS=	tv_cat:textproc/p5-xmltv
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 NO_ARCH=	yes
 
diff --git a/misc/jbidwatcher/Makefile b/misc/jbidwatcher/Makefile
index 1d75744c1f6e..feb6a6a76c2b 100644
--- a/misc/jbidwatcher/Makefile
+++ b/misc/jbidwatcher/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jbidwatcher
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	misc java
 MASTER_SITES=	http://www.jbidwatcher.com/download/
 
@@ -13,7 +14,6 @@ USES=	tar:bzip2
 USE_JAVA=	yes
 USE_ANT=	yes
 ALL_TARGET=	jar
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	jbidwatcher
 SUB_LIST+=	PORTVERSION=${PORTVERSION}
diff --git a/misc/jbidwatcher/files/jbidwatcher.in b/misc/jbidwatcher/files/jbidwatcher.in
index 62e03be5efc6..ef4d47abd89f 100644
--- a/misc/jbidwatcher/files/jbidwatcher.in
+++ b/misc/jbidwatcher/files/jbidwatcher.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@"
diff --git a/misc/pauker/Makefile b/misc/pauker/Makefile
index 02ebd6a23a77..bcb4328b9553 100644
--- a/misc/pauker/Makefile
+++ b/misc/pauker/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	alex@stangl.us
 COMMENT=	Java-based flashcard learning using the Leitner system
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 do-install:
diff --git a/misc/pipe/Makefile b/misc/pipe/Makefile
index 3b1b281e63f1..317a4e8d5098 100644
--- a/misc/pipe/Makefile
+++ b/misc/pipe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pipe
 PORTVERSION=	2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc java
 MASTER_SITES=	SF/${PORTNAME}2/Pipe%202/PIPE2%20V${PORTVERSION}
 DISTNAME=	pipe25_rc5
@@ -15,7 +15,6 @@ USES=		zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	pipe.sh
 
diff --git a/misc/pipe/files/pipe.sh.in b/misc/pipe/files/pipe.sh.in
index abd5404c0569..e21fd111e13f 100644
--- a/misc/pipe/files/pipe.sh.in
+++ b/misc/pipe/files/pipe.sh.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%" RunGui
+"%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%" RunGui
diff --git a/multimedia/gdialog/Makefile b/multimedia/gdialog/Makefile
index 38df0454eb38..c0202fee87e8 100644
--- a/multimedia/gdialog/Makefile
+++ b/multimedia/gdialog/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gdialog
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	multimedia java
 MASTER_SITES=	SF/${PORTNAME}-x/${PORTNAME}-090400/${PORTVERSION}
 DISTNAME=	GDialog-090400-25
@@ -17,7 +18,6 @@ RUN_DEPENDS=	projectx>=0.90.4.00:multimedia/projectx
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/multimedia/gdialog/files/gdialog.in b/multimedia/gdialog/files/gdialog.in
index 5b6c42d16625..bb3bb1c628c0 100644
--- a/multimedia/gdialog/files/gdialog.in
+++ b/multimedia/gdialog/files/gdialog.in
@@ -13,4 +13,4 @@ case "$#" in
 	;;
 esac
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/GDialog.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/GDialog.jar" "$@"
diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile
index 6b55deda287d..8f87683243e6 100644
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -43,7 +43,7 @@ JAVA_CATEGORIES=		java
 JAVA_CONFIGURE_ENABLE=		bdjava-jar
 JAVA_CONFIGURE_ENV=		JDK_HOME="${JAVA_HOME}"
 JAVA_USE=			JAVA=yes
-JAVA_VARS=			JAVA_VERSION=1.6+ JAVA_BUILD=yes JAVA_RUN=yes
+JAVA_VARS=			JAVA_BUILD=yes JAVA_RUN=yes
 
 post-patch:
 	@${RLN} ${WRKSRC}/jni/linux ${WRKSRC}/jni/freebsd
diff --git a/multimedia/projectx/Makefile b/multimedia/projectx/Makefile
index 37ecb5772082..d4f835f52db6 100644
--- a/multimedia/projectx/Makefile
+++ b/multimedia/projectx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	projectx
 PORTVERSION=	0.91.0
+PORTREVISION=	1
 CATEGORIES=	multimedia java
 MASTER_SITES=	SF/project-x/project-x/ProjectX_${PORTVERSION}.00
 DISTNAME=	ProjectX_${PORTVERSION}
@@ -15,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/Copying
 
 USES=		zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	project-x.sh
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/multimedia/projectx/files/project-x.sh.in b/multimedia/projectx/files/project-x.sh.in
index 10384cff72cc..ecd37fb7b4ac 100644
--- a/multimedia/projectx/files/project-x.sh.in
+++ b/multimedia/projectx/files/project-x.sh.in
@@ -13,4 +13,4 @@ case "$#" in
 	;;
 esac
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/ProjectX.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/ProjectX.jar" "$@"
diff --git a/net-im/convey/Makefile b/net-im/convey/Makefile
index dab1185aec6b..e388576f096b 100644
--- a/net-im/convey/Makefile
+++ b/net-im/convey/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	convey
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im java
 MASTER_SITES=	http://convey.sourceforge.net/downloads/ \
 		http://nivi.interfree.it/tmp/convey.sourceforge.net/
@@ -15,8 +15,6 @@ COMMENT=	Instant Message (IM) program using the Jabber protocol
 USE_ANT=	yes
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.6+
-
 MAKE_ARGS=	-quiet
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/net-im/convey/files/convey.sh.in b/net-im/convey/files/convey.sh.in
index 7080202e7469..a9e78cc3ca41 100644
--- a/net-im/convey/files/convey.sh.in
+++ b/net-im/convey/files/convey.sh.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 
 cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "classes:lib/muse-0.72.jar:lib/crimson-1.1.3.jar:lib/jaxp-1.1.jar:lib/jakarta-oro-2.0.4.jar:lib/jdom-b7.jar:lib/convey-0.3.jar" org.convey.ConveyFrame
+"%%LOCALBASE%%/bin/java" -cp "classes:lib/muse-0.72.jar:lib/crimson-1.1.3.jar:lib/jaxp-1.1.jar:lib/jakarta-oro-2.0.4.jar:lib/jdom-b7.jar:lib/convey-0.3.jar" org.convey.ConveyFrame
diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile
index 62b6920f1bfe..d7aa093623ac 100644
--- a/net-p2p/frost/Makefile
+++ b/net-p2p/frost/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	frost
 PORTVERSION=	1.2.0.20090314
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	net-p2p java
 MASTER_SITES=	SF/jtc${PORTNAME}/${PORTNAME}/14-Mar-2009
@@ -14,7 +14,6 @@ COMMENT=	Freenet client that provides messenger and file services
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -60,7 +59,6 @@ DESKTOP_ENTRIES=	"Frost" "Freenet Client" \
 
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
-		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%JAVAVM%%|${JAVAVM}|; \
 		s|%%JAR_DIR%%|${JAR_DIR}|; \
 		s|%%JAR_FILE%%|${JAR_FILE}|; \
diff --git a/net-p2p/frost/files/wrapper.sh b/net-p2p/frost/files/wrapper.sh
index 78dc182f71fa..52ca5f86fb71 100644
--- a/net-p2p/frost/files/wrapper.sh
+++ b/net-p2p/frost/files/wrapper.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-export JAVA_VERSION
-
 PREFIX="%%PREFIX%%"
-JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM="%%JAVAVM%%"
 JAR_DIR="%%JAR_DIR%%"
 JAR_FILE="%%JAR_FILE%%"
diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile
index e03bc780b260..f4792c06108e 100644
--- a/net-p2p/phex/Makefile
+++ b/net-p2p/phex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	phex
 PORTVERSION=	3.4.2.116
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 MASTER_SITES=	SF/${PORTNAME}/Phex%20Final%20Releases/Phex%20${PORTVERSION:R}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -14,11 +15,9 @@ LICENSE=	GPLv2
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 SUB_FILES=	${PORTNAME}.sh
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 PORTDOCS=	Phex_other.htm \
diff --git a/net-p2p/phex/files/phex.sh.in b/net-p2p/phex/files/phex.sh.in
index 70171e64c04d..28164277d05f 100644
--- a/net-p2p/phex/files/phex.sh.in
+++ b/net-p2p/phex/files/phex.sh.in
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar phex.jar "${@}"
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index c2e6b1ec1673..3ef1d94e9313 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vuze
 PORTVERSION=	5.7.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p java
 MASTER_SITES=	SF/azureus/vuze/Vuze_${PORTVERSION:S/.//g}
 DISTNAME=	Vuze_${PORTVERSION:S/.//g}_source
diff --git a/net-p2p/vuze/files/vuze.in b/net-p2p/vuze/files/vuze.in
index e2c7d24875dd..f055e8b5bd0c 100644
--- a/net-p2p/vuze/files/vuze.in
+++ b/net-p2p/vuze/files/vuze.in
@@ -3,7 +3,6 @@
 # $FreeBSD: /tmp/pcvs/ports/net-p2p/vuze/files/vuze.in,v 1.2 2009-12-01 21:05:21 rnoland Exp $
 
 # java
-export JAVA_VERSION="%%JAVA_VERSION%%"
 export JAVA_OS="%%JAVA_OS%%"
 
 ECLIPSE_BASE=%%LOCALBASE%%/eclipse
diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index 9d1d1f023a06..944d8c8ad771 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/net/apache-commons-net/Makefile b/net/apache-commons-net/Makefile
index 587cf57c0dac..e2d69ca132f8 100644
--- a/net/apache-commons-net/Makefile
+++ b/net/apache-commons-net/Makefile
@@ -15,7 +15,6 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index 4dda0546c34d..755a4dc5a0d4 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -27,7 +27,6 @@ USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DENABLE_STATIC=NO -DENABLE_STRICT=NO -DENABLE_TESTS=NO \
 		-DANTLR3_JAR_PATH:FILEPATH=${WRKDIR}/antlr3.jar
 JAVA_BUILD=	jre
-JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}/${DISTNAME}-0
 
 post-extract:
diff --git a/net/dimes/Makefile b/net/dimes/Makefile
index b2f5913f7063..5f37a3257fca 100644
--- a/net/dimes/Makefile
+++ b/net/dimes/Makefile
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/DIMES
 BUILD_WRKSRC=	${WRKSRC}/scripts_linux
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 #java-linux required
 JAVA_OS=	linux
 DATADIR=	${JAVASHAREDIR}/dimes
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index 7659760caadf..260371c617ee 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -15,7 +15,6 @@ COMMENT=	Implementation of BEEP core and BEEP mapping for TCP in Java
 RUN_DEPENDS=	${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/net/jcifs/Makefile b/net/jcifs/Makefile
index 04181345d4d3..9471597cf945 100644
--- a/net/jcifs/Makefile
+++ b/net/jcifs/Makefile
@@ -16,7 +16,6 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		tar:tgz
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/net/jgroups/Makefile b/net/jgroups/Makefile
index 276c01e2b13c..efd4bb31e6a4 100644
--- a/net/jgroups/Makefile
+++ b/net/jgroups/Makefile
@@ -14,7 +14,6 @@ LICENSE=	LGPL21
 OPTIONS_DEFINE=	DOCS
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	jar
 NO_ARCH=	yes
diff --git a/net/jicmp/Makefile b/net/jicmp/Makefile
index dc204f5e4e33..42707ed3de0b 100644
--- a/net/jicmp/Makefile
+++ b/net/jicmp/Makefile
@@ -13,7 +13,6 @@ WRKSRC=		${WRKDIR}/jicmp-${PORTVERSION}
 
 USES=		libtool
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
diff --git a/net/jicmp6/Makefile b/net/jicmp6/Makefile
index ad14383b418c..4042740a68ff 100644
--- a/net/jicmp6/Makefile
+++ b/net/jicmp6/Makefile
@@ -10,7 +10,6 @@ COMMENT=	Java native interface (JNI) to ICMPv6
 
 USES=		libtool
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
diff --git a/net/jrdesktop/Makefile b/net/jrdesktop/Makefile
index c43137fb57cd..66f63a4537fb 100644
--- a/net/jrdesktop/Makefile
+++ b/net/jrdesktop/Makefile
@@ -14,7 +14,6 @@ COMMENT=	View and/or control a remote PC
 LICENSE=	GPLv3
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 SUB_FILES=	jrdesktop
diff --git a/net/jsch/Makefile b/net/jsch/Makefile
index d0bb44830a05..6904a89849ad 100644
--- a/net/jsch/Makefile
+++ b/net/jsch/Makefile
@@ -13,7 +13,6 @@ LICENSE=	BSD3CLAUSE
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}.jar
diff --git a/net/ldapbrowser/Makefile b/net/ldapbrowser/Makefile
index 120a7bea13ea..ee7a5cfc9dc2 100644
--- a/net/ldapbrowser/Makefile
+++ b/net/ldapbrowser/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Java/Swing-based LDAP browser and editor
 RESTRICTED=	No reply from author regarding redistribution licensing
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 REINPLACE_ARGS=	-i ''
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index ee5cbfe65502..510c0d2b998f 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -96,7 +96,6 @@ IGNORE=		WITH_JAVA requires WITH_X11
 .endif
 CONFIGURE_ARGS+=	--with-java="${JAVA_HOME}"
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 PLIST_SUB+=	JAVA=""
 PLX11=		""
 BIN2STRIP+=	rlog_check_timeorder rlog_print
diff --git a/net/seda/Makefile b/net/seda/Makefile
index dd493a8a77a5..1f5cd1ae4fe0 100644
--- a/net/seda/Makefile
+++ b/net/seda/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Architecture for Highly Concurrent Server Applications
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	dist
 NO_ARCH=	yes
diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile
index a3bfb6965f6b..22d7f8e6d1ab 100644
--- a/net/spread-j/Makefile
+++ b/net/spread-j/Makefile
@@ -18,7 +18,6 @@ BROKEN_armv6=		fails to package: java/docs/*.html: No such file or directory
 BROKEN_armv7=		fails to package: java/docs/*.html: No such file or directory
 
 USE_JAVA=	YES
-JAVA_VERSION=	1.6+
 PKGMESSAGE=	${WRKSRC}/../license.txt
 
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/net/toonel/Makefile b/net/toonel/Makefile
index 18620cca7ba7..adeff63f0240 100644
--- a/net/toonel/Makefile
+++ b/net/toonel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	toonel
 PORTVERSION=	0.0.50.50
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	http://www.toonel.net/generic/005050/
 DISTNAME=	${PORTNAME}
@@ -16,7 +17,6 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	JARNAME=${DISTNAME}${EXTRACT_SUFX}
diff --git a/net/toonel/files/toonel.sh.in b/net/toonel/files/toonel.sh.in
index b3705ab2d572..f71935de80ee 100644
--- a/net/toonel/files/toonel.sh.in
+++ b/net/toonel/files/toonel.sh.in
@@ -2,6 +2,5 @@
 
 JAVA="%%LOCALBASE%%/bin/java"
 JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
 
 exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@"
diff --git a/portuguese/irpf-pt_BR/Makefile b/portuguese/irpf-pt_BR/Makefile
index c1510399535a..6fffa4d45413 100644
--- a/portuguese/irpf-pt_BR/Makefile
+++ b/portuguese/irpf-pt_BR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	irpf
 PORTVERSION=	2014.1.4
+PORTREVISION=	1
 CATEGORIES=	portuguese finance java
 MASTER_SITES=	http://www28.receita.fazenda.gov.br/publico/programas/IRPF/2014/PGDIRPF2014/Java/zip/
 PKGNAMEPREFIX?=	pt_BR-
@@ -24,7 +25,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME:tu}2014
 
 USE_JAVA=	yes
 JAVA_RUN=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 
 NO_BUILD=	yes
@@ -94,7 +94,6 @@ post-patch:
 	@${SED} -e  "s|%%JAR_DIR%%|${JAR_DIR}|; \
 		s|%%JAR_FILE%%|${JAR_FILE}|; \
 		s|%%JAR_FILES%%|${JAR_FILES:C/^lib\///}|; \
-		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
 		s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 
diff --git a/portuguese/irpf-pt_BR/files/wrapper.sh b/portuguese/irpf-pt_BR/files/wrapper.sh
index a08a36807fe5..7bfafbe59007 100644
--- a/portuguese/irpf-pt_BR/files/wrapper.sh
+++ b/portuguese/irpf-pt_BR/files/wrapper.sh
@@ -3,11 +3,8 @@
 # Under a BSDL license. Copyright by Mario S F Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
-export JAVA_VERSION
-
 PREFIX="%%PREFIX%%"
 # java
-JAVA_VERSION="%%JAVA_VERSION%%"
 JAVAVM="%%JAVAVM%%"
 JAR_DIR="%%JAR_DIR%%"
 JAR_FILES="%%JAR_FILES%%"
diff --git a/print/pdf-renderer/Makefile b/print/pdf-renderer/Makefile
index e370c61497d7..cd8e06ec6f4b 100644
--- a/print/pdf-renderer/Makefile
+++ b/print/pdf-renderer/Makefile
@@ -19,7 +19,6 @@ BROKEN_armv7=		fails to install: swinglabs-build-impl.xml: Javadoc returned 1
 USES=		dos2unix zip
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 ALL_TARGET=	jar
diff --git a/science/colt/Makefile b/science/colt/Makefile
index d5bec5a20d3e..034ac4d79c5d 100644
--- a/science/colt/Makefile
+++ b/science/colt/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java package for scalable scientific and technical computing
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS COMPILE
diff --git a/science/devisor/Makefile b/science/devisor/Makefile
index 7a85017368d5..5b791013298c 100644
--- a/science/devisor/Makefile
+++ b/science/devisor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	devisor
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science java
 MASTER_SITES=	http://www.featflow.de/download/
 DISTNAME=	devisor${PORTVERSION}
@@ -12,7 +12,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Design and Visualization Software Resource for FeatFlow
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes	# Sources are available though
 
 SUB_FILES=	devisorgrid.sh
diff --git a/science/devisor/files/devisorgrid.sh.in b/science/devisor/files/devisorgrid.sh.in
index 6e8dfab96c3a..596553473b3c 100644
--- a/science/devisor/files/devisorgrid.sh.in
+++ b/science/devisor/files/devisorgrid.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" %%LOCALBASE%%/bin/java -Ddevisorgrid.home="%%DATADIR%%" -cp "%%DATADIR%%" devisorgrid "$@"
+%%LOCALBASE%%/bin/java -Ddevisorgrid.home="%%DATADIR%%" -cp "%%DATADIR%%" devisorgrid "$@"
diff --git a/science/simsmith/Makefile b/science/simsmith/Makefile
index 1c23465625a3..dfdf6ea99337 100644
--- a/science/simsmith/Makefile
+++ b/science/simsmith/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	simsmith
 PORTVERSION=	9.9
+PORTREVISION=	1
 CATEGORIES=	science hamradio
 MASTER_SITES=	http://ae6ty.com/Smith_Charts_files/ \
 		LOCAL/shurd
@@ -14,7 +15,6 @@ MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	A Java-based Smith Chart program
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \
diff --git a/science/simsmith/files/simsmith.in b/science/simsmith/files/simsmith.in
index e5f359395be4..c37aca80d2bc 100644
--- a/science/simsmith/files/simsmith.in
+++ b/science/simsmith/files/simsmith.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" "$@"
diff --git a/security/dirbuster/Makefile b/security/dirbuster/Makefile
index 1015598a5f66..6a13a0f286e6 100644
--- a/security/dirbuster/Makefile
+++ b/security/dirbuster/Makefile
@@ -15,7 +15,6 @@ LICENSE_COMB=	multi
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/security/i2p/Makefile b/security/i2p/Makefile
index 3fc9ceb473ab..2e5d6be95cc2 100644
--- a/security/i2p/Makefile
+++ b/security/i2p/Makefile
@@ -36,7 +36,6 @@ USE_ANT=	yes
 USE_JAVA=	yes
 NO_ARCH=	yes
 JAVA_BUILD=	jdk
-JAVA_VERSION=	1.6+
 USE_LOCALE=	en_US.UTF-8
 ALL_TARGET=	updater tarball
 
diff --git a/security/iaikpkcs11wrapper/Makefile b/security/iaikpkcs11wrapper/Makefile
index d0cbc9775aa9..22459a849ccd 100644
--- a/security/iaikpkcs11wrapper/Makefile
+++ b/security/iaikpkcs11wrapper/Makefile
@@ -18,7 +18,6 @@ USES=		dos2unix gmake zip
 USE_JAVA=	yes
 DOS2UNIX_GLOB=	Makefile *.c
 DOS2UNIX_WRKSRC=	${WRKDIR}/src/native
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 ALL_TARGET=	release
 
diff --git a/security/jbrofuzz/Makefile b/security/jbrofuzz/Makefile
index b0fb41aeaae5..2c4a4598b62c 100644
--- a/security/jbrofuzz/Makefile
+++ b/security/jbrofuzz/Makefile
@@ -12,7 +12,6 @@ COMMENT=	JBroFuzz is a web application fuzzer
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/security/owasp-dependency-check/Makefile b/security/owasp-dependency-check/Makefile
index f7a7854e997f..1e82aed44633 100644
--- a/security/owasp-dependency-check/Makefile
+++ b/security/owasp-dependency-check/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	owasp-dependency-check
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security java
 MASTER_SITES=	LOCAL/pi/:source2
@@ -23,7 +24,6 @@ GH_ACCOUNT=	jeremylong
 GH_PROJECT=	DependencyCheck
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 NO_ARCH=	yes
 
diff --git a/security/owasp-dependency-check/files/owasp-dependency-check.in b/security/owasp-dependency-check/files/owasp-dependency-check.in
index 66fd4b7e32b1..319be4b91b23 100644
--- a/security/owasp-dependency-check/files/owasp-dependency-check.in
+++ b/security/owasp-dependency-check/files/owasp-dependency-check.in
@@ -10,8 +10,7 @@
 #
 # `--cve*` arguments fix https://github.com/jeremylong/DependencyCheck/issues/1171 until the changed URLs
 # get released.
-JAVA_VERSION="%%JAVA_VERSION%%" \
-	"%%LOCALBASE%%/bin/java" \
+"%%LOCALBASE%%/bin/java" \
 	-Dbasedir="/var/cache/owasp-dependency-check" \
 	-jar "%%JAVAJARDIR%%/owasp-dependency-check-%%PORTVERSION%%-jar-with-dependencies.jar" \
 	--cveUrl12Base "https://nvd.nist.gov/feeds/xml/cve/1.2/nvdcve-%d.xml.gz" \
diff --git a/security/webscarab/Makefile b/security/webscarab/Makefile
index 40e92f7db7e2..32a9a4aa1aaf 100644
--- a/security/webscarab/Makefile
+++ b/security/webscarab/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}-1304
diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile
index f8b523c209fe..b7b6667d51f7 100644
--- a/security/xml-security/Makefile
+++ b/security/xml-security/Makefile
@@ -22,7 +22,6 @@ USES=		cpe zip
 CPE_PRODUCT=	xml_security_for_java
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
diff --git a/sysutils/hfsexplorer/Makefile b/sysutils/hfsexplorer/Makefile
index 1cb558c55d8a..d864700a1162 100644
--- a/sysutils/hfsexplorer/Makefile
+++ b/sysutils/hfsexplorer/Makefile
@@ -20,7 +20,6 @@ DESKTOP_ENTRIES="hfsexplorer" "reader Mac-formatted harddisk" \
 USE_GITHUB=	yes
 GH_ACCOUNT=	unsound
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/sysutils/jdiskreport/Makefile b/sysutils/jdiskreport/Makefile
index c69c756301fe..311ab47b4af2 100644
--- a/sysutils/jdiskreport/Makefile
+++ b/sysutils/jdiskreport/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Java program to graphically display disk usage statistics
 
 USES=		zip
 USE_JAVA=	YES
-JAVA_VERSION=	1.6+
 
 PLIST_SUB=	JDISKDIR=${JDISKDIR:S,${PREFIX}/,,g}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
diff --git a/sysutils/jvmtop/Makefile b/sysutils/jvmtop/Makefile
index 39db2862ed6f..6d6a2b3e1309 100644
--- a/sysutils/jvmtop/Makefile
+++ b/sysutils/jvmtop/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jvmtop
 DISTVERSION=	0.8.0-27
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g5693965
 CATEGORIES=	sysutils java
 MASTER_SITES=	SF/bsdsrc/jvmtop:source2
@@ -17,7 +18,6 @@ BUILD_DEPENDS=	mvn:devel/maven
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 NO_ARCH=	yes
 
diff --git a/sysutils/jvmtop/files/jvmtop.sh.in b/sysutils/jvmtop/files/jvmtop.sh.in
index e9d3e73ef67b..051325f27c3f 100644
--- a/sysutils/jvmtop/files/jvmtop.sh.in
+++ b/sysutils/jvmtop/files/jvmtop.sh.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jvmtop.jar:%%JAVA_HOME%%/lib/tools.jar" com.jvmtop.JvmTop $1
+"%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jvmtop.jar:%%JAVA_HOME%%/lib/tools.jar" com.jvmtop.JvmTop $1
diff --git a/sysutils/linux-crashplan/Makefile b/sysutils/linux-crashplan/Makefile
index 8295a7c761a6..79f00491546a 100644
--- a/sysutils/linux-crashplan/Makefile
+++ b/sysutils/linux-crashplan/Makefile
@@ -24,7 +24,6 @@ USE_RC_SUBR=	crashplan
 
 USE_JAVA=	yes
 JAVA_OS=	linux
-JAVA_VERSION=	1.7+
 
 WRKSRC=		${WRKDIR}/crashplan-install
 
diff --git a/textproc/apache-commons-digester/Makefile b/textproc/apache-commons-digester/Makefile
index 6e16b00ac144..4bc7e818f472 100644
--- a/textproc/apache-commons-digester/Makefile
+++ b/textproc/apache-commons-digester/Makefile
@@ -22,7 +22,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
diff --git a/textproc/apache-poi/Makefile b/textproc/apache-poi/Makefile
index 6b8f3dbe8683..6cdb19e914bf 100644
--- a/textproc/apache-poi/Makefile
+++ b/textproc/apache-poi/Makefile
@@ -15,7 +15,6 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 RELEASE_DATE=	20160924
diff --git a/textproc/denature/Makefile b/textproc/denature/Makefile
index 8faa0a1a84dd..bca75b78be80 100644
--- a/textproc/denature/Makefile
+++ b/textproc/denature/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
 
 USES=		perl5
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 POD2MAN?=	pod2man
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/textproc/dom4j/Makefile b/textproc/dom4j/Makefile
index c5068135660a..aa95d751472d 100644
--- a/textproc/dom4j/Makefile
+++ b/textproc/dom4j/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source XML framework for Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index d96e666d9b20..72e50d8f9df6 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -26,7 +26,6 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 PORTDOCS=	*
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 NO_ARCH=	yes
diff --git a/textproc/jalingo/Makefile b/textproc/jalingo/Makefile
index 686af0328648..990e8a86e9ca 100644
--- a/textproc/jalingo/Makefile
+++ b/textproc/jalingo/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	jalingo
 PORTVERSION=	0.6.0
-PORTREVISION=	2
-#PORTREVISION=	0
+PORTREVISION=	3
 CATEGORIES=	textproc java
 MASTER_SITES=	SF/${PORTNAME}/JaLingo/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -17,7 +16,6 @@ LICENSE=	GPLv2
 USES=		7z
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 ALL_TARGET=	dist
 
diff --git a/textproc/jalingo/files/jalingo.in b/textproc/jalingo/files/jalingo.in
index bbbc7e03f34b..a799ad15e587 100644
--- a/textproc/jalingo/files/jalingo.in
+++ b/textproc/jalingo/files/jalingo.in
@@ -1,4 +1,3 @@
 #!/bin/sh
 # $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%"	\
 exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/%%JALINGOJAR%% "$@"
diff --git a/textproc/jarnal/Makefile b/textproc/jarnal/Makefile
index 24b17468b4ce..da7769fa162b 100644
--- a/textproc/jarnal/Makefile
+++ b/textproc/jarnal/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile
index a2e082fc542e..8bc11d4fe14e 100644
--- a/textproc/jaxup/Makefile
+++ b/textproc/jaxup/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jaxup
 PORTVERSION=	1.01
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc java
 MASTER_SITES=	http://klomp.org/jaxup/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -22,7 +22,6 @@ USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
diff --git a/textproc/jaxup/files/jaxup-xupdater.sh b/textproc/jaxup/files/jaxup-xupdater.sh
index 1fd12cf618fe..225e7f334974 100644
--- a/textproc/jaxup/files/jaxup-xupdater.sh
+++ b/textproc/jaxup/files/jaxup-xupdater.sh
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" %%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@"
+%%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@"
diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile
index cb6f1291743c..aecf3408fbe4 100644
--- a/textproc/jdictionary/Makefile
+++ b/textproc/jdictionary/Makefile
@@ -11,7 +11,6 @@ MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Platform independent, plugin based dictionary
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/textproc/jdictionary/Makefile.plugin b/textproc/jdictionary/Makefile.plugin
index dc5d415fe08e..7913d231bbf6 100644
--- a/textproc/jdictionary/Makefile.plugin
+++ b/textproc/jdictionary/Makefile.plugin
@@ -9,9 +9,7 @@ COMMENT?=	JDictionary plugin master port
 RUN_DEPENDS+=	jdictionary:textproc/jdictionary
 
 # WARNING: USE_JAVA is set to be able to use JAVASHAREDIR.
-#          Please make sure that JAVA_VERSION here is the same as in Makefile.
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	#
diff --git a/textproc/jing/Makefile b/textproc/jing/Makefile
index e33d45fadbd0..46afbff29622 100644
--- a/textproc/jing/Makefile
+++ b/textproc/jing/Makefile
@@ -18,7 +18,6 @@ BROKEN_armv7=		fails to build: modbuild.xml: Java returned: 1
 USES=		zip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/textproc/lucene/Makefile b/textproc/lucene/Makefile
index e8da8d80acc5..b6a923d76016 100644
--- a/textproc/lucene/Makefile
+++ b/textproc/lucene/Makefile
@@ -21,7 +21,6 @@ USES=		tar:tgz
 USE_JAVA=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
-JAVA_VERSION=	1.6+
 
 OPTIONS_DEFINE=	CONTRIB DOCS EXAMPLES
 CONTRIB_DESC=	Install contributed jars
diff --git a/textproc/lucene4/Makefile b/textproc/lucene4/Makefile
index 8cce62f71146..de769182dd20 100644
--- a/textproc/lucene4/Makefile
+++ b/textproc/lucene4/Makefile
@@ -17,7 +17,6 @@ CONFLICTS=	lucene-[0-9].*
 
 USES=		tar:tgz
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/textproc/lucene5/Makefile b/textproc/lucene5/Makefile
index d6dcc7bfbe97..4dfe3f89a68a 100644
--- a/textproc/lucene5/Makefile
+++ b/textproc/lucene5/Makefile
@@ -17,7 +17,6 @@ CONFLICTS=	lucene-[0-9].*
 
 USES=		tar:tgz
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/textproc/nux/Makefile b/textproc/nux/Makefile
index 191762ce6f81..a28b5a6502ef 100644
--- a/textproc/nux/Makefile
+++ b/textproc/nux/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nux
 PORTVERSION=	1.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://dst.lbl.gov/ACSSoftware/nux/nux-download/releases/
@@ -15,7 +15,6 @@ RUN_DEPENDS=	${JAVALIBDIR}/xom.jar:textproc/xom \
 		${JAVALIBDIR}/saxon9.jar:textproc/saxon-devel
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/textproc/nux/files/fire-xquery.sh.in b/textproc/nux/files/fire-xquery.sh.in
index 8eab10673812..aba701bb6dbe 100644
--- a/textproc/nux/files/fire-xquery.sh.in
+++ b/textproc/nux/files/fire-xquery.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "`%%LOCALBASE%%/bin/classpath`" nux.xom.tests.XQueryCommand "$@"
+exec "%%LOCALBASE%%/bin/java" -classpath "`%%LOCALBASE%%/bin/classpath`" nux.xom.tests.XQueryCommand "$@"
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index 9d9794aae88f..8a693071845e 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ppower4
 PORTVERSION=	0.9.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc java
 MASTER_SITES=	TEX_CTAN/support/${PORTNAME}
 DISTFILES=	pp4sty.zip pp4p.jar manual.pdf leveldemo.zip
@@ -18,7 +18,6 @@ LICENSE=	GPLv2 # version not really specified
 USES=		zip
 USE_TEX=	latex
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 NO_ARCH=	yes
diff --git a/textproc/ppower4/files/ppower4.sh.in b/textproc/ppower4/files/ppower4.sh.in
index 4336fce21178..bdf80d3c20ec 100644
--- a/textproc/ppower4/files/ppower4.sh.in
+++ b/textproc/ppower4/files/ppower4.sh.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@"
diff --git a/textproc/qrcodegen/Makefile b/textproc/qrcodegen/Makefile
index 7520d378cc12..69b409ceafab 100644
--- a/textproc/qrcodegen/Makefile
+++ b/textproc/qrcodegen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qrcodegen
 PORTVERSION=	1.14.2
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -17,7 +18,6 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 USES=		zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 SUB_FILES=	qrcodegen
 
 INSTALLFILES=	FAQ.txt Installation.txt NOTICE QRCodeGen.jar Version.html
diff --git a/textproc/qrcodegen/files/qrcodegen.in b/textproc/qrcodegen/files/qrcodegen.in
index 71cb66d6665f..05eadc249d9a 100644
--- a/textproc/qrcodegen/files/qrcodegen.in
+++ b/textproc/qrcodegen/files/qrcodegen.in
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \
-    -jar QRCodeGen.jar "$@"
+exec %%LOCALBASE%%/bin/java -jar QRCodeGen.jar "$@"
 
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index 4d4efb3b5fdb..4c192213d80e 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	saxon
 PORTVERSION=	9.1.0.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	SF/${PORTNAME}/Saxon-B/${PORTVERSION}:binary	\
@@ -21,7 +22,6 @@ XOM_DESC=	XOM support
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
@@ -50,7 +50,7 @@ RUN_DEPENDS+=	${JAVALIBDIR}/xom.jar:textproc/xom
 .endif
 
 SUB_FILES=	saxon.sh
-SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}" JAVA_VERSION="${JAVA_VERSION}"
+SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}"
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}/..."
diff --git a/textproc/saxon-devel/files/saxon.sh.in b/textproc/saxon-devel/files/saxon.sh.in
index fe3c728dfffb..0db106450555 100644
--- a/textproc/saxon-devel/files/saxon.sh.in
+++ b/textproc/saxon-devel/files/saxon.sh.in
@@ -17,4 +17,4 @@ do
 	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
 done
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
+exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index cb9e00da25df..62a1610479bf 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	saxon
 PORTVERSION=	6.5.5
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	SF/${PORTNAME}/saxon6/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/./-/g}
@@ -14,7 +15,6 @@ LICENSE=	MPL10
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/textproc/saxon/files/saxon.sh.in b/textproc/saxon/files/saxon.sh.in
index 3844e62e0bd5..f335d9ddd3a8 100644
--- a/textproc/saxon/files/saxon.sh.in
+++ b/textproc/saxon/files/saxon.sh.in
@@ -8,4 +8,4 @@ do
 	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
 done
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" com.icl.saxon.StyleSheet "$@"
+"%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" com.icl.saxon.StyleSheet "$@"
diff --git a/textproc/trang/Makefile b/textproc/trang/Makefile
index 4904ae77e034..b3a34304df4a 100644
--- a/textproc/trang/Makefile
+++ b/textproc/trang/Makefile
@@ -18,7 +18,6 @@ BROKEN_armv7=		fails to build: modbuild.xml: Java returned: 1
 USES=		zip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/textproc/weka/Makefile b/textproc/weka/Makefile
index 0987cab96bbf..a0ea66d5edba 100644
--- a/textproc/weka/Makefile
+++ b/textproc/weka/Makefile
@@ -15,7 +15,6 @@ PORTSCOUT=	limitw:1,even	# Second component is even for stable versions.
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 9ea098db33ff..87ecae352f15 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -20,7 +20,6 @@ USES=		cpe
 CPE_PRODUCT=	xalan-java
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index b9ea2465fb23..eeaf8f227580 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -13,7 +13,6 @@ COMMENT=	XML parser for Java
 LICENSE=	APACHE20
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile
index a62415d817b4..e3c8b0851212 100644
--- a/textproc/xincluder/Makefile
+++ b/textproc/xincluder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xincluder
 PORTVERSION=	1.0.d11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc java
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/languages/java/javafaq/
 DISTNAME=	${PORTNAME}-1.0d11
@@ -18,7 +18,6 @@ RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom \
 		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/textproc/xincluder/files/xincluder.sh.in b/textproc/xincluder/files/xincluder.sh.in
index 4ed46d6e30e6..a3ad6be4f9c0 100644
--- a/textproc/xincluder/files/xincluder.sh.in
+++ b/textproc/xincluder/files/xincluder.sh.in
@@ -12,4 +12,4 @@ case "${IAM}" in
 	*) echo "ERROR!" ; false ;;
 esac
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "`"%%LOCALBASE%%/bin/classpath"`" "com.elharo.xml.xinclude.${MAIN_CLASS}" "$@"
+"%%LOCALBASE%%/bin/java" -cp "`"%%LOCALBASE%%/bin/classpath"`" "com.elharo.xml.xinclude.${MAIN_CLASS}" "$@"
diff --git a/textproc/xml-commons/Makefile b/textproc/xml-commons/Makefile
index 6fa56b7b8fc9..d42b013361d3 100644
--- a/textproc/xml-commons/Makefile
+++ b/textproc/xml-commons/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Provides common XML code for Apache projects
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 NO_BUILD=	yes
 
diff --git a/textproc/xom/Makefile b/textproc/xom/Makefile
index 8c2eb38088c5..c596e6c66631 100644
--- a/textproc/xom/Makefile
+++ b/textproc/xom/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j \
 		${JAVALIBDIR}/xalan.jar:textproc/xalan-j
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/XOM
 
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index 8d63c99f4504..9433e01e466b 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	mike@vee.net
 COMMENT=	XML parser written in Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 USES=		zip
diff --git a/www/apache-forrest/Makefile b/www/apache-forrest/Makefile
index 6fad4fe7a712..d6e272e9a6d0 100644
--- a/www/apache-forrest/Makefile
+++ b/www/apache-forrest/Makefile
@@ -28,8 +28,6 @@ IGNORE_FILES=		! -name *\.bak -and ! -name *\.bat \
 
 INSTALL_WRKSRC=		${WRKSRC}/build
 
-JAVA_VERSION=		1.6+
-
 NO_BUILD=		Yes
 
 PLUGINSDIR=		${DATADIR}/plugins/org.apache.forrest.plugin.output.pdf
diff --git a/www/archiva/Makefile b/www/archiva/Makefile
index ae4651feace5..0e57fb82c5b9 100644
--- a/www/archiva/Makefile
+++ b/www/archiva/Makefile
@@ -18,7 +18,6 @@ USES=		cpe
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index e64b7bd294d1..cafa27b74c92 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -32,7 +32,6 @@ TOMCAT85_VARS=	APPHOME=${LOCALBASE}/apache-tomcat-8.5
 TOMCAT85_RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:www/tomcat85
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 SHAREOWN=	www
 SHAREGRP=	www
 
diff --git a/www/dojo-shrinksafe/Makefile b/www/dojo-shrinksafe/Makefile
index 8cf8c34c31b6..e8dbd5fbece7 100644
--- a/www/dojo-shrinksafe/Makefile
+++ b/www/dojo-shrinksafe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		shrinksafe
 PORTVERSION=		1.9.0
+PORTREVISION=		1
 CATEGORIES=		www java
 MASTER_SITES=		http://download.dojotoolkit.org/release-${PORTVERSION}/ \
 			LOCAL/glarkin
@@ -13,7 +14,6 @@ MAINTAINER=		ports@FreeBSD.org
 COMMENT=		JavaScript code compressor
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PKGNAMEPREFIX}${PORTNAME} %%DATADIR%%/shrinksafe.jar \
diff --git a/www/dojo-shrinksafe/files/dojo-shrinksafe.in b/www/dojo-shrinksafe/files/dojo-shrinksafe.in
index 050e6bd0de7b..f9e23d5e5aec 100644
--- a/www/dojo-shrinksafe/files/dojo-shrinksafe.in
+++ b/www/dojo-shrinksafe/files/dojo-shrinksafe.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar "$@"
+exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar "$@"
diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile
index 5adb204d403c..dc1ba6b80202 100644
--- a/www/geronimo/Makefile
+++ b/www/geronimo/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Open-source Java EE 5 application server
 
 USES=		cpe
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 CPE_VENDOR=	apache
@@ -62,8 +61,7 @@ SUB_LIST=	GERONIMO_HOME=${APP_HOME} \
 		USER=${GERONIMO_USER} \
 		GERONIMO_VERSION=${MAJOR_VER} \
 		GERONIMO_OUT=${GERONIMO_OUT} \
-		JAVA_HOME=${JAVA_HOME} \
-		JAVA_VERSION=${JAVA_VERSION}
+		JAVA_HOME=${JAVA_HOME}
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
diff --git a/www/glassfish4/Makefile b/www/glassfish4/Makefile
index b3b0fe8d573a..fc96c48a0924 100644
--- a/www/glassfish4/Makefile
+++ b/www/glassfish4/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Reference implementation of the Java EE application server
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/glassfish4
diff --git a/www/grails/Makefile b/www/grails/Makefile
index 6220ada806cd..457c3b3fc961 100644
--- a/www/grails/Makefile
+++ b/www/grails/Makefile
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:tu}
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/www/helma/Makefile b/www/helma/Makefile
index 9e34642547c1..9fe609ea345d 100644
--- a/www/helma/Makefile
+++ b/www/helma/Makefile
@@ -21,7 +21,6 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 USE_RC_SUBR=	helma
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	clean jar
 NO_ARCH=	yes
diff --git a/www/htmlcompressor/Makefile b/www/htmlcompressor/Makefile
index b5b8bc4f845d..bbf77fd76436 100644
--- a/www/htmlcompressor/Makefile
+++ b/www/htmlcompressor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	htmlcompressor
 PORTVERSION=	1.5.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www java
 MASTER_SITES=	https://github.com/serg472/htmlcompressor/releases/download/${PORTVERSION}/
 EXTRACT_SUFX=	.jar
@@ -21,7 +21,6 @@ NO_ARCH=	yes
 
 PLIST_FILES=	bin/htmlcompressor %%JAVAJARDIR%%/htmlcompressor.jar
 SUB_FILES=	htmlcompressor
-SUB_LIST+=	JAVA_VERSION=${JAVA_PORT_VERSION:R:C/^([^1])/1.\1/}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
diff --git a/www/htmlcompressor/files/htmlcompressor.in b/www/htmlcompressor/files/htmlcompressor.in
index 51762b6a44a9..4a2fd3e431a5 100644
--- a/www/htmlcompressor/files/htmlcompressor.in
+++ b/www/htmlcompressor/files/htmlcompressor.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar "$@"
+exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar "$@"
diff --git a/www/httpasyncclient/Makefile b/www/httpasyncclient/Makefile
index ce99d4b6ada5..4029f2d5d28b 100644
--- a/www/httpasyncclient/Makefile
+++ b/www/httpasyncclient/Makefile
@@ -19,7 +19,6 @@ USES=		cpe
 CPE_VENDOR=	apache
 OPTIONS_DEFINE=	DOCS
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/httpcomponents-asyncclient-${DISTVERSION}
diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile
index 6a903dce9eb4..55a6877bd6c9 100644
--- a/www/httpclient/Makefile
+++ b/www/httpclient/Makefile
@@ -25,7 +25,6 @@ CPE_PRODUCT=	commons-httpclient
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/httpcomponents-client-${DISTVERSION}
diff --git a/www/httpcore/Makefile b/www/httpcore/Makefile
index 11d2dd29ab28..c63880530722 100644
--- a/www/httpcore/Makefile
+++ b/www/httpcore/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	${JAVALIBDIR}/commons-cli.jar:java/apache-commons-cli
 OPTIONS_DEFINE=	DOCS
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/httpcomponents-core-${DISTVERSION}
diff --git a/www/jetty8/Makefile b/www/jetty8/Makefile
index 0dbfb54e5e63..7245a6b8e655 100644
--- a/www/jetty8/Makefile
+++ b/www/jetty8/Makefile
@@ -22,7 +22,6 @@ CONFLICTS=	jetty-9.*
 JDVDATE=	v20140411
 USE_RC_SUBR=	${PORTNAME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USES=		python
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PLIST_SUB+=	RUNASUSER=${RUNASUSER} GROUP=${GROUP}
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index ba36c2b1cfd0..4cec73e326eb 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-jmeter
 PORTVERSION=	2.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www benchmarks java
 MASTER_SITES=	APACHE/jmeter/binaries
 
@@ -43,7 +43,6 @@ RUN_DEPENDS=	\
 
 USES=		tar:tgz
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 SUB_FILES=	jmeter.sh
diff --git a/www/jmeter/files/jmeter.sh.in b/www/jmeter/files/jmeter.sh.in
index d8f106d98d8b..2edbbfe1da3c 100644
--- a/www/jmeter/files/jmeter.sh.in
+++ b/www/jmeter/files/jmeter.sh.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/bin/ApacheJMeter.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/bin/ApacheJMeter.jar" "$@"
diff --git a/www/madsonic-standalone/Makefile b/www/madsonic-standalone/Makefile
index 36851333cf26..24f36cf68e1b 100644
--- a/www/madsonic-standalone/Makefile
+++ b/www/madsonic-standalone/Makefile
@@ -52,7 +52,6 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_JAVA=	yes
 USE_RC_SUBR=	madsonic
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 # Don't waste UID/GID and reuse Subsonic's user.
 USERS=		subsonic
diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile
index 856c0d2fce9a..5cbcf231345c 100644
--- a/www/madsonic/Makefile
+++ b/www/madsonic/Makefile
@@ -60,7 +60,6 @@ APE_RUN_DEPENDS=	mac:audio/mac
 NO_BUILD=	yes
 DISTDATE=	20161208
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USES=	zip
 USER=	www
 GROUP=	www
diff --git a/www/myfaces/Makefile b/www/myfaces/Makefile
index 7913ce1a6e6b..fe107b3d4658 100644
--- a/www/myfaces/Makefile
+++ b/www/myfaces/Makefile
@@ -14,7 +14,6 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 USES=		cpe
diff --git a/www/paros/Makefile b/www/paros/Makefile
index 274709fb6447..c8991ac2d0d4 100644
--- a/www/paros/Makefile
+++ b/www/paros/Makefile
@@ -14,7 +14,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_JAVA=	yes
 JAVA_RUN=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 USES=		dos2unix zip
diff --git a/www/py-dojango/Makefile b/www/py-dojango/Makefile
index fc731352d1d4..b560d242cb29 100644
--- a/www/py-dojango/Makefile
+++ b/www/py-dojango/Makefile
@@ -28,7 +28,6 @@ OPTIONS_DEFINE=		JAVA
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 4853c114431d..1b4a63c7f520 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -15,7 +15,6 @@ USES=		libtool python ssl
 USE_JAVA=	yes
 
 # Pass JAVA_HOME as determined by bsd.java.mk
-JAVA_VERSION=	1.6+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-java-home=${JAVA_HOME} \
 		--with-openssl-lib=${OPENSSLLIB} \
diff --git a/www/rssowl/Makefile b/www/rssowl/Makefile
index 21241f5314af..8536284724dd 100644
--- a/www/rssowl/Makefile
+++ b/www/rssowl/Makefile
@@ -21,7 +21,6 @@ BUILD_WRKSRC=	${WRKSRC}/src
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 JAVA_RUN=	yes
 
diff --git a/www/sahi/Makefile b/www/sahi/Makefile
index 44fdb84fc43c..06a3f127e65e 100644
--- a/www/sahi/Makefile
+++ b/www/sahi/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 JAVA_RUN=	yes
 
diff --git a/www/sakai/Makefile b/www/sakai/Makefile
index c177de788c47..eed06168f5b1 100644
--- a/www/sakai/Makefile
+++ b/www/sakai/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:www/tomcat7
 IGNORE=		does not work correctly
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/www/scloader/Makefile b/www/scloader/Makefile
index 306f238cec09..bc8b9bf6d49e 100644
--- a/www/scloader/Makefile
+++ b/www/scloader/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 
 USES=		dos2unix zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/www/servlet-api/Makefile b/www/servlet-api/Makefile
index e910acacb027..0e7099989c0e 100644
--- a/www/servlet-api/Makefile
+++ b/www/servlet-api/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Servlet API
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
diff --git a/www/subsonic-standalone/Makefile b/www/subsonic-standalone/Makefile
index 0f0eae1e66ff..a1f985c25d8f 100644
--- a/www/subsonic-standalone/Makefile
+++ b/www/subsonic-standalone/Makefile
@@ -48,7 +48,6 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_JAVA=	yes
 USE_RC_SUBR=	subsonic
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 USERS=		subsonic
 GROUPS=		subsonic
diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile
index 567709223413..5d715efc5b45 100644
--- a/www/tomcat-native/Makefile
+++ b/www/tomcat-native/Makefile
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/native
 USES=		libtool ssl
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
-JAVA_VERSION=	1.6+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apr=${LOCALBASE} \
 		--with-java-home=${JAVA_HOME} \
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index d18557e02b94..6fe4fb2d78ec 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -20,7 +20,6 @@ USES=		cpe
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile
index 0e45835f1aec..48750d1ccf7b 100644
--- a/www/tomcat85/Makefile
+++ b/www/tomcat85/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
diff --git a/www/tomee/Makefile b/www/tomee/Makefile
index 6db2110138d4..98e3bf4c72b1 100644
--- a/www/tomee/Makefile
+++ b/www/tomee/Makefile
@@ -18,7 +18,6 @@ USES=		cpe
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_ARCH=	yes
 NO_BUILD=	yes
 
diff --git a/www/vertx/Makefile b/www/vertx/Makefile
index e60bf7125666..6ccef6e580b4 100644
--- a/www/vertx/Makefile
+++ b/www/vertx/Makefile
@@ -19,7 +19,6 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 JAVA_OS=	native
 JAVA_RUN=	yes
-JAVA_VERSION=	1.7+
 
 PLIST_SUB=	VERTXVER=${PORTVERSION}
 
diff --git a/www/yuicompressor/Makefile b/www/yuicompressor/Makefile
index 2001e66f72c3..6209a17c6bc3 100644
--- a/www/yuicompressor/Makefile
+++ b/www/yuicompressor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yuicompressor
 PORTVERSION=	2.4.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www java
 #MASTER_SITES=	http://tml.github.io/yui/
 MASTER_SITES+=	LOCAL/az
@@ -19,7 +19,6 @@ LICENSE_COMB=	multi
 NO_WRKSUBDIR=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/www/yuicompressor/files/yuicompressor.in b/www/yuicompressor/files/yuicompressor.in
index 6e09f807e5d7..74a50520d26d 100644
--- a/www/yuicompressor/files/yuicompressor.in
+++ b/www/yuicompressor/files/yuicompressor.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar "$@"
+exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar "$@"
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 003730dcc6f5..5811ada6cd92 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -24,7 +24,6 @@ USE_GL=		glu gl
 USE_GNOME=	gtk20
 USE_JAVA=	yes
 USE_XORG=	xtst
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 USE_ANT=	yes
 MAKE_ARGS+=	-Doutput.jar=${OUTPUT_JAR}
diff --git a/x11-wm/lxmed/Makefile b/x11-wm/lxmed/Makefile
index 6b1fd9ba99ee..3d26ac488649 100644
--- a/x11-wm/lxmed/Makefile
+++ b/x11-wm/lxmed/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lxmed
 PORTVERSION=	20120515
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm java
 MASTER_SITES=	SF/${PORTNAME}/
 DIST_SUBDIR=	java
@@ -18,7 +18,6 @@ RUN_DEPENDS=	gksu:sysutils/gksu
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/x11-wm/lxmed/files/lxmed.sh.in b/x11-wm/lxmed/files/lxmed.sh.in
index f2e7dba1d772..df96adb3ba39 100644
--- a/x11-wm/lxmed/files/lxmed.sh.in
+++ b/x11-wm/lxmed/files/lxmed.sh.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -jar "%%DATADIR%%/LXMenuEditor.jar" "${@}"
author	Jung-uk Kim <jkim@FreeBSD.org>	2019-11-26 21:46:12 +0000
committer	Jung-uk Kim <jkim@FreeBSD.org>	2019-11-26 21:46:12 +0000
commit	5a52a082347653e46a7330eb60d51230c01183ef (patch)
tree	175d5bf406b7321a3c965d241cd3f2b32e2c8ca1
parent	bb21effd9b960e4613fbf599abcde1f3e655d817 (diff)
download	ports-5a52a082347653e46a7330eb60d51230c01183ef.tar.gz ports-5a52a082347653e46a7330eb60d51230c01183ef.zip