Index: Mk/bsd.java.mk =================================================================== --- Mk/bsd.java.mk (revision 517355) +++ Mk/bsd.java.mk (working copy) @@ -162,7 +162,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 6 7 8 11 12 13 +__JAVA_VERSION_LIST= 7 8 11 12 13 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle @@ -270,7 +270,7 @@ JAVA_RUN= jre . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/6+/7+/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/} +_JAVA_VERSION= ${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif Index: archivers/javatar/Makefile =================================================================== --- archivers/javatar/Makefile (revision 517355) +++ archivers/javatar/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= PD LICENSE_FILE= ${WRKSRC}/doc/LICENSE USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes Index: archivers/jzlib/Makefile =================================================================== --- archivers/jzlib/Makefile (revision 517355) +++ archivers/jzlib/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes JAR_FILE= ${WRKSRC}/src/main/java/${PORTNAME}.jar Index: archivers/snappy-java/Makefile =================================================================== --- archivers/snappy-java/Makefile (revision 517355) +++ archivers/snappy-java/Makefile (working copy) @@ -35,7 +35,6 @@ GH_PROJECT= snappy-java USES= gmake USE_JAVA= yes -JAVA_VERSION= 1.7+ USE_LDCONFIG= yes MAKE_ARGS+= Default_CXX=${CXX} Index: astro/gpsprune/Makefile =================================================================== --- astro/gpsprune/Makefile (revision 517355) +++ astro/gpsprune/Makefile (working copy) @@ -20,7 +20,6 @@ NO_BUILD= yes 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 (revision 517355) +++ astro/osmosis/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/copying.txt NO_WRKSUBDIR= yes USES= tar:tgz USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: audio/atunes/Makefile =================================================================== --- audio/atunes/Makefile (revision 517355) +++ audio/atunes/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= GPLv2 NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= atunes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: audio/gervill/Makefile =================================================================== --- audio/gervill/Makefile (revision 517355) +++ audio/gervill/Makefile (working copy) @@ -17,7 +17,6 @@ BROKEN_armv7= fails to package: find: *: No such USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes NO_ARCH= yes Index: audio/jid3lib/Makefile =================================================================== --- audio/jid3lib/Makefile (revision 517355) +++ audio/jid3lib/Makefile (working copy) @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java ID3 Tag Library USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes PLIST_FILES= %%JAVAJARDIR%%/jid3lib.jar Index: audio/musiccontrol/Makefile =================================================================== --- audio/musiccontrol/Makefile (revision 517355) +++ audio/musiccontrol/Makefile (working copy) @@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/mpg123:audio/mpg123 ${LOCALBASE}/bin/simplemod:audio/simplemod USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_FILES= share/java/classes/MusicControl-${PORTVERSION}.jar bin/musiccontrol Index: audio/tuxguitar/Makefile =================================================================== --- audio/tuxguitar/Makefile (revision 517355) +++ audio/tuxguitar/Makefile (working copy) @@ -35,7 +35,6 @@ CPE_VENDOR= herac USE_JAVA= yes USE_ANT= yes USE_LDCONFIG= yes -JAVA_VERSION= 1.6+ NO_CCACHE= yes BUILD_WRKSRC= ${WRKSRC}/TuxGuitar Index: benchmarks/linux-vdbench/Makefile =================================================================== --- benchmarks/linux-vdbench/Makefile (revision 517355) +++ benchmarks/linux-vdbench/Makefile (working copy) @@ -22,7 +22,6 @@ USES= linux shebangfix uniquefiles:dirs zip USE_JAVA= yes EXTRACT_AFTER_ARGS= -d ${WRKSRC} -JAVA_VERSION= 1.7+ JAVA_OS= linux NO_BUILD= yes PLIST_SUB= LINUX_ARCH=${LINUX_ARCH} Index: benchmarks/scimark2/Makefile =================================================================== --- benchmarks/scimark2/Makefile (revision 517355) +++ benchmarks/scimark2/Makefile (working copy) @@ -14,7 +14,6 @@ COMMENT= Java benchmark for scientific and numeric USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NEED_JAVAC= yes JAVAC_OPTS?= -O Index: biology/artemis/Makefile =================================================================== --- biology/artemis/Makefile (revision 517355) +++ biology/artemis/Makefile (working copy) @@ -20,7 +20,6 @@ USE_GITHUB= yes GH_ACCOUNT= sanger-pathogens SHEBANG_FILES= act art bamview dnaplotter test/*.sh etc/go_associations.pl USE_JAVA= yes -JAVA_VERSION= 1.6+ ALL_TARGET= jar NO_ARCH= yes Index: biology/cytoscape/Makefile =================================================================== --- biology/cytoscape/Makefile (revision 517355) +++ biology/cytoscape/Makefile (working copy) @@ -24,7 +24,6 @@ RUN_DEPENDS= bash:shells/bash USES= shebangfix SHEBANG_FILES= gui-distribution/assembly/src/main/bin/cytoscape.sh USE_JAVA= yes -JAVA_VERSION= 1.7+ USE_GITHUB= yes GH_TUPLE= ${PORTNAME}:${PORTNAME}-parent:${DISTVERSION}:p/parent \ ${PORTNAME}:${PORTNAME}-api:${DISTVERSION}:a/api \ Index: biology/jalview/Makefile =================================================================== --- biology/jalview/Makefile (revision 517355) +++ biology/jalview/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Viewer and editor for multiple sequence alignments USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= makejars WRKSRC= ${WRKDIR}/${PORTNAME} Index: biology/trimmomatic/Makefile =================================================================== --- biology/trimmomatic/Makefile (revision 517355) +++ biology/trimmomatic/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes NO_BUILD= yes NO_ARCH= yes Index: cad/electric-ng/Makefile =================================================================== --- cad/electric-ng/Makefile (revision 517355) +++ cad/electric-ng/Makefile (working copy) @@ -20,7 +20,6 @@ LICENSE= GPLv3 EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes SUB_LIST+= LIBFILES="${LIBFILES}" \ JARFILE="${JARFILE}" Index: cad/fidocadj/Makefile =================================================================== --- cad/fidocadj/Makefile (revision 517355) +++ cad/fidocadj/Makefile (working copy) @@ -23,7 +23,6 @@ NO_BUILD= yes SUB_FILES= ${PORTNAME}.sh -JAVA_VERSION= 1.6+ USE_JAVA= yes OPTIONS_DEFINE= DOCS Index: cad/impact/Makefile =================================================================== --- cad/impact/Makefile (revision 517355) +++ cad/impact/Makefile (working copy) @@ -24,7 +24,6 @@ WRKSRC= ${WRKDIR}/Impact USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/Impact Index: cad/logisim/Makefile =================================================================== --- cad/logisim/Makefile (revision 517355) +++ cad/logisim/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE= GPLv2 NO_BUILD= yes USE_JAVA= yes JAVA_RUN= yes -JAVA_VERSION= 1.6+ PLIST_FILES= ${DATADIR_REL}/${PORTNAME}-generic-${PORTVERSION}${EXTRACT_SUFX} \ bin/${PORTNAME} Index: cad/sweethome3d/Makefile =================================================================== --- cad/sweethome3d/Makefile (revision 517355) +++ cad/sweethome3d/Makefile (working copy) @@ -20,7 +20,6 @@ USES= zip 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 (revision 517355) +++ comms/rxtx/Makefile (working copy) @@ -21,7 +21,6 @@ NOT_FOR_ARCHS_REASON= Java not available for this 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 (revision 517355) +++ comms/yaac/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= LGPL3 BROKEN_armv7= fails to package: yaac/build.xml:205: yaac/work/yaac/YAAC/site does not exist -JAVA_VERSION= 1.6+ USES= zip USE_ANT= yes USE_JAVA= yes Index: databases/apache-commons-dbutils/Makefile =================================================================== --- databases/apache-commons-dbutils/Makefile (revision 517355) +++ databases/apache-commons-dbutils/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= APACHE20 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 (revision 517355) +++ databases/c3p0/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE_COMB= dual USES= tar:tgz USE_JAVA= yes NO_BUILD= yes -JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_ARCH= yes Index: databases/db6/Makefile =================================================================== --- databases/db6/Makefile (revision 517355) +++ databases/db6/Makefile (working copy) @@ -54,7 +54,7 @@ L10N_CONFIGURE_ENABLE= localization SQL_CONFIGURE_ENABLE= sql sql_codegen SQL_VARS= DBLIBS+=libdb_sql JAVA_USE= java -JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION=1.6+ +JAVA_VARS= DBLIBS+=libdb_java JAVA_CONFIGURE_ENABLE= java JAVA_CPPFLAGS= -I"${JAVA_HOME}/include" JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" Index: databases/frontbase-jdbc/Makefile =================================================================== --- databases/frontbase-jdbc/Makefile (revision 517355) +++ databases/frontbase-jdbc/Makefile (working copy) @@ -13,7 +13,6 @@ MAINTAINER?= ports@FreeBSD.org COMMENT= The Java JDBC implementation for FrontBase USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes JARFILE= frontbasejdbc.jar Index: databases/hbase/Makefile =================================================================== --- databases/hbase/Makefile (revision 517355) +++ databases/hbase/Makefile (working copy) @@ -24,7 +24,6 @@ RUN_DEPENDS= bash:shells/bash \ USES= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.7+ MAKE_ENV+= JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-XX:MaxPermSize=256m" OPTIONS_DEFINE= DOCS Index: databases/hsqldb/Makefile =================================================================== --- databases/hsqldb/Makefile (revision 517355) +++ databases/hsqldb/Makefile (working copy) @@ -12,7 +12,6 @@ COMMENT= Embeddable SQL database written in Java LICENSE= BSD3CLAUSE USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes USES= zip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME} Index: databases/isql-viewer/Makefile =================================================================== --- databases/isql-viewer/Makefile (revision 517355) +++ databases/isql-viewer/Makefile (working copy) @@ -19,7 +19,6 @@ RUN_DEPENDS= ${JYTHON_PREFIX}/${JYTHON_JAR}:lang/j ${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 (revision 517355) +++ databases/jasperreports/Makefile (working copy) @@ -26,7 +26,6 @@ OPTIONS_DEFAULT=MYSQL PGSQL HSQLDB_DESC= Install libraries required for HSQLDB USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty Index: databases/jdbc-oracle11g/Makefile =================================================================== --- databases/jdbc-oracle11g/Makefile (revision 517355) +++ databases/jdbc-oracle11g/Makefile (working copy) @@ -14,7 +14,6 @@ MAINTAINER= ports@FreeBSD.org 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 (revision 517355) +++ databases/jrobin/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Pure Java alternative to RRDTool USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes CLASSES= jrobin Index: databases/jrrd/Makefile =================================================================== --- databases/jrrd/Makefile (revision 517355) +++ databases/jrrd/Makefile (working copy) @@ -14,7 +14,6 @@ LIB_DEPENDS= librrd.so:databases/rrdtool USES= libtool USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk JAVA_BUILD= yes JAVA_RUN= yes Index: databases/libgda5/Makefile =================================================================== --- databases/libgda5/Makefile (revision 517355) +++ databases/libgda5/Makefile (working copy) @@ -95,7 +95,6 @@ CONFIGURE_ARGS+= --without-mdb .if ${LIBGDA5_SLAVE}==jdbc USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_VENDOR= bsdjava openjdk CFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd .else Index: databases/postgis-jdbc/Makefile =================================================================== --- databases/postgis-jdbc/Makefile (revision 517355) +++ databases/postgis-jdbc/Makefile (working copy) @@ -17,7 +17,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/postgresql.jar:database USES= zip:infozip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: databases/powerarchitect/Makefile =================================================================== --- databases/powerarchitect/Makefile (revision 517355) +++ databases/powerarchitect/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= Data modeling and profiling tool LICENSE= GPLv3 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PORTDOCS= * Index: databases/puppetdb5/Makefile =================================================================== --- databases/puppetdb5/Makefile (revision 517355) +++ databases/puppetdb5/Makefile (working copy) @@ -30,7 +30,6 @@ SHEBANG_FILES= ext/bin/puppetdb \ USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes -JAVA_VERSION= 1.7+ USERS= puppetdb GROUPS= puppetdb Index: databases/puppetdb6/Makefile =================================================================== --- databases/puppetdb6/Makefile (revision 517355) +++ databases/puppetdb6/Makefile (working copy) @@ -30,7 +30,6 @@ SHEBANG_FILES= ext/bin/puppetdb \ USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes -JAVA_VERSION= 1.7+ USERS= puppetdb GROUPS= puppetdb Index: deskutils/docear/Makefile =================================================================== --- deskutils/docear/Makefile (revision 517355) +++ deskutils/docear/Makefile (working copy) @@ -20,7 +20,6 @@ LICENSE_FILE= ${WRKSRC}/license.txt USES= desktop-file-utils shared-mime-info USE_JAVA= yes JAVA_VENDOR= openjdk -JAVA_VERSION= 1.6+ NO_BUILD= yes JDATADIR= ${JAVASHAREDIR}/${PORTNAME} icon= ${DATADIR}/${PORTNAME}-icon48x48.png Index: deskutils/freemind/Makefile =================================================================== --- deskutils/freemind/Makefile (revision 517355) +++ deskutils/freemind/Makefile (working copy) @@ -18,7 +18,6 @@ BUILD_DEPENDS= zip:archivers/zip USES= cpe zip:infozip USE_JAVA= yes -JAVA_VERSION= 1.6+ DATADIR= ${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION} DATAFILES= accessories browser doc lib plugins patterns.xml Index: deskutils/freeplane/Makefile =================================================================== --- deskutils/freeplane/Makefile (revision 517355) +++ deskutils/freeplane/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/license.txt USES= cpe zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes NO_BUILD= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" Index: deskutils/ganttproject/Makefile =================================================================== --- deskutils/ganttproject/Makefile (revision 517355) +++ deskutils/ganttproject/Makefile (working copy) @@ -19,7 +19,6 @@ SHEBANG_FILES= ganttproject bash_CMD= /bin/sh USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_ARCH= yes NO_BUILD= yes Index: deskutils/projectlibre/Makefile =================================================================== --- deskutils/projectlibre/Makefile (revision 517355) +++ deskutils/projectlibre/Makefile (working copy) @@ -17,7 +17,6 @@ COMMENT= Open source desktop alternative to Micros LICENSE= CPAL-1.0 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes NO_BUILD= yes Index: deskutils/thinkingrock/Makefile =================================================================== --- deskutils/thinkingrock/Makefile (revision 517355) +++ deskutils/thinkingrock/Makefile (working copy) @@ -15,7 +15,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:devel/xdg-u ${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 (revision 517355) +++ devel/antlr3/Makefile (working copy) @@ -17,7 +17,6 @@ LICENSE= BSD3CLAUSE NO_BUILD= yes NO_ARCH= yes USE_JAVA= yes -JAVA_VERSION= 1.7+ INSTALL_JAR= ${DISTFILES} SUB_LIST= INSTALL_JAR=${INSTALL_JAR} SUB_FILES= antlr.sh Index: devel/apache-commons-configuration/Makefile =================================================================== --- devel/apache-commons-configuration/Makefile (revision 517355) +++ devel/apache-commons-configuration/Makefile (working copy) @@ -22,7 +22,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} 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 (revision 517355) +++ devel/apache-commons-daemon/Makefile (working copy) @@ -18,7 +18,6 @@ LICENSE= APACHE20 OPTIONS_DEFINE= DOCS USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-java=${JAVA_HOME} Index: devel/apache-commons-io/Makefile =================================================================== --- devel/apache-commons-io/Makefile (revision 517355) +++ devel/apache-commons-io/Makefile (working copy) @@ -14,7 +14,7 @@ COMMENT= Collection of I/O utilities for Java LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USE_JAVA= 1.7+ +USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes Index: devel/apache-commons-jxpath/Makefile =================================================================== --- devel/apache-commons-jxpath/Makefile (revision 517355) +++ devel/apache-commons-jxpath/Makefile (working copy) @@ -14,7 +14,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Utilities for manipulating Java Beans using the XPath syntax USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar Index: devel/apache-commons-modeler/Makefile =================================================================== --- devel/apache-commons-modeler/Makefile (revision 517355) +++ devel/apache-commons-modeler/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= Mechanisms to create Model MBeans compati LICENSE= APACHE20 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar Index: devel/argouml/Makefile =================================================================== --- devel/argouml/Makefile (revision 517355) +++ devel/argouml/Makefile (working copy) @@ -24,7 +24,6 @@ PORTSCOUT= limitw:1,even \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= argouml.sh SUB_LIST= JAVA_VERSION=${JAVA_VERSION} Index: devel/astah-community/Makefile =================================================================== --- devel/astah-community/Makefile (revision 517355) +++ devel/astah-community/Makefile (working copy) @@ -21,7 +21,6 @@ RESTRICTED= License restrictions -- See http://ast 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 (revision 517355) +++ devel/avalon-framework/Makefile (working copy) @@ -11,7 +11,6 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Apache Avalon core framework for component programming USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} Index: devel/charva/Makefile =================================================================== --- devel/charva/Makefile (revision 517355) +++ devel/charva/Makefile (working copy) @@ -22,7 +22,6 @@ OPTIONS_DEFINE= DOCS USES= dos2unix zip DOS2UNIX_GLOB= build.xml Makefile.freebsd.txt *.c *.java USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= clean makeDLL dist Index: devel/doctorj/Makefile =================================================================== --- devel/doctorj/Makefile (revision 517355) +++ devel/doctorj/Makefile (working copy) @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tool for analyzing Java code and documentation USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jarfile Index: devel/flex-sdk/Makefile =================================================================== --- devel/flex-sdk/Makefile (revision 517355) +++ devel/flex-sdk/Makefile (working copy) @@ -12,7 +12,6 @@ COMMENT= Adobe Flex SDK CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.* USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= ${SCRIPTS:C/\$/.sh/g} NO_ARCH= yes NO_BUILD= yes Index: devel/flex-sdk35/Makefile =================================================================== --- devel/flex-sdk35/Makefile (revision 517355) +++ devel/flex-sdk35/Makefile (working copy) @@ -14,7 +14,6 @@ COMMENT= Adobe Flex SDK CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk-4.* USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= ${SCRIPTS:C/\$/.sh/g} PLIST_SUB= PORTNAME=${PORTNAME} SUB_LIST= PORTNAME=${PORTNAME} Index: devel/flexjson/Makefile =================================================================== --- devel/flexjson/Makefile (revision 517355) +++ devel/flexjson/Makefile (working copy) @@ -13,7 +13,6 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: devel/gitblit/Makefile =================================================================== --- devel/gitblit/Makefile (revision 517355) +++ devel/gitblit/Makefile (working copy) @@ -23,7 +23,6 @@ USERS= www GROUPS= www USE_JAVA= yes -JAVA_VERSION= 1.7+ SUB_FILES= pkg-message PLIST_SUB+= GB_DATAHOME=${PREFIX}/${PORTNAME} \ Index: devel/gogland-eap/Makefile =================================================================== --- devel/gogland-eap/Makefile (revision 517355) +++ devel/gogland-eap/Makefile (working copy) @@ -21,7 +21,6 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-f 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 (revision 517355) +++ devel/gradle/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= APACHE20 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 (revision 517355) +++ devel/gradle4/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= APACHE20 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.7+ DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} NO_ARCH= yes Index: devel/hadoop/Makefile =================================================================== --- devel/hadoop/Makefile (revision 517355) +++ devel/hadoop/Makefile (working copy) @@ -27,7 +27,6 @@ CONFLICTS_INSTALL= hadoop2-2* USES= cpe libtool ssl:build CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.7+ USE_ANT= yes ONLY_FOR_ARCHS= amd64 i386 USE_LDCONFIG= yes Index: devel/hadoop2/Makefile =================================================================== --- devel/hadoop2/Makefile (revision 517355) +++ devel/hadoop2/Makefile (working copy) @@ -39,7 +39,6 @@ CONFLICTS_INSTALL= hadoop-1* yarn USES= cpe shebangfix CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.7+ USE_LDCONFIG= yes SHEBANG_FILES= hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh MAKE_ENV+= JAVA_HOME=${JAVA_HOME} HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc Index: devel/hive/Makefile =================================================================== --- devel/hive/Makefile (revision 517355) +++ devel/hive/Makefile (working copy) @@ -25,7 +25,6 @@ RUN_DEPENDS= bash:shells/bash \ USES= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.7+ WRKSRC= ${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}-src HIVE_USER= hive Index: devel/ireport/Makefile =================================================================== --- devel/ireport/Makefile (revision 517355) +++ devel/ireport/Makefile (working copy) @@ -12,7 +12,6 @@ COMMENT= A visual report builder/designer for Jasp USES= dos2unix USE_JAVA= yes -JAVA_VERSION= 1.6+ DOS2UNIX_GLOB= *.txt NO_BUILD= yes Index: devel/itext/Makefile =================================================================== --- devel/itext/Makefile (revision 517355) +++ devel/itext/Makefile (working copy) @@ -26,7 +26,6 @@ OPTIONS_DEFINE= DOCS USES= dos2unix tar:bzip2 DOS2UNIX_GLOB= *.java USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jar jar.rtf jar.rups MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES Index: devel/java-findbugs/Makefile =================================================================== --- devel/java-findbugs/Makefile (revision 517355) +++ devel/java-findbugs/Makefile (working copy) @@ -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 (revision 517355) +++ devel/java-findbugs/files/patch-findbugs2 (working copy) @@ -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 (revision 517355) +++ devel/jcmdline/Makefile (working copy) @@ -13,7 +13,6 @@ LICENSE= MPL11 LICENSE_FILE= ${WRKSRC}/LICENSE USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: devel/jiic/Makefile =================================================================== --- devel/jiic/Makefile (revision 517355) +++ devel/jiic/Makefile (working copy) @@ -16,7 +16,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/sabre.jar:devel/sabre WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES ALL_TARGET= jar Index: devel/jsap/Makefile =================================================================== --- devel/jsap/Makefile (revision 517355) +++ devel/jsap/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java package to parse command-line arguments USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: devel/leiningen/Makefile =================================================================== --- devel/leiningen/Makefile (revision 517355) +++ devel/leiningen/Makefile (working copy) @@ -18,7 +18,6 @@ GH_ACCOUNT= technomancy USES= shebangfix USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes NO_BUILD= yes Index: devel/libvirt-java/Makefile =================================================================== --- devel/libvirt-java/Makefile (revision 517355) +++ devel/libvirt-java/Makefile (working copy) @@ -18,7 +18,6 @@ BUILD_DEPENDS= jna>=4.0:devel/jna \ junit>=4.8.2:java/junit USE_JAVA= YES -JAVA_VERSION= 1.6+ USE_ANT= YES ALL_TARGET= jar Index: devel/looks/Makefile =================================================================== --- devel/looks/Makefile (revision 517355) +++ devel/looks/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= BSD3CLAUSE USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/jgoodies-${PORTNAME}-${PORTVERSION} Index: devel/maven/Makefile =================================================================== --- devel/maven/Makefile (revision 517355) +++ devel/maven/Makefile (working copy) @@ -19,7 +19,6 @@ USE_JAVA= yes 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 (revision 517355) +++ devel/maven3/Makefile (working copy) @@ -19,7 +19,6 @@ CPE_PRODUCT= maven CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} Index: devel/maven31/Makefile =================================================================== --- devel/maven31/Makefile (revision 517355) +++ devel/maven31/Makefile (working copy) @@ -20,7 +20,6 @@ CPE_PRODUCT= maven CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} Index: devel/maven33/Makefile =================================================================== --- devel/maven33/Makefile (revision 517355) +++ devel/maven33/Makefile (working copy) @@ -18,7 +18,6 @@ CPE_PRODUCT= maven CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} Index: devel/netscape-java40/Makefile =================================================================== --- devel/netscape-java40/Makefile (revision 517355) +++ devel/netscape-java40/Makefile (working copy) @@ -17,7 +17,6 @@ LICENSE_FILE= ${WRKSRC}/License LICENSE_PERMS= dist-mirror dist-sell pkg-mirror auto-accept USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: devel/ocaml-camljava/Makefile =================================================================== --- devel/ocaml-camljava/Makefile (revision 517355) +++ devel/ocaml-camljava/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= OCaml-Java library interface USE_OCAML= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ post-patch: @${REINPLACE_CMD} -e "s,^\(JAVAC=\).*,\1${JAVAC},g" \ Index: devel/oozie/Makefile =================================================================== --- devel/oozie/Makefile (revision 517355) +++ devel/oozie/Makefile (working copy) @@ -29,7 +29,6 @@ RUN_DEPENDS= bash:shells/bash \ USES= shebangfix USE_JAVA= yes -JAVA_VERSION= 1.7+ TOMCAT_VERSION= 6.0.43 HADOOP_VERSION= 2.7.2 # Matches devel/hadoop2 SHEBANG_FILES= client/src/main/bin/oozie distro/src/main/bin/addtowar.sh distro/src/main/bin/oozied.sh distro/src/main/bin/oozie-setup.sh distro/src/main/bin/oozie-sys.sh tools/src/main/bin/ooziedb.sh core/src/main/conf/oozie-env.sh Index: devel/p5-Inline-Java/Makefile =================================================================== --- devel/p5-Inline-Java/Makefile (revision 517355) +++ devel/p5-Inline-Java/Makefile (working copy) @@ -18,7 +18,6 @@ RUN_DEPENDS= p5-Inline>=0.68:devel/p5-Inline \ p5-Inline-C>=0.62:devel/p5-Inline-C USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native MAKE_JOBS_UNSAFE= yes Index: devel/p5-Java/Makefile =================================================================== --- devel/p5-Java/Makefile (revision 517355) +++ devel/p5-Java/Makefile (working copy) @@ -15,7 +15,6 @@ USE_RC_SUBR= javaserver USES= perl5 USE_PERL5= configure USE_JAVA= yes -JAVA_VERSION= 1.6+ post-patch: ${RM} ${WRKSRC}/java_server_install.pl Index: devel/pig/Makefile =================================================================== --- devel/pig/Makefile (revision 517355) +++ devel/pig/Makefile (working copy) @@ -24,7 +24,6 @@ RUN_DEPENDS= bash:shells/bash \ BROKEN= tries to make outbound http connection during build phase breaking tinderbox. Software itself does not have known issues, remove this BROKEN line and build your own package USE_JAVA= yes -JAVA_VERSION= 1.7+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src PLIST_SUB= PORTVERSION="${PORTVERSION}" Index: devel/pmd/Makefile =================================================================== --- devel/pmd/Makefile (revision 517355) +++ devel/pmd/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE_COMB= dual USES= zip USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} PLIST_SUB+= PORTVERSION=${PORTVERSION} Index: devel/py-jcc/Makefile =================================================================== --- devel/py-jcc/Makefile (revision 517355) +++ devel/py-jcc/Makefile (working copy) @@ -24,7 +24,6 @@ USES= python:-3.6 USE_PYTHON= distutils autoplist PYDISTUTILS_PKGNAME= JCC USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk JCC_INCLUDES= '${JAVA_HOME}/include;${JAVA_HOME}/include/freebsd' Index: devel/py-jep/Makefile =================================================================== --- devel/py-jep/Makefile (revision 517355) +++ devel/py-jep/Makefile (working copy) @@ -19,7 +19,6 @@ USE_PYTHON= distutils CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} MAKE_ENV= JAVA_HOME=${JAVA_HOME} USE_JAVA= yes -JAVA_VERSION= 1.7+ USE_LDCONFIG= yes PLIST_SUB+= VERSION=${PORTVERSION} Index: devel/pycharm-ce/Makefile =================================================================== --- devel/pycharm-ce/Makefile (revision 517355) +++ devel/pycharm-ce/Makefile (working copy) @@ -19,7 +19,6 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-f 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 (revision 517355) +++ devel/sabre/Makefile (working copy) @@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/Simple\ API\ for\ Binary\ REpre 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 (revision 517355) +++ devel/simian/Makefile (working copy) @@ -39,7 +39,6 @@ OPTIONS_DEFAULT= JAVA .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes -JAVA_VERSION= 1.6+ PLIST_SUB+= JAVA="" SUB_LIST+= JAVA="" .else Index: devel/smc/Makefile =================================================================== --- devel/smc/Makefile (revision 517355) +++ devel/smc/Makefile (working copy) @@ -13,7 +13,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The State Machine Compiler USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PORTEXAMPLES= * Index: devel/soapui/Makefile =================================================================== --- devel/soapui/Makefile (revision 517355) +++ devel/soapui/Makefile (working copy) @@ -25,7 +25,7 @@ LICENSE_PERMS_EUPL= dist-mirror dist-sell pkg-mirr 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 (revision 517355) +++ devel/sonar-ant-task/Makefile (working copy) @@ -25,7 +25,6 @@ USES= cpe CPE_VENDOR= sonarsource USE_JAVA= yes -JAVA_VERSION= 1.7+ SUB_FILES= pkg-message PLIST_FILES= ${DATADIR_REL}/sonar-ant-task.jar Index: devel/sonar-scanner-cli/Makefile =================================================================== --- devel/sonar-scanner-cli/Makefile (revision 517355) +++ devel/sonar-scanner-cli/Makefile (working copy) @@ -22,7 +22,6 @@ USES= cpe zip CPE_VENDOR= sonarsource USE_JAVA= yes -JAVA_VERSION= 1.7+ SR= sonar-runner SQ_CLI= sonar-scanner Index: devel/sonarqube/Makefile =================================================================== --- devel/sonarqube/Makefile (revision 517355) +++ devel/sonarqube/Makefile (working copy) @@ -29,7 +29,6 @@ CPE_VENDOR= sonarsource DOS2UNIX_GLOB= *.properties *.conf USE_JAVA= yes -JAVA_VERSION= 1.7+ SQ_FILE= sonar.sh SQ_HOME= ${PREFIX}/share/${PORTNAME} Index: devel/spark/Makefile =================================================================== --- devel/spark/Makefile (revision 517355) +++ devel/spark/Makefile (working copy) @@ -25,7 +25,6 @@ RUN_DEPENDS= bash:shells/bash \ USES= python:2.7 shebangfix USE_JAVA= yes -JAVA_VERSION= 1.7+ MAKE_ENV+= JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=512m" SHEBANG_FILES= bin/sparkR Index: devel/statcvs/Makefile =================================================================== --- devel/statcvs/Makefile (revision 517355) +++ devel/statcvs/Makefile (working copy) @@ -20,7 +20,6 @@ BROKEN_armv7= fails to compile: build.xml: compil 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 (revision 517355) +++ devel/statsvn/Makefile (working copy) @@ -21,7 +21,6 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} USES= zip USE_JAVA= yes USE_ANT= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes ALL_TARGET= dist Index: devel/swank-clojure/Makefile =================================================================== --- devel/swank-clojure/Makefile (revision 517355) +++ devel/swank-clojure/Makefile (working copy) @@ -11,7 +11,6 @@ COMMENT= Swank/SLIME support for Clojure USE_GITHUB= yes GH_ACCOUNT= technomancy USE_JAVA= yes -JAVA_VERSION= 1.6+ PLIST_FILES= %%JAVAJARDIR%%/swank-clojure-1.2.1.jar Index: devel/tijmp/Makefile =================================================================== --- devel/tijmp/Makefile (revision 517355) +++ devel/tijmp/Makefile (working copy) @@ -18,7 +18,6 @@ CONFIGURE_ENV= JAVA_HOME="${JAVA_HOME}" INSTALL_TARGET= install-strip USES= gmake libtool USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native JAVA_BUILD= jdk USE_LDCONFIG= yes Index: devel/tinylaf/Makefile =================================================================== --- devel/tinylaf/Makefile (revision 517355) +++ devel/tinylaf/Makefile (working copy) @@ -13,7 +13,6 @@ OPTIONS_DEFINE= DOCS USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes JARFILE= ${PORTNAME}.jar tinycp.jar Index: devel/violet/Makefile =================================================================== --- devel/violet/Makefile (revision 517355) +++ devel/violet/Makefile (working copy) @@ -15,7 +15,6 @@ COMMENT= Violet is a easy to learn and use UML edi LICENSE= GPLv2 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= YES Index: dns/crossip/Makefile =================================================================== --- dns/crossip/Makefile (revision 517355) +++ dns/crossip/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= GPLv2 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes Index: dns/dnsjava/Makefile =================================================================== --- dns/dnsjava/Makefile (revision 517355) +++ dns/dnsjava/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes USE_JAVA= yes -JAVA_VERSION= 7+ USE_ANT= yes ALL_TARGET= jar NO_ARCH= yes Index: editors/drjava/Makefile =================================================================== --- editors/drjava/Makefile (revision 517355) +++ editors/drjava/Makefile (working copy) @@ -15,7 +15,6 @@ COMMENT= Lightweight IDE for writing Java programs NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= ${PORTNAME} SUB_LIST= DRJAVAJAR=${DRJAVAJAR} Index: editors/jedit/Makefile =================================================================== --- editors/jedit/Makefile (revision 517355) +++ editors/jedit/Makefile (working copy) @@ -23,7 +23,6 @@ OPTIONS_SUB= yes USES= cpe xorg USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_XORG= x11 NO_BUILD= yes Index: editors/omegaT/Makefile =================================================================== --- editors/omegaT/Makefile (revision 517355) +++ editors/omegaT/Makefile (working copy) @@ -24,7 +24,6 @@ kaptain_CMD= ${LOCALBASE}/bin/kaptain USE_ANT= yes USE_JAVA= yes JAVA_VENDOR= openjdk -JAVA_VERSION= 1.7+ JAVA_BUILD= yes JAVA_RUN= yes NO_WRKSUBDIR= yes Index: editors/openoffice-4/Makefile =================================================================== --- editors/openoffice-4/Makefile (revision 517355) +++ editors/openoffice-4/Makefile (working copy) @@ -105,7 +105,6 @@ USE_JAVA= yes JAVA_BUILD= jdk JAVA_RUN= jdk JAVA_VENDOR= openjdk -JAVA_VERSION= 1.6+ USE_PERL5= build USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ xinerama xrandr xrender xt Index: editors/openoffice-devel/Makefile =================================================================== --- editors/openoffice-devel/Makefile (revision 517355) +++ editors/openoffice-devel/Makefile (working copy) @@ -108,7 +108,6 @@ USE_JAVA= yes JAVA_BUILD= jdk JAVA_RUN= jdk JAVA_VENDOR= openjdk -JAVA_VERSION= 1.6+ USE_PERL5= build USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ xinerama xrandr xrender xt Index: editors/treeform/Makefile =================================================================== --- editors/treeform/Makefile (revision 517355) +++ editors/treeform/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= Linguistic Syntax/Semantics tree drawing 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 (revision 517355) +++ emulators/javatari/Makefile (working copy) @@ -19,7 +19,6 @@ LICENSE= AGPLv3 EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \ bin/javatari Index: finance/jgnash/Makefile =================================================================== --- finance/jgnash/Makefile (revision 517355) +++ finance/jgnash/Makefile (working copy) @@ -20,7 +20,6 @@ PLIST_SUB+= DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/| USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk NO_BUILD= yes Index: finance/venice/Makefile =================================================================== --- finance/venice/Makefile (revision 517355) +++ finance/venice/Makefile (working copy) @@ -17,7 +17,6 @@ LICENSE= GPLv2 USES= gnome USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PORTDOCS= * Index: ftp/jftp/Makefile =================================================================== --- ftp/jftp/Makefile (revision 517355) +++ ftp/jftp/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= Java Network Browser LICENSE= GPLv2 -JAVA_VERSION= 1.6+ NO_BUILD= yes USE_JAVA= yes WRKSRC= ${WRKDIR}/j-ftp Index: games/blackjackclient/Makefile =================================================================== --- games/blackjackclient/Makefile (revision 517355) +++ games/blackjackclient/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= GPLv2 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 (revision 517355) +++ games/castlevox/Makefile (working copy) @@ -14,7 +14,6 @@ COMMENT= Fast world domination game BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: games/dmjava/Makefile =================================================================== --- games/dmjava/Makefile (revision 517355) +++ games/dmjava/Makefile (working copy) @@ -16,7 +16,6 @@ EXTRACT_AFTER_ARGS= -d ${WRKSRC} USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes do-install: Index: games/domination/Makefile =================================================================== --- games/domination/Makefile (revision 517355) +++ games/domination/Makefile (working copy) @@ -19,7 +19,6 @@ LICENSE= GPLv3 USES= dos2unix zip:infozip DOS2UNIX_GLOB= *.txt *.ini *.htm *.cards *.map USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME:S/d/D/} Index: games/freecol/Makefile =================================================================== --- games/freecol/Makefile (revision 517355) +++ games/freecol/Makefile (working copy) @@ -17,7 +17,6 @@ USES= zip NO_BUILD= yes SUB_FILES= freecol USE_JAVA= yes -JAVA_VERSION= 1.6+ PLIST_FILES= bin/freecol \ ${DESKTOPDIR:S,^${PREFIX}/,,}/freecol.desktop Index: games/java-games-suite/Makefile =================================================================== --- games/java-games-suite/Makefile (revision 517355) +++ games/java-games-suite/Makefile (working copy) @@ -13,7 +13,6 @@ USE_JAVA= yes 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 (revision 517355) +++ games/jchessboard/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE= GPLv2 USES= tar:tgz USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_LOCALE= en_US.ISO8859-1 NO_ARCH= yes Index: games/jinput/Makefile =================================================================== --- games/jinput/Makefile (revision 517355) +++ games/jinput/Makefile (working copy) @@ -17,7 +17,6 @@ BROKEN_armv7= fails to compile: build.xml: compil 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 (revision 517355) +++ games/jtans/Makefile (working copy) @@ -19,7 +19,6 @@ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes SUB_FILES= jtans.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} Index: games/jutils/Makefile =================================================================== --- games/jutils/Makefile (revision 517355) +++ games/jutils/Makefile (working copy) @@ -18,7 +18,7 @@ USE_GITLAB= yes GL_ACCOUNT= voidanix GL_COMMIT= 3b2f176fdb76126c831a695b579267cf351624f5 -USE_JAVA= 6+ +USE_JAVA= yes PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar PLIST_DIRS= ${JAVAJARDIR}/${PORTNAME} Index: games/lwjgl/Makefile =================================================================== --- games/lwjgl/Makefile (revision 517355) +++ games/lwjgl/Makefile (working copy) @@ -29,7 +29,6 @@ USES= dos2unix zip xorg DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$ USE_JAVA= yes USE_LDCONFIG= yes -JAVA_VERSION= 1.7+ JAVA_OS= native JAVA_VENDOR= openjdk USE_ANT= yes Index: games/moagg/Makefile =================================================================== --- games/moagg/Makefile (revision 517355) +++ games/moagg/Makefile (working copy) @@ -22,7 +22,6 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PORTDOCS= AUTHORS README.txt Index: games/pcgen/Makefile =================================================================== --- games/pcgen/Makefile (revision 517355) +++ games/pcgen/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= LGPL21 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 (revision 517355) +++ games/rescue/Makefile (working copy) @@ -17,7 +17,6 @@ LICENSE_FILE= ${WRKSRC}/gpl.txt USES= dos2unix zip:infozip DOS2UNIX_GLOB= *.txt *.htm *.css *.ini *.xml USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME:S/r/R/} Index: games/robocode/Makefile =================================================================== --- games/robocode/Makefile (revision 517355) +++ games/robocode/Makefile (working copy) @@ -18,7 +18,6 @@ LICENSE_FILE= ${WRKSRC}/license/epl-v10.html USES= dos2unix zip:infozip DOS2UNIX_GLOB= *.css *.team *.properties package-list MANIFEST.MF USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_EXTRACT= yes JAVA_RUN= yes NO_WRKSUBDIR= yes Index: games/robocode-naval/Makefile =================================================================== --- games/robocode-naval/Makefile (revision 517355) +++ games/robocode-naval/Makefile (working copy) @@ -19,7 +19,6 @@ PORTSCOUT= limit:^\d+\.\d+\.\d+$$ USES= dos2unix zip DOS2UNIX_GLOB= *.css *.team *.properties package-list MANIFEST.MF USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_EXTRACT= yes JAVA_RUN= yes NO_WRKSUBDIR= yes Index: games/spicetrade/Makefile =================================================================== --- games/spicetrade/Makefile (revision 517355) +++ games/spicetrade/Makefile (working copy) @@ -14,7 +14,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Colourful 14th century Arab spice trading game USE_JAVA= yes -JAVA_VERSION= 1.6+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} NO_BUILD= yes NO_ARCH= yes Index: games/stendhal/Makefile =================================================================== --- games/stendhal/Makefile (revision 517355) +++ games/stendhal/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE_COMB= multi WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes USES= shebangfix Index: graphics/aoi/Makefile =================================================================== --- graphics/aoi/Makefile (revision 517355) +++ graphics/aoi/Makefile (working copy) @@ -21,7 +21,6 @@ LIB_DEPENDS= libjogl.so:graphics/jogl USES= zip DOS2UNIX_FILES= ../AoI_Manual/*.html # USES=dos2unix is optional USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g} Index: graphics/barbecue/Makefile =================================================================== --- graphics/barbecue/Makefile (revision 517355) +++ graphics/barbecue/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE= BSD3CLAUSE RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:java/jdom USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes JARFILES= ${PORTNAME}-${DISTVERSION}.jar Index: graphics/batik/Makefile =================================================================== --- graphics/batik/Makefile (revision 517355) +++ graphics/batik/Makefile (working copy) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE CPE_VENDOR= apache USES= cpe -USE_JAVA= 1.7+ +USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes Index: graphics/cbviewer/Makefile =================================================================== --- graphics/cbviewer/Makefile (revision 517355) +++ graphics/cbviewer/Makefile (working copy) @@ -23,7 +23,6 @@ RUN_DEPENDS= unrar:archivers/unrar USES= dos2unix zip DOS2UNIX_GLOB= CREDITS USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} Index: graphics/cosmoplayer/Makefile =================================================================== --- graphics/cosmoplayer/Makefile (revision 517355) +++ graphics/cosmoplayer/Makefile (working copy) @@ -22,7 +22,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror au 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 (revision 517355) +++ graphics/ditaa/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKDIR}/COPYING USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: graphics/geoserver/Makefile =================================================================== --- graphics/geoserver/Makefile (revision 517355) +++ graphics/geoserver/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= GPLv2 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: graphics/jalbum/Makefile =================================================================== --- graphics/jalbum/Makefile (revision 517355) +++ graphics/jalbum/Makefile (working copy) @@ -16,7 +16,6 @@ USES= zip NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= jalbum.sh Index: graphics/jave6/Makefile =================================================================== --- graphics/jave6/Makefile (revision 517355) +++ graphics/jave6/Makefile (working copy) @@ -16,7 +16,6 @@ EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes SUB_FILES= jave6 pkg-message Index: graphics/jdraw/Makefile =================================================================== --- graphics/jdraw/Makefile (revision 517355) +++ graphics/jdraw/Makefile (working copy) @@ -37,6 +37,5 @@ do-install: PLASTIC3D= "-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\"" RUN_DEPENDS+= ${JAVALIBDIR}/looks.jar:devel/looks .endif -JAVA_VERSION= 1.6+ .include Index: graphics/jogl/Makefile =================================================================== --- graphics/jogl/Makefile (revision 517355) +++ graphics/jogl/Makefile (working copy) @@ -35,7 +35,6 @@ USE_ANT= yes USE_LDCONFIG= yes USE_LOCALE= en_US.UTF-8 USE_JAVA= yes -JAVA_VERSION= 1.6+ BUILD_WRKSRC= ${WRKSRC}/jogl/make BUILD_BINPATH= ${WRKSRC}/bin Index: graphics/jpatch/Makefile =================================================================== --- graphics/jpatch/Makefile (revision 517355) +++ graphics/jpatch/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= Spline based 3D modeling tool USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION} Index: graphics/libpano13/Makefile =================================================================== --- graphics/libpano13/Makefile (revision 517355) +++ graphics/libpano13/Makefile (working copy) @@ -38,7 +38,6 @@ OPTIONS_SUB= yes .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native CONFIGURE_ARGS+= --with-java=${JAVA_HOME} .else Index: graphics/lightzone/Makefile =================================================================== --- graphics/lightzone/Makefile (revision 517355) +++ graphics/lightzone/Makefile (working copy) @@ -41,7 +41,6 @@ USE_GCC= yes USE_LDCONFIG= yes USE_XORG= x11 JAVA_VENDOR= openjdk -JAVA_VERSION= 1.6+ JAVA_BUILD= yes JAVA_RUN= yes INSTALLS_ICONS= yes Index: graphics/mapyrus/Makefile =================================================================== --- graphics/mapyrus/Makefile (revision 517355) +++ graphics/mapyrus/Makefile (working copy) @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/userdoc/COPYING DATADIR= ${JAVASHAREDIR}/${PORTNAME} -JAVA_VERSION= 1.6+ - MAPYRUSDOCS= ${PORTNAME}.pdf MAPYRUSJAR= ${PORTNAME}.jar Index: graphics/opendx/Makefile =================================================================== --- graphics/opendx/Makefile (revision 517355) +++ graphics/opendx/Makefile (working copy) @@ -53,7 +53,6 @@ CONFIGURE_ARGS+= --without-netcdf .if defined(WITH_JAVA) ONLY_FOR_ARCHS= i386 USE_JAVA= yes -JAVA_VERSION= 1.6+ BUILD_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer RUN_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer CONFIGURE_ARGS+= --with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \ Index: graphics/tintfu/Makefile =================================================================== --- graphics/tintfu/Makefile (revision 517355) +++ graphics/tintfu/Makefile (working copy) @@ -18,7 +18,6 @@ EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}.jar \ bin/tintfu Index: graphics/xmlgraphics-commons/Makefile =================================================================== --- graphics/xmlgraphics-commons/Makefile (revision 517355) +++ graphics/xmlgraphics-commons/Makefile (working copy) @@ -13,7 +13,7 @@ COMMENT= Several reusable components used by Apach 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 (revision 517355) +++ java/apache-commons-cli/Makefile (working copy) @@ -14,7 +14,6 @@ COMMENT= Java library for command line arguments a 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 (revision 517355) +++ java/apache-commons-lang/Makefile (working copy) @@ -14,7 +14,6 @@ COMMENT= Apache library with helper utilities for 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 (revision 517355) +++ java/apache-commons-lang3/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= APACHE20 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 (revision 517355) +++ java/apache-commons-logging/Makefile (working copy) @@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= DOCS USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes JARFILE= ${PORTNAME}-${PORTVERSION}.jar Index: java/apache-commons-primitives/Makefile =================================================================== --- java/apache-commons-primitives/Makefile (revision 517355) +++ java/apache-commons-primitives/Makefile (working copy) @@ -14,7 +14,6 @@ COMMENT= Library supporting Java primitive types LICENSE= APACHE20 USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: java/aparapi/Makefile =================================================================== --- java/aparapi/Makefile (revision 517355) +++ java/aparapi/Makefile (working copy) @@ -22,7 +22,6 @@ ONLY_FOR_ARCHS= amd64 USE_GITHUB= yes USE_JAVA= yes -JAVA_VERSION= 1.7+ USE_ANT= yes ALL_TARGET= dist Index: java/avis/Makefile =================================================================== --- java/avis/Makefile (revision 517355) +++ java/avis/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= Elvin Publish/Subscribe Message Bus serve 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 (revision 517355) +++ java/berkeley-db/Makefile (working copy) @@ -19,7 +19,6 @@ BROKEN_armv7= fails to build: build.xml: Java ret 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 (revision 517355) +++ java/bouncycastle/Makefile (working copy) @@ -23,7 +23,6 @@ CPE_PRODUCT= legion-of-the-bouncy-castle-java-cryt 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 (revision 517355) +++ java/bouncycastle15/Makefile (working copy) @@ -30,7 +30,6 @@ CPE_PRODUCT= legion-of-the-bouncy-castle-java-cryt 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 (revision 517355) +++ java/castor/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE= APACHE20 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 (revision 517355) +++ java/cryptix-jce/Makefile (working copy) @@ -12,7 +12,6 @@ COMMENT= JCE (Java Cryptography Extension) by Cryp USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes OPTIONS_DEFINE= DOCS Index: java/dbvis/Makefile =================================================================== --- java/dbvis/Makefile (revision 517355) +++ java/dbvis/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE_TEXT= Full license can be found at http:// 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 (revision 517355) +++ java/eclipse-drjava/Makefile (working copy) @@ -19,7 +19,6 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native DATADIR= ${PREFIX}/lib/eclipse/plugins Index: java/eclipse-ecj/Makefile =================================================================== --- java/eclipse-ecj/Makefile (revision 517355) +++ java/eclipse-ecj/Makefile (working copy) @@ -20,7 +20,6 @@ EXTRACT_AFTER_ARGS= -C ${WRKSRC} USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= ecj.sh SUB_LIST= PORTVERSION=${PORTVERSION} NO_WRKSUBDIR= yes Index: java/eclipse-findbugs/Makefile =================================================================== --- java/eclipse-findbugs/Makefile (revision 517355) +++ java/eclipse-findbugs/Makefile (working copy) @@ -17,7 +17,6 @@ RUN_DEPENDS= eclipse:java/eclipse USES= zip NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native PLIST_SUB= \ Index: java/eclipse-shelled/Makefile =================================================================== --- java/eclipse-shelled/Makefile (revision 517355) +++ java/eclipse-shelled/Makefile (working copy) @@ -19,7 +19,6 @@ USES= zip 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 (revision 517355) +++ java/infobus/Makefile (working copy) @@ -14,7 +14,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES USES= zip USE_JAVA= YES -JAVA_VERSION= 1.6+ NO_WRKSUBDIR= yes NO_BUILD= yes Index: java/jai/Makefile =================================================================== --- java/jai/Makefile (revision 517355) +++ java/jai/Makefile (working copy) @@ -14,7 +14,6 @@ COMMENT= High performance image processing librari 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 (revision 517355) +++ java/jakarta-bcel/Makefile (working copy) @@ -12,7 +12,6 @@ COMMENT= Library for generating Java bytecode NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes PLIST_FILES= %%JAVAJARDIR%%/bcel.jar Index: java/jakarta-commons-beanutils/Makefile =================================================================== --- java/jakarta-commons-beanutils/Makefile (revision 517355) +++ java/jakarta-commons-beanutils/Makefile (working copy) @@ -23,7 +23,6 @@ USES= dos2unix USE_JAVA= yes USE_ANT= yes DOS2UNIX_FILES= build.xml -JAVA_VERSION= 1.6+ ALL_TARGET= dist MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \ -Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar Index: java/jakarta-commons-discovery/Makefile =================================================================== --- java/jakarta-commons-discovery/Makefile (revision 517355) +++ java/jakarta-commons-discovery/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Java library for locating resources (including classes) USE_JAVA= YES -JAVA_VERSION= 1.6+ NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Index: java/jakarta-commons-httpclient/Makefile =================================================================== --- java/jakarta-commons-httpclient/Makefile (revision 517355) +++ java/jakarta-commons-httpclient/Makefile (working copy) @@ -24,7 +24,6 @@ OPTIONS_DEFINE= DOCS USES+= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES NO_ARCH= yes Index: java/jakarta-oro/Makefile =================================================================== --- java/jakarta-oro/Makefile (revision 517355) +++ java/jakarta-oro/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= APACHE20 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 (revision 517355) +++ java/jakarta-regexp/Makefile (working copy) @@ -16,7 +16,6 @@ BROKEN_armv6= fails to build: build.xml: Java ret 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 (revision 517355) +++ java/jasmin/Makefile (working copy) @@ -14,7 +14,6 @@ USES= dos2unix zip USE_ANT= yes ALL_TARGET= jasmin USE_JAVA= yes -JAVA_VERSION= 1.6+ DOS2UNIX_REGEX= .*\.(txt|xml|j|class|java|mf|css|bnf|html) SUB_FILES= jasmin.sh Index: java/java-subversion/Makefile =================================================================== --- java/java-subversion/Makefile (revision 517355) +++ java/java-subversion/Makefile (working copy) @@ -10,7 +10,6 @@ COMMENT= Java bindings for Version control system USES+= compiler USE_JAVA= yes -JAVA_VERSION= 1.7+ JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes Index: java/java3d/Makefile =================================================================== --- java/java3d/Makefile (revision 517355) +++ java/java3d/Makefile (working copy) @@ -21,7 +21,6 @@ USES= gl tar:bzip2 xorg USE_JAVA= yes USE_GL= gl USE_XORG= xt -JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk USE_ANT= yes LLD_UNSAFE= yes Index: java/javavmwrapper/Makefile =================================================================== --- java/javavmwrapper/Makefile (revision 517355) +++ java/javavmwrapper/Makefile (working copy) @@ -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 (revision 517355) +++ java/javavmwrapper/src/javavm.1 (working copy) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 24, 2005 +.Dd November 12, 2019 .Os .Dt JAVAVM 1 .Sh NAME @@ -112,8 +112,6 @@ to a version, any Java VM with a version greater t 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 @@ Currently allowed versions are .Ql 1.8+ , .Ql 1.9 , .Ql 1.9+ , -.Ql 6 , -.Ql 6+ , .Ql 7 , .Ql 7+ , .Ql 8 , @@ -202,8 +198,8 @@ Execute MyApp with the most up to date native Java 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 (revision 517355) +++ java/javavmwrapper/src/javavmwrapper.sh (working copy) @@ -173,8 +173,7 @@ sortConfiguration () { _VM=`dirname "${_VM}"` _VM=`dirname "${_VM}"` _VM=`basename "${_VM}"` - # Consistent version numbering for various install directory names - # including 'openjdk6', 'jdk1.6.0', 'linux-sun-jdk1.6.0', etc. + # Consistent version numbering for various install directory names. VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' \ -e 's|1\.\([0-9][0-9]*\)|\1|' \ -e 's|\([0-9][0-9]*\)\.[0-9]|\1|' \ @@ -506,9 +505,6 @@ setJavaHome() { _JAVAVM_VERSION= for version in ${JAVA_VERSION}; do case "${version}" in - *6+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 6 7 8 9 10 11 12" - ;; *7+) _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12" ;; @@ -527,9 +523,6 @@ setJavaHome() { 12+) _JAVAVM_VERSION="${_JAVAVM_VERSION} 12" ;; - 1.6) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 6" - ;; 1.7) _JAVAVM_VERSION="${_JAVAVM_VERSION} 7" ;; Index: java/javavmwrapper/src/manvm.1 =================================================================== --- java/javavmwrapper/src/manvm.1 (revision 517355) +++ java/javavmwrapper/src/manvm.1 (working copy) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 12, 2006 +.Dd November 12, 2019 .Os .Dt MANVM 1 .Sh NAME @@ -100,8 +100,6 @@ to a version, the on-line manual pages from any Ja 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 @@ Currently allowed versions are .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 (revision 517355) +++ java/javavmwrapper/src/registervm.1 (working copy) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 24, 2005 +.Dd November 12, 2019 .Os .Dt REGISTERVM 1 .Sh NAME @@ -58,12 +58,12 @@ The location of the Java VM wrapper configuration .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 (revision 517355) +++ java/jaxen/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java XPath Engine USE_JAVA= YES -JAVA_VERSION= 1.6+ NO_BUILD= YES JARFILES= jaxen-core.jar jaxen-dom.jar jaxen-dom4j.jar jaxen-exml.jar jaxen-full.jar jaxen-jdom.jar lib/saxpath.jar Index: java/jcalendar/Makefile =================================================================== --- java/jcalendar/Makefile (revision 517355) +++ java/jcalendar/Makefile (working copy) @@ -11,7 +11,6 @@ COMMENT= Java Date Chooser USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes WRKSRC= ${WRKDIR}/src PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \ Index: java/jcommon/Makefile =================================================================== --- java/jcommon/Makefile (revision 517355) +++ java/jcommon/Makefile (working copy) @@ -16,7 +16,6 @@ BROKEN_armv7= fails to package: find: *: No such 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 (revision 517355) +++ java/jd-gui/Makefile (working copy) @@ -19,7 +19,6 @@ USES= desktop-file-utils USE_GITHUB= yes GH_ACCOUNT= java-decompiler USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_ARCH= yes NO_BUILD= yes Index: java/jdbcpool/Makefile =================================================================== --- java/jdbcpool/Makefile (revision 517355) +++ java/jdbcpool/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= JDBC connection pool BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PORTDOCS= CHANGES LICENSE README Index: java/jdom/Makefile =================================================================== --- java/jdom/Makefile (revision 517355) +++ java/jdom/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= Java library for accessing and manipulati 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 (revision 517355) +++ java/jfreechart/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= LGPL21 RUN_DEPENDS= ${JAVALIBDIR}/jcommon.jar:java/jcommon USE_JAVA= yes -JAVA_VERSION= 1.6+ OPTIONS_DEFINE= COMPILE DOCS OPTIONS_DEFAULT=COMPILE Index: java/jgraph/Makefile =================================================================== --- java/jgraph/Makefile (revision 517355) +++ java/jgraph/Makefile (working copy) @@ -22,7 +22,6 @@ COMPILE_DESC= Compile from source instead of using USES= zip NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes .include Index: java/jmf/Makefile =================================================================== --- java/jmf/Makefile (revision 517355) +++ java/jmf/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= Java Media Framework USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= YES WRKSRC= ${WRKDIR}/JMF-${PORTVERSION} Index: java/jode/Makefile =================================================================== --- java/jode/Makefile (revision 517355) +++ java/jode/Makefile (working copy) @@ -16,7 +16,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} VENDOR_VERSION= 1.1.2-pre1 USE_JAVA= yes -JAVA_VERSION= 1.6+ NEED_JAVAC= yes GNU_CONFIGURE= yes USES= gmake perl5 shebangfix Index: java/jomp/Makefile =================================================================== --- java/jomp/Makefile (revision 517355) +++ java/jomp/Makefile (working copy) @@ -16,7 +16,6 @@ COMMENT= Prototype OpenMP implementation for Java BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_WRKSUBDIR= yes Index: java/jta/Makefile =================================================================== --- java/jta/Makefile (revision 517355) +++ java/jta/Makefile (working copy) @@ -12,7 +12,6 @@ COMMENT= Java Transaction API (JTA) USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_CDROM= See the license Index: java/jump/Makefile =================================================================== --- java/jump/Makefile (revision 517355) +++ java/jump/Makefile (working copy) @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java library for arbitrary precision computations USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jar Index: java/mx4j/Makefile =================================================================== --- java/mx4j/Makefile (revision 517355) +++ java/mx4j/Makefile (working copy) @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Open Source implementation of the Java Management Extensions (JMX) USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes JARFILES= mx4j-examples.jar mx4j-impl.jar mx4j-jmx.jar \ Index: java/servingxml/Makefile =================================================================== --- java/servingxml/Makefile (revision 517355) +++ java/servingxml/Makefile (working copy) @@ -13,7 +13,6 @@ BUILD_DEPENDS= ${ANT_CMD}:devel/apache-ant USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ ANT_CMD?= ${LOCALBASE}/bin/ant ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} ANT_TARGETS= dist Index: java/springframework/Makefile =================================================================== --- java/springframework/Makefile (revision 517355) +++ java/springframework/Makefile (working copy) @@ -17,7 +17,6 @@ CONFLICTS= springframework-3.1.* NO_BUILD= yes USE_JAVA= yes USES= zip -JAVA_VERSION= 1.6+ OPTIONS_DEFINE= DOCS RESRCS RESRCS_DESC= Install resource files Index: java/springframework31/Makefile =================================================================== --- java/springframework31/Makefile (revision 517355) +++ java/springframework31/Makefile (working copy) @@ -20,7 +20,6 @@ CONFLICTS= springframework-3.2.* NO_BUILD= yes USE_JAVA= yes USES= zip -JAVA_VERSION= 1.6+ OPTIONS_DEFINE= DOCS RESRCS RESRCS_DESC= Install resource files Index: java/sqlitejdbc/Makefile =================================================================== --- java/sqlitejdbc/Makefile (revision 517355) +++ java/sqlitejdbc/Makefile (working copy) @@ -16,7 +16,6 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION} USE_JAVA= yes -JAVA_VERSION= 1.6+ USES= gmake tar:tgz MAKE_ENV= JAVA_HOME="${JAVA_HOME}" ALL_TARGET= native Index: java/trove4j/Makefile =================================================================== --- java/trove4j/Makefile (revision 517355) +++ java/trove4j/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= High performance collections API for Java BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PORTDOCS= javadocs AUTHORS.txt CHANGES.txt LICENSE.txt README-idea-devel.txt \ Index: java/wildfly10/Makefile =================================================================== --- java/wildfly10/Makefile (revision 517355) +++ java/wildfly10/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= wildfly10 PORTVERSION= 10.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java www MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/ DISTNAME= wildfly-${WILDFLY_VERSION} @@ -15,7 +15,6 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly10 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var Index: java/wildfly10/files/patch-bin_add-user.sh =================================================================== --- java/wildfly10/files/patch-bin_add-user.sh (revision 517355) +++ java/wildfly10/files/patch-bin_add-user.sh (nonexistent) @@ -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; Property changes on: java/wildfly10/files/patch-bin_add-user.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: java/wildfly10/files/wildfly10.in =================================================================== --- java/wildfly10/files/wildfly10.in (revision 517355) +++ java/wildfly10/files/wildfly10.in (working copy) @@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { Index: java/wildfly11/Makefile =================================================================== --- java/wildfly11/Makefile (revision 517355) +++ java/wildfly11/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= wildfly11 PORTVERSION= 11.0.0 +PORTREVISION= 1 CATEGORIES= java www MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/ DISTNAME= wildfly-${WILDFLY_VERSION} @@ -14,7 +15,6 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly11 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var Index: java/wildfly11/files/patch-bin_add-user.sh =================================================================== --- java/wildfly11/files/patch-bin_add-user.sh (revision 517355) +++ java/wildfly11/files/patch-bin_add-user.sh (nonexistent) @@ -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; Property changes on: java/wildfly11/files/patch-bin_add-user.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: java/wildfly11/files/wildfly11.in =================================================================== --- java/wildfly11/files/wildfly11.in (revision 517355) +++ java/wildfly11/files/wildfly11.in (working copy) @@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { Index: java/wildfly12/Makefile =================================================================== --- java/wildfly12/Makefile (revision 517355) +++ java/wildfly12/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= wildfly12 PORTVERSION= 12.0.0 +PORTREVISION= 1 CATEGORIES= java www MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/ DISTNAME= wildfly-${WILDFLY_VERSION} @@ -14,7 +15,6 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly12 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var Index: java/wildfly12/files/patch-bin_add-user.sh =================================================================== --- java/wildfly12/files/patch-bin_add-user.sh (revision 517355) +++ java/wildfly12/files/patch-bin_add-user.sh (nonexistent) @@ -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; Property changes on: java/wildfly12/files/patch-bin_add-user.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: java/wildfly12/files/wildfly12.in =================================================================== --- java/wildfly12/files/wildfly12.in (revision 517355) +++ java/wildfly12/files/wildfly12.in (working copy) @@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { Index: java/wildfly13/Makefile =================================================================== --- java/wildfly13/Makefile (revision 517355) +++ java/wildfly13/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= wildfly13 PORTVERSION= 13.0.0 +PORTREVISION= 1 CATEGORIES= java www MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/ DISTNAME= wildfly-${WILDFLY_VERSION} @@ -13,7 +14,6 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly13 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var Index: java/wildfly13/files/patch-bin_add-user.sh =================================================================== --- java/wildfly13/files/patch-bin_add-user.sh (revision 517355) +++ java/wildfly13/files/patch-bin_add-user.sh (nonexistent) @@ -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; Property changes on: java/wildfly13/files/patch-bin_add-user.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: java/wildfly13/files/wildfly13.in =================================================================== --- java/wildfly13/files/wildfly13.in (revision 517355) +++ java/wildfly13/files/wildfly13.in (working copy) @@ -40,9 +40,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { Index: java/wildfly90/Makefile =================================================================== --- java/wildfly90/Makefile (revision 517355) +++ java/wildfly90/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= wildfly90 PORTVERSION= 9.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java www MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/ DISTNAME= wildfly-${WILDFLY_VERSION} @@ -15,7 +15,6 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly90 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var Index: java/wildfly90/files/patch-bin-add-user.sh =================================================================== --- java/wildfly90/files/patch-bin-add-user.sh (revision 517355) +++ java/wildfly90/files/patch-bin-add-user.sh (nonexistent) @@ -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; Property changes on: java/wildfly90/files/patch-bin-add-user.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: java/wildfly90/files/wildfly90.in =================================================================== --- java/wildfly90/files/wildfly90.in (revision 517355) +++ java/wildfly90/files/wildfly90.in (working copy) @@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { Index: java/xdoclet/Makefile =================================================================== --- java/xdoclet/Makefile (revision 517355) +++ java/xdoclet/Makefile (working copy) @@ -19,7 +19,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/ant:devel/apache-ant USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes Index: lang/abcl/Makefile =================================================================== --- lang/abcl/Makefile (revision 517355) +++ lang/abcl/Makefile (working copy) @@ -21,7 +21,6 @@ SUB_LIST+= JAVAJARDIR="${JAVAJARDIR}" 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 (revision 517355) +++ lang/apache-commons-jelly/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= XML based scripting engine LICENSE= APACHE20 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} Index: lang/bsh/Makefile =================================================================== --- lang/bsh/Makefile (revision 517355) +++ lang/bsh/Makefile (working copy) @@ -15,7 +15,6 @@ GH_ACCOUNT= beanshell GH_PROJECT= beanshell USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jarall Index: lang/ceylon/Makefile =================================================================== --- lang/ceylon/Makefile (revision 517355) +++ lang/ceylon/Makefile (working copy) @@ -16,7 +16,6 @@ USES= zip NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.7+ JAVA_RUN= yes PORTDATA= * Index: lang/groovy/Makefile =================================================================== --- lang/groovy/Makefile (revision 517355) +++ lang/groovy/Makefile (working copy) @@ -15,8 +15,6 @@ LICENSE= APACHE20 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.7+ - NO_ARCH= yes NO_BUILD= yes Index: lang/jython/Makefile =================================================================== --- lang/jython/Makefile (revision 517355) +++ lang/jython/Makefile (working copy) @@ -24,7 +24,6 @@ RUN_DEPENDS= bash:shells/bash EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions \ LICENSE.txt LICENSE_Apache.txt USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_BUILD= yes NO_ARCH= yes REINPLACE_ARGS= -i "" Index: lang/linux-j/Makefile =================================================================== --- lang/linux-j/Makefile (revision 517355) +++ lang/linux-j/Makefile (working copy) @@ -20,7 +20,6 @@ LICENSE_PERMS= auto-accept dist-mirror pkg-mirror USES= linux USE_JAVA= yes -JAVA_VERSION= 1.6+ ONLY_FOR_ARCHS= i386 amd64 Index: lang/rhino/Makefile =================================================================== --- lang/rhino/Makefile (revision 517355) +++ lang/rhino/Makefile (working copy) @@ -22,8 +22,6 @@ ALL_TARGET= jar DATADIR= ${JAVASHAREDIR}/${PORTNAME} -JAVA_VERSION= 1.6+ - LINEDIT_DESC= Enable line editing in the Rhino shell LINEDIT_RUN_DEPENDS= ${JLINEJAR}:devel/jline LINEDIT_USE= java=yes ant=yes Index: lang/sisc/Makefile =================================================================== --- lang/sisc/Makefile (revision 517355) +++ lang/sisc/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= MPL11 GPLv2+ LICENSE_COMB= dual USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: lang/starlogo/Makefile =================================================================== --- lang/starlogo/Makefile (revision 517355) +++ lang/starlogo/Makefile (working copy) @@ -15,7 +15,6 @@ BROKEN= unfetchable USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DATADIR= ${JAVASHAREDIR}/${PORTNAME} Index: mail/davmail/Makefile =================================================================== --- mail/davmail/Makefile (revision 517355) +++ mail/davmail/Makefile (working copy) @@ -18,7 +18,6 @@ DOS2UNIX_FILES= build.xml NO_ARCH= yes USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ ALL_TARGET= release # 5.3.1 REVISION= 3079 Index: mail/james/Makefile =================================================================== --- mail/james/Makefile (revision 517355) +++ mail/james/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt 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 (revision 517355) +++ mail/mime4j/Makefile (working copy) @@ -18,7 +18,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:jav 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 (revision 517355) +++ mail/openemm2013/Makefile (working copy) @@ -30,7 +30,6 @@ LIB_DEPENDS= libslang.so:devel/libslang2 \ USES= dos2unix gmake python:2.7,run USE_RC_SUBR= openemm2013 USE_JAVA= yes -JAVA_VERSION= 1.7+ DOS2UNIX_GLOB= *.c *.cpp *.h *.java *.xml *.properties CC= clang Index: mail/openemm2013/files/openemm2013.in =================================================================== --- mail/openemm2013/files/openemm2013.in (revision 517355) +++ mail/openemm2013/files/openemm2013.in (working copy) @@ -44,9 +44,6 @@ tomcat_pidfile="tomcat8.pid" # todo replace dynami 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 (revision 517355) +++ mail/openemm2015/Makefile (working copy) @@ -28,7 +28,6 @@ RUN_DEPENDS= ${TOMCATHOME}/bin/bootstrap.jar:www/t 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 (revision 517355) +++ math/cvc4/Makefile (working copy) @@ -84,7 +84,7 @@ CMAKE_ARGS+= -DENABLE_GPL:BOOL=ON post-extract: @${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr3.jar @${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/antlr3 - @${ECHO_CMD} "JAVA_VERSION=1.7+ exec \"${LOCALBASE}/bin/java\" -classpath \"${WRKDIR}/antlr3.jar\" org.antlr.Tool \"\$$@\"" >> ${WRKDIR}/antlr3 + @${ECHO_CMD} "exec \"${LOCALBASE}/bin/java\" -classpath \"${WRKDIR}/antlr3.jar\" org.antlr.Tool \"\$$@\"" >> ${WRKDIR}/antlr3 @${CHMOD} +x ${WRKDIR}/antlr3 post-patch: Index: math/geonext/Makefile =================================================================== --- math/geonext/Makefile (revision 517355) +++ math/geonext/Makefile (working copy) @@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/geonext_install NO_BUILD= yes USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ DATA= cacerts didmat.crt geonext-batik.jar geonext.html geonext.jar \ help.jar help_de.jar help_fr.jar help_gr.jar help_it.jar \ Index: math/jakarta-commons-math3/Makefile =================================================================== --- math/jakarta-commons-math3/Makefile (revision 517355) +++ math/jakarta-commons-math3/Makefile (working copy) @@ -24,7 +24,6 @@ BROKEN_armv7= fails to compile: PowellOptimizer.j 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 (revision 517355) +++ math/jeuclid/Makefile (working copy) @@ -12,7 +12,6 @@ COMMENT= Java based MathML rendering solution USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes NO_BUILD= yes Index: math/jlatexmath/Makefile =================================================================== --- math/jlatexmath/Makefile (revision 517355) +++ math/jlatexmath/Makefile (working copy) @@ -17,7 +17,7 @@ LICENSE= GPLv2 RUN_DEPENDS= ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons -USE_JAVA= 1.7+ +USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes Index: math/matlab-installer/Makefile =================================================================== --- math/matlab-installer/Makefile (revision 517355) +++ math/matlab-installer/Makefile (working copy) @@ -18,7 +18,6 @@ RUN_DEPENDS= mount_cd9660_image:sysutils/diskimage 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 (revision 517355) +++ math/octave/Makefile (working copy) @@ -47,7 +47,6 @@ USES= charsetfix fortran gmake libtool perl5 pkgc 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 (revision 517355) +++ math/plman/Makefile (working copy) @@ -17,7 +17,6 @@ NO_BUILD= yes USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} REPLACE_FILES= ${WRKSRC}/bin/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} Index: math/truthtable/Makefile =================================================================== --- math/truthtable/Makefile (revision 517355) +++ math/truthtable/Makefile (working copy) @@ -17,7 +17,6 @@ COMMENT= Truth Tables generator (written in Java) BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} Index: misc/freeguide/Makefile =================================================================== --- misc/freeguide/Makefile (revision 517355) +++ misc/freeguide/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/doc/COPYING RUN_DEPENDS= tv_cat:textproc/p5-xmltv USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes NO_ARCH= yes Index: misc/jbidwatcher/Makefile =================================================================== --- misc/jbidwatcher/Makefile (revision 517355) +++ misc/jbidwatcher/Makefile (working copy) @@ -13,7 +13,6 @@ USES= tar:bzip2 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 (revision 517355) +++ misc/pauker/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= alex@stangl.us COMMENT= Java-based flashcard learning using the Leitner system USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes do-install: Index: misc/pipe/Makefile =================================================================== --- misc/pipe/Makefile (revision 517355) +++ misc/pipe/Makefile (working copy) @@ -15,7 +15,6 @@ USES= zip NO_BUILD= yes NO_ARCH= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= pipe.sh Index: multimedia/gdialog/Makefile =================================================================== --- multimedia/gdialog/Makefile (revision 517355) +++ multimedia/gdialog/Makefile (working copy) @@ -17,7 +17,6 @@ RUN_DEPENDS= projectx>=0.90.4.00:multimedia/projec USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_WRKSUBDIR= yes Index: multimedia/libbluray/Makefile =================================================================== --- multimedia/libbluray/Makefile (revision 517355) +++ multimedia/libbluray/Makefile (working copy) @@ -43,7 +43,7 @@ JAVA_CATEGORIES= java JAVA_CONFIGURE_ENABLE= bdjava-jar JAVA_CONFIGURE_ENV= JDK_HOME="${JAVA_HOME}" JAVA_USE= JAVA=yes -JAVA_VARS= JAVA_VERSION=1.6+ JAVA_BUILD=yes JAVA_RUN=yes +JAVA_VARS= JAVA_BUILD=yes JAVA_RUN=yes post-patch: @${RLN} ${WRKSRC}/jni/linux ${WRKSRC}/jni/freebsd Index: multimedia/projectx/Makefile =================================================================== --- multimedia/projectx/Makefile (revision 517355) +++ multimedia/projectx/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/Copying USES= zip:infozip USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= project-x.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} Index: net/activemq/Makefile =================================================================== --- net/activemq/Makefile (revision 517355) +++ net/activemq/Makefile (working copy) @@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_ARCH= yes NO_BUILD= yes Index: net/apache-commons-net/Makefile =================================================================== --- net/apache-commons-net/Makefile (revision 517355) +++ net/apache-commons-net/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= APACHE20 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 (revision 517355) +++ net/belle-sip/Makefile (working copy) @@ -27,7 +27,6 @@ USE_LDCONFIG= yes CMAKE_ARGS= -DENABLE_STATIC=NO -DENABLE_STRICT=NO -DENABLE_TESTS=NO \ -DANTLR3_JAR_PATH:FILEPATH=${WRKDIR}/antlr3.jar JAVA_BUILD= jre -JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${DISTNAME}-0 post-extract: Index: net/dimes/Makefile =================================================================== --- net/dimes/Makefile (revision 517355) +++ net/dimes/Makefile (working copy) @@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/DIMES BUILD_WRKSRC= ${WRKSRC}/scripts_linux USE_JAVA= yes -JAVA_VERSION= 1.6+ #java-linux required JAVA_OS= linux DATADIR= ${JAVASHAREDIR}/dimes Index: net/java-beepcore/Makefile =================================================================== --- net/java-beepcore/Makefile (revision 517355) +++ net/java-beepcore/Makefile (working copy) @@ -15,7 +15,6 @@ COMMENT= Implementation of BEEP core and BEEP mapp 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 (revision 517355) +++ net/jcifs/Makefile (working copy) @@ -16,7 +16,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES USES= tar:tgz USE_JAVA= yes -JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} NO_ARCH= yes NO_BUILD= yes Index: net/jgroups/Makefile =================================================================== --- net/jgroups/Makefile (revision 517355) +++ net/jgroups/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= LGPL21 OPTIONS_DEFINE= DOCS USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jar NO_ARCH= yes Index: net/jicmp/Makefile =================================================================== --- net/jicmp/Makefile (revision 517355) +++ net/jicmp/Makefile (working copy) @@ -13,7 +13,6 @@ WRKSRC= ${WRKDIR}/jicmp-${PORTVERSION} USES= libtool USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk JAVA_BUILD= yes JAVA_RUN= yes Index: net/jicmp6/Makefile =================================================================== --- net/jicmp6/Makefile (revision 517355) +++ net/jicmp6/Makefile (working copy) @@ -10,7 +10,6 @@ COMMENT= Java native interface (JNI) to ICMPv6 USES= libtool USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk JAVA_BUILD= yes JAVA_RUN= yes Index: net/jrdesktop/Makefile =================================================================== --- net/jrdesktop/Makefile (revision 517355) +++ net/jrdesktop/Makefile (working copy) @@ -14,7 +14,6 @@ COMMENT= View and/or control a remote PC LICENSE= GPLv3 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes SUB_FILES= jrdesktop Index: net/jsch/Makefile =================================================================== --- net/jsch/Makefile (revision 517355) +++ net/jsch/Makefile (working copy) @@ -13,7 +13,6 @@ LICENSE= BSD3CLAUSE USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME}.jar Index: net/ldapbrowser/Makefile =================================================================== --- net/ldapbrowser/Makefile (revision 517355) +++ net/ldapbrowser/Makefile (working copy) @@ -18,7 +18,6 @@ COMMENT= Java/Swing-based LDAP browser and editor RESTRICTED= No reply from author regarding redistribution licensing USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} REINPLACE_ARGS= -i '' Index: net/mpich2/Makefile =================================================================== --- net/mpich2/Makefile (revision 517355) +++ net/mpich2/Makefile (working copy) @@ -96,7 +96,6 @@ IGNORE= WITH_JAVA requires WITH_X11 .endif CONFIGURE_ARGS+= --with-java="${JAVA_HOME}" USE_JAVA= yes -JAVA_VERSION= 1.6+ PLIST_SUB+= JAVA="" PLX11= "" BIN2STRIP+= rlog_check_timeorder rlog_print Index: net/seda/Makefile =================================================================== --- net/seda/Makefile (revision 517355) +++ net/seda/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Architecture for Highly Concurrent Server Applications USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= dist NO_ARCH= yes Index: net/spread-j/Makefile =================================================================== --- net/spread-j/Makefile (revision 517355) +++ net/spread-j/Makefile (working copy) @@ -18,7 +18,6 @@ BROKEN_armv6= fails to package: java/docs/*.html: 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 (revision 517355) +++ net/toonel/Makefile (working copy) @@ -16,7 +16,6 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= ${PORTNAME}.sh SUB_LIST= JARNAME=${DISTNAME}${EXTRACT_SUFX} Index: net-im/convey/Makefile =================================================================== --- net-im/convey/Makefile (revision 517355) +++ net-im/convey/Makefile (working copy) @@ -15,8 +15,6 @@ COMMENT= Instant Message (IM) program using the Ja 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 (revision 517355) +++ net-p2p/frost/Makefile (working copy) @@ -14,7 +14,6 @@ COMMENT= Freenet client that provides messenger an 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 (revision 517355) +++ net-p2p/phex/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= GPLv2 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes SUB_FILES= ${PORTNAME}.sh Index: portuguese/irpf-pt_BR/Makefile =================================================================== --- portuguese/irpf-pt_BR/Makefile (revision 517355) +++ portuguese/irpf-pt_BR/Makefile (working copy) @@ -24,7 +24,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME:tu}2014 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 (revision 517355) +++ print/pdf-renderer/Makefile (working copy) @@ -19,7 +19,6 @@ BROKEN_armv7= fails to install: swinglabs-build-i 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 (revision 517355) +++ science/colt/Makefile (working copy) @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java package for scalable scientific and technical computing USE_JAVA= yes -JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= DOCS COMPILE Index: science/devisor/Makefile =================================================================== --- science/devisor/Makefile (revision 517355) +++ science/devisor/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Design and Visualization Software Resource for FeatFlow USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes # Sources are available though SUB_FILES= devisorgrid.sh Index: science/simsmith/Makefile =================================================================== --- science/simsmith/Makefile (revision 517355) +++ science/simsmith/Makefile (working copy) @@ -14,7 +14,6 @@ MAINTAINER= hamradio@FreeBSD.org COMMENT= A Java-based Smith Chart program USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \ Index: security/dirbuster/Makefile =================================================================== --- security/dirbuster/Makefile (revision 517355) +++ security/dirbuster/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE_COMB= multi USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${DISTNAME} Index: security/i2p/Makefile =================================================================== --- security/i2p/Makefile (revision 517355) +++ security/i2p/Makefile (working copy) @@ -36,7 +36,6 @@ USE_ANT= yes USE_JAVA= yes NO_ARCH= yes JAVA_BUILD= jdk -JAVA_VERSION= 1.6+ USE_LOCALE= en_US.UTF-8 ALL_TARGET= updater tarball Index: security/iaikpkcs11wrapper/Makefile =================================================================== --- security/iaikpkcs11wrapper/Makefile (revision 517355) +++ security/iaikpkcs11wrapper/Makefile (working copy) @@ -18,7 +18,6 @@ USES= dos2unix gmake zip USE_JAVA= yes DOS2UNIX_GLOB= Makefile *.c DOS2UNIX_WRKSRC= ${WRKDIR}/src/native -JAVA_VERSION= 1.6+ JAVA_OS= native ALL_TARGET= release Index: security/jbrofuzz/Makefile =================================================================== --- security/jbrofuzz/Makefile (revision 517355) +++ security/jbrofuzz/Makefile (working copy) @@ -12,7 +12,6 @@ COMMENT= JBroFuzz is a web application fuzzer USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME} Index: security/owasp-dependency-check/Makefile =================================================================== --- security/owasp-dependency-check/Makefile (revision 517355) +++ security/owasp-dependency-check/Makefile (working copy) @@ -23,7 +23,6 @@ GH_ACCOUNT= jeremylong GH_PROJECT= DependencyCheck USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_ARCH= yes Index: security/webscarab/Makefile =================================================================== --- security/webscarab/Makefile (revision 517355) +++ security/webscarab/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${DISTNAME}-1304 Index: security/xml-security/Makefile =================================================================== --- security/xml-security/Makefile (revision 517355) +++ security/xml-security/Makefile (working copy) @@ -22,7 +22,6 @@ USES= cpe zip CPE_PRODUCT= xml_security_for_java CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES Index: sysutils/hfsexplorer/Makefile =================================================================== --- sysutils/hfsexplorer/Makefile (revision 517355) +++ sysutils/hfsexplorer/Makefile (working copy) @@ -20,7 +20,6 @@ DESKTOP_ENTRIES="hfsexplorer" "reader Mac-formatte 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 (revision 517355) +++ sysutils/jdiskreport/Makefile (working copy) @@ -11,7 +11,6 @@ COMMENT= Java program to graphically display disk 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 (revision 517355) +++ sysutils/jvmtop/Makefile (working copy) @@ -13,7 +13,6 @@ LICENSE= GPLv2 USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \ Index: sysutils/linux-crashplan/Makefile =================================================================== --- sysutils/linux-crashplan/Makefile (revision 517355) +++ sysutils/linux-crashplan/Makefile (working copy) @@ -24,7 +24,6 @@ USE_RC_SUBR= crashplan 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 (revision 517355) +++ textproc/apache-commons-digester/Makefile (working copy) @@ -22,7 +22,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes NO_ARCH= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ JARFILE= ${PORTNAME}.jar PLIST_FILES= %%JAVAJARDIR%%/${JARFILE} Index: textproc/apache-poi/Makefile =================================================================== --- textproc/apache-poi/Makefile (revision 517355) +++ textproc/apache-poi/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes RELEASE_DATE= 20160924 Index: textproc/denature/Makefile =================================================================== --- textproc/denature/Makefile (revision 517355) +++ textproc/denature/Makefile (working copy) @@ -20,7 +20,6 @@ RUN_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser USES= perl5 USE_JAVA= yes -JAVA_VERSION= 1.6+ POD2MAN?= pod2man WRKSRC= ${WRKDIR}/${PORTNAME} Index: textproc/dom4j/Makefile =================================================================== --- textproc/dom4j/Makefile (revision 517355) +++ textproc/dom4j/Makefile (working copy) @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Open Source XML framework for Java USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes OPTIONS_DEFINE= DOCS Index: textproc/fop/Makefile =================================================================== --- textproc/fop/Makefile (revision 517355) +++ textproc/fop/Makefile (working copy) @@ -26,7 +26,6 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} PORTDOCS= * USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes NO_ARCH= yes Index: textproc/jalingo/Makefile =================================================================== --- textproc/jalingo/Makefile (revision 517355) +++ textproc/jalingo/Makefile (working copy) @@ -17,7 +17,6 @@ LICENSE= GPLv2 USES= 7z USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ ALL_TARGET= dist Index: textproc/jarnal/Makefile =================================================================== --- textproc/jarnal/Makefile (revision 517355) +++ textproc/jarnal/Makefile (working copy) @@ -17,7 +17,6 @@ LICENSE= GPLv2 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: textproc/jaxup/Makefile =================================================================== --- textproc/jaxup/Makefile (revision 517355) +++ textproc/jaxup/Makefile (working copy) @@ -22,7 +22,6 @@ USES= zip WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.6+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} Index: textproc/jdictionary/Makefile =================================================================== --- textproc/jdictionary/Makefile (revision 517355) +++ textproc/jdictionary/Makefile (working copy) @@ -11,7 +11,6 @@ MAINTAINER= jmohacsi@bsd.hu COMMENT= Platform independent, plugin based dictionary USE_JAVA= yes -JAVA_VERSION= 1.6+ USES= zip WRKSRC= ${WRKDIR}/${PORTNAME} Index: textproc/jdictionary/Makefile.plugin =================================================================== --- textproc/jdictionary/Makefile.plugin (revision 517355) +++ textproc/jdictionary/Makefile.plugin (working copy) @@ -9,9 +9,7 @@ COMMENT?= JDictionary plugin master port RUN_DEPENDS+= jdictionary:textproc/jdictionary # WARNING: USE_JAVA is set to be able to use JAVASHAREDIR. -# Please make sure that JAVA_VERSION here is the same as in Makefile. USE_JAVA= yes -JAVA_VERSION= 1.6+ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # Index: textproc/jing/Makefile =================================================================== --- textproc/jing/Makefile (revision 517355) +++ textproc/jing/Makefile (working copy) @@ -18,7 +18,6 @@ BROKEN_armv7= fails to build: modbuild.xml: Java USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes OPTIONS_DEFINE= DOCS Index: textproc/lucene/Makefile =================================================================== --- textproc/lucene/Makefile (revision 517355) +++ textproc/lucene/Makefile (working copy) @@ -21,7 +21,6 @@ USES= tar:tgz USE_JAVA= yes NO_BUILD= yes NO_ARCH= yes -JAVA_VERSION= 1.6+ OPTIONS_DEFINE= CONTRIB DOCS EXAMPLES CONTRIB_DESC= Install contributed jars Index: textproc/lucene4/Makefile =================================================================== --- textproc/lucene4/Makefile (revision 517355) +++ textproc/lucene4/Makefile (working copy) @@ -17,7 +17,6 @@ CONFLICTS= lucene-[0-9].* USES= tar:tgz USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_BUILD= yes NO_ARCH= yes Index: textproc/lucene5/Makefile =================================================================== --- textproc/lucene5/Makefile (revision 517355) +++ textproc/lucene5/Makefile (working copy) @@ -17,7 +17,6 @@ CONFLICTS= lucene-[0-9].* USES= tar:tgz USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_BUILD= yes NO_ARCH= yes Index: textproc/nux/Makefile =================================================================== --- textproc/nux/Makefile (revision 517355) +++ textproc/nux/Makefile (working copy) @@ -15,7 +15,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/xom.jar:textproc/xom \ ${JAVALIBDIR}/saxon9.jar:textproc/saxon-devel USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME} Index: textproc/ppower4/Makefile =================================================================== --- textproc/ppower4/Makefile (revision 517355) +++ textproc/ppower4/Makefile (working copy) @@ -18,7 +18,6 @@ LICENSE= GPLv2 # version not really specified USES= zip USE_TEX= latex USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_WRKSUBDIR= yes NO_ARCH= yes Index: textproc/qrcodegen/Makefile =================================================================== --- textproc/qrcodegen/Makefile (revision 517355) +++ textproc/qrcodegen/Makefile (working copy) @@ -17,7 +17,6 @@ NO_ARCH= yes NO_BUILD= yes USES= zip:infozip USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= qrcodegen INSTALLFILES= FAQ.txt Installation.txt NOTICE QRCodeGen.jar Version.html Index: textproc/saxon/Makefile =================================================================== --- textproc/saxon/Makefile (revision 517355) +++ textproc/saxon/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= MPL10 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes Index: textproc/saxon-devel/Makefile =================================================================== --- textproc/saxon-devel/Makefile (revision 517355) +++ textproc/saxon-devel/Makefile (working copy) @@ -21,7 +21,6 @@ XOM_DESC= XOM support USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_WRKSUBDIR= yes NO_BUILD= yes Index: textproc/trang/Makefile =================================================================== --- textproc/trang/Makefile (revision 517355) +++ textproc/trang/Makefile (working copy) @@ -18,7 +18,6 @@ BROKEN_armv7= fails to build: modbuild.xml: Java USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes OPTIONS_DEFINE= DOCS Index: textproc/weka/Makefile =================================================================== --- textproc/weka/Makefile (revision 517355) +++ textproc/weka/Makefile (working copy) @@ -15,7 +15,6 @@ PORTSCOUT= limitw:1,even # Second component is eve USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} Index: textproc/xalan-j/Makefile =================================================================== --- textproc/xalan-j/Makefile (revision 517355) +++ textproc/xalan-j/Makefile (working copy) @@ -20,7 +20,6 @@ USES= cpe CPE_PRODUCT= xalan-java CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g} Index: textproc/xerces-j/Makefile =================================================================== --- textproc/xerces-j/Makefile (revision 517355) +++ textproc/xerces-j/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= XML parser for Java LICENSE= APACHE20 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: textproc/xincluder/Makefile =================================================================== --- textproc/xincluder/Makefile (revision 517355) +++ textproc/xincluder/Makefile (working copy) @@ -18,7 +18,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:java/jdom \ ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: textproc/xml-commons/Makefile =================================================================== --- textproc/xml-commons/Makefile (revision 517355) +++ textproc/xml-commons/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Provides common XML code for Apache projects USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes NO_BUILD= yes Index: textproc/xom/Makefile =================================================================== --- textproc/xom/Makefile (revision 517355) +++ textproc/xom/Makefile (working copy) @@ -14,7 +14,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/xml-apis.jar:textproc/x ${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 (revision 517355) +++ textproc/xp/Makefile (working copy) @@ -12,7 +12,6 @@ MAINTAINER= mike@vee.net COMMENT= XML parser written in Java USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes USES= zip Index: www/apache-forrest/Makefile =================================================================== --- www/apache-forrest/Makefile (revision 517355) +++ www/apache-forrest/Makefile (working copy) @@ -28,8 +28,6 @@ IGNORE_FILES= ! -name *\.bak -and ! -name *\.bat INSTALL_WRKSRC= ${WRKSRC}/build -JAVA_VERSION= 1.6+ - NO_BUILD= Yes PLUGINSDIR= ${DATADIR}/plugins/org.apache.forrest.plugin.output.pdf Index: www/archiva/Makefile =================================================================== --- www/archiva/Makefile (revision 517355) +++ www/archiva/Makefile (working copy) @@ -18,7 +18,6 @@ USES= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.7+ USE_RC_SUBR= ${PORTNAME} Index: www/axis2/Makefile =================================================================== --- www/axis2/Makefile (revision 517355) +++ www/axis2/Makefile (working copy) @@ -32,7 +32,6 @@ TOMCAT85_VARS= APPHOME=${LOCALBASE}/apache-tomcat- 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 (revision 517355) +++ www/dojo-shrinksafe/Makefile (working copy) @@ -13,7 +13,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= JavaScript code compressor USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_FILES= bin/${PKGNAMEPREFIX}${PORTNAME} %%DATADIR%%/shrinksafe.jar \ Index: www/geronimo/Makefile =================================================================== --- www/geronimo/Makefile (revision 517355) +++ www/geronimo/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= Open-source Java EE 5 application server USES= cpe USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes CPE_VENDOR= apache Index: www/glassfish4/Makefile =================================================================== --- www/glassfish4/Makefile (revision 517355) +++ www/glassfish4/Makefile (working copy) @@ -11,7 +11,6 @@ COMMENT= Reference implementation of the Java EE a USES= zip USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_BUILD= yes WRKSRC= ${WRKDIR}/glassfish4 Index: www/grails/Makefile =================================================================== --- www/grails/Makefile (revision 517355) +++ www/grails/Makefile (working copy) @@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:tu} USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} Index: www/helma/Makefile =================================================================== --- www/helma/Makefile (revision 517355) +++ www/helma/Makefile (working copy) @@ -21,7 +21,6 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} USE_RC_SUBR= helma USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= clean jar NO_ARCH= yes Index: www/httpasyncclient/Makefile =================================================================== --- www/httpasyncclient/Makefile (revision 517355) +++ www/httpasyncclient/Makefile (working copy) @@ -19,7 +19,6 @@ USES= cpe CPE_VENDOR= apache OPTIONS_DEFINE= DOCS USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/httpcomponents-asyncclient-${DISTVERSION} Index: www/httpclient/Makefile =================================================================== --- www/httpclient/Makefile (revision 517355) +++ www/httpclient/Makefile (working copy) @@ -25,7 +25,6 @@ CPE_PRODUCT= commons-httpclient CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/httpcomponents-client-${DISTVERSION} Index: www/httpcore/Makefile =================================================================== --- www/httpcore/Makefile (revision 517355) +++ www/httpcore/Makefile (working copy) @@ -17,7 +17,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-cli.jar:java/ap 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 (revision 517355) +++ www/jetty8/Makefile (working copy) @@ -22,7 +22,6 @@ CONFLICTS= jetty-9.* JDVDATE= v20140411 USE_RC_SUBR= ${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.6+ USES= python PKGMESSAGE= ${WRKDIR}/pkg-message PLIST_SUB+= RUNASUSER=${RUNASUSER} GROUP=${GROUP} Index: www/jmeter/Makefile =================================================================== --- www/jmeter/Makefile (revision 517355) +++ www/jmeter/Makefile (working copy) @@ -43,7 +43,6 @@ RUN_DEPENDS= \ USES= tar:tgz USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= jmeter.sh Index: www/madsonic/Makefile =================================================================== --- www/madsonic/Makefile (revision 517355) +++ www/madsonic/Makefile (working copy) @@ -60,7 +60,6 @@ APE_RUN_DEPENDS= mac:audio/mac NO_BUILD= yes DISTDATE= 20161208 USE_JAVA= yes -JAVA_VERSION= 1.7+ USES= zip USER= www GROUP= www Index: www/madsonic-standalone/Makefile =================================================================== --- www/madsonic-standalone/Makefile (revision 517355) +++ www/madsonic-standalone/Makefile (working copy) @@ -52,7 +52,6 @@ NO_WRKSUBDIR= yes NO_BUILD= yes USE_JAVA= yes USE_RC_SUBR= madsonic -JAVA_VERSION= 1.6+ JAVA_RUN= yes # Don't waste UID/GID and reuse Subsonic's user. USERS= subsonic Index: www/myfaces/Makefile =================================================================== --- www/myfaces/Makefile (revision 517355) +++ www/myfaces/Makefile (working copy) @@ -14,7 +14,6 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes USES= cpe Index: www/paros/Makefile =================================================================== --- www/paros/Makefile (revision 517355) +++ www/paros/Makefile (working copy) @@ -14,7 +14,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} 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 (revision 517355) +++ www/py-dojango/Makefile (working copy) @@ -28,7 +28,6 @@ OPTIONS_DEFINE= JAVA .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes -JAVA_VERSION= 1.6+ .endif .include Index: www/resin3/Makefile =================================================================== --- www/resin3/Makefile (revision 517355) +++ www/resin3/Makefile (working copy) @@ -15,7 +15,6 @@ USES= libtool python ssl USE_JAVA= yes # Pass JAVA_HOME as determined by bsd.java.mk -JAVA_VERSION= 1.6+ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-java-home=${JAVA_HOME} \ --with-openssl-lib=${OPENSSLLIB} \ Index: www/rssowl/Makefile =================================================================== --- www/rssowl/Makefile (revision 517355) +++ www/rssowl/Makefile (working copy) @@ -21,7 +21,6 @@ BUILD_WRKSRC= ${WRKSRC}/src ONLY_FOR_ARCHS= i386 amd64 USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native JAVA_RUN= yes Index: www/sahi/Makefile =================================================================== --- www/sahi/Makefile (revision 517355) +++ www/sahi/Makefile (working copy) @@ -19,7 +19,6 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils DATADIR= ${JAVASHAREDIR}/${PORTNAME} -JAVA_VERSION= 1.6+ JAVA_OS= native JAVA_RUN= yes Index: www/sakai/Makefile =================================================================== --- www/sakai/Makefile (revision 517355) +++ www/sakai/Makefile (working copy) @@ -20,7 +20,6 @@ RUN_DEPENDS= ${LOCALBASE}/apache-tomcat-7.0/bin/bo 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 (revision 517355) +++ www/scloader/Makefile (working copy) @@ -15,7 +15,6 @@ LICENSE= GPLv2 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 (revision 517355) +++ www/servlet-api/Makefile (working copy) @@ -14,7 +14,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Servlet API USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar Index: www/subsonic-standalone/Makefile =================================================================== --- www/subsonic-standalone/Makefile (revision 517355) +++ www/subsonic-standalone/Makefile (working copy) @@ -48,7 +48,6 @@ NO_WRKSUBDIR= yes NO_BUILD= yes USE_JAVA= yes USE_RC_SUBR= subsonic -JAVA_VERSION= 1.6+ JAVA_RUN= yes USERS= subsonic GROUPS= subsonic Index: www/tomcat-native/Makefile =================================================================== --- www/tomcat-native/Makefile (revision 517355) +++ www/tomcat-native/Makefile (working copy) @@ -19,7 +19,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/native USES= libtool ssl USE_JAVA= yes USE_LDCONFIG= yes -JAVA_VERSION= 1.6+ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apr=${LOCALBASE} \ --with-java-home=${JAVA_HOME} \ Index: www/tomcat7/Makefile =================================================================== --- www/tomcat7/Makefile (revision 517355) +++ www/tomcat7/Makefile (working copy) @@ -20,7 +20,6 @@ USES= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes Index: www/tomcat85/Makefile =================================================================== --- www/tomcat85/Makefile (revision 517355) +++ www/tomcat85/Makefile (working copy) @@ -18,7 +18,6 @@ RUN_DEPENDS= jsvc:devel/apache-commons-daemon USES= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.7+ USE_RC_SUBR= ${PKGBASE:C/-/_/} NO_ARCH= yes Index: www/tomee/Makefile =================================================================== --- www/tomee/Makefile (revision 517355) +++ www/tomee/Makefile (working copy) @@ -18,7 +18,6 @@ USES= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes NO_BUILD= yes Index: www/vertx/Makefile =================================================================== --- www/vertx/Makefile (revision 517355) +++ www/vertx/Makefile (working copy) @@ -19,7 +19,6 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} JAVA_OS= native JAVA_RUN= yes -JAVA_VERSION= 1.7+ PLIST_SUB= VERTXVER=${PORTVERSION} Index: www/yuicompressor/Makefile =================================================================== --- www/yuicompressor/Makefile (revision 517355) +++ www/yuicompressor/Makefile (working copy) @@ -19,7 +19,6 @@ LICENSE_COMB= multi 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 (revision 517355) +++ x11-toolkits/swt/Makefile (working copy) @@ -24,7 +24,6 @@ USE_GL= glu gl USE_GNOME= gtk20 USE_JAVA= yes USE_XORG= xtst -JAVA_VERSION= 1.6+ JAVA_OS= native USE_ANT= yes MAKE_ARGS+= -Doutput.jar=${OUTPUT_JAR} Index: x11-wm/lxmed/Makefile =================================================================== --- x11-wm/lxmed/Makefile (revision 517355) +++ x11-wm/lxmed/Makefile (working copy) @@ -18,7 +18,6 @@ RUN_DEPENDS= gksu:sysutils/gksu WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME}