Mk/**java.mk: Convert bsd.java.mk to USES

The following features have been added or changed: - Instead of USE_JAVA use USES=java. This defaults to USES=java:build,run if NO_BUILD is undefined. Else it defaults to USES=java:run - Instead of USE_ANT=yes use USES=java:ant which also implies USES=java:build - Instead of JAVA_BUILD=yes use USES=java:build. Does not imply run or extract - Instead of JAVA_EXTRACT=yes use USES=java:extract does not imply build or run - Instead of JAVA_RUN=yes use USES=java:run does not imply extract or build - Instead of USE_JAVA=<version> use USES=java and JAVA_VERSION=<version> Approved by: mat (portmgr), glewis Differential Revision: https://reviews.freebsd.org/D48201
2025-04-28 01:26:39 -04:00 · 2024-12-27 20:10:41 +01:00 · 2024-12-27 20:10:41 +01:00 · 0835676e36
commit 0835676e36
parent fbd8f896fa
538 changed files with 978 additions and 1365 deletions
--- a/19
+++ b/19
@ -10,6 +10,25 @@ in the release notes and/or placed into UPDATING.

 All ports committers are allowed to commit to this file.

+20241231:
+AUTHOR: bofh@FreeBSD.org
+
+  Convert bsd.java.mk to USES
+
+  The following features have been added or changed:
+  - Instead of USE_JAVA use USES=java. This defaults to
+    USES=java:build,run if NO_BUILD is undefined. Else it defaults to
+    USES=java:run
+  - Instead of USE_ANT=yes use USES=java:ant which also implies
+    USES=java:build
+  - Instead of JAVA_BUILD=yes use USES=java:build. Does not imply run or
+    extract
+  - Instead of JAVA_EXTRACT=yes use USES=java:extract does not imply
+    build or run
+  - Instead of JAVA_RUN=yes use USES=java:run does not imply extract or
+    build
+  - Instead of USE_JAVA=<version> use USES=java and JAVA_VERSION=<version>
+
 20241231:
 AUTHOR: bofh@FreeBSD.org

--- a/Mk/Uses/java.mk
+++ b/Mk/Uses/java.mk
@ -1,25 +1,32 @@
-#-*- tab-width: 4; -*-
-# ex:ts=4
+# Provide support for Java (java)
+# Feature:	java
+# Usage:	USES=java or USES=java:args
 #
-# bsd.java.mk - Support for Java-based ports.
+# Defaults to USES=java:build,run if no arguments are provided and NO_BUILD is
+# undefined. If NO_BUILD is defined, USES=java:run is used.
 #
+# Valid ARGS:	ant build extract
+#
+# ant		-	Should be defined when the port uses Apache Ant. Ant is thus
+#			considered to be the sub-make command. When no 'do-build'
+#			target is defined by the port, a default one will be set
+#			that simply runs Ant according to MAKE_ENV, MAKE_ARGS and
+#			ALL_TARGET. Read the documentation in bsd.port.mk for more
+#			information.
+#
+# build		-	Add the JDK port to the build dependencies
+#
+# extract	-	Add the JDK port to the extract dependencies
+#
+# run		-	Add the JDK port to the run dependencies
 #
 # For FreeBSD committers:
 # Please send all suggested changes to the maintainer instead of committing
 # them yourself.
 #
-
-.if !defined(Java_Include)
-
-Java_Include=				bsd.java.mk
-Java_Include_MAINTAINER=	java@FreeBSD.org
-
 #-------------------------------------------------------------------------------
 # Variables that each port can define:
 #
-# USE_JAVA			Should be defined to the remaining variables to have any
-#					effect
-#
 # JAVA_VERSION		List of space-separated suitable java versions for the
 #			port. An optional "+" allows you to specify a range of
 #			versions. (allowed values: 8[+] 11[+] 17[+] 18[+] 19[+]
@ -31,22 +38,6 @@ Java_Include_MAINTAINER=	java@FreeBSD.org
 # JAVA_VENDOR		List of space-separated suitable JDK port vendors for the
 #			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.
-#
-# JAVA_EXTRACT		This variable works exactly the same as JAVA_BUILD but
-#					regarding extract dependencies.
-#
-# JAVA_RUN			This variable works exactly the same as JAVA_BUILD but
-#					regarding run dependencies.
-#
-# USE_ANT			Should be defined when the port uses Apache Ant. Ant is thus
-#					considered to be the sub-make command. When no 'do-build'
-#					target is defined by the port, a default one will be set
-#					that simply runs Ant according to MAKE_ENV, MAKE_ARGS and
-#					ALL_TARGET. Read the documentation in bsd.port.mk for more
-#					information.
-#
 #-------------------------------------------------------------------------------
 # Variables defined for the port:
 #
@ -125,12 +116,62 @@ Java_Include_MAINTAINER=	java@FreeBSD.org
 # Stage 4: Add any dependencies if necessary
 # Stage 5: Define all settings for the port to use
 #
+# MAINTAINER:	java@FreeBSD.org

-.  if defined(USE_JAVA)
+.if !defined(_INCLUDE_USES_JAVA_MK)

-.    if !defined(JAVA_VERSION) && empty(USE_JAVA:C/[0-9]*[\.]*[0-9]*[+]*//)
-JAVA_VERSION=${USE_JAVA}
+_INCLUDE_USES_JAVA_MK=	yes
+
+_JAVA_VALID_ARGS=	ant build extract run
+_JAVA_UNKNOWN_ARGS=
+.  for arg in ${java_ARGS}
+.    if empty(_JAVA_VALID_ARGS:M${arg})
+_JAVA_UNKNOWN_ARGS+=	${arg}
 .    endif
+.  endfor
+.  if !empty(_JAVA_UNKNOWN_ARGS)
+IGNORE=	has unknown USES=java arguments: ${_JAVA_UNKNOWN_ARGS}
+.  endif
+.  if empty(java_ARGS)
+.    if defined(NO_BUILD)
+java_ARGS=	run
+.    else
+java_ARGS=	build,run
+.    endif
+.  endif
+
+.  if !empty(java_ARGS)
+.undef _USE_JAVA_ANT
+.undef _USE_JAVA_BUILD
+.undef _USE_JAVA_EXTRACT
+.undef _USE_JAVA_RUN
+_JAVA_ARGS=		${java_ARGS:S/,/ /g}
+.    if ${_JAVA_ARGS:Mextract}
+_USE_JAVA_EXTRACT=	yes
+_JAVA_ARGS:=	${_JAVA_ARGS:Nextract}
+.    endif
+.    if ${_JAVA_ARGS:Mant}
+.      if defined(NO_BUILD)
+IGNORE=		Makefile error: NO_BUILD and USES=java:ant cannot be set at the same time
+.      else
+_USE_JAVA_ANT=	yes
+_USE_JAVA_BUILD=	yes
+_JAVA_ARGS:=	${_JAVA_ARGS:Nant}
+.      endif
+.    endif
+.    if ${_JAVA_ARGS:Mbuild}
+.      if defined(NO_BUILD)
+IGNORE=		Makefile error: NO_BUILD and USES=java:build cannot be set at the same time
+.      else
+_USE_JAVA_BUILD=	yes
+_JAVA_ARGS:=	${_JAVA_ARGS:Nbuild}
+.      endif
+.    endif
+.    if ${_JAVA_ARGS:Mrun}
+_USE_JAVA_RUN=	yes
+_JAVA_ARGS:=	${_JAVA_ARGS:Nrun}
+.    endif
+.  endif # !empty(java_ARGS)

 #-------------------------------------------------------------------------------
 # Stage 1: Define constants
@ -221,7 +262,6 @@ _JDK_FILE=bin/javac
 # suitable
 #

-# From here, the port is using bsd.java.mk v2.0

 # Error checking: defined JAVA_{HOME,PORT,PORT_VERSION,PORT_VENDOR,PORT_OS}
 .    for variable in JAVA_HOME JAVA_PORT JAVA_PORT_VERSION JAVA_PORT_VENDOR JAVA_PORT_OS
@ -267,16 +307,6 @@ check-makevars::
 	${FALSE})
 .    endif

-# Set default values for JAVA_BUILD and JAVA_RUN
-# When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre
-# (unless NO_BUILD is set)
-.    if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN)
-.      if !defined(NO_BUILD)
-JAVA_BUILD=	jdk
-.      endif
-JAVA_RUN=	jre
-.    endif
-
 # JDK dependency setting
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
@ -371,31 +401,21 @@ JAVA_PORT_OS_DESCRIPTION:=		${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/}
 # Stage 4: Add any dependencies if necessary
 #

-# Ant Support: USE_ANT --> JAVA_BUILD=jdk
-.    if defined(USE_ANT)
-JAVA_BUILD=		jdk
-.    endif
-
 # Add the JDK port to the dependencies
 DEPEND_JAVA=	${JAVA}:${JAVA_PORT}
-.    if defined(JAVA_EXTRACT)
+.    if defined(_USE_JAVA_EXTRACT)
 EXTRACT_DEPENDS+=	${DEPEND_JAVA}
 .    endif
-.    if defined(JAVA_BUILD)
-.      if defined(NO_BUILD)
-check-makevars::
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: JAVA_BUILD and NO_BUILD cannot be set at the same time.";
-	@${FALSE}
-.      endif
+.    if defined(_USE_JAVA_BUILD)
 BUILD_DEPENDS+=		${DEPEND_JAVA}
 .    endif
-.    if defined(JAVA_RUN)
+.    if defined(_USE_JAVA_RUN)
 RUN_DEPENDS+=		${DEPEND_JAVA}
 .    endif

 # Ant support: default do-build target
-.    if defined(USE_ANT)
-DESTDIRNAME?=		-Dfreebsd.ports.destdir
+.    if defined(_USE_JAVA_ANT)
+DESTDIRNAME=		-Dfreebsd.ports.destdir
 ANT?=				${LOCALBASE}/bin/ant
 MAKE_ENV+=			JAVA_HOME=${JAVA_HOME}
 BUILD_DEPENDS+=		${ANT}:devel/apache-ant
@ -422,14 +442,12 @@ do-test:
 # Define the location of the Java compiler.

 # Only define JAVAC if a JDK is needed
-.		undef JAVAC
+#.		undef JAVAC

 # Then test if a JAVAC has to be set (JAVA_BUILD==jdk)
-.    if defined(JAVA_BUILD)
-.      if (${JAVA_BUILD:tu} == "JDK") && !defined(JAVAC)
+.    if defined(_USE_JAVA_BUILD) && !defined(JAVAC)
 JAVAC?=			${JAVA_HOME}/bin/javac
 .    endif
-.    endif

 # Define the location of some more executables.
 APPLETVIEWER?=	${JAVA_HOME}/bin/appletviewer
@ -460,9 +478,9 @@ java-debug:
 	@${ECHO_CMD} "JAVA_VERSION=                   ${JAVA_VERSION}	(${_JAVA_VERSION})"
 	@${ECHO_CMD} "JAVA_OS=                        ${JAVA_OS}	(${_JAVA_OS})"
 	@${ECHO_CMD} "JAVA_VENDOR=                    ${JAVA_VENDOR}	(${_JAVA_VENDOR})"
-	@${ECHO_CMD} "JAVA_BUILD=                     ${JAVA_BUILD}"
-	@${ECHO_CMD} "JAVA_RUN=                       ${JAVA_RUN}"
-	@${ECHO_CMD} "JAVA_EXTRACT=                   ${JAVA_EXTRACT}"
+	@${ECHO_CMD} "JAVA_BUILD=                     ${_USE_JAVA_BUILD}"
+	@${ECHO_CMD} "JAVA_RUN=                       ${_USE_JAVA_RUN}"
+	@${ECHO_CMD} "JAVA_EXTRACT=                   ${_USE_JAVA_EXTRACT}"
 	@${ECHO_CMD} "JAVA_DEFAULT=                   ${JAVA_DEFAULT}"
 	@${ECHO_CMD}
 	@${ECHO_CMD} "# JDK port dependency selection process:"
@ -484,4 +502,3 @@ java-debug:
 	@${ECHO_CMD} "JAVA_CLASSES=                   ${JAVA_CLASSES}"

 .endif
-.endif
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -357,9 +357,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 ##
 # LDFLAGS_${ARCH} Append the ldflags to LDFLAGS only on the specified architecture
 ##
-# USE_JAVA		- If set, this port relies on the Java language.
-#				  Implies inclusion of bsd.java.mk.  (Also see
-#				  that file for more information on USE_JAVA_*).
 ##
 # USE_GECKO		- If set, this port uses the Gecko/Mozilla product.
 #				  See bsd.gecko.mk for more details.
@ -1402,10 +1399,6 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 .sinclude "${odir}/Mk/bsd.overlay.mk"
 .    endfor

-.    if defined(USE_JAVA)
-.include "${PORTSDIR}/Mk/bsd.java.mk"
-.    endif
-
 .    if defined(USE_APACHE_BUILD)
 USES+=	apache:build,${USE_APACHE_BUILD:C/2([0-9])/2.\1/g}
 .    elif defined(USE_APACHE_RUN)
@ -1925,10 +1918,6 @@ PKGPOSTDEINSTALL?=	${PKGDIR}/pkg-post-deinstall
 .sinclude "${odir}/Mk/bsd.overlay.mk"
 .    endfor

-.    if defined(USE_JAVA)
-.include "${PORTSDIR}/Mk/bsd.java.mk"
-.    endif
-
 .    if defined(USE_WX) || defined(USE_WX_NOT)
 .include "${PORTSDIR}/Mk/bsd.wx.mk"
 .    endif
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@ -213,7 +213,8 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_OPENLDAP WANT_OPENLDAP_VER USE_OCAML USE_OCAML_CAMLP4 USE_OCAML_WASH \
 		USE_OCAML_TK NO_OCAMLTK_BUILDDEPENDS NO_OCAMLTK_RUNDEPENDS \
 		USE_OCAMLFIND_PLIST USE_OCAML_FINDLIB USE_OCAML_LDCONFIG \
-		NO_OCAML_BUILDDEPENDS NO_OCAML_RUNDEPENDS
+		NO_OCAML_BUILDDEPENDS NO_OCAML_RUNDEPENDS USE_JAVA JAVA_BUILD \
+		JAVA_EXTRACT USE_ANT JAVA_RUN
 SANITY_DEPRECATED=	MLINKS \
 			USE_MYSQL WANT_MYSQL_VER \
 			PYDISTUTILS_INSTALLNOSINGLE
@ -321,6 +322,11 @@ NO_OCAMLTK_BUILDDEPENDS_ALT=	USES=ocaml:tkrun
 NO_OCAMLTK_RUNDEPENDS_ALT=	USES=ocaml:tkbuild
 NO_OCAML_BUILDDEPENDS_ALT=	USES=ocaml:run
 NO_OCAML_RUNDEPENDS_ALT=	USES=ocaml:build
+USE_ANT_ALT=	USES=java:ant
+USE_JAVA_ALT=		USES=java
+JAVA_EXTRACT_ALT=	USES=java:extract
+JAVA_BUILD_ALT=		USES=java:build
+JAVA_RUN_ALT=		USES=java:run

 .for a in ${SANITY_DEPRECATED}
 .  if defined(${a})
--- a/archivers/apache-commons-compress/Makefile
+++ b/archivers/apache-commons-compress/Makefile
@ -11,8 +11,7 @@ WWW=		https://commons.apache.org/proper/commons-compress/

 LICENSE=	APACHE20

-USE_JAVA=	yes
-JAVA_VERSION=	8+
+USES=		java

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
--- a/archivers/javatar/Makefile
+++ b/archivers/javatar/Makefile
@ -11,7 +11,7 @@ WWW=		http://www.trustice.com/java/tar/
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE

-USE_JAVA=	yes
+USES=		java

 NO_BUILD=	yes

--- a/archivers/snappy-java/Makefile
+++ b/archivers/snappy-java/Makefile
@ -25,7 +25,7 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		sbt:devel/sbt

-USES=		gmake
+USES=		gmake java:build

 USE_GITHUB=	yes
 GH_ACCOUNT=	xerial
@ -36,8 +36,6 @@ GH_TUPLE=	google:snappy:${DISTVERSION:R}:google \
 		google:googletest:b796f7d:google_googletest/google_googletest \
 		kiyo-masui:bitshuffle:${BITSHUFFLE_V}:masui

-USE_JAVA=	yes
-JAVA_BUILD=	jre # prevent JAVA_RUN via bsd.java.mk
 USE_LDCONFIG=	yes
 MAKE_ARGS+=	CXX="${CXX}"
 TEST_TARGET=	test
--- a/astro/gpsprune/Makefile
+++ b/astro/gpsprune/Makefile
@ -16,7 +16,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes

-USE_JAVA=	yes
+USES=		java
 JAVA_VERSION=	11+

 SUB_FILES=	gpsprune.sh
--- a/astro/josm/Makefile
+++ b/astro/josm/Makefile
@ -15,8 +15,7 @@ PORTSCOUT=	ignore:1

 NO_WRKSUBDIR=	yes

-USES=		zip:infozip
-USE_JAVA=	yes
+USES=		java zip:infozip
 JAVA_VERSION=	11+

 NO_BUILD=	yes
--- a/astro/mkgmap-splitter/Makefile
+++ b/astro/mkgmap-splitter/Makefile
@ -10,8 +10,7 @@ WWW=		https://www.mkgmap.org.uk/doc/splitter.html

 LICENSE=	GPLv3

-USE_JAVA=	yes
-JAVA_VERSION=	8+
+USES=		java
 NO_BUILD=	yes
 NO_ARCH=	yes

--- a/astro/mkgmap/Makefile
+++ b/astro/mkgmap/Makefile
@ -10,8 +10,7 @@ WWW=		https://www.mkgmap.org.uk/index.html
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENCE

-USE_JAVA=	yes
-JAVA_VERSION=	8+
+USES=		java
 NO_BUILD=	yes
 NO_ARCH=	yes

--- a/astro/osmosis/Makefile
+++ b/astro/osmosis/Makefile
@ -10,8 +10,7 @@ WWW=		https://wiki.openstreetmap.org/wiki/Osmosis
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/copying.txt

-USES=		tar
-USE_JAVA=	yes
+USES=		java tar
 JAVA_VERSION=	17+
 NO_BUILD=	yes
 NO_ARCH=	yes
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@ -11,8 +11,8 @@ WWW=		https://www.atunes.org/

 LICENSE=	GPLv2

+USES=		java
 NO_BUILD=	yes
-USE_JAVA=	yes
 SUB_FILES=	atunes

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
--- a/audio/jid3lib/Makefile
+++ b/audio/jid3lib/Makefile
@ -8,8 +8,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java ID3 Tag Library
 WWW=		https://javamusictag.sourceforge.net/index.html

-USE_JAVA=	yes
-USE_ANT=	yes
+USES=		java:ant

 PLIST_FILES=	%%JAVAJARDIR%%/jid3lib.jar

--- a/audio/musiccontrol/Makefile
+++ b/audio/musiccontrol/Makefile
@ -15,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/mpg123:audio/mpg123 \
 		${LOCALBASE}/bin/ogg123:audio/vorbis-tools \
 		${LOCALBASE}/bin/simplemod:audio/simplemod

-USE_JAVA=	yes
+USES=		java
 NO_BUILD=	yes
 PLIST_FILES=	share/java/classes/MusicControl-${PORTVERSION}.jar bin/musiccontrol

--- a/audio/nyquist/Makefile
+++ b/audio/nyquist/Makefile
@ -10,7 +10,7 @@ WWW=		https://www.cs.cmu.edu/~music/music.software.html

 LICENSE=	BSD3CLAUSE

-USES=		cmake zip
+USES=		cmake java zip
 USE_CSTD=	c99
 USE_CXXSTD=	c++14

@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	-Dulong=uint32_t -DXL_BIG_ENDIAN -DHAVE_SYS_SOUNDCARD_H
 CFLAGS+=	-fcommon # notified the author vie e-mail on 2021-04-29

-USE_JAVA=	yes
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|nyquistDir = prefs.get("nyquist-dir", "");|nyquistDir = "${DATADIR}";|' ${WRKSRC}/jnyqide/MainFrame.java

--- a/benchmarks/linux-vdbench/Makefile
+++ b/benchmarks/linux-vdbench/Makefile
@ -17,8 +17,7 @@ LICENSE_PERMS=	none
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Linux compatibility layer only supports i386/amd64

-USES=		linux shebangfix uniquefiles:dirs zip
-USE_JAVA=	yes
+USES=		java linux shebangfix uniquefiles:dirs zip

 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 JAVA_OS=	linux
--- a/benchmarks/scimark2/Makefile
+++ b/benchmarks/scimark2/Makefile
@ -12,8 +12,7 @@ WWW=		https://math.nist.gov/scimark2/index.html

 LICENSE=	PD

-USES=		zip
-USE_JAVA=	yes
+USES=		java zip
 NEED_JAVAC=	yes
 JAVAC_OPTS?=	-O
 NO_ARCH=	yes
--- a/benchmarks/typometer/Makefile
+++ b/benchmarks/typometer/Makefile
@ -11,9 +11,7 @@ WWW=		https://pavelfatin.com/typometer/

 LICENSE=	APACHE20

-USES=		zip
-USE_JAVA=	yes
-JAVA_VERSION=	8+
+USES=		java zip
 NO_BUILD=	yes

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
--- a/biology/artemis/Makefile
+++ b/biology/artemis/Makefile
@ -13,11 +13,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 RUN_DEPENDS=	bash:shells/bash

-USES=		gmake shebangfix
+USES=		gmake java shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	sanger-pathogens
 SHEBANG_FILES=	act art bamview dnaplotter test/*.sh etc/go_associations.pl
-USE_JAVA=	yes
 ALL_TARGET=	jar
 NO_ARCH=	yes

--- a/biology/bbmap/Makefile
+++ b/biology/bbmap/Makefile
@ -15,8 +15,7 @@ RUN_DEPENDS=	bash:shells/bash \
 		pigz:archivers/pigz \
 		pbzip2:archivers/pbzip2

-USES=		shebangfix
-USE_JAVA=	yes
+USES=		java shebangfix

 SHEBANG_FILES=	${WRKSRC}/*.sh

--- a/biology/canu/Makefile
+++ b/biology/canu/Makefile
@ -18,10 +18,8 @@ NOT_FOR_ARCHS_REASON=	Requires 64-bit processor
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 RUN_DEPENDS=	gnuplot:math/gnuplot

-USES=		compiler:c++11-lang gmake localbase perl5 tar:xz
+USES=		compiler:c++11-lang gmake java localbase perl5 tar:xz
 USE_CXXSTD=	c++14
-USE_JAVA=	8+
-JAVA_RUN=	yes

 # Upstream Makefile compiles directly into ${DESTDIR}${PREFIX} rather than
 # using a separate install target.
--- a/biology/cytoscape/Makefile
+++ b/biology/cytoscape/Makefile
@ -20,9 +20,8 @@ BUILD_DEPENDS=	maven363>0:devel/maven363 \
 		bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash

-USES=		shebangfix
+USES=		java shebangfix
 SHEBANG_FILES=	gui-distribution/assembly/src/main/bin/cytoscape.sh
-USE_JAVA=	yes
 USE_GITHUB=	yes
 GH_TUPLE=	${PORTNAME}:${PORTNAME}-parent:${DISTVERSION}:p/parent \
 		${PORTNAME}:${PORTNAME}-api:${DISTVERSION}:a/api \
--- a/biology/ddocent/Makefile
+++ b/biology/ddocent/Makefile
@ -32,8 +32,7 @@ RUN_DEPENDS=	mawk>=0:lang/mawk \
 		freebayes:biology/freebayes \
 		fastp:biology/fastp

-USES=		perl5 python shebangfix
-USE_JAVA=	yes
+USES=		java perl5 python shebangfix
 USE_GITHUB=	yes

 SHEBANG_FILES=	dDocent scripts/*.sh scripts/*.pl scripts/dDocent_filters
--- a/biology/erminej/Makefile
+++ b/biology/erminej/Makefile
@ -11,8 +11,7 @@ WWW=		https://erminej.msl.ubc.ca/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

-USES=		zip
-USE_JAVA=	yes
+USES=		java zip

 WRKSRC=		${WRKDIR}/ermineJ-${DISTVERSION}
 NO_BUILD=	yes
--- a/biology/fastqc/Makefile
+++ b/biology/fastqc/Makefile
@ -11,8 +11,7 @@ WWW=		https://www.bioinformatics.babraham.ac.uk/projects/fastqc/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

-USES=		zip perl5 shebangfix
-USE_JAVA=	yes
+USES=		java zip perl5 shebangfix
 USE_PERL5=	run

 SHEBANG_FILES=	fastqc
--- a/biology/figtree/Makefile
+++ b/biology/figtree/Makefile
@ -10,8 +10,7 @@ WWW=		http://tree.bio.ed.ac.uk/software/figtree/

 LICENSE=	GPLv2

-USE_JAVA=	yes
-USE_ANT=	yes
+USES=		java:ant
 JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237) ...

 USE_GITHUB=	yes
--- a/biology/gatk/Makefile
+++ b/biology/gatk/Makefile
@ -16,9 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libfml.so:biology/fermi-lite \
 		gkl>0:biology/gkl \
 		mummer>0:biology/mummer

-USES=		gettext-runtime python:test
-USE_JAVA=	yes
-
+USES=		gettext-runtime java python:test
 JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=76025, tid=0x000000000006e359 guarantee(val < (1U << nbits)) failed: Field too big for insn

 USE_GITHUB=	yes
--- a/biology/gkl/Makefile
+++ b/biology/gkl/Makefile
@ -13,8 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	gmake:devel/gmake
 LIB_DEPENDS=	libisal.so:devel/isa-l

-USES=		cmake:noninja localbase:ldflags
-USE_JAVA=	yes
+USES=		cmake:noninja java localbase:ldflags
 USE_LDCONFIG=	yes

 USE_GITHUB=	yes
--- a/biology/igv/Makefile
+++ b/biology/igv/Makefile
@ -19,8 +19,7 @@ BUILD_DEPENDS=	openjfx14>0:java/openjfx14 \
 		gradle:devel/gradle6
 RUN_DEPENDS=	openjfx14>0:java/openjfx14

-USES=		gettext-runtime
-USE_JAVA=	yes
+USES=		gettext-runtime java

 USE_GITHUB=	yes
 GH_ACCOUNT=	igvteam
--- a/biology/jalview/Makefile
+++ b/biology/jalview/Makefile
@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	gradle761:devel/gradle761

-USE_JAVA=	yes
+USES=		java
 JAVA_VERSION=	11

 WRKSRC=		${WRKDIR}/${PORTNAME}
--- a/biology/picard-tools/Makefile
+++ b/biology/picard-tools/Makefile
@ -14,8 +14,7 @@ LICENSE=	MIT

 RUN_DEPENDS=	samtools:biology/samtools

-USE_JAVA=	8+
-JAVA_RUN=	yes
+USES=		java

 CONFLICTS_INSTALL=	picard # bin/picard

--- a/biology/readseq/Makefile
+++ b/biology/readseq/Makefile
@ -13,7 +13,7 @@ WWW=		https://sourceforge.net/projects/readseq

 LICENSE=	PD

-USE_JAVA=	yes
+USES=	java
 NO_BUILD=	yes
 SUB_FILES=	readseq
 PLIST_FILES=	bin/readseq share/java/classes/readseq.jar
--- a/biology/snpeff/Makefile
+++ b/biology/snpeff/Makefile
@ -14,8 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md

 RUN_DEPENDS=	bash:shells/bash

-USES=		python shebangfix zip
-USE_JAVA=	yes
+USES=		java python shebangfix zip

 JAVA_VERSION=	17+
 SHEBANG_FILES=	scripts/* scripts/gsa/*
--- a/biology/sra-tools/Makefile
+++ b/biology/sra-tools/Makefile
@ -18,10 +18,9 @@ ONLY_FOR_ARCHS_REASON=	Upstream explicitly supports specific platforms
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	hdf5>0:science/hdf5

-USES=		bison cmake shebangfix
+USES=		bison cmake java shebangfix
 USE_GITHUB=	yes
 USE_LDCONFIG=	${PREFIX}/lib64
-USE_JAVA=	yes

 # Builds with earlier versions, but ngs-doc plist differs if jdk17 is present
 JAVA_VERSION=	17+
--- a/biology/trimmomatic/Makefile
+++ b/biology/trimmomatic/Makefile
@ -11,10 +11,8 @@ WWW=		http://www.usadellab.org/cms/?page=trimmomatic
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USES=		zip
-USE_JAVA=	yes
+USES=		java zip

-JAVA_RUN=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes

--- a/cad/digital/Makefile
+++ b/cad/digital/Makefile
@ -12,14 +12,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	maven>0:devel/maven

-USES=		desktop-file-utils
+USES=		desktop-file-utils java
+JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=76025, tid=0x000000000006e359 guarantee(val < (1U << nbits)) failed: Field too big for insn

 USE_GITHUB=	yes
 GH_ACCOUNT=	hneemann
 GH_PROJECT=	Digital

-USE_JAVA=	yes
-JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=76025, tid=0x000000000006e359 guarantee(val < (1U << nbits)) failed: Field too big for insn

 NO_ARCH=	yes

--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@ -18,7 +18,7 @@ LICENSE=	GPLv3

 EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip

-USE_JAVA=	yes
+USES=		java
 NO_BUILD=	yes
 SUB_LIST+=	LIBFILES="${LIBFILES}" \
 		JARFILE="${JARFILE}"
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@ -14,6 +14,7 @@ WWW=		https://darwinne.github.io/FidoCadJ/index.html

 LICENSE=	GPLv3

+USES=	java
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}

 JAVA_VERSION=	11+
@ -26,8 +27,6 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	PORTVERSION=${PORTVERSION} JAVA=${JAVA}

-USE_JAVA=	yes
-
 OPTIONS_DEFINE=	DOCS

 DOCS_DISTFILES=	manual_en.pdf
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@ -20,8 +20,7 @@ RUN_DEPENDS=	java3d>0:java/java3d

 WRKSRC=		${WRKDIR}/Impact

-USES=		zip
-USE_JAVA=	yes
+USES=		java zip
 NO_BUILD=	yes

 DATADIR=	${JAVASHAREDIR}/Impact
--- a/cad/logisim/Makefile
+++ b/cad/logisim/Makefile
@ -12,9 +12,9 @@ WWW=		http://ozark.hendrix.edu/~burch/logisim/

 LICENSE=	GPLv2

+USES=		java
+
 NO_BUILD=	yes
-USE_JAVA=	yes
-JAVA_RUN=	yes

 PLIST_FILES=	${DATADIR_REL}/${PORTNAME}-generic-${PORTVERSION}${EXTRACT_SUFX} \
 		bin/${PORTNAME}
--- a/cad/silice/Makefile
+++ b/cad/silice/Makefile
@ -13,8 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE_GPLv3
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}edalize>0:cad/py-edalize@${PY_FLAVOR} # examples also require xtclsh from Xilinx

-USES=		cmake:noninja python shebangfix
-USE_JAVA=	yes
+USES=		cmake:noninja java python shebangfix

 JAVA_VERSION=	17

--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@ -21,12 +21,9 @@ LIB_DEPENDS=	libcapnp.so:devel/capnproto \
 		libuhdm.so:cad/uhdm
 TEST_DEPENDS=	googletest>0:devel/googletest

-USES=		cmake:testing compiler:c++17-lang localbase:ldflags tcl:86,build
-USE_JAVA=	17 # Java selection fails in cmake when Java 11 is also installed, see https://gitlab.kitware.com/cmake/cmake/-/issues/24674
+USES=		cmake:testing compiler:c++17-lang java:build localbase:ldflags tcl:86,build
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/surelog
-
-JAVA_BUILD=	yes
-JAVA_RUN=	no
+JAVA_VERSION=	17 # Java selection fails in cmake when Java 11 is also installed, see https://gitlab.kitware.com/cmake/cmake/-/issues/24674

 USE_GITHUB=	yes
 GH_ACCOUNT=	chipsalliance
@ -39,7 +36,7 @@ CMAKE_ON=	BUILD_SHARED_LIBS \
 		SURELOG_USE_HOST_CAPNP \
 		SURELOG_USE_HOST_GTEST
 CMAKE_OFF=	SURELOG_BUILD_TESTS
-CMAKE_ARGS=	-DFREEBSD_JAVA_VERSION=${USE_JAVA} \
+CMAKE_ARGS=	-DFREEBSD_JAVA_VERSION=${JAVA_VERSION} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
 CMAKE_TESTING_ON=	SURELOG_BUILD_TESTS # 2 tests fail, see https://github.com/chipsalliance/Surelog/issues/3545
 CMAKE_TESTING_TARGET=	UnitTests
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@ -15,10 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING.TXT
 BUILD_DEPENDS=	java3d>=0:java/java3d
 RUN_DEPENDS=	java3d>=0:java/java3d

-USES=		cmake:indirect
-
-USE_ANT=	yes
-USE_JAVA=	8
+USES=		cmake:indirect java:ant
+JAVA_VERSION=	8

 USE_GITHUB=	nodefault
 GH_ACCOUNT=	puybaret:yr
--- a/comms/java-simple-serial-connector/Makefile
+++ b/comms/java-simple-serial-connector/Makefile
@ -10,12 +10,11 @@ WWW=		https://github.com/scream3r/java-simple-serial-connector

 LICENSE=	LGPL3

+USES=		java:ant
 USE_GITHUB=	yes
 GH_ACCOUNT=	scream3r

 MAJOR_MINOR=	${PORTVERSION:C/(.*)\.[0-9]*/\\1/}
-USE_JAVA=	yes
-USE_ANT=	yes
 ALL_TARGET=	dist
 CXXFLAGS+=	-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 WRKSRC_LIBS=	${WRKSRC}/src/java/libs
--- a/comms/rxtx/Makefile
+++ b/comms/rxtx/Makefile
@ -16,9 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 NOT_FOR_ARCHS=		mips mips64
 NOT_FOR_ARCHS_REASON=	Java not available for this architecture

-USES=		gmake libtool zip
+USES=		gmake java libtool zip

-USE_JAVA=	yes
 JAVA_OS=	native
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
--- a/databases/apache-commons-dbutils/Makefile
+++ b/databases/apache-commons-dbutils/Makefile
@ -12,7 +12,8 @@ WWW=		https://commons.apache.org/proper/commons-dbutils/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

-USE_JAVA=	yes
+USES=		java
+
 NO_BUILD=	yes
 NO_ARCH=	yes

--- a/databases/c3p0/Makefile
+++ b/databases/c3p0/Makefile
@ -11,9 +11,8 @@ WWW=		https://www.mchange.com/projects/c3p0/
 LICENSE=	LGPL21 EPL
 LICENSE_COMB=	dual

-USES=		cpe tar:tgz
+USES=		cpe java tar:tgz
 CPE_VENDOR=	mchange
-USE_JAVA=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_ARCH=	yes
--- a/databases/cassandra3/Makefile
+++ b/databases/cassandra3/Makefile
@ -17,9 +17,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAV
 		bash>0:shells/bash \
 		git>0:devel/git

-USES=		cpe python
-USE_ANT=	yes
-USE_JAVA=	yes
+USES=		cpe java:ant python
 JAVA_VERSION=	8
 JAVA_VENDOR=	openjdk
 CPE_VENDOR=	apache
--- a/databases/cassandra4/Makefile
+++ b/databases/cassandra4/Makefile
@ -23,9 +23,7 @@ FETCH_DEPENDS=	ant:devel/apache-ant
 RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java \
 		netty>0:java/netty

-USES=		cpe python shebangfix
-USE_JAVA=	yes
-USE_ANT=	yes
+USES=		cpe java:ant python shebangfix
 USE_RC_SUBR=	cassandra
 SHEBANG_FILES=	bin/cqlsh.py pylib/setup.py
 TEST_TARGET=	test
--- a/databases/db18/Makefile
+++ b/databases/db18/Makefile
@ -60,14 +60,13 @@ L10N_DESC=	Localization support (EXPERIMENTAL)
 CRYPTO_CONFIGURE_WITH=	cryptography=yes
 DEBUG_CONFIGURE_ENABLE=	debug umrw
 DOCS_INSTALL_TARGET=	install_docs
-JAVA_USE=		java
+JAVA_USES=		java
 JAVA_CONFIGURE_ENABLE=	java
 JAVA_CONFIGURE_ENV=	JAR="${JAR}" \
 			JAVA="${JAVA}" \
 			JAVAC="${JAVAC}"
 JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
-JAVA_VARS=		DBLIBS+=libdb_java \
-			JAVA_VERSION="8+"
+JAVA_VARS=		DBLIBS+=libdb_java
 L10N_CONFIGURE_ENABLE=	localization
 TCL_USES=		tcl
 TCL_CONFIGURE_ENABLE=	tcl
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@ -53,7 +53,7 @@ DBLIBS=	libdb libdb_cxx libdb_stl
 DEBUG_CONFIGURE_ENABLE=	debug umrw
 CRYPTO_CONFIGURE_WITH=	cryptography=yes
 L10N_CONFIGURE_ENABLE=	localization
-JAVA_USE=		java
+JAVA_USES=		java
 # db5 is incompatible with openjdk8 and causes IllegalArgument
 # exceptions during build
 JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION="8"
--- a/databases/frontbase-jdbc/Makefile
+++ b/databases/frontbase-jdbc/Makefile
@ -10,7 +10,7 @@ MAINTAINER?=	ports@FreeBSD.org
 COMMENT=	The Java JDBC implementation for FrontBase
 WWW=		http://www.frontbase.com/

-USE_JAVA=	yes
+USES=		java

 NO_BUILD=	yes
 JARFILE=	frontbasejdbc.jar
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@ -9,9 +9,8 @@ WWW=		https://hsqldb.org/

 LICENSE=	BSD3CLAUSE

-USE_JAVA=	yes
-USE_ANT=	yes
-USES=		zip
+USES=		java:ant zip
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/build
 ALL_TARGET=	hsqldb hsqljdbc
--- a/databases/jdbc-oracle11g/Makefile
+++ b/databases/jdbc-oracle11g/Makefile
@ -21,7 +21,7 @@ LICENSE_PERMS=	auto-accept
 DEPRECATED=	Oracle no longer provides public downloads of the old JDBC drivers
 EXPIRATION_DATE=	2025-01-24

-USE_JAVA=	yes
+USES=		java
 JAVA_VERSION=	8
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
--- a/databases/jetbrains-datagrip/Makefile
+++ b/databases/jetbrains-datagrip/Makefile
@ -23,9 +23,7 @@ RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier \
 		jetbrains-sqlite>=232.8660.185:devel/jetbrains-sqlite \
 		lsof:sysutils/lsof

-USES=		python:run shebangfix
-
-USE_JAVA=	yes
+USES=		java python:run shebangfix
 JAVA_VERSION=	17+

 USE_LDCONFIG=	yes
--- a/databases/jrobin/Makefile
+++ b/databases/jrobin/Makefile
@ -9,7 +9,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pure Java alternative to RRDTool
 WWW=		http://www.jrobin.org/

-USE_JAVA=	yes
+USES=		java
 NO_BUILD=	yes

 CLASSES=	jrobin
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@ -10,14 +10,13 @@ WWW=		https://www.opennms.org/index.php/Jrrd

 LIB_DEPENDS=	librrd.so:databases/rrdtool

-USES=		libtool
-USE_JAVA=	yes
+USES=		java libtool
 JAVA_VENDOR=	openjdk
-JAVA_BUILD=	yes
-JAVA_RUN=	yes
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
-USE_LDCONFIG=	yes
+
 INSTALL_TARGET=	install-strip

 PLIST_FILES=	%%JAVAJARDIR%%/jrrd.jar \
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@ -92,8 +92,8 @@ CONFIGURE_ARGS+=	--without-mdb
 .endif

 .if ${LIBGDA5_SLAVE}==jdbc
-USE_JAVA=		yes
-JAVA_VENDOR=		bsdjava openjdk
+USES+=			java
+JAVA_VENDOR=		openjdk
 CFLAGS+=		-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 .else
 CONFIGURE_ARGS+=	--without-java
--- a/databases/liquibase/Makefile
+++ b/databases/liquibase/Makefile
@ -9,14 +9,12 @@ WWW=		https://www.liquibase.org/

 LICENSE=	APACHE20

-USES=		cpe
+USES=		cpe java

 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes

-USE_JAVA=	yes
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/liquibase ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
--- a/databases/metabase/Makefile
+++ b/databases/metabase/Makefile
@ -14,10 +14,7 @@ WWW=		https://metabase.com/

 LICENSE=	AGPLv3

-USES=		cpe
-
-USE_JAVA=	yes
-JAVA_RUN=	yes
+USES=		cpe java
 USE_RC_SUBR=	${PORTNAME}

 NO_ARCH=	yes
--- a/databases/mysql-connector-j/Makefile
+++ b/databases/mysql-connector-j/Makefile
@ -14,9 +14,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \
 		${JAVALIBDIR}/c3p0.jar:databases/c3p0 \
 		${JAVALIBDIR}/protobuf-java.jar:devel/protobuf-java

-USES=		cpe
-USE_JAVA=	yes
-
+USES=		cpe java
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	mysql_connector_j

@ -25,7 +23,6 @@ NO_BUILD=	yes

 CONFLICTS_INSTALL=	mysql-connector-java51 # share/java/classes/mysql-connector-java.jar

-JAVA_VERSION=	8+
 EXTRADOCS=	CHANGES

 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
--- a/databases/mysql-connector-java51/Makefile
+++ b/databases/mysql-connector-java51/Makefile
@ -15,14 +15,13 @@ RUN_DEPENDS=	${JAVALIBDIR}/log4j.jar:devel/log4j
 # 8.0.x is now the GA release, but drops support for java 1.6 and 1.7
 PORTSCOUT=	limit:^5\.1\..*

-USES=		cpe
+USES=		cpe java
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	mysql_connector_j

 CONFLICTS_INSTALL=	mysql-connector-java # share/java/classes/mysql-connector-java.jar

 NO_ARCH=	yes
-USE_JAVA=	yes
 JAVA_VERSION=	8
 BUILDDIR=	${WRKDIR}/${DISTNAME}
 APIDOCSDIR=	${STAGEDIR}${DOCSDIR}/javadoc
--- a/databases/neo4j/Makefile
+++ b/databases/neo4j/Makefile
@ -14,9 +14,8 @@ RUN_DEPENDS=	bash:shells/bash

 WRKSRC=		${WRKDIR}/${DISTNAME:S,-unix,,}
 NO_BUILD=	yes
-USES=		cpe shebangfix
+USES=		cpe java shebangfix
 SHEBANG_FILES=	bin/cypher-shell bin/neo4j-admin
-USE_JAVA=	yes
 JAVA_VERSION=	11
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	${PORTNAME}.sh
--- a/databases/postgis-jdbc/Makefile
+++ b/databases/postgis-jdbc/Makefile
@ -13,8 +13,7 @@ LICENSE_COMB=	multi

 RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc

-USES=		zip:infozip
-USE_JAVA=	yes
+USES=		java zip:infozip
 NO_BUILD=	yes
 NO_ARCH=	yes

--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@ -12,8 +12,7 @@ WWW=		https://jdbc.postgresql.org/

 LICENSE=	BSD3CLAUSE

-USE_JAVA=	yes
-JAVA_VERSION=	8+
+USES=		java
 NO_ARCH=	yes
 PLIST_FILES=	%%JAVAJARDIR%%/postgresql.jar

--- a/databases/powerarchitect/Makefile
+++ b/databases/powerarchitect/Makefile
@ -10,7 +10,7 @@ WWW=		http://www.bestofbi.com/page/architect

 LICENSE=	GPLv3

-USE_JAVA=	yes
+USES=		java
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	${PORTNAME}
--- a/databases/puppetdb7/Makefile
+++ b/databases/puppetdb7/Makefile
@ -15,7 +15,7 @@ RUN_DEPENDS=	bash:shells/bash
 USE_RC_SUBR=	puppetdb

 CONFLICTS_INSTALL=	puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample
-USES=		cpe shebangfix
+USES=		cpe java shebangfix
 CPE_VENDOR=	puppet
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
@ -27,7 +27,6 @@ SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/reload \
 		ext/cli/upgrade \
 		ext/ezbake-functions.sh
-USE_JAVA=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes

--- a/databases/puppetdb8/Makefile
+++ b/databases/puppetdb8/Makefile
@ -15,7 +15,7 @@ RUN_DEPENDS=	bash:shells/bash
 USE_RC_SUBR=	puppetdb

 CONFLICTS_INSTALL=	puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample
-USES=		cpe shebangfix
+USES=		cpe java shebangfix
 CPE_VENDOR=	puppet
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
@ -27,7 +27,6 @@ SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/reload \
 		ext/cli/upgrade \
 		ext/ezbake-functions.sh
-USE_JAVA=	yes
 JAVA_VERSION=	11+
 NO_ARCH=	yes
 NO_BUILD=	yes
--- a/databases/rocksdb-jni/Makefile
+++ b/databases/rocksdb-jni/Makefile
@ -23,15 +23,11 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/../COPYING
 BUILD_DEPENDS=	googletest>0:devel/googletest
 LIB_DEPENDS=	librocksdb.so:databases/rocksdb # librocksdbjni.so in the rocksdb.jar file is linked to librocksdb.so

-USES=		cmake compiler:c++17-lang localbase:ldflags
+USES=		cmake compiler:c++17-lang java localbase:ldflags

 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 GH_PROJECT=	rocksdb
-
-USE_JAVA=	yes
-JAVA_BUILD=	yes
-JAVA_RUN=	yes
 JAVA_VERSION=	21

 WRKSRC_SUBDIR=	java
--- a/databases/sql-workbench/Makefile
+++ b/databases/sql-workbench/Makefile
@ -12,8 +12,7 @@ WWW=		https://www.sql-workbench.eu/

 LICENSE=	APACHE20

-USES=		zip
-USE_JAVA=	yes
+USES=		java zip
 JAVA_VERSION=	11+

 NO_BUILD=	yes
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@ -18,8 +18,7 @@ LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror
 RUN_DEPENDS=	openjfx14>=0:java/openjfx14 \
 		bash:shells/bash

-USES=		gnome zip
-USE_JAVA=	17
+USES=		gnome java zip

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@ -10,8 +10,8 @@ WWW=		http://www.squirrelsql.org/

 LICENSE=	GPLv2

-USES=		zip
-USE_JAVA=	11+
+USES=		java zip
+JAVA_VERSION=	11+

 DATADIR=	${PREFIX}/share/java/${PKGBASE}

--- a/deskutils/docear/Makefile
+++ b/deskutils/docear/Makefile
@ -15,8 +15,7 @@ WWW=		https://www.docear.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt

-USES=		desktop-file-utils shared-mime-info
-USE_JAVA=	yes
+USES=		desktop-file-utils java shared-mime-info
 JAVA_VENDOR=	openjdk
 NO_BUILD=	yes
 JDATADIR=	${JAVASHAREDIR}/${PORTNAME}
--- a/deskutils/freemind/Makefile
+++ b/deskutils/freemind/Makefile
@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/license

 BUILD_DEPENDS=	zip:archivers/zip

-USES=		cpe zip:infozip
-USE_JAVA=	yes
+USES=		cpe java zip:infozip

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
 DATAFILES=	accessories browser doc lib plugins patterns.xml
--- a/deskutils/freeplane/Makefile
+++ b/deskutils/freeplane/Makefile
@ -13,8 +13,7 @@ LICENSE_FILE=	${WRKSRC}/license.txt

 RUN_DEPENDS=	bash:shells/bash

-USES=		cpe desktop-file-utils shebangfix zip
-USE_JAVA=	yes
+USES=		cpe desktop-file-utils java shebangfix zip

 SHEBANG_FILES=	${WRKSRC}/freeplane.sh

--- a/deskutils/ganttproject/Makefile
+++ b/deskutils/ganttproject/Makefile
@ -13,8 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 RUN_DEPENDS=	openjfx14>=14:java/openjfx14

-USES=		desktop-file-utils shebangfix zip
-USE_JAVA=	yes
+USES=		desktop-file-utils java shebangfix zip
 JAVA_VERSION=	11+
 SHEBANG_FILES=	ganttproject
 bash_CMD=	/bin/sh
--- a/deskutils/projectlibre/Makefile
+++ b/deskutils/projectlibre/Makefile
@ -14,7 +14,7 @@ WWW=		https://www.projectlibre.com/product/1-alternative-microsoft-project-open-

 LICENSE=	CPAL-1.0

-USE_JAVA=	yes
+USES=		java

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
 DESKTOP_ENTRIES="ProjectLibre" \
--- a/deskutils/thinkingrock/Makefile
+++ b/deskutils/thinkingrock/Makefile
@ -12,7 +12,7 @@ WWW=		http://www.thinkingrock.com.au/
 RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:devel/xdg-utils \
 		${LOCALBASE}/bin/xdg-email:devel/xdg-utils

-USE_JAVA=	yes
+USES=		java
 NO_BUILD=	yes

 SUB_FILES=	pkg-message
--- 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>
--- 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 \
--- 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
--- 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}"
--- 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
--- 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
--- 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
--- 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=	*
--- 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}

--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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!-!_!}
--- 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

--- 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)

--- 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)

--- a/Show more
+++ b/Show more