--- Mk/bsd.java.mk (revision 518044) +++ 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 --- archivers/javatar/Makefile (revision 518044) +++ 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 --- archivers/jzlib/Makefile (revision 518044) +++ 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 --- archivers/snappy-java/Makefile (revision 518044) +++ 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} --- astro/gpsprune/Makefile (revision 518044) +++ astro/gpsprune/Makefile (working copy) @@ -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} --- astro/gpsprune/files/gpsprune.sh.in (revision 518044) +++ astro/gpsprune/files/gpsprune.sh.in (working copy) @@ -4,6 +4,5 @@ JAVA="%%LOCALBASE%%/bin/java" JARPATH="%%JAVALIBDIR%%" -export JAVA_VERSION="%%JAVA_VERSION%%" exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@" --- astro/osmosis/Makefile (revision 518044) +++ 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 --- audio/atunes/Makefile (revision 518044) +++ audio/atunes/Makefile (working copy) @@ -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} --- audio/atunes/files/atunes.in (revision 518044) +++ audio/atunes/files/atunes.in (working copy) @@ -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 \ --- audio/gervill/Makefile (revision 518044) +++ 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 --- audio/jid3lib/Makefile (revision 518044) +++ 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 --- audio/musiccontrol/Makefile (revision 518044) +++ 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 --- audio/tuxguitar/Makefile (revision 518044) +++ 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 --- benchmarks/linux-vdbench/Makefile (revision 518044) +++ 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} --- benchmarks/scimark2/Makefile (revision 518044) +++ 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 --- biology/artemis/Makefile (revision 518044) +++ 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 --- biology/cytoscape/Makefile (revision 518044) +++ 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 \ --- biology/jalview/Makefile (revision 518044) +++ biology/jalview/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jalview PORTVERSION= 2.07 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology java MASTER_SITES= http://www.jalview.org/source/ DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/} @@ -12,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Viewer and editor for multiple sequence alignments USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= makejars WRKSRC= ${WRKDIR}/${PORTNAME} --- biology/jalview/files/jalview.sh.in (revision 518044) +++ biology/jalview/files/jalview.sh.in (working copy) @@ -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 --- biology/trimmomatic/Makefile (revision 518044) +++ 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 --- cad/electric-ng/Makefile (revision 518044) +++ cad/electric-ng/Makefile (working copy) @@ -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}" --- cad/electric-ng/files/electric-ng.in (revision 518044) +++ cad/electric-ng/files/electric-ng.in (working copy) @@ -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'` --- cad/fidocadj/Makefile (revision 518044) +++ cad/fidocadj/Makefile (working copy) @@ -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 --- cad/fidocadj/files/fidocadj.sh.in (revision 518044) +++ cad/fidocadj/files/fidocadj.sh.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@" +"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@" --- cad/impact/Makefile (revision 518044) +++ cad/impact/Makefile (working copy) @@ -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 --- cad/impact/files/impact.in (revision 518044) +++ cad/impact/files/impact.in (working copy) @@ -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 - --- cad/impact/files/impactgui.in (revision 518044) +++ cad/impact/files/impactgui.in (working copy) @@ -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 - --- cad/logisim/Makefile (revision 518044) +++ 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} --- cad/sweethome3d/Makefile (revision 518044) +++ cad/sweethome3d/Makefile (working copy) @@ -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 --- cad/sweethome3d/files/sweethome3d.sh.in (revision 518044) +++ cad/sweethome3d/files/sweethome3d.sh.in (working copy) @@ -4,6 +4,5 @@ JAVA="%%LOCALBASE%%/bin/java" JARPATH="%%JAVALIBDIR%%" -export JAVA_VERSION="%%JAVA_VERSION%%" exec "${JAVA}" -Xmx1024m -jar "${JARPATH}/%%JARNAME%%" "$@" --- comms/rxtx/Makefile (revision 518044) +++ 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} --- comms/yaac/Makefile (revision 518044) +++ comms/yaac/Makefile (working copy) @@ -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 --- comms/yaac/files/yaac.sh.in (revision 518044) +++ comms/yaac/files/yaac.sh.in (working copy) @@ -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" "$@" --- databases/apache-commons-dbutils/Makefile (revision 518044) +++ 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 --- databases/c3p0/Makefile (revision 518044) +++ 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 --- databases/db6/Makefile (revision 518044) +++ 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}" --- databases/frontbase-jdbc/Makefile (revision 518044) +++ 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 --- databases/hbase/Makefile (revision 518044) +++ 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 --- databases/hsqldb/Makefile (revision 518044) +++ 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} --- databases/isql-viewer/Makefile (revision 518044) +++ databases/isql-viewer/Makefile (working copy) @@ -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/j ${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}/,}:${JYTH 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: --- databases/isql-viewer/files/iSQL-Viewer.sh (revision 518044) +++ databases/isql-viewer/files/iSQL-Viewer.sh (working copy) @@ -1,5 +1,3 @@ #!/bin/sh -JAVA_VERSION=%%JAVA_VERSION%% \ - java -classpath %%CLASSPATH%% \ - org.isqlviewer.core.Launcher +java -classpath %%CLASSPATH%% org.isqlviewer.core.Launcher --- databases/jasperreports/Makefile (revision 518044) +++ 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 --- databases/jrobin/Makefile (revision 518044) +++ 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 --- databases/jrrd/Makefile (revision 518044) +++ 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 --- databases/libgda5/Makefile (revision 518044) +++ 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 --- databases/postgis-jdbc/Makefile (revision 518044) +++ 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 --- databases/powerarchitect/Makefile (revision 518044) +++ databases/powerarchitect/Makefile (working copy) @@ -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= * --- databases/powerarchitect/files/powerarchitect.in (revision 518044) +++ databases/powerarchitect/files/powerarchitect.in (working copy) @@ -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 --- databases/puppetdb5/Makefile (revision 518044) +++ 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 --- databases/puppetdb6/Makefile (revision 518044) +++ 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 --- deskutils/docear/Makefile (revision 518044) +++ 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 --- deskutils/freemind/Makefile (revision 518044) +++ deskutils/freemind/Makefile (working copy) @@ -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 --- deskutils/freemind/files/freemind.sh.in (revision 518044) +++ deskutils/freemind/files/freemind.sh.in (working copy) @@ -6,4 +6,4 @@ CLASSPATH="${ADD_JARS}:${CLASSPATH}:`find "%%DATAD FILE="lib/freemind.jar" cd "%%DATADIR%%" -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "${CLASSPATH}" -jar "${FILE}" +"%%LOCALBASE%%/bin/java" -cp "${CLASSPATH}" -jar "${FILE}" --- deskutils/freeplane/Makefile (revision 518044) +++ 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}" --- deskutils/ganttproject/Makefile (revision 518044) +++ 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 --- deskutils/projectlibre/Makefile (revision 518044) +++ deskutils/projectlibre/Makefile (working copy) @@ -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 Micros LICENSE= CPAL-1.0 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes NO_BUILD= yes --- deskutils/projectlibre/files/projectlibre.sh.in (revision 518044) +++ deskutils/projectlibre/files/projectlibre.sh.in (working copy) @@ -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 --- deskutils/thinkingrock/Makefile (revision 518044) +++ 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 --- devel/antlr/Makefile (revision 518044) +++ devel/antlr/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= antlr PORTVERSION= 2.7.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= http://www.antlr2.org/download/ --- devel/antlr/files/antlr.sh.in (revision 518044) +++ devel/antlr/files/antlr.sh.in (working copy) @@ -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 "$@" --- devel/antlr3/Makefile (revision 518044) +++ devel/antlr3/Makefile (working copy) @@ -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 --- devel/antlr3/files/antlr.sh.in (revision 518044) +++ devel/antlr3/files/antlr.sh.in (working copy) @@ -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 "$@" --- devel/apache-commons-configuration/Makefile (revision 518044) +++ 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= * --- devel/apache-commons-daemon/Makefile (revision 518044) +++ 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} --- devel/apache-commons-io/Makefile (revision 518044) +++ 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 --- devel/apache-commons-jxpath/Makefile (revision 518044) +++ 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 --- devel/apache-commons-modeler/Makefile (revision 518044) +++ 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 --- devel/argouml/Makefile (revision 518044) +++ devel/argouml/Makefile (working copy) @@ -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 --- devel/argouml/files/argouml.sh.in (revision 518044) +++ devel/argouml/files/argouml.sh.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@" +"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@" --- devel/astah-community/Makefile (revision 518044) +++ 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!-!_!} --- devel/avalon-framework/Makefile (revision 518044) +++ 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} --- devel/charva/Makefile (revision 518044) +++ 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 --- devel/doctorj/Makefile (revision 518044) +++ 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 --- devel/flex-sdk/Makefile (revision 518044) +++ 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 --- devel/flex-sdk35/Makefile (revision 518044) +++ 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} --- devel/flexjson/Makefile (revision 518044) +++ 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 --- devel/gitblit/Makefile (revision 518044) +++ 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} \ --- devel/gogland-eap/Makefile (revision 518044) +++ 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 --- devel/gradle4/Makefile (revision 518044) +++ 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 --- devel/hadoop/Makefile (revision 518044) +++ 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 --- devel/hadoop2/Makefile (revision 518044) +++ 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 --- devel/hive/Makefile (revision 518044) +++ 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 --- devel/ireport/Makefile (revision 518044) +++ devel/ireport/Makefile (working copy) @@ -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 Jasp 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 --- devel/itext/Makefile (revision 518044) +++ 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 --- devel/java-findbugs/Makefile (revision 518044) +++ 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- --- devel/java-findbugs/files/patch-findbugs2 (revision 518044) +++ 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 \ --- devel/jcmdline/Makefile (revision 518044) +++ 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 --- devel/jiic/Makefile (revision 518044) +++ 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 --- devel/jsap/Makefile (revision 518044) +++ 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 --- devel/leiningen/Makefile (revision 518044) +++ 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 --- devel/libvirt-java/Makefile (revision 518044) +++ 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 --- devel/looks/Makefile (revision 518044) +++ 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} --- devel/maven/Makefile (revision 518044) +++ devel/maven/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= maven DISTVERSION= 3.6.1 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= APACHE/maven/maven-3/${DISTVERSION}/binaries DISTNAME= apache-maven-${DISTVERSION}-bin @@ -19,7 +20,6 @@ USE_JAVA= yes CPE_PRODUCT= maven CPE_VENDOR= apache -JAVA_VERSION= 1.7+ NO_BUILD= yes NO_ARCH= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- devel/maven/files/mvn.sh.in (revision 518044) +++ devel/maven/files/mvn.sh.in (working copy) @@ -38,7 +38,7 @@ concat_lines() MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ +exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ -classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ "-Dmaven.home=${M2_HOME}" \ --- devel/maven3/Makefile (revision 518044) +++ devel/maven3/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= maven3 DISTVERSION= 3.0.5 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= APACHE/maven/binaries DISTNAME= apache-maven-${DISTVERSION}-bin @@ -19,7 +20,6 @@ CPE_PRODUCT= maven CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} --- devel/maven3/files/mvn.sh.in (revision 518044) +++ devel/maven3/files/mvn.sh.in (working copy) @@ -12,7 +12,7 @@ fi M2_HOME=${M2_HOME:-"%%DATADIR%%"} -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ +exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ -classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ "-Dmaven.home=${M2_HOME}" org.codehaus.classworlds.Launcher "$@" --- devel/maven31/Makefile (revision 518044) +++ devel/maven31/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= maven31 DISTVERSION= 3.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= APACHE/maven/binaries DISTNAME= apache-maven-${DISTVERSION}-bin @@ -20,7 +20,6 @@ CPE_PRODUCT= maven CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} --- devel/maven31/files/mvn.sh.in (revision 518044) +++ devel/maven31/files/mvn.sh.in (working copy) @@ -12,7 +12,7 @@ fi M2_HOME=${M2_HOME:-"%%DATADIR%%"} -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ +exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ -classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ "-Dmaven.home=${M2_HOME}" org.codehaus.classworlds.Launcher "$@" --- devel/maven33/Makefile (revision 518044) +++ devel/maven33/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= maven33 DISTVERSION= 3.3.9 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= APACHE/maven/maven-3/${DISTVERSION}/binaries DISTNAME= apache-maven-${DISTVERSION}-bin @@ -18,7 +19,6 @@ CPE_PRODUCT= maven CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} --- devel/maven33/files/mvn.sh.in (revision 518044) +++ devel/maven33/files/mvn.sh.in (working copy) @@ -37,7 +37,7 @@ concat_lines() { MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ +exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ -classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ "-Dmaven.home=${M2_HOME}" \ --- devel/netscape-java40/Makefile (revision 518044) +++ 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 --- devel/ocaml-camljava/Makefile (revision 518044) +++ 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" \ --- devel/oozie/Makefile (revision 518044) +++ 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 --- devel/p5-Inline-Java/Makefile (revision 518044) +++ 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 --- devel/p5-Java/Makefile (revision 518044) +++ 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 --- devel/pig/Makefile (revision 518044) +++ 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}" --- devel/pmd/Makefile (revision 518044) +++ 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} --- devel/py-jcc/Makefile (revision 518044) +++ 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' --- devel/py-jep/Makefile (revision 518044) +++ 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} --- devel/pycharm-ce/Makefile (revision 518044) +++ 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 --- devel/sabre/Makefile (revision 518044) +++ 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 --- devel/simian/Makefile (revision 518044) +++ 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 --- devel/smc/Makefile (revision 518044) +++ 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= * --- devel/soapui/Makefile (revision 518044) +++ 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} --- devel/sonar-ant-task/Makefile (revision 518044) +++ 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 --- devel/sonar-scanner-cli/Makefile (revision 518044) +++ 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 --- devel/sonarqube/Makefile (revision 518044) +++ 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} --- devel/spark/Makefile (revision 518044) +++ 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 --- devel/statcvs/Makefile (revision 518044) +++ 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} --- devel/statsvn/Makefile (revision 518044) +++ 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 --- devel/swank-clojure/Makefile (revision 518044) +++ 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 --- devel/tijmp/Makefile (revision 518044) +++ 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 --- devel/tinylaf/Makefile (revision 518044) +++ 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 --- devel/violet/Makefile (revision 518044) +++ 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 --- dns/crossip/Makefile (revision 518044) +++ dns/crossip/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= crossip DISTVERSION= 1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= dns java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CrossIP%20${PORTVERSION} @@ -14,7 +14,6 @@ LICENSE= GPLv2 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes --- dns/crossip/files/crossip.sh.in (revision 518044) +++ dns/crossip/files/crossip.sh.in (working copy) @@ -2,5 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" \ - exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/CrossIP.jar" "${@}" +exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/CrossIP.jar" "${@}" --- dns/dnsjava/Makefile (revision 518044) +++ 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 --- editors/drjava/Makefile (revision 518044) +++ editors/drjava/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= drjava DISTVERSION= 20140826-r5761 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= editors java MASTER_SITES= SF/${PORTNAME}/1.%20DrJava%20Stable%20Releases/${PORTNAME}-stable-${DISTVERSION} DISTNAME= ${PORTNAME}-stable-${PORTVERSION:S|.|-|g} @@ -15,7 +15,6 @@ COMMENT= Lightweight IDE for writing Java programs NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= ${PORTNAME} SUB_LIST= DRJAVAJAR=${DRJAVAJAR} --- editors/drjava/files/drjava.in (revision 518044) +++ editors/drjava/files/drjava.in (working copy) @@ -1,4 +1,3 @@ #!/bin/sh # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" \ exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/%%DRJAVAJAR%% "$@" --- editors/jedit/Makefile (revision 518044) +++ editors/jedit/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= jedit PORTVERSION= 5.5.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= editors java MASTER_SITES= SF @@ -23,7 +24,6 @@ OPTIONS_SUB= yes USES= cpe xorg USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_XORG= x11 NO_BUILD= yes --- editors/jedit/files/jedit.sh.in (revision 518044) +++ editors/jedit/files/jedit.sh.in (working copy) @@ -4,4 +4,4 @@ # Java heap size, in megabytes JAVA_HEAP_SIZE=32 -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@" +"%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@" --- editors/omegaT/Makefile (revision 518044) +++ editors/omegaT/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= omegaT DISTVERSION= 3.6.0 +PORTREVISION= 1 CATEGORIES= editors java x11 MASTER_SITES= SF/${PORTNAME:tl}/OmegaT%20-%20Standard/OmegaT%20${DISTVERSION}%20update%204/ DISTNAME= OmegaT_${DISTVERSION}_04_Source @@ -24,7 +25,6 @@ kaptain_CMD= ${LOCALBASE}/bin/kaptain USE_ANT= yes USE_JAVA= yes JAVA_VENDOR= openjdk -JAVA_VERSION= 1.7+ JAVA_BUILD= yes JAVA_RUN= yes NO_WRKSUBDIR= yes --- editors/omegaT/files/omegaT.sh.in (revision 518044) +++ editors/omegaT/files/omegaT.sh.in (working copy) @@ -9,4 +9,4 @@ if [ ! -f ${HOME}/.omegat/omegat.prefs ] ; then cp "%%DATADIR%%/omegat.prefs" ${HOME}/.omegat && chmod 644 ${HOME}/.omegat/omegat.prefs fi -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/OmegaT.jar" "$@" +"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/OmegaT.jar" "$@" --- editors/openoffice-4/Makefile (revision 518044) +++ 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 --- editors/openoffice-devel/Makefile (revision 518044) +++ 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 --- editors/treeform/Makefile (revision 518044) +++ 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 --- emulators/javatari/Makefile (revision 518044) +++ emulators/javatari/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= javatari PORTVERSION= 4.1 +PORTREVISION= 1 CATEGORIES= emulators java MASTER_SITES= http://javatari.org/java/files/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//} @@ -19,7 +20,6 @@ LICENSE= AGPLv3 EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \ bin/javatari --- emulators/javatari/files/javatari.in (revision 518044) +++ emulators/javatari/files/javatari.in (working copy) @@ -3,6 +3,5 @@ set JAVA = "%%LOCALBASE%%/bin/java" set JARPATH = "%%JAVALIBDIR%%" -setenv JAVA_VERSION "%%JAVA_VERSION%%" exec "${JAVA}" -jar %%JAVAJARDIR%%/%%JARFILE%% --- finance/jgnash/Makefile (revision 518044) +++ 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 --- finance/venice/Makefile (revision 518044) +++ finance/venice/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= venice DISTVERSION= 0.751beta +PORTREVISION= 1 CATEGORIES= finance java MASTER_SITES= SF/mov/${PORTNAME}/0.751%20beta/ \ SF/nemysisfreebsdp/:icons @@ -17,7 +18,6 @@ LICENSE= GPLv2 USES= gnome USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PORTDOCS= * --- finance/venice/files/venice.in (revision 518044) +++ finance/venice/files/venice.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/venice.jar" "${@}" --- ftp/jftp/Makefile (revision 518044) +++ 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 --- games/blackjackclient/Makefile (revision 518044) +++ games/blackjackclient/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= BlackjackClient PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= games java MASTER_SITES= SF/t-blackjack/ DISTNAME= t-blackjack-beta @@ -14,7 +15,6 @@ LICENSE= GPLv2 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.7+ PLIST_FILES= bin/${PORTNAME} \ ${JAVAJARDIR}/${PORTNAME}.jar SUB_FILES= ${PORTNAME}.sh --- games/blackjackclient/files/BlackjackClient.sh.in (revision 518044) +++ games/blackjackclient/files/BlackjackClient.sh.in (working copy) @@ -1,3 +1,3 @@ #!/bin/sh -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/BlackjackClient.jar" +"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/BlackjackClient.jar" --- games/castlevox/Makefile (revision 518044) +++ games/castlevox/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= CastleVox PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games java MASTER_SITES= http://sillysoft.net/download/ DISTNAME= ${PORTNAME}-linux @@ -14,7 +14,6 @@ COMMENT= Fast world domination game BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes --- games/castlevox/files/CastleVox.in (revision 518044) +++ games/castlevox/files/CastleVox.in (working copy) @@ -2,7 +2,5 @@ # # $FreeBSD$ -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/VoxCore.jar" "${@}" --- games/dmjava/Makefile (revision 518044) +++ 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: --- games/domination/Makefile (revision 518044) +++ games/domination/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= domination PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= games java MASTER_SITES= SF/${PORTNAME}/${PORTNAME:S/d/D/}/${PORTVERSION}/:game \ http://domination.sourceforge.net/maps/ @@ -19,7 +20,6 @@ LICENSE= GPLv3 USES= dos2unix zip:infozip DOS2UNIX_GLOB= *.txt *.ini *.htm *.cards *.map USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME:S/d/D/} --- games/domination/files/domination-FlashGUI.in (revision 518044) +++ games/domination/files/domination-FlashGUI.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -cp Domination.jar net.yura.domination.ui.flashgui.MainMenu "${@}" --- games/domination/files/domination-Increment1GUI.in (revision 518044) +++ games/domination/files/domination-Increment1GUI.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -cp Domination.jar net.yura.domination.ui.increment1gui.Increment1Frame "${@}" --- games/domination/files/domination-SimpleGUI.in (revision 518044) +++ games/domination/files/domination-SimpleGUI.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -cp Domination.jar net.yura.domination.ui.simplegui.RiskGUI "${@}" --- games/domination/files/domination-SwingGUI.in (revision 518044) +++ games/domination/files/domination-SwingGUI.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -cp Domination.jar net.yura.domination.ui.swinggui.SwingGUIFrame "${@}" --- games/freecol/Makefile (revision 518044) +++ 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 --- games/java-games-suite/Makefile (revision 518044) +++ games/java-games-suite/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= java-games-suite PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= games java MASTER_SITES= SF/javagamessuite @@ -13,7 +14,6 @@ USE_JAVA= yes NO_ARCH= yes -JAVA_VERSION= 1.6+ PLIST_FILES= bin/java-games-suite \ ${JAVAJARDIR}/MM.jar \ ${JAVAJARDIR}/reversi.jar \ --- games/java-games-suite/files/java-games-suite.sh.in (revision 518044) +++ games/java-games-suite/files/java-games-suite.sh.in (working copy) @@ -2,22 +2,22 @@ case "$1" in mastermind) - JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/MM.jar" + "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/MM.jar" ;; reversi) - JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/reversi.jar" + "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/reversi.jar" ;; mine) - JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Mine.jar" + "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Mine.jar" ;; tetris) - JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Tetris.jar" + "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Tetris.jar" ;; rt) - JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/RT.jar" + "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/RT.jar" ;; number) - JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Number.jar" + "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Number.jar" ;; *) echo $"Usage: $0 {mastermind|reversi|mine|tetris|rt|number}" --- games/jchessboard/Makefile (revision 518044) +++ games/jchessboard/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jchessboard PORTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games java MASTER_SITES= SF DISTNAME= JChessBoard-${PORTVERSION} @@ -16,7 +16,6 @@ LICENSE= GPLv2 USES= tar:tgz USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_LOCALE= en_US.ISO8859-1 NO_ARCH= yes --- games/jchessboard/files/jchessboard.in (revision 518044) +++ games/jchessboard/files/jchessboard.in (working copy) @@ -1,3 +1,3 @@ #!/bin/sh -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVASHAREDIR%%/%%PORTNAME%%/%%JARFILE%%" +"%%LOCALBASE%%/bin/java" -jar "%%JAVASHAREDIR%%/%%PORTNAME%%/%%JARFILE%%" --- games/jin/Makefile (revision 518044) +++ games/jin/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jin PORTVERSION= 2.14.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -25,8 +25,7 @@ USE_ANT= yes MAKE_ARGS+= -lib ${JAVAJARDIR}/bsh.jar SUB_FILES= ${PORTNAME} -SUB_LIST= JINJAR=${JINJAR:Q} \ - JAVA_VERSION=${JAVA_PORT_VERSION:R:C/^([^1])/1.\1/} +SUB_LIST= JINJAR=${JINJAR:Q} DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- games/jin/files/jin.in (revision 518044) +++ games/jin/files/jin.in (working copy) @@ -1,5 +1,4 @@ #!/bin/sh # $FreeBSD$ cd %%DATADIR%% -export JAVA_VERSION="%%JAVA_VERSION%%+" exec "%%LOCALBASE%%/bin/java" -cp %%JAVAJARDIR%%/bsh.jar:%%JINJAR%% free.jin.JinApplication "$@" --- games/jinput/Makefile (revision 518044) +++ 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 --- games/jtans/Makefile (revision 518044) +++ games/jtans/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jtans PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games java MASTER_SITES= SF DISTNAME= ${PORTNAME}_appli-${PORTVERSION} @@ -19,7 +19,6 @@ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes SUB_FILES= jtans.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- games/jtans/files/jtans.sh.in (revision 518044) +++ games/jtans/files/jtans.sh.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar" +"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar" --- games/jutils/Makefile (revision 518044) +++ 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} --- games/lwjgl/Makefile (revision 518044) +++ 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 --- games/moagg/Makefile (revision 518044) +++ 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 --- games/pcgen/Makefile (revision 518044) +++ games/pcgen/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= pcgen PORTVERSION= 6.06.01 +PORTREVISION= 1 CATEGORIES= games java MASTER_SITES= https://github.com/PCGen/${PORTNAME}/releases/download/${PORTVERSION}/ DISTNAME= pcgen-${PORTVERSION}-full @@ -14,7 +15,6 @@ LICENSE= LGPL21 USES= zip WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_BUILD= yes NO_ARCH= yes --- games/pcgen/files/pcgen.sh.in (revision 518044) +++ games/pcgen/files/pcgen.sh.in (working copy) @@ -4,4 +4,4 @@ [ \! -d "${HOME}/.pcgen" ] && mkdir "${HOME}/.pcgen" cd "%%DATADIR%%" -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" ${PCGEN_OPTS} -jar ./pcgen.jar "$@" +exec "%%LOCALBASE%%/bin/java" ${PCGEN_OPTS} -jar ./pcgen.jar "$@" --- games/rescue/Makefile (revision 518044) +++ games/rescue/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= rescue PORTVERSION= 1.0.0.3 +PORTREVISION= 1 CATEGORIES= games java MASTER_SITES= SF/${PORTNAME}/${PORTNAME:S/r/R/}%21%20Max/${PORTVERSION}/ DISTNAME= ${PORTNAME:S/r/R/}_${PORTVERSION} @@ -17,7 +18,6 @@ LICENSE_FILE= ${WRKSRC}/gpl.txt USES= dos2unix zip:infozip DOS2UNIX_GLOB= *.txt *.htm *.css *.ini *.xml USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME:S/r/R/} --- games/rescue/files/rescue.in (revision 518044) +++ games/rescue/files/rescue.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -jar "%%DATADIR%%/Rescue.jar" "${@}" --- games/robocode/Makefile (revision 518044) +++ games/robocode/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= robocode PORTVERSION= 1.9.3.7 +PORTREVISION= 1 CATEGORIES= games java MASTER_SITES= SF DISTNAME= ${PORTNAME}-${DISTVERSION}-setup.jar @@ -18,7 +19,6 @@ LICENSE_FILE= ${WRKSRC}/license/epl-v10.html USES= dos2unix zip:infozip DOS2UNIX_GLOB= *.css *.team *.properties package-list MANIFEST.MF USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_EXTRACT= yes JAVA_RUN= yes NO_WRKSUBDIR= yes --- games/robocode/files/robocode-MeleeRumble.in (revision 518044) +++ games/robocode/files/robocode-MeleeRumble.in (working copy) @@ -3,8 +3,6 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx1024M \ -cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \ roborumble.RoboRumbleAtHome ./roborumble/meleerumble.txt "${@}" --- games/robocode/files/robocode-RoboRumble.in (revision 518044) +++ games/robocode/files/robocode-RoboRumble.in (working copy) @@ -3,8 +3,6 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \ -cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \ roborumble.RoboRumbleAtHome ./roborumble/roborumble.txt "${@}" --- games/robocode/files/robocode-Robocode.in (revision 518044) +++ games/robocode/files/robocode-Robocode.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \ -cp "libs/robocode.jar" robocode.Robocode "${@}" --- games/robocode/files/robocode-TeamRumble.in (revision 518044) +++ games/robocode/files/robocode-TeamRumble.in (working copy) @@ -3,8 +3,6 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \ -cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \ roborumble.RoboRumbleAtHome ./roborumble/roborumble.txt "${@}" --- games/robocode/files/robocode-TwinDuel.in (revision 518044) +++ games/robocode/files/robocode-TwinDuel.in (working copy) @@ -3,8 +3,6 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \ -cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \ roborumble.RoboRumbleAtHome ./roborumble/twinduel.txt "${@}" --- games/robocode-naval/Makefile (revision 518044) +++ games/robocode-naval/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= robocode PORTVERSION= 0.9.2 +PORTREVISION= 1 DISTVERSIONSUFFIX= -setup CATEGORIES= games java MASTER_SITES= SF/${PORTNAME}/naval-robocode/${PORTVERSION} @@ -19,7 +20,6 @@ PORTSCOUT= limit:^\d+\.\d+\.\d+$$ USES= dos2unix zip DOS2UNIX_GLOB= *.css *.team *.properties package-list MANIFEST.MF USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_EXTRACT= yes JAVA_RUN= yes NO_WRKSUBDIR= yes --- games/robocode-naval/files/robocode-NavalRobocode.in (revision 518044) +++ games/robocode-naval/files/robocode-NavalRobocode.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \ -cp "libs/robocode.jar" robocode.NavalRobocode "${@}" --- games/spicetrade/Makefile (revision 518044) +++ games/spicetrade/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= spicetrade PORTVERSION= 1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Spice%20Trade%20v${PORTVERSION} DISTNAME= Spicetrade-${PORTVERSION} @@ -14,7 +14,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Colourful 14th century Arab spice trading game USE_JAVA= yes -JAVA_VERSION= 1.6+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} NO_BUILD= yes NO_ARCH= yes --- games/spicetrade/files/spicetrade.in (revision 518044) +++ games/spicetrade/files/spicetrade.in (working copy) @@ -2,5 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" \ - exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@" +exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@" --- games/stendhal/Makefile (revision 518044) +++ 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 --- graphics/aoi/Makefile (revision 518044) +++ graphics/aoi/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= aoi PORTVERSION= 3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics java MASTER_SITES= SF/${PORTNAME}/ArtOfIllusion/${PORTVERSION} \ SF/${PORTNAME}/ArtOfIllusion-manual/${PORTVERSION}:docs @@ -21,7 +21,6 @@ LIB_DEPENDS= libjogl.so:graphics/jogl USES= zip DOS2UNIX_FILES= ../AoI_Manual/*.html # USES=dos2unix is optional USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g} --- graphics/aoi/files/aoi.in (revision 518044) +++ graphics/aoi/files/aoi.in (working copy) @@ -2,7 +2,5 @@ # # $FreeBSD$ -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -jar "%%DATADIR%%/ArtOfIllusion.jar" "${@}" --- graphics/barbecue/Makefile (revision 518044) +++ 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 --- graphics/batik/Makefile (revision 518044) +++ 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 --- graphics/cbviewer/Makefile (revision 518044) +++ graphics/cbviewer/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= cbviewer PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CBViewer%200.8/ \ SF/nemysisfreebsdp/graphics/:icons @@ -23,7 +23,6 @@ RUN_DEPENDS= unrar:archivers/unrar USES= dos2unix zip DOS2UNIX_GLOB= CREDITS USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- graphics/cbviewer/files/cbviewer.in (revision 518044) +++ graphics/cbviewer/files/cbviewer.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -jar "%%DATADIR%%/CBViewer.jar" "${@}" --- graphics/cosmoplayer/Makefile (revision 518044) +++ 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 --- graphics/ditaa/Makefile (revision 518044) +++ 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 --- graphics/geoserver/Makefile (revision 518044) +++ 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} --- graphics/jalbum/Makefile (revision 518044) +++ 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 --- graphics/jave6/Makefile (revision 518044) +++ graphics/jave6/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jave6 PORTVERSION= 0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics java MASTER_SITES= http://www.jave.de/developer/\ http://ikaria.informatik.uni-rostock.de/public_bsd/FreeBSD/ @@ -16,11 +16,9 @@ EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes SUB_FILES= jave6 pkg-message -SUB_LIST= JAVA_VERSION=${JAVA_VERSION} DATADIR= ${JAVASHAREDIR}/${PORTNAME} do-install: --- graphics/jave6/files/jave6.in (revision 518044) +++ graphics/jave6/files/jave6.in (working copy) @@ -1,5 +1,3 @@ #!/bin/sh -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar jave.jar "${@}" --- graphics/jdraw/Makefile (revision 518044) +++ graphics/jdraw/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jdraw PORTVERSION= 1.1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} DISTNAME= ${PORTNAME}_v${PORTVERSION} @@ -22,7 +22,7 @@ PLASTIC3D_DESC= Use Plastic3DLook&Feel DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= ${PORTNAME} -SUB_LIST= JAVA_VERSION=${JAVA_VERSION} JDRAWJAR=${JDRAWJAR} PLASTIC3D=${PLASTIC3D} +SUB_LIST= JDRAWJAR=${JDRAWJAR} PLASTIC3D=${PLASTIC3D} JDRAWJAR= ${DATADIR}/${DISTFILES} @@ -37,6 +37,5 @@ do-install: PLASTIC3D= "-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\"" RUN_DEPENDS+= ${JAVALIBDIR}/looks.jar:devel/looks .endif -JAVA_VERSION= 1.6+ .include --- graphics/jdraw/files/jdraw.in (revision 518044) +++ graphics/jdraw/files/jdraw.in (working copy) @@ -1,10 +1,6 @@ #!/bin/sh # $FreeBSD$ -if [ -z "${JAVA_VERSION}" ]; then - JAVA_VERSION="%%JAVA_VERSION%%" -fi - LOOK_AND_FEEL="%%PLASTIC3D%%" exec "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%" ${LOOK_AND_FEEL} -jar "%%JDRAWJAR%%" "$@" --- graphics/jogl/Makefile (revision 518044) +++ 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 --- graphics/jpatch/Makefile (revision 518044) +++ graphics/jpatch/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jpatch DISTVERSION= 0.4p1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JPatch%200.4%20PREVIEW%201 DISTNAME= ${PORTNAME}0_4preview1 @@ -13,7 +13,6 @@ COMMENT= Spline based 3D modeling tool USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION} --- graphics/jpatch/files/jpatch.sh.in (revision 518044) +++ graphics/jpatch/files/jpatch.sh.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@" +"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@" --- graphics/libpano13/Makefile (revision 518044) +++ 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 --- graphics/lightzone/Makefile (revision 518044) +++ 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 --- graphics/mapyrus/Makefile (revision 518044) +++ graphics/mapyrus/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= mapyrus PORTVERSION= 1.801 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics print java MASTER_SITES= SF @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/userdoc/COPYING DATADIR= ${JAVASHAREDIR}/${PORTNAME} -JAVA_VERSION= 1.6+ - MAPYRUSDOCS= ${PORTNAME}.pdf MAPYRUSJAR= ${PORTNAME}.jar --- graphics/mapyrus/files/mapyrus.in (revision 518044) +++ graphics/mapyrus/files/mapyrus.in (working copy) @@ -9,5 +9,4 @@ if [ -z "$1" ]; then else MAPYRUS_ARGS="$@" fi -JAVA_VERSION="%%JAVA_VERSION%%" \ - exec "%%LOCALBASE%%/bin/java" ${JAVA_AWT_HEADLESS} -jar "%%DATADIR%%/mapyrus.jar" ${MAPYRUS_ARGS} +exec "%%LOCALBASE%%/bin/java" ${JAVA_AWT_HEADLESS} -jar "%%DATADIR%%/mapyrus.jar" ${MAPYRUS_ARGS} --- graphics/opendx/Makefile (revision 518044) +++ 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 \ --- graphics/tintfu/Makefile (revision 518044) +++ graphics/tintfu/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= tintfu PORTVERSION= 0.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g} @@ -18,7 +18,6 @@ EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}.jar \ bin/tintfu --- graphics/tintfu/files/tintfu.sh.in (revision 518044) +++ graphics/tintfu/files/tintfu.sh.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" +"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" --- graphics/xmlgraphics-commons/Makefile (revision 518044) +++ 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 --- java/apache-commons-cli/Makefile (revision 518044) +++ 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} --- java/apache-commons-lang/Makefile (revision 518044) +++ 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 --- java/apache-commons-lang3/Makefile (revision 518044) +++ 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 --- java/apache-commons-logging/Makefile (revision 518044) +++ 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 --- java/apache-commons-primitives/Makefile (revision 518044) +++ 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} --- java/aparapi/Makefile (revision 518044) +++ 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 --- java/avis/Makefile (revision 518044) +++ 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) --- java/berkeley-db/Makefile (revision 518044) +++ 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 --- java/bouncycastle/Makefile (revision 518044) +++ 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 --- java/bouncycastle15/Makefile (revision 518044) +++ 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 --- java/castor/Makefile (revision 518044) +++ 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 \ --- java/cryptix-jce/Makefile (revision 518044) +++ 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 --- java/dbvis/Makefile (revision 518044) +++ 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 --- java/eclipse-drjava/Makefile (revision 518044) +++ 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 --- java/eclipse-ecj/Makefile (revision 518044) +++ java/eclipse-ecj/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= ecj PORTVERSION= 4.4.2 +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= http://download.eclipse.org/eclipse/downloads/drops4/R-${PORTVERSION}-${DROPDATE}/ PKGNAMEPREFIX= eclipse- @@ -20,7 +21,6 @@ EXTRACT_AFTER_ARGS= -C ${WRKSRC} USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= ecj.sh SUB_LIST= PORTVERSION=${PORTVERSION} NO_WRKSUBDIR= yes --- java/eclipse-ecj/files/ecj.sh.in (revision 518044) +++ java/eclipse-ecj/files/ecj.sh.in (working copy) @@ -1,3 +1,3 @@ #!/bin/sh -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/ecj-%%PORTVERSION%%.jar" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}" +"%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/ecj-%%PORTVERSION%%.jar" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}" --- java/eclipse-findbugs/Makefile (revision 518044) +++ 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= \ --- java/eclipse-shelled/Makefile (revision 518044) +++ 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: --- java/infobus/Makefile (revision 518044) +++ 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 --- java/jai/Makefile (revision 518044) +++ 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 --- java/jakarta-bcel/Makefile (revision 518044) +++ 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 --- java/jakarta-commons-beanutils/Makefile (revision 518044) +++ 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 --- java/jakarta-commons-discovery/Makefile (revision 518044) +++ 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} --- java/jakarta-commons-httpclient/Makefile (revision 518044) +++ 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 --- java/jakarta-oro/Makefile (revision 518044) +++ 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} --- java/jakarta-regexp/Makefile (revision 518044) +++ 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} --- java/jasmin/Makefile (revision 518044) +++ java/jasmin/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= jasmin PORTVERSION= 2.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= java lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -14,7 +15,6 @@ USES= dos2unix zip USE_ANT= yes ALL_TARGET= jasmin USE_JAVA= yes -JAVA_VERSION= 1.6+ DOS2UNIX_REGEX= .*\.(txt|xml|j|class|java|mf|css|bnf|html) SUB_FILES= jasmin.sh --- java/jasmin/files/jasmin.sh.in (revision 518044) +++ java/jasmin/files/jasmin.sh.in (working copy) @@ -2,5 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" \ - exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jasmin.jar" "$@" +exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jasmin.jar" "$@" --- java/java-subversion/Makefile (revision 518044) +++ 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 --- java/java3d/Makefile (revision 518044) +++ 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 --- java/javahelp/Makefile (revision 518044) +++ java/javahelp/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= javahelp PORTVERSION= 2.0.05.20170719 +PORTREVISION= 1 CATEGORIES= java devel MAINTAINER= makc@FreeBSD.org @@ -19,7 +20,6 @@ GH_TAGNAME= 3ca862d USE_JAVA= yes USE_ANT= yes -JAVA_VER= 1.${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} TOMCAT_VER?= 8.5 TOMCAT_PORT= www/tomcat${TOMCAT_VER:S/.0//:S/.//} TOMCAT_DIR= ${LOCALBASE}/apache-tomcat-${TOMCAT_VER} @@ -30,14 +30,11 @@ MAKE_ARGS= -Djsp-jar=${TOMCAT_jsp} \ -Dfile.reference.jsp-api.jar=${TOMCAT_jsp} \ -Dservlet-jar=${TOMCAT_servlet} \ -Dfile.reference.servlet-api.jar=${TOMCAT_servlet} \ - -Djavac.target=${JAVA_VER} \ - -Ddefault.javac.target=${JAVA_VER} \ -Dtomcat-zip-present=true BUILD_WRKSRC= ${WRKSRC}/javahelp_nbproject SUB_FILES= jhindexer \ jhsearch -SUB_LIST= JAVA_VER=${JAVA_VER}+ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/jhindexer ${WRKDIR}/jhsearch ${STAGEDIR}${PREFIX}/bin/ --- java/javahelp/files/jhindexer.in (revision 518044) +++ java/javahelp/files/jhindexer.in (working copy) @@ -1,5 +1,3 @@ #!/bin/sh -export JAVA_VERSION=%%JAVA_VER%% - exec java -cp %%JAVALIBDIR%%/jhall.jar com.sun.java.help.search.Indexer "$@" --- java/javahelp/files/jhsearch.in (revision 518044) +++ java/javahelp/files/jhsearch.in (working copy) @@ -1,5 +1,3 @@ #!/bin/sh -export JAVA_VERSION=%%JAVA_VER%% - exec java -cp %%JAVALIBDIR%%/jhall.jar com.sun.java.help.search.QueryEngine "$@" --- java/javavmwrapper/Makefile (revision 518044) +++ 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 --- java/javavmwrapper/src/javavm.1 (revision 518044) +++ 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. --- java/javavmwrapper/src/javavmwrapper.sh (revision 518044) +++ 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" ;; --- java/javavmwrapper/src/manvm.1 (revision 518044) +++ 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 , --- java/javavmwrapper/src/registervm.1 (revision 518044) +++ 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 --- java/jaxen/Makefile (revision 518044) +++ 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 --- java/jcalendar/Makefile (revision 518044) +++ 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 \ --- java/jcommon/Makefile (revision 518044) +++ 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 --- java/jd-gui/Makefile (revision 518044) +++ 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 --- java/jdbcpool/Makefile (revision 518044) +++ 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 --- java/jdom/Makefile (revision 518044) +++ 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 --- java/jfreechart/Makefile (revision 518044) +++ 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 --- java/jgraph/Makefile (revision 518044) +++ 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 --- java/jmf/Makefile (revision 518044) +++ 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} --- java/jode/Makefile (revision 518044) +++ 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 --- java/jomp/Makefile (revision 518044) +++ 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 --- java/jta/Makefile (revision 518044) +++ 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 --- java/jump/Makefile (revision 518044) +++ 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 --- java/mx4j/Makefile (revision 518044) +++ 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 \ --- java/servingxml/Makefile (revision 518044) +++ 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 --- java/springframework/Makefile (revision 518044) +++ 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 --- java/springframework31/Makefile (revision 518044) +++ 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 --- java/sqlitejdbc/Makefile (revision 518044) +++ 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 --- java/trove4j/Makefile (revision 518044) +++ 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 \ --- java/wildfly10/Makefile (revision 518044) +++ 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 --- java/wildfly10/files/patch-bin_add-user.sh (revision 518044) +++ 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; --- java/wildfly10/files/wildfly10.in (revision 518044) +++ 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 () { --- java/wildfly11/Makefile (revision 518044) +++ 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 --- java/wildfly11/files/patch-bin_add-user.sh (revision 518044) +++ 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; --- java/wildfly11/files/wildfly11.in (revision 518044) +++ 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 () { --- java/wildfly12/Makefile (revision 518044) +++ 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 --- java/wildfly12/files/patch-bin_add-user.sh (revision 518044) +++ 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; --- java/wildfly12/files/wildfly12.in (revision 518044) +++ 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 () { --- java/wildfly13/Makefile (revision 518044) +++ 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 --- java/wildfly13/files/patch-bin_add-user.sh (revision 518044) +++ 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; --- java/wildfly13/files/wildfly13.in (revision 518044) +++ 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 () { --- java/wildfly90/Makefile (revision 518044) +++ 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 --- java/wildfly90/files/patch-bin-add-user.sh (revision 518044) +++ 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; --- java/wildfly90/files/wildfly90.in (revision 518044) +++ 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 () { --- java/xdoclet/Makefile (revision 518044) +++ 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 --- lang/abcl/Makefile (revision 518044) +++ 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: --- lang/apache-commons-jelly/Makefile (revision 518044) +++ lang/apache-commons-jelly/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= commons-jelly PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= lang devel java MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= apache- @@ -13,7 +14,6 @@ COMMENT= XML based scripting engine LICENSE= APACHE20 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- lang/apache-commons-jelly/files/jelly.sh.in (revision 518044) +++ lang/apache-commons-jelly/files/jelly.sh.in (working copy) @@ -6,7 +6,7 @@ JELLY_HOME="${JELLY_HOME:-"%%DATADIR%%"}" CLASSPATH="${CLASSPATH}:${JELLY_HOME}/lib/forehead-1.0-beta-5.jar" FOREHEAD_CONF="${FOREHEAD_CONF:-"${JELLY_HOME}/bin/forehead.conf"}" -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" \ +"%%LOCALBASE%%/bin/java" \ -classpath "${CLASSPATH}" \ -Dforehead.conf.file="${FOREHEAD_CONF}" \ -Djelly.home="${JELLY_HOME}" \ --- lang/bsh/Makefile (revision 518044) +++ lang/bsh/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= bsh DISTVERSION= 2.0b6 +PORTREVISION= 1 CATEGORIES= lang java MAINTAINER= pfg@FreeBSD.org @@ -15,7 +16,6 @@ GH_ACCOUNT= beanshell GH_PROJECT= beanshell USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jarall --- lang/bsh/files/bsh.sh.in (revision 518044) +++ lang/bsh/files/bsh.sh.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%JARNAME%%" "$@" +exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%JARNAME%%" "$@" --- lang/ceylon/Makefile (revision 518044) +++ 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= * --- lang/groovy/Makefile (revision 518044) +++ 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 --- lang/jython/Makefile (revision 518044) +++ 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 "" --- lang/linux-j/Makefile (revision 518044) +++ lang/linux-j/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= j PORTVERSION= 504b -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang linux java MASTER_SITES= http://www.jsoftware.com/download/ PKGNAMEPREFIX= linux- @@ -20,7 +20,6 @@ LICENSE_PERMS= auto-accept dist-mirror pkg-mirror USES= linux USE_JAVA= yes -JAVA_VERSION= 1.6+ ONLY_FOR_ARCHS= i386 amd64 --- lang/linux-j/files/jw.sh.in (revision 518044) +++ lang/linux-j/files/jw.sh.in (working copy) @@ -6,4 +6,4 @@ if [ ! -d ${HOME}/J ] then cp -r ${JPATHj%%PORTVERSION%%}/user ${HOME}/J fi -JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%PREFIX%%/lib/j/j.jar "$@" +exec %%LOCALBASE%%/bin/java -jar %%PREFIX%%/lib/j/j.jar "$@" --- lang/rhino/Makefile (revision 518044) +++ lang/rhino/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= rhino DISTVERSION= 1_7R4 +PORTREVISION= 1 CATEGORIES= lang java MASTER_SITES= GHC \ LOCAL/nivit/${PORTNAME}/:swingex \ @@ -22,8 +23,6 @@ ALL_TARGET= jar DATADIR= ${JAVASHAREDIR}/${PORTNAME} -JAVA_VERSION= 1.6+ - LINEDIT_DESC= Enable line editing in the Rhino shell LINEDIT_RUN_DEPENDS= ${JLINEJAR}:devel/jline LINEDIT_USE= java=yes ant=yes --- lang/rhino/files/rhinoc.in (revision 518044) +++ lang/rhino/files/rhinoc.in (working copy) @@ -3,4 +3,4 @@ # $FreeBSD$ # # Rhino compiler -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.jsc.Main $@ +"%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.jsc.Main $@ --- lang/rhino/files/rhinodbg.in (revision 518044) +++ lang/rhino/files/rhinodbg.in (working copy) @@ -3,4 +3,4 @@ # $FreeBSD$ # # Rhino debugger -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.debugger.Main $@ +"%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.debugger.Main $@ --- lang/rhino/files/rhinosh.in (revision 518044) +++ lang/rhino/files/rhinosh.in (working copy) @@ -3,4 +3,4 @@ # $FreeBSD$ # # Rhino shell -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%:%%JLINEJAR%%" org.mozilla.javascript.tools.shell.Main $@ +"%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%:%%JLINEJAR%%" org.mozilla.javascript.tools.shell.Main $@ --- lang/sisc/Makefile (revision 518044) +++ lang/sisc/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= sisc PORTVERSION= 1.16.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang scheme java MASTER_SITES= SF/${PORTNAME}/SISC/${PORTVERSION} @@ -14,7 +14,6 @@ LICENSE= MPL11 GPLv2+ LICENSE_COMB= dual USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes @@ -24,7 +23,7 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|\(SISC_HOME=\).*$$|\1${DATADIR}|' \ - -e 's|\(JAVA=\)java|\1"${LOCALBASE}/bin/java" ; export JAVA_VERSION="${JAVA_VERSION}"|' \ + -e 's|\(JAVA=\)java|\1"${LOCALBASE}/bin/java"|' \ ${WRKSRC}/sisc @${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' \ ${WRKSRC}/scheme-src/srfi-22/srfi-22.sh --- lang/starlogo/Makefile (revision 518044) +++ lang/starlogo/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= starlogo PORTVERSION= 2.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang java MASTER_SITES= http://education.mit.edu/starlogo/download/ DISTNAME= ${PORTNAME}-2.0 @@ -15,7 +15,6 @@ BROKEN= unfetchable USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- lang/starlogo/files/starlogo.sh.in (revision 518044) +++ lang/starlogo/files/starlogo.sh.in (working copy) @@ -3,4 +3,4 @@ # $FreeBSD$ cd %%DATADIR%%/sample-projects && \ -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@" +"%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@" --- mail/davmail/Makefile (revision 518044) +++ 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 --- mail/james/Makefile (revision 518044) +++ mail/james/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= james PORTVERSION= 2.3.2.1 +PORTREVISION= 1 CATEGORIES= mail java MASTER_SITES= APACHE/${PORTNAME}/server/ DISTNAME= ${PORTNAME}-binary-${PORTVERSION} @@ -16,7 +17,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes NO_BUILD= yes --- mail/james/files/james.in (revision 518044) +++ mail/james/files/james.in (working copy) @@ -44,7 +44,6 @@ # james_enable="${james_enable:-"NO"}" -james_java_version="${james_java_version:-"%%JAVA_VERSION%%"}" james_home="${james_home:-"%%JAMES_HOME%%"}" james_base="${james_base:-"%%JAMES_HOME%%"}" james_tmpdir="${james_tmpdir:-"/tmp"}" --- mail/mime4j/Makefile (revision 518044) +++ 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} --- mail/openemm2013/Makefile (revision 518044) +++ 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 --- mail/openemm2013/files/openemm2013.in (revision 518044) +++ 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 () { --- mail/openemm2015/Makefile (revision 518044) +++ 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 --- math/cvc4/Makefile (revision 518044) +++ 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: --- math/geonext/Makefile (revision 518044) +++ 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 \ --- math/jakarta-commons-math3/Makefile (revision 518044) +++ 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 --- math/jeuclid/Makefile (revision 518044) +++ 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 --- math/jlatexmath/Makefile (revision 518044) +++ 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 --- math/matlab-installer/Makefile (revision 518044) +++ 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 --- math/octave/Makefile (revision 518044) +++ 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 \ --- math/plman/Makefile (revision 518044) +++ 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} --- math/truthtable/Makefile (revision 518044) +++ math/truthtable/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= truthtable PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math java MASTER_SITES= http://www.kinostudios.com/java/ \ http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/ @@ -17,7 +17,6 @@ COMMENT= Truth Tables generator (written in Java) BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- math/truthtable/files/truthtable.in (revision 518044) +++ math/truthtable/files/truthtable.in (working copy) @@ -1,4 +1,3 @@ #!/bin/sh # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" \ - exec "%%LOCALBASE%%/bin/java" -jar "%%TRUTHTABLEJAR%%" "$@" +exec "%%LOCALBASE%%/bin/java" -jar "%%TRUTHTABLEJAR%%" "$@" --- misc/freeguide/Makefile (revision 518044) +++ 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 --- misc/jbidwatcher/Makefile (revision 518044) +++ misc/jbidwatcher/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= jbidwatcher PORTVERSION= 2.5.6 +PORTREVISION= 1 CATEGORIES= misc java MASTER_SITES= http://www.jbidwatcher.com/download/ @@ -13,7 +14,6 @@ USES= tar:bzip2 USE_JAVA= yes USE_ANT= yes ALL_TARGET= jar -JAVA_VERSION= 1.6+ SUB_FILES= jbidwatcher SUB_LIST+= PORTVERSION=${PORTVERSION} --- misc/jbidwatcher/files/jbidwatcher.in (revision 518044) +++ misc/jbidwatcher/files/jbidwatcher.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@" +"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@" --- misc/pauker/Makefile (revision 518044) +++ 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: --- misc/pipe/Makefile (revision 518044) +++ misc/pipe/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= pipe PORTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc java MASTER_SITES= SF/${PORTNAME}2/Pipe%202/PIPE2%20V${PORTVERSION} DISTNAME= pipe25_rc5 @@ -15,7 +15,6 @@ USES= zip NO_BUILD= yes NO_ARCH= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= pipe.sh --- misc/pipe/files/pipe.sh.in (revision 518044) +++ misc/pipe/files/pipe.sh.in (working copy) @@ -3,4 +3,4 @@ # $FreeBSD$ cd %%DATADIR%% -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%" RunGui +"%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%" RunGui --- multimedia/gdialog/Makefile (revision 518044) +++ multimedia/gdialog/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= gdialog PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= multimedia java MASTER_SITES= SF/${PORTNAME}-x/${PORTNAME}-090400/${PORTVERSION} DISTNAME= GDialog-090400-25 @@ -17,7 +18,6 @@ RUN_DEPENDS= projectx>=0.90.4.00:multimedia/projec USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_WRKSUBDIR= yes --- multimedia/gdialog/files/gdialog.in (revision 518044) +++ multimedia/gdialog/files/gdialog.in (working copy) @@ -13,4 +13,4 @@ case "$#" in ;; esac -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/GDialog.jar" "$@" +exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/GDialog.jar" "$@" --- multimedia/libbluray/Makefile (revision 518044) +++ 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 --- multimedia/projectx/Makefile (revision 518044) +++ multimedia/projectx/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= projectx PORTVERSION= 0.91.0 +PORTREVISION= 1 CATEGORIES= multimedia java MASTER_SITES= SF/project-x/project-x/ProjectX_${PORTVERSION}.00 DISTNAME= ProjectX_${PORTVERSION} @@ -15,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/Copying USES= zip:infozip USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= project-x.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- multimedia/projectx/files/project-x.sh.in (revision 518044) +++ multimedia/projectx/files/project-x.sh.in (working copy) @@ -13,4 +13,4 @@ case "$#" in ;; esac -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/ProjectX.jar" "$@" +exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/ProjectX.jar" "$@" --- net/activemq/Makefile (revision 518044) +++ 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 --- net/apache-commons-net/Makefile (revision 518044) +++ 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 --- net/belle-sip/Makefile (revision 518044) +++ 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: --- net/dimes/Makefile (revision 518044) +++ 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 --- net/java-beepcore/Makefile (revision 518044) +++ 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 --- net/jcifs/Makefile (revision 518044) +++ 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 --- net/jgroups/Makefile (revision 518044) +++ 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 --- net/jicmp/Makefile (revision 518044) +++ 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 --- net/jicmp6/Makefile (revision 518044) +++ 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 --- net/jrdesktop/Makefile (revision 518044) +++ 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 --- net/jsch/Makefile (revision 518044) +++ 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 --- net/ldapbrowser/Makefile (revision 518044) +++ 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 '' --- net/mpich2/Makefile (revision 518044) +++ 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 --- net/seda/Makefile (revision 518044) +++ 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 --- net/spread-j/Makefile (revision 518044) +++ 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 --- net/toonel/Makefile (revision 518044) +++ net/toonel/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= toonel PORTVERSION= 0.0.50.50 +PORTREVISION= 1 CATEGORIES= net java MASTER_SITES= http://www.toonel.net/generic/005050/ DISTNAME= ${PORTNAME} @@ -16,7 +17,6 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= ${PORTNAME}.sh SUB_LIST= JARNAME=${DISTNAME}${EXTRACT_SUFX} --- net/toonel/files/toonel.sh.in (revision 518044) +++ net/toonel/files/toonel.sh.in (working copy) @@ -2,6 +2,5 @@ JAVA="%%LOCALBASE%%/bin/java" JARPATH="%%JAVALIBDIR%%" -export JAVA_VERSION="%%JAVA_VERSION%%" exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@" --- net-im/convey/Makefile (revision 518044) +++ net-im/convey/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= convey PORTVERSION= 0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im java MASTER_SITES= http://convey.sourceforge.net/downloads/ \ http://nivi.interfree.it/tmp/convey.sourceforge.net/ @@ -15,8 +15,6 @@ COMMENT= Instant Message (IM) program using the Ja USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ - MAKE_ARGS= -quiet DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- net-im/convey/files/convey.sh.in (revision 518044) +++ net-im/convey/files/convey.sh.in (working copy) @@ -3,4 +3,4 @@ # $FreeBSD$ cd "%%DATADIR%%" -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "classes:lib/muse-0.72.jar:lib/crimson-1.1.3.jar:lib/jaxp-1.1.jar:lib/jakarta-oro-2.0.4.jar:lib/jdom-b7.jar:lib/convey-0.3.jar" org.convey.ConveyFrame +"%%LOCALBASE%%/bin/java" -cp "classes:lib/muse-0.72.jar:lib/crimson-1.1.3.jar:lib/jaxp-1.1.jar:lib/jakarta-oro-2.0.4.jar:lib/jdom-b7.jar:lib/convey-0.3.jar" org.convey.ConveyFrame --- net-p2p/frost/Makefile (revision 518044) +++ net-p2p/frost/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= frost PORTVERSION= 1.2.0.20090314 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= net-p2p java MASTER_SITES= SF/jtc${PORTNAME}/${PORTNAME}/14-Mar-2009 @@ -14,7 +14,6 @@ COMMENT= Freenet client that provides messenger an USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes NO_BUILD= yes NO_WRKSUBDIR= yes @@ -60,7 +59,6 @@ DESKTOP_ENTRIES= "Frost" "Freenet Client" \ post-patch: @${SED} -e "s|%%PREFIX%%|${PREFIX}|; \ - s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \ s|%%JAVAVM%%|${JAVAVM}|; \ s|%%JAR_DIR%%|${JAR_DIR}|; \ s|%%JAR_FILE%%|${JAR_FILE}|; \ --- net-p2p/frost/files/wrapper.sh (revision 518044) +++ net-p2p/frost/files/wrapper.sh (working copy) @@ -1,9 +1,6 @@ #!/bin/sh -export JAVA_VERSION - PREFIX="%%PREFIX%%" -JAVA_VERSION="%%JAVA_VERSION%%" JAVAVM="%%JAVAVM%%" JAR_DIR="%%JAR_DIR%%" JAR_FILE="%%JAR_FILE%%" --- net-p2p/phex/Makefile (revision 518044) +++ net-p2p/phex/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= phex PORTVERSION= 3.4.2.116 +PORTREVISION= 1 CATEGORIES= net-p2p java MASTER_SITES= SF/${PORTNAME}/Phex%20Final%20Releases/Phex%20${PORTVERSION:R} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -14,11 +15,9 @@ LICENSE= GPLv2 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes SUB_FILES= ${PORTNAME}.sh -SUB_LIST= JAVA_VERSION=${JAVA_VERSION} DATADIR= ${JAVASHAREDIR}/${PORTNAME} PORTDOCS= Phex_other.htm \ --- net-p2p/phex/files/phex.sh.in (revision 518044) +++ net-p2p/phex/files/phex.sh.in (working copy) @@ -1,5 +1,3 @@ #!/bin/sh -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar phex.jar "${@}" --- net-p2p/vuze/Makefile (revision 518044) +++ net-p2p/vuze/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= vuze PORTVERSION= 5.7.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p java MASTER_SITES= SF/azureus/vuze/Vuze_${PORTVERSION:S/.//g} DISTNAME= Vuze_${PORTVERSION:S/.//g}_source --- net-p2p/vuze/files/vuze.in (revision 518044) +++ net-p2p/vuze/files/vuze.in (working copy) @@ -3,7 +3,6 @@ # $FreeBSD: /tmp/pcvs/ports/net-p2p/vuze/files/vuze.in,v 1.2 2009-12-01 21:05:21 rnoland Exp $ # java -export JAVA_VERSION="%%JAVA_VERSION%%" export JAVA_OS="%%JAVA_OS%%" ECLIPSE_BASE=%%LOCALBASE%%/eclipse --- portuguese/irpf-pt_BR/Makefile (revision 518044) +++ portuguese/irpf-pt_BR/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= irpf PORTVERSION= 2014.1.4 +PORTREVISION= 1 CATEGORIES= portuguese finance java MASTER_SITES= http://www28.receita.fazenda.gov.br/publico/programas/IRPF/2014/PGDIRPF2014/Java/zip/ PKGNAMEPREFIX?= pt_BR- @@ -24,7 +25,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME:tu}2014 USE_JAVA= yes JAVA_RUN= yes -JAVA_VERSION= 1.6+ JAVA_OS= native NO_BUILD= yes @@ -94,7 +94,6 @@ post-patch: @${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|; \ s|%%JAR_FILE%%|${JAR_FILE}|; \ s|%%JAR_FILES%%|${JAR_FILES:C/^lib\///}|; \ - s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \ s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \ ${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh --- portuguese/irpf-pt_BR/files/wrapper.sh (revision 518044) +++ portuguese/irpf-pt_BR/files/wrapper.sh (working copy) @@ -3,11 +3,8 @@ # Under a BSDL license. Copyright by Mario S F Ferreira # $FreeBSD$ -export JAVA_VERSION - PREFIX="%%PREFIX%%" # java -JAVA_VERSION="%%JAVA_VERSION%%" JAVAVM="%%JAVAVM%%" JAR_DIR="%%JAR_DIR%%" JAR_FILES="%%JAR_FILES%%" --- print/pdf-renderer/Makefile (revision 518044) +++ 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 --- science/colt/Makefile (revision 518044) +++ 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 --- science/devisor/Makefile (revision 518044) +++ science/devisor/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= devisor PORTVERSION= 2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science java MASTER_SITES= http://www.featflow.de/download/ DISTNAME= devisor${PORTVERSION} @@ -12,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Design and Visualization Software Resource for FeatFlow USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes # Sources are available though SUB_FILES= devisorgrid.sh --- science/devisor/files/devisorgrid.sh.in (revision 518044) +++ science/devisor/files/devisorgrid.sh.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" %%LOCALBASE%%/bin/java -Ddevisorgrid.home="%%DATADIR%%" -cp "%%DATADIR%%" devisorgrid "$@" +%%LOCALBASE%%/bin/java -Ddevisorgrid.home="%%DATADIR%%" -cp "%%DATADIR%%" devisorgrid "$@" --- science/simsmith/Makefile (revision 518044) +++ science/simsmith/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= simsmith PORTVERSION= 9.9 +PORTREVISION= 1 CATEGORIES= science hamradio MASTER_SITES= http://ae6ty.com/Smith_Charts_files/ \ LOCAL/shurd @@ -14,7 +15,6 @@ MAINTAINER= hamradio@FreeBSD.org COMMENT= A Java-based Smith Chart program USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \ --- science/simsmith/files/simsmith.in (revision 518044) +++ science/simsmith/files/simsmith.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" "$@" +"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" "$@" --- security/dirbuster/Makefile (revision 518044) +++ 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} --- security/i2p/Makefile (revision 518044) +++ 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 --- security/iaikpkcs11wrapper/Makefile (revision 518044) +++ 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 --- security/jbrofuzz/Makefile (revision 518044) +++ 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} --- security/owasp-dependency-check/Makefile (revision 518044) +++ security/owasp-dependency-check/Makefile (working copy) @@ -6,6 +6,7 @@ PORTNAME= owasp-dependency-check PORTVERSION= 3.1.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= security java MASTER_SITES= LOCAL/pi/:source2 @@ -23,7 +24,6 @@ GH_ACCOUNT= jeremylong GH_PROJECT= DependencyCheck USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_ARCH= yes --- security/owasp-dependency-check/files/owasp-dependency-check.in (revision 518044) +++ security/owasp-dependency-check/files/owasp-dependency-check.in (working copy) @@ -10,8 +10,7 @@ # # `--cve*` arguments fix https://github.com/jeremylong/DependencyCheck/issues/1171 until the changed URLs # get released. -JAVA_VERSION="%%JAVA_VERSION%%" \ - "%%LOCALBASE%%/bin/java" \ +"%%LOCALBASE%%/bin/java" \ -Dbasedir="/var/cache/owasp-dependency-check" \ -jar "%%JAVAJARDIR%%/owasp-dependency-check-%%PORTVERSION%%-jar-with-dependencies.jar" \ --cveUrl12Base "https://nvd.nist.gov/feeds/xml/cve/1.2/nvdcve-%d.xml.gz" \ --- security/webscarab/Makefile (revision 518044) +++ 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 --- security/xml-security/Makefile (revision 518044) +++ 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 --- sysutils/hfsexplorer/Makefile (revision 518044) +++ 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 --- sysutils/jdiskreport/Makefile (revision 518044) +++ 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} --- sysutils/jvmtop/Makefile (revision 518044) +++ sysutils/jvmtop/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jvmtop PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils java MAINTAINER= jgh@FreeBSD.org @@ -13,7 +13,6 @@ LICENSE= GPLv2 USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \ --- sysutils/jvmtop/files/jvmtop.sh.in (revision 518044) +++ sysutils/jvmtop/files/jvmtop.sh.in (working copy) @@ -1,3 +1,3 @@ #!/bin/sh -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jvmtop.jar:%%JAVA_HOME%%/lib/tools.jar" com.jvmtop.JvmTop $1 +"%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jvmtop.jar:%%JAVA_HOME%%/lib/tools.jar" com.jvmtop.JvmTop $1 --- sysutils/linux-crashplan/Makefile (revision 518044) +++ 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 --- textproc/apache-commons-digester/Makefile (revision 518044) +++ 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} --- textproc/apache-poi/Makefile (revision 518044) +++ 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 --- textproc/denature/Makefile (revision 518044) +++ 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} --- textproc/dom4j/Makefile (revision 518044) +++ 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 --- textproc/fop/Makefile (revision 518044) +++ 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 --- textproc/jalingo/Makefile (revision 518044) +++ textproc/jalingo/Makefile (working copy) @@ -3,8 +3,7 @@ PORTNAME= jalingo PORTVERSION= 0.6.0 -PORTREVISION= 2 -#PORTREVISION= 0 +PORTREVISION= 3 CATEGORIES= textproc java MASTER_SITES= SF/${PORTNAME}/JaLingo/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -17,7 +16,6 @@ LICENSE= GPLv2 USES= 7z USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ ALL_TARGET= dist --- textproc/jalingo/files/jalingo.in (revision 518044) +++ textproc/jalingo/files/jalingo.in (working copy) @@ -1,4 +1,3 @@ #!/bin/sh # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" \ exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/%%JALINGOJAR%% "$@" --- textproc/jarnal/Makefile (revision 518044) +++ 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 --- textproc/jaxup/Makefile (revision 518044) +++ textproc/jaxup/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= jaxup PORTVERSION= 1.01 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc java MASTER_SITES= http://klomp.org/jaxup/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -22,7 +22,6 @@ USES= zip WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.6+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- textproc/jaxup/files/jaxup-xupdater.sh (revision 518044) +++ textproc/jaxup/files/jaxup-xupdater.sh (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" %%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@" +%%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@" --- textproc/jdictionary/Makefile (revision 518044) +++ 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} --- textproc/jdictionary/Makefile.plugin (revision 518044) +++ 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= # --- textproc/jing/Makefile (revision 518044) +++ 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 --- textproc/lucene/Makefile (revision 518044) +++ 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 --- textproc/lucene4/Makefile (revision 518044) +++ 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 --- textproc/lucene5/Makefile (revision 518044) +++ 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 --- textproc/nux/Makefile (revision 518044) +++ textproc/nux/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= nux PORTVERSION= 1.6 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= textproc java MASTER_SITES= http://dst.lbl.gov/ACSSoftware/nux/nux-download/releases/ @@ -15,7 +15,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/xom.jar:textproc/xom \ ${JAVALIBDIR}/saxon9.jar:textproc/saxon-devel USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME} --- textproc/nux/files/fire-xquery.sh.in (revision 518044) +++ textproc/nux/files/fire-xquery.sh.in (working copy) @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "`%%LOCALBASE%%/bin/classpath`" nux.xom.tests.XQueryCommand "$@" +exec "%%LOCALBASE%%/bin/java" -classpath "`%%LOCALBASE%%/bin/classpath`" nux.xom.tests.XQueryCommand "$@" --- textproc/ppower4/Makefile (revision 518044) +++ textproc/ppower4/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= ppower4 PORTVERSION= 0.9.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc java MASTER_SITES= TEX_CTAN/support/${PORTNAME} DISTFILES= pp4sty.zip pp4p.jar manual.pdf leveldemo.zip @@ -18,7 +18,6 @@ LICENSE= GPLv2 # version not really specified USES= zip USE_TEX= latex USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_WRKSUBDIR= yes NO_ARCH= yes --- textproc/ppower4/files/ppower4.sh.in (revision 518044) +++ textproc/ppower4/files/ppower4.sh.in (working copy) @@ -1,4 +1,4 @@ #!/bin/sh # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@" +exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@" --- textproc/qrcodegen/Makefile (revision 518044) +++ textproc/qrcodegen/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= qrcodegen PORTVERSION= 1.14.2 +PORTREVISION= 1 CATEGORIES= textproc java MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -17,7 +18,6 @@ NO_ARCH= yes NO_BUILD= yes USES= zip:infozip USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= qrcodegen INSTALLFILES= FAQ.txt Installation.txt NOTICE QRCodeGen.jar Version.html --- textproc/qrcodegen/files/qrcodegen.in (revision 518044) +++ textproc/qrcodegen/files/qrcodegen.in (working copy) @@ -1,6 +1,5 @@ #!/bin/sh cd %%DATADIR%% -JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \ - -jar QRCodeGen.jar "$@" +exec %%LOCALBASE%%/bin/java -jar QRCodeGen.jar "$@" --- textproc/saxon/Makefile (revision 518044) +++ textproc/saxon/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= saxon PORTVERSION= 6.5.5 +PORTREVISION= 1 CATEGORIES= textproc java MASTER_SITES= SF/${PORTNAME}/saxon6/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/./-/g} @@ -14,7 +15,6 @@ LICENSE= MPL10 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes --- textproc/saxon/files/saxon.sh.in (revision 518044) +++ textproc/saxon/files/saxon.sh.in (working copy) @@ -8,4 +8,4 @@ do SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}" done -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" com.icl.saxon.StyleSheet "$@" +"%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" com.icl.saxon.StyleSheet "$@" --- textproc/saxon-devel/Makefile (revision 518044) +++ textproc/saxon-devel/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= saxon PORTVERSION= 9.1.0.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc java MASTER_SITES= SF/${PORTNAME}/Saxon-B/${PORTVERSION}:binary \ @@ -21,7 +22,6 @@ XOM_DESC= XOM support USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_WRKSUBDIR= yes NO_BUILD= yes @@ -50,7 +50,7 @@ RUN_DEPENDS+= ${JAVALIBDIR}/xom.jar:textproc/xom .endif SUB_FILES= saxon.sh -SUB_LIST= SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}" JAVA_VERSION="${JAVA_VERSION}" +SUB_LIST= SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}" do-install: @${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}/..." --- textproc/saxon-devel/files/saxon.sh.in (revision 518044) +++ textproc/saxon-devel/files/saxon.sh.in (working copy) @@ -17,4 +17,4 @@ do SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}" done -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" +exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" --- textproc/trang/Makefile (revision 518044) +++ 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 --- textproc/weka/Makefile (revision 518044) +++ 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} --- textproc/xalan-j/Makefile (revision 518044) +++ 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} --- textproc/xerces-j/Makefile (revision 518044) +++ 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 --- textproc/xincluder/Makefile (revision 518044) +++ textproc/xincluder/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= xincluder PORTVERSION= 1.0.d11 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc java MASTER_SITES= ftp://ftp.ibiblio.org/pub/languages/java/javafaq/ DISTNAME= ${PORTNAME}-1.0d11 @@ -18,7 +18,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:java/jdom \ ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes --- textproc/xincluder/files/xincluder.sh.in (revision 518044) +++ textproc/xincluder/files/xincluder.sh.in (working copy) @@ -12,4 +12,4 @@ case "${IAM}" in *) echo "ERROR!" ; false ;; esac -JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "`"%%LOCALBASE%%/bin/classpath"`" "com.elharo.xml.xinclude.${MAIN_CLASS}" "$@" +"%%LOCALBASE%%/bin/java" -cp "`"%%LOCALBASE%%/bin/classpath"`" "com.elharo.xml.xinclude.${MAIN_CLASS}" "$@" --- textproc/xml-commons/Makefile (revision 518044) +++ 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 --- textproc/xom/Makefile (revision 518044) +++ 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 --- textproc/xp/Makefile (revision 518044) +++ 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 --- www/apache-forrest/Makefile (revision 518044) +++ 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 --- www/archiva/Makefile (revision 518044) +++ 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} --- www/axis2/Makefile (revision 518044) +++ 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 --- www/dojo-shrinksafe/Makefile (revision 518044) +++ www/dojo-shrinksafe/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= shrinksafe PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= http://download.dojotoolkit.org/release-${PORTVERSION}/ \ LOCAL/glarkin @@ -13,7 +14,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= JavaScript code compressor USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_FILES= bin/${PKGNAMEPREFIX}${PORTNAME} %%DATADIR%%/shrinksafe.jar \ --- www/dojo-shrinksafe/files/dojo-shrinksafe.in (revision 518044) +++ www/dojo-shrinksafe/files/dojo-shrinksafe.in (working copy) @@ -1,3 +1,3 @@ #!/bin/sh -JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar "$@" +exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar "$@" --- www/geronimo/Makefile (revision 518044) +++ 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 @@ -62,8 +61,7 @@ SUB_LIST= GERONIMO_HOME=${APP_HOME} \ USER=${GERONIMO_USER} \ GERONIMO_VERSION=${MAJOR_VER} \ GERONIMO_OUT=${GERONIMO_OUT} \ - JAVA_HOME=${JAVA_HOME} \ - JAVA_VERSION=${JAVA_VERSION} + JAVA_HOME=${JAVA_HOME} pre-patch: @${ECHO_MSG} "Installation settings:" --- www/glassfish4/Makefile (revision 518044) +++ 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 --- www/grails/Makefile (revision 518044) +++ 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} --- www/helma/Makefile (revision 518044) +++ 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 --- www/htmlcompressor/Makefile (revision 518044) +++ www/htmlcompressor/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= htmlcompressor PORTVERSION= 1.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www java MASTER_SITES= https://github.com/serg472/htmlcompressor/releases/download/${PORTVERSION}/ EXTRACT_SUFX= .jar @@ -21,7 +21,6 @@ NO_ARCH= yes PLIST_FILES= bin/htmlcompressor %%JAVAJARDIR%%/htmlcompressor.jar SUB_FILES= htmlcompressor -SUB_LIST+= JAVA_VERSION=${JAVA_PORT_VERSION:R:C/^([^1])/1.\1/} do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} --- www/htmlcompressor/files/htmlcompressor.in (revision 518044) +++ www/htmlcompressor/files/htmlcompressor.in (working copy) @@ -1,4 +1,4 @@ #!/bin/sh # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar "$@" +exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar "$@" --- www/httpasyncclient/Makefile (revision 518044) +++ 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} --- www/httpclient/Makefile (revision 518044) +++ 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} --- www/httpcore/Makefile (revision 518044) +++ 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} --- www/jetty8/Makefile (revision 518044) +++ 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} --- www/jmeter/Makefile (revision 518044) +++ www/jmeter/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= apache-jmeter PORTVERSION= 2.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www benchmarks java MASTER_SITES= APACHE/jmeter/binaries @@ -43,7 +43,6 @@ RUN_DEPENDS= \ USES= tar:tgz USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= jmeter.sh --- www/jmeter/files/jmeter.sh.in (revision 518044) +++ www/jmeter/files/jmeter.sh.in (working copy) @@ -1,4 +1,4 @@ #!/bin/sh # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/bin/ApacheJMeter.jar" "$@" +exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/bin/ApacheJMeter.jar" "$@" --- www/madsonic/Makefile (revision 518044) +++ 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 --- www/madsonic-standalone/Makefile (revision 518044) +++ 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 --- www/myfaces/Makefile (revision 518044) +++ 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 --- www/paros/Makefile (revision 518044) +++ 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 --- www/py-dojango/Makefile (revision 518044) +++ 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 --- www/resin3/Makefile (revision 518044) +++ 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} \ --- www/rssowl/Makefile (revision 518044) +++ 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 --- www/sahi/Makefile (revision 518044) +++ 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 --- www/sakai/Makefile (revision 518044) +++ 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 --- www/scloader/Makefile (revision 518044) +++ 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 --- www/servlet-api/Makefile (revision 518044) +++ 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 --- www/subsonic-standalone/Makefile (revision 518044) +++ 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 --- www/tomcat-native/Makefile (revision 518044) +++ 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} \ --- www/tomcat7/Makefile (revision 518044) +++ 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 --- www/tomcat85/Makefile (revision 518044) +++ 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 --- www/tomee/Makefile (revision 518044) +++ 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 --- www/vertx/Makefile (revision 518044) +++ 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} --- www/yuicompressor/Makefile (revision 518044) +++ www/yuicompressor/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= yuicompressor PORTVERSION= 2.4.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www java #MASTER_SITES= http://tml.github.io/yui/ MASTER_SITES+= LOCAL/az @@ -19,7 +19,6 @@ LICENSE_COMB= multi NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_ARCH= yes --- www/yuicompressor/files/yuicompressor.in (revision 518044) +++ www/yuicompressor/files/yuicompressor.in (working copy) @@ -1,3 +1,3 @@ #!/bin/sh -JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar "$@" +exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar "$@" --- x11-toolkits/swt/Makefile (revision 518044) +++ 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} --- x11-wm/lxmed/Makefile (revision 518044) +++ x11-wm/lxmed/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= lxmed PORTVERSION= 20120515 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm java MASTER_SITES= SF/${PORTNAME}/ DIST_SUBDIR= java @@ -18,7 +18,6 @@ RUN_DEPENDS= gksu:sysutils/gksu WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} --- x11-wm/lxmed/files/lxmed.sh.in (revision 518044) +++ x11-wm/lxmed/files/lxmed.sh.in (working copy) @@ -3,7 +3,5 @@ # $FreeBSD$ # -export JAVA_VERSION="%%JAVA_VERSION%%" - cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ -jar "%%DATADIR%%/LXMenuEditor.jar" "${@}"