D22342.id64261.diff
No OneTemporary
Actions

Size

112 KB

Referenced Files

None

Subscribers

None

D22342.id64261.diff
View Options

	Index: Mk/bsd.java.mk
	===================================================================
	--- Mk/bsd.java.mk
	+++ Mk/bsd.java.mk
	@@ -162,7 +162,7 @@
	. 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 @@
	. 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
	Index: archivers/javatar/Makefile
	===================================================================
	--- archivers/javatar/Makefile
	+++ archivers/javatar/Makefile
	@@ -14,7 +14,6 @@
	LICENSE_FILE= ${WRKSRC}/doc/LICENSE

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes

	Index: archivers/jzlib/Makefile
	===================================================================
	--- archivers/jzlib/Makefile
	+++ archivers/jzlib/Makefile
	@@ -14,7 +14,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_ARCH= yes

	JAR_FILE= ${WRKSRC}/src/main/java/${PORTNAME}.jar
	Index: archivers/snappy-java/Makefile
	===================================================================
	--- archivers/snappy-java/Makefile
	+++ archivers/snappy-java/Makefile
	@@ -35,7 +35,6 @@

	USES= gmake
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	USE_LDCONFIG= yes
	MAKE_ARGS+= Default_CXX=${CXX}

	Index: astro/gpsprune/Makefile
	===================================================================
	--- astro/gpsprune/Makefile
	+++ astro/gpsprune/Makefile
	@@ -20,7 +20,6 @@
	NO_ARCH= yes

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	SUB_FILES= gpsprune.sh
	SUB_LIST= JARNAME=${DISTNAME}
	Index: astro/osmosis/Makefile
	===================================================================
	--- astro/osmosis/Makefile
	+++ astro/osmosis/Makefile
	@@ -16,7 +16,6 @@
	NO_WRKSUBDIR= yes
	USES= tar:tgz
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: audio/atunes/Makefile
	===================================================================
	--- audio/atunes/Makefile
	+++ audio/atunes/Makefile
	@@ -15,7 +15,6 @@

	NO_BUILD= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	SUB_FILES= atunes

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
	Index: audio/gervill/Makefile
	===================================================================
	--- audio/gervill/Makefile
	+++ audio/gervill/Makefile
	@@ -17,7 +17,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	NO_ARCH= yes

	Index: audio/jid3lib/Makefile
	===================================================================
	--- audio/jid3lib/Makefile
	+++ audio/jid3lib/Makefile
	@@ -11,7 +11,6 @@
	COMMENT= Java ID3 Tag Library

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes

	PLIST_FILES= %%JAVAJARDIR%%/jid3lib.jar
	Index: audio/musiccontrol/Makefile
	===================================================================
	--- audio/musiccontrol/Makefile
	+++ audio/musiccontrol/Makefile
	@@ -18,7 +18,6 @@
	${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

	Index: audio/tuxguitar/Makefile
	===================================================================
	--- audio/tuxguitar/Makefile
	+++ audio/tuxguitar/Makefile
	@@ -35,7 +35,6 @@
	USE_JAVA= yes
	USE_ANT= yes
	USE_LDCONFIG= yes
	-JAVA_VERSION= 1.6+
	NO_CCACHE= yes

	BUILD_WRKSRC= ${WRKSRC}/TuxGuitar
	Index: benchmarks/linux-vdbench/Makefile
	===================================================================
	--- benchmarks/linux-vdbench/Makefile
	+++ benchmarks/linux-vdbench/Makefile
	@@ -22,7 +22,6 @@
	USE_JAVA= yes

	EXTRACT_AFTER_ARGS= -d ${WRKSRC}
	-JAVA_VERSION= 1.7+
	JAVA_OS= linux
	NO_BUILD= yes
	PLIST_SUB= LINUX_ARCH=${LINUX_ARCH}
	Index: benchmarks/scimark2/Makefile
	===================================================================
	--- benchmarks/scimark2/Makefile
	+++ benchmarks/scimark2/Makefile
	@@ -14,7 +14,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NEED_JAVAC= yes
	JAVAC_OPTS?= -O

	Index: biology/artemis/Makefile
	===================================================================
	--- biology/artemis/Makefile
	+++ biology/artemis/Makefile
	@@ -20,7 +20,6 @@
	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

	Index: biology/cytoscape/Makefile
	===================================================================
	--- biology/cytoscape/Makefile
	+++ biology/cytoscape/Makefile
	@@ -24,7 +24,6 @@
	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 \
	Index: biology/jalview/Makefile
	===================================================================
	--- biology/jalview/Makefile
	+++ biology/jalview/Makefile
	@@ -12,7 +12,6 @@
	COMMENT= Viewer and editor for multiple sequence alignments

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	ALL_TARGET= makejars
	WRKSRC= ${WRKDIR}/${PORTNAME}
	Index: biology/trimmomatic/Makefile
	===================================================================
	--- biology/trimmomatic/Makefile
	+++ biology/trimmomatic/Makefile
	@@ -16,7 +16,6 @@
	USES= zip
	USE_JAVA= yes

	-JAVA_VERSION= 1.6+
	JAVA_RUN= yes
	NO_BUILD= yes
	NO_ARCH= yes
	Index: cad/electric-ng/Makefile
	===================================================================
	--- cad/electric-ng/Makefile
	+++ cad/electric-ng/Makefile
	@@ -20,7 +20,6 @@
	EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	SUB_LIST+= LIBFILES="${LIBFILES}" \
	JARFILE="${JARFILE}"
	Index: cad/fidocadj/Makefile
	===================================================================
	--- cad/fidocadj/Makefile
	+++ cad/fidocadj/Makefile
	@@ -23,7 +23,6 @@

	SUB_FILES= ${PORTNAME}.sh

	-JAVA_VERSION= 1.6+
	USE_JAVA= yes

	OPTIONS_DEFINE= DOCS
	Index: cad/impact/Makefile
	===================================================================
	--- cad/impact/Makefile
	+++ cad/impact/Makefile
	@@ -24,7 +24,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	DATADIR= ${JAVASHAREDIR}/Impact
	Index: cad/logisim/Makefile
	===================================================================
	--- cad/logisim/Makefile
	+++ cad/logisim/Makefile
	@@ -16,7 +16,6 @@
	NO_BUILD= yes
	USE_JAVA= yes
	JAVA_RUN= yes
	-JAVA_VERSION= 1.6+

	PLIST_FILES= ${DATADIR_REL}/${PORTNAME}-generic-${PORTVERSION}${EXTRACT_SUFX} \
	bin/${PORTNAME}
	Index: cad/sweethome3d/Makefile
	===================================================================
	--- cad/sweethome3d/Makefile
	+++ cad/sweethome3d/Makefile
	@@ -20,7 +20,6 @@
	NO_ARCH= yes
	USE_ANT= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	ALL_TARGET= jarExecutable
	JARNAME= SweetHome3D-${PORTVERSION}.jar
	Index: comms/rxtx/Makefile
	===================================================================
	--- comms/rxtx/Makefile
	+++ comms/rxtx/Makefile
	@@ -21,7 +21,6 @@
	USES= gmake libtool zip

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native
	GNU_CONFIGURE= yes
	CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME}
	Index: comms/yaac/Makefile
	===================================================================
	--- comms/yaac/Makefile
	+++ comms/yaac/Makefile
	@@ -15,7 +15,6 @@

	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
	Index: databases/apache-commons-dbutils/Makefile
	===================================================================
	--- databases/apache-commons-dbutils/Makefile
	+++ databases/apache-commons-dbutils/Makefile
	@@ -15,7 +15,6 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE.txt

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: databases/c3p0/Makefile
	===================================================================
	--- databases/c3p0/Makefile
	+++ databases/c3p0/Makefile
	@@ -15,7 +15,6 @@
	USES= tar:tgz
	USE_JAVA= yes
	NO_BUILD= yes
	-JAVA_VERSION= 1.6+
	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
	NO_ARCH= yes

	Index: databases/db6/Makefile
	===================================================================
	--- databases/db6/Makefile
	+++ databases/db6/Makefile
	@@ -54,7 +54,7 @@
	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}"
	Index: databases/frontbase-jdbc/Makefile
	===================================================================
	--- databases/frontbase-jdbc/Makefile
	+++ databases/frontbase-jdbc/Makefile
	@@ -13,7 +13,6 @@
	COMMENT= The Java JDBC implementation for FrontBase

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes
	JARFILE= frontbasejdbc.jar
	Index: databases/hbase/Makefile
	===================================================================
	--- databases/hbase/Makefile
	+++ databases/hbase/Makefile
	@@ -24,7 +24,6 @@
	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
	Index: databases/hsqldb/Makefile
	===================================================================
	--- databases/hsqldb/Makefile
	+++ databases/hsqldb/Makefile
	@@ -12,7 +12,6 @@
	LICENSE= BSD3CLAUSE

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	USES= zip
	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
	Index: databases/isql-viewer/Makefile
	===================================================================
	--- databases/isql-viewer/Makefile
	+++ databases/isql-viewer/Makefile
	@@ -19,7 +19,6 @@
	${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	ISQL= iSQL-Viewer
	Index: databases/jasperreports/Makefile
	===================================================================
	--- databases/jasperreports/Makefile
	+++ databases/jasperreports/Makefile
	@@ -26,7 +26,6 @@
	HSQLDB_DESC= Install libraries required for HSQLDB

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	EXTRACT_CMD= ${CP}
	EXTRACT_BEFORE_ARGS= # empty
	Index: databases/jdbc-oracle11g/Makefile
	===================================================================
	--- databases/jdbc-oracle11g/Makefile
	+++ databases/jdbc-oracle11g/Makefile
	@@ -14,7 +14,6 @@
	COMMENT= JDBC drivers for Oracle 11g

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_WRKSUBDIR= yes

	Index: databases/jrobin/Makefile
	===================================================================
	--- databases/jrobin/Makefile
	+++ databases/jrobin/Makefile
	@@ -12,7 +12,6 @@
	COMMENT= Pure Java alternative to RRDTool

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	CLASSES= jrobin
	Index: databases/jrrd/Makefile
	===================================================================
	--- databases/jrrd/Makefile
	+++ databases/jrrd/Makefile
	@@ -14,7 +14,6 @@

	USES= libtool
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_VENDOR= openjdk
	JAVA_BUILD= yes
	JAVA_RUN= yes
	Index: databases/libgda5/Makefile
	===================================================================
	--- databases/libgda5/Makefile
	+++ databases/libgda5/Makefile
	@@ -95,7 +95,6 @@

	.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
	Index: databases/postgis-jdbc/Makefile
	===================================================================
	--- databases/postgis-jdbc/Makefile
	+++ databases/postgis-jdbc/Makefile
	@@ -17,7 +17,6 @@

	USES= zip:infozip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: databases/powerarchitect/Makefile
	===================================================================
	--- databases/powerarchitect/Makefile
	+++ databases/powerarchitect/Makefile
	@@ -13,7 +13,6 @@
	LICENSE= GPLv3

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PORTDOCS= *
	Index: databases/puppetdb5/Makefile
	===================================================================
	--- databases/puppetdb5/Makefile
	+++ databases/puppetdb5/Makefile
	@@ -30,7 +30,6 @@
	USE_JAVA= yes
	NO_ARCH= yes
	NO_BUILD= yes
	-JAVA_VERSION= 1.7+

	USERS= puppetdb
	GROUPS= puppetdb
	Index: databases/puppetdb6/Makefile
	===================================================================
	--- databases/puppetdb6/Makefile
	+++ databases/puppetdb6/Makefile
	@@ -30,7 +30,6 @@
	USE_JAVA= yes
	NO_ARCH= yes
	NO_BUILD= yes
	-JAVA_VERSION= 1.7+

	USERS= puppetdb
	GROUPS= puppetdb
	Index: deskutils/docear/Makefile
	===================================================================
	--- deskutils/docear/Makefile
	+++ deskutils/docear/Makefile
	@@ -20,7 +20,6 @@
	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
	Index: deskutils/freemind/Makefile
	===================================================================
	--- deskutils/freemind/Makefile
	+++ deskutils/freemind/Makefile
	@@ -18,7 +18,6 @@

	USES= cpe zip:infozip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
	DATAFILES= accessories browser doc lib plugins patterns.xml
	Index: deskutils/freeplane/Makefile
	===================================================================
	--- deskutils/freeplane/Makefile
	+++ deskutils/freeplane/Makefile
	@@ -16,7 +16,6 @@
	USES= cpe zip

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_ARCH= yes
	NO_BUILD= yes
	PLIST_SUB= PORTVERSION="${PORTVERSION}"
	Index: deskutils/ganttproject/Makefile
	===================================================================
	--- deskutils/ganttproject/Makefile
	+++ deskutils/ganttproject/Makefile
	@@ -19,7 +19,6 @@
	bash_CMD= /bin/sh

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	NO_ARCH= yes
	NO_BUILD= yes
	Index: deskutils/projectlibre/Makefile
	===================================================================
	--- deskutils/projectlibre/Makefile
	+++ deskutils/projectlibre/Makefile
	@@ -17,7 +17,6 @@
	LICENSE= CPAL-1.0

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_ARCH= yes
	NO_BUILD= yes
	Index: deskutils/thinkingrock/Makefile
	===================================================================
	--- deskutils/thinkingrock/Makefile
	+++ deskutils/thinkingrock/Makefile
	@@ -15,7 +15,6 @@
	${LOCALBASE}/bin/xdg-email:devel/xdg-utils

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	SUB_FILES= pkg-message
	Index: devel/antlr3/Makefile
	===================================================================
	--- devel/antlr3/Makefile
	+++ devel/antlr3/Makefile
	@@ -17,7 +17,6 @@
	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
	Index: devel/apache-commons-configuration/Makefile
	===================================================================
	--- devel/apache-commons-configuration/Makefile
	+++ devel/apache-commons-configuration/Makefile
	@@ -22,7 +22,6 @@
	OPTIONS_DEFINE= DOCS

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PORTDOCS= *
	Index: devel/apache-commons-daemon/Makefile
	===================================================================
	--- devel/apache-commons-daemon/Makefile
	+++ devel/apache-commons-daemon/Makefile
	@@ -18,7 +18,6 @@
	OPTIONS_DEFINE= DOCS

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native
	GNU_CONFIGURE= yes
	CONFIGURE_ARGS= --with-java=${JAVA_HOME}
	Index: devel/apache-commons-io/Makefile
	===================================================================
	--- devel/apache-commons-io/Makefile
	+++ devel/apache-commons-io/Makefile
	@@ -14,7 +14,7 @@
	LICENSE= APACHE20
	LICENSE_FILE= ${WRKSRC}/LICENSE.txt

	-USE_JAVA= 1.7+
	+USE_JAVA= yes

	NO_ARCH= yes
	NO_BUILD= yes
	Index: devel/apache-commons-jxpath/Makefile
	===================================================================
	--- devel/apache-commons-jxpath/Makefile
	+++ devel/apache-commons-jxpath/Makefile
	@@ -14,7 +14,6 @@
	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
	Index: devel/apache-commons-modeler/Makefile
	===================================================================
	--- devel/apache-commons-modeler/Makefile
	+++ devel/apache-commons-modeler/Makefile
	@@ -13,7 +13,6 @@
	LICENSE= APACHE20

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
	Index: devel/argouml/Makefile
	===================================================================
	--- devel/argouml/Makefile
	+++ devel/argouml/Makefile
	@@ -24,7 +24,6 @@
	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
	NO_BUILD= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	SUB_FILES= argouml.sh
	SUB_LIST= JAVA_VERSION=${JAVA_VERSION}
	Index: devel/astah-community/Makefile
	===================================================================
	--- devel/astah-community/Makefile
	+++ devel/astah-community/Makefile
	@@ -21,7 +21,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	REVISION= b4c6e9

	WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX:S!-!_!}
	Index: devel/avalon-framework/Makefile
	===================================================================
	--- devel/avalon-framework/Makefile
	+++ devel/avalon-framework/Makefile
	@@ -11,7 +11,6 @@
	COMMENT= Apache Avalon core framework for component programming

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	WRKSRC= ${WRKDIR}/${PORTNAME}
	Index: devel/charva/Makefile
	===================================================================
	--- devel/charva/Makefile
	+++ devel/charva/Makefile
	@@ -22,7 +22,6 @@
	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

	Index: devel/doctorj/Makefile
	===================================================================
	--- devel/doctorj/Makefile
	+++ devel/doctorj/Makefile
	@@ -11,7 +11,6 @@
	COMMENT= Tool for analyzing Java code and documentation

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes

	ALL_TARGET= jarfile
	Index: devel/flex-sdk/Makefile
	===================================================================
	--- devel/flex-sdk/Makefile
	+++ devel/flex-sdk/Makefile
	@@ -12,7 +12,6 @@
	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
	Index: devel/flex-sdk35/Makefile
	===================================================================
	--- devel/flex-sdk35/Makefile
	+++ devel/flex-sdk35/Makefile
	@@ -14,7 +14,6 @@
	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}
	Index: devel/flexjson/Makefile
	===================================================================
	--- devel/flexjson/Makefile
	+++ devel/flexjson/Makefile
	@@ -13,7 +13,6 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: devel/gitblit/Makefile
	===================================================================
	--- devel/gitblit/Makefile
	+++ devel/gitblit/Makefile
	@@ -23,7 +23,6 @@
	GROUPS= www

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	SUB_FILES= pkg-message
	PLIST_SUB+= GB_DATAHOME=${PREFIX}/${PORTNAME} \
	Index: devel/gogland-eap/Makefile
	===================================================================
	--- devel/gogland-eap/Makefile
	+++ devel/gogland-eap/Makefile
	@@ -21,7 +21,6 @@
	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
	Index: devel/gradle/Makefile
	===================================================================
	--- devel/gradle/Makefile
	+++ devel/gradle/Makefile
	@@ -14,7 +14,6 @@

	NO_ARCH= yes
	USES= zip
	-JAVA_VERSION= 1.7+
	USE_JAVA= yes
	NO_BUILD= yes
	SUB_LIST= PORTVERSION=${PORTVERSION} \
	Index: devel/gradle4/Makefile
	===================================================================
	--- devel/gradle4/Makefile
	+++ devel/gradle4/Makefile
	@@ -15,7 +15,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
	NO_ARCH= yes
	Index: devel/hadoop/Makefile
	===================================================================
	--- devel/hadoop/Makefile
	+++ devel/hadoop/Makefile
	@@ -27,7 +27,6 @@
	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
	Index: devel/hadoop2/Makefile
	===================================================================
	--- devel/hadoop2/Makefile
	+++ devel/hadoop2/Makefile
	@@ -39,7 +39,6 @@
	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
	Index: devel/hive/Makefile
	===================================================================
	--- devel/hive/Makefile
	+++ devel/hive/Makefile
	@@ -25,7 +25,6 @@
	USES= cpe
	CPE_VENDOR= apache
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	WRKSRC= ${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}-src

	HIVE_USER= hive
	Index: devel/ireport/Makefile
	===================================================================
	--- devel/ireport/Makefile
	+++ devel/ireport/Makefile
	@@ -12,7 +12,6 @@

	USES= dos2unix
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	DOS2UNIX_GLOB= *.txt
	NO_BUILD= yes

	Index: devel/itext/Makefile
	===================================================================
	--- devel/itext/Makefile
	+++ devel/itext/Makefile
	@@ -26,7 +26,6 @@
	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
	Index: devel/java-findbugs/Makefile
	===================================================================
	--- devel/java-findbugs/Makefile
	+++ devel/java-findbugs/Makefile
	@@ -3,6 +3,7 @@

	PORTNAME= findbugs
	PORTVERSION= 1.3.9
	+PORTREVISION= 1
	CATEGORIES= devel java
	MASTER_SITES= SF
	PKGNAMEPREFIX= java-
	Index: devel/java-findbugs/files/patch-findbugs2
	===================================================================
	--- devel/java-findbugs/files/patch-findbugs2
	+++ 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 \
	Index: devel/jcmdline/Makefile
	===================================================================
	--- devel/jcmdline/Makefile
	+++ devel/jcmdline/Makefile
	@@ -13,7 +13,6 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: devel/jiic/Makefile
	===================================================================
	--- devel/jiic/Makefile
	+++ devel/jiic/Makefile
	@@ -16,7 +16,6 @@

	WRKSRC= ${WRKDIR}/${PORTNAME}
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES
	ALL_TARGET= jar
	Index: devel/jsap/Makefile
	===================================================================
	--- devel/jsap/Makefile
	+++ devel/jsap/Makefile
	@@ -12,7 +12,6 @@
	COMMENT= Java package to parse command-line arguments

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: devel/leiningen/Makefile
	===================================================================
	--- devel/leiningen/Makefile
	+++ devel/leiningen/Makefile
	@@ -18,7 +18,6 @@

	USES= shebangfix
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_ARCH= yes
	NO_BUILD= yes

	Index: devel/libvirt-java/Makefile
	===================================================================
	--- devel/libvirt-java/Makefile
	+++ devel/libvirt-java/Makefile
	@@ -18,7 +18,6 @@
	junit>=4.8.2:java/junit

	USE_JAVA= YES
	-JAVA_VERSION= 1.6+
	USE_ANT= YES
	ALL_TARGET= jar

	Index: devel/looks/Makefile
	===================================================================
	--- devel/looks/Makefile
	+++ devel/looks/Makefile
	@@ -15,7 +15,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	WRKSRC= ${WRKDIR}/jgoodies-${PORTNAME}-${PORTVERSION}
	Index: devel/maven/Makefile
	===================================================================
	--- devel/maven/Makefile
	+++ devel/maven/Makefile
	@@ -19,7 +19,6 @@

	CPE_PRODUCT= maven
	CPE_VENDOR= apache
	-JAVA_VERSION= 1.7+
	NO_BUILD= yes
	NO_ARCH= yes
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: devel/maven3/Makefile
	===================================================================
	--- devel/maven3/Makefile
	+++ devel/maven3/Makefile
	@@ -19,7 +19,6 @@
	CPE_VENDOR= apache

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION}
	Index: devel/maven31/Makefile
	===================================================================
	--- devel/maven31/Makefile
	+++ devel/maven31/Makefile
	@@ -20,7 +20,6 @@
	CPE_VENDOR= apache

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION}
	Index: devel/maven33/Makefile
	===================================================================
	--- devel/maven33/Makefile
	+++ devel/maven33/Makefile
	@@ -18,7 +18,6 @@
	CPE_VENDOR= apache

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	NO_BUILD= yes
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION}
	Index: devel/netscape-java40/Makefile
	===================================================================
	--- devel/netscape-java40/Makefile
	+++ devel/netscape-java40/Makefile
	@@ -17,7 +17,6 @@
	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror auto-accept

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: devel/ocaml-camljava/Makefile
	===================================================================
	--- devel/ocaml-camljava/Makefile
	+++ devel/ocaml-camljava/Makefile
	@@ -13,7 +13,6 @@

	USE_OCAML= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	post-patch:
	@${REINPLACE_CMD} -e "s,^$JAVAC=$.*,\1${JAVAC},g" \
	Index: devel/oozie/Makefile
	===================================================================
	--- devel/oozie/Makefile
	+++ devel/oozie/Makefile
	@@ -29,7 +29,6 @@

	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
	Index: devel/p5-Inline-Java/Makefile
	===================================================================
	--- devel/p5-Inline-Java/Makefile
	+++ devel/p5-Inline-Java/Makefile
	@@ -18,7 +18,6 @@
	p5-Inline-C>=0.62:devel/p5-Inline-C

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native

	MAKE_JOBS_UNSAFE= yes
	Index: devel/p5-Java/Makefile
	===================================================================
	--- devel/p5-Java/Makefile
	+++ devel/p5-Java/Makefile
	@@ -15,7 +15,6 @@
	USES= perl5
	USE_PERL5= configure
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	post-patch:
	${RM} ${WRKSRC}/java_server_install.pl
	Index: devel/pig/Makefile
	===================================================================
	--- devel/pig/Makefile
	+++ devel/pig/Makefile
	@@ -24,7 +24,6 @@
	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}"
	Index: devel/pmd/Makefile
	===================================================================
	--- devel/pmd/Makefile
	+++ devel/pmd/Makefile
	@@ -16,7 +16,6 @@
	USES= zip

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	NO_BUILD= yes
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	PLIST_SUB+= PORTVERSION=${PORTVERSION}
	Index: devel/py-jcc/Makefile
	===================================================================
	--- devel/py-jcc/Makefile
	+++ devel/py-jcc/Makefile
	@@ -24,7 +24,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'
	Index: devel/py-jep/Makefile
	===================================================================
	--- devel/py-jep/Makefile
	+++ devel/py-jep/Makefile
	@@ -19,7 +19,6 @@
	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}

	Index: devel/pycharm-ce/Makefile
	===================================================================
	--- devel/pycharm-ce/Makefile
	+++ devel/pycharm-ce/Makefile
	@@ -19,7 +19,6 @@
	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
	Index: devel/sabre/Makefile
	===================================================================
	--- devel/sabre/Makefile
	+++ devel/sabre/Makefile
	@@ -16,7 +16,6 @@
	USES= dos2unix zip
	DOS2UNIX_GLOB= .xml .java
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	ALL_TARGET= dist

	Index: devel/simian/Makefile
	===================================================================
	--- devel/simian/Makefile
	+++ devel/simian/Makefile
	@@ -39,7 +39,6 @@

	.if ${PORT_OPTIONS:MJAVA}
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	PLIST_SUB+= JAVA=""
	SUB_LIST+= JAVA=""
	.else
	Index: devel/smc/Makefile
	===================================================================
	--- devel/smc/Makefile
	+++ devel/smc/Makefile
	@@ -13,7 +13,6 @@
	COMMENT= The State Machine Compiler

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PORTEXAMPLES= *
	Index: devel/soapui/Makefile
	===================================================================
	--- devel/soapui/Makefile
	+++ devel/soapui/Makefile
	@@ -25,7 +25,7 @@

	USES= cpe
	CPE_VENDOR= smartbear
	-USE_JAVA= 1.7+
	+USE_JAVA= yes
	WRKSRC= ${WRKDIR}/SoapUI-${PORTVERSION}
	REINPLACE_ARGS= -i ''
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: devel/sonar-ant-task/Makefile
	===================================================================
	--- devel/sonar-ant-task/Makefile
	+++ devel/sonar-ant-task/Makefile
	@@ -25,7 +25,6 @@
	CPE_VENDOR= sonarsource

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	SUB_FILES= pkg-message
	PLIST_FILES= ${DATADIR_REL}/sonar-ant-task.jar
	Index: devel/sonar-scanner-cli/Makefile
	===================================================================
	--- devel/sonar-scanner-cli/Makefile
	+++ devel/sonar-scanner-cli/Makefile
	@@ -22,7 +22,6 @@
	CPE_VENDOR= sonarsource

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	SR= sonar-runner
	SQ_CLI= sonar-scanner
	Index: devel/sonarqube/Makefile
	===================================================================
	--- devel/sonarqube/Makefile
	+++ devel/sonarqube/Makefile
	@@ -29,7 +29,6 @@
	DOS2UNIX_GLOB= .properties .conf

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	SQ_FILE= sonar.sh
	SQ_HOME= ${PREFIX}/share/${PORTNAME}
	Index: devel/spark/Makefile
	===================================================================
	--- devel/spark/Makefile
	+++ devel/spark/Makefile
	@@ -25,7 +25,6 @@

	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

	Index: devel/statcvs/Makefile
	===================================================================
	--- devel/statcvs/Makefile
	+++ devel/statcvs/Makefile
	@@ -20,7 +20,6 @@
	USES= zip
	USE_JAVA= yes
	USE_ANT= yes
	-JAVA_VERSION= 1.6+
	NO_ARCH= yes

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
	Index: devel/statsvn/Makefile
	===================================================================
	--- devel/statsvn/Makefile
	+++ devel/statsvn/Makefile
	@@ -21,7 +21,6 @@
	USES= zip
	USE_JAVA= yes
	USE_ANT= yes
	-JAVA_VERSION= 1.6+
	NO_ARCH= yes

	ALL_TARGET= dist
	Index: devel/swank-clojure/Makefile
	===================================================================
	--- devel/swank-clojure/Makefile
	+++ devel/swank-clojure/Makefile
	@@ -11,7 +11,6 @@
	USE_GITHUB= yes
	GH_ACCOUNT= technomancy
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	PLIST_FILES= %%JAVAJARDIR%%/swank-clojure-1.2.1.jar

	Index: devel/tijmp/Makefile
	===================================================================
	--- devel/tijmp/Makefile
	+++ devel/tijmp/Makefile
	@@ -18,7 +18,6 @@
	INSTALL_TARGET= install-strip
	USES= gmake libtool
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native
	JAVA_BUILD= jdk
	USE_LDCONFIG= yes
	Index: devel/tinylaf/Makefile
	===================================================================
	--- devel/tinylaf/Makefile
	+++ devel/tinylaf/Makefile
	@@ -13,7 +13,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	JARFILE= ${PORTNAME}.jar tinycp.jar
	Index: devel/violet/Makefile
	===================================================================
	--- devel/violet/Makefile
	+++ devel/violet/Makefile
	@@ -15,7 +15,6 @@
	LICENSE= GPLv2

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= YES

	Index: dns/crossip/Makefile
	===================================================================
	--- dns/crossip/Makefile
	+++ dns/crossip/Makefile
	@@ -14,7 +14,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes

	Index: dns/dnsjava/Makefile
	===================================================================
	--- dns/dnsjava/Makefile
	+++ dns/dnsjava/Makefile
	@@ -15,7 +15,6 @@
	USE_GITHUB= yes

	USE_JAVA= yes
	-JAVA_VERSION= 7+
	USE_ANT= yes
	ALL_TARGET= jar
	NO_ARCH= yes
	Index: editors/drjava/Makefile
	===================================================================
	--- editors/drjava/Makefile
	+++ editors/drjava/Makefile
	@@ -15,7 +15,6 @@

	NO_BUILD= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	SUB_FILES= ${PORTNAME}
	SUB_LIST= DRJAVAJAR=${DRJAVAJAR}
	Index: editors/jedit/Makefile
	===================================================================
	--- editors/jedit/Makefile
	+++ editors/jedit/Makefile
	@@ -23,7 +23,6 @@
	USES= cpe xorg

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	USE_XORG= x11
	NO_BUILD= yes
	Index: editors/omegaT/Makefile
	===================================================================
	--- editors/omegaT/Makefile
	+++ editors/omegaT/Makefile
	@@ -24,7 +24,6 @@
	USE_ANT= yes
	USE_JAVA= yes
	JAVA_VENDOR= openjdk
	-JAVA_VERSION= 1.7+
	JAVA_BUILD= yes
	JAVA_RUN= yes
	NO_WRKSUBDIR= yes
	Index: editors/openoffice-4/Makefile
	===================================================================
	--- editors/openoffice-4/Makefile
	+++ editors/openoffice-4/Makefile
	@@ -105,7 +105,6 @@
	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
	Index: editors/openoffice-devel/Makefile
	===================================================================
	--- editors/openoffice-devel/Makefile
	+++ editors/openoffice-devel/Makefile
	@@ -108,7 +108,6 @@
	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
	Index: editors/treeform/Makefile
	===================================================================
	--- editors/treeform/Makefile
	+++ editors/treeform/Makefile
	@@ -13,7 +13,6 @@
	USES= zip
	NO_BUILD= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	SUB_FILES= treeform

	WRKSRC= ${WRKDIR}/TreeForm
	Index: emulators/javatari/Makefile
	===================================================================
	--- emulators/javatari/Makefile
	+++ emulators/javatari/Makefile
	@@ -19,7 +19,6 @@
	EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \
	bin/javatari
	Index: finance/jgnash/Makefile
	===================================================================
	--- finance/jgnash/Makefile
	+++ finance/jgnash/Makefile
	@@ -20,7 +20,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_VENDOR= openjdk

	NO_BUILD= yes
	Index: finance/venice/Makefile
	===================================================================
	--- finance/venice/Makefile
	+++ finance/venice/Makefile
	@@ -17,7 +17,6 @@

	USES= gnome
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PORTDOCS= *
	Index: ftp/jftp/Makefile
	===================================================================
	--- ftp/jftp/Makefile
	+++ ftp/jftp/Makefile
	@@ -13,7 +13,6 @@

	LICENSE= GPLv2

	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	USE_JAVA= yes
	WRKSRC= ${WRKDIR}/j-ftp
	Index: games/blackjackclient/Makefile
	===================================================================
	--- games/blackjackclient/Makefile
	+++ games/blackjackclient/Makefile
	@@ -14,7 +14,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	PLIST_FILES= bin/${PORTNAME} \
	${JAVAJARDIR}/${PORTNAME}.jar
	SUB_FILES= ${PORTNAME}.sh
	Index: games/castlevox/Makefile
	===================================================================
	--- games/castlevox/Makefile
	+++ games/castlevox/Makefile
	@@ -14,7 +14,6 @@
	BROKEN= unfetchable

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: games/dmjava/Makefile
	===================================================================
	--- games/dmjava/Makefile
	+++ games/dmjava/Makefile
	@@ -16,7 +16,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	do-install:
	Index: games/domination/Makefile
	===================================================================
	--- games/domination/Makefile
	+++ games/domination/Makefile
	@@ -19,7 +19,6 @@
	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/}
	Index: games/freecol/Makefile
	===================================================================
	--- games/freecol/Makefile
	+++ games/freecol/Makefile
	@@ -17,7 +17,6 @@
	NO_BUILD= yes
	SUB_FILES= freecol
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	PLIST_FILES= bin/freecol \
	${DESKTOPDIR:S,^${PREFIX}/,,}/freecol.desktop
	Index: games/java-games-suite/Makefile
	===================================================================
	--- games/java-games-suite/Makefile
	+++ games/java-games-suite/Makefile
	@@ -13,7 +13,6 @@

	NO_ARCH= yes

	-JAVA_VERSION= 1.6+
	PLIST_FILES= bin/java-games-suite \
	${JAVAJARDIR}/MM.jar \
	${JAVAJARDIR}/reversi.jar \
	Index: games/jchessboard/Makefile
	===================================================================
	--- games/jchessboard/Makefile
	+++ games/jchessboard/Makefile
	@@ -16,7 +16,6 @@
	USES= tar:tgz
	USE_ANT= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_LOCALE= en_US.ISO8859-1
	NO_ARCH= yes

	Index: games/jinput/Makefile
	===================================================================
	--- games/jinput/Makefile
	+++ games/jinput/Makefile
	@@ -17,7 +17,6 @@

	USES= tar:bzip2
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native
	JAVA_VENDOR= openjdk
	USE_ANT= yes
	Index: games/jtans/Makefile
	===================================================================
	--- games/jtans/Makefile
	+++ games/jtans/Makefile
	@@ -19,7 +19,6 @@
	EXTRACT_BEFORE_ARGS= # empty
	EXTRACT_AFTER_ARGS= .
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	SUB_FILES= jtans.sh
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: games/jutils/Makefile
	===================================================================
	--- games/jutils/Makefile
	+++ games/jutils/Makefile
	@@ -18,7 +18,7 @@
	GL_ACCOUNT= voidanix
	GL_COMMIT= 3b2f176fdb76126c831a695b579267cf351624f5

	-USE_JAVA= 6+
	+USE_JAVA= yes

	PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
	PLIST_DIRS= ${JAVAJARDIR}/${PORTNAME}
	Index: games/lwjgl/Makefile
	===================================================================
	--- games/lwjgl/Makefile
	+++ games/lwjgl/Makefile
	@@ -29,7 +29,6 @@
	DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$
	USE_JAVA= yes
	USE_LDCONFIG= yes
	-JAVA_VERSION= 1.7+
	JAVA_OS= native
	JAVA_VENDOR= openjdk
	USE_ANT= yes
	Index: games/moagg/Makefile
	===================================================================
	--- games/moagg/Makefile
	+++ games/moagg/Makefile
	@@ -22,7 +22,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PORTDOCS= AUTHORS README.txt
	Index: games/pcgen/Makefile
	===================================================================
	--- games/pcgen/Makefile
	+++ games/pcgen/Makefile
	@@ -14,7 +14,6 @@
	USES= zip
	WRKSRC= ${WRKDIR}/${PORTNAME}
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: games/rescue/Makefile
	===================================================================
	--- games/rescue/Makefile
	+++ games/rescue/Makefile
	@@ -17,7 +17,6 @@
	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/}
	Index: games/robocode-naval/Makefile
	===================================================================
	--- games/robocode-naval/Makefile
	+++ games/robocode-naval/Makefile
	@@ -19,7 +19,6 @@
	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
	Index: games/robocode/Makefile
	===================================================================
	--- games/robocode/Makefile
	+++ games/robocode/Makefile
	@@ -18,7 +18,6 @@
	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
	Index: games/spicetrade/Makefile
	===================================================================
	--- games/spicetrade/Makefile
	+++ games/spicetrade/Makefile
	@@ -14,7 +14,6 @@
	COMMENT= Colourful 14th century Arab spice trading game

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	NO_BUILD= yes
	NO_ARCH= yes
	Index: games/stendhal/Makefile
	===================================================================
	--- games/stendhal/Makefile
	+++ games/stendhal/Makefile
	@@ -16,7 +16,6 @@
	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	USES= shebangfix

	Index: graphics/aoi/Makefile
	===================================================================
	--- graphics/aoi/Makefile
	+++ graphics/aoi/Makefile
	@@ -21,7 +21,6 @@
	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}
	Index: graphics/barbecue/Makefile
	===================================================================
	--- graphics/barbecue/Makefile
	+++ graphics/barbecue/Makefile
	@@ -16,7 +16,6 @@
	RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:java/jdom

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	JARFILES= ${PORTNAME}-${DISTVERSION}.jar
	Index: graphics/batik/Makefile
	===================================================================
	--- graphics/batik/Makefile
	+++ graphics/batik/Makefile
	@@ -16,7 +16,7 @@
	CPE_VENDOR= apache

	USES= cpe
	-USE_JAVA= 1.7+
	+USE_JAVA= yes

	NO_ARCH= yes
	NO_BUILD= yes
	Index: graphics/cbviewer/Makefile
	===================================================================
	--- graphics/cbviewer/Makefile
	+++ graphics/cbviewer/Makefile
	@@ -23,7 +23,6 @@
	USES= dos2unix zip
	DOS2UNIX_GLOB= CREDITS
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: graphics/cosmoplayer/Makefile
	===================================================================
	--- graphics/cosmoplayer/Makefile
	+++ graphics/cosmoplayer/Makefile
	@@ -22,7 +22,6 @@
	RUN_DEPENDS= ${JAVALIBDIR}/java40.jar:devel/netscape-java40

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: graphics/ditaa/Makefile
	===================================================================
	--- graphics/ditaa/Makefile
	+++ graphics/ditaa/Makefile
	@@ -15,7 +15,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes
	NO_ARCH= yes
	Index: graphics/geoserver/Makefile
	===================================================================
	--- graphics/geoserver/Makefile
	+++ graphics/geoserver/Makefile
	@@ -15,7 +15,6 @@
	USES= zip
	USE_JAVA= yes

	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
	Index: graphics/jalbum/Makefile
	===================================================================
	--- graphics/jalbum/Makefile
	+++ graphics/jalbum/Makefile
	@@ -16,7 +16,6 @@
	NO_BUILD= yes

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}

	SUB_FILES= jalbum.sh
	Index: graphics/jave6/Makefile
	===================================================================
	--- graphics/jave6/Makefile
	+++ graphics/jave6/Makefile
	@@ -16,7 +16,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	SUB_FILES= jave6 pkg-message
	Index: graphics/jdraw/Makefile
	===================================================================
	--- graphics/jdraw/Makefile
	+++ graphics/jdraw/Makefile
	@@ -37,6 +37,5 @@
	PLASTIC3D= "-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
	RUN_DEPENDS+= ${JAVALIBDIR}/looks.jar:devel/looks
	.endif
	-JAVA_VERSION= 1.6+

	.include <bsd.port.mk>
	Index: graphics/jogl/Makefile
	===================================================================
	--- graphics/jogl/Makefile
	+++ graphics/jogl/Makefile
	@@ -35,7 +35,6 @@
	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
	Index: graphics/jpatch/Makefile
	===================================================================
	--- graphics/jpatch/Makefile
	+++ graphics/jpatch/Makefile
	@@ -13,7 +13,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION}

	Index: graphics/libpano13/Makefile
	===================================================================
	--- graphics/libpano13/Makefile
	+++ graphics/libpano13/Makefile
	@@ -38,7 +38,6 @@

	.if ${PORT_OPTIONS:MJAVA}
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native
	CONFIGURE_ARGS+= --with-java=${JAVA_HOME}
	.else
	Index: graphics/lightzone/Makefile
	===================================================================
	--- graphics/lightzone/Makefile
	+++ graphics/lightzone/Makefile
	@@ -41,7 +41,6 @@
	USE_LDCONFIG= yes
	USE_XORG= x11
	JAVA_VENDOR= openjdk
	-JAVA_VERSION= 1.6+
	JAVA_BUILD= yes
	JAVA_RUN= yes
	INSTALLS_ICONS= yes
	Index: graphics/mapyrus/Makefile
	===================================================================
	--- graphics/mapyrus/Makefile
	+++ graphics/mapyrus/Makefile
	@@ -15,8 +15,6 @@

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}

	-JAVA_VERSION= 1.6+
	-
	MAPYRUSDOCS= ${PORTNAME}.pdf
	MAPYRUSJAR= ${PORTNAME}.jar

	Index: graphics/opendx/Makefile
	===================================================================
	--- graphics/opendx/Makefile
	+++ graphics/opendx/Makefile
	@@ -53,7 +53,6 @@
	.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 \
	Index: graphics/tintfu/Makefile
	===================================================================
	--- graphics/tintfu/Makefile
	+++ graphics/tintfu/Makefile
	@@ -18,7 +18,6 @@
	EXTRACT_AFTER_ARGS= .
	NO_BUILD= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}.jar \
	bin/tintfu
	Index: graphics/xmlgraphics-commons/Makefile
	===================================================================
	--- graphics/xmlgraphics-commons/Makefile
	+++ graphics/xmlgraphics-commons/Makefile
	@@ -13,7 +13,7 @@
	LICENSE= APACHE20
	LICENSE_FILE= ${WRKSRC}/LICENSE

	-USE_JAVA= 1.6+
	+USE_JAVA= yes

	NO_ARCH= yes
	NO_BUILD= yes
	Index: java/apache-commons-cli/Makefile
	===================================================================
	--- java/apache-commons-cli/Makefile
	+++ java/apache-commons-cli/Makefile
	@@ -14,7 +14,6 @@
	LICENSE= APACHE20

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
	Index: java/apache-commons-lang/Makefile
	===================================================================
	--- java/apache-commons-lang/Makefile
	+++ java/apache-commons-lang/Makefile
	@@ -14,7 +14,6 @@
	LICENSE= APACHE20

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	ALL_TARGET= jar

	Index: java/apache-commons-lang3/Makefile
	===================================================================
	--- java/apache-commons-lang3/Makefile
	+++ java/apache-commons-lang3/Makefile
	@@ -15,7 +15,6 @@
	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: java/apache-commons-logging/Makefile
	===================================================================
	--- java/apache-commons-logging/Makefile
	+++ java/apache-commons-logging/Makefile
	@@ -18,7 +18,6 @@
	OPTIONS_DEFINE= DOCS

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	JARFILE= ${PORTNAME}-${PORTVERSION}.jar
	Index: java/apache-commons-primitives/Makefile
	===================================================================
	--- java/apache-commons-primitives/Makefile
	+++ java/apache-commons-primitives/Makefile
	@@ -14,7 +14,6 @@
	LICENSE= APACHE20

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
	Index: java/aparapi/Makefile
	===================================================================
	--- java/aparapi/Makefile
	+++ java/aparapi/Makefile
	@@ -22,7 +22,6 @@
	USE_GITHUB= yes

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	USE_ANT= yes
	ALL_TARGET= dist

	Index: java/avis/Makefile
	===================================================================
	--- java/avis/Makefile
	+++ java/avis/Makefile
	@@ -13,7 +13,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

	.if !defined(WITHOUT_COMPILE)
	Index: java/berkeley-db/Makefile
	===================================================================
	--- java/berkeley-db/Makefile
	+++ java/berkeley-db/Makefile
	@@ -19,7 +19,6 @@
	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
	Index: java/bouncycastle/Makefile
	===================================================================
	--- java/bouncycastle/Makefile
	+++ java/bouncycastle/Makefile
	@@ -23,7 +23,6 @@
	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
	Index: java/bouncycastle15/Makefile
	===================================================================
	--- java/bouncycastle15/Makefile
	+++ java/bouncycastle15/Makefile
	@@ -30,7 +30,6 @@
	CPE_VENDOR= ${PORTNAME}
	USE_JAVA= yes
	USES= cpe
	-JAVA_VERSION= 1.6+
	JDKMVERSION= 1.5
	JDKNVERSION= 15
	USE_ANT= yes
	Index: java/castor/Makefile
	===================================================================
	--- java/castor/Makefile
	+++ java/castor/Makefile
	@@ -16,7 +16,6 @@

	USES= cpe
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}-anttasks.jar \
	Index: java/cryptix-jce/Makefile
	===================================================================
	--- java/cryptix-jce/Makefile
	+++ java/cryptix-jce/Makefile
	@@ -12,7 +12,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	OPTIONS_DEFINE= DOCS
	Index: java/dbvis/Makefile
	===================================================================
	--- java/dbvis/Makefile
	+++ java/dbvis/Makefile
	@@ -16,7 +16,6 @@
	LICENSE_PERMS= auto-accept

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	JAVA_VENDOR= openjdk
	NO_BUILD= yes
	RESTRICTED= Redistribution is not permitted
	Index: java/eclipse-drjava/Makefile
	===================================================================
	--- java/eclipse-drjava/Makefile
	+++ java/eclipse-drjava/Makefile
	@@ -19,7 +19,6 @@
	NO_WRKSUBDIR= yes
	USE_JAVA= yes

	-JAVA_VERSION= 1.6+
	JAVA_OS= native

	DATADIR= ${PREFIX}/lib/eclipse/plugins
	Index: java/eclipse-ecj/Makefile
	===================================================================
	--- java/eclipse-ecj/Makefile
	+++ java/eclipse-ecj/Makefile
	@@ -20,7 +20,6 @@

	USE_ANT= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	SUB_FILES= ecj.sh
	SUB_LIST= PORTVERSION=${PORTVERSION}
	NO_WRKSUBDIR= yes
	Index: java/eclipse-findbugs/Makefile
	===================================================================
	--- java/eclipse-findbugs/Makefile
	+++ java/eclipse-findbugs/Makefile
	@@ -17,7 +17,6 @@
	USES= zip
	NO_BUILD= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native

	PLIST_SUB= \
	Index: java/eclipse-shelled/Makefile
	===================================================================
	--- java/eclipse-shelled/Makefile
	+++ java/eclipse-shelled/Makefile
	@@ -19,7 +19,6 @@
	NO_BUILD= yes
	NO_WRKSUBDIR= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native

	do-install:
	Index: java/infobus/Makefile
	===================================================================
	--- java/infobus/Makefile
	+++ java/infobus/Makefile
	@@ -14,7 +14,6 @@

	USES= zip
	USE_JAVA= YES
	-JAVA_VERSION= 1.6+

	NO_WRKSUBDIR= yes
	NO_BUILD= yes
	Index: java/jai/Makefile
	===================================================================
	--- java/jai/Makefile
	+++ java/jai/Makefile
	@@ -14,7 +14,6 @@
	USES= cpe zip
	CPE_VENDOR= oracle
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
	NO_BUILD= yes

	Index: java/jakarta-bcel/Makefile
	===================================================================
	--- java/jakarta-bcel/Makefile
	+++ java/jakarta-bcel/Makefile
	@@ -12,7 +12,6 @@

	NO_BUILD= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_ARCH= yes

	PLIST_FILES= %%JAVAJARDIR%%/bcel.jar
	Index: java/jakarta-commons-beanutils/Makefile
	===================================================================
	--- java/jakarta-commons-beanutils/Makefile
	+++ java/jakarta-commons-beanutils/Makefile
	@@ -23,7 +23,6 @@
	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
	Index: java/jakarta-commons-discovery/Makefile
	===================================================================
	--- java/jakarta-commons-discovery/Makefile
	+++ java/jakarta-commons-discovery/Makefile
	@@ -12,7 +12,6 @@
	COMMENT= Java library for locating resources (including classes)

	USE_JAVA= YES
	-JAVA_VERSION= 1.6+
	NO_BUILD= YES
	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

	Index: java/jakarta-commons-httpclient/Makefile
	===================================================================
	--- java/jakarta-commons-httpclient/Makefile
	+++ java/jakarta-commons-httpclient/Makefile
	@@ -24,7 +24,6 @@
	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
	Index: java/jakarta-oro/Makefile
	===================================================================
	--- java/jakarta-oro/Makefile
	+++ java/jakarta-oro/Makefile
	@@ -14,7 +14,6 @@

	USE_JAVA= yes
	USE_ANT= yes
	-JAVA_VERSION= 1.6+
	ALL_TARGET= jar javadocs

	JAVALIBNAME= ${PORTNAME}-${PORTVERSION}
	Index: java/jakarta-regexp/Makefile
	===================================================================
	--- java/jakarta-regexp/Makefile
	+++ java/jakarta-regexp/Makefile
	@@ -16,7 +16,6 @@
	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}
	Index: java/jasmin/Makefile
	===================================================================
	--- java/jasmin/Makefile
	+++ java/jasmin/Makefile
	@@ -14,7 +14,6 @@
	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
	Index: java/java-subversion/Makefile
	===================================================================
	--- java/java-subversion/Makefile
	+++ java/java-subversion/Makefile
	@@ -10,7 +10,6 @@
	USES+= compiler

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	JAVA_OS= native
	JAVA_BUILD= yes
	JAVA_RUN= yes
	Index: java/java3d/Makefile
	===================================================================
	--- java/java3d/Makefile
	+++ java/java3d/Makefile
	@@ -21,7 +21,6 @@
	USE_JAVA= yes
	USE_GL= gl
	USE_XORG= xt
	-JAVA_VERSION= 1.6+
	JAVA_VENDOR= openjdk
	USE_ANT= yes
	LLD_UNSAFE= yes
	Index: java/javavmwrapper/Makefile
	===================================================================
	--- java/javavmwrapper/Makefile
	+++ 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
	Index: java/javavmwrapper/src/javavm.1
	===================================================================
	--- java/javavmwrapper/src/javavm.1
	+++ 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,8 +112,6 @@
	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 ,
	@@ -120,8 +118,6 @@
	.Ql 1.8+ ,
	.Ql 1.9 ,
	.Ql 1.9+ ,
	-.Ql 6 ,
	-.Ql 6+ ,
	.Ql 7 ,
	.Ql 7+ ,
	.Ql 8 ,
	@@ -202,8 +198,8 @@
	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.
	Index: java/javavmwrapper/src/javavmwrapper.sh
	===================================================================
	--- java/javavmwrapper/src/javavmwrapper.sh
	+++ java/javavmwrapper/src/javavmwrapper.sh
	@@ -173,8 +173,7 @@
	_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 @@
	_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 @@
	12+)
	_JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
	;;
	- 1.6)
	- _JAVAVM_VERSION="${_JAVAVM_VERSION} 6"
	- ;;
	1.7)
	_JAVAVM_VERSION="${_JAVAVM_VERSION} 7"
	;;
	Index: java/javavmwrapper/src/manvm.1
	===================================================================
	--- java/javavmwrapper/src/manvm.1
	+++ 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,8 +100,6 @@
	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 ,
	@@ -108,8 +106,6 @@
	.Ql 1.8+ ,
	.Ql 1.9 ,
	.Ql 1.9+ ,
	-.Ql 6 ,
	-.Ql 6+ ,
	.Ql 7 ,
	.Ql 7+ ,
	.Ql 8 ,
	Index: java/javavmwrapper/src/registervm.1
	===================================================================
	--- java/javavmwrapper/src/registervm.1
	+++ 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 @@
	.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
	Index: java/jaxen/Makefile
	===================================================================
	--- java/jaxen/Makefile
	+++ java/jaxen/Makefile
	@@ -12,7 +12,6 @@
	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
	Index: java/jcalendar/Makefile
	===================================================================
	--- java/jcalendar/Makefile
	+++ java/jcalendar/Makefile
	@@ -11,7 +11,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	WRKSRC= ${WRKDIR}/src
	PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \
	Index: java/jcommon/Makefile
	===================================================================
	--- java/jcommon/Makefile
	+++ java/jcommon/Makefile
	@@ -16,7 +16,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	OPTIONS_DEFINE= COMPILE DOCS
	OPTIONS_DEFAULT=COMPILE
	Index: java/jd-gui/Makefile
	===================================================================
	--- java/jd-gui/Makefile
	+++ java/jd-gui/Makefile
	@@ -19,7 +19,6 @@
	USE_GITHUB= yes
	GH_ACCOUNT= java-decompiler
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	NO_ARCH= yes
	NO_BUILD= yes
	Index: java/jdbcpool/Makefile
	===================================================================
	--- java/jdbcpool/Makefile
	+++ java/jdbcpool/Makefile
	@@ -13,7 +13,6 @@
	BROKEN= unfetchable

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PORTDOCS= CHANGES LICENSE README
	Index: java/jdom/Makefile
	===================================================================
	--- java/jdom/Makefile
	+++ java/jdom/Makefile
	@@ -13,7 +13,6 @@
	RUN_DEPENDS= ${JAVALIBDIR}/jaxen-jdom.jar:java/jaxen

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	ALL_TARGET= package

	Index: java/jfreechart/Makefile
	===================================================================
	--- java/jfreechart/Makefile
	+++ java/jfreechart/Makefile
	@@ -14,7 +14,6 @@
	RUN_DEPENDS= ${JAVALIBDIR}/jcommon.jar:java/jcommon

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	OPTIONS_DEFINE= COMPILE DOCS
	OPTIONS_DEFAULT=COMPILE
	Index: java/jgraph/Makefile
	===================================================================
	--- java/jgraph/Makefile
	+++ java/jgraph/Makefile
	@@ -22,7 +22,6 @@
	USES= zip
	NO_WRKSUBDIR= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_RUN= yes

	.include <bsd.port.options.mk>
	Index: java/jmf/Makefile
	===================================================================
	--- java/jmf/Makefile
	+++ java/jmf/Makefile
	@@ -13,7 +13,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= YES

	WRKSRC= ${WRKDIR}/JMF-${PORTVERSION}
	Index: java/jode/Makefile
	===================================================================
	--- java/jode/Makefile
	+++ java/jode/Makefile
	@@ -16,7 +16,6 @@

	VENDOR_VERSION= 1.1.2-pre1
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NEED_JAVAC= yes
	GNU_CONFIGURE= yes
	USES= gmake perl5 shebangfix
	Index: java/jomp/Makefile
	===================================================================
	--- java/jomp/Makefile
	+++ java/jomp/Makefile
	@@ -16,7 +16,6 @@
	BROKEN= unfetchable

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes
	NO_WRKSUBDIR= yes
	Index: java/jta/Makefile
	===================================================================
	--- java/jta/Makefile
	+++ java/jta/Makefile
	@@ -12,7 +12,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes
	NO_CDROM= See the license
	Index: java/jump/Makefile
	===================================================================
	--- java/jump/Makefile
	+++ java/jump/Makefile
	@@ -11,7 +11,6 @@
	COMMENT= Java library for arbitrary precision computations

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	ALL_TARGET= jar

	Index: java/mx4j/Makefile
	===================================================================
	--- java/mx4j/Makefile
	+++ java/mx4j/Makefile
	@@ -11,7 +11,6 @@
	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 \
	Index: java/servingxml/Makefile
	===================================================================
	--- java/servingxml/Makefile
	+++ java/servingxml/Makefile
	@@ -13,7 +13,6 @@

	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
	Index: java/springframework/Makefile
	===================================================================
	--- java/springframework/Makefile
	+++ java/springframework/Makefile
	@@ -17,7 +17,6 @@
	NO_BUILD= yes
	USE_JAVA= yes
	USES= zip
	-JAVA_VERSION= 1.6+

	OPTIONS_DEFINE= DOCS RESRCS
	RESRCS_DESC= Install resource files
	Index: java/springframework31/Makefile
	===================================================================
	--- java/springframework31/Makefile
	+++ java/springframework31/Makefile
	@@ -20,7 +20,6 @@
	NO_BUILD= yes
	USE_JAVA= yes
	USES= zip
	-JAVA_VERSION= 1.6+

	OPTIONS_DEFINE= DOCS RESRCS
	RESRCS_DESC= Install resource files
	Index: java/sqlitejdbc/Makefile
	===================================================================
	--- java/sqlitejdbc/Makefile
	+++ java/sqlitejdbc/Makefile
	@@ -16,7 +16,6 @@

	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
	Index: java/trove4j/Makefile
	===================================================================
	--- java/trove4j/Makefile
	+++ java/trove4j/Makefile
	@@ -13,7 +13,6 @@
	BROKEN= unfetchable

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PORTDOCS= javadocs AUTHORS.txt CHANGES.txt LICENSE.txt README-idea-devel.txt \
	Index: java/wildfly10/Makefile
	===================================================================
	--- java/wildfly10/Makefile
	+++ 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 @@

	USE_RC_SUBR= wildfly10
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	USER= www
	GROUP= www
	VAR_DIR?= /var
	Index: java/wildfly10/files/patch-bin_add-user.sh
	===================================================================
	--- java/wildfly10/files/patch-bin_add-user.sh
	+++ java/wildfly10/files/patch-bin_add-user.sh
	@@ -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;
	Index: java/wildfly10/files/wildfly10.in
	===================================================================
	--- java/wildfly10/files/wildfly10.in
	+++ java/wildfly10/files/wildfly10.in
	@@ -41,9 +41,6 @@
	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 ()
	{
	Index: java/wildfly11/Makefile
	===================================================================
	--- java/wildfly11/Makefile
	+++ 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 @@

	USE_RC_SUBR= wildfly11
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	USER= www
	GROUP= www
	VAR_DIR?= /var
	Index: java/wildfly11/files/patch-bin_add-user.sh
	===================================================================
	--- java/wildfly11/files/patch-bin_add-user.sh
	+++ java/wildfly11/files/patch-bin_add-user.sh
	@@ -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;
	Index: java/wildfly11/files/wildfly11.in
	===================================================================
	--- java/wildfly11/files/wildfly11.in
	+++ java/wildfly11/files/wildfly11.in
	@@ -41,9 +41,6 @@
	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 ()
	{
	Index: java/wildfly12/Makefile
	===================================================================
	--- java/wildfly12/Makefile
	+++ 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 @@

	USE_RC_SUBR= wildfly12
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	USER= www
	GROUP= www
	VAR_DIR?= /var
	Index: java/wildfly12/files/patch-bin_add-user.sh
	===================================================================
	--- java/wildfly12/files/patch-bin_add-user.sh
	+++ java/wildfly12/files/patch-bin_add-user.sh
	@@ -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;
	Index: java/wildfly12/files/wildfly12.in
	===================================================================
	--- java/wildfly12/files/wildfly12.in
	+++ java/wildfly12/files/wildfly12.in
	@@ -41,9 +41,6 @@
	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 ()
	{
	Index: java/wildfly13/Makefile
	===================================================================
	--- java/wildfly13/Makefile
	+++ 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 @@

	USE_RC_SUBR= wildfly13
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	USER= www
	GROUP= www
	VAR_DIR?= /var
	Index: java/wildfly13/files/patch-bin_add-user.sh
	===================================================================
	--- java/wildfly13/files/patch-bin_add-user.sh
	+++ java/wildfly13/files/patch-bin_add-user.sh
	@@ -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;
	Index: java/wildfly13/files/wildfly13.in
	===================================================================
	--- java/wildfly13/files/wildfly13.in
	+++ java/wildfly13/files/wildfly13.in
	@@ -40,9 +40,6 @@
	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 ()
	{
	Index: java/wildfly90/Makefile
	===================================================================
	--- java/wildfly90/Makefile
	+++ 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 @@

	USE_RC_SUBR= wildfly90
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	USER= www
	GROUP= www
	VAR_DIR?= /var
	Index: java/wildfly90/files/patch-bin-add-user.sh
	===================================================================
	--- java/wildfly90/files/patch-bin-add-user.sh
	+++ java/wildfly90/files/patch-bin-add-user.sh
	@@ -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;
	Index: java/wildfly90/files/wildfly90.in
	===================================================================
	--- java/wildfly90/files/wildfly90.in
	+++ java/wildfly90/files/wildfly90.in
	@@ -41,9 +41,6 @@
	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 ()
	{
	Index: java/xdoclet/Makefile
	===================================================================
	--- java/xdoclet/Makefile
	+++ java/xdoclet/Makefile
	@@ -19,7 +19,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_WRKSUBDIR= yes
	NO_BUILD= yes
	NO_ARCH= yes
	Index: lang/abcl/Makefile
	===================================================================
	--- lang/abcl/Makefile
	+++ lang/abcl/Makefile
	@@ -21,7 +21,6 @@
	SUB_FILES= abcl

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes

	do-install:
	Index: lang/apache-commons-jelly/Makefile
	===================================================================
	--- lang/apache-commons-jelly/Makefile
	+++ lang/apache-commons-jelly/Makefile
	@@ -13,7 +13,6 @@
	LICENSE= APACHE20

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: lang/bsh/Makefile
	===================================================================
	--- lang/bsh/Makefile
	+++ lang/bsh/Makefile
	@@ -15,7 +15,6 @@
	GH_PROJECT= beanshell

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	USE_ANT= yes
	ALL_TARGET= jarall
	Index: lang/ceylon/Makefile
	===================================================================
	--- lang/ceylon/Makefile
	+++ lang/ceylon/Makefile
	@@ -16,7 +16,6 @@
	NO_BUILD= yes

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	JAVA_RUN= yes

	PORTDATA= *
	Index: lang/groovy/Makefile
	===================================================================
	--- lang/groovy/Makefile
	+++ lang/groovy/Makefile
	@@ -15,8 +15,6 @@
	USES= zip
	USE_JAVA= yes

	-JAVA_VERSION= 1.7+
	-
	NO_ARCH= yes
	NO_BUILD= yes

	Index: lang/jython/Makefile
	===================================================================
	--- lang/jython/Makefile
	+++ lang/jython/Makefile
	@@ -24,7 +24,6 @@
	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 ""
	Index: lang/linux-j/Makefile
	===================================================================
	--- lang/linux-j/Makefile
	+++ lang/linux-j/Makefile
	@@ -20,7 +20,6 @@

	USES= linux
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	ONLY_FOR_ARCHS= i386 amd64

	Index: lang/rhino/Makefile
	===================================================================
	--- lang/rhino/Makefile
	+++ lang/rhino/Makefile
	@@ -22,8 +22,6 @@

	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
	Index: lang/sisc/Makefile
	===================================================================
	--- lang/sisc/Makefile
	+++ lang/sisc/Makefile
	@@ -14,7 +14,6 @@
	LICENSE_COMB= dual

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: lang/starlogo/Makefile
	===================================================================
	--- lang/starlogo/Makefile
	+++ lang/starlogo/Makefile
	@@ -15,7 +15,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: mail/davmail/Makefile
	===================================================================
	--- mail/davmail/Makefile
	+++ mail/davmail/Makefile
	@@ -18,7 +18,6 @@
	NO_ARCH= yes
	USE_ANT= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	ALL_TARGET= release
	# 5.3.1
	REVISION= 3079
	Index: mail/james/Makefile
	===================================================================
	--- mail/james/Makefile
	+++ mail/james/Makefile
	@@ -16,7 +16,6 @@
	USES= cpe
	CPE_VENDOR= apache
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_ARCH= yes
	NO_BUILD= yes

	Index: mail/mime4j/Makefile
	===================================================================
	--- mail/mime4j/Makefile
	+++ mail/mime4j/Makefile
	@@ -18,7 +18,6 @@
	OPTIONS_DEFINE= DOCS

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	WRKSRC= ${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}

	Index: mail/openemm2013/Makefile
	===================================================================
	--- mail/openemm2013/Makefile
	+++ mail/openemm2013/Makefile
	@@ -30,7 +30,6 @@
	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
	Index: mail/openemm2013/files/openemm2013.in
	===================================================================
	--- mail/openemm2013/files/openemm2013.in
	+++ mail/openemm2013/files/openemm2013.in
	@@ -44,9 +44,6 @@
	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 ()
	{
	Index: mail/openemm2015/Makefile
	===================================================================
	--- mail/openemm2015/Makefile
	+++ mail/openemm2015/Makefile
	@@ -28,7 +28,6 @@
	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
	Index: math/cvc4/Makefile
	===================================================================
	--- math/cvc4/Makefile
	+++ math/cvc4/Makefile
	@@ -84,7 +84,7 @@
	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:
	Index: math/geonext/Makefile
	===================================================================
	--- math/geonext/Makefile
	+++ math/geonext/Makefile
	@@ -17,7 +17,6 @@
	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 \
	Index: math/jakarta-commons-math3/Makefile
	===================================================================
	--- math/jakarta-commons-math3/Makefile
	+++ math/jakarta-commons-math3/Makefile
	@@ -24,7 +24,6 @@

	USE_ANT= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_LOCALE= en_US.ISO8859-1

	ALL_TARGET= jar
	Index: math/jeuclid/Makefile
	===================================================================
	--- math/jeuclid/Makefile
	+++ math/jeuclid/Makefile
	@@ -12,7 +12,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_RUN= yes
	NO_BUILD= yes

	Index: math/jlatexmath/Makefile
	===================================================================
	--- math/jlatexmath/Makefile
	+++ math/jlatexmath/Makefile
	@@ -17,7 +17,7 @@

	RUN_DEPENDS= ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons

	-USE_JAVA= 1.7+
	+USE_JAVA= yes

	NO_ARCH= yes
	NO_BUILD= yes
	Index: math/matlab-installer/Makefile
	===================================================================
	--- math/matlab-installer/Makefile
	+++ math/matlab-installer/Makefile
	@@ -18,7 +18,6 @@
	USES= linux tar:xz
	USE_LINUX= dri devtools
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= linux
	JAVA_RUN= yes

	Index: math/octave/Makefile
	===================================================================
	--- math/octave/Makefile
	+++ math/octave/Makefile
	@@ -47,7 +47,6 @@
	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 \
	Index: math/plman/Makefile
	===================================================================
	--- math/plman/Makefile
	+++ math/plman/Makefile
	@@ -17,7 +17,6 @@
	USES= zip
	USE_JAVA= yes

	-JAVA_VERSION= 1.6+
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	REPLACE_FILES= ${WRKSRC}/bin/${PORTNAME}
	WRKSRC= ${WRKDIR}/${PORTNAME}
	Index: math/truthtable/Makefile
	===================================================================
	--- math/truthtable/Makefile
	+++ math/truthtable/Makefile
	@@ -17,7 +17,6 @@
	BROKEN= unfetchable

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: misc/freeguide/Makefile
	===================================================================
	--- misc/freeguide/Makefile
	+++ misc/freeguide/Makefile
	@@ -15,7 +15,6 @@
	RUN_DEPENDS= tv_cat:textproc/p5-xmltv

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	NO_ARCH= yes

	Index: misc/jbidwatcher/Makefile
	===================================================================
	--- misc/jbidwatcher/Makefile
	+++ misc/jbidwatcher/Makefile
	@@ -13,7 +13,6 @@
	USE_JAVA= yes
	USE_ANT= yes
	ALL_TARGET= jar
	-JAVA_VERSION= 1.6+

	SUB_FILES= jbidwatcher
	SUB_LIST+= PORTVERSION=${PORTVERSION}
	Index: misc/pauker/Makefile
	===================================================================
	--- misc/pauker/Makefile
	+++ misc/pauker/Makefile
	@@ -12,7 +12,6 @@
	COMMENT= Java-based flashcard learning using the Leitner system

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	do-install:
	Index: misc/pipe/Makefile
	===================================================================
	--- misc/pipe/Makefile
	+++ misc/pipe/Makefile
	@@ -15,7 +15,6 @@
	NO_BUILD= yes
	NO_ARCH= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	SUB_FILES= pipe.sh

	Index: multimedia/gdialog/Makefile
	===================================================================
	--- multimedia/gdialog/Makefile
	+++ multimedia/gdialog/Makefile
	@@ -17,7 +17,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes
	NO_WRKSUBDIR= yes
	Index: multimedia/libbluray/Makefile
	===================================================================
	--- multimedia/libbluray/Makefile
	+++ multimedia/libbluray/Makefile
	@@ -43,7 +43,7 @@
	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
	Index: multimedia/projectx/Makefile
	===================================================================
	--- multimedia/projectx/Makefile
	+++ multimedia/projectx/Makefile
	@@ -15,7 +15,6 @@

	USES= zip:infozip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	SUB_FILES= project-x.sh
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: net-im/convey/Makefile
	===================================================================
	--- net-im/convey/Makefile
	+++ net-im/convey/Makefile
	@@ -15,8 +15,6 @@
	USE_ANT= yes
	USE_JAVA= yes

	-JAVA_VERSION= 1.6+
	-
	MAKE_ARGS= -quiet

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: net-p2p/frost/Makefile
	===================================================================
	--- net-p2p/frost/Makefile
	+++ net-p2p/frost/Makefile
	@@ -14,7 +14,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_RUN= yes
	NO_BUILD= yes
	NO_WRKSUBDIR= yes
	Index: net-p2p/phex/Makefile
	===================================================================
	--- net-p2p/phex/Makefile
	+++ net-p2p/phex/Makefile
	@@ -14,7 +14,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	SUB_FILES= ${PORTNAME}.sh
	Index: net/activemq/Makefile
	===================================================================
	--- net/activemq/Makefile
	+++ net/activemq/Makefile
	@@ -16,7 +16,6 @@
	USES= cpe
	CPE_VENDOR= apache
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	NO_ARCH= yes
	NO_BUILD= yes
	Index: net/apache-commons-net/Makefile
	===================================================================
	--- net/apache-commons-net/Makefile
	+++ net/apache-commons-net/Makefile
	@@ -15,7 +15,6 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE.txt

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: net/belle-sip/Makefile
	===================================================================
	--- net/belle-sip/Makefile
	+++ net/belle-sip/Makefile
	@@ -27,7 +27,6 @@
	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:
	Index: net/dimes/Makefile
	===================================================================
	--- net/dimes/Makefile
	+++ net/dimes/Makefile
	@@ -17,7 +17,6 @@
	BUILD_WRKSRC= ${WRKSRC}/scripts_linux

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	#java-linux required
	JAVA_OS= linux
	DATADIR= ${JAVASHAREDIR}/dimes
	Index: net/java-beepcore/Makefile
	===================================================================
	--- net/java-beepcore/Makefile
	+++ net/java-beepcore/Makefile
	@@ -15,7 +15,6 @@
	RUN_DEPENDS= ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	OPTIONS_DEFINE= DOCS EXAMPLES
	Index: net/jcifs/Makefile
	===================================================================
	--- net/jcifs/Makefile
	+++ net/jcifs/Makefile
	@@ -16,7 +16,6 @@

	USES= tar:tgz
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
	NO_ARCH= yes
	NO_BUILD= yes
	Index: net/jgroups/Makefile
	===================================================================
	--- net/jgroups/Makefile
	+++ net/jgroups/Makefile
	@@ -14,7 +14,6 @@
	OPTIONS_DEFINE= DOCS

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	ALL_TARGET= jar
	NO_ARCH= yes
	Index: net/jicmp/Makefile
	===================================================================
	--- net/jicmp/Makefile
	+++ net/jicmp/Makefile
	@@ -13,7 +13,6 @@

	USES= libtool
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_VENDOR= openjdk
	JAVA_BUILD= yes
	JAVA_RUN= yes
	Index: net/jicmp6/Makefile
	===================================================================
	--- net/jicmp6/Makefile
	+++ net/jicmp6/Makefile
	@@ -10,7 +10,6 @@

	USES= libtool
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_VENDOR= openjdk
	JAVA_BUILD= yes
	JAVA_RUN= yes
	Index: net/jrdesktop/Makefile
	===================================================================
	--- net/jrdesktop/Makefile
	+++ net/jrdesktop/Makefile
	@@ -14,7 +14,6 @@
	LICENSE= GPLv3

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	SUB_FILES= jrdesktop
	Index: net/jsch/Makefile
	===================================================================
	--- net/jsch/Makefile
	+++ net/jsch/Makefile
	@@ -13,7 +13,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes

	PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME}.jar
	Index: net/ldapbrowser/Makefile
	===================================================================
	--- net/ldapbrowser/Makefile
	+++ net/ldapbrowser/Makefile
	@@ -18,7 +18,6 @@
	RESTRICTED= No reply from author regarding redistribution licensing

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	WRKSRC= ${WRKDIR}/${PORTNAME}
	REINPLACE_ARGS= -i ''
	Index: net/mpich2/Makefile
	===================================================================
	--- net/mpich2/Makefile
	+++ net/mpich2/Makefile
	@@ -96,7 +96,6 @@
	.endif
	CONFIGURE_ARGS+= --with-java="${JAVA_HOME}"
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	PLIST_SUB+= JAVA=""
	PLX11= ""
	BIN2STRIP+= rlog_check_timeorder rlog_print
	Index: net/seda/Makefile
	===================================================================
	--- net/seda/Makefile
	+++ net/seda/Makefile
	@@ -12,7 +12,6 @@
	COMMENT= Architecture for Highly Concurrent Server Applications

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	ALL_TARGET= dist
	NO_ARCH= yes
	Index: net/spread-j/Makefile
	===================================================================
	--- net/spread-j/Makefile
	+++ net/spread-j/Makefile
	@@ -18,7 +18,6 @@
	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
	Index: net/toonel/Makefile
	===================================================================
	--- net/toonel/Makefile
	+++ net/toonel/Makefile
	@@ -16,7 +16,6 @@
	NO_WRKSUBDIR= yes

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	SUB_FILES= ${PORTNAME}.sh
	SUB_LIST= JARNAME=${DISTNAME}${EXTRACT_SUFX}
	Index: portuguese/irpf-pt_BR/Makefile
	===================================================================
	--- portuguese/irpf-pt_BR/Makefile
	+++ portuguese/irpf-pt_BR/Makefile
	@@ -24,7 +24,6 @@

	USE_JAVA= yes
	JAVA_RUN= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native

	NO_BUILD= yes
	Index: print/pdf-renderer/Makefile
	===================================================================
	--- print/pdf-renderer/Makefile
	+++ print/pdf-renderer/Makefile
	@@ -19,7 +19,6 @@
	USES= dos2unix zip
	NO_WRKSUBDIR= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes

	ALL_TARGET= jar
	Index: science/colt/Makefile
	===================================================================
	--- science/colt/Makefile
	+++ science/colt/Makefile
	@@ -11,7 +11,6 @@
	COMMENT= Java package for scalable scientific and technical computing

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	WRKSRC= ${WRKDIR}/${PORTNAME}

	OPTIONS_DEFINE= DOCS COMPILE
	Index: science/devisor/Makefile
	===================================================================
	--- science/devisor/Makefile
	+++ science/devisor/Makefile
	@@ -12,7 +12,6 @@
	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
	Index: science/simsmith/Makefile
	===================================================================
	--- science/simsmith/Makefile
	+++ science/simsmith/Makefile
	@@ -14,7 +14,6 @@
	COMMENT= A Java-based Smith Chart program

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_RUN= yes

	PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \
	Index: security/dirbuster/Makefile
	===================================================================
	--- security/dirbuster/Makefile
	+++ security/dirbuster/Makefile
	@@ -15,7 +15,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	WRKSRC= ${WRKDIR}/${DISTNAME}
	Index: security/i2p/Makefile
	===================================================================
	--- security/i2p/Makefile
	+++ security/i2p/Makefile
	@@ -36,7 +36,6 @@
	USE_JAVA= yes
	NO_ARCH= yes
	JAVA_BUILD= jdk
	-JAVA_VERSION= 1.6+
	USE_LOCALE= en_US.UTF-8
	ALL_TARGET= updater tarball

	Index: security/iaikpkcs11wrapper/Makefile
	===================================================================
	--- security/iaikpkcs11wrapper/Makefile
	+++ security/iaikpkcs11wrapper/Makefile
	@@ -18,7 +18,6 @@
	USE_JAVA= yes
	DOS2UNIX_GLOB= Makefile *.c
	DOS2UNIX_WRKSRC= ${WRKDIR}/src/native
	-JAVA_VERSION= 1.6+
	JAVA_OS= native
	ALL_TARGET= release

	Index: security/jbrofuzz/Makefile
	===================================================================
	--- security/jbrofuzz/Makefile
	+++ security/jbrofuzz/Makefile
	@@ -12,7 +12,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	WRKSRC= ${WRKDIR}/${PORTNAME}
	Index: security/owasp-dependency-check/Makefile
	===================================================================
	--- security/owasp-dependency-check/Makefile
	+++ security/owasp-dependency-check/Makefile
	@@ -23,7 +23,6 @@
	GH_PROJECT= DependencyCheck

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	NO_ARCH= yes

	Index: security/webscarab/Makefile
	===================================================================
	--- security/webscarab/Makefile
	+++ security/webscarab/Makefile
	@@ -15,7 +15,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	WRKSRC= ${WRKDIR}/${DISTNAME}-1304
	Index: security/xml-security/Makefile
	===================================================================
	--- security/xml-security/Makefile
	+++ security/xml-security/Makefile
	@@ -22,7 +22,6 @@
	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
	Index: sysutils/hfsexplorer/Makefile
	===================================================================
	--- sysutils/hfsexplorer/Makefile
	+++ sysutils/hfsexplorer/Makefile
	@@ -20,7 +20,6 @@
	USE_GITHUB= yes
	GH_ACCOUNT= unsound
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_ARCH= yes

	OPTIONS_DEFINE= DOCS
	Index: sysutils/jdiskreport/Makefile
	===================================================================
	--- sysutils/jdiskreport/Makefile
	+++ sysutils/jdiskreport/Makefile
	@@ -11,7 +11,6 @@

	USES= zip
	USE_JAVA= YES
	-JAVA_VERSION= 1.6+

	PLIST_SUB= JDISKDIR=${JDISKDIR:S,${PREFIX}/,,g}
	PLIST_SUB+= PORTVERSION=${PORTVERSION}
	Index: sysutils/jvmtop/Makefile
	===================================================================
	--- sysutils/jvmtop/Makefile
	+++ sysutils/jvmtop/Makefile
	@@ -13,7 +13,6 @@

	USE_JAVA= yes

	-JAVA_VERSION= 1.6+
	USE_ANT= yes

	PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \
	Index: sysutils/linux-crashplan/Makefile
	===================================================================
	--- sysutils/linux-crashplan/Makefile
	+++ sysutils/linux-crashplan/Makefile
	@@ -24,7 +24,6 @@

	USE_JAVA= yes
	JAVA_OS= linux
	-JAVA_VERSION= 1.7+

	WRKSRC= ${WRKDIR}/crashplan-install

	Index: textproc/apache-commons-digester/Makefile
	===================================================================
	--- textproc/apache-commons-digester/Makefile
	+++ textproc/apache-commons-digester/Makefile
	@@ -22,7 +22,6 @@
	NO_BUILD= yes
	NO_ARCH= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	JARFILE= ${PORTNAME}.jar
	PLIST_FILES= %%JAVAJARDIR%%/${JARFILE}
	Index: textproc/apache-poi/Makefile
	===================================================================
	--- textproc/apache-poi/Makefile
	+++ textproc/apache-poi/Makefile
	@@ -15,7 +15,6 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	RELEASE_DATE= 20160924
	Index: textproc/denature/Makefile
	===================================================================
	--- textproc/denature/Makefile
	+++ textproc/denature/Makefile
	@@ -20,7 +20,6 @@

	USES= perl5
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	POD2MAN?= pod2man
	WRKSRC= ${WRKDIR}/${PORTNAME}

	Index: textproc/dom4j/Makefile
	===================================================================
	--- textproc/dom4j/Makefile
	+++ textproc/dom4j/Makefile
	@@ -11,7 +11,6 @@
	COMMENT= Open Source XML framework for Java

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	OPTIONS_DEFINE= DOCS
	Index: textproc/fop/Makefile
	===================================================================
	--- textproc/fop/Makefile
	+++ textproc/fop/Makefile
	@@ -26,7 +26,6 @@
	PORTDOCS= *

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes

	NO_ARCH= yes
	Index: textproc/jalingo/Makefile
	===================================================================
	--- textproc/jalingo/Makefile
	+++ textproc/jalingo/Makefile
	@@ -17,7 +17,6 @@
	USES= 7z
	USE_ANT= yes
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	ALL_TARGET= dist

	Index: textproc/jarnal/Makefile
	===================================================================
	--- textproc/jarnal/Makefile
	+++ textproc/jarnal/Makefile
	@@ -17,7 +17,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes
	NO_ARCH= yes
	Index: textproc/jaxup/Makefile
	===================================================================
	--- textproc/jaxup/Makefile
	+++ textproc/jaxup/Makefile
	@@ -22,7 +22,6 @@
	WRKSRC= ${WRKDIR}/${PORTNAME}

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}

	Index: textproc/jdictionary/Makefile
	===================================================================
	--- textproc/jdictionary/Makefile
	+++ textproc/jdictionary/Makefile
	@@ -11,7 +11,6 @@
	COMMENT= Platform independent, plugin based dictionary

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	USES= zip
	WRKSRC= ${WRKDIR}/${PORTNAME}
	Index: textproc/jdictionary/Makefile.plugin
	===================================================================
	--- textproc/jdictionary/Makefile.plugin
	+++ textproc/jdictionary/Makefile.plugin
	@@ -9,9 +9,7 @@
	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= #
	Index: textproc/jing/Makefile
	===================================================================
	--- textproc/jing/Makefile
	+++ textproc/jing/Makefile
	@@ -18,7 +18,6 @@
	USES= zip

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_RUN= yes

	OPTIONS_DEFINE= DOCS
	Index: textproc/lucene/Makefile
	===================================================================
	--- textproc/lucene/Makefile
	+++ textproc/lucene/Makefile
	@@ -21,7 +21,6 @@
	USE_JAVA= yes
	NO_BUILD= yes
	NO_ARCH= yes
	-JAVA_VERSION= 1.6+

	OPTIONS_DEFINE= CONTRIB DOCS EXAMPLES
	CONTRIB_DESC= Install contributed jars
	Index: textproc/lucene4/Makefile
	===================================================================
	--- textproc/lucene4/Makefile
	+++ textproc/lucene4/Makefile
	@@ -17,7 +17,6 @@

	USES= tar:tgz
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: textproc/lucene5/Makefile
	===================================================================
	--- textproc/lucene5/Makefile
	+++ textproc/lucene5/Makefile
	@@ -17,7 +17,6 @@

	USES= tar:tgz
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: textproc/nux/Makefile
	===================================================================
	--- textproc/nux/Makefile
	+++ textproc/nux/Makefile
	@@ -15,7 +15,6 @@
	${JAVALIBDIR}/saxon9.jar:textproc/saxon-devel

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	WRKSRC= ${WRKDIR}/${PORTNAME}
	Index: textproc/ppower4/Makefile
	===================================================================
	--- textproc/ppower4/Makefile
	+++ textproc/ppower4/Makefile
	@@ -18,7 +18,6 @@
	USES= zip
	USE_TEX= latex
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_WRKSUBDIR= yes
	NO_ARCH= yes
	Index: textproc/qrcodegen/Makefile
	===================================================================
	--- textproc/qrcodegen/Makefile
	+++ textproc/qrcodegen/Makefile
	@@ -17,7 +17,6 @@
	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
	Index: textproc/saxon-devel/Makefile
	===================================================================
	--- textproc/saxon-devel/Makefile
	+++ textproc/saxon-devel/Makefile
	@@ -21,7 +21,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_WRKSUBDIR= yes
	NO_BUILD= yes

	Index: textproc/saxon/Makefile
	===================================================================
	--- textproc/saxon/Makefile
	+++ textproc/saxon/Makefile
	@@ -14,7 +14,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_WRKSUBDIR= yes
	NO_BUILD= yes
	NO_ARCH= yes
	Index: textproc/trang/Makefile
	===================================================================
	--- textproc/trang/Makefile
	+++ textproc/trang/Makefile
	@@ -18,7 +18,6 @@
	USES= zip

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_RUN= yes

	OPTIONS_DEFINE= DOCS
	Index: textproc/weka/Makefile
	===================================================================
	--- textproc/weka/Makefile
	+++ textproc/weka/Makefile
	@@ -15,7 +15,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: textproc/xalan-j/Makefile
	===================================================================
	--- textproc/xalan-j/Makefile
	+++ textproc/xalan-j/Makefile
	@@ -20,7 +20,6 @@
	CPE_PRODUCT= xalan-java
	CPE_VENDOR= apache
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
	Index: textproc/xerces-j/Makefile
	===================================================================
	--- textproc/xerces-j/Makefile
	+++ textproc/xerces-j/Makefile
	@@ -13,7 +13,6 @@
	LICENSE= APACHE20

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: textproc/xincluder/Makefile
	===================================================================
	--- textproc/xincluder/Makefile
	+++ textproc/xincluder/Makefile
	@@ -18,7 +18,6 @@
	${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: textproc/xml-commons/Makefile
	===================================================================
	--- textproc/xml-commons/Makefile
	+++ textproc/xml-commons/Makefile
	@@ -12,7 +12,6 @@
	COMMENT= Provides common XML code for Apache projects

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_RUN= yes
	NO_BUILD= yes

	Index: textproc/xom/Makefile
	===================================================================
	--- textproc/xom/Makefile
	+++ textproc/xom/Makefile
	@@ -14,7 +14,6 @@
	${JAVALIBDIR}/xalan.jar:textproc/xalan-j

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	WRKSRC= ${WRKDIR}/XOM

	Index: textproc/xp/Makefile
	===================================================================
	--- textproc/xp/Makefile
	+++ textproc/xp/Makefile
	@@ -12,7 +12,6 @@
	COMMENT= XML parser written in Java

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes
	USES= zip
	Index: www/apache-forrest/Makefile
	===================================================================
	--- www/apache-forrest/Makefile
	+++ www/apache-forrest/Makefile
	@@ -28,8 +28,6 @@

	INSTALL_WRKSRC= ${WRKSRC}/build

	-JAVA_VERSION= 1.6+
	-
	NO_BUILD= Yes

	PLUGINSDIR= ${DATADIR}/plugins/org.apache.forrest.plugin.output.pdf
	Index: www/archiva/Makefile
	===================================================================
	--- www/archiva/Makefile
	+++ www/archiva/Makefile
	@@ -18,7 +18,6 @@
	CPE_VENDOR= apache

	USE_JAVA= yes
	-JAVA_VERSION= 1.7+

	USE_RC_SUBR= ${PORTNAME}

	Index: www/axis2/Makefile
	===================================================================
	--- www/axis2/Makefile
	+++ www/axis2/Makefile
	@@ -32,7 +32,6 @@
	TOMCAT85_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat85

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	SHAREOWN= www
	SHAREGRP= www

	Index: www/dojo-shrinksafe/Makefile
	===================================================================
	--- www/dojo-shrinksafe/Makefile
	+++ www/dojo-shrinksafe/Makefile
	@@ -13,7 +13,6 @@
	COMMENT= JavaScript code compressor

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PLIST_FILES= bin/${PKGNAMEPREFIX}${PORTNAME} %%DATADIR%%/shrinksafe.jar \
	Index: www/geronimo/Makefile
	===================================================================
	--- www/geronimo/Makefile
	+++ www/geronimo/Makefile
	@@ -13,7 +13,6 @@

	USES= cpe
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	CPE_VENDOR= apache
	Index: www/glassfish4/Makefile
	===================================================================
	--- www/glassfish4/Makefile
	+++ www/glassfish4/Makefile
	@@ -11,7 +11,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	NO_BUILD= yes

	WRKSRC= ${WRKDIR}/glassfish4
	Index: www/grails/Makefile
	===================================================================
	--- www/grails/Makefile
	+++ www/grails/Makefile
	@@ -17,7 +17,6 @@

	USES= zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	Index: www/helma/Makefile
	===================================================================
	--- www/helma/Makefile
	+++ www/helma/Makefile
	@@ -21,7 +21,6 @@

	USE_RC_SUBR= helma
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	USE_ANT= yes
	ALL_TARGET= clean jar
	NO_ARCH= yes
	Index: www/httpasyncclient/Makefile
	===================================================================
	--- www/httpasyncclient/Makefile
	+++ www/httpasyncclient/Makefile
	@@ -19,7 +19,6 @@
	CPE_VENDOR= apache
	OPTIONS_DEFINE= DOCS
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	WRKSRC= ${WRKDIR}/httpcomponents-asyncclient-${DISTVERSION}
	Index: www/httpclient/Makefile
	===================================================================
	--- www/httpclient/Makefile
	+++ www/httpclient/Makefile
	@@ -25,7 +25,6 @@
	CPE_VENDOR= apache

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	WRKSRC= ${WRKDIR}/httpcomponents-client-${DISTVERSION}
	Index: www/httpcore/Makefile
	===================================================================
	--- www/httpcore/Makefile
	+++ www/httpcore/Makefile
	@@ -17,7 +17,6 @@
	OPTIONS_DEFINE= DOCS

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	WRKSRC= ${WRKDIR}/httpcomponents-core-${DISTVERSION}
	Index: www/jetty8/Makefile
	===================================================================
	--- www/jetty8/Makefile
	+++ www/jetty8/Makefile
	@@ -22,7 +22,6 @@
	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}
	Index: www/jmeter/Makefile
	===================================================================
	--- www/jmeter/Makefile
	+++ www/jmeter/Makefile
	@@ -43,7 +43,6 @@

	USES= tar:tgz
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
	SUB_FILES= jmeter.sh
	Index: www/madsonic-standalone/Makefile
	===================================================================
	--- www/madsonic-standalone/Makefile
	+++ www/madsonic-standalone/Makefile
	@@ -52,7 +52,6 @@
	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
	Index: www/madsonic/Makefile
	===================================================================
	--- www/madsonic/Makefile
	+++ www/madsonic/Makefile
	@@ -60,7 +60,6 @@
	NO_BUILD= yes
	DISTDATE= 20161208
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	USES= zip
	USER= www
	GROUP= www
	Index: www/myfaces/Makefile
	===================================================================
	--- www/myfaces/Makefile
	+++ www/myfaces/Makefile
	@@ -14,7 +14,6 @@
	LICENSE_FILE= ${WRKSRC}/LICENSE.txt

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes
	USES= cpe
	Index: www/paros/Makefile
	===================================================================
	--- www/paros/Makefile
	+++ www/paros/Makefile
	@@ -14,7 +14,6 @@

	USE_JAVA= yes
	JAVA_RUN= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes
	USES= dos2unix zip
	Index: www/py-dojango/Makefile
	===================================================================
	--- www/py-dojango/Makefile
	+++ www/py-dojango/Makefile
	@@ -28,7 +28,6 @@

	.if ${PORT_OPTIONS:MJAVA}
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	.endif

	.include <bsd.port.mk>
	Index: www/resin3/Makefile
	===================================================================
	--- www/resin3/Makefile
	+++ www/resin3/Makefile
	@@ -15,7 +15,6 @@
	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} \
	Index: www/rssowl/Makefile
	===================================================================
	--- www/rssowl/Makefile
	+++ www/rssowl/Makefile
	@@ -21,7 +21,6 @@
	ONLY_FOR_ARCHS= i386 amd64

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	JAVA_OS= native
	JAVA_RUN= yes

	Index: www/sahi/Makefile
	===================================================================
	--- www/sahi/Makefile
	+++ www/sahi/Makefile
	@@ -19,7 +19,6 @@

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}

	-JAVA_VERSION= 1.6+
	JAVA_OS= native
	JAVA_RUN= yes

	Index: www/sakai/Makefile
	===================================================================
	--- www/sakai/Makefile
	+++ www/sakai/Makefile
	@@ -20,7 +20,6 @@
	IGNORE= does not work correctly

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_BUILD= yes
	NO_WRKSUBDIR= yes
	Index: www/scloader/Makefile
	===================================================================
	--- www/scloader/Makefile
	+++ www/scloader/Makefile
	@@ -15,7 +15,6 @@

	USES= dos2unix zip
	USE_JAVA= yes
	-JAVA_VERSION= 1.6+

	NO_WRKSUBDIR= yes
	NO_BUILD= yes
	Index: www/servlet-api/Makefile
	===================================================================
	--- www/servlet-api/Makefile
	+++ www/servlet-api/Makefile
	@@ -14,7 +14,6 @@
	COMMENT= The Servlet API

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
	Index: www/subsonic-standalone/Makefile
	===================================================================
	--- www/subsonic-standalone/Makefile
	+++ www/subsonic-standalone/Makefile
	@@ -48,7 +48,6 @@
	NO_BUILD= yes
	USE_JAVA= yes
	USE_RC_SUBR= subsonic
	-JAVA_VERSION= 1.6+
	JAVA_RUN= yes
	USERS= subsonic
	GROUPS= subsonic
	Index: www/tomcat-native/Makefile
	===================================================================
	--- www/tomcat-native/Makefile
	+++ www/tomcat-native/Makefile
	@@ -19,7 +19,6 @@
	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} \
	Index: www/tomcat7/Makefile
	===================================================================
	--- www/tomcat7/Makefile
	+++ www/tomcat7/Makefile
	@@ -20,7 +20,6 @@
	CPE_VENDOR= apache

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: www/tomcat85/Makefile
	===================================================================
	--- www/tomcat85/Makefile
	+++ www/tomcat85/Makefile
	@@ -18,7 +18,6 @@
	USES= cpe
	CPE_VENDOR= apache
	USE_JAVA= yes
	-JAVA_VERSION= 1.7+
	USE_RC_SUBR= ${PKGBASE:C/-/_/}

	NO_ARCH= yes
	Index: www/tomee/Makefile
	===================================================================
	--- www/tomee/Makefile
	+++ www/tomee/Makefile
	@@ -18,7 +18,6 @@
	CPE_VENDOR= apache

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_ARCH= yes
	NO_BUILD= yes

	Index: www/vertx/Makefile
	===================================================================
	--- www/vertx/Makefile
	+++ www/vertx/Makefile
	@@ -19,7 +19,6 @@

	JAVA_OS= native
	JAVA_RUN= yes
	-JAVA_VERSION= 1.7+

	PLIST_SUB= VERTXVER=${PORTVERSION}

	Index: www/yuicompressor/Makefile
	===================================================================
	--- www/yuicompressor/Makefile
	+++ www/yuicompressor/Makefile
	@@ -19,7 +19,6 @@
	NO_WRKSUBDIR= yes

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes
	NO_ARCH= yes

	Index: x11-toolkits/swt/Makefile
	===================================================================
	--- x11-toolkits/swt/Makefile
	+++ x11-toolkits/swt/Makefile
	@@ -24,7 +24,6 @@
	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}
	Index: x11-wm/lxmed/Makefile
	===================================================================
	--- x11-wm/lxmed/Makefile
	+++ x11-wm/lxmed/Makefile
	@@ -18,7 +18,6 @@
	WRKSRC= ${WRKDIR}/${PORTNAME}

	USE_JAVA= yes
	-JAVA_VERSION= 1.6+
	NO_BUILD= yes

	DATADIR= ${JAVASHAREDIR}/${PORTNAME}

File Metadata

Mime Type: text/plain
Expires: Fri, Jun 5, 5:51 AM (13 h, 30 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 33743412
Default Alt Text: D22342.id64261.diff (112 KB)

D22342.id64261.diffNo OneTemporaryActions

D22342.id64261.diffView Options

File Metadata

Event Timeline

D22342.id64261.diff
No OneTemporary
Actions

D22342.id64261.diff
View Options