svn commit: r518482 - in head: Mk archivers/javatar archivers/jzlib archivers/snappy-java astro/gpsprune astro/gpsprune/files astro/osmosis audio/atunes audio/atunes/files audio/gervill audio/jid3l...

Jung-uk Kim jkim at FreeBSD.org
Tue Nov 26 21:46:31 UTC 2019 

Author: jkim
Date: Tue Nov 26 21:46:12 2019
New Revision: 518482
URL: https://svnweb.freebsd.org/changeset/ports/518482

Log:
  Clean up after java/openjdk6 and java/openjdk6-jre removal
  
  java/openjdk6 support was removed from Mk/bsd.java.mk (r512662) and
  java/openjdk6 and java/openjdk6-jre were removed from the ports tree
  (r512663).  Now this patch completely removes remaining stuff from the
  ports tree.
  
  PR:			241953 (exp-run)
  Reviewed by:		glewis
  Approved by:		portmgr (antoine)
  Differential Revision:	https://reviews.freebsd.org/D22342

Deleted:
  head/java/wildfly10/files/patch-bin_add-user.sh
  head/java/wildfly11/files/patch-bin_add-user.sh
  head/java/wildfly12/files/patch-bin_add-user.sh
  head/java/wildfly13/files/patch-bin_add-user.sh
  head/java/wildfly90/files/patch-bin-add-user.sh
Modified:
  head/Mk/bsd.java.mk
  head/archivers/javatar/Makefile
  head/archivers/jzlib/Makefile
  head/archivers/snappy-java/Makefile
  head/astro/gpsprune/Makefile
  head/astro/gpsprune/files/gpsprune.sh.in
  head/astro/osmosis/Makefile
  head/audio/atunes/Makefile
  head/audio/atunes/files/atunes.in
  head/audio/gervill/Makefile
  head/audio/jid3lib/Makefile
  head/audio/musiccontrol/Makefile
  head/audio/tuxguitar/Makefile
  head/benchmarks/linux-vdbench/Makefile
  head/benchmarks/scimark2/Makefile
  head/biology/artemis/Makefile
  head/biology/cytoscape/Makefile
  head/biology/jalview/Makefile
  head/biology/jalview/files/jalview.sh.in
  head/biology/trimmomatic/Makefile
  head/cad/electric-ng/Makefile
  head/cad/electric-ng/files/electric-ng.in
  head/cad/fidocadj/Makefile
  head/cad/fidocadj/files/fidocadj.sh.in
  head/cad/impact/Makefile
  head/cad/impact/files/impact.in
  head/cad/impact/files/impactgui.in
  head/cad/logisim/Makefile
  head/cad/sweethome3d/Makefile
  head/cad/sweethome3d/files/sweethome3d.sh.in
  head/comms/rxtx/Makefile
  head/comms/yaac/Makefile
  head/comms/yaac/files/yaac.sh.in
  head/databases/apache-commons-dbutils/Makefile
  head/databases/c3p0/Makefile
  head/databases/db6/Makefile
  head/databases/frontbase-jdbc/Makefile
  head/databases/hbase/Makefile
  head/databases/hsqldb/Makefile
  head/databases/isql-viewer/Makefile
  head/databases/isql-viewer/files/iSQL-Viewer.sh
  head/databases/jasperreports/Makefile
  head/databases/jrobin/Makefile
  head/databases/jrrd/Makefile
  head/databases/libgda5/Makefile
  head/databases/postgis-jdbc/Makefile
  head/databases/powerarchitect/Makefile
  head/databases/powerarchitect/files/powerarchitect.in
  head/databases/puppetdb5/Makefile
  head/databases/puppetdb6/Makefile
  head/deskutils/docear/Makefile
  head/deskutils/freemind/Makefile
  head/deskutils/freemind/files/freemind.sh.in
  head/deskutils/freeplane/Makefile
  head/deskutils/ganttproject/Makefile
  head/deskutils/projectlibre/Makefile
  head/deskutils/projectlibre/files/projectlibre.sh.in
  head/deskutils/thinkingrock/Makefile
  head/devel/antlr/Makefile
  head/devel/antlr/files/antlr.sh.in
  head/devel/antlr3/Makefile
  head/devel/antlr3/files/antlr.sh.in
  head/devel/apache-commons-configuration/Makefile
  head/devel/apache-commons-daemon/Makefile
  head/devel/apache-commons-io/Makefile
  head/devel/apache-commons-jxpath/Makefile
  head/devel/apache-commons-modeler/Makefile
  head/devel/argouml/Makefile
  head/devel/argouml/files/argouml.sh.in
  head/devel/astah-community/Makefile
  head/devel/avalon-framework/Makefile
  head/devel/charva/Makefile
  head/devel/doctorj/Makefile
  head/devel/flex-sdk/Makefile
  head/devel/flex-sdk35/Makefile
  head/devel/flexjson/Makefile
  head/devel/gitblit/Makefile
  head/devel/gogland-eap/Makefile
  head/devel/gradle4/Makefile
  head/devel/hadoop/Makefile
  head/devel/hadoop2/Makefile
  head/devel/hive/Makefile
  head/devel/ireport/Makefile
  head/devel/itext/Makefile
  head/devel/java-findbugs/Makefile
  head/devel/java-findbugs/files/patch-findbugs2
  head/devel/jcmdline/Makefile
  head/devel/jiic/Makefile
  head/devel/jsap/Makefile
  head/devel/leiningen/Makefile
  head/devel/libvirt-java/Makefile
  head/devel/looks/Makefile
  head/devel/maven/Makefile
  head/devel/maven/files/mvn.sh.in
  head/devel/maven3/Makefile
  head/devel/maven3/files/mvn.sh.in
  head/devel/maven31/Makefile
  head/devel/maven31/files/mvn.sh.in
  head/devel/maven33/Makefile
  head/devel/maven33/files/mvn.sh.in
  head/devel/netscape-java40/Makefile
  head/devel/ocaml-camljava/Makefile
  head/devel/oozie/Makefile
  head/devel/p5-Inline-Java/Makefile
  head/devel/p5-Java/Makefile
  head/devel/pig/Makefile
  head/devel/pmd/Makefile
  head/devel/py-jcc/Makefile
  head/devel/py-jep/Makefile
  head/devel/pycharm-ce/Makefile
  head/devel/sabre/Makefile
  head/devel/simian/Makefile
  head/devel/smc/Makefile
  head/devel/soapui/Makefile
  head/devel/sonar-ant-task/Makefile
  head/devel/sonar-scanner-cli/Makefile
  head/devel/sonarqube/Makefile
  head/devel/spark/Makefile
  head/devel/statcvs/Makefile
  head/devel/statsvn/Makefile
  head/devel/swank-clojure/Makefile
  head/devel/tijmp/Makefile
  head/devel/tinylaf/Makefile
  head/devel/violet/Makefile
  head/dns/crossip/Makefile
  head/dns/crossip/files/crossip.sh.in
  head/dns/dnsjava/Makefile
  head/editors/drjava/Makefile
  head/editors/drjava/files/drjava.in
  head/editors/jedit/Makefile
  head/editors/jedit/files/jedit.sh.in
  head/editors/omegaT/Makefile
  head/editors/omegaT/files/omegaT.sh.in
  head/editors/openoffice-4/Makefile
  head/editors/openoffice-devel/Makefile
  head/editors/treeform/Makefile
  head/emulators/javatari/Makefile
  head/emulators/javatari/files/javatari.in
  head/finance/jgnash/Makefile
  head/finance/venice/Makefile
  head/finance/venice/files/venice.in
  head/ftp/jftp/Makefile
  head/games/blackjackclient/Makefile
  head/games/blackjackclient/files/BlackjackClient.sh.in
  head/games/castlevox/Makefile
  head/games/castlevox/files/CastleVox.in
  head/games/dmjava/Makefile
  head/games/domination/Makefile
  head/games/domination/files/domination-FlashGUI.in
  head/games/domination/files/domination-Increment1GUI.in
  head/games/domination/files/domination-SimpleGUI.in
  head/games/domination/files/domination-SwingGUI.in
  head/games/freecol/Makefile
  head/games/java-games-suite/Makefile
  head/games/java-games-suite/files/java-games-suite.sh.in
  head/games/jchessboard/Makefile
  head/games/jchessboard/files/jchessboard.in
  head/games/jin/Makefile
  head/games/jin/files/jin.in
  head/games/jinput/Makefile
  head/games/jtans/Makefile
  head/games/jtans/files/jtans.sh.in
  head/games/jutils/Makefile
  head/games/lwjgl/Makefile
  head/games/moagg/Makefile
  head/games/pcgen/Makefile
  head/games/pcgen/files/pcgen.sh.in
  head/games/rescue/Makefile
  head/games/rescue/files/rescue.in
  head/games/robocode-naval/Makefile
  head/games/robocode-naval/files/robocode-NavalRobocode.in
  head/games/robocode/Makefile
  head/games/robocode/files/robocode-MeleeRumble.in
  head/games/robocode/files/robocode-RoboRumble.in
  head/games/robocode/files/robocode-Robocode.in
  head/games/robocode/files/robocode-TeamRumble.in
  head/games/robocode/files/robocode-TwinDuel.in
  head/games/spicetrade/Makefile
  head/games/spicetrade/files/spicetrade.in
  head/games/stendhal/Makefile
  head/graphics/aoi/Makefile
  head/graphics/aoi/files/aoi.in
  head/graphics/barbecue/Makefile
  head/graphics/batik/Makefile
  head/graphics/cbviewer/Makefile
  head/graphics/cbviewer/files/cbviewer.in
  head/graphics/cosmoplayer/Makefile
  head/graphics/ditaa/Makefile
  head/graphics/geoserver/Makefile
  head/graphics/jalbum/Makefile
  head/graphics/jave6/Makefile
  head/graphics/jave6/files/jave6.in
  head/graphics/jdraw/Makefile
  head/graphics/jdraw/files/jdraw.in
  head/graphics/jogl/Makefile
  head/graphics/jpatch/Makefile
  head/graphics/jpatch/files/jpatch.sh.in
  head/graphics/libpano13/Makefile
  head/graphics/lightzone/Makefile
  head/graphics/mapyrus/Makefile
  head/graphics/mapyrus/files/mapyrus.in
  head/graphics/opendx/Makefile
  head/graphics/tintfu/Makefile
  head/graphics/tintfu/files/tintfu.sh.in
  head/graphics/xmlgraphics-commons/Makefile
  head/java/apache-commons-cli/Makefile
  head/java/apache-commons-lang/Makefile
  head/java/apache-commons-lang3/Makefile
  head/java/apache-commons-logging/Makefile
  head/java/apache-commons-primitives/Makefile
  head/java/aparapi/Makefile
  head/java/avis/Makefile
  head/java/berkeley-db/Makefile
  head/java/bouncycastle/Makefile
  head/java/bouncycastle15/Makefile
  head/java/castor/Makefile
  head/java/cryptix-jce/Makefile
  head/java/dbvis/Makefile
  head/java/eclipse-drjava/Makefile
  head/java/eclipse-ecj/Makefile
  head/java/eclipse-ecj/files/ecj.sh.in
  head/java/eclipse-findbugs/Makefile
  head/java/eclipse-shelled/Makefile
  head/java/infobus/Makefile
  head/java/jai/Makefile
  head/java/jakarta-bcel/Makefile
  head/java/jakarta-commons-beanutils/Makefile
  head/java/jakarta-commons-discovery/Makefile
  head/java/jakarta-commons-httpclient/Makefile
  head/java/jakarta-oro/Makefile
  head/java/jakarta-regexp/Makefile
  head/java/jasmin/Makefile
  head/java/jasmin/files/jasmin.sh.in
  head/java/java-subversion/Makefile
  head/java/java3d/Makefile
  head/java/javahelp/Makefile
  head/java/javahelp/files/jhindexer.in
  head/java/javahelp/files/jhsearch.in
  head/java/javavmwrapper/Makefile
  head/java/javavmwrapper/src/javavm.1
  head/java/javavmwrapper/src/javavmwrapper.sh
  head/java/javavmwrapper/src/manvm.1
  head/java/javavmwrapper/src/registervm.1
  head/java/jaxen/Makefile
  head/java/jcalendar/Makefile
  head/java/jcommon/Makefile
  head/java/jd-gui/Makefile
  head/java/jdbcpool/Makefile
  head/java/jdom/Makefile
  head/java/jfreechart/Makefile
  head/java/jgraph/Makefile
  head/java/jmf/Makefile
  head/java/jode/Makefile
  head/java/jomp/Makefile
  head/java/jta/Makefile
  head/java/jump/Makefile
  head/java/mx4j/Makefile
  head/java/servingxml/Makefile
  head/java/springframework/Makefile
  head/java/springframework31/Makefile
  head/java/sqlitejdbc/Makefile
  head/java/trove4j/Makefile
  head/java/wildfly10/Makefile
  head/java/wildfly10/files/wildfly10.in
  head/java/wildfly11/Makefile
  head/java/wildfly11/files/wildfly11.in
  head/java/wildfly12/Makefile
  head/java/wildfly12/files/wildfly12.in
  head/java/wildfly13/Makefile
  head/java/wildfly13/files/wildfly13.in
  head/java/wildfly90/Makefile
  head/java/wildfly90/files/wildfly90.in
  head/java/xdoclet/Makefile
  head/lang/abcl/Makefile
  head/lang/apache-commons-jelly/Makefile
  head/lang/apache-commons-jelly/files/jelly.sh.in
  head/lang/bsh/Makefile
  head/lang/bsh/files/bsh.sh.in
  head/lang/ceylon/Makefile
  head/lang/groovy/Makefile
  head/lang/jython/Makefile
  head/lang/linux-j/Makefile
  head/lang/linux-j/files/jw.sh.in
  head/lang/rhino/Makefile
  head/lang/rhino/files/rhinoc.in
  head/lang/rhino/files/rhinodbg.in
  head/lang/rhino/files/rhinosh.in
  head/lang/sisc/Makefile
  head/lang/starlogo/Makefile
  head/lang/starlogo/files/starlogo.sh.in
  head/mail/davmail/Makefile
  head/mail/james/Makefile
  head/mail/james/files/james.in
  head/mail/mime4j/Makefile
  head/mail/openemm2013/Makefile
  head/mail/openemm2013/files/openemm2013.in
  head/mail/openemm2015/Makefile
  head/math/cvc4/Makefile
  head/math/geonext/Makefile
  head/math/jakarta-commons-math3/Makefile
  head/math/jeuclid/Makefile
  head/math/jlatexmath/Makefile
  head/math/matlab-installer/Makefile
  head/math/octave/Makefile
  head/math/plman/Makefile
  head/math/truthtable/Makefile
  head/math/truthtable/files/truthtable.in
  head/misc/freeguide/Makefile
  head/misc/jbidwatcher/Makefile
  head/misc/jbidwatcher/files/jbidwatcher.in
  head/misc/pauker/Makefile
  head/misc/pipe/Makefile
  head/misc/pipe/files/pipe.sh.in
  head/multimedia/gdialog/Makefile
  head/multimedia/gdialog/files/gdialog.in
  head/multimedia/libbluray/Makefile
  head/multimedia/projectx/Makefile
  head/multimedia/projectx/files/project-x.sh.in
  head/net-im/convey/Makefile
  head/net-im/convey/files/convey.sh.in
  head/net-p2p/frost/Makefile
  head/net-p2p/frost/files/wrapper.sh
  head/net-p2p/phex/Makefile
  head/net-p2p/phex/files/phex.sh.in
  head/net-p2p/vuze/Makefile
  head/net-p2p/vuze/files/vuze.in
  head/net/activemq/Makefile
  head/net/apache-commons-net/Makefile
  head/net/belle-sip/Makefile
  head/net/dimes/Makefile
  head/net/java-beepcore/Makefile
  head/net/jcifs/Makefile
  head/net/jgroups/Makefile
  head/net/jicmp/Makefile
  head/net/jicmp6/Makefile
  head/net/jrdesktop/Makefile
  head/net/jsch/Makefile
  head/net/ldapbrowser/Makefile
  head/net/mpich2/Makefile
  head/net/seda/Makefile
  head/net/spread-j/Makefile
  head/net/toonel/Makefile
  head/net/toonel/files/toonel.sh.in
  head/portuguese/irpf-pt_BR/Makefile
  head/portuguese/irpf-pt_BR/files/wrapper.sh
  head/print/pdf-renderer/Makefile
  head/science/colt/Makefile
  head/science/devisor/Makefile
  head/science/devisor/files/devisorgrid.sh.in
  head/science/simsmith/Makefile
  head/science/simsmith/files/simsmith.in
  head/security/dirbuster/Makefile
  head/security/i2p/Makefile
  head/security/iaikpkcs11wrapper/Makefile
  head/security/jbrofuzz/Makefile
  head/security/owasp-dependency-check/Makefile
  head/security/owasp-dependency-check/files/owasp-dependency-check.in
  head/security/webscarab/Makefile
  head/security/xml-security/Makefile
  head/sysutils/hfsexplorer/Makefile
  head/sysutils/jdiskreport/Makefile
  head/sysutils/jvmtop/Makefile
  head/sysutils/jvmtop/files/jvmtop.sh.in
  head/sysutils/linux-crashplan/Makefile
  head/textproc/apache-commons-digester/Makefile
  head/textproc/apache-poi/Makefile
  head/textproc/denature/Makefile
  head/textproc/dom4j/Makefile
  head/textproc/fop/Makefile
  head/textproc/jalingo/Makefile
  head/textproc/jalingo/files/jalingo.in
  head/textproc/jarnal/Makefile
  head/textproc/jaxup/Makefile
  head/textproc/jaxup/files/jaxup-xupdater.sh
  head/textproc/jdictionary/Makefile
  head/textproc/jdictionary/Makefile.plugin
  head/textproc/jing/Makefile
  head/textproc/lucene/Makefile
  head/textproc/lucene4/Makefile
  head/textproc/lucene5/Makefile
  head/textproc/nux/Makefile
  head/textproc/nux/files/fire-xquery.sh.in
  head/textproc/ppower4/Makefile
  head/textproc/ppower4/files/ppower4.sh.in
  head/textproc/qrcodegen/Makefile
  head/textproc/qrcodegen/files/qrcodegen.in
  head/textproc/saxon-devel/Makefile
  head/textproc/saxon-devel/files/saxon.sh.in
  head/textproc/saxon/Makefile
  head/textproc/saxon/files/saxon.sh.in
  head/textproc/trang/Makefile
  head/textproc/weka/Makefile
  head/textproc/xalan-j/Makefile
  head/textproc/xerces-j/Makefile
  head/textproc/xincluder/Makefile
  head/textproc/xincluder/files/xincluder.sh.in
  head/textproc/xml-commons/Makefile
  head/textproc/xom/Makefile
  head/textproc/xp/Makefile
  head/www/apache-forrest/Makefile
  head/www/archiva/Makefile
  head/www/axis2/Makefile
  head/www/dojo-shrinksafe/Makefile
  head/www/dojo-shrinksafe/files/dojo-shrinksafe.in
  head/www/geronimo/Makefile
  head/www/glassfish4/Makefile
  head/www/grails/Makefile
  head/www/helma/Makefile
  head/www/htmlcompressor/Makefile
  head/www/htmlcompressor/files/htmlcompressor.in
  head/www/httpasyncclient/Makefile
  head/www/httpclient/Makefile
  head/www/httpcore/Makefile
  head/www/jetty8/Makefile
  head/www/jmeter/Makefile
  head/www/jmeter/files/jmeter.sh.in
  head/www/madsonic-standalone/Makefile
  head/www/madsonic/Makefile
  head/www/myfaces/Makefile
  head/www/paros/Makefile
  head/www/py-dojango/Makefile
  head/www/resin3/Makefile
  head/www/rssowl/Makefile
  head/www/sahi/Makefile
  head/www/sakai/Makefile
  head/www/scloader/Makefile
  head/www/servlet-api/Makefile
  head/www/subsonic-standalone/Makefile
  head/www/tomcat-native/Makefile
  head/www/tomcat7/Makefile
  head/www/tomcat85/Makefile
  head/www/tomee/Makefile
  head/www/vertx/Makefile
  head/www/yuicompressor/Makefile
  head/www/yuicompressor/files/yuicompressor.in
  head/x11-toolkits/swt/Makefile
  head/x11-wm/lxmed/Makefile
  head/x11-wm/lxmed/files/lxmed.sh.in

Modified: head/Mk/bsd.java.mk
==============================================================================
--- head/Mk/bsd.java.mk	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/Mk/bsd.java.mk	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/archivers/javatar/Makefile
==============================================================================
--- head/archivers/javatar/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/archivers/javatar/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -14,7 +14,6 @@ LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 

Modified: head/archivers/jzlib/Makefile
==============================================================================
--- head/archivers/jzlib/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/archivers/jzlib/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/archivers/snappy-java/Makefile
==============================================================================
--- head/archivers/snappy-java/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/archivers/snappy-java/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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}
 

Modified: head/astro/gpsprune/Makefile
==============================================================================
--- head/astro/gpsprune/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/astro/gpsprune/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gpsprune
 PORTVERSION=	19.2
+PORTREVISION=	1
 CATEGORIES=	astro java
 MASTER_SITES=	http://activityworkshop.net/software/${PORTNAME}/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -20,7 +21,6 @@ NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	gpsprune.sh
 SUB_LIST=	JARNAME=${DISTNAME}

Modified: head/astro/gpsprune/files/gpsprune.sh.in
==============================================================================
--- head/astro/gpsprune/files/gpsprune.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/astro/gpsprune/files/gpsprune.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -4,6 +4,5 @@
 
 JAVA="%%LOCALBASE%%/bin/java"
 JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
 
 exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@"

Modified: head/astro/osmosis/Makefile
==============================================================================
--- head/astro/osmosis/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/astro/osmosis/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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
 

Modified: head/audio/atunes/Makefile
==============================================================================
--- head/audio/atunes/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/audio/atunes/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,7 +3,7 @@
 
 PORTNAME=	atunes
 PORTVERSION=	3.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 SUB_FILES=	atunes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

Modified: head/audio/atunes/files/atunes.in
==============================================================================
--- head/audio/atunes/files/atunes.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/audio/atunes/files/atunes.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \
+exec %%LOCALBASE%%/bin/java \
     -Dsubstancelaf.windowRoundedCorners=false \
     -Dinsubstantial.looseTableCellRenderers=true -Djava.library.path=./ \
     -Xms128m -Xmx256m -splash:splash.gif \

Modified: head/audio/gervill/Makefile
==============================================================================
--- head/audio/gervill/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/audio/gervill/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -17,7 +17,6 @@ BROKEN_armv7=		fails to package: find: *: No such file
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 NO_ARCH=	yes
 

Modified: head/audio/jid3lib/Makefile
==============================================================================
--- head/audio/jid3lib/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/audio/jid3lib/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -11,7 +11,6 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Java ID3 Tag Library
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/jid3lib.jar

Modified: head/audio/musiccontrol/Makefile
==============================================================================
--- head/audio/musiccontrol/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/audio/musiccontrol/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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
 

Modified: head/audio/tuxguitar/Makefile
==============================================================================
--- head/audio/tuxguitar/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/audio/tuxguitar/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/benchmarks/linux-vdbench/Makefile
==============================================================================
--- head/benchmarks/linux-vdbench/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/benchmarks/linux-vdbench/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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}

Modified: head/benchmarks/scimark2/Makefile
==============================================================================
--- head/benchmarks/scimark2/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/benchmarks/scimark2/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -14,7 +14,6 @@ COMMENT=	Java benchmark for scientific and numerical c
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NEED_JAVAC=	yes
 JAVAC_OPTS?=	-O
 

Modified: head/biology/artemis/Makefile
==============================================================================
--- head/biology/artemis/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/biology/artemis/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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
 

Modified: head/biology/cytoscape/Makefile
==============================================================================
--- head/biology/cytoscape/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/biology/cytoscape/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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 \

Modified: head/biology/jalview/Makefile
==============================================================================
--- head/biology/jalview/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/biology/jalview/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,7 +3,7 @@
 
 PORTNAME=	jalview
 PORTVERSION=	2.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology java
 MASTER_SITES=	http://www.jalview.org/source/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/}
@@ -12,7 +12,6 @@ MAINTAINER=	ports at 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}

Modified: head/biology/jalview/files/jalview.sh.in
==============================================================================
--- head/biology/jalview/files/jalview.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/biology/jalview/files/jalview.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -4,4 +4,4 @@
 
 # Shell script to launch jalview using our javavm wrapper
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" -cp "%%DATADIR%%/jalview.jar" jalview.bin.Jalview
+"%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" -cp "%%DATADIR%%/jalview.jar" jalview.bin.Jalview

Modified: head/biology/trimmomatic/Makefile
==============================================================================
--- head/biology/trimmomatic/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/biology/trimmomatic/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/cad/electric-ng/Makefile
==============================================================================
--- head/cad/electric-ng/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/electric-ng/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,6 +3,7 @@
 
 PORTNAME=	electric
 PORTVERSION=	9.07
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	GNU \
 		http://www.staticfreesoft.com/:1 \
@@ -20,7 +21,6 @@ LICENSE=	GPLv3
 EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 SUB_LIST+=	LIBFILES="${LIBFILES}" \
 		JARFILE="${JARFILE}"

Modified: head/cad/electric-ng/files/electric-ng.in
==============================================================================
--- head/cad/electric-ng/files/electric-ng.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/electric-ng/files/electric-ng.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -6,7 +6,6 @@
 set JAVA = "%%LOCALBASE%%/bin/java"
 set LIBFILES = "%%LIBFILES%%"
 set JARPATH = "%%JAVALIBDIR%%"
-setenv JAVA_VERSION "%%JAVA_VERSION%%"
 
 if ( "${LIBFILES}" != "" ) then
 	set CLASSPATH = :`echo ${LIBFILES} | sed -E -e 's,[[:space:]]+,:,g'`

Modified: head/cad/fidocadj/Makefile
==============================================================================
--- head/cad/fidocadj/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/fidocadj/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fidocadj
 PORTVERSION=	0.24.6
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/:src SF/${PORTNAME}/manuals/:docs
 DISTFILES=	${PORTNAME}.jar:src
@@ -23,7 +23,6 @@ NO_BUILD=	yes
 
 SUB_FILES=	${PORTNAME}.sh
 
-JAVA_VERSION=	1.6+
 USE_JAVA=	yes
 
 OPTIONS_DEFINE=	DOCS

Modified: head/cad/fidocadj/files/fidocadj.sh.in
==============================================================================
--- head/cad/fidocadj/files/fidocadj.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/fidocadj/files/fidocadj.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@"

Modified: head/cad/impact/Makefile
==============================================================================
--- head/cad/impact/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/impact/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,7 +3,7 @@
 
 PORTNAME=	impact
 PORTVERSION=	0.7.06.038
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION} \
@@ -24,7 +24,6 @@ WRKSRC=		${WRKDIR}/Impact
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/Impact

Modified: head/cad/impact/files/impact.in
==============================================================================
--- head/cad/impact/files/impact.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/impact/files/impact.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,5 +3,5 @@
 # $FreeBSD$
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:doc:bin run.Impact "$@"
+"%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:doc:bin run.Impact "$@"
 cd -

Modified: head/cad/impact/files/impactgui.in
==============================================================================
--- head/cad/impact/files/impactgui.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/impact/files/impactgui.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,5 +3,5 @@
 # $FreeBSD$
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:bin:doc:lib/jogl.jar:lib/gluegen-rt.jar:lib/patbinfree153.jar:lib/LogDB.jar:lib/mysql-connector-java-5.1.11-bin.jar gui.ImpactGUI
+"%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:bin:doc:lib/jogl.jar:lib/gluegen-rt.jar:lib/patbinfree153.jar:lib/LogDB.jar:lib/mysql-connector-java-5.1.11-bin.jar gui.ImpactGUI
 cd -

Modified: head/cad/logisim/Makefile
==============================================================================
--- head/cad/logisim/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/logisim/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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}

Modified: head/cad/sweethome3d/Makefile
==============================================================================
--- head/cad/sweethome3d/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/sweethome3d/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sweethome3d
 PORTVERSION=	5.4
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
@@ -20,7 +21,6 @@ USES=		zip
 NO_ARCH=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 ALL_TARGET=	jarExecutable
 JARNAME=	SweetHome3D-${PORTVERSION}.jar

Modified: head/cad/sweethome3d/files/sweethome3d.sh.in
==============================================================================
--- head/cad/sweethome3d/files/sweethome3d.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/cad/sweethome3d/files/sweethome3d.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -4,6 +4,5 @@
 
 JAVA="%%LOCALBASE%%/bin/java"
 JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
 
 exec "${JAVA}" -Xmx1024m -jar "${JARPATH}/%%JARNAME%%" "$@"

Modified: head/comms/rxtx/Makefile
==============================================================================
--- head/comms/rxtx/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/comms/rxtx/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -21,7 +21,6 @@ NOT_FOR_ARCHS_REASON=	Java not available for this arch
 USES=		gmake libtool zip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}

Modified: head/comms/yaac/Makefile
==============================================================================
--- head/comms/yaac/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/comms/yaac/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -2,6 +2,7 @@
 
 PORTNAME=	yaac
 PORTVERSION=	1.0b114
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/yetanotheraprsc/
 DISTNAME=	YAACsrc_20170920
@@ -15,7 +16,6 @@ LICENSE=	LGPL3
 
 BROKEN_armv7=	fails to package: yaac/build.xml:205: yaac/work/yaac/YAAC/site does not exist
 
-JAVA_VERSION=	1.6+
 USES=		zip
 USE_ANT=	yes
 USE_JAVA=	yes

Modified: head/comms/yaac/files/yaac.sh.in
==============================================================================
--- head/comms/yaac/files/yaac.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/comms/yaac/files/yaac.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,4 +3,4 @@
 # $FreeBSD$
 
 cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/YAAC.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/YAAC.jar" "$@"

Modified: head/databases/apache-commons-dbutils/Makefile
==============================================================================
--- head/databases/apache-commons-dbutils/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/apache-commons-dbutils/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -15,7 +15,6 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 

Modified: head/databases/c3p0/Makefile
==============================================================================
--- head/databases/c3p0/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/c3p0/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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
 

Modified: head/databases/db6/Makefile
==============================================================================
--- head/databases/db6/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/db6/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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}"

Modified: head/databases/frontbase-jdbc/Makefile
==============================================================================
--- head/databases/frontbase-jdbc/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/frontbase-jdbc/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -13,7 +13,6 @@ MAINTAINER?=	ports at FreeBSD.org
 COMMENT=	The Java JDBC implementation for FrontBase
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 JARFILE=	frontbasejdbc.jar

Modified: head/databases/hbase/Makefile
==============================================================================
--- head/databases/hbase/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/hbase/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/databases/hsqldb/Makefile
==============================================================================
--- head/databases/hsqldb/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/hsqldb/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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}

Modified: head/databases/isql-viewer/Makefile
==============================================================================
--- head/databases/isql-viewer/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/isql-viewer/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,7 +3,7 @@
 
 PORTNAME=	isql-viewer
 PORTVERSION=	2.1.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases java
 MASTER_SITES=	SF/isql/Stand%20Alone%20Jars/Version%20${PORTVERSION}:isql \
 		APACHE/ws/soap/version-2.2:bsf
@@ -19,7 +19,6 @@ RUN_DEPENDS=	${JYTHON_PREFIX}/${JYTHON_JAR}:lang/jytho
 		${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 ISQL=		iSQL-Viewer
@@ -45,7 +44,6 @@ CLASSPATH=	"${JARFILES:S,^,${JAVAJARDIR}/,}:${JYTHON_P
 
 do-configure:
 	@${SED} -e 's|%%CLASSPATH%%|${CLASSPATH:C,[[:space:]],:,g}|g'	\
-		-e 's|%%JAVA_VERSION%%|${JAVA_VERSION}|g'	\
 		${FILESDIR}/iSQL-Viewer.sh > ${WRKDIR}/iSQL-Viewer.sh
 
 do-install:

Modified: head/databases/isql-viewer/files/iSQL-Viewer.sh
==============================================================================
--- head/databases/isql-viewer/files/iSQL-Viewer.sh	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/isql-viewer/files/iSQL-Viewer.sh	Tue Nov 26 21:46:12 2019	(r518482)
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-JAVA_VERSION=%%JAVA_VERSION%% \
-	java -classpath %%CLASSPATH%% \
-	     org.isqlviewer.core.Launcher
+java -classpath %%CLASSPATH%% org.isqlviewer.core.Launcher

Modified: head/databases/jasperreports/Makefile
==============================================================================
--- head/databases/jasperreports/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/jasperreports/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/databases/jrobin/Makefile
==============================================================================
--- head/databases/jrobin/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/jrobin/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -12,7 +12,6 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Pure Java alternative to RRDTool
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 CLASSES=	jrobin

Modified: head/databases/jrrd/Makefile
==============================================================================
--- head/databases/jrrd/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/jrrd/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/databases/libgda5/Makefile
==============================================================================
--- head/databases/libgda5/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/libgda5/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/databases/postgis-jdbc/Makefile
==============================================================================
--- head/databases/postgis-jdbc/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/postgis-jdbc/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -17,7 +17,6 @@ RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:databases/po
 
 USES=		zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 

Modified: head/databases/powerarchitect/Makefile
==============================================================================
--- head/databases/powerarchitect/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/powerarchitect/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,6 +3,7 @@
 
 PORTNAME=	powerarchitect
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.sqlpower.ca/architect/1.0.8/community/
 DISTNAME=	SQL-Power-Architect-generic-jdbc-${PORTVERSION}
@@ -13,7 +14,6 @@ COMMENT=	Data modeling and profiling tool
 LICENSE=	GPLv3
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PORTDOCS=	*

Modified: head/databases/powerarchitect/files/powerarchitect.in
==============================================================================
--- head/databases/powerarchitect/files/powerarchitect.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/powerarchitect/files/powerarchitect.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/architect.jar
+exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/architect.jar

Modified: head/databases/puppetdb5/Makefile
==============================================================================
--- head/databases/puppetdb5/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/puppetdb5/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/databases/puppetdb6/Makefile
==============================================================================
--- head/databases/puppetdb6/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/databases/puppetdb6/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/deskutils/docear/Makefile
==============================================================================
--- head/deskutils/docear/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/deskutils/docear/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/deskutils/freemind/Makefile
==============================================================================
--- head/deskutils/freemind/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/deskutils/freemind/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,6 +3,7 @@
 
 PORTNAME=	freemind
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils editors java
 MASTER_SITES=	SF
@@ -18,7 +19,6 @@ BUILD_DEPENDS=	zip:archivers/zip
 
 USES=		cpe zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
 DATAFILES=	accessories browser doc lib plugins patterns.xml

Modified: head/deskutils/freemind/files/freemind.sh.in
==============================================================================
--- head/deskutils/freemind/files/freemind.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/deskutils/freemind/files/freemind.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -6,4 +6,4 @@ CLASSPATH="${ADD_JARS}:${CLASSPATH}:`find "%%DATADIR%%
 FILE="lib/freemind.jar"
 
 cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "${CLASSPATH}" -jar "${FILE}"
+"%%LOCALBASE%%/bin/java" -cp "${CLASSPATH}" -jar "${FILE}"

Modified: head/deskutils/freeplane/Makefile
==============================================================================
--- head/deskutils/freeplane/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/deskutils/freeplane/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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}"

Modified: head/deskutils/ganttproject/Makefile
==============================================================================
--- head/deskutils/ganttproject/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/deskutils/ganttproject/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -19,7 +19,6 @@ SHEBANG_FILES=	ganttproject
 bash_CMD=	/bin/sh
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 NO_ARCH=	yes
 NO_BUILD=	yes

Modified: head/deskutils/projectlibre/Makefile
==============================================================================
--- head/deskutils/projectlibre/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/deskutils/projectlibre/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,6 +3,7 @@
 
 PORTNAME=	projectlibre
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	deskutils editors java
 MASTER_SITES=	SF/${PORTNAME}/ProjectLibre/${PORTVERSION:S/.0$//} \
 		LOCAL/cpm/projectlibre/:icons
@@ -17,7 +18,6 @@ COMMENT=	Open source desktop alternative to Microsoft 
 LICENSE=	CPAL-1.0
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_ARCH=	yes
 NO_BUILD=	yes

Modified: head/deskutils/projectlibre/files/projectlibre.sh.in
==============================================================================
--- head/deskutils/projectlibre/files/projectlibre.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/deskutils/projectlibre/files/projectlibre.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -5,6 +5,6 @@
 PROJECTLIBRE_HOME="%%DATADIR%%"
 export PROJECTLIBRE_HOME
 cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "$PROJECTLIBRE_HOME/projectlibre.jar" "$@" > /dev/null 2>&1
+"%%LOCALBASE%%/bin/java" -jar "$PROJECTLIBRE_HOME/projectlibre.jar" "$@" > /dev/null 2>&1
 
 # eof

Modified: head/deskutils/thinkingrock/Makefile
==============================================================================
--- head/deskutils/thinkingrock/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/deskutils/thinkingrock/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -15,7 +15,6 @@ RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:devel/xdg-utils
 		${LOCALBASE}/bin/xdg-email:devel/xdg-utils
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message

Modified: head/devel/antlr/Makefile
==============================================================================
--- head/devel/antlr/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/antlr/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,7 +3,7 @@
 
 PORTNAME=	antlr
 PORTVERSION=	2.7.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.antlr2.org/download/
 

Modified: head/devel/antlr/files/antlr.sh.in
==============================================================================
--- head/devel/antlr/files/antlr.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/antlr/files/antlr.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/antlr.jar" antlr.Tool "$@"
+"%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/antlr.jar" antlr.Tool "$@"

Modified: head/devel/antlr3/Makefile
==============================================================================
--- head/devel/antlr3/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/antlr3/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,6 +3,7 @@
 
 PORTNAME=	antlr3
 PORTVERSION=	3.5.2
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.antlr3.org/download/
 DISTNAME=	antlr-${PORTVERSION}-complete
@@ -17,7 +18,6 @@ LICENSE=	BSD3CLAUSE
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 INSTALL_JAR=	${DISTFILES}
 SUB_LIST=	INSTALL_JAR=${INSTALL_JAR}
 SUB_FILES=	antlr.sh

Modified: head/devel/antlr3/files/antlr.sh.in
==============================================================================
--- head/devel/antlr3/files/antlr.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/antlr3/files/antlr.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/%%INSTALL_JAR%%" org.antlr.Tool "$@"
+"%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/%%INSTALL_JAR%%" org.antlr.Tool "$@"

Modified: head/devel/apache-commons-configuration/Makefile
==============================================================================
--- head/devel/apache-commons-configuration/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/apache-commons-configuration/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -22,7 +22,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 OPTIONS_DEFINE=	DOCS
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PORTDOCS=	*

Modified: head/devel/apache-commons-daemon/Makefile
==============================================================================
--- head/devel/apache-commons-daemon/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/apache-commons-daemon/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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}

Modified: head/devel/apache-commons-io/Makefile
==============================================================================
--- head/devel/apache-commons-io/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/apache-commons-io/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/devel/apache-commons-jxpath/Makefile
==============================================================================
--- head/devel/apache-commons-jxpath/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/apache-commons-jxpath/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -14,7 +14,6 @@ MAINTAINER=	ports at 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

Modified: head/devel/apache-commons-modeler/Makefile
==============================================================================
--- head/devel/apache-commons-modeler/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/apache-commons-modeler/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -13,7 +13,6 @@ COMMENT=	Mechanisms to create Model MBeans compatible 
 LICENSE=	APACHE20
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar

Modified: head/devel/argouml/Makefile
==============================================================================
--- head/devel/argouml/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/argouml/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,7 +3,7 @@
 
 PORTNAME=	argouml
 PORTVERSION=	0.34
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	http://argouml-downloads.tigris.org/nonav/argouml-${PORTVERSION}/
 DISTNAME=	ArgoUML-${PORTVERSION}
@@ -24,10 +24,8 @@ PORTSCOUT=	limitw:1,even \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	argouml.sh
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
 PORTDOCS=	manual-${PORTVERSION}.pdf quickguide-${PORTVERSION}.pdf
 
 OPTIONS_DEFINE=	DOCS

Modified: head/devel/argouml/files/argouml.sh.in
==============================================================================
--- head/devel/argouml/files/argouml.sh.in	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/argouml/files/argouml.sh.in	Tue Nov 26 21:46:12 2019	(r518482)
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%"  "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"

Modified: head/devel/astah-community/Makefile
==============================================================================
--- head/devel/astah-community/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/astah-community/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -21,7 +21,6 @@ RESTRICTED=	License restrictions -- See http://astah.n
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 REVISION=	b4c6e9
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX:S!-!_!}

Modified: head/devel/avalon-framework/Makefile
==============================================================================
--- head/devel/avalon-framework/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/avalon-framework/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -11,7 +11,6 @@ MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Apache Avalon core framework for component programming
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}

Modified: head/devel/charva/Makefile
==============================================================================
--- head/devel/charva/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/charva/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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
 

Modified: head/devel/doctorj/Makefile
==============================================================================
--- head/devel/doctorj/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/doctorj/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -11,7 +11,6 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Tool for analyzing Java code and documentation
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 ALL_TARGET=	jarfile

Modified: head/devel/flex-sdk/Makefile
==============================================================================
--- head/devel/flex-sdk/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/flex-sdk/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/devel/flex-sdk35/Makefile
==============================================================================
--- head/devel/flex-sdk35/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/flex-sdk35/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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}

Modified: head/devel/flexjson/Makefile
==============================================================================
--- head/devel/flexjson/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/flexjson/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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
 

Modified: head/devel/gitblit/Makefile
==============================================================================
--- head/devel/gitblit/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/gitblit/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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} \

Modified: head/devel/gogland-eap/Makefile
==============================================================================
--- head/devel/gogland-eap/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/gogland-eap/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -21,7 +21,6 @@ RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnot
 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

Modified: head/devel/gradle4/Makefile
==============================================================================
--- head/devel/gradle4/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/gradle4/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -15,7 +15,6 @@ LICENSE=	APACHE20
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 NO_ARCH=	yes

Modified: head/devel/hadoop/Makefile
==============================================================================
--- head/devel/hadoop/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/hadoop/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/devel/hadoop2/Makefile
==============================================================================
--- head/devel/hadoop2/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/hadoop2/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/devel/hive/Makefile
==============================================================================
--- head/devel/hive/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/hive/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/devel/ireport/Makefile
==============================================================================
--- head/devel/ireport/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/ireport/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ireport
 PORTVERSION=	3.7.6
+PORTREVISION=	1
 CATEGORIES=	devel databases java
 MASTER_SITES=	SF/${PORTNAME}/iReport/iReport-${PORTVERSION}
 DISTNAME=	iReport-${PORTVERSION}
@@ -12,7 +13,6 @@ COMMENT=	A visual report builder/designer for JasperRe
 
 USES=		dos2unix
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 DOS2UNIX_GLOB=	*.txt
 NO_BUILD=	yes
 
@@ -75,7 +75,7 @@ pre-configure:
 		s|zip |zip|g; s|jar |jar|g' \
 		-e 's|%%JAVA_HOME%%|${JAVA_HOME}|; \
 		s|%%DATADIR%%|${DATADIR}|g; \
-		s|^java |JAVA_VERSION="${JAVA_VERSION}" ${LOCALBASE}/bin/java |' \
+		s|^java |${LOCALBASE}/bin/java |' \
 		${WRKSRC}/bin/startup.sh
 	${REINPLACE_CMD} -e 's|/bin/grep|/usr/bin/grep|' \
 		${WRKSRC}/platform9/lib/nbexec

Modified: head/devel/itext/Makefile
==============================================================================
--- head/devel/itext/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/itext/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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

Modified: head/devel/java-findbugs/Makefile
==============================================================================
--- head/devel/java-findbugs/Makefile	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/java-findbugs/Makefile	Tue Nov 26 21:46:12 2019	(r518482)
@@ -3,6 +3,7 @@
 
 PORTNAME=	findbugs
 PORTVERSION=	1.3.9
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	java-

Modified: head/devel/java-findbugs/files/patch-findbugs2
==============================================================================
--- head/devel/java-findbugs/files/patch-findbugs2	Tue Nov 26 21:44:42 2019	(r518481)
+++ head/devel/java-findbugs/files/patch-findbugs2	Tue Nov 26 21:46:12 2019	(r518482)
@@ -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/.."

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list