diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 854671d8..da0d06e0 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -9,7 +9,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to svn yourself. # -# $FreeBSD: head/Mk/bsd.java.mk 453438 2017-11-04 01:16:31Z kevans $ +# $FreeBSD: head/Mk/bsd.java.mk 528866 2020-03-21 19:05:48Z glewis $ # .if !defined(Java_Include) @@ -25,13 +25,14 @@ Java_Include_MAINTAINER= java@FreeBSD.org # # JAVA_VERSION List of space-separated suitable java versions for the # port. An optional "+" allows you to specify a range of -# versions. (allowed values: 1.6[+] 1.7[+] 1.8[+]) +# versions. (allowed values: 7[+] 8[+] 11[+] 12[+] 13[+] +# 14[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) # # JAVA_VENDOR List of space-separated suitable JDK port vendors for the -# port. (allowed values: openjdk oracle sun) +# port. (allowed values: openjdk oracle) # # JAVA_BUILD When set, it means that the selected JDK port should be # added to build dependencies for the port. @@ -52,13 +53,13 @@ Java_Include_MAINTAINER= java@FreeBSD.org #------------------------------------------------------------------------------- # Variables defined for the port: # -# JAVA_PORT The name of the JDK port. (e.g. 'java/openjdk6') +# JAVA_PORT The name of the JDK port. (e.g. 'java/openjdk8') # -# JAVA_PORT_VERSION The version of the JDK port. (e.g. '1.6') +# JAVA_PORT_VERSION The version of the JDK port. (e.g. '8') # # JAVA_PORT_OS The operating system used by the JDK port. (e.g. 'linux') # -# JAVA_PORT_VENDOR The vendor of the JDK port. (e.g. 'sun') +# JAVA_PORT_VENDOR The vendor of the JDK port. (e.g. 'openjdk') # # JAVA_PORT_OS_DESCRIPTION Description of the operating system used by the # JDK port. (e.g. 'Linux') @@ -67,19 +68,19 @@ Java_Include_MAINTAINER= java@FreeBSD.org # (e.g. 'OpenJDK BSD Porting Team') # # JAVA_HOME Path to the installation directory of the JDK. (e.g. -# '/usr/local/openjdk6') +# '/usr/local/openjdk8') # # JAVAC Path to the Java compiler to use. (e.g. -# '/usr/local/openjdk6/bin/javac' or '/usr/local/bin/javac') +# '/usr/local/openjdk8/bin/javac' or '/usr/local/bin/javac') # # JAR Path to the JAR tool to use. (e.g. -# '/usr/local/openjdk6/bin/jar' or '/usr/local/bin/fastjar') +# '/usr/local/openjdk8/bin/jar' or '/usr/local/bin/fastjar') # # APPLETVIEWER Path to the appletviewer utility. (e.g. -# '/usr/local/linux-jdk1.7.0/bin/appletviewer') +# '/usr/local/linux-jdk1.8.0/bin/appletviewer') # # JAVA Path to the java executable. Use this for executing Java -# programs. (e.g. '/usr/local/openjdk6/bin/java') +# programs. (e.g. '/usr/local/openjdk8/bin/java') # # JAVADOC Path to the javadoc utility program. # @@ -114,7 +115,7 @@ Java_Include_MAINTAINER= java@FreeBSD.org #------------------------------------------------------------------------------- # Porter's hints # -# To retrieve the Major version number from JAVA_PORT_VERSION (e.g. "1.6"): +# To retrieve the Major version number from JAVA_PORT_VERSION (e.g. "1.8"): # -> ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} # #------------------------------------------------------------------------------- @@ -130,6 +131,9 @@ Java_Include_MAINTAINER= java@FreeBSD.org . if defined(USE_JAVA) +. if !defined(JAVA_VERSION) && empty(USE_JAVA:C/[0-9]*[\.]*[0-9]*[+]*//) +JAVA_VERSION=${USE_JAVA} +. endif #------------------------------------------------------------------------------- # Stage 1: Define constants @@ -159,39 +163,45 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 1.6 1.7 1.8 1.9 +__JAVA_VERSION_LIST= 7 8 11 12 13 14 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux -_JAVA_VENDOR_LIST= openjdk oracle sun +_JAVA_VENDOR_LIST= openjdk oracle # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor -_JAVA_PORT_NATIVE_OPENJDK_JDK_1_6_INFO= PORT=java/openjdk6 HOME=${LOCALBASE}/openjdk6 \ - VERSION=1.6.0 OS=native VENDOR=openjdk -_JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_INFO= PORT=java/openjdk7 HOME=${LOCALBASE}/openjdk7 \ - VERSION=1.7.0 OS=native VENDOR=openjdk -_JAVA_PORT_NATIVE_OPENJDK_JDK_1_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/openjdk8 \ - VERSION=1.8.0 OS=native VENDOR=openjdk -_JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \ - VERSION=1.8.0 OS=linux VENDOR=oracle -_JAVA_PORT_LINUX_ORACLE_JDK_1_9_INFO= PORT=java/linux-oracle-jdk9 HOME=${LOCALBASE}/linux-oracle-jdk9 \ - VERSION=1.9.0 OS=linux VENDOR=oracle +_JAVA_PORT_NATIVE_OPENJDK_JDK_7_INFO= PORT=java/openjdk7 HOME=${LOCALBASE}/openjdk7 \ + VERSION=7 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/openjdk8 \ + VERSION=8 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_11_INFO= PORT=java/openjdk11 HOME=${LOCALBASE}/openjdk11 \ + VERSION=11 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_12_INFO= PORT=java/openjdk12 HOME=${LOCALBASE}/openjdk12 \ + VERSION=12 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_13_INFO= PORT=java/openjdk13 HOME=${LOCALBASE}/openjdk13 \ + VERSION=13 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_14_INFO= PORT=java/openjdk14 HOME=${LOCALBASE}/openjdk14 \ + VERSION=14 OS=native VENDOR=openjdk +_JAVA_PORT_LINUX_ORACLE_JDK_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \ + VERSION=8 OS=linux VENDOR=oracle # Verbose description for each VENDOR _JAVA_VENDOR_openjdk= "OpenJDK BSD Porting Team" _JAVA_VENDOR_oracle= Oracle -_JAVA_VENDOR_sun= Sun # Verbose description for each OS _JAVA_OS_native= Native _JAVA_OS_linux= Linux # List all JDK ports in order of preference -__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \ - JAVA_PORT_LINUX_ORACLE_JDK_1_8 \ - JAVA_PORT_LINUX_ORACLE_JDK_1_9 +__JAVA_PORTS_ALL= \ + JAVA_PORT_NATIVE_OPENJDK_JDK_8 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_11 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_12 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_13 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_14 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_7 \ + JAVA_PORT_LINUX_ORACLE_JDK_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ ${__JAVA_PORTS_ALL} @@ -264,7 +274,7 @@ JAVA_RUN= jre . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 1.9+/:S/1.9+/1.9/} +_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 14+/:S/14+/14/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif @@ -282,7 +292,7 @@ _JAVA_VENDOR= ${_JAVA_VENDOR_LIST} . for A_JAVA_PORT in ${_JAVA_PORTS_ALL} A_JAVA_PORT_INFO:= ${A_JAVA_PORT:S/^/\${_/:S/$/_INFO}/} A_JAVA_PORT_HOME= ${A_JAVA_PORT_INFO:MHOME=*:S,HOME=,,} -A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:C/VERSION=([0-9])\.([0-9])(.*)/\1.\2/} +A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:S,VERSION=,,} A_JAVA_PORT_OS= ${A_JAVA_PORT_INFO:MOS=*:S,OS=,,} A_JAVA_PORT_VENDOR= ${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,} .if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE}) diff --git a/java/bsh/Makefile b/_oldver/java/bsh/Makefile similarity index 100% rename from java/bsh/Makefile rename to _oldver/java/bsh/Makefile diff --git a/java/bsh/distinfo b/_oldver/java/bsh/distinfo similarity index 100% rename from java/bsh/distinfo rename to _oldver/java/bsh/distinfo diff --git a/java/bsh/files/bsh.sh.in b/_oldver/java/bsh/files/bsh.sh.in similarity index 100% rename from java/bsh/files/bsh.sh.in rename to _oldver/java/bsh/files/bsh.sh.in diff --git a/java/bsh/pkg-descr b/_oldver/java/bsh/pkg-descr similarity index 100% rename from java/bsh/pkg-descr rename to _oldver/java/bsh/pkg-descr diff --git a/java/hamcrest/Makefile b/_oldver/java/hamcrest/Makefile similarity index 100% rename from java/hamcrest/Makefile rename to _oldver/java/hamcrest/Makefile diff --git a/java/hamcrest/distinfo b/_oldver/java/hamcrest/distinfo similarity index 100% rename from java/hamcrest/distinfo rename to _oldver/java/hamcrest/distinfo diff --git a/java/hamcrest/pkg-descr b/_oldver/java/hamcrest/pkg-descr similarity index 100% rename from java/hamcrest/pkg-descr rename to _oldver/java/hamcrest/pkg-descr diff --git a/java/jakarta-commons-beanutils/Makefile b/_oldver/java/jakarta-commons-beanutils/Makefile similarity index 100% rename from java/jakarta-commons-beanutils/Makefile rename to _oldver/java/jakarta-commons-beanutils/Makefile diff --git a/java/jakarta-commons-beanutils/distinfo b/_oldver/java/jakarta-commons-beanutils/distinfo similarity index 100% rename from java/jakarta-commons-beanutils/distinfo rename to _oldver/java/jakarta-commons-beanutils/distinfo diff --git a/java/jakarta-commons-beanutils/files/patch-build.xml b/_oldver/java/jakarta-commons-beanutils/files/patch-build.xml similarity index 100% rename from java/jakarta-commons-beanutils/files/patch-build.xml rename to _oldver/java/jakarta-commons-beanutils/files/patch-build.xml diff --git a/java/jakarta-commons-beanutils/pkg-descr b/_oldver/java/jakarta-commons-beanutils/pkg-descr similarity index 100% rename from java/jakarta-commons-beanutils/pkg-descr rename to _oldver/java/jakarta-commons-beanutils/pkg-descr diff --git a/java/jakarta-commons-cli/Makefile b/_oldver/java/jakarta-commons-cli/Makefile similarity index 100% rename from java/jakarta-commons-cli/Makefile rename to _oldver/java/jakarta-commons-cli/Makefile diff --git a/java/jakarta-commons-cli/distinfo b/_oldver/java/jakarta-commons-cli/distinfo similarity index 100% rename from java/jakarta-commons-cli/distinfo rename to _oldver/java/jakarta-commons-cli/distinfo diff --git a/java/jakarta-commons-cli/pkg-descr b/_oldver/java/jakarta-commons-cli/pkg-descr similarity index 100% rename from java/jakarta-commons-cli/pkg-descr rename to _oldver/java/jakarta-commons-cli/pkg-descr diff --git a/java/jakarta-commons-codec/Makefile b/_oldver/java/jakarta-commons-codec/Makefile similarity index 100% rename from java/jakarta-commons-codec/Makefile rename to _oldver/java/jakarta-commons-codec/Makefile diff --git a/java/jakarta-commons-codec/distinfo b/_oldver/java/jakarta-commons-codec/distinfo similarity index 100% rename from java/jakarta-commons-codec/distinfo rename to _oldver/java/jakarta-commons-codec/distinfo diff --git a/java/jakarta-commons-codec/pkg-descr b/_oldver/java/jakarta-commons-codec/pkg-descr similarity index 100% rename from java/jakarta-commons-codec/pkg-descr rename to _oldver/java/jakarta-commons-codec/pkg-descr diff --git a/java/jakarta-commons-collections/Makefile b/_oldver/java/jakarta-commons-collections/Makefile similarity index 100% rename from java/jakarta-commons-collections/Makefile rename to _oldver/java/jakarta-commons-collections/Makefile diff --git a/java/jakarta-commons-collections/distinfo b/_oldver/java/jakarta-commons-collections/distinfo similarity index 100% rename from java/jakarta-commons-collections/distinfo rename to _oldver/java/jakarta-commons-collections/distinfo diff --git a/java/jakarta-commons-collections/files/patch-jdk8 b/_oldver/java/jakarta-commons-collections/files/patch-jdk8 similarity index 100% rename from java/jakarta-commons-collections/files/patch-jdk8 rename to _oldver/java/jakarta-commons-collections/files/patch-jdk8 diff --git a/java/jakarta-commons-collections/pkg-descr b/_oldver/java/jakarta-commons-collections/pkg-descr similarity index 100% rename from java/jakarta-commons-collections/pkg-descr rename to _oldver/java/jakarta-commons-collections/pkg-descr diff --git a/java/jakarta-commons-dbcp/Makefile b/_oldver/java/jakarta-commons-dbcp/Makefile similarity index 100% rename from java/jakarta-commons-dbcp/Makefile rename to _oldver/java/jakarta-commons-dbcp/Makefile diff --git a/java/jakarta-commons-dbcp/distinfo b/_oldver/java/jakarta-commons-dbcp/distinfo similarity index 100% rename from java/jakarta-commons-dbcp/distinfo rename to _oldver/java/jakarta-commons-dbcp/distinfo diff --git a/java/jakarta-commons-dbcp/pkg-descr b/_oldver/java/jakarta-commons-dbcp/pkg-descr similarity index 100% rename from java/jakarta-commons-dbcp/pkg-descr rename to _oldver/java/jakarta-commons-dbcp/pkg-descr diff --git a/java/jakarta-commons-discovery/Makefile b/_oldver/java/jakarta-commons-discovery/Makefile similarity index 100% rename from java/jakarta-commons-discovery/Makefile rename to _oldver/java/jakarta-commons-discovery/Makefile diff --git a/java/jakarta-commons-discovery/distinfo b/_oldver/java/jakarta-commons-discovery/distinfo similarity index 100% rename from java/jakarta-commons-discovery/distinfo rename to _oldver/java/jakarta-commons-discovery/distinfo diff --git a/java/jakarta-commons-discovery/pkg-descr b/_oldver/java/jakarta-commons-discovery/pkg-descr similarity index 100% rename from java/jakarta-commons-discovery/pkg-descr rename to _oldver/java/jakarta-commons-discovery/pkg-descr diff --git a/java/jakarta-commons-httpclient/Makefile b/_oldver/java/jakarta-commons-httpclient/Makefile similarity index 100% rename from java/jakarta-commons-httpclient/Makefile rename to _oldver/java/jakarta-commons-httpclient/Makefile diff --git a/java/jakarta-commons-httpclient/distinfo b/_oldver/java/jakarta-commons-httpclient/distinfo similarity index 100% rename from java/jakarta-commons-httpclient/distinfo rename to _oldver/java/jakarta-commons-httpclient/distinfo diff --git a/java/jakarta-commons-httpclient/files/patch-build.xml b/_oldver/java/jakarta-commons-httpclient/files/patch-build.xml similarity index 100% rename from java/jakarta-commons-httpclient/files/patch-build.xml rename to _oldver/java/jakarta-commons-httpclient/files/patch-build.xml diff --git a/java/jakarta-commons-httpclient/pkg-descr b/_oldver/java/jakarta-commons-httpclient/pkg-descr similarity index 100% rename from java/jakarta-commons-httpclient/pkg-descr rename to _oldver/java/jakarta-commons-httpclient/pkg-descr diff --git a/java/jakarta-commons-lang/Makefile b/_oldver/java/jakarta-commons-lang/Makefile similarity index 100% rename from java/jakarta-commons-lang/Makefile rename to _oldver/java/jakarta-commons-lang/Makefile diff --git a/java/jakarta-commons-lang/distinfo b/_oldver/java/jakarta-commons-lang/distinfo similarity index 100% rename from java/jakarta-commons-lang/distinfo rename to _oldver/java/jakarta-commons-lang/distinfo diff --git a/java/jakarta-commons-lang/pkg-descr b/_oldver/java/jakarta-commons-lang/pkg-descr similarity index 100% rename from java/jakarta-commons-lang/pkg-descr rename to _oldver/java/jakarta-commons-lang/pkg-descr diff --git a/java/jakarta-commons-logging/Makefile b/_oldver/java/jakarta-commons-logging/Makefile similarity index 100% rename from java/jakarta-commons-logging/Makefile rename to _oldver/java/jakarta-commons-logging/Makefile diff --git a/java/jakarta-commons-logging/distinfo b/_oldver/java/jakarta-commons-logging/distinfo similarity index 100% rename from java/jakarta-commons-logging/distinfo rename to _oldver/java/jakarta-commons-logging/distinfo diff --git a/java/jakarta-commons-logging/pkg-descr b/_oldver/java/jakarta-commons-logging/pkg-descr similarity index 100% rename from java/jakarta-commons-logging/pkg-descr rename to _oldver/java/jakarta-commons-logging/pkg-descr diff --git a/java/jakarta-commons-pool/Makefile b/_oldver/java/jakarta-commons-pool/Makefile similarity index 100% rename from java/jakarta-commons-pool/Makefile rename to _oldver/java/jakarta-commons-pool/Makefile diff --git a/java/jakarta-commons-pool/distinfo b/_oldver/java/jakarta-commons-pool/distinfo similarity index 100% rename from java/jakarta-commons-pool/distinfo rename to _oldver/java/jakarta-commons-pool/distinfo diff --git a/java/jakarta-commons-pool/files/patch-build.xml b/_oldver/java/jakarta-commons-pool/files/patch-build.xml similarity index 100% rename from java/jakarta-commons-pool/files/patch-build.xml rename to _oldver/java/jakarta-commons-pool/files/patch-build.xml diff --git a/java/jakarta-commons-pool/pkg-descr b/_oldver/java/jakarta-commons-pool/pkg-descr similarity index 100% rename from java/jakarta-commons-pool/pkg-descr rename to _oldver/java/jakarta-commons-pool/pkg-descr diff --git a/java/jakarta-commons-primitives/Makefile b/_oldver/java/jakarta-commons-primitives/Makefile similarity index 100% rename from java/jakarta-commons-primitives/Makefile rename to _oldver/java/jakarta-commons-primitives/Makefile diff --git a/java/jakarta-commons-primitives/distinfo b/_oldver/java/jakarta-commons-primitives/distinfo similarity index 100% rename from java/jakarta-commons-primitives/distinfo rename to _oldver/java/jakarta-commons-primitives/distinfo diff --git a/java/jakarta-commons-primitives/pkg-descr b/_oldver/java/jakarta-commons-primitives/pkg-descr similarity index 100% rename from java/jakarta-commons-primitives/pkg-descr rename to _oldver/java/jakarta-commons-primitives/pkg-descr diff --git a/java/java-simple-serial-connector/Makefile b/_oldver/java/java-simple-serial-connector/Makefile similarity index 100% rename from java/java-simple-serial-connector/Makefile rename to _oldver/java/java-simple-serial-connector/Makefile diff --git a/java/java-simple-serial-connector/distinfo b/_oldver/java/java-simple-serial-connector/distinfo similarity index 100% rename from java/java-simple-serial-connector/distinfo rename to _oldver/java/java-simple-serial-connector/distinfo diff --git a/java/java-simple-serial-connector/files/build.xml.in b/_oldver/java/java-simple-serial-connector/files/build.xml.in similarity index 100% rename from java/java-simple-serial-connector/files/build.xml.in rename to _oldver/java/java-simple-serial-connector/files/build.xml.in diff --git a/java/java-simple-serial-connector/files/patch-src_cpp___nix__based_jssc.cpp b/_oldver/java/java-simple-serial-connector/files/patch-src_cpp___nix__based_jssc.cpp similarity index 100% rename from java/java-simple-serial-connector/files/patch-src_cpp___nix__based_jssc.cpp rename to _oldver/java/java-simple-serial-connector/files/patch-src_cpp___nix__based_jssc.cpp diff --git a/java/java-simple-serial-connector/files/patch-src_cpp_jssc__SerialNativeInterface.h b/_oldver/java/java-simple-serial-connector/files/patch-src_cpp_jssc__SerialNativeInterface.h similarity index 100% rename from java/java-simple-serial-connector/files/patch-src_cpp_jssc__SerialNativeInterface.h rename to _oldver/java/java-simple-serial-connector/files/patch-src_cpp_jssc__SerialNativeInterface.h diff --git a/java/java-simple-serial-connector/files/patch-src_java_jssc_SerialNativeInterface.java b/_oldver/java/java-simple-serial-connector/files/patch-src_java_jssc_SerialNativeInterface.java similarity index 100% rename from java/java-simple-serial-connector/files/patch-src_java_jssc_SerialNativeInterface.java rename to _oldver/java/java-simple-serial-connector/files/patch-src_java_jssc_SerialNativeInterface.java diff --git a/java/java-simple-serial-connector/files/patch-src_java_jssc_SerialPort.java b/_oldver/java/java-simple-serial-connector/files/patch-src_java_jssc_SerialPort.java similarity index 100% rename from java/java-simple-serial-connector/files/patch-src_java_jssc_SerialPort.java rename to _oldver/java/java-simple-serial-connector/files/patch-src_java_jssc_SerialPort.java diff --git a/java/java-simple-serial-connector/files/patch-src_java_jssc_SerialPortList.java b/_oldver/java/java-simple-serial-connector/files/patch-src_java_jssc_SerialPortList.java similarity index 100% rename from java/java-simple-serial-connector/files/patch-src_java_jssc_SerialPortList.java rename to _oldver/java/java-simple-serial-connector/files/patch-src_java_jssc_SerialPortList.java diff --git a/java/java-simple-serial-connector/pkg-descr b/_oldver/java/java-simple-serial-connector/pkg-descr similarity index 100% rename from java/java-simple-serial-connector/pkg-descr rename to _oldver/java/java-simple-serial-connector/pkg-descr diff --git a/java/jboss71/Makefile b/_oldver/java/jboss71/Makefile similarity index 100% rename from java/jboss71/Makefile rename to _oldver/java/jboss71/Makefile diff --git a/java/jboss71/distinfo b/_oldver/java/jboss71/distinfo similarity index 100% rename from java/jboss71/distinfo rename to _oldver/java/jboss71/distinfo diff --git a/java/jboss71/files/jboss71.in b/_oldver/java/jboss71/files/jboss71.in similarity index 100% rename from java/jboss71/files/jboss71.in rename to _oldver/java/jboss71/files/jboss71.in diff --git a/java/jboss71/files/patch-JCAValidatorFactory.java b/_oldver/java/jboss71/files/patch-JCAValidatorFactory.java similarity index 100% rename from java/jboss71/files/patch-JCAValidatorFactory.java rename to _oldver/java/jboss71/files/patch-JCAValidatorFactory.java diff --git a/java/jboss71/files/patch-JPALazyValidatorFactory.java b/_oldver/java/jboss71/files/patch-JPALazyValidatorFactory.java similarity index 100% rename from java/jboss71/files/patch-JPALazyValidatorFactory.java rename to _oldver/java/jboss71/files/patch-JPALazyValidatorFactory.java diff --git a/java/jboss71/files/patch-LazyValidatorFactory.java b/_oldver/java/jboss71/files/patch-LazyValidatorFactory.java similarity index 100% rename from java/jboss71/files/patch-LazyValidatorFactory.java rename to _oldver/java/jboss71/files/patch-LazyValidatorFactory.java diff --git a/java/jboss71/files/patch-PlatformMBeanResourceUnitTestCase.java b/_oldver/java/jboss71/files/patch-PlatformMBeanResourceUnitTestCase.java similarity index 100% rename from java/jboss71/files/patch-PlatformMBeanResourceUnitTestCase.java rename to _oldver/java/jboss71/files/patch-PlatformMBeanResourceUnitTestCase.java diff --git a/java/jboss71/pkg-descr b/_oldver/java/jboss71/pkg-descr similarity index 100% rename from java/jboss71/pkg-descr rename to _oldver/java/jboss71/pkg-descr diff --git a/java/jboss71/pkg-plist b/_oldver/java/jboss71/pkg-plist similarity index 100% rename from java/jboss71/pkg-plist rename to _oldver/java/jboss71/pkg-plist diff --git a/java/junit/Makefile b/_oldver/java/junit/Makefile similarity index 100% rename from java/junit/Makefile rename to _oldver/java/junit/Makefile diff --git a/java/junit/distinfo b/_oldver/java/junit/distinfo similarity index 100% rename from java/junit/distinfo rename to _oldver/java/junit/distinfo diff --git a/java/junit/pkg-descr b/_oldver/java/junit/pkg-descr similarity index 100% rename from java/junit/pkg-descr rename to _oldver/java/junit/pkg-descr diff --git a/java/maven33/Makefile b/_oldver/java/maven33/Makefile similarity index 100% rename from java/maven33/Makefile rename to _oldver/java/maven33/Makefile diff --git a/java/maven33/distinfo b/_oldver/java/maven33/distinfo similarity index 100% rename from java/maven33/distinfo rename to _oldver/java/maven33/distinfo diff --git a/java/maven33/files/mvn.sh.in b/_oldver/java/maven33/files/mvn.sh.in similarity index 100% rename from java/maven33/files/mvn.sh.in rename to _oldver/java/maven33/files/mvn.sh.in diff --git a/java/maven33/pkg-descr b/_oldver/java/maven33/pkg-descr similarity index 100% rename from java/maven33/pkg-descr rename to _oldver/java/maven33/pkg-descr diff --git a/java/maven33/pkg-plist b/_oldver/java/maven33/pkg-plist similarity index 100% rename from java/maven33/pkg-plist rename to _oldver/java/maven33/pkg-plist diff --git a/java/openfire3/Makefile b/_oldver/java/openfire3/Makefile similarity index 100% rename from java/openfire3/Makefile rename to _oldver/java/openfire3/Makefile diff --git a/java/openfire3/distinfo b/_oldver/java/openfire3/distinfo similarity index 100% rename from java/openfire3/distinfo rename to _oldver/java/openfire3/distinfo diff --git a/java/openfire3/files/openfire.in b/_oldver/java/openfire3/files/openfire.in similarity index 100% rename from java/openfire3/files/openfire.in rename to _oldver/java/openfire3/files/openfire.in diff --git a/java/openfire3/files/pkg-install.in b/_oldver/java/openfire3/files/pkg-install.in similarity index 100% rename from java/openfire3/files/pkg-install.in rename to _oldver/java/openfire3/files/pkg-install.in diff --git a/java/openfire3/files/pkg-message.in b/_oldver/java/openfire3/files/pkg-message.in similarity index 100% rename from java/openfire3/files/pkg-message.in rename to _oldver/java/openfire3/files/pkg-message.in diff --git a/java/openfire3/pkg-descr b/_oldver/java/openfire3/pkg-descr similarity index 100% rename from java/openfire3/pkg-descr rename to _oldver/java/openfire3/pkg-descr diff --git a/java/openfire3/pkg-plist b/_oldver/java/openfire3/pkg-plist similarity index 100% rename from java/openfire3/pkg-plist rename to _oldver/java/openfire3/pkg-plist diff --git a/java/postgresql-jdbc/Makefile b/_oldver/java/postgresql-jdbc/Makefile similarity index 100% rename from java/postgresql-jdbc/Makefile rename to _oldver/java/postgresql-jdbc/Makefile diff --git a/java/postgresql-jdbc/distinfo b/_oldver/java/postgresql-jdbc/distinfo similarity index 100% rename from java/postgresql-jdbc/distinfo rename to _oldver/java/postgresql-jdbc/distinfo diff --git a/java/postgresql-jdbc/files/patch-build-xml b/_oldver/java/postgresql-jdbc/files/patch-build-xml similarity index 100% rename from java/postgresql-jdbc/files/patch-build-xml rename to _oldver/java/postgresql-jdbc/files/patch-build-xml diff --git a/java/postgresql-jdbc/files/pkg-message.in b/_oldver/java/postgresql-jdbc/files/pkg-message.in similarity index 100% rename from java/postgresql-jdbc/files/pkg-message.in rename to _oldver/java/postgresql-jdbc/files/pkg-message.in diff --git a/java/postgresql-jdbc/pkg-descr b/_oldver/java/postgresql-jdbc/pkg-descr similarity index 100% rename from java/postgresql-jdbc/pkg-descr rename to _oldver/java/postgresql-jdbc/pkg-descr diff --git a/java/rxtx/Makefile b/_oldver/java/rxtx/Makefile similarity index 100% rename from java/rxtx/Makefile rename to _oldver/java/rxtx/Makefile diff --git a/java/rxtx/distinfo b/_oldver/java/rxtx/distinfo similarity index 100% rename from java/rxtx/distinfo rename to _oldver/java/rxtx/distinfo diff --git a/java/rxtx/files/patch-Makefile.in b/_oldver/java/rxtx/files/patch-Makefile.in similarity index 100% rename from java/rxtx/files/patch-Makefile.in rename to _oldver/java/rxtx/files/patch-Makefile.in diff --git a/java/rxtx/files/patch-src-ParallelImp.c b/_oldver/java/rxtx/files/patch-src-ParallelImp.c similarity index 100% rename from java/rxtx/files/patch-src-ParallelImp.c rename to _oldver/java/rxtx/files/patch-src-ParallelImp.c diff --git a/java/rxtx/files/patch-src-SerialImp.c b/_oldver/java/rxtx/files/patch-src-SerialImp.c similarity index 100% rename from java/rxtx/files/patch-src-SerialImp.c rename to _oldver/java/rxtx/files/patch-src-SerialImp.c diff --git a/java/rxtx/files/patch-src-gnu-io-CommPort.java b/_oldver/java/rxtx/files/patch-src-gnu-io-CommPort.java similarity index 100% rename from java/rxtx/files/patch-src-gnu-io-CommPort.java rename to _oldver/java/rxtx/files/patch-src-gnu-io-CommPort.java diff --git a/java/rxtx/files/patch-src-gnu-io-CommPortEnumerator.java b/_oldver/java/rxtx/files/patch-src-gnu-io-CommPortEnumerator.java similarity index 100% rename from java/rxtx/files/patch-src-gnu-io-CommPortEnumerator.java rename to _oldver/java/rxtx/files/patch-src-gnu-io-CommPortEnumerator.java diff --git a/java/rxtx/files/patch-src-gnu-io-CommPortIdentifier.java b/_oldver/java/rxtx/files/patch-src-gnu-io-CommPortIdentifier.java similarity index 100% rename from java/rxtx/files/patch-src-gnu-io-CommPortIdentifier.java rename to _oldver/java/rxtx/files/patch-src-gnu-io-CommPortIdentifier.java diff --git a/java/rxtx/files/patch-src-gnu-io-Configure.java b/_oldver/java/rxtx/files/patch-src-gnu-io-Configure.java similarity index 100% rename from java/rxtx/files/patch-src-gnu-io-Configure.java rename to _oldver/java/rxtx/files/patch-src-gnu-io-Configure.java diff --git a/java/rxtx/files/patch-src-gnu-io-LPRPort.java b/_oldver/java/rxtx/files/patch-src-gnu-io-LPRPort.java similarity index 100% rename from java/rxtx/files/patch-src-gnu-io-LPRPort.java rename to _oldver/java/rxtx/files/patch-src-gnu-io-LPRPort.java diff --git a/java/rxtx/files/patch-src-gnu-io-NoSuchPortException.java b/_oldver/java/rxtx/files/patch-src-gnu-io-NoSuchPortException.java similarity index 100% rename from java/rxtx/files/patch-src-gnu-io-NoSuchPortException.java rename to _oldver/java/rxtx/files/patch-src-gnu-io-NoSuchPortException.java diff --git a/java/rxtx/files/patch-src-gnu-io-RXTXCommDriver.java b/_oldver/java/rxtx/files/patch-src-gnu-io-RXTXCommDriver.java similarity index 100% rename from java/rxtx/files/patch-src-gnu-io-RXTXCommDriver.java rename to _oldver/java/rxtx/files/patch-src-gnu-io-RXTXCommDriver.java diff --git a/java/rxtx/files/patch-src-gnu-io-RXTXPort.java b/_oldver/java/rxtx/files/patch-src-gnu-io-RXTXPort.java similarity index 100% rename from java/rxtx/files/patch-src-gnu-io-RXTXPort.java rename to _oldver/java/rxtx/files/patch-src-gnu-io-RXTXPort.java diff --git a/java/rxtx/files/patch-src-gnu-io-SerialPortEvent.java b/_oldver/java/rxtx/files/patch-src-gnu-io-SerialPortEvent.java similarity index 100% rename from java/rxtx/files/patch-src-gnu-io-SerialPortEvent.java rename to _oldver/java/rxtx/files/patch-src-gnu-io-SerialPortEvent.java diff --git a/java/rxtx/pkg-descr b/_oldver/java/rxtx/pkg-descr similarity index 100% rename from java/rxtx/pkg-descr rename to _oldver/java/rxtx/pkg-descr diff --git a/java/rxtx/pkg-plist b/_oldver/java/rxtx/pkg-plist similarity index 100% rename from java/rxtx/pkg-plist rename to _oldver/java/rxtx/pkg-plist diff --git a/java/slf4j/Makefile b/_oldver/java/slf4j/Makefile similarity index 100% rename from java/slf4j/Makefile rename to _oldver/java/slf4j/Makefile diff --git a/java/slf4j/distinfo b/_oldver/java/slf4j/distinfo similarity index 100% rename from java/slf4j/distinfo rename to _oldver/java/slf4j/distinfo diff --git a/java/slf4j/pkg-descr b/_oldver/java/slf4j/pkg-descr similarity index 100% rename from java/slf4j/pkg-descr rename to _oldver/java/slf4j/pkg-descr diff --git a/java/slf4j/pkg-plist b/_oldver/java/slf4j/pkg-plist similarity index 100% rename from java/slf4j/pkg-plist rename to _oldver/java/slf4j/pkg-plist diff --git a/java/springframework/Makefile b/_oldver/java/springframework/Makefile similarity index 100% rename from java/springframework/Makefile rename to _oldver/java/springframework/Makefile diff --git a/java/springframework/distinfo b/_oldver/java/springframework/distinfo similarity index 100% rename from java/springframework/distinfo rename to _oldver/java/springframework/distinfo diff --git a/java/springframework/pkg-descr b/_oldver/java/springframework/pkg-descr similarity index 100% rename from java/springframework/pkg-descr rename to _oldver/java/springframework/pkg-descr diff --git a/java/springframework/pkg-plist b/_oldver/java/springframework/pkg-plist similarity index 100% rename from java/springframework/pkg-plist rename to _oldver/java/springframework/pkg-plist diff --git a/java/sqlitejdbc/Makefile b/_oldver/java/sqlitejdbc/Makefile similarity index 100% rename from java/sqlitejdbc/Makefile rename to _oldver/java/sqlitejdbc/Makefile diff --git a/java/sqlitejdbc/distinfo b/_oldver/java/sqlitejdbc/distinfo similarity index 100% rename from java/sqlitejdbc/distinfo rename to _oldver/java/sqlitejdbc/distinfo diff --git a/java/sqlitejdbc/files/patch-Makefile b/_oldver/java/sqlitejdbc/files/patch-Makefile similarity index 100% rename from java/sqlitejdbc/files/patch-Makefile rename to _oldver/java/sqlitejdbc/files/patch-Makefile diff --git a/java/sqlitejdbc/files/patch-Makefile.common b/_oldver/java/sqlitejdbc/files/patch-Makefile.common similarity index 100% rename from java/sqlitejdbc/files/patch-Makefile.common rename to _oldver/java/sqlitejdbc/files/patch-Makefile.common diff --git a/java/sqlitejdbc/files/patch-src_org_sqlite_Conn.java b/_oldver/java/sqlitejdbc/files/patch-src_org_sqlite_Conn.java similarity index 100% rename from java/sqlitejdbc/files/patch-src_org_sqlite_Conn.java rename to _oldver/java/sqlitejdbc/files/patch-src_org_sqlite_Conn.java diff --git a/java/sqlitejdbc/pkg-descr b/_oldver/java/sqlitejdbc/pkg-descr similarity index 100% rename from java/sqlitejdbc/pkg-descr rename to _oldver/java/sqlitejdbc/pkg-descr diff --git a/java/sqlitejdbc/pkg-message b/_oldver/java/sqlitejdbc/pkg-message similarity index 100% rename from java/sqlitejdbc/pkg-message rename to _oldver/java/sqlitejdbc/pkg-message diff --git a/java/wildfly10/Makefile b/_oldver/java/wildfly10/Makefile similarity index 100% rename from java/wildfly10/Makefile rename to _oldver/java/wildfly10/Makefile diff --git a/java/wildfly10/distinfo b/_oldver/java/wildfly10/distinfo similarity index 100% rename from java/wildfly10/distinfo rename to _oldver/java/wildfly10/distinfo diff --git a/java/wildfly10/files/patch-bin_add-user.sh b/_oldver/java/wildfly10/files/patch-bin_add-user.sh similarity index 100% rename from java/wildfly10/files/patch-bin_add-user.sh rename to _oldver/java/wildfly10/files/patch-bin_add-user.sh diff --git a/java/wildfly10/files/pkg-message.in b/_oldver/java/wildfly10/files/pkg-message.in similarity index 100% rename from java/wildfly10/files/pkg-message.in rename to _oldver/java/wildfly10/files/pkg-message.in diff --git a/java/wildfly10/files/wildfly10.in b/_oldver/java/wildfly10/files/wildfly10.in similarity index 100% rename from java/wildfly10/files/wildfly10.in rename to _oldver/java/wildfly10/files/wildfly10.in diff --git a/java/wildfly10/pkg-descr b/_oldver/java/wildfly10/pkg-descr similarity index 100% rename from java/wildfly10/pkg-descr rename to _oldver/java/wildfly10/pkg-descr diff --git a/java/wildfly10/pkg-plist b/_oldver/java/wildfly10/pkg-plist similarity index 100% rename from java/wildfly10/pkg-plist rename to _oldver/java/wildfly10/pkg-plist diff --git a/java/wildfly10/pkg-plist.orig b/_oldver/java/wildfly10/pkg-plist.orig similarity index 100% rename from java/wildfly10/pkg-plist.orig rename to _oldver/java/wildfly10/pkg-plist.orig diff --git a/java/wildfly9/Makefile b/_oldver/java/wildfly9/Makefile similarity index 100% rename from java/wildfly9/Makefile rename to _oldver/java/wildfly9/Makefile diff --git a/java/wildfly9/Makefile.orig b/_oldver/java/wildfly9/Makefile.orig similarity index 100% rename from java/wildfly9/Makefile.orig rename to _oldver/java/wildfly9/Makefile.orig diff --git a/java/wildfly9/distinfo b/_oldver/java/wildfly9/distinfo similarity index 100% rename from java/wildfly9/distinfo rename to _oldver/java/wildfly9/distinfo diff --git a/java/wildfly9/files/patch-bin-add-user.sh b/_oldver/java/wildfly9/files/patch-bin-add-user.sh similarity index 100% rename from java/wildfly9/files/patch-bin-add-user.sh rename to _oldver/java/wildfly9/files/patch-bin-add-user.sh diff --git a/java/wildfly9/files/pkg-message.in b/_oldver/java/wildfly9/files/pkg-message.in similarity index 100% rename from java/wildfly9/files/pkg-message.in rename to _oldver/java/wildfly9/files/pkg-message.in diff --git a/java/wildfly9/files/wildfly9.in b/_oldver/java/wildfly9/files/wildfly9.in similarity index 100% rename from java/wildfly9/files/wildfly9.in rename to _oldver/java/wildfly9/files/wildfly9.in diff --git a/java/wildfly9/pkg-descr b/_oldver/java/wildfly9/pkg-descr similarity index 100% rename from java/wildfly9/pkg-descr rename to _oldver/java/wildfly9/pkg-descr diff --git a/java/wildfly9/pkg-plist b/_oldver/java/wildfly9/pkg-plist similarity index 100% rename from java/wildfly9/pkg-plist rename to _oldver/java/wildfly9/pkg-plist diff --git a/java/gradle/Makefile b/java/gradle/Makefile index f2f75b71..dcb86921 100644 --- a/java/gradle/Makefile +++ b/java/gradle/Makefile @@ -12,6 +12,7 @@ COMMENT= Project automation tool USES= zip USE_JAVA= yes +JAVA_VERSION= 11+ NO_ARCH= yes NO_BUILD= yes diff --git a/java/intellij-fsnotifier/Makefile b/java/intellij-fsnotifier/Makefile index d46a6492..0c180cf2 100644 --- a/java/intellij-fsnotifier/Makefile +++ b/java/intellij-fsnotifier/Makefile @@ -17,7 +17,7 @@ GH_TAGNAME= a04fbff6e21d58fea7a3ed2a6a21e53cbef4b7af USES= compiler:c11 -#IDEA_HOME=${PREFIX}/intellij +IDEA_HOME=${PREFIX}/intellij PLIST_FILES= ${IDEA_HOME}/bin/fsnotifier do-install: diff --git a/java/intellij/Makefile b/java/intellij/Makefile index 6a13288b..a4de4094 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -5,7 +5,7 @@ # Vadim Zhukov PORTNAME= intellij -PORTVERSION= 2019.3.3 +PORTVERSION= 2020.1 #2019.3.4 CATEGORIES= java devel MASTER_SITES= https://download-cf.jetbrains.com/idea/ DISTNAME= ideaIC-${PORTVERSION}-no-jbr @@ -19,7 +19,7 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier USES= python:run shebangfix USE_JAVA= yes -#JAVA_VERSION= 8+ +JAVA_VERSION= 11+ SHEBANG_FILES= bin/printenv.py bin/restart.py diff --git a/java/intellij/distinfo b/java/intellij/distinfo index e8cf51cb..fd256ac9 100644 --- a/java/intellij/distinfo +++ b/java/intellij/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581536465 -SHA256 (jetbrains/ideaIC-2019.3.3-no-jbr.tar.gz) = c40536791c754c30dbf378bd6b59e0524b0588f26ddb4d85a9f260cf13454d14 -SIZE (jetbrains/ideaIC-2019.3.3-no-jbr.tar.gz) = 563410584 +TIMESTAMP = 1586608700 +SHA256 (jetbrains/ideaIC-2020.1-no-jbr.tar.gz) = 990783cd0115515557668fa67421dae0f6245eb3f8e7d1c42e423b36d577a222 +SIZE (jetbrains/ideaIC-2020.1-no-jbr.tar.gz) = 524536881 diff --git a/java/kotlin/Makefile b/java/kotlin/Makefile index 0954107f..3618ee17 100644 --- a/java/kotlin/Makefile +++ b/java/kotlin/Makefile @@ -17,6 +17,8 @@ WRKSRC= ${WRKDIR}/kotlinc USE_JAVA= yes NO_BUILD= yes +JAVA_VERSION= 11+ + KOTLIN_BIN+= kapt KOTLIN_BIN+= kotlin diff --git a/java/maven/Makefile b/java/maven/Makefile index 0041ca58..e3c080a3 100644 --- a/java/maven/Makefile +++ b/java/maven/Makefile @@ -13,6 +13,7 @@ COMMENT= Java project management tool #RUN_DEPENDS= mvn:devel/maven-wrapper USE_JAVA= yes +JAVA_VERSION= 11+ CPE_PRODUCT= maven CPE_VENDOR= apache diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index c5bf0c26..0712c2ab 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -60,13 +60,19 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes +#JDK_MAJOR_VERSION= 11 +#JDK_MINOR_VERSION= 0 +#JDK_PATCH_VERSION= 5 +#JDK_BUILD_NUMBER= 10 +#BSD_JDK_VERSION= 1 + JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 5 - +JDK_PATCH_VERSION= 6 JDK_BUILD_NUMBER= 10 BSD_JDK_VERSION= 1 + GNU_CONFIGURE= yes CONFIGURE_ENV+= CC=${CC} diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo index 37a79473..816434bf 100644 --- a/java/openjdk11/distinfo +++ b/java/openjdk11/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1571251905 -SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.5+10-1_GH0.tar.gz) = 7e9ae3ca72fe048dfcea4a95755e7fef4b2615d5817d809cc3b39519c63ab86b -SIZE (battleblow-openjdk-jdk11u-jdk-11.0.5+10-1_GH0.tar.gz) = 116849965 +TIMESTAMP = 1586617043 +SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.6+10-1_GH0.tar.gz) = 062450974b7df3ec7128b0361bab1c470f9b7cc4542a77304f4c5eb3b4752a6f +SIZE (battleblow-openjdk-jdk11u-jdk-11.0.6+10-1_GH0.tar.gz) = 117035292 diff --git a/java/scala/Makefile b/java/scala/Makefile index 8ed3fccd..b4ea45d4 100644 --- a/java/scala/Makefile +++ b/java/scala/Makefile @@ -16,7 +16,7 @@ USES= tar:tgz NO_ARCH= yes NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.8+ +JAVA_VERSION= 11+ SCALA_HOME= ${DATADIR} SCALA_SHRDIRS= lib