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

20 files changed, 40 insertions, 57 deletions

diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index b45f4d82394f..e4b42b78f1c8 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -12,9 +12,8 @@ WWW=		https://activemq.apache.org
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe
+USES=		cpe java
 CPE_VENDOR=	apache
-USE_JAVA=	yes
 JAVA_VERSION=	18
 USE_RC_SUBR=	activemq
 
diff --git a/net/apache-commons-net/Makefile b/net/apache-commons-net/Makefile
index 481a17773b79..cfda06233fa6 100644
--- a/net/apache-commons-net/Makefile
+++ b/net/apache-commons-net/Makefile
@@ -12,7 +12,8 @@ WWW=		https://commons.apache.org/proper/commons-net/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USE_JAVA=	yes
+USES=		java
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index 6e9159af1f55..ea30799b20e7 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -13,13 +13,11 @@ LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
 		libbctoolbox.so:net/bctoolbox \
 		libbelr.so:textproc/belr
 
-USES=		cmake cpe tar:bz2
+USES=		cmake cpe java:build tar:bz2
 CPE_VENDOR=	linphone
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.linphone.org/BC
 GL_ACCOUNT=	public
-USE_JAVA=	yes
-JAVA_BUILD=	jre
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DCMAKE_PREFIX_PATH=${LOCALBASE} \
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index c59d9eaebc2e..1e984a765345 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -123,9 +123,8 @@ ALL_MODULES_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 				libvlc.so:multimedia/vlc \
 				libyaml.so:textproc/libyaml
 ALL_MODULES_RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
-ALL_MODULES_USE=		XORG=x11 OPENLDAP=yes JAVA=yes
-ALL_MODULES_VARS=		USE_JAVA=yes
-ALL_MODULES_USES=		python:2.7 xorg # required by mod_unimrcp
+ALL_MODULES_USE=		XORG=x11 OPENLDAP=yes
+ALL_MODULES_USES=		java python:2.7 xorg # required by mod_unimrcp
 ALL_MODULES_CFLAGS=		-I${LOCALBASE}/include/openh323/ \
 				-I${JAVA_HOME}/include/ \
 				-I${JAVA_HOME}/include/freebsd
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index 5f888c0ffeb8..cd4a57de99c9 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -12,7 +12,8 @@ WWW=		https://sourceforge.net/projects/beepcore-java/
 
 RUN_DEPENDS=	${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 
-USE_JAVA=	yes
+USES=		java
+
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/net/jcifs/Makefile b/net/jcifs/Makefile
index 7760d607b339..fe941d59aad0 100644
--- a/net/jcifs/Makefile
+++ b/net/jcifs/Makefile
@@ -12,8 +12,8 @@ LICENSE=	LGPL21
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		tar:tgz
-USE_JAVA=	yes
+USES=		java tar:tgz
+
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/net/jgroups/Makefile b/net/jgroups/Makefile
index 3fb82d3b75a9..9abcc40eddf5 100644
--- a/net/jgroups/Makefile
+++ b/net/jgroups/Makefile
@@ -9,10 +9,10 @@ WWW=		http://www.jgroups.org/
 
 LICENSE=	LGPL21
 
+USES=		java:ant
+
 OPTIONS_DEFINE=	DOCS
 
-USE_JAVA=	yes
-USE_ANT=	yes
 ALL_TARGET=	jar
 NO_ARCH=	yes
 
diff --git a/net/jicmp/Makefile b/net/jicmp/Makefile
index 6e4ce01fdd20..b51ed04ad18b 100644
--- a/net/jicmp/Makefile
+++ b/net/jicmp/Makefile
@@ -9,14 +9,13 @@ WWW=		https://www.opennms.org/index.php/Jicmp
 
 WRKSRC=		${WRKDIR}/jicmp-${PORTVERSION}
 
-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
 
 pre-everything::
diff --git a/net/jicmp6/Makefile b/net/jicmp6/Makefile
index 05f2d070d79f..0b711e78635f 100644
--- a/net/jicmp6/Makefile
+++ b/net/jicmp6/Makefile
@@ -7,11 +7,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java native interface (JNI) to ICMPv6
 WWW=		https://www.opennms.org/wiki/Jicmp
 
-USES=		libtool
-USE_JAVA=	yes
+USES=		java libtool
 JAVA_VENDOR=	openjdk
-JAVA_BUILD=	yes
-JAVA_RUN=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 
diff --git a/net/jrdesktop/Makefile b/net/jrdesktop/Makefile
index 035b8e2de2c4..930658129766 100644
--- a/net/jrdesktop/Makefile
+++ b/net/jrdesktop/Makefile
@@ -11,7 +11,8 @@ WWW=		https://jrdesktop.sourceforge.net/
 
 LICENSE=	GPLv3
 
-USE_JAVA=	yes
+USES=		java
+
 NO_BUILD=	yes
 
 SUB_FILES=	jrdesktop
diff --git a/net/jsch/Makefile b/net/jsch/Makefile
index c6d9a50d2b35..933350ca51e3 100644
--- a/net/jsch/Makefile
+++ b/net/jsch/Makefile
@@ -9,10 +9,8 @@ WWW=		http://www.jcraft.com/jsch
 
 LICENSE=	BSD3CLAUSE
 
-USES=		cpe zip
+USES=		cpe java:ant zip
 CPE_VENDOR=	jcraft
-USE_JAVA=	yes
-USE_ANT=	yes
 
 PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
diff --git a/net/kafka/Makefile b/net/kafka/Makefile
index 75f8cfea6c29..65dadfbca678 100644
--- a/net/kafka/Makefile
+++ b/net/kafka/Makefile
@@ -13,12 +13,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		cpe shebangfix tar:tgz
+USES=		cpe java shebangfix tar:tgz
 CPE_VENDOR=	apache
-
-USE_JAVA=	yes
 JAVA_VERSION=	17+
-JAVA_RUN=	jre
 
 USE_RC_SUBR=	kafka kafka_connect
 
diff --git a/net/keycloak/Makefile b/net/keycloak/Makefile
index e5e5e22f3f49..67aacc9f8d85 100644
--- a/net/keycloak/Makefile
+++ b/net/keycloak/Makefile
@@ -10,15 +10,11 @@ WWW=		https://www.keycloak.org/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		cpe shebangfix
-
+USES=		cpe java shebangfix
 CPE_VENDOR=	redhat
-
-USE_JAVA=	yes
 JAVA_VERSION=	21+
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
-JAVA_RUN=	yes
 
 USE_RC_SUBR=	keycloak
 
diff --git a/net/ldapbrowser/Makefile b/net/ldapbrowser/Makefile
index cfa236894ec0..9145bdaf3346 100644
--- a/net/ldapbrowser/Makefile
+++ b/net/ldapbrowser/Makefile
@@ -19,7 +19,8 @@ LICENSE_NAME=	ldapbrowser
 LICENSE_TEXT=	No reply from author regarding redistribution licensing
 LICENSE_PERMS=	auto-accept
 
-USE_JAVA=	yes
+USES=		java
+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 REINPLACE_ARGS=	-i ''
diff --git a/net/seda/Makefile b/net/seda/Makefile
index c0e105e823bc..1b1a6aa082f9 100644
--- a/net/seda/Makefile
+++ b/net/seda/Makefile
@@ -9,8 +9,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Architecture for Highly Concurrent Server Applications
 WWW=		http://www.eecs.harvard.edu/~mdw/proj/seda/
 
-USE_JAVA=	yes
-USE_ANT=	yes
+USES=		java:ant
+
 ALL_TARGET=	dist
 NO_ARCH=	yes
 
@@ -25,11 +25,7 @@ PORTDOCS=	*
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME:tl}.jar
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+=	javadoc
-.endif
+DOCS_ALL_TARGET=	javadoc
 
 pre-build:
 # use our build.xml
@@ -40,7 +36,8 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/lib/${PORTNAME:tl}.jar \
 		${STAGEDIR}${JAVAJARDIR}/
-# docs
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in gnutella-graph.gif index.html nbio.html profile.gif sandstorm.html sandstorm.jpg
 	${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/net/serviio/Makefile b/net/serviio/Makefile
index 3c6706ed7b24..282d1d3303ac 100644
--- a/net/serviio/Makefile
+++ b/net/serviio/Makefile
@@ -17,11 +17,11 @@ LICENSE_PERMS=	auto-accept
 
 RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 
-NO_BUILD=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	21
-USES=		dos2unix
+USES=		dos2unix java
 DOS2UNIX_GLOB=	derby.properties
+JAVA_VERSION=	21
+
+NO_BUILD=	yes
 
 PKGMESSAGE=	${WRKSRC}/pkg-message
 SUB_FILES+=	pkg-message serviiod
diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile
index 88976ade6388..1ee9da1c24fd 100644
--- a/net/spread-j/Makefile
+++ b/net/spread-j/Makefile
@@ -15,7 +15,8 @@ BUILD_DEPENDS=	${ANT}:devel/apache-ant
 BROKEN_armv6=		fails to package: java/docs/*.html: No such file or directory
 BROKEN_armv7=		fails to package: java/docs/*.html: No such file or directory
 
-USE_JAVA=	YES
+USES=		java
+
 PKGMESSAGE=	${WRKSRC}/../license.txt
 
 ANT?=		${LOCALBASE}/bin/ant
diff --git a/net/tigervnc-viewer-java/Makefile b/net/tigervnc-viewer-java/Makefile
index 0a9ae19cc674..b16497bf803c 100644
--- a/net/tigervnc-viewer-java/Makefile
+++ b/net/tigervnc-viewer-java/Makefile
@@ -4,10 +4,8 @@ CATEGORIES=	net java
 COMMENT=	TigerVNC Viewer
 WWW=		https://tigervnc.org/
 
-USES+=		jpeg xorg
+USES+=		java jpeg xorg
 USE_XORG+=	pixman
-USE_JAVA=	yes
-JAVA_VERSION=	8+
 
 NO_ARCH=	yes
 
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index d6ba0bcfa77f..fa29df9c9d9d 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -40,8 +40,7 @@ MAKE_ARGS=	CC=${CC}
 OPTIONS_DEFINE=	JVNC_VIEWER
 OPTIONS_SUB=	yes
 JVNC_VIEWER_DESC=	Install Java-based vnc viewer
-JVNC_VIEWER_USE=	JAVA=yes
-JVNC_VIEWER_VARS=	JAVA_RUN=yes
+JVNC_VIEWER_USES=	java
 
 .ifdef(TIGHTVNC_BASE)
 PREFIX=${TIGHTVNC_BASE}
diff --git a/net/toonel/Makefile b/net/toonel/Makefile
index 4e316444423e..17fadf660bcb 100644
--- a/net/toonel/Makefile
+++ b/net/toonel/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tunneling with data compression
 WWW=		https://toonel.net
 
+USES=		java
+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-USE_JAVA=	yes
-
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	JARNAME=${DISTNAME}${EXTRACT_SUFX}