summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/R-cran-rJava/Makefile11
-rw-r--r--devel/RStudio/Makefile5
-rw-r--r--devel/ammonite/Makefile3
-rw-r--r--devel/antlr/Makefile3
-rw-r--r--devel/antlr3/Makefile3
-rw-r--r--devel/antlr4/Makefile4
-rw-r--r--devel/apache-ant/Makefile3
-rw-r--r--devel/apache-commons-configuration/Makefile3
-rw-r--r--devel/apache-commons-daemon/Makefile5
-rw-r--r--devel/apache-commons-io/Makefile2
-rw-r--r--devel/apache-commons-jxpath/Makefile3
-rw-r--r--devel/apache-log4j2/Makefile4
-rw-r--r--devel/apache-rat/Makefile3
-rw-r--r--devel/arduino/Makefile4
-rw-r--r--devel/arduino18/Makefile5
-rw-r--r--devel/argouml/Makefile3
-rw-r--r--devel/artifactory/Makefile4
-rw-r--r--devel/astah-community/Makefile3
-rw-r--r--devel/avalon-framework/Makefile3
-rw-r--r--devel/bazel/Makefile7
-rw-r--r--devel/bazel5/Makefile7
-rw-r--r--devel/bfg/Makefile3
-rw-r--r--devel/cfr/Makefile3
-rw-r--r--devel/charva/Makefile5
-rw-r--r--devel/coursier/Makefile3
-rw-r--r--devel/dbus-java/Makefile4
-rw-r--r--devel/doctorj/Makefile3
-rw-r--r--devel/flex-sdk/Makefile3
-rw-r--r--devel/flex-sdk35/Makefile3
-rw-r--r--devel/flexdock/Makefile3
-rw-r--r--devel/flexjson/Makefile3
-rw-r--r--devel/ghidra/Makefile4
-rw-r--r--devel/gradle/Makefile3
-rw-r--r--devel/gradle5/Makefile4
-rw-r--r--devel/gradle6/Makefile3
-rw-r--r--devel/gradle62/Makefile3
-rw-r--r--devel/gradle761/Makefile3
-rw-r--r--devel/ireport/Makefile3
-rw-r--r--devel/java-findbugs/Makefile3
-rw-r--r--devel/jcmdline/Makefile3
-rw-r--r--devel/jenkins-lts/Makefile4
-rw-r--r--devel/jenkins/Makefile4
-rw-r--r--devel/jetbrains-clion/Makefile4
-rw-r--r--devel/jetbrains-goland/Makefile3
-rw-r--r--devel/jetbrains-phpstorm/Makefile3
-rw-r--r--devel/jetbrains-rustrover/Makefile3
-rw-r--r--devel/jetbrains-sqlite/Makefile4
-rw-r--r--devel/jetbrains-webstorm/Makefile3
-rw-r--r--devel/jgoodies-looks/Makefile2
-rw-r--r--devel/jiic/Makefile4
-rw-r--r--devel/jline/Makefile4
-rw-r--r--devel/jna/Makefile6
-rw-r--r--devel/jsap/Makefile3
-rw-r--r--devel/leiningen/Makefile3
-rw-r--r--devel/libastylej/Makefile4
-rw-r--r--devel/libmatthew/Makefile3
-rw-r--r--devel/libreadline-java/Makefile6
-rw-r--r--devel/libvirt-java/Makefile4
-rw-r--r--devel/listserialc/Makefile2
-rw-r--r--devel/log4j/Makefile3
-rw-r--r--devel/luajava/Makefile3
-rw-r--r--devel/maven/Makefile3
-rw-r--r--devel/maven363/Makefile3
-rw-r--r--devel/maven39/Makefile3
-rw-r--r--devel/mill/Makefile3
-rw-r--r--devel/netscape-java40/Makefile3
-rw-r--r--devel/nexus2-oss/Makefile8
-rw-r--r--devel/ocaml-camljava/Makefile3
-rw-r--r--devel/opengrok/Makefile3
-rw-r--r--devel/p5-Inline-Java/Makefile9
-rw-r--r--devel/p5-Java/Makefile3
-rw-r--r--devel/pmd/Makefile3
-rw-r--r--devel/protobuf-java/Makefile2
-rw-r--r--devel/py-jep/Makefile3
-rw-r--r--devel/pycharm-ce/Makefile3
-rw-r--r--devel/pycharm-pro/Makefile3
-rw-r--r--devel/rubygem-jruby-jars/Makefile3
-rw-r--r--devel/rubymine/Makefile4
-rw-r--r--devel/sabre/Makefile5
-rw-r--r--devel/sbt/Makefile4
-rw-r--r--devel/scalatest/Makefile4
-rw-r--r--devel/simian/Makefile22
-rw-r--r--devel/slf4j/Makefile4
-rw-r--r--devel/smc/Makefile3
-rw-r--r--devel/soapui/Makefile4
-rw-r--r--devel/sonar-scanner-cli/Makefile3
-rw-r--r--devel/sonarqube-ant-task/Makefile3
-rw-r--r--devel/sonarqube-community/Makefile3
-rw-r--r--devel/spark/Makefile3
-rw-r--r--devel/sparsebitset/Makefile3
-rw-r--r--devel/staf/Makefile4
-rw-r--r--devel/statcvs/Makefile5
-rw-r--r--devel/statsvn/Makefile5
-rw-r--r--devel/swank-clojure/Makefile2
-rw-r--r--devel/tijmp/Makefile4
-rw-r--r--devel/tinylaf/Makefile4
-rw-r--r--devel/umlgraph/Makefile3
-rw-r--r--devel/violet/Makefile2
-rw-r--r--devel/zanata-cli/Makefile3
-rw-r--r--devel/zookeeper/Makefile5
100 files changed, 146 insertions, 239 deletions
diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile
index 4dc72caf7725..c96c1f480486 100644
--- a/devel/R-cran-rJava/Makefile
+++ b/devel/R-cran-rJava/Makefile
@@ -12,15 +12,14 @@ LICENSE= LGPL21
LIB_DEPENDS= libicuuc.so:devel/icu \
libpcre2-8.so:devel/pcre2
-USES= cran:compiles
-USE_JAVA= yes
+USES= cran:compiles java
JRE_LIBS= ${JAVA_HOME}/jre/lib/${ARCH:S/armv6/arm/:S/armv7/arm/:S/powerpc64/ppc64/}/server # JDK8
#JRE_LIBS= ${JAVA_HOME}/jre/lib/server # JDK11
LDFLAGS= "-Wl,-rpath=${JRE_LIBS} "
MAKE_ENV= JAVA_HOME=${JAVA_HOME} \
JAVA=${JAVA} \
- JAVAC=${JAVAC} \
+ JAVAC=${JAVA_HOME}/bin/javac \
JAVAH=${JAVAH} \
JAR=${JAR} \
LD_LIBRARY_PATH="${JRE_LIBS}" \
@@ -28,8 +27,8 @@ MAKE_ENV= JAVA_HOME=${JAVA_HOME} \
JAVA_LIBS="-Wl,-rpath=${JRE_LIBS} -L${JRE_LIBS} -ljvm -lpthread" \
JAVA_CPPFLAGS="-I${JAVA_HOME}/jre/../include -I${JAVA_HOME}/jre/../include/${OPSYS:tl}"
-pre-configure:
- # Just for debug purpose
- ${LOCALBASE}/bin/R CMD javareconf -e exit
+#pre-configure:
+ # Just for debug purpose but this fails with new USES=java although build is OK
+# ${LOCALBASE}/bin/R CMD javareconf -e exit
.include <bsd.port.mk>
diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile
index 5670744f75cf..7b7f455b98ab 100644
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@@ -38,11 +38,8 @@ FLAVORS= desktop server
FLAVOR?= ${FLAVORS:[1]}
server_PKGNAMESUFFIX= -server
-USES= cmake fortran localbase:ldflags pgsql pkgconfig sqlite ssl
-USE_JAVA= yes
+USES= cmake fortran java:build localbase:ldflags pgsql pkgconfig sqlite ssl
JAVA_VERSION= 11 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=1644, tid=0x00000000000c62b6 guarantee(val < (1U << nbits)) failed: Field too big for insn
-JAVA_BUILD= yes
-
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME:tl}
GH_TUPLE= rstudio:r2d3:v0.2.0:r2d3/dependencies/common/r2d3 \
diff --git a/devel/ammonite/Makefile b/devel/ammonite/Makefile
index dbc370d8b40b..acb4f95792ae 100644
--- a/devel/ammonite/Makefile
+++ b/devel/ammonite/Makefile
@@ -13,8 +13,7 @@ WWW= https://ammonite.io/
LICENSE= MIT
-USE_JAVA= yes
-JAVA_VERSION= 8+
+USES= java
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index 97ea79d0cac4..cd0010fe4fdb 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -13,9 +13,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
CONFLICTS= pccts
-USES= compiler:c++11-lang gmake
+USES= compiler:c++11-lang gmake java
USE_CXXSTD= c++14
-USE_JAVA= yes
HAS_CONFIGURE= yes
CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" CLASSPATH="${PORT_CLASSPATH}"
diff --git a/devel/antlr3/Makefile b/devel/antlr3/Makefile
index f2d6f3765a86..d2b09279d2b3 100644
--- a/devel/antlr3/Makefile
+++ b/devel/antlr3/Makefile
@@ -13,9 +13,10 @@ WWW= https://www.antlr3.org/
LICENSE= BSD3CLAUSE
+USES= java
+
NO_BUILD= yes
NO_ARCH= yes
-USE_JAVA= yes
INSTALL_JAR= ${DISTFILES}
SUB_LIST= INSTALL_JAR=${INSTALL_JAR}
SUB_FILES= antlr.sh
diff --git a/devel/antlr4/Makefile b/devel/antlr4/Makefile
index da95afec1d00..09a68d760c6c 100644
--- a/devel/antlr4/Makefile
+++ b/devel/antlr4/Makefile
@@ -12,10 +12,10 @@ WWW= https://www.antlr.org/
LICENSE= BSD3CLAUSE
+USES= java
+
NO_BUILD= yes
NO_ARCH= yes
-USE_JAVA= yes
-JAVA_VERSION= 8+
INSTALL_JAR= ${DISTFILES}
SUB_LIST= INSTALL_JAR=${INSTALL_JAR}
SUB_FILES= antlr.sh
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 90112042189e..00ecb6eefdd6 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -14,10 +14,9 @@ WWW= https://ant.apache.org/
LICENSE= APACHE20
-USES= cpe tar:bzip2
+USES= cpe java tar:bzip2
CPE_VENDOR= apache
CPE_PRODUCT= ant
-USE_JAVA= yes
ANT_DISTFILE= ${PORTNAME}-${DISTVERSION}-bin.tar.bz2
MANPAGE_DISTFILE= ant_${DISTVERSION}-${MANPAGE_VERSION}.debian.tar.xz
diff --git a/devel/apache-commons-configuration/Makefile b/devel/apache-commons-configuration/Makefile
index 0e38e6ce379f..47d9bf4b5dc7 100644
--- a/devel/apache-commons-configuration/Makefile
+++ b/devel/apache-commons-configuration/Makefile
@@ -16,11 +16,12 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \
${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
+USES= java
+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
OPTIONS_DEFINE= DOCS
-USE_JAVA= yes
NO_BUILD= yes
PORTDOCS= *
diff --git a/devel/apache-commons-daemon/Makefile b/devel/apache-commons-daemon/Makefile
index 5ca55f773869..9f705811de95 100644
--- a/devel/apache-commons-daemon/Makefile
+++ b/devel/apache-commons-daemon/Makefile
@@ -13,10 +13,11 @@ WWW= https://commons.apache.org/proper/commons-daemon/
LICENSE= APACHE20
+USES= java
+JAVA_OS= native
+
OPTIONS_DEFINE= DOCS
-USE_JAVA= yes
-JAVA_OS= native
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-java=${JAVA_HOME}
diff --git a/devel/apache-commons-io/Makefile b/devel/apache-commons-io/Makefile
index 91255885331f..7f9ec6678194 100644
--- a/devel/apache-commons-io/Makefile
+++ b/devel/apache-commons-io/Makefile
@@ -12,7 +12,7 @@ WWW= https://commons.apache.org/proper/commons-io/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USE_JAVA= yes
+USES= java
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/apache-commons-jxpath/Makefile b/devel/apache-commons-jxpath/Makefile
index 4aca17db0d4c..cf5984d75e96 100644
--- a/devel/apache-commons-jxpath/Makefile
+++ b/devel/apache-commons-jxpath/Makefile
@@ -11,7 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Utilities for manipulating Java Beans using the XPath syntax
WWW= https://commons.apache.org/proper/commons-jxpath/
-USE_JAVA= yes
+USES= java
+
NO_BUILD= yes
PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
diff --git a/devel/apache-log4j2/Makefile b/devel/apache-log4j2/Makefile
index 285bc0988648..5c33daaaf0d0 100644
--- a/devel/apache-log4j2/Makefile
+++ b/devel/apache-log4j2/Makefile
@@ -12,11 +12,9 @@ WWW= https://logging.apache.org/log4j/2.x/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES= cpe zip
+USES= cpe java zip
NO_WRKSUBDIR= yes
-USE_JAVA= yes
-JAVA_VERSION= 8+
NO_BUILD= yes
NO_ARCH= yes
CPE_VENDOR= apache
diff --git a/devel/apache-rat/Makefile b/devel/apache-rat/Makefile
index 533e1564ceaa..7a89809d79bb 100644
--- a/devel/apache-rat/Makefile
+++ b/devel/apache-rat/Makefile
@@ -11,8 +11,7 @@ WWW= https://creadur.apache.org/rat/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= tar:bzip2
-USE_JAVA= yes
+USES= java tar:bzip2
NO_BUILD= yes
NO_ARCH= yes
diff --git a/devel/arduino/Makefile b/devel/arduino/Makefile
index 2ca921cc51f3..1186e5536f9d 100644
--- a/devel/arduino/Makefile
+++ b/devel/arduino/Makefile
@@ -21,13 +21,11 @@ RUN_DEPENDS= ${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:comms/rxtx \
${LOCALBASE}/avr/include/avr/io.h:devel/avr-libc
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= dos2unix tar:tgz kmod
+USES= dos2unix java tar:tgz kmod
DOS2UNIX_REGEX= .*(\.(c|cpp|h|hex|txt)|Makefile|makefile)
-USE_JAVA= yes
JAVA_OS= native
JAVA_VENDOR= openjdk
-JAVA_RUN= yes
CONFLICTS_INSTALL= arduino18
diff --git a/devel/arduino18/Makefile b/devel/arduino18/Makefile
index 03887a958df1..6205751b0e3c 100644
--- a/devel/arduino18/Makefile
+++ b/devel/arduino18/Makefile
@@ -48,14 +48,11 @@ GH_PROJECT= Arduino
GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//}
.endfor
-USES= desktop-file-utils
+USES= desktop-file-utils java:ant
LIB_DIRS+= ${LOCALBASE}/lib ${LOCALBASE}/lib/jni
WRKSRC_SUBDIR= build
PATCH_WRKSRC= ${WRKSRC}/../
MAKE_ARGS+= -Dlight_bundle=true -Dlocal_sources=true -Dno_arduino_builder=true
-USE_JAVA= yes
-JAVA_VERSION= 8+
-USE_ANT= yes
OS_DIR= ${WRKSRC}/linux
BUILD_DIR= ${OS_DIR}/work
INSLIST= lib libraries revisions.txt tools
diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index 3307bc643f0f..5eaaa7fe9546 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -16,12 +16,13 @@ WWW= https://github.com/argouml-tigris-org/argouml/wiki
LICENSE= EPL
+USES= java
+
PORTSCOUT= limitw:1,even \
site:${MASTER_SITES:S/argouml-${PORTVERSION}\///}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
NO_BUILD= yes
-USE_JAVA= yes
SUB_FILES= argouml.sh
PORTDOCS= manual-${PORTVERSION}.pdf quickguide-${PORTVERSION}.pdf
diff --git a/devel/artifactory/Makefile b/devel/artifactory/Makefile
index 88ad006a6cbd..e9cf53f565ac 100644
--- a/devel/artifactory/Makefile
+++ b/devel/artifactory/Makefile
@@ -20,11 +20,9 @@ RUN_DEPENDS= bash:shells/bash
WRKSRC= ${WRKDIR}/${PORTNAME}-oss-${PORTVERSION}
-USES= cpe shebangfix zip
+USES= cpe java shebangfix zip
CPE_VENDOR= jfrog
SHEBANG_FILES= bin/artifactory.sh
-USE_JAVA= yes
-JAVA_VERSION= 8+
JAVA_VENDOR= openjdk
NO_BUILD= yes
NO_ARCH= yes
diff --git a/devel/astah-community/Makefile b/devel/astah-community/Makefile
index b24e773e821b..f9b30ca9c8b1 100644
--- a/devel/astah-community/Makefile
+++ b/devel/astah-community/Makefile
@@ -15,8 +15,7 @@ LICENSE_NAME= End User License Agreement
LICENSE_TEXT= License restrictions -- See http://astah.net/faq/community/enduser-license-agreement
LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept
-USES= zip
-USE_JAVA= yes
+USES= java zip
REVISION= b4c6e9
WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX:S!-!_!}
diff --git a/devel/avalon-framework/Makefile b/devel/avalon-framework/Makefile
index 9963389adebc..5ddfe14bdf13 100644
--- a/devel/avalon-framework/Makefile
+++ b/devel/avalon-framework/Makefile
@@ -8,7 +8,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Apache Avalon core framework for component programming
WWW= https://avalon.apache.org/closed.html
-USE_JAVA= yes
+USES= java
+
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile
index a485e9080be1..4741cbfa276e 100644
--- a/devel/bazel/Makefile
+++ b/devel/bazel/Makefile
@@ -16,15 +16,10 @@ NOT_FOR_ARCHS= i386
BUILD_DEPENDS= bash:shells/bash \
zip:archivers/zip
-USES= cpe python shebangfix zip
-
+USES= cpe java python shebangfix zip
CPE_VENDOR= google
-
-USE_JAVA= yes
JAVA_VERSION= 11
JAVA_VENDOR= openjdk
-JAVA_BUILD= yes
-JAVA_RUN= yes
SHEBANG_REGEX= .*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
diff --git a/devel/bazel5/Makefile b/devel/bazel5/Makefile
index ab02325d1e8f..a948339e010b 100644
--- a/devel/bazel5/Makefile
+++ b/devel/bazel5/Makefile
@@ -19,15 +19,10 @@ BROKEN_armv7= fails to package: cp: bazel: No such file or directory
BUILD_DEPENDS= bash:shells/bash \
zip:archivers/zip
-USES= cpe python shebangfix zip
-
+USES= cpe java python shebangfix zip
CPE_VENDOR= google
-
-USE_JAVA= yes
JAVA_VERSION= 11
JAVA_VENDOR= openjdk
-JAVA_BUILD= yes
-JAVA_RUN= yes
SHEBANG_REGEX= .*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
diff --git a/devel/bfg/Makefile b/devel/bfg/Makefile
index f384ffdf6b21..2f4c0d840c97 100644
--- a/devel/bfg/Makefile
+++ b/devel/bfg/Makefile
@@ -10,8 +10,7 @@ WWW= https://rtyley.github.io/bfg-repo-cleaner/
LICENSE= GPLv3
-USE_JAVA= yes
-JAVA_RUN= jre
+USES= java
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/cfr/Makefile b/devel/cfr/Makefile
index 47d38559d2ce..c259100a8d21 100644
--- a/devel/cfr/Makefile
+++ b/devel/cfr/Makefile
@@ -14,8 +14,7 @@ WWW= https://www.benf.org/other/cfr/
# http://www.benf.org/other/cfr/license.html
LICENSE= MIT
-USE_JAVA= yes
-JAVA_RUN= jre
+USES= java
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index e3b59fdca2bd..b22823768f31 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -17,10 +17,9 @@ BROKEN_armv7= fails to compile: build.xml: compilation failed
OPTIONS_DEFINE= DOCS
-USES= dos2unix zip
+USES= dos2unix java:ant zip
DOS2UNIX_GLOB= build.xml Makefile.freebsd.txt *.c *.java
-USE_JAVA= yes
-USE_ANT= yes
+
ALL_TARGET= clean makeDLL dist
PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \
diff --git a/devel/coursier/Makefile b/devel/coursier/Makefile
index 252d4639549d..c18d4994b3eb 100644
--- a/devel/coursier/Makefile
+++ b/devel/coursier/Makefile
@@ -13,8 +13,7 @@ WWW= https://get-coursier.io/
LICENSE= APACHE20
-USE_JAVA= yes
-JAVA_VERSION= 8+
+USES= java
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/dbus-java/Makefile b/devel/dbus-java/Makefile
index f791dbb92d09..89170ef3b200 100644
--- a/devel/dbus-java/Makefile
+++ b/devel/dbus-java/Makefile
@@ -16,9 +16,7 @@ LICENSE_PERMS_ACADEMIC= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libunix-java.so:devel/libmatthew
-USES= gettext gmake
-USE_JAVA= yes
-JAVA_VERSION= 8+
+USES= gettext gmake java
MAKE_ARGS= MANPREFIX=${PREFIX}/share/man/man1
.if defined(WITH_DEBUG)
diff --git a/devel/doctorj/Makefile b/devel/doctorj/Makefile
index d3650e7c897a..a4bfbe9c4f79 100644
--- a/devel/doctorj/Makefile
+++ b/devel/doctorj/Makefile
@@ -8,8 +8,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for analyzing Java code and documentation
WWW= https://doctorj.sourceforge.net/
-USE_JAVA= yes
-USE_ANT= yes
+USES= java:ant
ALL_TARGET= jarfile
diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile
index 7f36955a64b0..27d1190058c3 100644
--- a/devel/flex-sdk/Makefile
+++ b/devel/flex-sdk/Makefile
@@ -9,8 +9,7 @@ COMMENT= Adobe Flex SDK
WWW= http://opensource.adobe.com/wiki/display/flexsdk/Flex+4
CONFLICTS= flex-sdk3
-USES= zip
-USE_JAVA= yes
+USES= java zip
SUB_FILES= ${SCRIPTS:C/\$/.sh/g}
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile
index 1f03a3c01e77..05ed8d7c2794 100644
--- a/devel/flex-sdk35/Makefile
+++ b/devel/flex-sdk35/Makefile
@@ -11,8 +11,7 @@ COMMENT= Adobe Flex SDK
WWW= http://opensource.adobe.com/wiki/display/flexsdk/Flex+3
CONFLICTS= flex-sdk
-USES= zip
-USE_JAVA= yes
+USES= java zip
SUB_FILES= ${SCRIPTS:C/\$/.sh/g}
PLIST_SUB= PORTNAME=${PORTNAME}
SUB_LIST= PORTNAME=${PORTNAME}
diff --git a/devel/flexdock/Makefile b/devel/flexdock/Makefile
index 1066a93c99ac..1512daba59df 100644
--- a/devel/flexdock/Makefile
+++ b/devel/flexdock/Makefile
@@ -10,8 +10,7 @@ WWW= https://forge.scilab.org/index.php/p/flexdock/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USE_ANT= yes
-USE_JAVA= yes
+USES= java:ant
ALL_TARGET= dist
NO_ARCH= yes
diff --git a/devel/flexjson/Makefile b/devel/flexjson/Makefile
index 02fbfd259577..d9ee4ee1cb86 100644
--- a/devel/flexjson/Makefile
+++ b/devel/flexjson/Makefile
@@ -10,7 +10,8 @@ WWW= https://flexjson.sourceforge.net/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt
-USE_JAVA= yes
+USES= java
+
NO_BUILD= yes
NO_ARCH= yes
diff --git a/devel/ghidra/Makefile b/devel/ghidra/Makefile
index ef0a0324d949..c61cb0855006 100644
--- a/devel/ghidra/Makefile
+++ b/devel/ghidra/Makefile
@@ -17,10 +17,8 @@ BUILD_DEPENDS= bash:shells/bash \
gradle>=8.5:devel/gradle
RUN_DEPENDS= bash:shells/bash
-USES= cpe shebangfix zip
+USES= cpe java shebangfix zip
CPE_VENDOR= nsa
-
-USE_JAVA= yes
JAVA_VERSION= 17+
SHEBANG_FILES= Ghidra/Features/BSim/make-postgres.sh \
diff --git a/devel/gradle/Makefile b/devel/gradle/Makefile
index c9411092b79a..5f62a6eefde9 100644
--- a/devel/gradle/Makefile
+++ b/devel/gradle/Makefile
@@ -12,8 +12,7 @@ LICENSE= APACHE20 BSD3CLAUSE CDDL EPL LGPL21+ MIT MPL20
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cpe zip
-USE_JAVA= yes
+USES= cpe java zip
CONFLICTS_INSTALL= gradle6 gradle62
diff --git a/devel/gradle5/Makefile b/devel/gradle5/Makefile
index 29f1da9a3c12..073e2df6e762 100644
--- a/devel/gradle5/Makefile
+++ b/devel/gradle5/Makefile
@@ -11,10 +11,8 @@ WWW= https://www.gradle.org/
LICENSE= APACHE20
+USES= cpe java zip
NO_ARCH= yes
-USES= cpe zip
-JAVA_VERSION= 8+
-USE_JAVA= yes
NO_BUILD= yes
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
PORTSCOUT= ignore:1
diff --git a/devel/gradle6/Makefile b/devel/gradle6/Makefile
index 230d8a1d5b73..520656048b55 100644
--- a/devel/gradle6/Makefile
+++ b/devel/gradle6/Makefile
@@ -13,8 +13,7 @@ LICENSE= APACHE20 BSD3CLAUSE CDDL EPL LGPL21+ MIT MPL20
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cpe zip
-USE_JAVA= yes
+USES= cpe java zip
CONFLICTS_INSTALL= gradle gradle62
diff --git a/devel/gradle62/Makefile b/devel/gradle62/Makefile
index 891c51cc7ecc..2b4713b7a6d0 100644
--- a/devel/gradle62/Makefile
+++ b/devel/gradle62/Makefile
@@ -14,8 +14,7 @@ LICENSE= APACHE20 BSD3CLAUSE CDDL EPL LGPL21+ MIT MPL20
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cpe zip
-USE_JAVA= yes
+USES= cpe java zip
CONFLICTS_INSTALL= gradle gradle6
diff --git a/devel/gradle761/Makefile b/devel/gradle761/Makefile
index 509be08504e3..60d78480a5a8 100644
--- a/devel/gradle761/Makefile
+++ b/devel/gradle761/Makefile
@@ -13,8 +13,7 @@ LICENSE= APACHE20 BSD3CLAUSE CDDL EPL LGPL21+ MIT MPL20
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cpe zip
-USE_JAVA= yes
+USES= cpe java zip
CONFLICTS_INSTALL= gradle gradle5 gradle6 gradle62
diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 76f0280ee762..7a39ae6479b9 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -9,8 +9,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Visual report builder/designer for JasperReports
WWW= https://www.jasperforge.org/projects/ireport
-USES= dos2unix
-USE_JAVA= yes
+USES= dos2unix java
DOS2UNIX_GLOB= *.txt
NO_BUILD= yes
diff --git a/devel/java-findbugs/Makefile b/devel/java-findbugs/Makefile
index 069707270045..a798f0851344 100644
--- a/devel/java-findbugs/Makefile
+++ b/devel/java-findbugs/Makefile
@@ -10,7 +10,8 @@ COMMENT= Find Bugs in Java Programs
WWW= https://findbugs.sourceforge.net/
LICENSE= LGPL21
-USE_JAVA= yes
+
+USES= java
NO_BUILD= yes
JAR_FILES= annotations.jar \
diff --git a/devel/jcmdline/Makefile b/devel/jcmdline/Makefile
index cfabe75f8e4f..6eece2ffb375 100644
--- a/devel/jcmdline/Makefile
+++ b/devel/jcmdline/Makefile
@@ -10,7 +10,8 @@ WWW= https://jcmdline.sourceforge.net/
LICENSE= MPL11
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_JAVA= yes
+USES= java
+
NO_BUILD= yes
NO_ARCH= yes
diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile
index 22f1bc716efc..766513f109e9 100644
--- a/devel/jenkins-lts/Makefile
+++ b/devel/jenkins-lts/Makefile
@@ -14,9 +14,9 @@ WWW= https://jenkins.io/
LICENSE= MIT
-USES= cpe
+USES= cpe java
CPE_EDITION= lts
-USE_JAVA= 17+
+JAVA_VERSION= 17+
USE_RC_SUBR= jenkins
CONFLICTS= jenkins
diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index 2c342e95bd8f..538d786ec53c 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -13,8 +13,8 @@ WWW= https://jenkins.io/
LICENSE= MIT
-USES= cpe
-USE_JAVA= 17+
+USES= cpe java
+JAVA_VERSION= 17+
USE_RC_SUBR= jenkins
CONFLICTS= jenkins-lts
diff --git a/devel/jetbrains-clion/Makefile b/devel/jetbrains-clion/Makefile
index 32412aa8e69f..35737af12fbf 100644
--- a/devel/jetbrains-clion/Makefile
+++ b/devel/jetbrains-clion/Makefile
@@ -36,10 +36,8 @@ RUN_DEPENDS= cmake:devel/cmake-core \
lsof:sysutils/lsof \
ninja:devel/ninja
-USES= cpe python:run shebangfix
-
+USES= cpe java python:run shebangfix
CPE_VENDOR= jetbrains
-USE_JAVA= yes
JAVA_VERSION= 17+
SHEBANG_FILES= plugins/python-ce/helpers/typeshed/scripts/generate_proto_stubs.sh
diff --git a/devel/jetbrains-goland/Makefile b/devel/jetbrains-goland/Makefile
index 8aba76b4b0f2..fa6b45fcd844 100644
--- a/devel/jetbrains-goland/Makefile
+++ b/devel/jetbrains-goland/Makefile
@@ -23,10 +23,9 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \
jetbrains-sqlite>=241.15989.150:devel/jetbrains-sqlite \
lsof:sysutils/lsof
-USES= cpe python:run
+USES= cpe java python:run
CPE_VENDOR= jetbrains
-USE_JAVA= yes
JAVA_VERSION= 17+
DATADIR= ${PREFIX}/share/jetbrains/${PORTNAME}
diff --git a/devel/jetbrains-phpstorm/Makefile b/devel/jetbrains-phpstorm/Makefile
index 2014b7a2bf98..2ff4ed2985b6 100644
--- a/devel/jetbrains-phpstorm/Makefile
+++ b/devel/jetbrains-phpstorm/Makefile
@@ -24,10 +24,9 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \
jetbrains-sqlite>=241.15989.150:devel/jetbrains-sqlite \
lsof:sysutils/lsof
-USES= cpe python:run
+USES= cpe java python:run
CPE_VENDOR= jetbrains
-USE_JAVA= yes
JAVA_VERSION= 17+
DATADIR= ${PREFIX}/share/jetbrains/${PORTNAME}
diff --git a/devel/jetbrains-rustrover/Makefile b/devel/jetbrains-rustrover/Makefile
index cb2a0f2f0663..cfa350c7e7ae 100644
--- a/devel/jetbrains-rustrover/Makefile
+++ b/devel/jetbrains-rustrover/Makefile
@@ -25,10 +25,9 @@ RUN_DEPENDS= cmake:devel/cmake-core \
jetbrains-sqlite>=241.15989.150:devel/jetbrains-sqlite \
lsof:sysutils/lsof
-USES= cpe python:run
+USES= cpe java python:run
CPE_VENDOR= jetbrains
-USE_JAVA= yes
JAVA_VERSION= 17+
DATADIR= ${PREFIX}/share/jetbrains/${PORTNAME}
diff --git a/devel/jetbrains-sqlite/Makefile b/devel/jetbrains-sqlite/Makefile
index 84cd9a50b78b..1da01432bb35 100644
--- a/devel/jetbrains-sqlite/Makefile
+++ b/devel/jetbrains-sqlite/Makefile
@@ -15,14 +15,12 @@ ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le
BUILD_DEPENDS= bash:shells/bash
+USES= java:build
USE_GITHUB= yes
GH_ACCOUNT= JetBrains
GH_PROJECT= intellij-community
GH_TAGNAME= idea/242.23726.38
-
-USE_JAVA= yes
JAVA_VERSION= 17+
-JAVA_BUILD= yes
DATADIR= ${PREFIX}/share/jetbrains/${PORTNAME}
WRKSRC_SUBDIR= platform/sqlite
diff --git a/devel/jetbrains-webstorm/Makefile b/devel/jetbrains-webstorm/Makefile
index 06f19b19ab9f..19d0d673731b 100644
--- a/devel/jetbrains-webstorm/Makefile
+++ b/devel/jetbrains-webstorm/Makefile
@@ -24,10 +24,9 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \
jetbrains-sqlite>=241.15989.150:devel/jetbrains-sqlite \
lsof:sysutils/lsof
-USES= cpe python:run
+USES= cpe java python:run
CPE_VENDOR= jetbrains
-USE_JAVA= yes
JAVA_VERSION= 17+
DATADIR= ${PREFIX}/share/jetbrains/${PORTNAME}
diff --git a/devel/jgoodies-looks/Makefile b/devel/jgoodies-looks/Makefile
index 9af5286ba907..3d5bca81c2ec 100644
--- a/devel/jgoodies-looks/Makefile
+++ b/devel/jgoodies-looks/Makefile
@@ -11,7 +11,7 @@ WWW= http://www.jgoodies.com
LICENSE= BSD3CLAUSE
-USE_JAVA= yes
+USES= java
NO_ARCH= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/devel/jiic/Makefile b/devel/jiic/Makefile
index b8eba8ae06af..e37869b7875d 100644
--- a/devel/jiic/Makefile
+++ b/devel/jiic/Makefile
@@ -12,9 +12,9 @@ LICENSE= LGPL21
BUILD_DEPENDS= ${JAVALIBDIR}/sabre.jar:devel/sabre
RUN_DEPENDS= ${JAVALIBDIR}/sabre.jar:devel/sabre
+USES= java:ant
+
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_JAVA= yes
-USE_ANT= yes
MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES
ALL_TARGET= jar
diff --git a/devel/jline/Makefile b/devel/jline/Makefile
index ecb33e438f59..cec05bccff53 100644
--- a/devel/jline/Makefile
+++ b/devel/jline/Makefile
@@ -9,8 +9,8 @@ WWW= https://jline.sourceforge.net/
LICENSE= BSD4CLAUSE
-USES= zip
-USE_JAVA= yes
+USES= java zip
+
OPTIONS_DEFINE= JLINEPATCH DOCS
JLINEPATCH_DESC= Allow ConsoleRunner customized completion
JLINEJAR= ${WRKSRC}/jline-${PORTVERSION}.jar
diff --git a/devel/jna/Makefile b/devel/jna/Makefile
index 1a7c6ad79a83..28b2f7bdbbc4 100644
--- a/devel/jna/Makefile
+++ b/devel/jna/Makefile
@@ -15,14 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= makeinfo:print/texinfo
-USES= autoreconf:build gmake libtool xorg
-USE_ANT= yes
+USES= autoreconf:build gmake java:ant libtool xorg
USE_GITHUB= yes
GH_ACCOUNT= java-native-access
GH_TAGNAME= 0a33062e1971962ca6b283c397ed1de5cc053d33
-USE_JAVA= yes
-JAVA_VERSION= 8+
-JAVA_BUILD= yes # prevent JAVA_RUN via bsd.java.mk
USE_XORG= x11 xt
MAKE_ARGS= -DCC="${CC}" \
-DLD="${LD}"
diff --git a/devel/jsap/Makefile b/devel/jsap/Makefile
index 773fabf90afc..680b4b72e9bc 100644
--- a/devel/jsap/Makefile
+++ b/devel/jsap/Makefile
@@ -9,7 +9,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Java package to parse command-line arguments
WWW= http://www.martiansoftware.com/jsap/index.html
-USE_JAVA= yes
+USES= java
+
NO_BUILD= yes
NO_ARCH= yes
diff --git a/devel/leiningen/Makefile b/devel/leiningen/Makefile
index 6494637b61c3..07b3c98dbf88 100644
--- a/devel/leiningen/Makefile
+++ b/devel/leiningen/Makefile
@@ -15,7 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_JAVA= yes
+USES= java
+
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/libastylej/Makefile b/devel/libastylej/Makefile
index 104e3527c813..603f8a1bf3b0 100644
--- a/devel/libastylej/Makefile
+++ b/devel/libastylej/Makefile
@@ -12,10 +12,10 @@ WWW= https://astyle.sourceforge.net/
LICENSE= LGPL3
+USES= compiler:c++11-lang gmake java
+
ALL_TARGET= java
LDFLAGS+= -s
-USES= compiler:c++11-lang gmake
-USE_JAVA= yes
USE_LDCONFIG= yes
MAKE_ARGS+= JAVA_HOME=${JAVA_HOME}
diff --git a/devel/libmatthew/Makefile b/devel/libmatthew/Makefile
index ee16df346be1..e0eec3a5eb44 100644
--- a/devel/libmatthew/Makefile
+++ b/devel/libmatthew/Makefile
@@ -14,8 +14,7 @@ LICENSE_NAME= Expat License
LICENSE_FILE= ${WRKSRC}/COPYING
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= gmake localbase:ldconfig
-USE_JAVA= yes
+USES= gmake java localbase:ldconfig
USE_LDCONFIG= yes
MAKE_ENV= JARDIR=${JAVAJARDIR} \
diff --git a/devel/libreadline-java/Makefile b/devel/libreadline-java/Makefile
index f51de6348247..13c57608ad1b 100644
--- a/devel/libreadline-java/Makefile
+++ b/devel/libreadline-java/Makefile
@@ -9,6 +9,9 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= JNI wrapper around GNU Readline / libedit / libgetline
WWW= https://sourceforge.net/projects/java-readline/
+USES= gmake java libedit ncurses readline
+JAVA_VERSION= 8
+
ALL_TARGET= # empty
MAKE_ENV= JAVA_HOME="${JAVA_HOME}" JAVA="${JAVA}" JAVAC="${JAVAC}" \
JAVAH="${JAVAH}" JAR_="${JAR}"
@@ -18,9 +21,6 @@ PLIST_FILES= %%JAVAJARDIR%%/libreadline-java.jar \
lib/libJavaEditline.so \
lib/libJavaGetline.so
PORTDOCS= README.1st README jython.sh JReadlineCompleter.py
-USES= gmake libedit ncurses readline
-USE_JAVA= yes
-JAVA_VERSION= 8
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/libvirt-java/Makefile b/devel/libvirt-java/Makefile
index 606800ac5932..c2ceb6f47be4 100644
--- a/devel/libvirt-java/Makefile
+++ b/devel/libvirt-java/Makefile
@@ -14,8 +14,8 @@ LIB_DEPENDS= libvirt.so:devel/libvirt
BUILD_DEPENDS= jna>=4.0:devel/jna \
junit>=4.8.2:java/junit
-USE_JAVA= YES
-USE_ANT= YES
+USES= java:ant
+
ALL_TARGET= jar
PLIST_FILES= %%JAVAJARDIR%%/libvirt-${PORTVERSION}.jar
diff --git a/devel/listserialc/Makefile b/devel/listserialc/Makefile
index 2d3f88d544c2..e71fadf43658 100644
--- a/devel/listserialc/Makefile
+++ b/devel/listserialc/Makefile
@@ -10,11 +10,11 @@ LICENSE= LGPL3+
LIB_DEPENDS= libserialport.so:devel/libserialport
+USES= java
USE_GITHUB= yes
GH_ACCOUNT= arduino
GH_PROJECT= listSerialPortsC
-USE_JAVA= yes
USE_LDCONFIG= yes
MAKE_ARGS+= JAVA_HOME=${JAVA_HOME}
diff --git a/devel/log4j/Makefile b/devel/log4j/Makefile
index 1691283a2142..f9cf7f795484 100644
--- a/devel/log4j/Makefile
+++ b/devel/log4j/Makefile
@@ -10,9 +10,8 @@ WWW= https://logging.apache.org/log4j/1.2/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cpe
+USES= cpe java
-USE_JAVA= yes
NO_BUILD= yes
NO_ARCH= yes
CPE_VENDOR= apache
diff --git a/devel/luajava/Makefile b/devel/luajava/Makefile
index 9df3a483bc2d..0e975560f360 100644
--- a/devel/luajava/Makefile
+++ b/devel/luajava/Makefile
@@ -8,8 +8,7 @@ MAINTAINER= sunghyuk@gmail.com
COMMENT= Lua scripting tool for Java
WWW= http://www.keplerproject.org/luajava/
-USES= gmake dos2unix lua:51
-USE_JAVA= yes
+USES= gmake dos2unix java lua:51
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index 38876c6aace3..0646da2b75fe 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -13,10 +13,9 @@ LICENSE= APACHE20
RUN_DEPENDS= mvn:devel/maven-wrapper
-USES= cpe
+USES= cpe java
CPE_VENDOR= apache
CPE_PRODUCT= maven
-USE_JAVA= yes
DATADIR= ${JAVASHAREDIR}/${INSTANCE_ID}
NO_ARCH= yes
diff --git a/devel/maven363/Makefile b/devel/maven363/Makefile
index ce406fbd2a90..98d499dafd1a 100644
--- a/devel/maven363/Makefile
+++ b/devel/maven363/Makefile
@@ -13,8 +13,7 @@ LICENSE= APACHE20
RUN_DEPENDS= mvn:devel/maven-wrapper
-USES= cpe
-USE_JAVA= yes
+USES= cpe java
CPE_PRODUCT= maven
CPE_VENDOR= apache
diff --git a/devel/maven39/Makefile b/devel/maven39/Makefile
index 6d41caa91e94..0c12a4fdfc8f 100644
--- a/devel/maven39/Makefile
+++ b/devel/maven39/Makefile
@@ -13,10 +13,9 @@ LICENSE= APACHE20
RUN_DEPENDS= mvn:devel/maven-wrapper
-USES= cpe
+USES= cpe java
CPE_VENDOR= apache
CPE_PRODUCT= maven
-USE_JAVA= yes
DATADIR= ${JAVASHAREDIR}/${INSTANCE_ID}
NO_ARCH= yes
diff --git a/devel/mill/Makefile b/devel/mill/Makefile
index 366033d51927..33f3bc07d4eb 100644
--- a/devel/mill/Makefile
+++ b/devel/mill/Makefile
@@ -13,8 +13,7 @@ WWW= https://www.lihaoyi.com/mill/
LICENSE= MIT
-USE_JAVA= yes
-JAVA_VERSION= 8+
+USES= java
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/netscape-java40/Makefile b/devel/netscape-java40/Makefile
index 16eb467e9773..41f56e445173 100644
--- a/devel/netscape-java40/Makefile
+++ b/devel/netscape-java40/Makefile
@@ -13,7 +13,8 @@ LICENSE_NAME= Netscape
LICENSE_FILE= ${WRKSRC}/License
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror auto-accept
-USE_JAVA= yes
+USES= java
+
NO_BUILD= yes
NO_ARCH= yes
diff --git a/devel/nexus2-oss/Makefile b/devel/nexus2-oss/Makefile
index d75212b8ca97..cfc7930010d4 100644
--- a/devel/nexus2-oss/Makefile
+++ b/devel/nexus2-oss/Makefile
@@ -15,18 +15,16 @@ LICENSE= EPL
PATCH_DEPENDS= zip:archivers/zip
RUN_DEPENDS= javaservicewrapper:sysutils/javaservicewrapper
-USES= cpe
-
+USES= cpe java
CPE_VENDOR= sonatype
CPE_PRODUCT= nexus
+# Java 8 only, see https://issues.sonatype.org/browse/NEXUS-19183
+JAVA_VERSION= 8
NO_ARCH= yes
NO_BUILD= yes
NO_TEST= yes
-USE_JAVA= yes
-# Java 8 only, see https://issues.sonatype.org/browse/NEXUS-19183
-JAVA_VERSION= 8
USE_RC_SUBR= ${PORTNAME}
diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile
index eebb27c09bf5..a00553a96508 100644
--- a/devel/ocaml-camljava/Makefile
+++ b/devel/ocaml-camljava/Makefile
@@ -9,12 +9,11 @@ WWW= https://caml.inria.fr/
LICENSE= GPLv2
-USES= ocaml
+USES= java ocaml
USE_GITHUB= yes
GH_ACCOUNT= xavierleroy
GH_PROJECT= camljava
GH_TAGNAME= ${PORTNAME}${DISTVERSION:S/.//}
-USE_JAVA= yes
MAKE_ARGS= -e
MAKE_ENV+= CAMLJAVALIB=${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME} \
diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index a34f3014f7ab..7386a1c20ac8 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -23,9 +23,8 @@ LICENSE_PERMS_ECMA= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
RUN_DEPENDS= uctags:devel/universal-ctags
-USES= cpe
+USES= cpe java
CPE_VENDOR= oracle
-USE_JAVA= yes
JAVA_VERSION= 11+
SHAREOWN= www
SHAREGRP= www
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index 1c35e951d9c9..089b8a612e79 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -15,13 +15,12 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-Inline>=0.68:devel/p5-Inline \
p5-Inline-C>=0.62:devel/p5-Inline-C
-USE_JAVA= yes
+USES= java perl5
JAVA_OS= native
-
-MAKE_JOBS_UNSAFE= yes
-
-USES= perl5
USE_PERL5= configure
+
CONFIGURE_ARGS= J2SDK=${JAVA_HOME} </dev/null
+MAKE_JOBS_UNSAFE= yes
+
.include <bsd.port.mk>
diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile
index b54dbb90e12e..6125aed49de1 100644
--- a/devel/p5-Java/Makefile
+++ b/devel/p5-Java/Makefile
@@ -8,10 +8,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= numisemis@yahoo.com
COMMENT= Perl extension for accessing a JVM remotely or locally
+USES= java perl5
USE_RC_SUBR= javaserver
-USES= perl5
USE_PERL5= configure
-USE_JAVA= yes
post-patch:
${RM} ${WRKSRC}/java_server_install.pl
diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index 8ea8b9d972b5..8cad8e5c8dc5 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -12,9 +12,8 @@ LICENSE= APACHE20 BSD4CLAUSE
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cpe zip
+USES= cpe java zip
CPE_VENDOR= pmd_project
-USE_JAVA= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
NO_ARCH= yes
diff --git a/devel/protobuf-java/Makefile b/devel/protobuf-java/Makefile
index e4e17da09f98..65585d7c3448 100644
--- a/devel/protobuf-java/Makefile
+++ b/devel/protobuf-java/Makefile
@@ -10,7 +10,7 @@ WWW= https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java
LICENSE= BSD3CLAUSE
-USE_JAVA= yes
+USES= java
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CP}
diff --git a/devel/py-jep/Makefile b/devel/py-jep/Makefile
index 81f577bc18fe..900a47aed399 100644
--- a/devel/py-jep/Makefile
+++ b/devel/py-jep/Makefile
@@ -12,12 +12,11 @@ WWW= https://github.com/mrj0/jep
LICENSE= ZLIB
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= python
+USES= java python
USE_PYTHON= distutils
CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME}
MAKE_ENV= JAVA_HOME=${JAVA_HOME}
-USE_JAVA= yes
USE_LDCONFIG= yes
PLIST_SUB+= VERSION=${PORTVERSION}
diff --git a/devel/pycharm-ce/Makefile b/devel/pycharm-ce/Makefile
index dfe9eeff098c..510a3bca2471 100644
--- a/devel/pycharm-ce/Makefile
+++ b/devel/pycharm-ce/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \
jetbrains-restarter>=233.11799.241:devel/jetbrains-restarter \
jetbrains-sqlite>=232.8660.185:devel/jetbrains-sqlite
-USES= desktop-file-utils python:run shebangfix
-USE_JAVA= yes
+USES= desktop-file-utils java python:run shebangfix
JAVA_VERSION= 17+
SHEBANG_FILES= plugins/python-ce/helpers/pycodestyle-2.10.0.py \
plugins/python-ce/helpers/pycodestyle.py \
diff --git a/devel/pycharm-pro/Makefile b/devel/pycharm-pro/Makefile
index d57218d4d18e..8febd6378487 100644
--- a/devel/pycharm-pro/Makefile
+++ b/devel/pycharm-pro/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \
jetbrains-restarter>=233.11799.241:devel/jetbrains-restarter \
jetbrains-sqlite>=232.8660.185:devel/jetbrains-sqlite
-USES= cpe desktop-file-utils python:run shebangfix
+USES= cpe desktop-file-utils java python:run shebangfix
SHEBANG_FILES= plugins/python-ce/helpers/pydev/pydevd_attach_to_process/linux_and_mac/compile_mac.sh \
plugins/python-ce/helpers/pydev/pydevd_attach_to_process/linux_and_mac/compile_linux.sh \
plugins/python-ce/helpers/pydev/pydevd_attach_to_process/linux_and_mac/compile_linux_aarch64.sh \
@@ -31,7 +31,6 @@ SHEBANG_FILES= plugins/python-ce/helpers/pydev/pydevd_attach_to_process/linux_an
plugins/python-ce/helpers/typeshed/scripts/sync_tensorflow_protobuf_stubs.sh
CPE_VENDOR= jetbrains
-USE_JAVA= yes
JAVA_VERSION= 17+
# Remove the bundled native Pty4J support libraries, they are replaced
diff --git a/devel/rubygem-jruby-jars/Makefile b/devel/rubygem-jruby-jars/Makefile
index 57ec9cb3f432..c9756e090633 100644
--- a/devel/rubygem-jruby-jars/Makefile
+++ b/devel/rubygem-jruby-jars/Makefile
@@ -13,8 +13,7 @@ LICENSE_COMB= dual
BUILD_DEPENDS= jgem:lang/jruby
RUN_DEPENDS= jruby:lang/jruby
-USES= gem
-USE_JAVA= yes
+USES= gem java
RUBYGEMBIN= ${LOCALBASE}/bin/jgem
diff --git a/devel/rubymine/Makefile b/devel/rubymine/Makefile
index d9c16c513a1e..9063738c0636 100644
--- a/devel/rubymine/Makefile
+++ b/devel/rubymine/Makefile
@@ -16,10 +16,8 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept
RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier
-USES= cpe python:run shebangfix
+USES= cpe java python:run shebangfix
CPE_VENDOR= jetbrains
-
-USE_JAVA= yes
JAVA_VERSION= 11+
SHEBANG_FILES= bin/restart.py
diff --git a/devel/sabre/Makefile b/devel/sabre/Makefile
index 79224c727db7..609015a76cc0 100644
--- a/devel/sabre/Makefile
+++ b/devel/sabre/Makefile
@@ -10,11 +10,10 @@ WWW= https://sabre-library.sourceforge.net/
LICENSE= LGPL21
+USES= dos2unix java:ant zip
+
WRKSRC= ${WRKDIR}/Simple\ API\ for\ Binary\ REpresentations\ \(SABRE\)
-USES= dos2unix zip
DOS2UNIX_GLOB= *.xml *.java
-USE_JAVA= yes
-USE_ANT= yes
ALL_TARGET= dist
PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar ${JAVAJARDIR}/udflib.jar
diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile
index d8817aae77ca..71d51db4867f 100644
--- a/devel/sbt/Makefile
+++ b/devel/sbt/Makefile
@@ -11,15 +11,15 @@ LICENSE= APACHE20
RUN_DEPENDS= infocmp:devel/ncurses
-USES= tar:tgz
+USES= java tar:tgz
OPTIONS_DEFINE= ADVANCED # PRELOADED
OPTIONS_DEFAULT=ADVANCED
+
ADVANCED_DESC= Install advanced bash shell-script (required for Java 11+)
NO_BUILD= yes
NO_ARCH= yes
-USE_JAVA= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
ADVANCED_RUN_DEPENDS+= bash:shells/bash
diff --git a/devel/scalatest/Makefile b/devel/scalatest/Makefile
index b93e385b6791..768b09666e67 100644
--- a/devel/scalatest/Makefile
+++ b/devel/scalatest/Makefile
@@ -13,8 +13,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= scala>=2.9.0:lang/scala
-USES= zip
-USE_JAVA= yes
+USES= java zip
+
NO_BUILD= yes
PORTDOCS= LICENSE NOTICE README.txt doc
diff --git a/devel/simian/Makefile b/devel/simian/Makefile
index df6a730fce9e..cedc68958097 100644
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@@ -29,28 +29,14 @@ PORTDOCS= changes.html features.html \
OPTIONS_DEFINE= DOCS
OPTIONS_SINGLE= LANG
OPTIONS_SINGLE_LANG= JAVA MONO
+OPTIONS_SUB= yes
OPTIONS_DEFAULT= JAVA
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA= yes
-PLIST_SUB+= JAVA=""
-SUB_LIST+= JAVA=""
-.else
-PLIST_SUB+= JAVA="@comment "
-SUB_LIST+= JAVA="@comment "
-.endif
+JAVA_USES= java
+MONO_RUN_DEPENDS= mono:lang/mono${MONO_DEFAULT}
-.if ${PORT_OPTIONS:MMONO}
-RUN_DEPENDS+= mono:lang/mono${MONO_DEFAULT}
-PLIST_SUB+= MONO=""
-SUB_LIST+= MONO=""
-.else
-PLIST_SUB+= MONO="@comment "
-SUB_LIST+= MONO="@comment "
-.endif
+.include <bsd.port.pre.mk>
pre-fetch:
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
diff --git a/devel/slf4j/Makefile b/devel/slf4j/Makefile
index 301d0c8f1db2..c048e6421025 100644
--- a/devel/slf4j/Makefile
+++ b/devel/slf4j/Makefile
@@ -9,9 +9,9 @@ WWW= https://www.slf4j.org/
LICENSE= MIT
-USES= cpe
+USES= cpe java
CPE_VENDOR= qos
-USE_JAVA= YES
+
NO_BUILD= YES
JARFILES= slf4j-migrator.jar \
diff --git a/devel/smc/Makefile b/devel/smc/Makefile
index ebce3ee2f253..40bdd6ebc676 100644
--- a/devel/smc/Makefile
+++ b/devel/smc/Makefile
@@ -10,7 +10,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The State Machine Compiler
WWW= https://smc.sourceforge.net/
-USE_JAVA= yes
+USES= java
+
NO_BUILD= yes
PORTEXAMPLES= *
diff --git a/devel/soapui/Makefile b/devel/soapui/Makefile
index b09ce9e76278..4f2d8c4f9653 100644
--- a/devel/soapui/Makefile
+++ b/devel/soapui/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE_CPL= ${WRKSRC}/licenses/junit-LICENSE.txt
LICENSE_FILE_EUPL11= ${WRKSRC}/LICENSE.txt
LICENSE_PERMS_CPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= cpe
+USES= cpe java
CPE_VENDOR= smartbear
-USE_JAVA= yes
+
WRKSRC= ${WRKDIR}/SoapUI-${PORTVERSION}
REINPLACE_ARGS= -i ''
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
diff --git a/devel/sonar-scanner-cli/Makefile b/devel/sonar-scanner-cli/Makefile
index eb545f88231a..33c2c9734097 100644
--- a/devel/sonar-scanner-cli/Makefile
+++ b/devel/sonar-scanner-cli/Makefile
@@ -11,10 +11,9 @@ WWW= https://www.sonarqube.org/
LICENSE= LGPL3
# node -> JS analysis
-USES= cpe nodejs:run zip
+USES= cpe java nodejs:run zip
CPE_VENDOR= sonarsource
CPE_PRODUCT= sonarqube_scanner
-USE_JAVA= yes
WRKSRC= ${WRKDIR}/sonar-scanner-${DISTVERSION}
diff --git a/devel/sonarqube-ant-task/Makefile b/devel/sonarqube-ant-task/Makefile
index 8613191c849a..b8b6d66b7180 100644
--- a/devel/sonarqube-ant-task/Makefile
+++ b/devel/sonarqube-ant-task/Makefile
@@ -11,8 +11,7 @@ WWW= https://docs.sonarqube.org/latest/analysis/scan/sonarscanner-for-ant/
LICENSE= LGPL3
-USES= cpe
-USE_JAVA= yes
+USES= cpe java
CPE_VENDOR= sonarsource
NO_ARCH= yes
diff --git a/devel/sonarqube-community/Makefile b/devel/sonarqube-community/Makefile
index c860b57ffbe6..5a1c8b1fe838 100644
--- a/devel/sonarqube-community/Makefile
+++ b/devel/sonarqube-community/Makefile
@@ -30,9 +30,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= bash:shells/bash #\
# jna>0:devel/jna
-USES= cpe shebangfix zip nodejs:lts,run
+USES= cpe java shebangfix zip nodejs:lts,run
CPE_VENDOR= sonarsource
-USE_JAVA= yes
SHEBANG_FILES= elasticsearch/bin/elasticsearch-cli \
elasticsearch/bin/elasticsearch-env
diff --git a/devel/spark/Makefile b/devel/spark/Makefile
index 9ba2f4bd2765..3cb2004185e9 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -22,9 +22,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libsnappyjava.so:archivers/snappy-java \
maven>0:devel/maven
RUN_DEPENDS= bash:shells/bash
-USES= cpe python shebangfix
+USES= cpe java python shebangfix
CPE_VENDOR= apache
-USE_JAVA= yes
JAVA_VERSION= 8 11 17
USE_RC_SUBR= spark_master spark_worker
diff --git a/devel/sparsebitset/Makefile b/devel/sparsebitset/Makefile
index 95535c7a6357..1e186bcc4265 100644
--- a/devel/sparsebitset/Makefile
+++ b/devel/sparsebitset/Makefile
@@ -11,8 +11,7 @@ WWW= https://github.com/brettwooldridge/SparseBitSet
LICENSE= APACHE20
-USE_JAVA= yes
-JAVA_VERSION= 8+
+USES= java
NO_BUILD= yes
NO_ARCH= yes
diff --git a/devel/staf/Makefile b/devel/staf/Makefile
index bf5d68ed5368..f82b7680b003 100644
--- a/devel/staf/Makefile
+++ b/devel/staf/Makefile
@@ -39,14 +39,14 @@ DEBUG_VARS_OFF= staf_build_type=retail
IPV6_VARS= staf_use_ipv6=1
IPV6_VARS_OFF= staf_use_ipv6=""
+JAVA_USES= java
JAVA_VARS= staf_projects+=java \
staf_projects+=event \
staf_projects+=ftp \
staf_projects+=fsext \
staf_projects+=namedcounter \
staf_projects+=sxe \
- staf_projects+=timer \
- use_java=yes
+ staf_projects+=timer
JAVA_MAKE_ARGS= JAVA_V12_ROOT=${JAVA_HOME} \
JAVAC_V12=${JAVAC} \
JAVAH_V12=${JAVAH} \
diff --git a/devel/statcvs/Makefile b/devel/statcvs/Makefile
index 3e8ec57fc3f4..912bacc0cda7 100644
--- a/devel/statcvs/Makefile
+++ b/devel/statcvs/Makefile
@@ -15,10 +15,9 @@ LICENSE_FILE= ${WRKSRC}/etc/LICENSE
BROKEN_armv6= fails to compile: build.xml: compilation failed
BROKEN_armv7= fails to compile: build.xml: compilation failed
-USES= zip
-USE_JAVA= yes
+USES= java:ant zip
JAVA_VERSION= 8
-USE_ANT= yes
+
NO_ARCH= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile
index 9a240c9f0432..9646081c2f30 100644
--- a/devel/statsvn/Makefile
+++ b/devel/statsvn/Makefile
@@ -20,10 +20,9 @@ RUN_DEPENDS= subversion>0:devel/subversion
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
-USES= zip
-USE_JAVA= yes
+USES= java:ant zip
JAVA_VERSION= 8
-USE_ANT= yes
+
NO_ARCH= yes
ALL_TARGET= dist
diff --git a/devel/swank-clojure/Makefile b/devel/swank-clojure/Makefile
index 1e5462bda14a..c225f745c118 100644
--- a/devel/swank-clojure/Makefile
+++ b/devel/swank-clojure/Makefile
@@ -7,9 +7,9 @@ MAINTAINER= olgeni@FreeBSD.org
COMMENT= Swank/SLIME support for Clojure
WWW= https://github.com/technomancy/swank-clojure
+USES= java
USE_GITHUB= yes
GH_ACCOUNT= technomancy
-USE_JAVA= yes
PLIST_FILES= %%JAVAJARDIR%%/swank-clojure-1.2.1.jar
diff --git a/devel/tijmp/Makefile b/devel/tijmp/Makefile
index f60753c8c19f..9c1839bc0fb7 100644
--- a/devel/tijmp/Makefile
+++ b/devel/tijmp/Makefile
@@ -11,10 +11,8 @@ WWW= https://www.khelekore.org/jmp/tijmp/
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake libtool
-USE_JAVA= yes
+USES= gmake java:build libtool
JAVA_OS= native
-JAVA_BUILD= jdk
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/tinylaf/Makefile b/devel/tinylaf/Makefile
index 1a618f6e1609..18bf6810d17c 100644
--- a/devel/tinylaf/Makefile
+++ b/devel/tinylaf/Makefile
@@ -9,8 +9,8 @@ WWW= http://www.muntjak.de/hans/java/tinylaf/index.html
OPTIONS_DEFINE= DOCS
-USES= zip
-USE_JAVA= yes
+USES= java zip
+
NO_BUILD= yes
JARFILE= ${PORTNAME}.jar tinycp.jar
diff --git a/devel/umlgraph/Makefile b/devel/umlgraph/Makefile
index 152288da4a4a..37dcf8c4601c 100644
--- a/devel/umlgraph/Makefile
+++ b/devel/umlgraph/Makefile
@@ -9,8 +9,7 @@ WWW= https://www.umlgraph.org/
LICENSE= BSD3CLAUSE
-USE_ANT= yes
-USE_JAVA= yes
+USES= java:ant
JAVA_VERSION= 8
USE_GITHUB= yes
GH_ACCOUNT= dspinellis
diff --git a/devel/violet/Makefile b/devel/violet/Makefile
index 0290e6f77f28..b1e84f659167 100644
--- a/devel/violet/Makefile
+++ b/devel/violet/Makefile
@@ -12,7 +12,7 @@ WWW= https://horstmann.com/violet/
LICENSE= GPLv2
-USE_JAVA= yes
+USES= java
NO_BUILD= YES
diff --git a/devel/zanata-cli/Makefile b/devel/zanata-cli/Makefile
index 97076c0b846f..64aa35680f50 100644
--- a/devel/zanata-cli/Makefile
+++ b/devel/zanata-cli/Makefile
@@ -11,7 +11,8 @@ WWW= https://docs.zanata.org/en/release/client/
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
-USE_JAVA= yes
+USES= java
+
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index eb0f138936db..6017b1d7b28a 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -14,11 +14,8 @@ LICENSE= APACHE20
RUN_DEPENDS= libzookeeper>=${PORTVERSION}:devel/libzookeeper
-USES= cpe
+USES= cpe java
CPE_VENDOR= apache
-USE_JAVA= yes
-JAVA_VERSION= 8+
-JAVA_RUN= yes
USE_RC_SUBR= zookeeper
DATADIR= ${JAVASHAREDIR}/${PORTNAME}