diff options
Diffstat (limited to 'java')
73 files changed, 21 insertions, 162 deletions
diff --git a/java/apache-commons-cli/Makefile b/java/apache-commons-cli/Makefile index 3c8f8fef617b..131a2bd0faaa 100644 --- a/java/apache-commons-cli/Makefile +++ b/java/apache-commons-cli/Makefile @@ -14,7 +14,6 @@ COMMENT= Java library for command line arguments and options LICENSE= APACHE20 USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/java/apache-commons-lang/Makefile b/java/apache-commons-lang/Makefile index 1dc30a7a3b81..1b95e5124fa3 100644 --- a/java/apache-commons-lang/Makefile +++ b/java/apache-commons-lang/Makefile @@ -14,7 +14,6 @@ COMMENT= Apache library with helper utilities for the java.lang API LICENSE= APACHE20 USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jar diff --git a/java/apache-commons-lang3/Makefile b/java/apache-commons-lang3/Makefile index 96ff0d0b4fde..566491aa4b18 100644 --- a/java/apache-commons-lang3/Makefile +++ b/java/apache-commons-lang3/Makefile @@ -15,7 +15,6 @@ LICENSE= APACHE20 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_BUILD= yes NO_ARCH= yes diff --git a/java/apache-commons-logging/Makefile b/java/apache-commons-logging/Makefile index d11312f4134b..00571432d085 100644 --- a/java/apache-commons-logging/Makefile +++ b/java/apache-commons-logging/Makefile @@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= DOCS USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes JARFILE= ${PORTNAME}-${PORTVERSION}.jar diff --git a/java/apache-commons-primitives/Makefile b/java/apache-commons-primitives/Makefile index d0f90bd72722..562e93f0efdc 100644 --- a/java/apache-commons-primitives/Makefile +++ b/java/apache-commons-primitives/Makefile @@ -14,7 +14,6 @@ COMMENT= Library supporting Java primitive types LICENSE= APACHE20 USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/java/aparapi/Makefile b/java/aparapi/Makefile index de225ad655f5..b6ac82eb2295 100644 --- a/java/aparapi/Makefile +++ b/java/aparapi/Makefile @@ -22,7 +22,6 @@ ONLY_FOR_ARCHS= amd64 USE_GITHUB= yes USE_JAVA= yes -JAVA_VERSION= 1.7+ USE_ANT= yes ALL_TARGET= dist diff --git a/java/avis/Makefile b/java/avis/Makefile index 0924d530d57d..7e7327c73dec 100644 --- a/java/avis/Makefile +++ b/java/avis/Makefile @@ -13,7 +13,6 @@ COMMENT= Elvin Publish/Subscribe Message Bus server based on the Elvin protocol USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .if !defined(WITHOUT_COMPILE) diff --git a/java/berkeley-db/Makefile b/java/berkeley-db/Makefile index f4cfc92b8c77..a7302913f2f6 100644 --- a/java/berkeley-db/Makefile +++ b/java/berkeley-db/Makefile @@ -19,7 +19,6 @@ BROKEN_armv7= fails to build: build.xml: Java returned: 1 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 diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile index ea5443b5d2cd..798cb82d43b2 100644 --- a/java/bouncycastle/Makefile +++ b/java/bouncycastle/Makefile @@ -23,7 +23,6 @@ CPE_PRODUCT= legion-of-the-bouncy-castle-java-crytography-api 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 diff --git a/java/bouncycastle15/Makefile b/java/bouncycastle15/Makefile index 2bfdb5af955f..15630b18731f 100644 --- a/java/bouncycastle15/Makefile +++ b/java/bouncycastle15/Makefile @@ -30,7 +30,6 @@ CPE_PRODUCT= legion-of-the-bouncy-castle-java-crytography-api CPE_VENDOR= ${PORTNAME} USE_JAVA= yes USES= cpe -JAVA_VERSION= 1.6+ JDKMVERSION= 1.5 JDKNVERSION= 15 USE_ANT= yes diff --git a/java/castor/Makefile b/java/castor/Makefile index b52405493184..7bbdcd04f4e5 100644 --- a/java/castor/Makefile +++ b/java/castor/Makefile @@ -16,7 +16,6 @@ LICENSE= APACHE20 USES= cpe USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}-anttasks.jar \ diff --git a/java/cryptix-jce/Makefile b/java/cryptix-jce/Makefile index 83ae733e9347..65031c9c52ea 100644 --- a/java/cryptix-jce/Makefile +++ b/java/cryptix-jce/Makefile @@ -12,7 +12,6 @@ COMMENT= JCE (Java Cryptography Extension) by Cryptix USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes OPTIONS_DEFINE= DOCS diff --git a/java/dbvis/Makefile b/java/dbvis/Makefile index 599a3ac80c8c..e1d6f5ae6720 100644 --- a/java/dbvis/Makefile +++ b/java/dbvis/Makefile @@ -16,7 +16,6 @@ LICENSE_TEXT= Full license can be found at http://www.dbvis.com/eula/ LICENSE_PERMS= auto-accept USE_JAVA= yes -JAVA_VERSION= 1.7+ JAVA_VENDOR= openjdk NO_BUILD= yes RESTRICTED= Redistribution is not permitted diff --git a/java/eclipse-drjava/Makefile b/java/eclipse-drjava/Makefile index 8a20d5d0bec7..16f2236135c3 100644 --- a/java/eclipse-drjava/Makefile +++ b/java/eclipse-drjava/Makefile @@ -19,7 +19,6 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native DATADIR= ${PREFIX}/lib/eclipse/plugins diff --git a/java/eclipse-ecj/Makefile b/java/eclipse-ecj/Makefile index 886cf167dff1..21e53222c2a8 100644 --- a/java/eclipse-ecj/Makefile +++ b/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 @@ EXTRACT_AFTER_ARGS= -C ${WRKSRC} USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ SUB_FILES= ecj.sh SUB_LIST= PORTVERSION=${PORTVERSION} NO_WRKSUBDIR= yes diff --git a/java/eclipse-ecj/files/ecj.sh.in b/java/eclipse-ecj/files/ecj.sh.in index bfbba17fc3d2..c46240556ed9 100644 --- a/java/eclipse-ecj/files/ecj.sh.in +++ b/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}" diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile index 740dd0d75edc..be8ffd027c21 100644 --- a/java/eclipse-findbugs/Makefile +++ b/java/eclipse-findbugs/Makefile @@ -17,7 +17,6 @@ RUN_DEPENDS= eclipse:java/eclipse USES= zip NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native PLIST_SUB= \ diff --git a/java/eclipse-shelled/Makefile b/java/eclipse-shelled/Makefile index 3eded7ba4199..f045c6fa10e1 100644 --- a/java/eclipse-shelled/Makefile +++ b/java/eclipse-shelled/Makefile @@ -19,7 +19,6 @@ USES= zip NO_BUILD= yes NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native do-install: diff --git a/java/infobus/Makefile b/java/infobus/Makefile index dd27b44f5c9b..6ff2a6ed081c 100644 --- a/java/infobus/Makefile +++ b/java/infobus/Makefile @@ -14,7 +14,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES USES= zip USE_JAVA= YES -JAVA_VERSION= 1.6+ NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/java/jai/Makefile b/java/jai/Makefile index 38bdc7c7192d..0d4e9f8519cc 100644 --- a/java/jai/Makefile +++ b/java/jai/Makefile @@ -14,7 +14,6 @@ COMMENT= High performance image processing libraries for Java USES= cpe zip CPE_VENDOR= oracle USE_JAVA= yes -JAVA_VERSION= 1.6+ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} NO_BUILD= yes diff --git a/java/jakarta-bcel/Makefile b/java/jakarta-bcel/Makefile index 1959b05d358a..fed96ec38cde 100644 --- a/java/jakarta-bcel/Makefile +++ b/java/jakarta-bcel/Makefile @@ -12,7 +12,6 @@ COMMENT= Library for generating Java bytecode NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_ARCH= yes PLIST_FILES= %%JAVAJARDIR%%/bcel.jar diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile index c099069efeb3..c4205acbd512 100644 --- a/java/jakarta-commons-beanutils/Makefile +++ b/java/jakarta-commons-beanutils/Makefile @@ -23,7 +23,6 @@ USES= dos2unix USE_JAVA= yes USE_ANT= yes DOS2UNIX_FILES= build.xml -JAVA_VERSION= 1.6+ ALL_TARGET= dist MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \ -Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile index 3720edc4c3a3..405b07860ad1 100644 --- a/java/jakarta-commons-discovery/Makefile +++ b/java/jakarta-commons-discovery/Makefile @@ -12,7 +12,6 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Java library for locating resources (including classes) USE_JAVA= YES -JAVA_VERSION= 1.6+ NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile index 1b682d7f3837..2a63aeb6aaad 100644 --- a/java/jakarta-commons-httpclient/Makefile +++ b/java/jakarta-commons-httpclient/Makefile @@ -24,7 +24,6 @@ OPTIONS_DEFINE= DOCS USES+= cpe CPE_VENDOR= apache USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES NO_ARCH= yes diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile index 4a33a2c56954..2ae24b11558e 100644 --- a/java/jakarta-oro/Makefile +++ b/java/jakarta-oro/Makefile @@ -14,7 +14,6 @@ LICENSE= APACHE20 USE_JAVA= yes USE_ANT= yes -JAVA_VERSION= 1.6+ ALL_TARGET= jar javadocs JAVALIBNAME= ${PORTNAME}-${PORTVERSION} diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile index f6ad47c0e16c..bb39230895f5 100644 --- a/java/jakarta-regexp/Makefile +++ b/java/jakarta-regexp/Makefile @@ -16,7 +16,6 @@ BROKEN_armv6= fails to build: build.xml: Java returned: 1 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} diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile index 19ec224c06ab..386acf8bdcce 100644 --- a/java/jasmin/Makefile +++ b/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 @@ USES= dos2unix zip USE_ANT= yes ALL_TARGET= jasmin USE_JAVA= yes -JAVA_VERSION= 1.6+ DOS2UNIX_REGEX= .*\.(txt|xml|j|class|java|mf|css|bnf|html) SUB_FILES= jasmin.sh diff --git a/java/jasmin/files/jasmin.sh.in b/java/jasmin/files/jasmin.sh.in index ef28eddd96a5..05c2e77b04bb 100644 --- a/java/jasmin/files/jasmin.sh.in +++ b/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" "$@" diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile index b65a79bb6157..cbff8884823a 100644 --- a/java/java-subversion/Makefile +++ b/java/java-subversion/Makefile @@ -10,7 +10,6 @@ COMMENT= Java bindings for Version control system USES+= compiler USE_JAVA= yes -JAVA_VERSION= 1.7+ JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes diff --git a/java/java3d/Makefile b/java/java3d/Makefile index 54245cab2607..188bf8752c87 100644 --- a/java/java3d/Makefile +++ b/java/java3d/Makefile @@ -21,7 +21,6 @@ USES= gl tar:bzip2 xorg USE_JAVA= yes USE_GL= gl USE_XORG= xt -JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk USE_ANT= yes LLD_UNSAFE= yes diff --git a/java/javahelp/Makefile b/java/javahelp/Makefile index a9ebff59daa4..ab5cb9912587 100644 --- a/java/javahelp/Makefile +++ b/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 @@ GH_TAGNAME= 3ca862d USE_JAVA= yes USE_ANT= yes -JAVA_VER= 1.${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} TOMCAT_VER?= 8.5 TOMCAT_PORT= www/tomcat${TOMCAT_VER:S/.0//:S/.//} TOMCAT_DIR= ${LOCALBASE}/apache-tomcat-${TOMCAT_VER} @@ -30,14 +30,11 @@ MAKE_ARGS= -Djsp-jar=${TOMCAT_jsp} \ -Dfile.reference.jsp-api.jar=${TOMCAT_jsp} \ -Dservlet-jar=${TOMCAT_servlet} \ -Dfile.reference.servlet-api.jar=${TOMCAT_servlet} \ - -Djavac.target=${JAVA_VER} \ - -Ddefault.javac.target=${JAVA_VER} \ -Dtomcat-zip-present=true BUILD_WRKSRC= ${WRKSRC}/javahelp_nbproject SUB_FILES= jhindexer \ jhsearch -SUB_LIST= JAVA_VER=${JAVA_VER}+ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/jhindexer ${WRKDIR}/jhsearch ${STAGEDIR}${PREFIX}/bin/ diff --git a/java/javahelp/files/jhindexer.in b/java/javahelp/files/jhindexer.in index 59ee27424484..48334eb3025c 100644 --- a/java/javahelp/files/jhindexer.in +++ b/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 "$@" diff --git a/java/javahelp/files/jhsearch.in b/java/javahelp/files/jhsearch.in index 36c5a2ff8258..d6cc3d45df6c 100644 --- a/java/javahelp/files/jhsearch.in +++ b/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 "$@" diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index ca8f2ee07ce5..f8712174f36f 100644 --- a/java/javavmwrapper/Makefile +++ b/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 diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1 index eb366c0d8cef..efe3e195204d 100644 --- a/java/javavmwrapper/src/javavm.1 +++ b/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 @@ to a version, any Java VM with a version 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 , @@ -202,8 +198,8 @@ Execute MyApp with the most up to date native Java VM that is registered 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. diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index 2dc2995bf2f7..321623b16ec7 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -173,8 +173,7 @@ sortConfiguration () { _VM=`dirname "${_VM}"` _VM=`dirname "${_VM}"` _VM=`basename "${_VM}"` - # Consistent version numbering for various install directory names - # including 'openjdk6', 'jdk1.6.0', 'linux-sun-jdk1.6.0', etc. + # Consistent version numbering for various install directory names. VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' \ -e 's|1\.\([0-9][0-9]*\)|\1|' \ -e 's|\([0-9][0-9]*\)\.[0-9]|\1|' \ @@ -506,9 +505,6 @@ setJavaHome() { _JAVAVM_VERSION= for version in ${JAVA_VERSION}; do case "${version}" in - *6+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 6 7 8 9 10 11 12" - ;; *7+) _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12" ;; @@ -527,9 +523,6 @@ setJavaHome() { 12+) _JAVAVM_VERSION="${_JAVAVM_VERSION} 12" ;; - 1.6) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 6" - ;; 1.7) _JAVAVM_VERSION="${_JAVAVM_VERSION} 7" ;; diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1 index 8ee1022f0b1c..a621bc4c981e 100644 --- a/java/javavmwrapper/src/manvm.1 +++ b/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 @@ to a version, the on-line manual pages from any Java VM with a version 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 , diff --git a/java/javavmwrapper/src/registervm.1 b/java/javavmwrapper/src/registervm.1 index 4ab769dc41db..16a73859e3c5 100644 --- a/java/javavmwrapper/src/registervm.1 +++ b/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 @@ The location of the Java VM wrapper configuration file. .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 diff --git a/java/jaxen/Makefile b/java/jaxen/Makefile index b6ea26babec5..d858659e3b0c 100644 --- a/java/jaxen/Makefile +++ b/java/jaxen/Makefile @@ -12,7 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java XPath Engine USE_JAVA= YES -JAVA_VERSION= 1.6+ NO_BUILD= YES JARFILES= jaxen-core.jar jaxen-dom.jar jaxen-dom4j.jar jaxen-exml.jar jaxen-full.jar jaxen-jdom.jar lib/saxpath.jar diff --git a/java/jcalendar/Makefile b/java/jcalendar/Makefile index d39e528e960a..d0a1bf302b12 100644 --- a/java/jcalendar/Makefile +++ b/java/jcalendar/Makefile @@ -11,7 +11,6 @@ COMMENT= Java Date Chooser USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes WRKSRC= ${WRKDIR}/src PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \ diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile index 3fdd1ad19099..ca5269768a58 100644 --- a/java/jcommon/Makefile +++ b/java/jcommon/Makefile @@ -16,7 +16,6 @@ BROKEN_armv7= fails to package: find: *: No such file or directory USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ OPTIONS_DEFINE= COMPILE DOCS OPTIONS_DEFAULT=COMPILE diff --git a/java/jd-gui/Makefile b/java/jd-gui/Makefile index 64fb789c3305..fb686d22d030 100644 --- a/java/jd-gui/Makefile +++ b/java/jd-gui/Makefile @@ -19,7 +19,6 @@ USES= desktop-file-utils USE_GITHUB= yes GH_ACCOUNT= java-decompiler USE_JAVA= yes -JAVA_VERSION= 1.7+ NO_ARCH= yes NO_BUILD= yes diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile index 0f47c44ab6bd..1f2cfd779116 100644 --- a/java/jdbcpool/Makefile +++ b/java/jdbcpool/Makefile @@ -13,7 +13,6 @@ COMMENT= JDBC connection pool BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PORTDOCS= CHANGES LICENSE README diff --git a/java/jdom/Makefile b/java/jdom/Makefile index f49bb1f30aab..9cdf709132c2 100644 --- a/java/jdom/Makefile +++ b/java/jdom/Makefile @@ -13,7 +13,6 @@ COMMENT= Java library for accessing and manipulating XML documents RUN_DEPENDS= ${JAVALIBDIR}/jaxen-jdom.jar:java/jaxen USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= package diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile index f3d6161748d1..62bd0d5e1ff9 100644 --- a/java/jfreechart/Makefile +++ b/java/jfreechart/Makefile @@ -14,7 +14,6 @@ LICENSE= LGPL21 RUN_DEPENDS= ${JAVALIBDIR}/jcommon.jar:java/jcommon USE_JAVA= yes -JAVA_VERSION= 1.6+ OPTIONS_DEFINE= COMPILE DOCS OPTIONS_DEFAULT=COMPILE diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile index cd1606b4b49f..4b1bf2aab984 100644 --- a/java/jgraph/Makefile +++ b/java/jgraph/Makefile @@ -22,7 +22,6 @@ COMPILE_DESC= Compile from source instead of using prebuilt binaries USES= zip NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_RUN= yes .include <bsd.port.options.mk> diff --git a/java/jmf/Makefile b/java/jmf/Makefile index 917cfbf2a4c5..eedb6d446e94 100644 --- a/java/jmf/Makefile +++ b/java/jmf/Makefile @@ -13,7 +13,6 @@ COMMENT= Java Media Framework USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= YES WRKSRC= ${WRKDIR}/JMF-${PORTVERSION} diff --git a/java/jode/Makefile b/java/jode/Makefile index b3580fd439df..ea0325aeb178 100644 --- a/java/jode/Makefile +++ b/java/jode/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} VENDOR_VERSION= 1.1.2-pre1 USE_JAVA= yes -JAVA_VERSION= 1.6+ NEED_JAVAC= yes GNU_CONFIGURE= yes USES= gmake perl5 shebangfix diff --git a/java/jomp/Makefile b/java/jomp/Makefile index 03af8eae3739..ce195bf1e058 100644 --- a/java/jomp/Makefile +++ b/java/jomp/Makefile @@ -16,7 +16,6 @@ COMMENT= Prototype OpenMP implementation for Java BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/java/jta/Makefile b/java/jta/Makefile index fbb315eda7cd..8ef86333d885 100644 --- a/java/jta/Makefile +++ b/java/jta/Makefile @@ -12,7 +12,6 @@ COMMENT= Java Transaction API (JTA) USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes NO_CDROM= See the license diff --git a/java/jump/Makefile b/java/jump/Makefile index bdc592147315..b67d07b4745e 100644 --- a/java/jump/Makefile +++ b/java/jump/Makefile @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java library for arbitrary precision computations USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jar diff --git a/java/mx4j/Makefile b/java/mx4j/Makefile index 392a6865759d..eb68abf20005 100644 --- a/java/mx4j/Makefile +++ b/java/mx4j/Makefile @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Open Source implementation of the Java Management Extensions (JMX) USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes JARFILES= mx4j-examples.jar mx4j-impl.jar mx4j-jmx.jar \ diff --git a/java/servingxml/Makefile b/java/servingxml/Makefile index 52c9f3a63767..9e3a4b09966d 100644 --- a/java/servingxml/Makefile +++ b/java/servingxml/Makefile @@ -13,7 +13,6 @@ BUILD_DEPENDS= ${ANT_CMD}:devel/apache-ant USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ ANT_CMD?= ${LOCALBASE}/bin/ant ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} ANT_TARGETS= dist diff --git a/java/springframework/Makefile b/java/springframework/Makefile index 717e4bf68271..255337a9c866 100644 --- a/java/springframework/Makefile +++ b/java/springframework/Makefile @@ -17,7 +17,6 @@ CONFLICTS= springframework-3.1.* NO_BUILD= yes USE_JAVA= yes USES= zip -JAVA_VERSION= 1.6+ OPTIONS_DEFINE= DOCS RESRCS RESRCS_DESC= Install resource files diff --git a/java/springframework31/Makefile b/java/springframework31/Makefile index e90bfd8cfdd4..4c2a648c08b8 100644 --- a/java/springframework31/Makefile +++ b/java/springframework31/Makefile @@ -20,7 +20,6 @@ CONFLICTS= springframework-3.2.* NO_BUILD= yes USE_JAVA= yes USES= zip -JAVA_VERSION= 1.6+ OPTIONS_DEFINE= DOCS RESRCS RESRCS_DESC= Install resource files diff --git a/java/sqlitejdbc/Makefile b/java/sqlitejdbc/Makefile index 89a040dbac01..4daf9e54a3e3 100644 --- a/java/sqlitejdbc/Makefile +++ b/java/sqlitejdbc/Makefile @@ -16,7 +16,6 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION} USE_JAVA= yes -JAVA_VERSION= 1.6+ USES= gmake tar:tgz MAKE_ENV= JAVA_HOME="${JAVA_HOME}" ALL_TARGET= native diff --git a/java/trove4j/Makefile b/java/trove4j/Makefile index e49c12b15e05..857c463ae2b1 100644 --- a/java/trove4j/Makefile +++ b/java/trove4j/Makefile @@ -13,7 +13,6 @@ COMMENT= High performance collections API for Java BROKEN= unfetchable USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_BUILD= yes PORTDOCS= javadocs AUTHORS.txt CHANGES.txt LICENSE.txt README-idea-devel.txt \ diff --git a/java/wildfly10/Makefile b/java/wildfly10/Makefile index 8ecc2783dc95..995d96659be5 100644 --- a/java/wildfly10/Makefile +++ b/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 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly10 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var diff --git a/java/wildfly10/files/patch-bin_add-user.sh b/java/wildfly10/files/patch-bin_add-user.sh deleted file mode 100644 index 72faebc8d863..000000000000 --- a/java/wildfly10/files/patch-bin_add-user.sh +++ /dev/null @@ -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; diff --git a/java/wildfly10/files/wildfly10.in b/java/wildfly10/files/wildfly10.in index bb4ae95e94f3..e837d1c934b6 100644 --- a/java/wildfly10/files/wildfly10.in +++ b/java/wildfly10/files/wildfly10.in @@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { diff --git a/java/wildfly11/Makefile b/java/wildfly11/Makefile index 246e0a3bc0e5..97253239ee60 100644 --- a/java/wildfly11/Makefile +++ b/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 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly11 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var diff --git a/java/wildfly11/files/patch-bin_add-user.sh b/java/wildfly11/files/patch-bin_add-user.sh deleted file mode 100644 index 72faebc8d863..000000000000 --- a/java/wildfly11/files/patch-bin_add-user.sh +++ /dev/null @@ -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; diff --git a/java/wildfly11/files/wildfly11.in b/java/wildfly11/files/wildfly11.in index bb4ae95e94f3..e837d1c934b6 100644 --- a/java/wildfly11/files/wildfly11.in +++ b/java/wildfly11/files/wildfly11.in @@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { diff --git a/java/wildfly12/Makefile b/java/wildfly12/Makefile index ec3f6047f9c5..6699ad5e2499 100644 --- a/java/wildfly12/Makefile +++ b/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 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly12 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var diff --git a/java/wildfly12/files/patch-bin_add-user.sh b/java/wildfly12/files/patch-bin_add-user.sh deleted file mode 100644 index 72faebc8d863..000000000000 --- a/java/wildfly12/files/patch-bin_add-user.sh +++ /dev/null @@ -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; diff --git a/java/wildfly12/files/wildfly12.in b/java/wildfly12/files/wildfly12.in index bb4ae95e94f3..e837d1c934b6 100644 --- a/java/wildfly12/files/wildfly12.in +++ b/java/wildfly12/files/wildfly12.in @@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { diff --git a/java/wildfly13/Makefile b/java/wildfly13/Makefile index c68d8215587e..2a4e60e4bb94 100644 --- a/java/wildfly13/Makefile +++ b/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 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly13 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var diff --git a/java/wildfly13/files/patch-bin_add-user.sh b/java/wildfly13/files/patch-bin_add-user.sh deleted file mode 100644 index 72faebc8d863..000000000000 --- a/java/wildfly13/files/patch-bin_add-user.sh +++ /dev/null @@ -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; diff --git a/java/wildfly13/files/wildfly13.in b/java/wildfly13/files/wildfly13.in index 250bdd0eb1a9..60e30678e6d5 100644 --- a/java/wildfly13/files/wildfly13.in +++ b/java/wildfly13/files/wildfly13.in @@ -40,9 +40,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { diff --git a/java/wildfly90/Makefile b/java/wildfly90/Makefile index 421a029ea359..32ae5f102132 100644 --- a/java/wildfly90/Makefile +++ b/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 @@ LICENSE= GPLv2 USE_RC_SUBR= wildfly90 USE_JAVA= yes -JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var diff --git a/java/wildfly90/files/patch-bin-add-user.sh b/java/wildfly90/files/patch-bin-add-user.sh deleted file mode 100644 index e1a33428d0e5..000000000000 --- a/java/wildfly90/files/patch-bin-add-user.sh +++ /dev/null @@ -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; diff --git a/java/wildfly90/files/wildfly90.in b/java/wildfly90/files/wildfly90.in index bb4ae95e94f3..e837d1c934b6 100644 --- a/java/wildfly90/files/wildfly90.in +++ b/java/wildfly90/files/wildfly90.in @@ -41,9 +41,6 @@ pidfile="%%PID_FILE%%" status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" -#minimal requirements must be set for our javavmwrapper -JAVA_VERSION="1.7+" -export JAVA_VERSION %%APP_SHORTNAME%%_start () { diff --git a/java/xdoclet/Makefile b/java/xdoclet/Makefile index 93b39075abe3..324d9eaab06d 100644 --- a/java/xdoclet/Makefile +++ b/java/xdoclet/Makefile @@ -19,7 +19,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/ant:devel/apache-ant USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6+ NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes |