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

41 files changed, 73 insertions, 97 deletions

diff --git a/textproc/apache-commons-csv/Makefile b/textproc/apache-commons-csv/Makefile
index 1a8013528129..dcaf450f87bb 100644
--- a/textproc/apache-commons-csv/Makefile
+++ b/textproc/apache-commons-csv/Makefile
@@ -14,10 +14,11 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	${JAR_DEPENDS}
 RUN_DEPENDS=	${JAR_DEPENDS}
 
+USES=		java
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 NO_ARCH=	yes
-USE_JAVA=	yes
 
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES=	${JAVAJARDIR}/${JARFILE}
diff --git a/textproc/apache-commons-digester/Makefile b/textproc/apache-commons-digester/Makefile
index 39773c81790b..be8c39a498bc 100644
--- a/textproc/apache-commons-digester/Makefile
+++ b/textproc/apache-commons-digester/Makefile
@@ -16,10 +16,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 BUILD_DEPENDS=	${JAR_DEPENDS}
 RUN_DEPENDS=	${JAR_DEPENDS}
 
+USES=		java
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 NO_ARCH=	yes
-USE_JAVA=	yes
 
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES=	${JAVAJARDIR}/${JARFILE}
diff --git a/textproc/apache-poi/Makefile b/textproc/apache-poi/Makefile
index e2da304a40f3..9d012adda484 100644
--- a/textproc/apache-poi/Makefile
+++ b/textproc/apache-poi/Makefile
@@ -31,10 +31,9 @@ RUN_DEPENDS=	apache-log4j2>0:devel/apache-log4j2	\
 		apache-commons-codec>0:java/apache-commons-codec	\
 		apache-commons-collections4>0:java/apache-commons-collections4
 
-USES=		cpe
+USES=		cpe java
 CPE_VENDOR=	apache
 
-USE_JAVA=	yes
 NO_BUILD=	yes
 NO_EXTRACT=	yes
 NO_ARCH=	yes
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 41035b83c920..5112c243eecf 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -14,12 +14,10 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		cpe tar:tgz
+USES=		cpe java tar:tgz
 CPE_VENDOR=	apache
 CPE_PRODUCT=	solr
-USE_JAVA=	yes
 JAVA_VERSION=	11+
-JAVA_RUN=	yes
 USE_RC_SUBR=	solr
 
 NO_ARCH=	yes
diff --git a/textproc/apache-xmlbeans/Makefile b/textproc/apache-xmlbeans/Makefile
index faa77376d9a2..38077588039d 100644
--- a/textproc/apache-xmlbeans/Makefile
+++ b/textproc/apache-xmlbeans/Makefile
@@ -12,9 +12,7 @@ WWW=		https://xmlbeans.apache.org/
 
 LICENSE=	APACHE20
 
-USES=		cpe tar:tgz
-USE_JAVA=	yes
-JAVA_VERSION=	8+
+USES=		cpe java tar:tgz
 DATE_REL=	20220819
 CPE_VENDOR=	apache
 
diff --git a/textproc/denature/Makefile b/textproc/denature/Makefile
index b112f297e180..94022e31f11e 100644
--- a/textproc/denature/Makefile
+++ b/textproc/denature/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
 		p5-CSS-Tiny>=0:textproc/p5-CSS-Tiny \
 		fop:textproc/fop
 
-USES=		perl5
-USE_JAVA=	yes
+USES=		java perl5
 POD2MAN?=	pod2man
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/textproc/dom4j/Makefile b/textproc/dom4j/Makefile
index 26e90c3b6084..8871112cb1c7 100644
--- a/textproc/dom4j/Makefile
+++ b/textproc/dom4j/Makefile
@@ -8,9 +8,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source XML framework for Java
 WWW=		https://www.dom4j.org/
 
-USES=		cpe
+USES=		cpe java
 CPE_VENDOR=	${PORTNAME}_project
-USE_JAVA=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/textproc/dtd2relax/Makefile b/textproc/dtd2relax/Makefile
index 8d4730e3fd19..4accdea49268 100644
--- a/textproc/dtd2relax/Makefile
+++ b/textproc/dtd2relax/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DTD to RELAX converter for Java
 WWW=		https://www.horobi.com/Projects/RELAX/Archive/DTD2RELAX.html
 
-USES=		zip
-USE_JAVA=	yes
+USES=		java zip
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/textproc/elasticsearch7/Makefile b/textproc/elasticsearch7/Makefile
index 660821833290..d70bafb3a5a5 100644
--- a/textproc/elasticsearch7/Makefile
+++ b/textproc/elasticsearch7/Makefile
@@ -15,8 +15,7 @@ BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash>0:shells/bash \
 		jna>0:devel/jna
 
-USES=		cpe shebangfix
-USE_JAVA=	yes
+USES=		cpe java shebangfix
 JAVA_VERSION=	11+
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/textproc/elasticsearch8/Makefile b/textproc/elasticsearch8/Makefile
index 483c20383718..af3c8e3f6b95 100644
--- a/textproc/elasticsearch8/Makefile
+++ b/textproc/elasticsearch8/Makefile
@@ -15,8 +15,7 @@ BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash:shells/bash \
 		jna>0:devel/jna
 
-USES=		cpe shebangfix
-USE_JAVA=	yes
+USES=		cpe java shebangfix
 JAVA_VERSION=	17+
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 1bdb884373af..756d219b5d79 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -17,8 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
-USE_JAVA=	yes
-USE_ANT=	yes
+USES=		java:ant
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 PORTDOCS=	*
diff --git a/textproc/jalingo/Makefile b/textproc/jalingo/Makefile
index dd5802822b94..6a878bd0165e 100644
--- a/textproc/jalingo/Makefile
+++ b/textproc/jalingo/Makefile
@@ -11,9 +11,7 @@ WWW=		https://jalingo.sourceforge.net/
 
 LICENSE=	GPLv2
 
-USES=		7z
-USE_ANT=	yes
-USE_JAVA=	yes
+USES=		7z java:ant
 
 ALL_TARGET=	dist
 
diff --git a/textproc/jarnal/Makefile b/textproc/jarnal/Makefile
index 41c024be0385..4b159a32fbbb 100644
--- a/textproc/jarnal/Makefile
+++ b/textproc/jarnal/Makefile
@@ -11,8 +11,7 @@ WWW=		http://www.dklevine.com/general/software/tc1000/jarnal.htm
 
 LICENSE=	GPLv2
 
-USES=		zip
-USE_JAVA=	yes
+USES=		java zip
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile
index f191218ed769..8de0107d252b 100644
--- a/textproc/jaxup/Makefile
+++ b/textproc/jaxup/Makefile
@@ -16,16 +16,14 @@ JAR_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom \
 		${JAVALIBDIR}/jaxen-full.jar:java/jaxen \
 		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 
-USES=		zip
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USES=		java:ant zip
 
-USE_JAVA=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
-USE_ANT=	yes
 ALL_TARGET=	jar
 DOCS_ALL_TARGET=docs
 
diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile
index 52697871fc56..707c66ed8e2f 100644
--- a/textproc/jdictionary/Makefile
+++ b/textproc/jdictionary/Makefile
@@ -8,9 +8,8 @@ MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Platform independent, plugin based dictionary
 WWW=		http://jdictionary.info/
 
-USE_JAVA=	yes
+USES=		java zip
 
-USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
diff --git a/textproc/jdictionary/Makefile.plugin b/textproc/jdictionary/Makefile.plugin
index 954986fde06f..34086584b488 100644
--- a/textproc/jdictionary/Makefile.plugin
+++ b/textproc/jdictionary/Makefile.plugin
@@ -5,8 +5,8 @@ COMMENT?=	JDictionary plugin master port
 
 RUN_DEPENDS+=	jdictionary:textproc/jdictionary
 
-# WARNING: USE_JAVA is set to be able to use JAVASHAREDIR.
-USE_JAVA=	yes
+# WARNING: USES=java is set to be able to use JAVASHAREDIR.
+USES=	java
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	#
diff --git a/textproc/jing/Makefile b/textproc/jing/Makefile
index b0356a5969a1..b70e446dd5b9 100644
--- a/textproc/jing/Makefile
+++ b/textproc/jing/Makefile
@@ -13,10 +13,7 @@ LICENSE_FILE=	${WRKSRC}/doc/copying.html
 BROKEN_armv6=		fails to build: modbuild.xml: Java returned: 1
 BROKEN_armv7=		fails to build: modbuild.xml: Java returned: 1
 
-USES=		zip
-
-USE_JAVA=	yes
-JAVA_RUN=	yes
+USES=		java zip
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 8505be37e002..39948ec304c6 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -43,7 +43,7 @@ HUNSPELL_CONFIGURE_ENABLE=	hunspell
 HUNSPELL_LIB_DEPENDS=		libhunspell-1.7.so:textproc/hunspell
 
 JAVA_CONFIGURE_ENABLE=		java-bindings
-JAVA_USE=			JAVA
+JAVA_USES=			java
 JAVA_CPPFLAGS=			-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 
 PERL_CONFIGURE_ENABLE=		perl-bindings
diff --git a/textproc/lucene/Makefile b/textproc/lucene/Makefile
index 4e5c24752f35..bc39c2c6fc95 100644
--- a/textproc/lucene/Makefile
+++ b/textproc/lucene/Makefile
@@ -11,8 +11,8 @@ WWW=		https://lucene.apache.org/core/
 
 LICENSE=	APACHE20
 
-USES=		cpe tar:tgz
-USE_JAVA=	yes
+USES=		cpe java tar:tgz
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/textproc/lucene5/Makefile b/textproc/lucene5/Makefile
index c2c089bc05db..328ef7964b83 100644
--- a/textproc/lucene5/Makefile
+++ b/textproc/lucene5/Makefile
@@ -13,8 +13,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS=	lucene-[0-9].*
 
-USES=		cpe tar:tgz
-USE_JAVA=	yes
+USES=		cpe java tar:tgz
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/textproc/nux/Makefile b/textproc/nux/Makefile
index 9a377cd110fe..35af139e9ecb 100644
--- a/textproc/nux/Makefile
+++ b/textproc/nux/Makefile
@@ -12,7 +12,8 @@ WWW=		https://dst.lbl.gov/ACSSoftware/nux/
 RUN_DEPENDS=	${JAVALIBDIR}/xom.jar:textproc/xom \
 		${JAVALIBDIR}/saxon9.jar:textproc/saxon-devel
 
-USE_JAVA=	yes
+USES=		java
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile
index 63cb24113d92..29e6984dda6b 100644
--- a/textproc/opensearch/Makefile
+++ b/textproc/opensearch/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	bash>0:shells/bash \
 
 CONFLICTS?=	opensearch13 opensearch210 opensearch213
 
-USES=		cpe shebangfix
-USE_JAVA=	yes
+USES=		cpe java shebangfix
 JAVA_VERSION=	17+
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/textproc/opensearch13/Makefile b/textproc/opensearch13/Makefile
index eba7a3d9547c..0964e5f49201 100644
--- a/textproc/opensearch13/Makefile
+++ b/textproc/opensearch13/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	bash>0:shells/bash \
 
 CONFLICTS=	opensearch
 
-USES=		cpe shebangfix
-USE_JAVA=	yes
+USES=		cpe java shebangfix
 JAVA_VERSION=	11+
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index bb758effda0d..9cf6615dd12b 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -13,8 +13,7 @@ WWW=		https://ctan.org/tex-archive/support/ppower4/
 
 LICENSE=	GPLv2 # version not really specified
 
-USES=		tex zip
-USE_JAVA=	yes
+USES=		java tex zip
 USE_TEX=	latex
 
 NO_ARCH=	yes
diff --git a/textproc/qrcodegen/Makefile b/textproc/qrcodegen/Makefile
index bdd56b525047..01ee8de5482c 100644
--- a/textproc/qrcodegen/Makefile
+++ b/textproc/qrcodegen/Makefile
@@ -12,10 +12,10 @@ WWW=		https://sites.google.com/site/qrcodeforwn/home/qr-code-generator-for-wirel
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		java zip:infozip
+
 NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		zip:infozip
-USE_JAVA=	yes
 SUB_FILES=	qrcodegen
 
 INSTALLFILES=	FAQ.txt Installation.txt NOTICE QRCodeGen.jar Version.html
diff --git a/textproc/resume/Makefile b/textproc/resume/Makefile
index 72145b88d047..637e25965da4 100644
--- a/textproc/resume/Makefile
+++ b/textproc/resume/Makefile
@@ -10,8 +10,8 @@ WWW=		https://xmlresume.sourceforge.net/
 
 LICENSE=	MIT
 
-USES=		tar:tgz
-USE_JAVA=	yes
+USES=		java tar:tgz
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index 2ac79859a678..45a49d00c328 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -13,13 +13,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java
 WWW=		https://saxon.sourceforge.net/
 
+USES=		java zip
+
 OPTIONS_DEFINE=	JDOM DOM4J XOM DOCS
 JDOM_DESC=	Jdom support
 DOM4J_DESC=	dom4j support
 XOM_DESC=	XOM support
 
-USES=		zip
-USE_JAVA=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile
index 0da82ba4201d..7b62afcc9195 100644
--- a/textproc/saxon-he/Makefile
+++ b/textproc/saxon-he/Makefile
@@ -11,8 +11,8 @@ WWW=		https://www.saxonica.com/
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/notices/LICENSE.txt
 
-USES=		zip
-USE_JAVA=	yes
+USES=		java zip
+
 NO_WRKSUBDIR=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index 42beec985604..2f7766c71690 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -11,8 +11,8 @@ WWW=		https://saxon.sourceforge.net/
 
 LICENSE=	MPL10
 
-USES=		zip
-USE_JAVA=	yes
+USES=		java zip
+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/textproc/tagsoup/Makefile b/textproc/tagsoup/Makefile
index 482d3fa83f5d..43788c4693e0 100644
--- a/textproc/tagsoup/Makefile
+++ b/textproc/tagsoup/Makefile
@@ -11,8 +11,7 @@ WWW=		http://vrici.lojban.org/~cowan/XML/tagsoup
 
 LICENSE=	APACHE20
 
-USE_JAVA=	yes
-JAVA_RUN=	jre
+USES=		java
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/textproc/trang/Makefile b/textproc/trang/Makefile
index b5f5477f38a5..ab03c7fa7f59 100644
--- a/textproc/trang/Makefile
+++ b/textproc/trang/Makefile
@@ -13,10 +13,7 @@ LICENSE_FILE=	${WRKSRC}/copying.txt
 BROKEN_armv6=		fails to build: modbuild.xml: Java returned: 1
 BROKEN_armv7=		fails to build: modbuild.xml: Java returned: 1
 
-USES=		zip
-
-USE_JAVA=	yes
-JAVA_RUN=	yes
+USES=		java zip
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/textproc/weka/Makefile b/textproc/weka/Makefile
index 9c34f65cef3d..ef46c7be498a 100644
--- a/textproc/weka/Makefile
+++ b/textproc/weka/Makefile
@@ -11,8 +11,8 @@ LICENSE=	GPLv2
 
 PORTSCOUT=	limitw:1,even	# Second component is even for stable versions.
 
-USES=		zip
-USE_JAVA=	yes
+USES=		java zip
+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index c0f5009493cf..8bd4fa310db2 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -14,10 +14,10 @@ RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		cpe
+USES=		cpe java
 CPE_PRODUCT=	xalan-java
 CPE_VENDOR=	apache
-USE_JAVA=	yes
+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index 3cc183d2d6b4..c0d25635e8cd 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -10,7 +10,8 @@ WWW=		https://xerces.apache.org/xerces2-j/
 
 LICENSE=	APACHE20
 
-USE_JAVA=	yes
+USES=		java
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile
index a3717a57296c..d6700437bdec 100644
--- a/textproc/xincluder/Makefile
+++ b/textproc/xincluder/Makefile
@@ -17,8 +17,8 @@ BUILD_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom \
 RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom \
 		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 
-USE_JAVA=	yes
-USE_ANT=	yes
+USES=		java:ant
+
 ALL_TARGET=	clean jar
 NO_ARCH=	yes
 
diff --git a/textproc/xml-commons/Makefile b/textproc/xml-commons/Makefile
index a4558b98eff4..8313a5d6115c 100644
--- a/textproc/xml-commons/Makefile
+++ b/textproc/xml-commons/Makefile
@@ -9,8 +9,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provides common XML code for Apache projects
 WWW=		https://xerces.apache.org/xml-commons/
 
-USE_JAVA=	yes
-JAVA_RUN=	yes
+USES=		java
+
 NO_ARCH=	yes
 NO_BUILD=	yes
 
diff --git a/textproc/xmlenc/Makefile b/textproc/xmlenc/Makefile
index 911724c71c5d..b6be914af270 100644
--- a/textproc/xmlenc/Makefile
+++ b/textproc/xmlenc/Makefile
@@ -8,10 +8,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Light-weight XML encoding library for Java
 WWW=		https://xmlenc.sourceforge.net/
 
-USES=		tar:tgz
-USE_JAVA=	yes
+USES=		java:ant tar:tgz
 JAVA_VERSION=	8
-USE_ANT=	yes
+
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/textproc/xom/Makefile b/textproc/xom/Makefile
index d81d25e4d778..4108c2b584da 100644
--- a/textproc/xom/Makefile
+++ b/textproc/xom/Makefile
@@ -11,7 +11,8 @@ WWW=		http://www.xom.nu/
 RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j \
 		${JAVALIBDIR}/xalan.jar:textproc/xalan-j
 
-USE_JAVA=	yes
+USES=		java
+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/XOM
 
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index f52e11864f7a..42a0c8abc68a 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -9,10 +9,9 @@ MAINTAINER=	mike@vee.net
 COMMENT=	XML parser written in Java
 WWW=		http://www.jclark.com/xml/xp/index.html
 
-USE_JAVA=	yes
+USES=		java zip
 
 NO_BUILD=	yes
-USES=		zip
 
 PORTDOCS=	api copying.txt index.html
 
diff --git a/textproc/xstream/Makefile b/textproc/xstream/Makefile
index e6d1ed5d38de..62d63fdd565d 100644
--- a/textproc/xstream/Makefile
+++ b/textproc/xstream/Makefile
@@ -13,9 +13,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		cpe zip
+USES=		cpe java zip
 CPE_VENDOR=	${PORTNAME}_project
-USE_JAVA=	yes
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index b27aeab3f992..895d78dd1b9a 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -24,12 +24,17 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 OPTIONS_DEFINE=	PHP PYTHON RUBY JAVA DOCS DOXYGEN
 OPTIONS_SUB=	yes
 
-DOXYGEN_BUILD_DEPENDS+=	doxygen:devel/doxygen
 DOXYGEN_IMPLIES=	DOCS
+DOXYGEN_BUILD_DEPENDS+=	doxygen:devel/doxygen
+JAVA_CATEGORIES=	java
+JAVA_USES=		java
+JAVA_CMAKE_BOOL=	WITH_JAVA
+JAVA_CMAKE_ON=	-DJAVA_LIBDIR:PATH=${JAVALIBDIR}
+JAVA_CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
+JAVA_VARS=		WITH_SWIG=yes
 PHP_CMAKE_BOOL=		WITH_PHP5
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
 RUBY_CMAKE_BOOL=	WITH_RUBY
-JAVA_CMAKE_BOOL=	WITH_JAVA
 
 # Both install include/xqc.h
 CONFLICTS=	xqilla
@@ -76,14 +81,6 @@ USES+=	ruby
 WITH_SWIG=	yes
 .endif
 
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-CONFIGURE_ENV+=	JAVA_HOME=${JAVA_HOME}
-CATEGORIES+=	java
-WITH_SWIG=	yes
-CMAKE_ARGS+=	-DJAVA_LIBDIR:PATH=${JAVALIBDIR}
-.endif
-
 .if defined(WITH_SWIG)
 BUILD_DEPENDS+=	swig:devel/swig
 .endif
@@ -93,14 +90,16 @@ post-patch:
 		-e 's|FreeBSD|${OPSYS}|g' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/cmake_modules/FindPHP5.cmake
-.if !${PORT_OPTIONS:MDOCS}
+
+post-patch-DOCS-on:
 	${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(doc)/d' \
 		${WRKSRC}/CMakeLists.txt
-.endif
 
 post-install:
 	${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R}
-.if ${PORT_OPTIONS:MDOCS} && !${PORT_OPTIONS:MDOXYGEN}
+
+post-install-DOCS-on:
+.if !${PORT_OPTIONS:MDOXYGEN}
 	cd ${STAGEDIR}${DOCSDIR} && ${RMDIR} c/html code/html code cxx/html zorba/html zorba/xqdoc zorba
 .endif