Page MenuHomeFreeBSD
Files F103287398

D22342.diff
No OneTemporary
Actions

D22342.diff
View Options

Index: head/Mk/bsd.java.mk
===================================================================
--- head/Mk/bsd.java.mk
+++ head/Mk/bsd.java.mk
@@ -162,7 +162,7 @@
. endif
# The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST= 6 7 8 11 12 13
+__JAVA_VERSION_LIST= 7 8 11 12 13
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= openjdk oracle
@@ -270,7 +270,7 @@
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
-_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/6+/7+/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
+_JAVA_VERSION= ${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif
Index: head/archivers/javatar/Makefile
===================================================================
--- head/archivers/javatar/Makefile
+++ head/archivers/javatar/Makefile
@@ -14,7 +14,6 @@
LICENSE_FILE= ${WRKSRC}/doc/LICENSE
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
Index: head/archivers/jzlib/Makefile
===================================================================
--- head/archivers/jzlib/Makefile
+++ head/archivers/jzlib/Makefile
@@ -14,7 +14,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
JAR_FILE= ${WRKSRC}/src/main/java/${PORTNAME}.jar
Index: head/archivers/snappy-java/Makefile
===================================================================
--- head/archivers/snappy-java/Makefile
+++ head/archivers/snappy-java/Makefile
@@ -35,7 +35,6 @@
USES= gmake
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USE_LDCONFIG= yes
MAKE_ARGS+= Default_CXX=${CXX}
Index: head/astro/gpsprune/Makefile
===================================================================
--- head/astro/gpsprune/Makefile
+++ head/astro/gpsprune/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gpsprune
PORTVERSION= 19.2
+PORTREVISION= 1
CATEGORIES= astro java
MASTER_SITES= http://activityworkshop.net/software/${PORTNAME}/ \
http://mirror.amdmi3.ru/distfiles/
@@ -20,7 +21,6 @@
NO_ARCH= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= gpsprune.sh
SUB_LIST= JARNAME=${DISTNAME}
Index: head/astro/gpsprune/files/gpsprune.sh.in
===================================================================
--- head/astro/gpsprune/files/gpsprune.sh.in
+++ head/astro/gpsprune/files/gpsprune.sh.in
@@ -4,6 +4,5 @@
JAVA="%%LOCALBASE%%/bin/java"
JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@"
Index: head/astro/osmosis/Makefile
===================================================================
--- head/astro/osmosis/Makefile
+++ head/astro/osmosis/Makefile
@@ -16,7 +16,6 @@
NO_WRKSUBDIR= yes
USES= tar:tgz
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/audio/atunes/Makefile
===================================================================
--- head/audio/atunes/Makefile
+++ head/audio/atunes/Makefile
@@ -3,7 +3,7 @@
PORTNAME= atunes
PORTVERSION= 3.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
@@ -15,7 +15,6 @@
NO_BUILD= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= atunes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: head/audio/atunes/files/atunes.in
===================================================================
--- head/audio/atunes/files/atunes.in
+++ head/audio/atunes/files/atunes.in
@@ -1,7 +1,7 @@
#!/bin/sh
cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \
+exec %%LOCALBASE%%/bin/java \
-Dsubstancelaf.windowRoundedCorners=false \
-Dinsubstantial.looseTableCellRenderers=true -Djava.library.path=./ \
-Xms128m -Xmx256m -splash:splash.gif \
Index: head/audio/gervill/Makefile
===================================================================
--- head/audio/gervill/Makefile
+++ head/audio/gervill/Makefile
@@ -17,7 +17,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
NO_ARCH= yes
Index: head/audio/jid3lib/Makefile
===================================================================
--- head/audio/jid3lib/Makefile
+++ head/audio/jid3lib/Makefile
@@ -11,7 +11,6 @@
COMMENT= Java ID3 Tag Library
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
PLIST_FILES= %%JAVAJARDIR%%/jid3lib.jar
Index: head/audio/musiccontrol/Makefile
===================================================================
--- head/audio/musiccontrol/Makefile
+++ head/audio/musiccontrol/Makefile
@@ -18,7 +18,6 @@
${LOCALBASE}/bin/simplemod:audio/simplemod
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PLIST_FILES= share/java/classes/MusicControl-${PORTVERSION}.jar bin/musiccontrol
Index: head/audio/tuxguitar/Makefile
===================================================================
--- head/audio/tuxguitar/Makefile
+++ head/audio/tuxguitar/Makefile
@@ -35,7 +35,6 @@
USE_JAVA= yes
USE_ANT= yes
USE_LDCONFIG= yes
-JAVA_VERSION= 1.6+
NO_CCACHE= yes
BUILD_WRKSRC= ${WRKSRC}/TuxGuitar
Index: head/benchmarks/linux-vdbench/Makefile
===================================================================
--- head/benchmarks/linux-vdbench/Makefile
+++ head/benchmarks/linux-vdbench/Makefile
@@ -22,7 +22,6 @@
USE_JAVA= yes
EXTRACT_AFTER_ARGS= -d ${WRKSRC}
-JAVA_VERSION= 1.7+
JAVA_OS= linux
NO_BUILD= yes
PLIST_SUB= LINUX_ARCH=${LINUX_ARCH}
Index: head/benchmarks/scimark2/Makefile
===================================================================
--- head/benchmarks/scimark2/Makefile
+++ head/benchmarks/scimark2/Makefile
@@ -14,7 +14,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NEED_JAVAC= yes
JAVAC_OPTS?= -O
Index: head/biology/artemis/Makefile
===================================================================
--- head/biology/artemis/Makefile
+++ head/biology/artemis/Makefile
@@ -20,7 +20,6 @@
GH_ACCOUNT= sanger-pathogens
SHEBANG_FILES= act art bamview dnaplotter test/*.sh etc/go_associations.pl
USE_JAVA= yes
-JAVA_VERSION= 1.6+
ALL_TARGET= jar
NO_ARCH= yes
Index: head/biology/cytoscape/Makefile
===================================================================
--- head/biology/cytoscape/Makefile
+++ head/biology/cytoscape/Makefile
@@ -24,7 +24,6 @@
USES= shebangfix
SHEBANG_FILES= gui-distribution/assembly/src/main/bin/cytoscape.sh
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USE_GITHUB= yes
GH_TUPLE= ${PORTNAME}:${PORTNAME}-parent:${DISTVERSION}:p/parent \
${PORTNAME}:${PORTNAME}-api:${DISTVERSION}:a/api \
Index: head/biology/jalview/Makefile
===================================================================
--- head/biology/jalview/Makefile
+++ head/biology/jalview/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jalview
PORTVERSION= 2.07
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= biology java
MASTER_SITES= http://www.jalview.org/source/
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/}
@@ -12,7 +12,6 @@
COMMENT= Viewer and editor for multiple sequence alignments
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= makejars
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: head/biology/jalview/files/jalview.sh.in
===================================================================
--- head/biology/jalview/files/jalview.sh.in
+++ head/biology/jalview/files/jalview.sh.in
@@ -4,4 +4,4 @@
# Shell script to launch jalview using our javavm wrapper
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" -cp "%%DATADIR%%/jalview.jar" jalview.bin.Jalview
+"%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" -cp "%%DATADIR%%/jalview.jar" jalview.bin.Jalview
Index: head/biology/trimmomatic/Makefile
===================================================================
--- head/biology/trimmomatic/Makefile
+++ head/biology/trimmomatic/Makefile
@@ -16,7 +16,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
NO_BUILD= yes
NO_ARCH= yes
Index: head/cad/electric-ng/Makefile
===================================================================
--- head/cad/electric-ng/Makefile
+++ head/cad/electric-ng/Makefile
@@ -3,6 +3,7 @@
PORTNAME= electric
PORTVERSION= 9.07
+PORTREVISION= 1
CATEGORIES= cad java
MASTER_SITES= GNU \
http://www.staticfreesoft.com/:1 \
@@ -20,7 +21,6 @@
EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
SUB_LIST+= LIBFILES="${LIBFILES}" \
JARFILE="${JARFILE}"
Index: head/cad/electric-ng/files/electric-ng.in
===================================================================
--- head/cad/electric-ng/files/electric-ng.in
+++ head/cad/electric-ng/files/electric-ng.in
@@ -6,7 +6,6 @@
set JAVA = "%%LOCALBASE%%/bin/java"
set LIBFILES = "%%LIBFILES%%"
set JARPATH = "%%JAVALIBDIR%%"
-setenv JAVA_VERSION "%%JAVA_VERSION%%"
if ( "${LIBFILES}" != "" ) then
set CLASSPATH = :`echo ${LIBFILES} | sed -E -e 's,[[:space:]]+,:,g'`
Index: head/cad/fidocadj/Makefile
===================================================================
--- head/cad/fidocadj/Makefile
+++ head/cad/fidocadj/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fidocadj
PORTVERSION= 0.24.6
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/:src SF/${PORTNAME}/manuals/:docs
DISTFILES= ${PORTNAME}.jar:src
@@ -23,7 +23,6 @@
SUB_FILES= ${PORTNAME}.sh
-JAVA_VERSION= 1.6+
USE_JAVA= yes
OPTIONS_DEFINE= DOCS
Index: head/cad/fidocadj/files/fidocadj.sh.in
===================================================================
--- head/cad/fidocadj/files/fidocadj.sh.in
+++ head/cad/fidocadj/files/fidocadj.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@"
Index: head/cad/impact/Makefile
===================================================================
--- head/cad/impact/Makefile
+++ head/cad/impact/Makefile
@@ -3,7 +3,7 @@
PORTNAME= impact
PORTVERSION= 0.7.06.038
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= cad java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION} \
@@ -24,7 +24,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/Impact
Index: head/cad/impact/files/impact.in
===================================================================
--- head/cad/impact/files/impact.in
+++ head/cad/impact/files/impact.in
@@ -3,5 +3,5 @@
# $FreeBSD$
cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:doc:bin run.Impact "$@"
+"%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:doc:bin run.Impact "$@"
cd -
Index: head/cad/impact/files/impactgui.in
===================================================================
--- head/cad/impact/files/impactgui.in
+++ head/cad/impact/files/impactgui.in
@@ -3,5 +3,5 @@
# $FreeBSD$
cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:bin:doc:lib/jogl.jar:lib/gluegen-rt.jar:lib/patbinfree153.jar:lib/LogDB.jar:lib/mysql-connector-java-5.1.11-bin.jar gui.ImpactGUI
+"%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:bin:doc:lib/jogl.jar:lib/gluegen-rt.jar:lib/patbinfree153.jar:lib/LogDB.jar:lib/mysql-connector-java-5.1.11-bin.jar gui.ImpactGUI
cd -
Index: head/cad/logisim/Makefile
===================================================================
--- head/cad/logisim/Makefile
+++ head/cad/logisim/Makefile
@@ -16,7 +16,6 @@
NO_BUILD= yes
USE_JAVA= yes
JAVA_RUN= yes
-JAVA_VERSION= 1.6+
PLIST_FILES= ${DATADIR_REL}/${PORTNAME}-generic-${PORTVERSION}${EXTRACT_SUFX} \
bin/${PORTNAME}
Index: head/cad/sweethome3d/Makefile
===================================================================
--- head/cad/sweethome3d/Makefile
+++ head/cad/sweethome3d/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sweethome3d
PORTVERSION= 5.4
+PORTREVISION= 1
CATEGORIES= cad java
MASTER_SITES= SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
DISTNAME= SweetHome3D-${PORTVERSION}-src
@@ -20,7 +21,6 @@
NO_ARCH= yes
USE_ANT= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
ALL_TARGET= jarExecutable
JARNAME= SweetHome3D-${PORTVERSION}.jar
Index: head/cad/sweethome3d/files/sweethome3d.sh.in
===================================================================
--- head/cad/sweethome3d/files/sweethome3d.sh.in
+++ head/cad/sweethome3d/files/sweethome3d.sh.in
@@ -4,6 +4,5 @@
JAVA="%%LOCALBASE%%/bin/java"
JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
exec "${JAVA}" -Xmx1024m -jar "${JARPATH}/%%JARNAME%%" "$@"
Index: head/comms/rxtx/Makefile
===================================================================
--- head/comms/rxtx/Makefile
+++ head/comms/rxtx/Makefile
@@ -21,7 +21,6 @@
USES= gmake libtool zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
GNU_CONFIGURE= yes
CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME}
Index: head/comms/yaac/Makefile
===================================================================
--- head/comms/yaac/Makefile
+++ head/comms/yaac/Makefile
@@ -2,6 +2,7 @@
PORTNAME= yaac
PORTVERSION= 1.0b114
+PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= SF/yetanotheraprsc/
DISTNAME= YAACsrc_20170920
@@ -15,7 +16,6 @@
BROKEN_armv7= fails to package: yaac/build.xml:205: yaac/work/yaac/YAAC/site does not exist
-JAVA_VERSION= 1.6+
USES= zip
USE_ANT= yes
USE_JAVA= yes
Index: head/comms/yaac/files/yaac.sh.in
===================================================================
--- head/comms/yaac/files/yaac.sh.in
+++ head/comms/yaac/files/yaac.sh.in
@@ -3,4 +3,4 @@
# $FreeBSD$
cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/YAAC.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/YAAC.jar" "$@"
Index: head/databases/apache-commons-dbutils/Makefile
===================================================================
--- head/databases/apache-commons-dbutils/Makefile
+++ head/databases/apache-commons-dbutils/Makefile
@@ -15,7 +15,6 @@
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/databases/c3p0/Makefile
===================================================================
--- head/databases/c3p0/Makefile
+++ head/databases/c3p0/Makefile
@@ -15,7 +15,6 @@
USES= tar:tgz
USE_JAVA= yes
NO_BUILD= yes
-JAVA_VERSION= 1.6+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
NO_ARCH= yes
Index: head/databases/db6/Makefile
===================================================================
--- head/databases/db6/Makefile
+++ head/databases/db6/Makefile
@@ -54,7 +54,7 @@
SQL_CONFIGURE_ENABLE= sql sql_codegen
SQL_VARS= DBLIBS+=libdb_sql
JAVA_USE= java
-JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION=1.6+
+JAVA_VARS= DBLIBS+=libdb_java
JAVA_CONFIGURE_ENABLE= java
JAVA_CPPFLAGS= -I"${JAVA_HOME}/include"
JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
Index: head/databases/frontbase-jdbc/Makefile
===================================================================
--- head/databases/frontbase-jdbc/Makefile
+++ head/databases/frontbase-jdbc/Makefile
@@ -13,7 +13,6 @@
COMMENT= The Java JDBC implementation for FrontBase
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
JARFILE= frontbasejdbc.jar
Index: head/databases/hbase/Makefile
===================================================================
--- head/databases/hbase/Makefile
+++ head/databases/hbase/Makefile
@@ -24,7 +24,6 @@
USES= cpe
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.7+
MAKE_ENV+= JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-XX:MaxPermSize=256m"
OPTIONS_DEFINE= DOCS
Index: head/databases/hsqldb/Makefile
===================================================================
--- head/databases/hsqldb/Makefile
+++ head/databases/hsqldb/Makefile
@@ -12,7 +12,6 @@
LICENSE= BSD3CLAUSE
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
USES= zip
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
Index: head/databases/isql-viewer/Makefile
===================================================================
--- head/databases/isql-viewer/Makefile
+++ head/databases/isql-viewer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= isql-viewer
PORTVERSION= 2.1.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases java
MASTER_SITES= SF/isql/Stand%20Alone%20Jars/Version%20${PORTVERSION}:isql \
APACHE/ws/soap/version-2.2:bsf
@@ -19,7 +19,6 @@
${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 @@
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:
Index: head/databases/isql-viewer/files/iSQL-Viewer.sh
===================================================================
--- head/databases/isql-viewer/files/iSQL-Viewer.sh
+++ head/databases/isql-viewer/files/iSQL-Viewer.sh
@@ -1,5 +1,3 @@
#!/bin/sh
-JAVA_VERSION=%%JAVA_VERSION%% \
- java -classpath %%CLASSPATH%% \
- org.isqlviewer.core.Launcher
+java -classpath %%CLASSPATH%% org.isqlviewer.core.Launcher
Index: head/databases/jasperreports/Makefile
===================================================================
--- head/databases/jasperreports/Makefile
+++ head/databases/jasperreports/Makefile
@@ -26,7 +26,6 @@
HSQLDB_DESC= Install libraries required for HSQLDB
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= # empty
Index: head/databases/jrobin/Makefile
===================================================================
--- head/databases/jrobin/Makefile
+++ head/databases/jrobin/Makefile
@@ -12,7 +12,6 @@
COMMENT= Pure Java alternative to RRDTool
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
CLASSES= jrobin
Index: head/databases/jrrd/Makefile
===================================================================
--- head/databases/jrrd/Makefile
+++ head/databases/jrrd/Makefile
@@ -14,7 +14,6 @@
USES= libtool
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_VENDOR= openjdk
JAVA_BUILD= yes
JAVA_RUN= yes
Index: head/databases/libgda5/Makefile
===================================================================
--- head/databases/libgda5/Makefile
+++ head/databases/libgda5/Makefile
@@ -95,7 +95,6 @@
.if ${LIBGDA5_SLAVE}==jdbc
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_VENDOR= bsdjava openjdk
CFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
.else
Index: head/databases/postgis-jdbc/Makefile
===================================================================
--- head/databases/postgis-jdbc/Makefile
+++ head/databases/postgis-jdbc/Makefile
@@ -17,7 +17,6 @@
USES= zip:infozip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/databases/powerarchitect/Makefile
===================================================================
--- head/databases/powerarchitect/Makefile
+++ head/databases/powerarchitect/Makefile
@@ -3,6 +3,7 @@
PORTNAME= powerarchitect
PORTVERSION= 1.0.8
+PORTREVISION= 1
CATEGORIES= databases java
MASTER_SITES= http://download.sqlpower.ca/architect/1.0.8/community/
DISTNAME= SQL-Power-Architect-generic-jdbc-${PORTVERSION}
@@ -13,7 +14,6 @@
LICENSE= GPLv3
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PORTDOCS= *
Index: head/databases/powerarchitect/files/powerarchitect.in
===================================================================
--- head/databases/powerarchitect/files/powerarchitect.in
+++ head/databases/powerarchitect/files/powerarchitect.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/architect.jar
+exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/architect.jar
Index: head/databases/puppetdb5/Makefile
===================================================================
--- head/databases/puppetdb5/Makefile
+++ head/databases/puppetdb5/Makefile
@@ -30,7 +30,6 @@
USE_JAVA= yes
NO_ARCH= yes
NO_BUILD= yes
-JAVA_VERSION= 1.7+
USERS= puppetdb
GROUPS= puppetdb
Index: head/databases/puppetdb6/Makefile
===================================================================
--- head/databases/puppetdb6/Makefile
+++ head/databases/puppetdb6/Makefile
@@ -30,7 +30,6 @@
USE_JAVA= yes
NO_ARCH= yes
NO_BUILD= yes
-JAVA_VERSION= 1.7+
USERS= puppetdb
GROUPS= puppetdb
Index: head/deskutils/docear/Makefile
===================================================================
--- head/deskutils/docear/Makefile
+++ head/deskutils/docear/Makefile
@@ -20,7 +20,6 @@
USES= desktop-file-utils shared-mime-info
USE_JAVA= yes
JAVA_VENDOR= openjdk
-JAVA_VERSION= 1.6+
NO_BUILD= yes
JDATADIR= ${JAVASHAREDIR}/${PORTNAME}
icon= ${DATADIR}/${PORTNAME}-icon48x48.png
Index: head/deskutils/freemind/Makefile
===================================================================
--- head/deskutils/freemind/Makefile
+++ head/deskutils/freemind/Makefile
@@ -3,6 +3,7 @@
PORTNAME= freemind
PORTVERSION= 1.0.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= deskutils editors java
MASTER_SITES= SF
@@ -18,7 +19,6 @@
USES= cpe zip:infozip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
DATADIR= ${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
DATAFILES= accessories browser doc lib plugins patterns.xml
Index: head/deskutils/freemind/files/freemind.sh.in
===================================================================
--- head/deskutils/freemind/files/freemind.sh.in
+++ head/deskutils/freemind/files/freemind.sh.in
@@ -6,4 +6,4 @@
FILE="lib/freemind.jar"
cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "${CLASSPATH}" -jar "${FILE}"
+"%%LOCALBASE%%/bin/java" -cp "${CLASSPATH}" -jar "${FILE}"
Index: head/deskutils/freeplane/Makefile
===================================================================
--- head/deskutils/freeplane/Makefile
+++ head/deskutils/freeplane/Makefile
@@ -16,7 +16,6 @@
USES= cpe zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
NO_BUILD= yes
PLIST_SUB= PORTVERSION="${PORTVERSION}"
Index: head/deskutils/ganttproject/Makefile
===================================================================
--- head/deskutils/ganttproject/Makefile
+++ head/deskutils/ganttproject/Makefile
@@ -19,7 +19,6 @@
bash_CMD= /bin/sh
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_ARCH= yes
NO_BUILD= yes
Index: head/deskutils/projectlibre/Makefile
===================================================================
--- head/deskutils/projectlibre/Makefile
+++ head/deskutils/projectlibre/Makefile
@@ -3,6 +3,7 @@
PORTNAME= projectlibre
PORTVERSION= 1.8.0
+PORTREVISION= 1
CATEGORIES= deskutils editors java
MASTER_SITES= SF/${PORTNAME}/ProjectLibre/${PORTVERSION:S/.0$//} \
LOCAL/cpm/projectlibre/:icons
@@ -17,7 +18,6 @@
LICENSE= CPAL-1.0
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
NO_BUILD= yes
Index: head/deskutils/projectlibre/files/projectlibre.sh.in
===================================================================
--- head/deskutils/projectlibre/files/projectlibre.sh.in
+++ head/deskutils/projectlibre/files/projectlibre.sh.in
@@ -5,6 +5,6 @@
PROJECTLIBRE_HOME="%%DATADIR%%"
export PROJECTLIBRE_HOME
cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "$PROJECTLIBRE_HOME/projectlibre.jar" "$@" > /dev/null 2>&1
+"%%LOCALBASE%%/bin/java" -jar "$PROJECTLIBRE_HOME/projectlibre.jar" "$@" > /dev/null 2>&1
# eof
Index: head/deskutils/thinkingrock/Makefile
===================================================================
--- head/deskutils/thinkingrock/Makefile
+++ head/deskutils/thinkingrock/Makefile
@@ -15,7 +15,6 @@
${LOCALBASE}/bin/xdg-email:devel/xdg-utils
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
SUB_FILES= pkg-message
Index: head/devel/antlr/Makefile
===================================================================
--- head/devel/antlr/Makefile
+++ head/devel/antlr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= antlr
PORTVERSION= 2.7.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel java
MASTER_SITES= http://www.antlr2.org/download/
Index: head/devel/antlr/files/antlr.sh.in
===================================================================
--- head/devel/antlr/files/antlr.sh.in
+++ head/devel/antlr/files/antlr.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/antlr.jar" antlr.Tool "$@"
+"%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/antlr.jar" antlr.Tool "$@"
Index: head/devel/antlr3/Makefile
===================================================================
--- head/devel/antlr3/Makefile
+++ head/devel/antlr3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= antlr3
PORTVERSION= 3.5.2
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= http://www.antlr3.org/download/
DISTNAME= antlr-${PORTVERSION}-complete
@@ -17,7 +18,6 @@
NO_BUILD= yes
NO_ARCH= yes
USE_JAVA= yes
-JAVA_VERSION= 1.7+
INSTALL_JAR= ${DISTFILES}
SUB_LIST= INSTALL_JAR=${INSTALL_JAR}
SUB_FILES= antlr.sh
Index: head/devel/antlr3/files/antlr.sh.in
===================================================================
--- head/devel/antlr3/files/antlr.sh.in
+++ head/devel/antlr3/files/antlr.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/%%INSTALL_JAR%%" org.antlr.Tool "$@"
+"%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/%%INSTALL_JAR%%" org.antlr.Tool "$@"
Index: head/devel/apache-commons-configuration/Makefile
===================================================================
--- head/devel/apache-commons-configuration/Makefile
+++ head/devel/apache-commons-configuration/Makefile
@@ -22,7 +22,6 @@
OPTIONS_DEFINE= DOCS
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PORTDOCS= *
Index: head/devel/apache-commons-daemon/Makefile
===================================================================
--- head/devel/apache-commons-daemon/Makefile
+++ head/devel/apache-commons-daemon/Makefile
@@ -18,7 +18,6 @@
OPTIONS_DEFINE= DOCS
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-java=${JAVA_HOME}
Index: head/devel/apache-commons-io/Makefile
===================================================================
--- head/devel/apache-commons-io/Makefile
+++ head/devel/apache-commons-io/Makefile
@@ -14,7 +14,7 @@
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USE_JAVA= 1.7+
+USE_JAVA= yes
NO_ARCH= yes
NO_BUILD= yes
Index: head/devel/apache-commons-jxpath/Makefile
===================================================================
--- head/devel/apache-commons-jxpath/Makefile
+++ head/devel/apache-commons-jxpath/Makefile
@@ -14,7 +14,6 @@
COMMENT= Utilities for manipulating Java Beans using the XPath syntax
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
Index: head/devel/apache-commons-modeler/Makefile
===================================================================
--- head/devel/apache-commons-modeler/Makefile
+++ head/devel/apache-commons-modeler/Makefile
@@ -13,7 +13,6 @@
LICENSE= APACHE20
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
Index: head/devel/argouml/Makefile
===================================================================
--- head/devel/argouml/Makefile
+++ head/devel/argouml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= argouml
PORTVERSION= 0.34
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel java
MASTER_SITES= http://argouml-downloads.tigris.org/nonav/argouml-${PORTVERSION}/
DISTNAME= ArgoUML-${PORTVERSION}
@@ -24,10 +24,8 @@
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
Index: head/devel/argouml/files/argouml.sh.in
===================================================================
--- head/devel/argouml/files/argouml.sh.in
+++ head/devel/argouml/files/argouml.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
Index: head/devel/astah-community/Makefile
===================================================================
--- head/devel/astah-community/Makefile
+++ head/devel/astah-community/Makefile
@@ -21,7 +21,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.7+
REVISION= b4c6e9
WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX:S!-!_!}
Index: head/devel/avalon-framework/Makefile
===================================================================
--- head/devel/avalon-framework/Makefile
+++ head/devel/avalon-framework/Makefile
@@ -11,7 +11,6 @@
COMMENT= Apache Avalon core framework for component programming
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: head/devel/charva/Makefile
===================================================================
--- head/devel/charva/Makefile
+++ head/devel/charva/Makefile
@@ -22,7 +22,6 @@
USES= dos2unix zip
DOS2UNIX_GLOB= build.xml Makefile.freebsd.txt *.c *.java
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= clean makeDLL dist
Index: head/devel/doctorj/Makefile
===================================================================
--- head/devel/doctorj/Makefile
+++ head/devel/doctorj/Makefile
@@ -11,7 +11,6 @@
COMMENT= Tool for analyzing Java code and documentation
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= jarfile
Index: head/devel/flex-sdk/Makefile
===================================================================
--- head/devel/flex-sdk/Makefile
+++ head/devel/flex-sdk/Makefile
@@ -12,7 +12,6 @@
CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.*
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= ${SCRIPTS:C/\$/.sh/g}
NO_ARCH= yes
NO_BUILD= yes
Index: head/devel/flex-sdk35/Makefile
===================================================================
--- head/devel/flex-sdk35/Makefile
+++ head/devel/flex-sdk35/Makefile
@@ -14,7 +14,6 @@
CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk-4.*
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= ${SCRIPTS:C/\$/.sh/g}
PLIST_SUB= PORTNAME=${PORTNAME}
SUB_LIST= PORTNAME=${PORTNAME}
Index: head/devel/flexjson/Makefile
===================================================================
--- head/devel/flexjson/Makefile
+++ head/devel/flexjson/Makefile
@@ -13,7 +13,6 @@
LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/devel/gitblit/Makefile
===================================================================
--- head/devel/gitblit/Makefile
+++ head/devel/gitblit/Makefile
@@ -23,7 +23,6 @@
GROUPS= www
USE_JAVA= yes
-JAVA_VERSION= 1.7+
SUB_FILES= pkg-message
PLIST_SUB+= GB_DATAHOME=${PREFIX}/${PORTNAME} \
Index: head/devel/gogland-eap/Makefile
===================================================================
--- head/devel/gogland-eap/Makefile
+++ head/devel/gogland-eap/Makefile
@@ -21,7 +21,6 @@
USES= python:run shebangfix
SHEBANG_FILES= bin/printenv.py bin/restart.py
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_ARCH= yes
NO_BUILD= yes
Index: head/devel/gradle4/Makefile
===================================================================
--- head/devel/gradle4/Makefile
+++ head/devel/gradle4/Makefile
@@ -15,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.7+
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
NO_ARCH= yes
Index: head/devel/hadoop/Makefile
===================================================================
--- head/devel/hadoop/Makefile
+++ head/devel/hadoop/Makefile
@@ -27,7 +27,6 @@
USES= cpe libtool ssl:build
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USE_ANT= yes
ONLY_FOR_ARCHS= amd64 i386
USE_LDCONFIG= yes
Index: head/devel/hadoop2/Makefile
===================================================================
--- head/devel/hadoop2/Makefile
+++ head/devel/hadoop2/Makefile
@@ -39,7 +39,6 @@
USES= cpe shebangfix
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USE_LDCONFIG= yes
SHEBANG_FILES= hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
MAKE_ENV+= JAVA_HOME=${JAVA_HOME} HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc
Index: head/devel/hive/Makefile
===================================================================
--- head/devel/hive/Makefile
+++ head/devel/hive/Makefile
@@ -25,7 +25,6 @@
USES= cpe
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.7+
WRKSRC= ${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}-src
HIVE_USER= hive
Index: head/devel/ireport/Makefile
===================================================================
--- head/devel/ireport/Makefile
+++ head/devel/ireport/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ireport
PORTVERSION= 3.7.6
+PORTREVISION= 1
CATEGORIES= devel databases java
MASTER_SITES= SF/${PORTNAME}/iReport/iReport-${PORTVERSION}
DISTNAME= iReport-${PORTVERSION}
@@ -12,7 +13,6 @@
USES= dos2unix
USE_JAVA= yes
-JAVA_VERSION= 1.6+
DOS2UNIX_GLOB= *.txt
NO_BUILD= yes
@@ -75,7 +75,7 @@
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
Index: head/devel/itext/Makefile
===================================================================
--- head/devel/itext/Makefile
+++ head/devel/itext/Makefile
@@ -26,7 +26,6 @@
USES= dos2unix tar:bzip2
DOS2UNIX_GLOB= *.java
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= jar jar.rtf jar.rups
MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES
Index: head/devel/java-findbugs/Makefile
===================================================================
--- head/devel/java-findbugs/Makefile
+++ head/devel/java-findbugs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= findbugs
PORTVERSION= 1.3.9
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= SF
PKGNAMEPREFIX= java-
Index: head/devel/java-findbugs/files/patch-findbugs2
===================================================================
--- head/devel/java-findbugs/files/patch-findbugs2
+++ head/devel/java-findbugs/files/patch-findbugs2
@@ -1,6 +1,6 @@
---- bin/findbugs2.orig 2010-12-26 13:57:04.000000000 -0800
-+++ bin/findbugs2 2010-12-26 14:00:48.000000000 -0800
-@@ -27,27 +27,11 @@
+--- bin/findbugs2.orig 2009-08-21 20:39:53 UTC
++++ bin/findbugs2
+@@ -27,27 +27,11 @@ done
dir=`dirname "$program"`
findbugs_home="$dir/.."
@@ -28,7 +28,7 @@
if [ ! -d "$findbugs_home" ]; then
echo "The path $findbugs_home,"
echo "which is where I think FindBugs is located,"
-@@ -56,14 +40,7 @@
+@@ -56,14 +40,7 @@ if [ ! -d "$findbugs_home" ]; then
fi
# Choose default java binary
@@ -44,7 +44,7 @@
# Default UI is GUI2
fb_launchui="2"
-@@ -133,7 +110,7 @@
+@@ -133,7 +110,7 @@ while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; d
jvm_user_props="-D$1 $jvm_user_props"
shift
;;
@@ -53,7 +53,7 @@
-D*=*)
jvm_user_props="$1 $user_props"
shift
-@@ -158,17 +135,9 @@
+@@ -158,18 +135,10 @@ while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; d
done
@@ -67,9 +67,8 @@
#
# Launch JVM
#
--exec "$fb_javacmd" \
+ exec "$fb_javacmd" \
- -classpath "$fb_appjar$fb_pathsep$CLASSPATH" \
-+JAVA_VERSION="1.6+" exec "$fb_javacmd" \
-Dfindbugs.home="$findbugs_home" \
$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \
-Dfindbugs.launchUI=$fb_launchui \
Index: head/devel/jcmdline/Makefile
===================================================================
--- head/devel/jcmdline/Makefile
+++ head/devel/jcmdline/Makefile
@@ -13,7 +13,6 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/devel/jiic/Makefile
===================================================================
--- head/devel/jiic/Makefile
+++ head/devel/jiic/Makefile
@@ -16,7 +16,6 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES
ALL_TARGET= jar
Index: head/devel/jsap/Makefile
===================================================================
--- head/devel/jsap/Makefile
+++ head/devel/jsap/Makefile
@@ -12,7 +12,6 @@
COMMENT= Java package to parse command-line arguments
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/devel/leiningen/Makefile
===================================================================
--- head/devel/leiningen/Makefile
+++ head/devel/leiningen/Makefile
@@ -18,7 +18,6 @@
USES= shebangfix
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
NO_BUILD= yes
Index: head/devel/libvirt-java/Makefile
===================================================================
--- head/devel/libvirt-java/Makefile
+++ head/devel/libvirt-java/Makefile
@@ -18,7 +18,6 @@
junit>=4.8.2:java/junit
USE_JAVA= YES
-JAVA_VERSION= 1.6+
USE_ANT= YES
ALL_TARGET= jar
Index: head/devel/looks/Makefile
===================================================================
--- head/devel/looks/Makefile
+++ head/devel/looks/Makefile
@@ -15,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/jgoodies-${PORTNAME}-${PORTVERSION}
Index: head/devel/maven/Makefile
===================================================================
--- head/devel/maven/Makefile
+++ head/devel/maven/Makefile
@@ -3,6 +3,7 @@
PORTNAME= maven
DISTVERSION= 3.6.1
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= APACHE/maven/maven-3/${DISTVERSION}/binaries
DISTNAME= apache-maven-${DISTVERSION}-bin
@@ -19,7 +20,6 @@
CPE_PRODUCT= maven
CPE_VENDOR= apache
-JAVA_VERSION= 1.7+
NO_BUILD= yes
NO_ARCH= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/devel/maven/files/mvn.sh.in
===================================================================
--- head/devel/maven/files/mvn.sh.in
+++ head/devel/maven/files/mvn.sh.in
@@ -38,7 +38,7 @@
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}" \
Index: head/devel/maven3/Makefile
===================================================================
--- head/devel/maven3/Makefile
+++ head/devel/maven3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= maven3
DISTVERSION= 3.0.5
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= APACHE/maven/binaries
DISTNAME= apache-maven-${DISTVERSION}-bin
@@ -19,7 +20,6 @@
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION}
Index: head/devel/maven3/files/mvn.sh.in
===================================================================
--- head/devel/maven3/files/mvn.sh.in
+++ head/devel/maven3/files/mvn.sh.in
@@ -12,7 +12,7 @@
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 "$@"
Index: head/devel/maven31/Makefile
===================================================================
--- head/devel/maven31/Makefile
+++ head/devel/maven31/Makefile
@@ -3,7 +3,7 @@
PORTNAME= maven31
DISTVERSION= 3.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel java
MASTER_SITES= APACHE/maven/binaries
DISTNAME= apache-maven-${DISTVERSION}-bin
@@ -20,7 +20,6 @@
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION}
Index: head/devel/maven31/files/mvn.sh.in
===================================================================
--- head/devel/maven31/files/mvn.sh.in
+++ head/devel/maven31/files/mvn.sh.in
@@ -12,7 +12,7 @@
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 "$@"
Index: head/devel/maven33/Makefile
===================================================================
--- head/devel/maven33/Makefile
+++ head/devel/maven33/Makefile
@@ -2,6 +2,7 @@
PORTNAME= maven33
DISTVERSION= 3.3.9
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= APACHE/maven/maven-3/${DISTVERSION}/binaries
DISTNAME= apache-maven-${DISTVERSION}-bin
@@ -18,7 +19,6 @@
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION}
Index: head/devel/maven33/files/mvn.sh.in
===================================================================
--- head/devel/maven33/files/mvn.sh.in
+++ head/devel/maven33/files/mvn.sh.in
@@ -37,7 +37,7 @@
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}" \
Index: head/devel/netscape-java40/Makefile
===================================================================
--- head/devel/netscape-java40/Makefile
+++ head/devel/netscape-java40/Makefile
@@ -17,7 +17,6 @@
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror auto-accept
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/devel/ocaml-camljava/Makefile
===================================================================
--- head/devel/ocaml-camljava/Makefile
+++ head/devel/ocaml-camljava/Makefile
@@ -13,7 +13,6 @@
USE_OCAML= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
post-patch:
@${REINPLACE_CMD} -e "s,^\(JAVAC=\).*,\1${JAVAC},g" \
Index: head/devel/oozie/Makefile
===================================================================
--- head/devel/oozie/Makefile
+++ head/devel/oozie/Makefile
@@ -29,7 +29,6 @@
USES= shebangfix
USE_JAVA= yes
-JAVA_VERSION= 1.7+
TOMCAT_VERSION= 6.0.43
HADOOP_VERSION= 2.7.2 # Matches devel/hadoop2
SHEBANG_FILES= client/src/main/bin/oozie distro/src/main/bin/addtowar.sh distro/src/main/bin/oozied.sh distro/src/main/bin/oozie-setup.sh distro/src/main/bin/oozie-sys.sh tools/src/main/bin/ooziedb.sh core/src/main/conf/oozie-env.sh
Index: head/devel/p5-Inline-Java/Makefile
===================================================================
--- head/devel/p5-Inline-Java/Makefile
+++ head/devel/p5-Inline-Java/Makefile
@@ -18,7 +18,6 @@
p5-Inline-C>=0.62:devel/p5-Inline-C
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
MAKE_JOBS_UNSAFE= yes
Index: head/devel/p5-Java/Makefile
===================================================================
--- head/devel/p5-Java/Makefile
+++ head/devel/p5-Java/Makefile
@@ -15,7 +15,6 @@
USES= perl5
USE_PERL5= configure
USE_JAVA= yes
-JAVA_VERSION= 1.6+
post-patch:
${RM} ${WRKSRC}/java_server_install.pl
Index: head/devel/pig/Makefile
===================================================================
--- head/devel/pig/Makefile
+++ head/devel/pig/Makefile
@@ -24,7 +24,6 @@
BROKEN= tries to make outbound http connection during build phase breaking tinderbox. Software itself does not have known issues, remove this BROKEN line and build your own package
USE_JAVA= yes
-JAVA_VERSION= 1.7+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
PLIST_SUB= PORTVERSION="${PORTVERSION}"
Index: head/devel/pmd/Makefile
===================================================================
--- head/devel/pmd/Makefile
+++ head/devel/pmd/Makefile
@@ -16,7 +16,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
PLIST_SUB+= PORTVERSION=${PORTVERSION}
Index: head/devel/py-jcc/Makefile
===================================================================
--- head/devel/py-jcc/Makefile
+++ head/devel/py-jcc/Makefile
@@ -24,7 +24,6 @@
USE_PYTHON= distutils autoplist
PYDISTUTILS_PKGNAME= JCC
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_VENDOR= openjdk
JCC_INCLUDES= '${JAVA_HOME}/include;${JAVA_HOME}/include/freebsd'
Index: head/devel/py-jep/Makefile
===================================================================
--- head/devel/py-jep/Makefile
+++ head/devel/py-jep/Makefile
@@ -19,7 +19,6 @@
CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME}
MAKE_ENV= JAVA_HOME=${JAVA_HOME}
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USE_LDCONFIG= yes
PLIST_SUB+= VERSION=${PORTVERSION}
Index: head/devel/pycharm-ce/Makefile
===================================================================
--- head/devel/pycharm-ce/Makefile
+++ head/devel/pycharm-ce/Makefile
@@ -19,7 +19,6 @@
USES= python:run shebangfix
SHEBANG_FILES= bin/printenv.py bin/restart.py
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_ARCH= yes
NO_BUILD= yes
Index: head/devel/sabre/Makefile
===================================================================
--- head/devel/sabre/Makefile
+++ head/devel/sabre/Makefile
@@ -16,7 +16,6 @@
USES= dos2unix zip
DOS2UNIX_GLOB= *.xml *.java
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= dist
Index: head/devel/simian/Makefile
===================================================================
--- head/devel/simian/Makefile
+++ head/devel/simian/Makefile
@@ -39,7 +39,6 @@
.if ${PORT_OPTIONS:MJAVA}
USE_JAVA= yes
-JAVA_VERSION= 1.6+
PLIST_SUB+= JAVA=""
SUB_LIST+= JAVA=""
.else
Index: head/devel/smc/Makefile
===================================================================
--- head/devel/smc/Makefile
+++ head/devel/smc/Makefile
@@ -13,7 +13,6 @@
COMMENT= The State Machine Compiler
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PORTEXAMPLES= *
Index: head/devel/soapui/Makefile
===================================================================
--- head/devel/soapui/Makefile
+++ head/devel/soapui/Makefile
@@ -25,7 +25,7 @@
USES= cpe
CPE_VENDOR= smartbear
-USE_JAVA= 1.7+
+USE_JAVA= yes
WRKSRC= ${WRKDIR}/SoapUI-${PORTVERSION}
REINPLACE_ARGS= -i ''
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/devel/sonar-ant-task/Makefile
===================================================================
--- head/devel/sonar-ant-task/Makefile
+++ head/devel/sonar-ant-task/Makefile
@@ -25,7 +25,6 @@
CPE_VENDOR= sonarsource
USE_JAVA= yes
-JAVA_VERSION= 1.7+
SUB_FILES= pkg-message
PLIST_FILES= ${DATADIR_REL}/sonar-ant-task.jar
Index: head/devel/sonar-scanner-cli/Makefile
===================================================================
--- head/devel/sonar-scanner-cli/Makefile
+++ head/devel/sonar-scanner-cli/Makefile
@@ -22,7 +22,6 @@
CPE_VENDOR= sonarsource
USE_JAVA= yes
-JAVA_VERSION= 1.7+
SR= sonar-runner
SQ_CLI= sonar-scanner
Index: head/devel/sonarqube/Makefile
===================================================================
--- head/devel/sonarqube/Makefile
+++ head/devel/sonarqube/Makefile
@@ -29,7 +29,6 @@
DOS2UNIX_GLOB= *.properties *.conf
USE_JAVA= yes
-JAVA_VERSION= 1.7+
SQ_FILE= sonar.sh
SQ_HOME= ${PREFIX}/share/${PORTNAME}
Index: head/devel/spark/Makefile
===================================================================
--- head/devel/spark/Makefile
+++ head/devel/spark/Makefile
@@ -25,7 +25,6 @@
USES= python:2.7 shebangfix
USE_JAVA= yes
-JAVA_VERSION= 1.7+
MAKE_ENV+= JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=512m"
SHEBANG_FILES= bin/sparkR
Index: head/devel/statcvs/Makefile
===================================================================
--- head/devel/statcvs/Makefile
+++ head/devel/statcvs/Makefile
@@ -20,7 +20,6 @@
USES= zip
USE_JAVA= yes
USE_ANT= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: head/devel/statsvn/Makefile
===================================================================
--- head/devel/statsvn/Makefile
+++ head/devel/statsvn/Makefile
@@ -21,7 +21,6 @@
USES= zip
USE_JAVA= yes
USE_ANT= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
ALL_TARGET= dist
Index: head/devel/swank-clojure/Makefile
===================================================================
--- head/devel/swank-clojure/Makefile
+++ head/devel/swank-clojure/Makefile
@@ -11,7 +11,6 @@
USE_GITHUB= yes
GH_ACCOUNT= technomancy
USE_JAVA= yes
-JAVA_VERSION= 1.6+
PLIST_FILES= %%JAVAJARDIR%%/swank-clojure-1.2.1.jar
Index: head/devel/tijmp/Makefile
===================================================================
--- head/devel/tijmp/Makefile
+++ head/devel/tijmp/Makefile
@@ -18,7 +18,6 @@
INSTALL_TARGET= install-strip
USES= gmake libtool
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
JAVA_BUILD= jdk
USE_LDCONFIG= yes
Index: head/devel/tinylaf/Makefile
===================================================================
--- head/devel/tinylaf/Makefile
+++ head/devel/tinylaf/Makefile
@@ -13,7 +13,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
JARFILE= ${PORTNAME}.jar tinycp.jar
Index: head/devel/violet/Makefile
===================================================================
--- head/devel/violet/Makefile
+++ head/devel/violet/Makefile
@@ -15,7 +15,6 @@
LICENSE= GPLv2
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= YES
Index: head/dns/crossip/Makefile
===================================================================
--- head/dns/crossip/Makefile
+++ head/dns/crossip/Makefile
@@ -3,7 +3,7 @@
PORTNAME= crossip
DISTVERSION= 1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= dns java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CrossIP%20${PORTVERSION}
@@ -14,7 +14,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
Index: head/dns/crossip/files/crossip.sh.in
===================================================================
--- head/dns/crossip/files/crossip.sh.in
+++ head/dns/crossip/files/crossip.sh.in
@@ -2,5 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" \
- exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/CrossIP.jar" "${@}"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/CrossIP.jar" "${@}"
Index: head/dns/dnsjava/Makefile
===================================================================
--- head/dns/dnsjava/Makefile
+++ head/dns/dnsjava/Makefile
@@ -15,7 +15,6 @@
USE_GITHUB= yes
USE_JAVA= yes
-JAVA_VERSION= 7+
USE_ANT= yes
ALL_TARGET= jar
NO_ARCH= yes
Index: head/editors/drjava/Makefile
===================================================================
--- head/editors/drjava/Makefile
+++ head/editors/drjava/Makefile
@@ -3,7 +3,7 @@
PORTNAME= drjava
DISTVERSION= 20140826-r5761
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= editors java
MASTER_SITES= SF/${PORTNAME}/1.%20DrJava%20Stable%20Releases/${PORTNAME}-stable-${DISTVERSION}
DISTNAME= ${PORTNAME}-stable-${PORTVERSION:S|.|-|g}
@@ -15,7 +15,6 @@
NO_BUILD= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= ${PORTNAME}
SUB_LIST= DRJAVAJAR=${DRJAVAJAR}
Index: head/editors/drjava/files/drjava.in
===================================================================
--- head/editors/drjava/files/drjava.in
+++ head/editors/drjava/files/drjava.in
@@ -1,4 +1,3 @@
#!/bin/sh
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" \
exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/%%DRJAVAJAR%% "$@"
Index: head/editors/jedit/Makefile
===================================================================
--- head/editors/jedit/Makefile
+++ head/editors/jedit/Makefile
@@ -3,6 +3,7 @@
PORTNAME= jedit
PORTVERSION= 5.5.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors java
MASTER_SITES= SF
@@ -23,7 +24,6 @@
USES= cpe xorg
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_XORG= x11
NO_BUILD= yes
Index: head/editors/jedit/files/jedit.sh.in
===================================================================
--- head/editors/jedit/files/jedit.sh.in
+++ head/editors/jedit/files/jedit.sh.in
@@ -4,4 +4,4 @@
# Java heap size, in megabytes
JAVA_HEAP_SIZE=32
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"
+"%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"
Index: head/editors/omegaT/Makefile
===================================================================
--- head/editors/omegaT/Makefile
+++ head/editors/omegaT/Makefile
@@ -2,6 +2,7 @@
PORTNAME= omegaT
DISTVERSION= 3.6.0
+PORTREVISION= 1
CATEGORIES= editors java x11
MASTER_SITES= SF/${PORTNAME:tl}/OmegaT%20-%20Standard/OmegaT%20${DISTVERSION}%20update%204/
DISTNAME= OmegaT_${DISTVERSION}_04_Source
@@ -24,7 +25,6 @@
USE_ANT= yes
USE_JAVA= yes
JAVA_VENDOR= openjdk
-JAVA_VERSION= 1.7+
JAVA_BUILD= yes
JAVA_RUN= yes
NO_WRKSUBDIR= yes
Index: head/editors/omegaT/files/omegaT.sh.in
===================================================================
--- head/editors/omegaT/files/omegaT.sh.in
+++ head/editors/omegaT/files/omegaT.sh.in
@@ -9,4 +9,4 @@
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" "$@"
Index: head/editors/openoffice-4/Makefile
===================================================================
--- head/editors/openoffice-4/Makefile
+++ head/editors/openoffice-4/Makefile
@@ -105,7 +105,6 @@
JAVA_BUILD= jdk
JAVA_RUN= jdk
JAVA_VENDOR= openjdk
-JAVA_VERSION= 1.6+
USE_PERL5= build
USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
xinerama xrandr xrender xt
Index: head/editors/openoffice-devel/Makefile
===================================================================
--- head/editors/openoffice-devel/Makefile
+++ head/editors/openoffice-devel/Makefile
@@ -108,7 +108,6 @@
JAVA_BUILD= jdk
JAVA_RUN= jdk
JAVA_VENDOR= openjdk
-JAVA_VERSION= 1.6+
USE_PERL5= build
USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \
xinerama xrandr xrender xt
Index: head/editors/treeform/Makefile
===================================================================
--- head/editors/treeform/Makefile
+++ head/editors/treeform/Makefile
@@ -13,7 +13,6 @@
USES= zip
NO_BUILD= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= treeform
WRKSRC= ${WRKDIR}/TreeForm
Index: head/emulators/javatari/Makefile
===================================================================
--- head/emulators/javatari/Makefile
+++ head/emulators/javatari/Makefile
@@ -3,6 +3,7 @@
PORTNAME= javatari
PORTVERSION= 4.1
+PORTREVISION= 1
CATEGORIES= emulators java
MASTER_SITES= http://javatari.org/java/files/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
@@ -19,7 +20,6 @@
EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \
bin/javatari
Index: head/emulators/javatari/files/javatari.in
===================================================================
--- head/emulators/javatari/files/javatari.in
+++ head/emulators/javatari/files/javatari.in
@@ -3,6 +3,5 @@
set JAVA = "%%LOCALBASE%%/bin/java"
set JARPATH = "%%JAVALIBDIR%%"
-setenv JAVA_VERSION "%%JAVA_VERSION%%"
exec "${JAVA}" -jar %%JAVAJARDIR%%/%%JARFILE%%
Index: head/finance/jgnash/Makefile
===================================================================
--- head/finance/jgnash/Makefile
+++ head/finance/jgnash/Makefile
@@ -20,7 +20,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_VENDOR= openjdk
NO_BUILD= yes
Index: head/finance/venice/Makefile
===================================================================
--- head/finance/venice/Makefile
+++ head/finance/venice/Makefile
@@ -3,6 +3,7 @@
PORTNAME= venice
DISTVERSION= 0.751beta
+PORTREVISION= 1
CATEGORIES= finance java
MASTER_SITES= SF/mov/${PORTNAME}/0.751%20beta/ \
SF/nemysisfreebsdp/:icons
@@ -17,7 +18,6 @@
USES= gnome
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PORTDOCS= *
Index: head/finance/venice/files/venice.in
===================================================================
--- head/finance/venice/files/venice.in
+++ head/finance/venice/files/venice.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/venice.jar" "${@}"
Index: head/ftp/jftp/Makefile
===================================================================
--- head/ftp/jftp/Makefile
+++ head/ftp/jftp/Makefile
@@ -13,7 +13,6 @@
LICENSE= GPLv2
-JAVA_VERSION= 1.6+
NO_BUILD= yes
USE_JAVA= yes
WRKSRC= ${WRKDIR}/j-ftp
Index: head/games/blackjackclient/Makefile
===================================================================
--- head/games/blackjackclient/Makefile
+++ head/games/blackjackclient/Makefile
@@ -3,6 +3,7 @@
PORTNAME= BlackjackClient
PORTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= games java
MASTER_SITES= SF/t-blackjack/
DISTNAME= t-blackjack-beta
@@ -14,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.7+
PLIST_FILES= bin/${PORTNAME} \
${JAVAJARDIR}/${PORTNAME}.jar
SUB_FILES= ${PORTNAME}.sh
Index: head/games/blackjackclient/files/BlackjackClient.sh.in
===================================================================
--- head/games/blackjackclient/files/BlackjackClient.sh.in
+++ head/games/blackjackclient/files/BlackjackClient.sh.in
@@ -1,3 +1,3 @@
#!/bin/sh
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/BlackjackClient.jar"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/BlackjackClient.jar"
Index: head/games/castlevox/Makefile
===================================================================
--- head/games/castlevox/Makefile
+++ head/games/castlevox/Makefile
@@ -3,7 +3,7 @@
PORTNAME= CastleVox
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games java
MASTER_SITES= http://sillysoft.net/download/
DISTNAME= ${PORTNAME}-linux
@@ -14,7 +14,6 @@
BROKEN= unfetchable
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/games/castlevox/files/CastleVox.in
===================================================================
--- head/games/castlevox/files/CastleVox.in
+++ head/games/castlevox/files/CastleVox.in
@@ -2,7 +2,5 @@
#
# $FreeBSD$
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/VoxCore.jar" "${@}"
Index: head/games/dmjava/Makefile
===================================================================
--- head/games/dmjava/Makefile
+++ head/games/dmjava/Makefile
@@ -16,7 +16,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
do-install:
Index: head/games/domination/Makefile
===================================================================
--- head/games/domination/Makefile
+++ head/games/domination/Makefile
@@ -3,6 +3,7 @@
PORTNAME= domination
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= games java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME:S/d/D/}/${PORTVERSION}/:game \
http://domination.sourceforge.net/maps/
@@ -19,7 +20,6 @@
USES= dos2unix zip:infozip
DOS2UNIX_GLOB= *.txt *.ini *.htm *.cards *.map
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME:S/d/D/}
Index: head/games/domination/files/domination-FlashGUI.in
===================================================================
--- head/games/domination/files/domination-FlashGUI.in
+++ head/games/domination/files/domination-FlashGUI.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-cp Domination.jar net.yura.domination.ui.flashgui.MainMenu "${@}"
Index: head/games/domination/files/domination-Increment1GUI.in
===================================================================
--- head/games/domination/files/domination-Increment1GUI.in
+++ head/games/domination/files/domination-Increment1GUI.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-cp Domination.jar net.yura.domination.ui.increment1gui.Increment1Frame "${@}"
Index: head/games/domination/files/domination-SimpleGUI.in
===================================================================
--- head/games/domination/files/domination-SimpleGUI.in
+++ head/games/domination/files/domination-SimpleGUI.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-cp Domination.jar net.yura.domination.ui.simplegui.RiskGUI "${@}"
Index: head/games/domination/files/domination-SwingGUI.in
===================================================================
--- head/games/domination/files/domination-SwingGUI.in
+++ head/games/domination/files/domination-SwingGUI.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-cp Domination.jar net.yura.domination.ui.swinggui.SwingGUIFrame "${@}"
Index: head/games/freecol/Makefile
===================================================================
--- head/games/freecol/Makefile
+++ head/games/freecol/Makefile
@@ -17,7 +17,6 @@
NO_BUILD= yes
SUB_FILES= freecol
USE_JAVA= yes
-JAVA_VERSION= 1.6+
PLIST_FILES= bin/freecol \
${DESKTOPDIR:S,^${PREFIX}/,,}/freecol.desktop
Index: head/games/java-games-suite/Makefile
===================================================================
--- head/games/java-games-suite/Makefile
+++ head/games/java-games-suite/Makefile
@@ -3,6 +3,7 @@
PORTNAME= java-games-suite
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= games java
MASTER_SITES= SF/javagamessuite
@@ -13,7 +14,6 @@
NO_ARCH= yes
-JAVA_VERSION= 1.6+
PLIST_FILES= bin/java-games-suite \
${JAVAJARDIR}/MM.jar \
${JAVAJARDIR}/reversi.jar \
Index: head/games/java-games-suite/files/java-games-suite.sh.in
===================================================================
--- head/games/java-games-suite/files/java-games-suite.sh.in
+++ head/games/java-games-suite/files/java-games-suite.sh.in
@@ -2,22 +2,22 @@
case "$1" in
mastermind)
- JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/MM.jar"
+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/MM.jar"
;;
reversi)
- JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/reversi.jar"
+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/reversi.jar"
;;
mine)
- JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Mine.jar"
+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Mine.jar"
;;
tetris)
- JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Tetris.jar"
+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Tetris.jar"
;;
rt)
- JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/RT.jar"
+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/RT.jar"
;;
number)
- JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Number.jar"
+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/Number.jar"
;;
*)
echo $"Usage: $0 {mastermind|reversi|mine|tetris|rt|number}"
Index: head/games/jchessboard/Makefile
===================================================================
--- head/games/jchessboard/Makefile
+++ head/games/jchessboard/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jchessboard
PORTVERSION= 1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games java
MASTER_SITES= SF
DISTNAME= JChessBoard-${PORTVERSION}
@@ -16,7 +16,6 @@
USES= tar:tgz
USE_ANT= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_LOCALE= en_US.ISO8859-1
NO_ARCH= yes
Index: head/games/jchessboard/files/jchessboard.in
===================================================================
--- head/games/jchessboard/files/jchessboard.in
+++ head/games/jchessboard/files/jchessboard.in
@@ -1,3 +1,3 @@
#!/bin/sh
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVASHAREDIR%%/%%PORTNAME%%/%%JARFILE%%"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVASHAREDIR%%/%%PORTNAME%%/%%JARFILE%%"
Index: head/games/jin/Makefile
===================================================================
--- head/games/jin/Makefile
+++ head/games/jin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jin
PORTVERSION= 2.14.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
@@ -25,8 +25,7 @@
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}
Index: head/games/jin/files/jin.in
===================================================================
--- head/games/jin/files/jin.in
+++ head/games/jin/files/jin.in
@@ -1,5 +1,4 @@
#!/bin/sh
# $FreeBSD$
cd %%DATADIR%%
-export JAVA_VERSION="%%JAVA_VERSION%%+"
exec "%%LOCALBASE%%/bin/java" -cp %%JAVAJARDIR%%/bsh.jar:%%JINJAR%% free.jin.JinApplication "$@"
Index: head/games/jinput/Makefile
===================================================================
--- head/games/jinput/Makefile
+++ head/games/jinput/Makefile
@@ -17,7 +17,6 @@
USES= tar:bzip2
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
JAVA_VENDOR= openjdk
USE_ANT= yes
Index: head/games/jtans/Makefile
===================================================================
--- head/games/jtans/Makefile
+++ head/games/jtans/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jtans
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games java
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_appli-${PORTVERSION}
@@ -19,7 +19,6 @@
EXTRACT_BEFORE_ARGS= # empty
EXTRACT_AFTER_ARGS= .
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
SUB_FILES= jtans.sh
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/games/jtans/files/jtans.sh.in
===================================================================
--- head/games/jtans/files/jtans.sh.in
+++ head/games/jtans/files/jtans.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar"
Index: head/games/jutils/Makefile
===================================================================
--- head/games/jutils/Makefile
+++ head/games/jutils/Makefile
@@ -18,7 +18,7 @@
GL_ACCOUNT= voidanix
GL_COMMIT= 3b2f176fdb76126c831a695b579267cf351624f5
-USE_JAVA= 6+
+USE_JAVA= yes
PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
PLIST_DIRS= ${JAVAJARDIR}/${PORTNAME}
Index: head/games/lwjgl/Makefile
===================================================================
--- head/games/lwjgl/Makefile
+++ head/games/lwjgl/Makefile
@@ -29,7 +29,6 @@
DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$
USE_JAVA= yes
USE_LDCONFIG= yes
-JAVA_VERSION= 1.7+
JAVA_OS= native
JAVA_VENDOR= openjdk
USE_ANT= yes
Index: head/games/moagg/Makefile
===================================================================
--- head/games/moagg/Makefile
+++ head/games/moagg/Makefile
@@ -22,7 +22,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PORTDOCS= AUTHORS README.txt
Index: head/games/pcgen/Makefile
===================================================================
--- head/games/pcgen/Makefile
+++ head/games/pcgen/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pcgen
PORTVERSION= 6.06.01
+PORTREVISION= 1
CATEGORIES= games java
MASTER_SITES= https://github.com/PCGen/${PORTNAME}/releases/download/${PORTVERSION}/
DISTNAME= pcgen-${PORTVERSION}-full
@@ -14,7 +15,6 @@
USES= zip
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_BUILD= yes
NO_ARCH= yes
Index: head/games/pcgen/files/pcgen.sh.in
===================================================================
--- head/games/pcgen/files/pcgen.sh.in
+++ head/games/pcgen/files/pcgen.sh.in
@@ -4,4 +4,4 @@
[ \! -d "${HOME}/.pcgen" ] && mkdir "${HOME}/.pcgen"
cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" ${PCGEN_OPTS} -jar ./pcgen.jar "$@"
+exec "%%LOCALBASE%%/bin/java" ${PCGEN_OPTS} -jar ./pcgen.jar "$@"
Index: head/games/rescue/Makefile
===================================================================
--- head/games/rescue/Makefile
+++ head/games/rescue/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rescue
PORTVERSION= 1.0.0.3
+PORTREVISION= 1
CATEGORIES= games java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME:S/r/R/}%21%20Max/${PORTVERSION}/
DISTNAME= ${PORTNAME:S/r/R/}_${PORTVERSION}
@@ -17,7 +18,6 @@
USES= dos2unix zip:infozip
DOS2UNIX_GLOB= *.txt *.htm *.css *.ini *.xml
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME:S/r/R/}
Index: head/games/rescue/files/rescue.in
===================================================================
--- head/games/rescue/files/rescue.in
+++ head/games/rescue/files/rescue.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-jar "%%DATADIR%%/Rescue.jar" "${@}"
Index: head/games/robocode-naval/Makefile
===================================================================
--- head/games/robocode-naval/Makefile
+++ head/games/robocode-naval/Makefile
@@ -2,6 +2,7 @@
PORTNAME= robocode
PORTVERSION= 0.9.2
+PORTREVISION= 1
DISTVERSIONSUFFIX= -setup
CATEGORIES= games java
MASTER_SITES= SF/${PORTNAME}/naval-robocode/${PORTVERSION}
@@ -19,7 +20,6 @@
USES= dos2unix zip
DOS2UNIX_GLOB= *.css *.team *.properties package-list MANIFEST.MF
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_EXTRACT= yes
JAVA_RUN= yes
NO_WRKSUBDIR= yes
Index: head/games/robocode-naval/files/robocode-NavalRobocode.in
===================================================================
--- head/games/robocode-naval/files/robocode-NavalRobocode.in
+++ head/games/robocode-naval/files/robocode-NavalRobocode.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
-cp "libs/robocode.jar" robocode.NavalRobocode "${@}"
Index: head/games/robocode/Makefile
===================================================================
--- head/games/robocode/Makefile
+++ head/games/robocode/Makefile
@@ -3,6 +3,7 @@
PORTNAME= robocode
PORTVERSION= 1.9.3.7
+PORTREVISION= 1
CATEGORIES= games java
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${DISTVERSION}-setup.jar
@@ -18,7 +19,6 @@
USES= dos2unix zip:infozip
DOS2UNIX_GLOB= *.css *.team *.properties package-list MANIFEST.MF
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_EXTRACT= yes
JAVA_RUN= yes
NO_WRKSUBDIR= yes
Index: head/games/robocode/files/robocode-MeleeRumble.in
===================================================================
--- head/games/robocode/files/robocode-MeleeRumble.in
+++ head/games/robocode/files/robocode-MeleeRumble.in
@@ -3,8 +3,6 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx1024M \
-cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \
roborumble.RoboRumbleAtHome ./roborumble/meleerumble.txt "${@}"
Index: head/games/robocode/files/robocode-RoboRumble.in
===================================================================
--- head/games/robocode/files/robocode-RoboRumble.in
+++ head/games/robocode/files/robocode-RoboRumble.in
@@ -3,8 +3,6 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
-cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \
roborumble.RoboRumbleAtHome ./roborumble/roborumble.txt "${@}"
Index: head/games/robocode/files/robocode-Robocode.in
===================================================================
--- head/games/robocode/files/robocode-Robocode.in
+++ head/games/robocode/files/robocode-Robocode.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
-cp "libs/robocode.jar" robocode.Robocode "${@}"
Index: head/games/robocode/files/robocode-TeamRumble.in
===================================================================
--- head/games/robocode/files/robocode-TeamRumble.in
+++ head/games/robocode/files/robocode-TeamRumble.in
@@ -3,8 +3,6 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
-cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \
roborumble.RoboRumbleAtHome ./roborumble/roborumble.txt "${@}"
Index: head/games/robocode/files/robocode-TwinDuel.in
===================================================================
--- head/games/robocode/files/robocode-TwinDuel.in
+++ head/games/robocode/files/robocode-TwinDuel.in
@@ -3,8 +3,6 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Xmx512M \
-cp "libs/robocode.jar:libs/roborumble.jar:libs/codesize-1.1.jar" \
roborumble.RoboRumbleAtHome ./roborumble/twinduel.txt "${@}"
Index: head/games/spicetrade/Makefile
===================================================================
--- head/games/spicetrade/Makefile
+++ head/games/spicetrade/Makefile
@@ -3,7 +3,7 @@
PORTNAME= spicetrade
PORTVERSION= 1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Spice%20Trade%20v${PORTVERSION}
DISTNAME= Spicetrade-${PORTVERSION}
@@ -14,7 +14,6 @@
COMMENT= Colourful 14th century Arab spice trading game
USE_JAVA= yes
-JAVA_VERSION= 1.6+
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
NO_BUILD= yes
NO_ARCH= yes
Index: head/games/spicetrade/files/spicetrade.in
===================================================================
--- head/games/spicetrade/files/spicetrade.in
+++ head/games/spicetrade/files/spicetrade.in
@@ -2,5 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" \
- exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@"
Index: head/games/stendhal/Makefile
===================================================================
--- head/games/stendhal/Makefile
+++ head/games/stendhal/Makefile
@@ -16,7 +16,6 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
USES= shebangfix
Index: head/graphics/aoi/Makefile
===================================================================
--- head/graphics/aoi/Makefile
+++ head/graphics/aoi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aoi
PORTVERSION= 3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics java
MASTER_SITES= SF/${PORTNAME}/ArtOfIllusion/${PORTVERSION} \
SF/${PORTNAME}/ArtOfIllusion-manual/${PORTVERSION}:docs
@@ -21,7 +21,6 @@
USES= zip
DOS2UNIX_FILES= ../AoI_Manual/*.html # USES=dos2unix is optional
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g}
Index: head/graphics/aoi/files/aoi.in
===================================================================
--- head/graphics/aoi/files/aoi.in
+++ head/graphics/aoi/files/aoi.in
@@ -2,7 +2,5 @@
#
# $FreeBSD$
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-jar "%%DATADIR%%/ArtOfIllusion.jar" "${@}"
Index: head/graphics/barbecue/Makefile
===================================================================
--- head/graphics/barbecue/Makefile
+++ head/graphics/barbecue/Makefile
@@ -16,7 +16,6 @@
RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:java/jdom
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
JARFILES= ${PORTNAME}-${DISTVERSION}.jar
Index: head/graphics/batik/Makefile
===================================================================
--- head/graphics/batik/Makefile
+++ head/graphics/batik/Makefile
@@ -16,7 +16,7 @@
CPE_VENDOR= apache
USES= cpe
-USE_JAVA= 1.7+
+USE_JAVA= yes
NO_ARCH= yes
NO_BUILD= yes
Index: head/graphics/cbviewer/Makefile
===================================================================
--- head/graphics/cbviewer/Makefile
+++ head/graphics/cbviewer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cbviewer
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CBViewer%200.8/ \
SF/nemysisfreebsdp/graphics/:icons
@@ -23,7 +23,6 @@
USES= dos2unix zip
DOS2UNIX_GLOB= CREDITS
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/graphics/cbviewer/files/cbviewer.in
===================================================================
--- head/graphics/cbviewer/files/cbviewer.in
+++ head/graphics/cbviewer/files/cbviewer.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-jar "%%DATADIR%%/CBViewer.jar" "${@}"
Index: head/graphics/cosmoplayer/Makefile
===================================================================
--- head/graphics/cosmoplayer/Makefile
+++ head/graphics/cosmoplayer/Makefile
@@ -22,7 +22,6 @@
RUN_DEPENDS= ${JAVALIBDIR}/java40.jar:devel/netscape-java40
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/graphics/ditaa/Makefile
===================================================================
--- head/graphics/ditaa/Makefile
+++ head/graphics/ditaa/Makefile
@@ -15,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/graphics/geoserver/Makefile
===================================================================
--- head/graphics/geoserver/Makefile
+++ head/graphics/geoserver/Makefile
@@ -15,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: head/graphics/jalbum/Makefile
===================================================================
--- head/graphics/jalbum/Makefile
+++ head/graphics/jalbum/Makefile
@@ -16,7 +16,6 @@
NO_BUILD= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
SUB_FILES= jalbum.sh
Index: head/graphics/jave6/Makefile
===================================================================
--- head/graphics/jave6/Makefile
+++ head/graphics/jave6/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jave6
PORTVERSION= 0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics java
MASTER_SITES= http://www.jave.de/developer/\
http://ikaria.informatik.uni-rostock.de/public_bsd/FreeBSD/
@@ -16,11 +16,9 @@
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:
Index: head/graphics/jave6/files/jave6.in
===================================================================
--- head/graphics/jave6/files/jave6.in
+++ head/graphics/jave6/files/jave6.in
@@ -1,5 +1,3 @@
#!/bin/sh
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar jave.jar "${@}"
Index: head/graphics/jdraw/Makefile
===================================================================
--- head/graphics/jdraw/Makefile
+++ head/graphics/jdraw/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jdraw
PORTVERSION= 1.1.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
DISTNAME= ${PORTNAME}_v${PORTVERSION}
@@ -22,7 +22,7 @@
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 @@
PLASTIC3D= "-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
RUN_DEPENDS+= ${JAVALIBDIR}/looks.jar:devel/looks
.endif
-JAVA_VERSION= 1.6+
.include <bsd.port.mk>
Index: head/graphics/jdraw/files/jdraw.in
===================================================================
--- head/graphics/jdraw/files/jdraw.in
+++ head/graphics/jdraw/files/jdraw.in
@@ -1,10 +1,6 @@
#!/bin/sh
# $FreeBSD$
-if [ -z "${JAVA_VERSION}" ]; then
- JAVA_VERSION="%%JAVA_VERSION%%"
-fi
-
LOOK_AND_FEEL="%%PLASTIC3D%%"
exec "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%" ${LOOK_AND_FEEL} -jar "%%JDRAWJAR%%" "$@"
Index: head/graphics/jogl/Makefile
===================================================================
--- head/graphics/jogl/Makefile
+++ head/graphics/jogl/Makefile
@@ -35,7 +35,6 @@
USE_LDCONFIG= yes
USE_LOCALE= en_US.UTF-8
USE_JAVA= yes
-JAVA_VERSION= 1.6+
BUILD_WRKSRC= ${WRKSRC}/jogl/make
BUILD_BINPATH= ${WRKSRC}/bin
Index: head/graphics/jpatch/Makefile
===================================================================
--- head/graphics/jpatch/Makefile
+++ head/graphics/jpatch/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jpatch
DISTVERSION= 0.4p1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JPatch%200.4%20PREVIEW%201
DISTNAME= ${PORTNAME}0_4preview1
@@ -13,7 +13,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION}
Index: head/graphics/jpatch/files/jpatch.sh.in
===================================================================
--- head/graphics/jpatch/files/jpatch.sh.in
+++ head/graphics/jpatch/files/jpatch.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@"
Index: head/graphics/libpano13/Makefile
===================================================================
--- head/graphics/libpano13/Makefile
+++ head/graphics/libpano13/Makefile
@@ -38,7 +38,6 @@
.if ${PORT_OPTIONS:MJAVA}
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
CONFIGURE_ARGS+= --with-java=${JAVA_HOME}
.else
Index: head/graphics/lightzone/Makefile
===================================================================
--- head/graphics/lightzone/Makefile
+++ head/graphics/lightzone/Makefile
@@ -41,7 +41,6 @@
USE_LDCONFIG= yes
USE_XORG= x11
JAVA_VENDOR= openjdk
-JAVA_VERSION= 1.6+
JAVA_BUILD= yes
JAVA_RUN= yes
INSTALLS_ICONS= yes
Index: head/graphics/mapyrus/Makefile
===================================================================
--- head/graphics/mapyrus/Makefile
+++ head/graphics/mapyrus/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mapyrus
PORTVERSION= 1.801
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics print java
MASTER_SITES= SF
@@ -14,8 +14,6 @@
LICENSE_FILE= ${WRKSRC}/userdoc/COPYING
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
-
-JAVA_VERSION= 1.6+
MAPYRUSDOCS= ${PORTNAME}.pdf
MAPYRUSJAR= ${PORTNAME}.jar
Index: head/graphics/mapyrus/files/mapyrus.in
===================================================================
--- head/graphics/mapyrus/files/mapyrus.in
+++ head/graphics/mapyrus/files/mapyrus.in
@@ -9,5 +9,4 @@
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}
Index: head/graphics/opendx/Makefile
===================================================================
--- head/graphics/opendx/Makefile
+++ head/graphics/opendx/Makefile
@@ -53,7 +53,6 @@
.if defined(WITH_JAVA)
ONLY_FOR_ARCHS= i386
USE_JAVA= yes
-JAVA_VERSION= 1.6+
BUILD_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
RUN_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
CONFIGURE_ARGS+= --with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \
Index: head/graphics/tintfu/Makefile
===================================================================
--- head/graphics/tintfu/Makefile
+++ head/graphics/tintfu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tintfu
PORTVERSION= 0.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
@@ -18,7 +18,6 @@
EXTRACT_AFTER_ARGS= .
NO_BUILD= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}.jar \
bin/tintfu
Index: head/graphics/tintfu/files/tintfu.sh.in
===================================================================
--- head/graphics/tintfu/files/tintfu.sh.in
+++ head/graphics/tintfu/files/tintfu.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar"
Index: head/graphics/xmlgraphics-commons/Makefile
===================================================================
--- head/graphics/xmlgraphics-commons/Makefile
+++ head/graphics/xmlgraphics-commons/Makefile
@@ -13,7 +13,7 @@
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_JAVA= 1.6+
+USE_JAVA= yes
NO_ARCH= yes
NO_BUILD= yes
Index: head/java/apache-commons-cli/Makefile
===================================================================
--- head/java/apache-commons-cli/Makefile
+++ head/java/apache-commons-cli/Makefile
@@ -14,7 +14,6 @@
LICENSE= APACHE20
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: head/java/apache-commons-lang/Makefile
===================================================================
--- head/java/apache-commons-lang/Makefile
+++ head/java/apache-commons-lang/Makefile
@@ -14,7 +14,6 @@
LICENSE= APACHE20
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= jar
Index: head/java/apache-commons-lang3/Makefile
===================================================================
--- head/java/apache-commons-lang3/Makefile
+++ head/java/apache-commons-lang3/Makefile
@@ -15,7 +15,6 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_BUILD= yes
NO_ARCH= yes
Index: head/java/apache-commons-logging/Makefile
===================================================================
--- head/java/apache-commons-logging/Makefile
+++ head/java/apache-commons-logging/Makefile
@@ -18,7 +18,6 @@
OPTIONS_DEFINE= DOCS
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
JARFILE= ${PORTNAME}-${PORTVERSION}.jar
Index: head/java/apache-commons-primitives/Makefile
===================================================================
--- head/java/apache-commons-primitives/Makefile
+++ head/java/apache-commons-primitives/Makefile
@@ -14,7 +14,6 @@
LICENSE= APACHE20
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: head/java/aparapi/Makefile
===================================================================
--- head/java/aparapi/Makefile
+++ head/java/aparapi/Makefile
@@ -22,7 +22,6 @@
USE_GITHUB= yes
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USE_ANT= yes
ALL_TARGET= dist
Index: head/java/avis/Makefile
===================================================================
--- head/java/avis/Makefile
+++ head/java/avis/Makefile
@@ -13,7 +13,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.if !defined(WITHOUT_COMPILE)
Index: head/java/berkeley-db/Makefile
===================================================================
--- head/java/berkeley-db/Makefile
+++ head/java/berkeley-db/Makefile
@@ -19,7 +19,6 @@
OPTIONS_DEFINE= DOCS EXAMPLES TEST
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USE_ANT= yes
MAKE_ENV+= JAVALIBDIR="${JAVALIBDIR}"
MAKE_ARGS+= -cp ${JAVALIBDIR}/junit.jar
Index: head/java/bouncycastle/Makefile
===================================================================
--- head/java/bouncycastle/Makefile
+++ head/java/bouncycastle/Makefile
@@ -23,7 +23,6 @@
CPE_VENDOR= ${PORTNAME}
USE_JAVA= yes
USES= cpe
-JAVA_VERSION= 1.6+
JDKMVERSION= 1.6 # ${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/}
JDKNVERSION= 16 # ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/}
USE_ANT= yes
Index: head/java/bouncycastle15/Makefile
===================================================================
--- head/java/bouncycastle15/Makefile
+++ head/java/bouncycastle15/Makefile
@@ -30,7 +30,6 @@
CPE_VENDOR= ${PORTNAME}
USE_JAVA= yes
USES= cpe
-JAVA_VERSION= 1.6+
JDKMVERSION= 1.5
JDKNVERSION= 15
USE_ANT= yes
Index: head/java/castor/Makefile
===================================================================
--- head/java/castor/Makefile
+++ head/java/castor/Makefile
@@ -16,7 +16,6 @@
USES= cpe
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}-anttasks.jar \
Index: head/java/cryptix-jce/Makefile
===================================================================
--- head/java/cryptix-jce/Makefile
+++ head/java/cryptix-jce/Makefile
@@ -12,7 +12,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
OPTIONS_DEFINE= DOCS
Index: head/java/dbvis/Makefile
===================================================================
--- head/java/dbvis/Makefile
+++ head/java/dbvis/Makefile
@@ -16,7 +16,6 @@
LICENSE_PERMS= auto-accept
USE_JAVA= yes
-JAVA_VERSION= 1.7+
JAVA_VENDOR= openjdk
NO_BUILD= yes
RESTRICTED= Redistribution is not permitted
Index: head/java/eclipse-drjava/Makefile
===================================================================
--- head/java/eclipse-drjava/Makefile
+++ head/java/eclipse-drjava/Makefile
@@ -19,7 +19,6 @@
NO_WRKSUBDIR= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
DATADIR= ${PREFIX}/lib/eclipse/plugins
Index: head/java/eclipse-ecj/Makefile
===================================================================
--- head/java/eclipse-ecj/Makefile
+++ head/java/eclipse-ecj/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ecj
PORTVERSION= 4.4.2
+PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= http://download.eclipse.org/eclipse/downloads/drops4/R-${PORTVERSION}-${DROPDATE}/
PKGNAMEPREFIX= eclipse-
@@ -20,7 +21,6 @@
USE_ANT= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= ecj.sh
SUB_LIST= PORTVERSION=${PORTVERSION}
NO_WRKSUBDIR= yes
Index: head/java/eclipse-ecj/files/ecj.sh.in
===================================================================
--- head/java/eclipse-ecj/files/ecj.sh.in
+++ head/java/eclipse-ecj/files/ecj.sh.in
@@ -1,3 +1,3 @@
#!/bin/sh
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/ecj-%%PORTVERSION%%.jar" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}"
+"%%LOCALBASE%%/bin/java" -classpath "%%JAVAJARDIR%%/ecj-%%PORTVERSION%%.jar" org.eclipse.jdt.internal.compiler.batch.Main "${@:--help}"
Index: head/java/eclipse-findbugs/Makefile
===================================================================
--- head/java/eclipse-findbugs/Makefile
+++ head/java/eclipse-findbugs/Makefile
@@ -17,7 +17,6 @@
USES= zip
NO_BUILD= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
PLIST_SUB= \
Index: head/java/eclipse-shelled/Makefile
===================================================================
--- head/java/eclipse-shelled/Makefile
+++ head/java/eclipse-shelled/Makefile
@@ -19,7 +19,6 @@
NO_BUILD= yes
NO_WRKSUBDIR= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
do-install:
Index: head/java/infobus/Makefile
===================================================================
--- head/java/infobus/Makefile
+++ head/java/infobus/Makefile
@@ -14,7 +14,6 @@
USES= zip
USE_JAVA= YES
-JAVA_VERSION= 1.6+
NO_WRKSUBDIR= yes
NO_BUILD= yes
Index: head/java/jai/Makefile
===================================================================
--- head/java/jai/Makefile
+++ head/java/jai/Makefile
@@ -14,7 +14,6 @@
USES= cpe zip
CPE_VENDOR= oracle
USE_JAVA= yes
-JAVA_VERSION= 1.6+
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
NO_BUILD= yes
Index: head/java/jakarta-bcel/Makefile
===================================================================
--- head/java/jakarta-bcel/Makefile
+++ head/java/jakarta-bcel/Makefile
@@ -12,7 +12,6 @@
NO_BUILD= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
PLIST_FILES= %%JAVAJARDIR%%/bcel.jar
Index: head/java/jakarta-commons-beanutils/Makefile
===================================================================
--- head/java/jakarta-commons-beanutils/Makefile
+++ head/java/jakarta-commons-beanutils/Makefile
@@ -23,7 +23,6 @@
USE_JAVA= yes
USE_ANT= yes
DOS2UNIX_FILES= build.xml
-JAVA_VERSION= 1.6+
ALL_TARGET= dist
MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar
Index: head/java/jakarta-commons-discovery/Makefile
===================================================================
--- head/java/jakarta-commons-discovery/Makefile
+++ head/java/jakarta-commons-discovery/Makefile
@@ -12,7 +12,6 @@
COMMENT= Java library for locating resources (including classes)
USE_JAVA= YES
-JAVA_VERSION= 1.6+
NO_BUILD= YES
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: head/java/jakarta-commons-httpclient/Makefile
===================================================================
--- head/java/jakarta-commons-httpclient/Makefile
+++ head/java/jakarta-commons-httpclient/Makefile
@@ -24,7 +24,6 @@
USES+= cpe
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES
NO_ARCH= yes
Index: head/java/jakarta-oro/Makefile
===================================================================
--- head/java/jakarta-oro/Makefile
+++ head/java/jakarta-oro/Makefile
@@ -14,7 +14,6 @@
USE_JAVA= yes
USE_ANT= yes
-JAVA_VERSION= 1.6+
ALL_TARGET= jar javadocs
JAVALIBNAME= ${PORTNAME}-${PORTVERSION}
Index: head/java/jakarta-regexp/Makefile
===================================================================
--- head/java/jakarta-regexp/Makefile
+++ head/java/jakarta-regexp/Makefile
@@ -16,7 +16,6 @@
BROKEN_armv7= fails to build: build.xml: Java returned: 1
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= test package
MAKE_ARGS= -Djakarta-site.dir=${WRKSRC}
Index: head/java/jasmin/Makefile
===================================================================
--- head/java/jasmin/Makefile
+++ head/java/jasmin/Makefile
@@ -3,6 +3,7 @@
PORTNAME= jasmin
PORTVERSION= 2.4
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= java lang
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -14,7 +15,6 @@
USE_ANT= yes
ALL_TARGET= jasmin
USE_JAVA= yes
-JAVA_VERSION= 1.6+
DOS2UNIX_REGEX= .*\.(txt|xml|j|class|java|mf|css|bnf|html)
SUB_FILES= jasmin.sh
Index: head/java/jasmin/files/jasmin.sh.in
===================================================================
--- head/java/jasmin/files/jasmin.sh.in
+++ head/java/jasmin/files/jasmin.sh.in
@@ -2,5 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" \
- exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jasmin.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jasmin.jar" "$@"
Index: head/java/java-subversion/Makefile
===================================================================
--- head/java/java-subversion/Makefile
+++ head/java/java-subversion/Makefile
@@ -10,7 +10,6 @@
USES+= compiler
USE_JAVA= yes
-JAVA_VERSION= 1.7+
JAVA_OS= native
JAVA_BUILD= yes
JAVA_RUN= yes
Index: head/java/java3d/Makefile
===================================================================
--- head/java/java3d/Makefile
+++ head/java/java3d/Makefile
@@ -21,7 +21,6 @@
USE_JAVA= yes
USE_GL= gl
USE_XORG= xt
-JAVA_VERSION= 1.6+
JAVA_VENDOR= openjdk
USE_ANT= yes
LLD_UNSAFE= yes
Index: head/java/javahelp/Makefile
===================================================================
--- head/java/javahelp/Makefile
+++ head/java/javahelp/Makefile
@@ -3,6 +3,7 @@
PORTNAME= javahelp
PORTVERSION= 2.0.05.20170719
+PORTREVISION= 1
CATEGORIES= java devel
MAINTAINER= makc@FreeBSD.org
@@ -19,7 +20,6 @@
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 @@
-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/
Index: head/java/javahelp/files/jhindexer.in
===================================================================
--- head/java/javahelp/files/jhindexer.in
+++ head/java/javahelp/files/jhindexer.in
@@ -1,5 +1,3 @@
#!/bin/sh
-export JAVA_VERSION=%%JAVA_VER%%
-
exec java -cp %%JAVALIBDIR%%/jhall.jar com.sun.java.help.search.Indexer "$@"
Index: head/java/javahelp/files/jhsearch.in
===================================================================
--- head/java/javahelp/files/jhsearch.in
+++ head/java/javahelp/files/jhsearch.in
@@ -1,5 +1,3 @@
#!/bin/sh
-export JAVA_VERSION=%%JAVA_VER%%
-
exec java -cp %%JAVALIBDIR%%/jhall.jar com.sun.java.help.search.QueryEngine "$@"
Index: head/java/javavmwrapper/Makefile
===================================================================
--- head/java/javavmwrapper/Makefile
+++ head/java/javavmwrapper/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= javavmwrapper
-PORTVERSION= 2.7.3
+PORTVERSION= 2.7.4
CATEGORIES= java
MASTER_SITES= # none
DISTFILES= # none
Index: head/java/javavmwrapper/src/javavm.1
===================================================================
--- head/java/javavmwrapper/src/javavm.1
+++ head/java/javavmwrapper/src/javavm.1
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 24, 2005
+.Dd November 12, 2019
.Os
.Dt JAVAVM 1
.Sh NAME
@@ -112,16 +112,12 @@
equal to the given version will be used.
.Pp
Currently allowed versions are
-.Ql 1.6 ,
-.Ql 1.6+ ,
.Ql 1.7 ,
.Ql 1.7+ ,
.Ql 1.8 ,
.Ql 1.8+ ,
.Ql 1.9 ,
.Ql 1.9+ ,
-.Ql 6 ,
-.Ql 6+ ,
.Ql 7 ,
.Ql 7+ ,
.Ql 8 ,
@@ -202,8 +198,8 @@
with
.Nm .
This is necessary if MyApp uses JNI, for instance.
-.It Ev JAVA_VERSION="6 8" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
-Execute MyApp with either a Java VM that is either version 6 or version 8.
+.It Ev JAVA_VERSION="8 11" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
+Execute MyApp with either a Java VM that is either version 8 or version 11.
.It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java
Don't invoke the Java VM, but print out information about what would have
been done.
Index: head/java/javavmwrapper/src/javavmwrapper.sh
===================================================================
--- head/java/javavmwrapper/src/javavmwrapper.sh
+++ head/java/javavmwrapper/src/javavmwrapper.sh
@@ -173,8 +173,7 @@
_VM=`dirname "${_VM}"`
_VM=`dirname "${_VM}"`
_VM=`basename "${_VM}"`
- # Consistent version numbering for various install directory names
- # including 'openjdk6', 'jdk1.6.0', 'linux-sun-jdk1.6.0', etc.
+ # Consistent version numbering for various install directory names.
VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' \
-e 's|1\.\([0-9][0-9]*\)|\1|' \
-e 's|\([0-9][0-9]*\)\.[0-9]|\1|' \
@@ -506,9 +505,6 @@
_JAVAVM_VERSION=
for version in ${JAVA_VERSION}; do
case "${version}" in
- *6+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 6 7 8 9 10 11 12"
- ;;
*7+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12"
;;
@@ -526,9 +522,6 @@
;;
12+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
- ;;
- 1.6)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 6"
;;
1.7)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 7"
Index: head/java/javavmwrapper/src/manvm.1
===================================================================
--- head/java/javavmwrapper/src/manvm.1
+++ head/java/javavmwrapper/src/manvm.1
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 12, 2006
+.Dd November 12, 2019
.Os
.Dt MANVM 1
.Sh NAME
@@ -100,16 +100,12 @@
greater than or equal to the given version will be used.
.Pp
Currently allowed versions are
-.Ql 1.6 ,
-.Ql 1.6+ ,
.Ql 1.7 ,
.Ql 1.7+ ,
.Ql 1.8 ,
.Ql 1.8+ ,
.Ql 1.9 ,
.Ql 1.9+ ,
-.Ql 6 ,
-.Ql 6+ ,
.Ql 7 ,
.Ql 7+ ,
.Ql 8 ,
Index: head/java/javavmwrapper/src/registervm.1
===================================================================
--- head/java/javavmwrapper/src/registervm.1
+++ head/java/javavmwrapper/src/registervm.1
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 24, 2005
+.Dd November 12, 2019
.Os
.Dt REGISTERVM 1
.Sh NAME
@@ -58,12 +58,12 @@
.El
.Sh EXAMPLES
.Bl -tag -width indent
-.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/jdk1.6.0/bin/java
-Register %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
+.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/openjdk11/bin/java
+Register %%LOCALBASE%%/openjdk11/bin/java as a possible choice of
Java VM for
.Nm javavm .
-.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/jdk1.6.0/bin/java
-Remove %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
+.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/openjdk11/bin/java
+Remove %%LOCALBASE%%/openjdk11/bin/java as a possible choice of
Java VM for
.Nm javavm .
.El
Index: head/java/jaxen/Makefile
===================================================================
--- head/java/jaxen/Makefile
+++ head/java/jaxen/Makefile
@@ -12,7 +12,6 @@
COMMENT= Java XPath Engine
USE_JAVA= YES
-JAVA_VERSION= 1.6+
NO_BUILD= YES
JARFILES= jaxen-core.jar jaxen-dom.jar jaxen-dom4j.jar jaxen-exml.jar jaxen-full.jar jaxen-jdom.jar lib/saxpath.jar
Index: head/java/jcalendar/Makefile
===================================================================
--- head/java/jcalendar/Makefile
+++ head/java/jcalendar/Makefile
@@ -11,7 +11,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
WRKSRC= ${WRKDIR}/src
PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \
Index: head/java/jcommon/Makefile
===================================================================
--- head/java/jcommon/Makefile
+++ head/java/jcommon/Makefile
@@ -16,7 +16,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
OPTIONS_DEFINE= COMPILE DOCS
OPTIONS_DEFAULT=COMPILE
Index: head/java/jd-gui/Makefile
===================================================================
--- head/java/jd-gui/Makefile
+++ head/java/jd-gui/Makefile
@@ -19,7 +19,6 @@
USE_GITHUB= yes
GH_ACCOUNT= java-decompiler
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_ARCH= yes
NO_BUILD= yes
Index: head/java/jdbcpool/Makefile
===================================================================
--- head/java/jdbcpool/Makefile
+++ head/java/jdbcpool/Makefile
@@ -13,7 +13,6 @@
BROKEN= unfetchable
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PORTDOCS= CHANGES LICENSE README
Index: head/java/jdom/Makefile
===================================================================
--- head/java/jdom/Makefile
+++ head/java/jdom/Makefile
@@ -13,7 +13,6 @@
RUN_DEPENDS= ${JAVALIBDIR}/jaxen-jdom.jar:java/jaxen
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= package
Index: head/java/jfreechart/Makefile
===================================================================
--- head/java/jfreechart/Makefile
+++ head/java/jfreechart/Makefile
@@ -14,7 +14,6 @@
RUN_DEPENDS= ${JAVALIBDIR}/jcommon.jar:java/jcommon
USE_JAVA= yes
-JAVA_VERSION= 1.6+
OPTIONS_DEFINE= COMPILE DOCS
OPTIONS_DEFAULT=COMPILE
Index: head/java/jgraph/Makefile
===================================================================
--- head/java/jgraph/Makefile
+++ head/java/jgraph/Makefile
@@ -22,7 +22,6 @@
USES= zip
NO_WRKSUBDIR= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
.include <bsd.port.options.mk>
Index: head/java/jmf/Makefile
===================================================================
--- head/java/jmf/Makefile
+++ head/java/jmf/Makefile
@@ -13,7 +13,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= YES
WRKSRC= ${WRKDIR}/JMF-${PORTVERSION}
Index: head/java/jode/Makefile
===================================================================
--- head/java/jode/Makefile
+++ head/java/jode/Makefile
@@ -16,7 +16,6 @@
VENDOR_VERSION= 1.1.2-pre1
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NEED_JAVAC= yes
GNU_CONFIGURE= yes
USES= gmake perl5 shebangfix
Index: head/java/jomp/Makefile
===================================================================
--- head/java/jomp/Makefile
+++ head/java/jomp/Makefile
@@ -16,7 +16,6 @@
BROKEN= unfetchable
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_WRKSUBDIR= yes
Index: head/java/jta/Makefile
===================================================================
--- head/java/jta/Makefile
+++ head/java/jta/Makefile
@@ -12,7 +12,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_CDROM= See the license
Index: head/java/jump/Makefile
===================================================================
--- head/java/jump/Makefile
+++ head/java/jump/Makefile
@@ -11,7 +11,6 @@
COMMENT= Java library for arbitrary precision computations
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= jar
Index: head/java/mx4j/Makefile
===================================================================
--- head/java/mx4j/Makefile
+++ head/java/mx4j/Makefile
@@ -11,7 +11,6 @@
COMMENT= Open Source implementation of the Java Management Extensions (JMX)
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
JARFILES= mx4j-examples.jar mx4j-impl.jar mx4j-jmx.jar \
Index: head/java/servingxml/Makefile
===================================================================
--- head/java/servingxml/Makefile
+++ head/java/servingxml/Makefile
@@ -13,7 +13,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
ANT_CMD?= ${LOCALBASE}/bin/ant
ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD}
ANT_TARGETS= dist
Index: head/java/springframework/Makefile
===================================================================
--- head/java/springframework/Makefile
+++ head/java/springframework/Makefile
@@ -17,7 +17,6 @@
NO_BUILD= yes
USE_JAVA= yes
USES= zip
-JAVA_VERSION= 1.6+
OPTIONS_DEFINE= DOCS RESRCS
RESRCS_DESC= Install resource files
Index: head/java/springframework31/Makefile
===================================================================
--- head/java/springframework31/Makefile
+++ head/java/springframework31/Makefile
@@ -20,7 +20,6 @@
NO_BUILD= yes
USE_JAVA= yes
USES= zip
-JAVA_VERSION= 1.6+
OPTIONS_DEFINE= DOCS RESRCS
RESRCS_DESC= Install resource files
Index: head/java/sqlitejdbc/Makefile
===================================================================
--- head/java/sqlitejdbc/Makefile
+++ head/java/sqlitejdbc/Makefile
@@ -16,7 +16,6 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USES= gmake tar:tgz
MAKE_ENV= JAVA_HOME="${JAVA_HOME}"
ALL_TARGET= native
Index: head/java/trove4j/Makefile
===================================================================
--- head/java/trove4j/Makefile
+++ head/java/trove4j/Makefile
@@ -13,7 +13,6 @@
BROKEN= unfetchable
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PORTDOCS= javadocs AUTHORS.txt CHANGES.txt LICENSE.txt README-idea-devel.txt \
Index: head/java/wildfly10/Makefile
===================================================================
--- head/java/wildfly10/Makefile
+++ head/java/wildfly10/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wildfly10
PORTVERSION= 10.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java www
MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
DISTNAME= wildfly-${WILDFLY_VERSION}
@@ -15,7 +15,6 @@
USE_RC_SUBR= wildfly10
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USER= www
GROUP= www
VAR_DIR?= /var
Index: head/java/wildfly10/files/patch-bin_add-user.sh
===================================================================
--- head/java/wildfly10/files/patch-bin_add-user.sh
+++ head/java/wildfly10/files/patch-bin_add-user.sh
@@ -1,11 +0,0 @@
---- bin/add-user.sh.orig 2015-10-23 18:57:02 UTC
-+++ bin/add-user.sh
-@@ -7,6 +7,8 @@
- #
-
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
-
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
Index: head/java/wildfly10/files/wildfly10.in
===================================================================
--- head/java/wildfly10/files/wildfly10.in
+++ head/java/wildfly10/files/wildfly10.in
@@ -41,9 +41,6 @@
status_cmd="%%APP_SHORTNAME%%_status"
WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
%%APP_SHORTNAME%%_start ()
{
Index: head/java/wildfly11/Makefile
===================================================================
--- head/java/wildfly11/Makefile
+++ head/java/wildfly11/Makefile
@@ -3,6 +3,7 @@
PORTNAME= wildfly11
PORTVERSION= 11.0.0
+PORTREVISION= 1
CATEGORIES= java www
MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
DISTNAME= wildfly-${WILDFLY_VERSION}
@@ -14,7 +15,6 @@
USE_RC_SUBR= wildfly11
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USER= www
GROUP= www
VAR_DIR?= /var
Index: head/java/wildfly11/files/patch-bin_add-user.sh
===================================================================
--- head/java/wildfly11/files/patch-bin_add-user.sh
+++ head/java/wildfly11/files/patch-bin_add-user.sh
@@ -1,11 +0,0 @@
---- bin/add-user.sh.orig 2015-10-23 18:57:02 UTC
-+++ bin/add-user.sh
-@@ -7,6 +7,8 @@
- #
-
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
-
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
Index: head/java/wildfly11/files/wildfly11.in
===================================================================
--- head/java/wildfly11/files/wildfly11.in
+++ head/java/wildfly11/files/wildfly11.in
@@ -41,9 +41,6 @@
status_cmd="%%APP_SHORTNAME%%_status"
WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
%%APP_SHORTNAME%%_start ()
{
Index: head/java/wildfly12/Makefile
===================================================================
--- head/java/wildfly12/Makefile
+++ head/java/wildfly12/Makefile
@@ -3,6 +3,7 @@
PORTNAME= wildfly12
PORTVERSION= 12.0.0
+PORTREVISION= 1
CATEGORIES= java www
MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
DISTNAME= wildfly-${WILDFLY_VERSION}
@@ -14,7 +15,6 @@
USE_RC_SUBR= wildfly12
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USER= www
GROUP= www
VAR_DIR?= /var
Index: head/java/wildfly12/files/patch-bin_add-user.sh
===================================================================
--- head/java/wildfly12/files/patch-bin_add-user.sh
+++ head/java/wildfly12/files/patch-bin_add-user.sh
@@ -1,11 +0,0 @@
---- bin/add-user.sh.orig 2015-10-23 18:57:02 UTC
-+++ bin/add-user.sh
-@@ -7,6 +7,8 @@
- #
-
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
-
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
Index: head/java/wildfly12/files/wildfly12.in
===================================================================
--- head/java/wildfly12/files/wildfly12.in
+++ head/java/wildfly12/files/wildfly12.in
@@ -41,9 +41,6 @@
status_cmd="%%APP_SHORTNAME%%_status"
WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
%%APP_SHORTNAME%%_start ()
{
Index: head/java/wildfly13/Makefile
===================================================================
--- head/java/wildfly13/Makefile
+++ head/java/wildfly13/Makefile
@@ -2,6 +2,7 @@
PORTNAME= wildfly13
PORTVERSION= 13.0.0
+PORTREVISION= 1
CATEGORIES= java www
MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
DISTNAME= wildfly-${WILDFLY_VERSION}
@@ -13,7 +14,6 @@
USE_RC_SUBR= wildfly13
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USER= www
GROUP= www
VAR_DIR?= /var
Index: head/java/wildfly13/files/patch-bin_add-user.sh
===================================================================
--- head/java/wildfly13/files/patch-bin_add-user.sh
+++ head/java/wildfly13/files/patch-bin_add-user.sh
@@ -1,11 +0,0 @@
---- bin/add-user.sh.orig 2015-10-23 18:57:02 UTC
-+++ bin/add-user.sh
-@@ -7,6 +7,8 @@
- #
-
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
-
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
Index: head/java/wildfly13/files/wildfly13.in
===================================================================
--- head/java/wildfly13/files/wildfly13.in
+++ head/java/wildfly13/files/wildfly13.in
@@ -40,9 +40,6 @@
status_cmd="%%APP_SHORTNAME%%_status"
WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
%%APP_SHORTNAME%%_start ()
{
Index: head/java/wildfly90/Makefile
===================================================================
--- head/java/wildfly90/Makefile
+++ head/java/wildfly90/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wildfly90
PORTVERSION= 9.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java www
MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/
DISTNAME= wildfly-${WILDFLY_VERSION}
@@ -15,7 +15,6 @@
USE_RC_SUBR= wildfly90
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USER= www
GROUP= www
VAR_DIR?= /var
Index: head/java/wildfly90/files/patch-bin-add-user.sh
===================================================================
--- head/java/wildfly90/files/patch-bin-add-user.sh
+++ head/java/wildfly90/files/patch-bin-add-user.sh
@@ -1,11 +0,0 @@
---- bin/add-user.sh 2014-02-12 05:43:24.000000000 +0100
-+++ /usr/local/wildfly-9.0.0/bin/add-user.sh 2014-05-11 10:53:59.000000000 +0200
-@@ -7,6 +7,8 @@
- #
-
- DIRNAME=`dirname "$0"`
-+JAVA_VERSION="1.7+"
-+export JAVA_VERSION
-
- # OS specific support (must be 'true' or 'false').
- cygwin=false;
Index: head/java/wildfly90/files/wildfly90.in
===================================================================
--- head/java/wildfly90/files/wildfly90.in
+++ head/java/wildfly90/files/wildfly90.in
@@ -41,9 +41,6 @@
status_cmd="%%APP_SHORTNAME%%_status"
WILDFLY_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
%%APP_SHORTNAME%%_start ()
{
Index: head/java/xdoclet/Makefile
===================================================================
--- head/java/xdoclet/Makefile
+++ head/java/xdoclet/Makefile
@@ -19,7 +19,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_WRKSUBDIR= yes
NO_BUILD= yes
NO_ARCH= yes
Index: head/lang/abcl/Makefile
===================================================================
--- head/lang/abcl/Makefile
+++ head/lang/abcl/Makefile
@@ -21,7 +21,6 @@
SUB_FILES= abcl
USE_JAVA= yes
-JAVA_VERSION= 7+
USE_ANT= yes
do-install:
Index: head/lang/apache-commons-jelly/Makefile
===================================================================
--- head/lang/apache-commons-jelly/Makefile
+++ head/lang/apache-commons-jelly/Makefile
@@ -3,6 +3,7 @@
PORTNAME= commons-jelly
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= lang devel java
MASTER_SITES= APACHE_COMMONS_BINARIES
PKGNAMEPREFIX= apache-
@@ -13,7 +14,6 @@
LICENSE= APACHE20
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/lang/apache-commons-jelly/files/jelly.sh.in
===================================================================
--- head/lang/apache-commons-jelly/files/jelly.sh.in
+++ head/lang/apache-commons-jelly/files/jelly.sh.in
@@ -6,7 +6,7 @@
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}" \
Index: head/lang/bsh/Makefile
===================================================================
--- head/lang/bsh/Makefile
+++ head/lang/bsh/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bsh
DISTVERSION= 2.0b6
+PORTREVISION= 1
CATEGORIES= lang java
MAINTAINER= pfg@FreeBSD.org
@@ -15,7 +16,6 @@
GH_PROJECT= beanshell
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= jarall
Index: head/lang/bsh/files/bsh.sh.in
===================================================================
--- head/lang/bsh/files/bsh.sh.in
+++ head/lang/bsh/files/bsh.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%JARNAME%%" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%JARNAME%%" "$@"
Index: head/lang/ceylon/Makefile
===================================================================
--- head/lang/ceylon/Makefile
+++ head/lang/ceylon/Makefile
@@ -16,7 +16,6 @@
NO_BUILD= yes
USE_JAVA= yes
-JAVA_VERSION= 1.7+
JAVA_RUN= yes
PORTDATA= *
Index: head/lang/groovy/Makefile
===================================================================
--- head/lang/groovy/Makefile
+++ head/lang/groovy/Makefile
@@ -15,8 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.7+
-
NO_ARCH= yes
NO_BUILD= yes
Index: head/lang/jython/Makefile
===================================================================
--- head/lang/jython/Makefile
+++ head/lang/jython/Makefile
@@ -24,7 +24,6 @@
EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions \
LICENSE.txt LICENSE_Apache.txt
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_BUILD= yes
NO_ARCH= yes
REINPLACE_ARGS= -i ""
Index: head/lang/linux-j/Makefile
===================================================================
--- head/lang/linux-j/Makefile
+++ head/lang/linux-j/Makefile
@@ -3,7 +3,7 @@
PORTNAME= j
PORTVERSION= 504b
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang linux java
MASTER_SITES= http://www.jsoftware.com/download/
PKGNAMEPREFIX= linux-
@@ -20,7 +20,6 @@
USES= linux
USE_JAVA= yes
-JAVA_VERSION= 1.6+
ONLY_FOR_ARCHS= i386 amd64
Index: head/lang/linux-j/files/jw.sh.in
===================================================================
--- head/lang/linux-j/files/jw.sh.in
+++ head/lang/linux-j/files/jw.sh.in
@@ -6,4 +6,4 @@
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 "$@"
Index: head/lang/rhino/Makefile
===================================================================
--- head/lang/rhino/Makefile
+++ head/lang/rhino/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rhino
DISTVERSION= 1_7R4
+PORTREVISION= 1
CATEGORIES= lang java
MASTER_SITES= GHC \
LOCAL/nivit/${PORTNAME}/:swingex \
@@ -21,8 +22,6 @@
ALL_TARGET= jar
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
-
-JAVA_VERSION= 1.6+
LINEDIT_DESC= Enable line editing in the Rhino shell
LINEDIT_RUN_DEPENDS= ${JLINEJAR}:devel/jline
Index: head/lang/rhino/files/rhinoc.in
===================================================================
--- head/lang/rhino/files/rhinoc.in
+++ head/lang/rhino/files/rhinoc.in
@@ -3,4 +3,4 @@
# $FreeBSD$
#
# Rhino compiler
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.jsc.Main $@
+"%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.jsc.Main $@
Index: head/lang/rhino/files/rhinodbg.in
===================================================================
--- head/lang/rhino/files/rhinodbg.in
+++ head/lang/rhino/files/rhinodbg.in
@@ -3,4 +3,4 @@
# $FreeBSD$
#
# Rhino debugger
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.debugger.Main $@
+"%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%" org.mozilla.javascript.tools.debugger.Main $@
Index: head/lang/rhino/files/rhinosh.in
===================================================================
--- head/lang/rhino/files/rhinosh.in
+++ head/lang/rhino/files/rhinosh.in
@@ -3,4 +3,4 @@
# $FreeBSD$
#
# Rhino shell
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%:%%JLINEJAR%%" org.mozilla.javascript.tools.shell.Main $@
+"%%LOCALBASE%%/bin/java" -cp "%%RHINOJAR%%:%%JLINEJAR%%" org.mozilla.javascript.tools.shell.Main $@
Index: head/lang/sisc/Makefile
===================================================================
--- head/lang/sisc/Makefile
+++ head/lang/sisc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sisc
PORTVERSION= 1.16.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang scheme java
MASTER_SITES= SF/${PORTNAME}/SISC/${PORTVERSION}
@@ -14,7 +14,6 @@
LICENSE_COMB= dual
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
@@ -24,7 +23,7 @@
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
Index: head/lang/starlogo/Makefile
===================================================================
--- head/lang/starlogo/Makefile
+++ head/lang/starlogo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= starlogo
PORTVERSION= 2.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang java
MASTER_SITES= http://education.mit.edu/starlogo/download/
DISTNAME= ${PORTNAME}-2.0
@@ -15,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/lang/starlogo/files/starlogo.sh.in
===================================================================
--- head/lang/starlogo/files/starlogo.sh.in
+++ head/lang/starlogo/files/starlogo.sh.in
@@ -3,4 +3,4 @@
# $FreeBSD$
cd %%DATADIR%%/sample-projects && \
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@"
+"%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@"
Index: head/mail/davmail/Makefile
===================================================================
--- head/mail/davmail/Makefile
+++ head/mail/davmail/Makefile
@@ -18,7 +18,6 @@
NO_ARCH= yes
USE_ANT= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
ALL_TARGET= release
# 5.3.1
REVISION= 3079
Index: head/mail/james/Makefile
===================================================================
--- head/mail/james/Makefile
+++ head/mail/james/Makefile
@@ -3,6 +3,7 @@
PORTNAME= james
PORTVERSION= 2.3.2.1
+PORTREVISION= 1
CATEGORIES= mail java
MASTER_SITES= APACHE/${PORTNAME}/server/
DISTNAME= ${PORTNAME}-binary-${PORTVERSION}
@@ -16,7 +17,6 @@
USES= cpe
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
NO_BUILD= yes
Index: head/mail/james/files/james.in
===================================================================
--- head/mail/james/files/james.in
+++ head/mail/james/files/james.in
@@ -44,7 +44,6 @@
#
james_enable="${james_enable:-"NO"}"
-james_java_version="${james_java_version:-"%%JAVA_VERSION%%"}"
james_home="${james_home:-"%%JAMES_HOME%%"}"
james_base="${james_base:-"%%JAMES_HOME%%"}"
james_tmpdir="${james_tmpdir:-"/tmp"}"
Index: head/mail/mime4j/Makefile
===================================================================
--- head/mail/mime4j/Makefile
+++ head/mail/mime4j/Makefile
@@ -18,7 +18,6 @@
OPTIONS_DEFINE= DOCS
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
Index: head/mail/openemm2013/Makefile
===================================================================
--- head/mail/openemm2013/Makefile
+++ head/mail/openemm2013/Makefile
@@ -30,7 +30,6 @@
USES= dos2unix gmake python:2.7,run
USE_RC_SUBR= openemm2013
USE_JAVA= yes
-JAVA_VERSION= 1.7+
DOS2UNIX_GLOB= *.c *.cpp *.h *.java *.xml *.properties
CC= clang
Index: head/mail/openemm2013/files/openemm2013.in
===================================================================
--- head/mail/openemm2013/files/openemm2013.in
+++ head/mail/openemm2013/files/openemm2013.in
@@ -44,9 +44,6 @@
sendmail_pidfile="sendmail.pid"
OPENEMM_HOME="%%APP_HOME%%"
-#minimal requirements must be set for our javavmwrapper
-JAVA_VERSION="1.7+"
-export JAVA_VERSION
%%APP_SHORTNAME%%_start ()
{
Index: head/mail/openemm2015/Makefile
===================================================================
--- head/mail/openemm2015/Makefile
+++ head/mail/openemm2015/Makefile
@@ -28,7 +28,6 @@
USES= dos2unix gmake python:2.7,run
USE_RC_SUBR= openemm2015
USE_JAVA= yes
-JAVA_VERSION= 1.7+
DOS2UNIX_GLOB= *.c *.cpp *.h *.java *.xml *.properties
CC= clang
Index: head/math/cvc4/Makefile
===================================================================
--- head/math/cvc4/Makefile
+++ head/math/cvc4/Makefile
@@ -84,7 +84,7 @@
post-extract:
@${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr3.jar
@${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/antlr3
- @${ECHO_CMD} "JAVA_VERSION=1.7+ exec \"${LOCALBASE}/bin/java\" -classpath \"${WRKDIR}/antlr3.jar\" org.antlr.Tool \"\$$@\"" >> ${WRKDIR}/antlr3
+ @${ECHO_CMD} "exec \"${LOCALBASE}/bin/java\" -classpath \"${WRKDIR}/antlr3.jar\" org.antlr.Tool \"\$$@\"" >> ${WRKDIR}/antlr3
@${CHMOD} +x ${WRKDIR}/antlr3
post-patch:
Index: head/math/geonext/Makefile
===================================================================
--- head/math/geonext/Makefile
+++ head/math/geonext/Makefile
@@ -17,7 +17,6 @@
NO_BUILD= yes
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
DATA= cacerts didmat.crt geonext-batik.jar geonext.html geonext.jar \
help.jar help_de.jar help_fr.jar help_gr.jar help_it.jar \
Index: head/math/jakarta-commons-math3/Makefile
===================================================================
--- head/math/jakarta-commons-math3/Makefile
+++ head/math/jakarta-commons-math3/Makefile
@@ -24,7 +24,6 @@
USE_ANT= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_LOCALE= en_US.ISO8859-1
ALL_TARGET= jar
Index: head/math/jeuclid/Makefile
===================================================================
--- head/math/jeuclid/Makefile
+++ head/math/jeuclid/Makefile
@@ -12,7 +12,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
NO_BUILD= yes
Index: head/math/jlatexmath/Makefile
===================================================================
--- head/math/jlatexmath/Makefile
+++ head/math/jlatexmath/Makefile
@@ -17,7 +17,7 @@
RUN_DEPENDS= ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
-USE_JAVA= 1.7+
+USE_JAVA= yes
NO_ARCH= yes
NO_BUILD= yes
Index: head/math/matlab-installer/Makefile
===================================================================
--- head/math/matlab-installer/Makefile
+++ head/math/matlab-installer/Makefile
@@ -18,7 +18,6 @@
USES= linux tar:xz
USE_LINUX= dri devtools
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= linux
JAVA_RUN= yes
Index: head/math/octave/Makefile
===================================================================
--- head/math/octave/Makefile
+++ head/math/octave/Makefile
@@ -47,7 +47,6 @@
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
USE_PERL5= build
GNU_CONFIGURE= yes
-JAVA_VERSION= 1.7+
USE_QT= core gui help network opengl \
qmake_build buildtools_build linguist_build \
printsupport sql widgets \
Index: head/math/plman/Makefile
===================================================================
--- head/math/plman/Makefile
+++ head/math/plman/Makefile
@@ -17,7 +17,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
REPLACE_FILES= ${WRKSRC}/bin/${PORTNAME}
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: head/math/truthtable/Makefile
===================================================================
--- head/math/truthtable/Makefile
+++ head/math/truthtable/Makefile
@@ -3,7 +3,7 @@
PORTNAME= truthtable
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math java
MASTER_SITES= http://www.kinostudios.com/java/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
@@ -17,7 +17,6 @@
BROKEN= unfetchable
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/math/truthtable/files/truthtable.in
===================================================================
--- head/math/truthtable/files/truthtable.in
+++ head/math/truthtable/files/truthtable.in
@@ -1,4 +1,3 @@
#!/bin/sh
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" \
- exec "%%LOCALBASE%%/bin/java" -jar "%%TRUTHTABLEJAR%%" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%TRUTHTABLEJAR%%" "$@"
Index: head/misc/freeguide/Makefile
===================================================================
--- head/misc/freeguide/Makefile
+++ head/misc/freeguide/Makefile
@@ -15,7 +15,6 @@
RUN_DEPENDS= tv_cat:textproc/p5-xmltv
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
NO_ARCH= yes
Index: head/misc/jbidwatcher/Makefile
===================================================================
--- head/misc/jbidwatcher/Makefile
+++ head/misc/jbidwatcher/Makefile
@@ -3,6 +3,7 @@
PORTNAME= jbidwatcher
PORTVERSION= 2.5.6
+PORTREVISION= 1
CATEGORIES= misc java
MASTER_SITES= http://www.jbidwatcher.com/download/
@@ -13,7 +14,6 @@
USE_JAVA= yes
USE_ANT= yes
ALL_TARGET= jar
-JAVA_VERSION= 1.6+
SUB_FILES= jbidwatcher
SUB_LIST+= PORTVERSION=${PORTVERSION}
Index: head/misc/jbidwatcher/files/jbidwatcher.in
===================================================================
--- head/misc/jbidwatcher/files/jbidwatcher.in
+++ head/misc/jbidwatcher/files/jbidwatcher.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@"
Index: head/misc/pauker/Makefile
===================================================================
--- head/misc/pauker/Makefile
+++ head/misc/pauker/Makefile
@@ -12,7 +12,6 @@
COMMENT= Java-based flashcard learning using the Leitner system
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
do-install:
Index: head/misc/pipe/Makefile
===================================================================
--- head/misc/pipe/Makefile
+++ head/misc/pipe/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pipe
PORTVERSION= 2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc java
MASTER_SITES= SF/${PORTNAME}2/Pipe%202/PIPE2%20V${PORTVERSION}
DISTNAME= pipe25_rc5
@@ -15,7 +15,6 @@
NO_BUILD= yes
NO_ARCH= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= pipe.sh
Index: head/misc/pipe/files/pipe.sh.in
===================================================================
--- head/misc/pipe/files/pipe.sh.in
+++ head/misc/pipe/files/pipe.sh.in
@@ -3,4 +3,4 @@
# $FreeBSD$
cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%" RunGui
+"%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%" RunGui
Index: head/multimedia/gdialog/Makefile
===================================================================
--- head/multimedia/gdialog/Makefile
+++ head/multimedia/gdialog/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gdialog
PORTVERSION= 2.5
+PORTREVISION= 1
CATEGORIES= multimedia java
MASTER_SITES= SF/${PORTNAME}-x/${PORTNAME}-090400/${PORTVERSION}
DISTNAME= GDialog-090400-25
@@ -17,7 +18,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_WRKSUBDIR= yes
Index: head/multimedia/gdialog/files/gdialog.in
===================================================================
--- head/multimedia/gdialog/files/gdialog.in
+++ head/multimedia/gdialog/files/gdialog.in
@@ -13,4 +13,4 @@
;;
esac
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/GDialog.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/GDialog.jar" "$@"
Index: head/multimedia/libbluray/Makefile
===================================================================
--- head/multimedia/libbluray/Makefile
+++ head/multimedia/libbluray/Makefile
@@ -43,7 +43,7 @@
JAVA_CONFIGURE_ENABLE= bdjava-jar
JAVA_CONFIGURE_ENV= JDK_HOME="${JAVA_HOME}"
JAVA_USE= JAVA=yes
-JAVA_VARS= JAVA_VERSION=1.6+ JAVA_BUILD=yes JAVA_RUN=yes
+JAVA_VARS= JAVA_BUILD=yes JAVA_RUN=yes
post-patch:
@${RLN} ${WRKSRC}/jni/linux ${WRKSRC}/jni/freebsd
Index: head/multimedia/projectx/Makefile
===================================================================
--- head/multimedia/projectx/Makefile
+++ head/multimedia/projectx/Makefile
@@ -3,6 +3,7 @@
PORTNAME= projectx
PORTVERSION= 0.91.0
+PORTREVISION= 1
CATEGORIES= multimedia java
MASTER_SITES= SF/project-x/project-x/ProjectX_${PORTVERSION}.00
DISTNAME= ProjectX_${PORTVERSION}
@@ -15,7 +16,6 @@
USES= zip:infozip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= project-x.sh
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/multimedia/projectx/files/project-x.sh.in
===================================================================
--- head/multimedia/projectx/files/project-x.sh.in
+++ head/multimedia/projectx/files/project-x.sh.in
@@ -13,4 +13,4 @@
;;
esac
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/ProjectX.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/ProjectX.jar" "$@"
Index: head/net-im/convey/Makefile
===================================================================
--- head/net-im/convey/Makefile
+++ head/net-im/convey/Makefile
@@ -3,7 +3,7 @@
PORTNAME= convey
PORTVERSION= 0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im java
MASTER_SITES= http://convey.sourceforge.net/downloads/ \
http://nivi.interfree.it/tmp/convey.sourceforge.net/
@@ -14,8 +14,6 @@
USE_ANT= yes
USE_JAVA= yes
-
-JAVA_VERSION= 1.6+
MAKE_ARGS= -quiet
Index: head/net-im/convey/files/convey.sh.in
===================================================================
--- head/net-im/convey/files/convey.sh.in
+++ head/net-im/convey/files/convey.sh.in
@@ -3,4 +3,4 @@
# $FreeBSD$
cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "classes:lib/muse-0.72.jar:lib/crimson-1.1.3.jar:lib/jaxp-1.1.jar:lib/jakarta-oro-2.0.4.jar:lib/jdom-b7.jar:lib/convey-0.3.jar" org.convey.ConveyFrame
+"%%LOCALBASE%%/bin/java" -cp "classes:lib/muse-0.72.jar:lib/crimson-1.1.3.jar:lib/jaxp-1.1.jar:lib/jakarta-oro-2.0.4.jar:lib/jdom-b7.jar:lib/convey-0.3.jar" org.convey.ConveyFrame
Index: head/net-p2p/frost/Makefile
===================================================================
--- head/net-p2p/frost/Makefile
+++ head/net-p2p/frost/Makefile
@@ -3,7 +3,7 @@
PORTNAME= frost
PORTVERSION= 1.2.0.20090314
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= net-p2p java
MASTER_SITES= SF/jtc${PORTNAME}/${PORTNAME}/14-Mar-2009
@@ -14,7 +14,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
@@ -60,7 +59,6 @@
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}|; \
Index: head/net-p2p/frost/files/wrapper.sh
===================================================================
--- head/net-p2p/frost/files/wrapper.sh
+++ head/net-p2p/frost/files/wrapper.sh
@@ -1,9 +1,6 @@
#!/bin/sh
-export JAVA_VERSION
-
PREFIX="%%PREFIX%%"
-JAVA_VERSION="%%JAVA_VERSION%%"
JAVAVM="%%JAVAVM%%"
JAR_DIR="%%JAR_DIR%%"
JAR_FILE="%%JAR_FILE%%"
Index: head/net-p2p/phex/Makefile
===================================================================
--- head/net-p2p/phex/Makefile
+++ head/net-p2p/phex/Makefile
@@ -3,6 +3,7 @@
PORTNAME= phex
PORTVERSION= 3.4.2.116
+PORTREVISION= 1
CATEGORIES= net-p2p java
MASTER_SITES= SF/${PORTNAME}/Phex%20Final%20Releases/Phex%20${PORTVERSION:R}
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -14,11 +15,9 @@
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 \
Index: head/net-p2p/phex/files/phex.sh.in
===================================================================
--- head/net-p2p/phex/files/phex.sh.in
+++ head/net-p2p/phex/files/phex.sh.in
@@ -1,5 +1,3 @@
#!/bin/sh
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar phex.jar "${@}"
Index: head/net-p2p/vuze/Makefile
===================================================================
--- head/net-p2p/vuze/Makefile
+++ head/net-p2p/vuze/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vuze
PORTVERSION= 5.7.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p java
MASTER_SITES= SF/azureus/vuze/Vuze_${PORTVERSION:S/.//g}
DISTNAME= Vuze_${PORTVERSION:S/.//g}_source
Index: head/net-p2p/vuze/files/vuze.in
===================================================================
--- head/net-p2p/vuze/files/vuze.in
+++ head/net-p2p/vuze/files/vuze.in
@@ -3,7 +3,6 @@
# $FreeBSD: /tmp/pcvs/ports/net-p2p/vuze/files/vuze.in,v 1.2 2009-12-01 21:05:21 rnoland Exp $
# java
-export JAVA_VERSION="%%JAVA_VERSION%%"
export JAVA_OS="%%JAVA_OS%%"
ECLIPSE_BASE=%%LOCALBASE%%/eclipse
Index: head/net/activemq/Makefile
===================================================================
--- head/net/activemq/Makefile
+++ head/net/activemq/Makefile
@@ -16,7 +16,6 @@
USES= cpe
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_ARCH= yes
NO_BUILD= yes
Index: head/net/apache-commons-net/Makefile
===================================================================
--- head/net/apache-commons-net/Makefile
+++ head/net/apache-commons-net/Makefile
@@ -15,7 +15,6 @@
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/net/belle-sip/Makefile
===================================================================
--- head/net/belle-sip/Makefile
+++ head/net/belle-sip/Makefile
@@ -27,7 +27,6 @@
CMAKE_ARGS= -DENABLE_STATIC=NO -DENABLE_STRICT=NO -DENABLE_TESTS=NO \
-DANTLR3_JAR_PATH:FILEPATH=${WRKDIR}/antlr3.jar
JAVA_BUILD= jre
-JAVA_VERSION= 1.6+
WRKSRC= ${WRKDIR}/${DISTNAME}-0
post-extract:
Index: head/net/dimes/Makefile
===================================================================
--- head/net/dimes/Makefile
+++ head/net/dimes/Makefile
@@ -17,7 +17,6 @@
BUILD_WRKSRC= ${WRKSRC}/scripts_linux
USE_JAVA= yes
-JAVA_VERSION= 1.6+
#java-linux required
JAVA_OS= linux
DATADIR= ${JAVASHAREDIR}/dimes
Index: head/net/java-beepcore/Makefile
===================================================================
--- head/net/java-beepcore/Makefile
+++ head/net/java-beepcore/Makefile
@@ -15,7 +15,6 @@
RUN_DEPENDS= ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
OPTIONS_DEFINE= DOCS EXAMPLES
Index: head/net/jcifs/Makefile
===================================================================
--- head/net/jcifs/Makefile
+++ head/net/jcifs/Makefile
@@ -16,7 +16,6 @@
USES= tar:tgz
USE_JAVA= yes
-JAVA_VERSION= 1.6+
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
NO_ARCH= yes
NO_BUILD= yes
Index: head/net/jgroups/Makefile
===================================================================
--- head/net/jgroups/Makefile
+++ head/net/jgroups/Makefile
@@ -14,7 +14,6 @@
OPTIONS_DEFINE= DOCS
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= jar
NO_ARCH= yes
Index: head/net/jicmp/Makefile
===================================================================
--- head/net/jicmp/Makefile
+++ head/net/jicmp/Makefile
@@ -13,7 +13,6 @@
USES= libtool
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_VENDOR= openjdk
JAVA_BUILD= yes
JAVA_RUN= yes
Index: head/net/jicmp6/Makefile
===================================================================
--- head/net/jicmp6/Makefile
+++ head/net/jicmp6/Makefile
@@ -10,7 +10,6 @@
USES= libtool
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_VENDOR= openjdk
JAVA_BUILD= yes
JAVA_RUN= yes
Index: head/net/jrdesktop/Makefile
===================================================================
--- head/net/jrdesktop/Makefile
+++ head/net/jrdesktop/Makefile
@@ -14,7 +14,6 @@
LICENSE= GPLv3
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
SUB_FILES= jrdesktop
Index: head/net/jsch/Makefile
===================================================================
--- head/net/jsch/Makefile
+++ head/net/jsch/Makefile
@@ -13,7 +13,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME}.jar
Index: head/net/ldapbrowser/Makefile
===================================================================
--- head/net/ldapbrowser/Makefile
+++ head/net/ldapbrowser/Makefile
@@ -18,7 +18,6 @@
RESTRICTED= No reply from author regarding redistribution licensing
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
REINPLACE_ARGS= -i ''
Index: head/net/mpich2/Makefile
===================================================================
--- head/net/mpich2/Makefile
+++ head/net/mpich2/Makefile
@@ -96,7 +96,6 @@
.endif
CONFIGURE_ARGS+= --with-java="${JAVA_HOME}"
USE_JAVA= yes
-JAVA_VERSION= 1.6+
PLIST_SUB+= JAVA=""
PLX11= ""
BIN2STRIP+= rlog_check_timeorder rlog_print
Index: head/net/seda/Makefile
===================================================================
--- head/net/seda/Makefile
+++ head/net/seda/Makefile
@@ -12,7 +12,6 @@
COMMENT= Architecture for Highly Concurrent Server Applications
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= dist
NO_ARCH= yes
Index: head/net/spread-j/Makefile
===================================================================
--- head/net/spread-j/Makefile
+++ head/net/spread-j/Makefile
@@ -18,7 +18,6 @@
BROKEN_armv7= fails to package: java/docs/*.html: No such file or directory
USE_JAVA= YES
-JAVA_VERSION= 1.6+
PKGMESSAGE= ${WRKSRC}/../license.txt
ANT?= ${LOCALBASE}/bin/ant
Index: head/net/toonel/Makefile
===================================================================
--- head/net/toonel/Makefile
+++ head/net/toonel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= toonel
PORTVERSION= 0.0.50.50
+PORTREVISION= 1
CATEGORIES= net java
MASTER_SITES= http://www.toonel.net/generic/005050/
DISTNAME= ${PORTNAME}
@@ -16,7 +17,6 @@
NO_WRKSUBDIR= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= ${PORTNAME}.sh
SUB_LIST= JARNAME=${DISTNAME}${EXTRACT_SUFX}
Index: head/net/toonel/files/toonel.sh.in
===================================================================
--- head/net/toonel/files/toonel.sh.in
+++ head/net/toonel/files/toonel.sh.in
@@ -2,6 +2,5 @@
JAVA="%%LOCALBASE%%/bin/java"
JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@"
Index: head/portuguese/irpf-pt_BR/Makefile
===================================================================
--- head/portuguese/irpf-pt_BR/Makefile
+++ head/portuguese/irpf-pt_BR/Makefile
@@ -3,6 +3,7 @@
PORTNAME= irpf
PORTVERSION= 2014.1.4
+PORTREVISION= 1
CATEGORIES= portuguese finance java
MASTER_SITES= http://www28.receita.fazenda.gov.br/publico/programas/IRPF/2014/PGDIRPF2014/Java/zip/
PKGNAMEPREFIX?= pt_BR-
@@ -24,7 +25,6 @@
USE_JAVA= yes
JAVA_RUN= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
NO_BUILD= yes
@@ -94,7 +94,6 @@
@${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
Index: head/portuguese/irpf-pt_BR/files/wrapper.sh
===================================================================
--- head/portuguese/irpf-pt_BR/files/wrapper.sh
+++ head/portuguese/irpf-pt_BR/files/wrapper.sh
@@ -3,11 +3,8 @@
# Under a BSDL license. Copyright by Mario S F Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
-export JAVA_VERSION
-
PREFIX="%%PREFIX%%"
# java
-JAVA_VERSION="%%JAVA_VERSION%%"
JAVAVM="%%JAVAVM%%"
JAR_DIR="%%JAR_DIR%%"
JAR_FILES="%%JAR_FILES%%"
Index: head/print/pdf-renderer/Makefile
===================================================================
--- head/print/pdf-renderer/Makefile
+++ head/print/pdf-renderer/Makefile
@@ -19,7 +19,6 @@
USES= dos2unix zip
NO_WRKSUBDIR= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= jar
Index: head/science/colt/Makefile
===================================================================
--- head/science/colt/Makefile
+++ head/science/colt/Makefile
@@ -11,7 +11,6 @@
COMMENT= Java package for scalable scientific and technical computing
USE_JAVA= yes
-JAVA_VERSION= 1.6+
WRKSRC= ${WRKDIR}/${PORTNAME}
OPTIONS_DEFINE= DOCS COMPILE
Index: head/science/devisor/Makefile
===================================================================
--- head/science/devisor/Makefile
+++ head/science/devisor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= devisor
PORTVERSION= 2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= science java
MASTER_SITES= http://www.featflow.de/download/
DISTNAME= devisor${PORTVERSION}
@@ -12,7 +12,6 @@
COMMENT= Design and Visualization Software Resource for FeatFlow
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes # Sources are available though
SUB_FILES= devisorgrid.sh
Index: head/science/devisor/files/devisorgrid.sh.in
===================================================================
--- head/science/devisor/files/devisorgrid.sh.in
+++ head/science/devisor/files/devisorgrid.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" %%LOCALBASE%%/bin/java -Ddevisorgrid.home="%%DATADIR%%" -cp "%%DATADIR%%" devisorgrid "$@"
+%%LOCALBASE%%/bin/java -Ddevisorgrid.home="%%DATADIR%%" -cp "%%DATADIR%%" devisorgrid "$@"
Index: head/science/simsmith/Makefile
===================================================================
--- head/science/simsmith/Makefile
+++ head/science/simsmith/Makefile
@@ -3,6 +3,7 @@
PORTNAME= simsmith
PORTVERSION= 9.9
+PORTREVISION= 1
CATEGORIES= science hamradio
MASTER_SITES= http://ae6ty.com/Smith_Charts_files/ \
LOCAL/shurd
@@ -14,7 +15,6 @@
COMMENT= A Java-based Smith Chart program
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \
Index: head/science/simsmith/files/simsmith.in
===================================================================
--- head/science/simsmith/files/simsmith.in
+++ head/science/simsmith/files/simsmith.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" "$@"
Index: head/security/dirbuster/Makefile
===================================================================
--- head/security/dirbuster/Makefile
+++ head/security/dirbuster/Makefile
@@ -15,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
Index: head/security/i2p/Makefile
===================================================================
--- head/security/i2p/Makefile
+++ head/security/i2p/Makefile
@@ -36,7 +36,6 @@
USE_JAVA= yes
NO_ARCH= yes
JAVA_BUILD= jdk
-JAVA_VERSION= 1.6+
USE_LOCALE= en_US.UTF-8
ALL_TARGET= updater tarball
Index: head/security/iaikpkcs11wrapper/Makefile
===================================================================
--- head/security/iaikpkcs11wrapper/Makefile
+++ head/security/iaikpkcs11wrapper/Makefile
@@ -18,7 +18,6 @@
USE_JAVA= yes
DOS2UNIX_GLOB= Makefile *.c
DOS2UNIX_WRKSRC= ${WRKDIR}/src/native
-JAVA_VERSION= 1.6+
JAVA_OS= native
ALL_TARGET= release
Index: head/security/jbrofuzz/Makefile
===================================================================
--- head/security/jbrofuzz/Makefile
+++ head/security/jbrofuzz/Makefile
@@ -12,7 +12,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: head/security/owasp-dependency-check/Makefile
===================================================================
--- head/security/owasp-dependency-check/Makefile
+++ head/security/owasp-dependency-check/Makefile
@@ -6,6 +6,7 @@
PORTNAME= owasp-dependency-check
PORTVERSION= 3.1.1
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= security java
MASTER_SITES= LOCAL/pi/:source2
@@ -23,7 +24,6 @@
GH_PROJECT= DependencyCheck
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_ARCH= yes
Index: head/security/owasp-dependency-check/files/owasp-dependency-check.in
===================================================================
--- head/security/owasp-dependency-check/files/owasp-dependency-check.in
+++ head/security/owasp-dependency-check/files/owasp-dependency-check.in
@@ -10,8 +10,7 @@
#
# `--cve*` arguments fix https://github.com/jeremylong/DependencyCheck/issues/1171 until the changed URLs
# get released.
-JAVA_VERSION="%%JAVA_VERSION%%" \
- "%%LOCALBASE%%/bin/java" \
+"%%LOCALBASE%%/bin/java" \
-Dbasedir="/var/cache/owasp-dependency-check" \
-jar "%%JAVAJARDIR%%/owasp-dependency-check-%%PORTVERSION%%-jar-with-dependencies.jar" \
--cveUrl12Base "https://nvd.nist.gov/feeds/xml/cve/1.2/nvdcve-%d.xml.gz" \
Index: head/security/webscarab/Makefile
===================================================================
--- head/security/webscarab/Makefile
+++ head/security/webscarab/Makefile
@@ -15,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
WRKSRC= ${WRKDIR}/${DISTNAME}-1304
Index: head/security/xml-security/Makefile
===================================================================
--- head/security/xml-security/Makefile
+++ head/security/xml-security/Makefile
@@ -22,7 +22,6 @@
CPE_PRODUCT= xml_security_for_java
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.6+
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
USE_ANT= yes
MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES
Index: head/sysutils/hfsexplorer/Makefile
===================================================================
--- head/sysutils/hfsexplorer/Makefile
+++ head/sysutils/hfsexplorer/Makefile
@@ -20,7 +20,6 @@
USE_GITHUB= yes
GH_ACCOUNT= unsound
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
OPTIONS_DEFINE= DOCS
Index: head/sysutils/jdiskreport/Makefile
===================================================================
--- head/sysutils/jdiskreport/Makefile
+++ head/sysutils/jdiskreport/Makefile
@@ -11,7 +11,6 @@
USES= zip
USE_JAVA= YES
-JAVA_VERSION= 1.6+
PLIST_SUB= JDISKDIR=${JDISKDIR:S,${PREFIX}/,,g}
PLIST_SUB+= PORTVERSION=${PORTVERSION}
Index: head/sysutils/jvmtop/Makefile
===================================================================
--- head/sysutils/jvmtop/Makefile
+++ head/sysutils/jvmtop/Makefile
@@ -3,6 +3,7 @@
PORTNAME= jvmtop
DISTVERSION= 0.8.0-27
+PORTREVISION= 1
DISTVERSIONSUFFIX= -g5693965
CATEGORIES= sysutils java
MASTER_SITES= SF/bsdsrc/jvmtop:source2
@@ -17,7 +18,6 @@
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_ARCH= yes
Index: head/sysutils/jvmtop/files/jvmtop.sh.in
===================================================================
--- head/sysutils/jvmtop/files/jvmtop.sh.in
+++ head/sysutils/jvmtop/files/jvmtop.sh.in
@@ -1,3 +1,3 @@
#!/bin/sh
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jvmtop.jar:%%JAVA_HOME%%/lib/tools.jar" com.jvmtop.JvmTop $1
+"%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jvmtop.jar:%%JAVA_HOME%%/lib/tools.jar" com.jvmtop.JvmTop $1
Index: head/sysutils/linux-crashplan/Makefile
===================================================================
--- head/sysutils/linux-crashplan/Makefile
+++ head/sysutils/linux-crashplan/Makefile
@@ -24,7 +24,6 @@
USE_JAVA= yes
JAVA_OS= linux
-JAVA_VERSION= 1.7+
WRKSRC= ${WRKDIR}/crashplan-install
Index: head/textproc/apache-commons-digester/Makefile
===================================================================
--- head/textproc/apache-commons-digester/Makefile
+++ head/textproc/apache-commons-digester/Makefile
@@ -22,7 +22,6 @@
NO_BUILD= yes
NO_ARCH= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JARFILE= ${PORTNAME}.jar
PLIST_FILES= %%JAVAJARDIR%%/${JARFILE}
Index: head/textproc/apache-poi/Makefile
===================================================================
--- head/textproc/apache-poi/Makefile
+++ head/textproc/apache-poi/Makefile
@@ -15,7 +15,6 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
RELEASE_DATE= 20160924
Index: head/textproc/denature/Makefile
===================================================================
--- head/textproc/denature/Makefile
+++ head/textproc/denature/Makefile
@@ -20,7 +20,6 @@
USES= perl5
USE_JAVA= yes
-JAVA_VERSION= 1.6+
POD2MAN?= pod2man
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: head/textproc/dom4j/Makefile
===================================================================
--- head/textproc/dom4j/Makefile
+++ head/textproc/dom4j/Makefile
@@ -11,7 +11,6 @@
COMMENT= Open Source XML framework for Java
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
OPTIONS_DEFINE= DOCS
Index: head/textproc/fop/Makefile
===================================================================
--- head/textproc/fop/Makefile
+++ head/textproc/fop/Makefile
@@ -26,7 +26,6 @@
PORTDOCS= *
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
NO_ARCH= yes
Index: head/textproc/jalingo/Makefile
===================================================================
--- head/textproc/jalingo/Makefile
+++ head/textproc/jalingo/Makefile
@@ -3,8 +3,7 @@
PORTNAME= jalingo
PORTVERSION= 0.6.0
-PORTREVISION= 2
-#PORTREVISION= 0
+PORTREVISION= 3
CATEGORIES= textproc java
MASTER_SITES= SF/${PORTNAME}/JaLingo/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -17,7 +16,6 @@
USES= 7z
USE_ANT= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
ALL_TARGET= dist
Index: head/textproc/jalingo/files/jalingo.in
===================================================================
--- head/textproc/jalingo/files/jalingo.in
+++ head/textproc/jalingo/files/jalingo.in
@@ -1,4 +1,3 @@
#!/bin/sh
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" \
exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/%%JALINGOJAR%% "$@"
Index: head/textproc/jarnal/Makefile
===================================================================
--- head/textproc/jarnal/Makefile
+++ head/textproc/jarnal/Makefile
@@ -15,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/textproc/jaxup/Makefile
===================================================================
--- head/textproc/jaxup/Makefile
+++ head/textproc/jaxup/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jaxup
PORTVERSION= 1.01
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc java
MASTER_SITES= http://klomp.org/jaxup/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -22,7 +22,6 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_JAVA= yes
-JAVA_VERSION= 1.6+
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/textproc/jaxup/files/jaxup-xupdater.sh
===================================================================
--- head/textproc/jaxup/files/jaxup-xupdater.sh
+++ head/textproc/jaxup/files/jaxup-xupdater.sh
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" %%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@"
+%%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@"
Index: head/textproc/jdictionary/Makefile
===================================================================
--- head/textproc/jdictionary/Makefile
+++ head/textproc/jdictionary/Makefile
@@ -11,7 +11,6 @@
COMMENT= Platform independent, plugin based dictionary
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USES= zip
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: head/textproc/jdictionary/Makefile.plugin
===================================================================
--- head/textproc/jdictionary/Makefile.plugin
+++ head/textproc/jdictionary/Makefile.plugin
@@ -9,9 +9,7 @@
RUN_DEPENDS+= jdictionary:textproc/jdictionary
# WARNING: USE_JAVA is set to be able to use JAVASHAREDIR.
-# Please make sure that JAVA_VERSION here is the same as in Makefile.
USE_JAVA= yes
-JAVA_VERSION= 1.6+
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= #
Index: head/textproc/jing/Makefile
===================================================================
--- head/textproc/jing/Makefile
+++ head/textproc/jing/Makefile
@@ -18,7 +18,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
OPTIONS_DEFINE= DOCS
Index: head/textproc/lucene/Makefile
===================================================================
--- head/textproc/lucene/Makefile
+++ head/textproc/lucene/Makefile
@@ -21,7 +21,6 @@
USE_JAVA= yes
NO_BUILD= yes
NO_ARCH= yes
-JAVA_VERSION= 1.6+
OPTIONS_DEFINE= CONTRIB DOCS EXAMPLES
CONTRIB_DESC= Install contributed jars
Index: head/textproc/lucene4/Makefile
===================================================================
--- head/textproc/lucene4/Makefile
+++ head/textproc/lucene4/Makefile
@@ -17,7 +17,6 @@
USES= tar:tgz
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_BUILD= yes
NO_ARCH= yes
Index: head/textproc/lucene5/Makefile
===================================================================
--- head/textproc/lucene5/Makefile
+++ head/textproc/lucene5/Makefile
@@ -17,7 +17,6 @@
USES= tar:tgz
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_BUILD= yes
NO_ARCH= yes
Index: head/textproc/nux/Makefile
===================================================================
--- head/textproc/nux/Makefile
+++ head/textproc/nux/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nux
PORTVERSION= 1.6
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= textproc java
MASTER_SITES= http://dst.lbl.gov/ACSSoftware/nux/nux-download/releases/
@@ -15,7 +15,6 @@
${JAVALIBDIR}/saxon9.jar:textproc/saxon-devel
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: head/textproc/nux/files/fire-xquery.sh.in
===================================================================
--- head/textproc/nux/files/fire-xquery.sh.in
+++ head/textproc/nux/files/fire-xquery.sh.in
@@ -2,4 +2,4 @@
#
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "`%%LOCALBASE%%/bin/classpath`" nux.xom.tests.XQueryCommand "$@"
+exec "%%LOCALBASE%%/bin/java" -classpath "`%%LOCALBASE%%/bin/classpath`" nux.xom.tests.XQueryCommand "$@"
Index: head/textproc/ppower4/Makefile
===================================================================
--- head/textproc/ppower4/Makefile
+++ head/textproc/ppower4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ppower4
PORTVERSION= 0.9.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc java
MASTER_SITES= TEX_CTAN/support/${PORTNAME}
DISTFILES= pp4sty.zip pp4p.jar manual.pdf leveldemo.zip
@@ -18,7 +18,6 @@
USES= zip
USE_TEX= latex
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_WRKSUBDIR= yes
NO_ARCH= yes
Index: head/textproc/ppower4/files/ppower4.sh.in
===================================================================
--- head/textproc/ppower4/files/ppower4.sh.in
+++ head/textproc/ppower4/files/ppower4.sh.in
@@ -1,4 +1,4 @@
#!/bin/sh
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%JARFILE%%" "$@"
Index: head/textproc/qrcodegen/Makefile
===================================================================
--- head/textproc/qrcodegen/Makefile
+++ head/textproc/qrcodegen/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qrcodegen
PORTVERSION= 1.14.2
+PORTREVISION= 1
CATEGORIES= textproc java
MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -17,7 +18,6 @@
NO_BUILD= yes
USES= zip:infozip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SUB_FILES= qrcodegen
INSTALLFILES= FAQ.txt Installation.txt NOTICE QRCodeGen.jar Version.html
Index: head/textproc/qrcodegen/files/qrcodegen.in
===================================================================
--- head/textproc/qrcodegen/files/qrcodegen.in
+++ head/textproc/qrcodegen/files/qrcodegen.in
@@ -1,6 +1,5 @@
#!/bin/sh
cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \
- -jar QRCodeGen.jar "$@"
+exec %%LOCALBASE%%/bin/java -jar QRCodeGen.jar "$@"
Index: head/textproc/saxon-devel/Makefile
===================================================================
--- head/textproc/saxon-devel/Makefile
+++ head/textproc/saxon-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= saxon
PORTVERSION= 9.1.0.8
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc java
MASTER_SITES= SF/${PORTNAME}/Saxon-B/${PORTVERSION}:binary \
@@ -21,7 +22,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_WRKSUBDIR= yes
NO_BUILD= yes
@@ -50,7 +50,7 @@
.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}/..."
Index: head/textproc/saxon-devel/files/saxon.sh.in
===================================================================
--- head/textproc/saxon-devel/files/saxon.sh.in
+++ head/textproc/saxon-devel/files/saxon.sh.in
@@ -17,4 +17,4 @@
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}" "$@"
Index: head/textproc/saxon/Makefile
===================================================================
--- head/textproc/saxon/Makefile
+++ head/textproc/saxon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= saxon
PORTVERSION= 6.5.5
+PORTREVISION= 1
CATEGORIES= textproc java
MASTER_SITES= SF/${PORTNAME}/saxon6/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/./-/g}
@@ -14,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_WRKSUBDIR= yes
NO_BUILD= yes
NO_ARCH= yes
Index: head/textproc/saxon/files/saxon.sh.in
===================================================================
--- head/textproc/saxon/files/saxon.sh.in
+++ head/textproc/saxon/files/saxon.sh.in
@@ -8,4 +8,4 @@
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 "$@"
Index: head/textproc/trang/Makefile
===================================================================
--- head/textproc/trang/Makefile
+++ head/textproc/trang/Makefile
@@ -18,7 +18,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
OPTIONS_DEFINE= DOCS
Index: head/textproc/weka/Makefile
===================================================================
--- head/textproc/weka/Makefile
+++ head/textproc/weka/Makefile
@@ -15,7 +15,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/textproc/xalan-j/Makefile
===================================================================
--- head/textproc/xalan-j/Makefile
+++ head/textproc/xalan-j/Makefile
@@ -20,7 +20,6 @@
CPE_PRODUCT= xalan-java
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
Index: head/textproc/xerces-j/Makefile
===================================================================
--- head/textproc/xerces-j/Makefile
+++ head/textproc/xerces-j/Makefile
@@ -13,7 +13,6 @@
LICENSE= APACHE20
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/textproc/xincluder/Makefile
===================================================================
--- head/textproc/xincluder/Makefile
+++ head/textproc/xincluder/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xincluder
PORTVERSION= 1.0.d11
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc java
MASTER_SITES= ftp://ftp.ibiblio.org/pub/languages/java/javafaq/
DISTNAME= ${PORTNAME}-1.0d11
@@ -18,7 +18,6 @@
${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/textproc/xincluder/files/xincluder.sh.in
===================================================================
--- head/textproc/xincluder/files/xincluder.sh.in
+++ head/textproc/xincluder/files/xincluder.sh.in
@@ -12,4 +12,4 @@
*) 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}" "$@"
Index: head/textproc/xml-commons/Makefile
===================================================================
--- head/textproc/xml-commons/Makefile
+++ head/textproc/xml-commons/Makefile
@@ -12,7 +12,6 @@
COMMENT= Provides common XML code for Apache projects
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
NO_BUILD= yes
Index: head/textproc/xom/Makefile
===================================================================
--- head/textproc/xom/Makefile
+++ head/textproc/xom/Makefile
@@ -14,7 +14,6 @@
${JAVALIBDIR}/xalan.jar:textproc/xalan-j
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/XOM
Index: head/textproc/xp/Makefile
===================================================================
--- head/textproc/xp/Makefile
+++ head/textproc/xp/Makefile
@@ -12,7 +12,6 @@
COMMENT= XML parser written in Java
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
USES= zip
Index: head/www/apache-forrest/Makefile
===================================================================
--- head/www/apache-forrest/Makefile
+++ head/www/apache-forrest/Makefile
@@ -28,8 +28,6 @@
INSTALL_WRKSRC= ${WRKSRC}/build
-JAVA_VERSION= 1.6+
-
NO_BUILD= Yes
PLUGINSDIR= ${DATADIR}/plugins/org.apache.forrest.plugin.output.pdf
Index: head/www/archiva/Makefile
===================================================================
--- head/www/archiva/Makefile
+++ head/www/archiva/Makefile
@@ -18,7 +18,6 @@
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USE_RC_SUBR= ${PORTNAME}
Index: head/www/axis2/Makefile
===================================================================
--- head/www/axis2/Makefile
+++ head/www/axis2/Makefile
@@ -32,7 +32,6 @@
TOMCAT85_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat85
USE_JAVA= yes
-JAVA_VERSION= 1.6+
SHAREOWN= www
SHAREGRP= www
Index: head/www/dojo-shrinksafe/Makefile
===================================================================
--- head/www/dojo-shrinksafe/Makefile
+++ head/www/dojo-shrinksafe/Makefile
@@ -3,6 +3,7 @@
PORTNAME= shrinksafe
PORTVERSION= 1.9.0
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= http://download.dojotoolkit.org/release-${PORTVERSION}/ \
LOCAL/glarkin
@@ -13,7 +14,6 @@
COMMENT= JavaScript code compressor
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PLIST_FILES= bin/${PKGNAMEPREFIX}${PORTNAME} %%DATADIR%%/shrinksafe.jar \
Index: head/www/dojo-shrinksafe/files/dojo-shrinksafe.in
===================================================================
--- head/www/dojo-shrinksafe/files/dojo-shrinksafe.in
+++ head/www/dojo-shrinksafe/files/dojo-shrinksafe.in
@@ -1,3 +1,3 @@
#!/bin/sh
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar "$@"
+exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar "$@"
Index: head/www/geronimo/Makefile
===================================================================
--- head/www/geronimo/Makefile
+++ head/www/geronimo/Makefile
@@ -13,7 +13,6 @@
USES= cpe
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
CPE_VENDOR= apache
@@ -62,8 +61,7 @@
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:"
Index: head/www/glassfish4/Makefile
===================================================================
--- head/www/glassfish4/Makefile
+++ head/www/glassfish4/Makefile
@@ -11,7 +11,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.7+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/glassfish4
Index: head/www/grails/Makefile
===================================================================
--- head/www/grails/Makefile
+++ head/www/grails/Makefile
@@ -17,7 +17,6 @@
USES= zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/www/helma/Makefile
===================================================================
--- head/www/helma/Makefile
+++ head/www/helma/Makefile
@@ -21,7 +21,6 @@
USE_RC_SUBR= helma
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= clean jar
NO_ARCH= yes
Index: head/www/htmlcompressor/Makefile
===================================================================
--- head/www/htmlcompressor/Makefile
+++ head/www/htmlcompressor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= htmlcompressor
PORTVERSION= 1.5.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www java
MASTER_SITES= https://github.com/serg472/htmlcompressor/releases/download/${PORTVERSION}/
EXTRACT_SUFX= .jar
@@ -21,7 +21,6 @@
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}
Index: head/www/htmlcompressor/files/htmlcompressor.in
===================================================================
--- head/www/htmlcompressor/files/htmlcompressor.in
+++ head/www/htmlcompressor/files/htmlcompressor.in
@@ -1,4 +1,4 @@
#!/bin/sh
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar "$@"
+exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar "$@"
Index: head/www/httpasyncclient/Makefile
===================================================================
--- head/www/httpasyncclient/Makefile
+++ head/www/httpasyncclient/Makefile
@@ -19,7 +19,6 @@
CPE_VENDOR= apache
OPTIONS_DEFINE= DOCS
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
WRKSRC= ${WRKDIR}/httpcomponents-asyncclient-${DISTVERSION}
Index: head/www/httpclient/Makefile
===================================================================
--- head/www/httpclient/Makefile
+++ head/www/httpclient/Makefile
@@ -25,7 +25,6 @@
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
WRKSRC= ${WRKDIR}/httpcomponents-client-${DISTVERSION}
Index: head/www/httpcore/Makefile
===================================================================
--- head/www/httpcore/Makefile
+++ head/www/httpcore/Makefile
@@ -17,7 +17,6 @@
OPTIONS_DEFINE= DOCS
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
WRKSRC= ${WRKDIR}/httpcomponents-core-${DISTVERSION}
Index: head/www/jetty8/Makefile
===================================================================
--- head/www/jetty8/Makefile
+++ head/www/jetty8/Makefile
@@ -22,7 +22,6 @@
JDVDATE= v20140411
USE_RC_SUBR= ${PORTNAME}
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USES= python
PKGMESSAGE= ${WRKDIR}/pkg-message
PLIST_SUB+= RUNASUSER=${RUNASUSER} GROUP=${GROUP}
Index: head/www/jmeter/Makefile
===================================================================
--- head/www/jmeter/Makefile
+++ head/www/jmeter/Makefile
@@ -3,7 +3,7 @@
PORTNAME= apache-jmeter
PORTVERSION= 2.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www benchmarks java
MASTER_SITES= APACHE/jmeter/binaries
@@ -43,7 +43,6 @@
USES= tar:tgz
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
SUB_FILES= jmeter.sh
Index: head/www/jmeter/files/jmeter.sh.in
===================================================================
--- head/www/jmeter/files/jmeter.sh.in
+++ head/www/jmeter/files/jmeter.sh.in
@@ -1,4 +1,4 @@
#!/bin/sh
# $FreeBSD$
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/bin/ApacheJMeter.jar" "$@"
+exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/bin/ApacheJMeter.jar" "$@"
Index: head/www/madsonic-standalone/Makefile
===================================================================
--- head/www/madsonic-standalone/Makefile
+++ head/www/madsonic-standalone/Makefile
@@ -52,7 +52,6 @@
NO_BUILD= yes
USE_JAVA= yes
USE_RC_SUBR= madsonic
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
# Don't waste UID/GID and reuse Subsonic's user.
USERS= subsonic
Index: head/www/madsonic/Makefile
===================================================================
--- head/www/madsonic/Makefile
+++ head/www/madsonic/Makefile
@@ -60,7 +60,6 @@
NO_BUILD= yes
DISTDATE= 20161208
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USES= zip
USER= www
GROUP= www
Index: head/www/myfaces/Makefile
===================================================================
--- head/www/myfaces/Makefile
+++ head/www/myfaces/Makefile
@@ -14,7 +14,6 @@
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
USES= cpe
Index: head/www/paros/Makefile
===================================================================
--- head/www/paros/Makefile
+++ head/www/paros/Makefile
@@ -14,7 +14,6 @@
USE_JAVA= yes
JAVA_RUN= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
USES= dos2unix zip
Index: head/www/py-dojango/Makefile
===================================================================
--- head/www/py-dojango/Makefile
+++ head/www/py-dojango/Makefile
@@ -28,7 +28,6 @@
.if ${PORT_OPTIONS:MJAVA}
USE_JAVA= yes
-JAVA_VERSION= 1.6+
.endif
.include <bsd.port.mk>
Index: head/www/resin3/Makefile
===================================================================
--- head/www/resin3/Makefile
+++ head/www/resin3/Makefile
@@ -15,7 +15,6 @@
USE_JAVA= yes
# Pass JAVA_HOME as determined by bsd.java.mk
-JAVA_VERSION= 1.6+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-java-home=${JAVA_HOME} \
--with-openssl-lib=${OPENSSLLIB} \
Index: head/www/rssowl/Makefile
===================================================================
--- head/www/rssowl/Makefile
+++ head/www/rssowl/Makefile
@@ -21,7 +21,6 @@
ONLY_FOR_ARCHS= i386 amd64
USE_JAVA= yes
-JAVA_VERSION= 1.6+
JAVA_OS= native
JAVA_RUN= yes
Index: head/www/sahi/Makefile
===================================================================
--- head/www/sahi/Makefile
+++ head/www/sahi/Makefile
@@ -19,7 +19,6 @@
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
-JAVA_VERSION= 1.6+
JAVA_OS= native
JAVA_RUN= yes
Index: head/www/sakai/Makefile
===================================================================
--- head/www/sakai/Makefile
+++ head/www/sakai/Makefile
@@ -20,7 +20,6 @@
IGNORE= does not work correctly
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_WRKSUBDIR= yes
Index: head/www/scloader/Makefile
===================================================================
--- head/www/scloader/Makefile
+++ head/www/scloader/Makefile
@@ -15,7 +15,6 @@
USES= dos2unix zip
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_WRKSUBDIR= yes
NO_BUILD= yes
Index: head/www/servlet-api/Makefile
===================================================================
--- head/www/servlet-api/Makefile
+++ head/www/servlet-api/Makefile
@@ -14,7 +14,6 @@
COMMENT= The Servlet API
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
Index: head/www/subsonic-standalone/Makefile
===================================================================
--- head/www/subsonic-standalone/Makefile
+++ head/www/subsonic-standalone/Makefile
@@ -48,7 +48,6 @@
NO_BUILD= yes
USE_JAVA= yes
USE_RC_SUBR= subsonic
-JAVA_VERSION= 1.6+
JAVA_RUN= yes
USERS= subsonic
GROUPS= subsonic
Index: head/www/tomcat-native/Makefile
===================================================================
--- head/www/tomcat-native/Makefile
+++ head/www/tomcat-native/Makefile
@@ -19,7 +19,6 @@
USES= libtool ssl
USE_JAVA= yes
USE_LDCONFIG= yes
-JAVA_VERSION= 1.6+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-apr=${LOCALBASE} \
--with-java-home=${JAVA_HOME} \
Index: head/www/tomcat7/Makefile
===================================================================
--- head/www/tomcat7/Makefile
+++ head/www/tomcat7/Makefile
@@ -20,7 +20,6 @@
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/www/tomcat85/Makefile
===================================================================
--- head/www/tomcat85/Makefile
+++ head/www/tomcat85/Makefile
@@ -18,7 +18,6 @@
USES= cpe
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.7+
USE_RC_SUBR= ${PKGBASE:C/-/_/}
NO_ARCH= yes
Index: head/www/tomee/Makefile
===================================================================
--- head/www/tomee/Makefile
+++ head/www/tomee/Makefile
@@ -18,7 +18,6 @@
CPE_VENDOR= apache
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_ARCH= yes
NO_BUILD= yes
Index: head/www/vertx/Makefile
===================================================================
--- head/www/vertx/Makefile
+++ head/www/vertx/Makefile
@@ -19,7 +19,6 @@
JAVA_OS= native
JAVA_RUN= yes
-JAVA_VERSION= 1.7+
PLIST_SUB= VERTXVER=${PORTVERSION}
Index: head/www/yuicompressor/Makefile
===================================================================
--- head/www/yuicompressor/Makefile
+++ head/www/yuicompressor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= yuicompressor
PORTVERSION= 2.4.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www java
#MASTER_SITES= http://tml.github.io/yui/
MASTER_SITES+= LOCAL/az
@@ -19,7 +19,6 @@
NO_WRKSUBDIR= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
NO_ARCH= yes
Index: head/www/yuicompressor/files/yuicompressor.in
===================================================================
--- head/www/yuicompressor/files/yuicompressor.in
+++ head/www/yuicompressor/files/yuicompressor.in
@@ -1,3 +1,3 @@
#!/bin/sh
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar "$@"
+exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar "$@"
Index: head/x11-toolkits/swt/Makefile
===================================================================
--- head/x11-toolkits/swt/Makefile
+++ head/x11-toolkits/swt/Makefile
@@ -24,7 +24,6 @@
USE_GNOME= gtk20
USE_JAVA= yes
USE_XORG= xtst
-JAVA_VERSION= 1.6+
JAVA_OS= native
USE_ANT= yes
MAKE_ARGS+= -Doutput.jar=${OUTPUT_JAR}
Index: head/x11-wm/lxmed/Makefile
===================================================================
--- head/x11-wm/lxmed/Makefile
+++ head/x11-wm/lxmed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lxmed
PORTVERSION= 20120515
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm java
MASTER_SITES= SF/${PORTNAME}/
DIST_SUBDIR= java
@@ -18,7 +18,6 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: head/x11-wm/lxmed/files/lxmed.sh.in
===================================================================
--- head/x11-wm/lxmed/files/lxmed.sh.in
+++ head/x11-wm/lxmed/files/lxmed.sh.in
@@ -3,7 +3,5 @@
# $FreeBSD$
#
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
-jar "%%DATADIR%%/LXMenuEditor.jar" "${@}"

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 2:28 AM (15 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14775792
Default Alt Text
D22342.diff (177 KB)

Event Timeline