diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,25 @@ 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= use USES=java and JAVA_VERSION= + 20241231: AUTHOR: bofh@FreeBSD.org diff --git a/Mk/bsd.java.mk b/Mk/Uses/java.mk rename from Mk/bsd.java.mk rename to Mk/Uses/java.mk --- a/Mk/bsd.java.mk +++ b/Mk/Uses/java.mk @@ -1,51 +1,42 @@ -#-*- 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[+] -# 20[+] 21[+] 22[+] 23[+]) +# port. An optional "+" allows you to specify a range of +# versions. (allowed values: 8[+] 11[+] 17[+] 18[+] 19[+] +# 20[+] 21[+] 22[+] 23[+]) # -# JAVA_OS List of space-separated suitable JDK port operating systems -# for the port. (allowed values: native linux) +# JAVA_OS List of space-separated suitable JDK port operating systems +# for the port. (allowed values: native linux) # # JAVA_VENDOR List of space-separated suitable JDK port vendors for the -# port. (allowed values: openjdk oracle) -# -# 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. +# port. (allowed values: openjdk oracle) # #------------------------------------------------------------------------------- # Variables defined for the port: @@ -125,12 +116,62 @@ # Stage 4: Add any dependencies if necessary # Stage 5: Define all settings for the port to use # +# MAINTAINER: java@FreeBSD.org + +.if !defined(_INCLUDE_USES_JAVA_MK) + +_INCLUDE_USES_JAVA_MK= yes -. if defined(USE_JAVA) +_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 !defined(JAVA_VERSION) && empty(USE_JAVA:C/[0-9]*[\.]*[0-9]*[+]*//) -JAVA_VERSION=${USE_JAVA} +. 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 @@ # 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 @@ ${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,46 +401,36 @@ # 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 ALL_TARGET?= . if !target(do-build) do-build: - @(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ - ${ANT} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ + ${ANT} ${MAKE_ARGS} ${ALL_TARGET}) . endif . if !target(do-test) && defined(TEST_TARGET) TEST_DEPENDS+= ${DEPEND_JAVA} TEST_DEPENDS+= ${ANT}:devel/apache-ant do-test: - @(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ - ${ANT} ${MAKE_ARGS} ${TEST_TARGET}) + @(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ + ${ANT} ${MAKE_ARGS} ${TEST_TARGET}) . endif . endif @@ -422,13 +442,11 @@ # 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. @@ -460,9 +478,9 @@ @${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:" @@ -483,5 +501,4 @@ @${ECHO_CMD} "JAVAC= ${JAVAC}" @${ECHO_CMD} "JAVA_CLASSES= ${JAVA_CLASSES}" -. endif .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -357,9 +357,6 @@ ## # 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 @@ .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 @@ .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 diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -213,7 +213,8 @@ 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_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}) diff --git a/archivers/apache-commons-compress/Makefile b/archivers/apache-commons-compress/Makefile --- a/archivers/apache-commons-compress/Makefile +++ b/archivers/apache-commons-compress/Makefile @@ -11,8 +11,7 @@ LICENSE= APACHE20 -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes diff --git a/archivers/javatar/Makefile b/archivers/javatar/Makefile --- a/archivers/javatar/Makefile +++ b/archivers/javatar/Makefile @@ -11,7 +11,7 @@ LICENSE= PD LICENSE_FILE= ${WRKSRC}/doc/LICENSE -USE_JAVA= yes +USES= java NO_BUILD= yes diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile --- a/archivers/snappy-java/Makefile +++ b/archivers/snappy-java/Makefile @@ -25,7 +25,7 @@ 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 @@ 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 diff --git a/astro/gpsprune/Makefile b/astro/gpsprune/Makefile --- a/astro/gpsprune/Makefile +++ b/astro/gpsprune/Makefile @@ -16,7 +16,7 @@ NO_BUILD= yes NO_ARCH= yes -USE_JAVA= yes +USES= java JAVA_VERSION= 11+ SUB_FILES= gpsprune.sh diff --git a/astro/josm/Makefile b/astro/josm/Makefile --- a/astro/josm/Makefile +++ b/astro/josm/Makefile @@ -15,8 +15,7 @@ NO_WRKSUBDIR= yes -USES= zip:infozip -USE_JAVA= yes +USES= java zip:infozip JAVA_VERSION= 11+ NO_BUILD= yes diff --git a/astro/mkgmap-splitter/Makefile b/astro/mkgmap-splitter/Makefile --- a/astro/mkgmap-splitter/Makefile +++ b/astro/mkgmap-splitter/Makefile @@ -10,8 +10,7 @@ LICENSE= GPLv3 -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java NO_BUILD= yes NO_ARCH= yes diff --git a/astro/mkgmap/Makefile b/astro/mkgmap/Makefile --- a/astro/mkgmap/Makefile +++ b/astro/mkgmap/Makefile @@ -10,8 +10,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENCE -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java NO_BUILD= yes NO_ARCH= yes diff --git a/astro/osmosis/Makefile b/astro/osmosis/Makefile --- a/astro/osmosis/Makefile +++ b/astro/osmosis/Makefile @@ -10,8 +10,7 @@ LICENSE= PD LICENSE_FILE= ${WRKSRC}/copying.txt -USES= tar -USE_JAVA= yes +USES= java tar JAVA_VERSION= 17+ NO_BUILD= yes NO_ARCH= yes diff --git a/audio/atunes/Makefile b/audio/atunes/Makefile --- a/audio/atunes/Makefile +++ b/audio/atunes/Makefile @@ -11,8 +11,8 @@ LICENSE= GPLv2 +USES= java NO_BUILD= yes -USE_JAVA= yes SUB_FILES= atunes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/audio/jid3lib/Makefile b/audio/jid3lib/Makefile --- a/audio/jid3lib/Makefile +++ b/audio/jid3lib/Makefile @@ -8,8 +8,7 @@ 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 diff --git a/audio/musiccontrol/Makefile b/audio/musiccontrol/Makefile --- a/audio/musiccontrol/Makefile +++ b/audio/musiccontrol/Makefile @@ -15,7 +15,7 @@ ${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 diff --git a/audio/nyquist/Makefile b/audio/nyquist/Makefile --- a/audio/nyquist/Makefile +++ b/audio/nyquist/Makefile @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -USES= cmake zip +USES= cmake java zip USE_CSTD= c99 USE_CXXSTD= c++14 @@ -19,8 +19,6 @@ 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 diff --git a/benchmarks/linux-vdbench/Makefile b/benchmarks/linux-vdbench/Makefile --- a/benchmarks/linux-vdbench/Makefile +++ b/benchmarks/linux-vdbench/Makefile @@ -17,8 +17,7 @@ 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 diff --git a/benchmarks/scimark2/Makefile b/benchmarks/scimark2/Makefile --- a/benchmarks/scimark2/Makefile +++ b/benchmarks/scimark2/Makefile @@ -12,8 +12,7 @@ LICENSE= PD -USES= zip -USE_JAVA= yes +USES= java zip NEED_JAVAC= yes JAVAC_OPTS?= -O NO_ARCH= yes diff --git a/benchmarks/typometer/Makefile b/benchmarks/typometer/Makefile --- a/benchmarks/typometer/Makefile +++ b/benchmarks/typometer/Makefile @@ -11,9 +11,7 @@ LICENSE= APACHE20 -USES= zip -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java zip NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/biology/artemis/Makefile b/biology/artemis/Makefile --- a/biology/artemis/Makefile +++ b/biology/artemis/Makefile @@ -13,11 +13,10 @@ 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 diff --git a/biology/bbmap/Makefile b/biology/bbmap/Makefile --- a/biology/bbmap/Makefile +++ b/biology/bbmap/Makefile @@ -15,8 +15,7 @@ pigz:archivers/pigz \ pbzip2:archivers/pbzip2 -USES= shebangfix -USE_JAVA= yes +USES= java shebangfix SHEBANG_FILES= ${WRKSRC}/*.sh diff --git a/biology/canu/Makefile b/biology/canu/Makefile --- a/biology/canu/Makefile +++ b/biology/canu/Makefile @@ -18,10 +18,8 @@ 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. diff --git a/biology/cytoscape/Makefile b/biology/cytoscape/Makefile --- a/biology/cytoscape/Makefile +++ b/biology/cytoscape/Makefile @@ -20,9 +20,8 @@ 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 \ diff --git a/biology/ddocent/Makefile b/biology/ddocent/Makefile --- a/biology/ddocent/Makefile +++ b/biology/ddocent/Makefile @@ -32,8 +32,7 @@ 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 diff --git a/biology/erminej/Makefile b/biology/erminej/Makefile --- a/biology/erminej/Makefile +++ b/biology/erminej/Makefile @@ -11,8 +11,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= zip -USE_JAVA= yes +USES= java zip WRKSRC= ${WRKDIR}/ermineJ-${DISTVERSION} NO_BUILD= yes diff --git a/biology/fastqc/Makefile b/biology/fastqc/Makefile --- a/biology/fastqc/Makefile +++ b/biology/fastqc/Makefile @@ -11,8 +11,7 @@ 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 diff --git a/biology/figtree/Makefile b/biology/figtree/Makefile --- a/biology/figtree/Makefile +++ b/biology/figtree/Makefile @@ -10,8 +10,7 @@ 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 diff --git a/biology/gatk/Makefile b/biology/gatk/Makefile --- a/biology/gatk/Makefile +++ b/biology/gatk/Makefile @@ -16,9 +16,7 @@ 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 diff --git a/biology/gkl/Makefile b/biology/gkl/Makefile --- a/biology/gkl/Makefile +++ b/biology/gkl/Makefile @@ -13,8 +13,7 @@ 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 diff --git a/biology/igv/Makefile b/biology/igv/Makefile --- a/biology/igv/Makefile +++ b/biology/igv/Makefile @@ -19,8 +19,7 @@ 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 diff --git a/biology/jalview/Makefile b/biology/jalview/Makefile --- a/biology/jalview/Makefile +++ b/biology/jalview/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= gradle761:devel/gradle761 -USE_JAVA= yes +USES= java JAVA_VERSION= 11 WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/biology/picard-tools/Makefile b/biology/picard-tools/Makefile --- a/biology/picard-tools/Makefile +++ b/biology/picard-tools/Makefile @@ -14,8 +14,7 @@ RUN_DEPENDS= samtools:biology/samtools -USE_JAVA= 8+ -JAVA_RUN= yes +USES= java CONFLICTS_INSTALL= picard # bin/picard diff --git a/biology/readseq/Makefile b/biology/readseq/Makefile --- a/biology/readseq/Makefile +++ b/biology/readseq/Makefile @@ -13,7 +13,7 @@ LICENSE= PD -USE_JAVA= yes +USES= java NO_BUILD= yes SUB_FILES= readseq PLIST_FILES= bin/readseq share/java/classes/readseq.jar diff --git a/biology/snpeff/Makefile b/biology/snpeff/Makefile --- a/biology/snpeff/Makefile +++ b/biology/snpeff/Makefile @@ -14,8 +14,7 @@ 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/* diff --git a/biology/sra-tools/Makefile b/biology/sra-tools/Makefile --- a/biology/sra-tools/Makefile +++ b/biology/sra-tools/Makefile @@ -18,10 +18,9 @@ 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+ diff --git a/biology/trimmomatic/Makefile b/biology/trimmomatic/Makefile --- a/biology/trimmomatic/Makefile +++ b/biology/trimmomatic/Makefile @@ -11,10 +11,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= zip -USE_JAVA= yes +USES= java zip -JAVA_RUN= yes NO_BUILD= yes NO_ARCH= yes diff --git a/cad/digital/Makefile b/cad/digital/Makefile --- a/cad/digital/Makefile +++ b/cad/digital/Makefile @@ -12,14 +12,13 @@ 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 diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile --- a/cad/electric-ng/Makefile +++ b/cad/electric-ng/Makefile @@ -18,7 +18,7 @@ EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip -USE_JAVA= yes +USES= java NO_BUILD= yes SUB_LIST+= LIBFILES="${LIBFILES}" \ JARFILE="${JARFILE}" diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile --- a/cad/fidocadj/Makefile +++ b/cad/fidocadj/Makefile @@ -14,6 +14,7 @@ LICENSE= GPLv3 +USES= java DATADIR= ${JAVASHAREDIR}/${PORTNAME} JAVA_VERSION= 11+ @@ -26,8 +27,6 @@ SUB_FILES= ${PORTNAME}.sh SUB_LIST= PORTVERSION=${PORTVERSION} JAVA=${JAVA} -USE_JAVA= yes - OPTIONS_DEFINE= DOCS DOCS_DISTFILES= manual_en.pdf diff --git a/cad/impact/Makefile b/cad/impact/Makefile --- a/cad/impact/Makefile +++ b/cad/impact/Makefile @@ -20,8 +20,7 @@ WRKSRC= ${WRKDIR}/Impact -USES= zip -USE_JAVA= yes +USES= java zip NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/Impact diff --git a/cad/logisim/Makefile b/cad/logisim/Makefile --- a/cad/logisim/Makefile +++ b/cad/logisim/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 +USES= java + NO_BUILD= yes -USE_JAVA= yes -JAVA_RUN= yes PLIST_FILES= ${DATADIR_REL}/${PORTNAME}-generic-${PORTVERSION}${EXTRACT_SUFX} \ bin/${PORTNAME} diff --git a/cad/silice/Makefile b/cad/silice/Makefile --- a/cad/silice/Makefile +++ b/cad/silice/Makefile @@ -13,8 +13,7 @@ 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 diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile --- a/cad/surelog/Makefile +++ b/cad/surelog/Makefile @@ -21,12 +21,9 @@ 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 @@ 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 diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile --- a/cad/sweethome3d/Makefile +++ b/cad/sweethome3d/Makefile @@ -15,10 +15,8 @@ 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 diff --git a/comms/java-simple-serial-connector/Makefile b/comms/java-simple-serial-connector/Makefile --- a/comms/java-simple-serial-connector/Makefile +++ b/comms/java-simple-serial-connector/Makefile @@ -10,12 +10,11 @@ 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 diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile --- a/comms/rxtx/Makefile +++ b/comms/rxtx/Makefile @@ -16,9 +16,8 @@ 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} diff --git a/databases/apache-commons-dbutils/Makefile b/databases/apache-commons-dbutils/Makefile --- a/databases/apache-commons-dbutils/Makefile +++ b/databases/apache-commons-dbutils/Makefile @@ -12,7 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USE_JAVA= yes +USES= java + NO_BUILD= yes NO_ARCH= yes diff --git a/databases/c3p0/Makefile b/databases/c3p0/Makefile --- a/databases/c3p0/Makefile +++ b/databases/c3p0/Makefile @@ -11,9 +11,8 @@ 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 diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile --- a/databases/cassandra3/Makefile +++ b/databases/cassandra3/Makefile @@ -17,9 +17,7 @@ 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 diff --git a/databases/cassandra4/Makefile b/databases/cassandra4/Makefile --- a/databases/cassandra4/Makefile +++ b/databases/cassandra4/Makefile @@ -23,9 +23,7 @@ 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 diff --git a/databases/db18/Makefile b/databases/db18/Makefile --- a/databases/db18/Makefile +++ b/databases/db18/Makefile @@ -60,14 +60,13 @@ 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 diff --git a/databases/db5/Makefile b/databases/db5/Makefile --- a/databases/db5/Makefile +++ b/databases/db5/Makefile @@ -53,7 +53,7 @@ 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" diff --git a/databases/frontbase-jdbc/Makefile b/databases/frontbase-jdbc/Makefile --- a/databases/frontbase-jdbc/Makefile +++ b/databases/frontbase-jdbc/Makefile @@ -10,7 +10,7 @@ COMMENT= The Java JDBC implementation for FrontBase WWW= http://www.frontbase.com/ -USE_JAVA= yes +USES= java NO_BUILD= yes JARFILE= frontbasejdbc.jar diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile --- a/databases/hsqldb/Makefile +++ b/databases/hsqldb/Makefile @@ -9,9 +9,8 @@ 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 diff --git a/databases/jdbc-oracle11g/Makefile b/databases/jdbc-oracle11g/Makefile --- a/databases/jdbc-oracle11g/Makefile +++ b/databases/jdbc-oracle11g/Makefile @@ -21,7 +21,7 @@ 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 diff --git a/databases/jetbrains-datagrip/Makefile b/databases/jetbrains-datagrip/Makefile --- a/databases/jetbrains-datagrip/Makefile +++ b/databases/jetbrains-datagrip/Makefile @@ -23,9 +23,7 @@ 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 diff --git a/databases/jrobin/Makefile b/databases/jrobin/Makefile --- a/databases/jrobin/Makefile +++ b/databases/jrobin/Makefile @@ -9,7 +9,7 @@ COMMENT= Pure Java alternative to RRDTool WWW= http://www.jrobin.org/ -USE_JAVA= yes +USES= java NO_BUILD= yes CLASSES= jrobin diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile --- a/databases/jrrd/Makefile +++ b/databases/jrrd/Makefile @@ -10,14 +10,13 @@ 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 \ diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -92,8 +92,8 @@ .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 diff --git a/databases/liquibase/Makefile b/databases/liquibase/Makefile --- a/databases/liquibase/Makefile +++ b/databases/liquibase/Makefile @@ -9,14 +9,12 @@ 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} diff --git a/databases/metabase/Makefile b/databases/metabase/Makefile --- a/databases/metabase/Makefile +++ b/databases/metabase/Makefile @@ -14,10 +14,7 @@ LICENSE= AGPLv3 -USES= cpe - -USE_JAVA= yes -JAVA_RUN= yes +USES= cpe java USE_RC_SUBR= ${PORTNAME} NO_ARCH= yes diff --git a/databases/mysql-connector-j/Makefile b/databases/mysql-connector-j/Makefile --- a/databases/mysql-connector-j/Makefile +++ b/databases/mysql-connector-j/Makefile @@ -14,9 +14,7 @@ ${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 @@ CONFLICTS_INSTALL= mysql-connector-java51 # share/java/classes/mysql-connector-java.jar -JAVA_VERSION= 8+ EXTRADOCS= CHANGES PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar diff --git a/databases/mysql-connector-java51/Makefile b/databases/mysql-connector-java51/Makefile --- a/databases/mysql-connector-java51/Makefile +++ b/databases/mysql-connector-java51/Makefile @@ -15,14 +15,13 @@ # 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 diff --git a/databases/neo4j/Makefile b/databases/neo4j/Makefile --- a/databases/neo4j/Makefile +++ b/databases/neo4j/Makefile @@ -14,9 +14,8 @@ 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 diff --git a/databases/postgis-jdbc/Makefile b/databases/postgis-jdbc/Makefile --- a/databases/postgis-jdbc/Makefile +++ b/databases/postgis-jdbc/Makefile @@ -13,8 +13,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc -USES= zip:infozip -USE_JAVA= yes +USES= java zip:infozip NO_BUILD= yes NO_ARCH= yes diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile --- a/databases/postgresql-jdbc/Makefile +++ b/databases/postgresql-jdbc/Makefile @@ -12,8 +12,7 @@ LICENSE= BSD3CLAUSE -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java NO_ARCH= yes PLIST_FILES= %%JAVAJARDIR%%/postgresql.jar diff --git a/databases/powerarchitect/Makefile b/databases/powerarchitect/Makefile --- a/databases/powerarchitect/Makefile +++ b/databases/powerarchitect/Makefile @@ -10,7 +10,7 @@ LICENSE= GPLv3 -USE_JAVA= yes +USES= java NO_ARCH= yes NO_BUILD= yes SUB_FILES= ${PORTNAME} diff --git a/databases/puppetdb7/Makefile b/databases/puppetdb7/Makefile --- a/databases/puppetdb7/Makefile +++ b/databases/puppetdb7/Makefile @@ -15,7 +15,7 @@ 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 @@ ext/cli/reload \ ext/cli/upgrade \ ext/ezbake-functions.sh -USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes diff --git a/databases/puppetdb8/Makefile b/databases/puppetdb8/Makefile --- a/databases/puppetdb8/Makefile +++ b/databases/puppetdb8/Makefile @@ -15,7 +15,7 @@ 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 @@ ext/cli/reload \ ext/cli/upgrade \ ext/ezbake-functions.sh -USE_JAVA= yes JAVA_VERSION= 11+ NO_ARCH= yes NO_BUILD= yes diff --git a/databases/rocksdb-jni/Makefile b/databases/rocksdb-jni/Makefile --- a/databases/rocksdb-jni/Makefile +++ b/databases/rocksdb-jni/Makefile @@ -23,15 +23,11 @@ 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 diff --git a/databases/sql-workbench/Makefile b/databases/sql-workbench/Makefile --- a/databases/sql-workbench/Makefile +++ b/databases/sql-workbench/Makefile @@ -12,8 +12,7 @@ LICENSE= APACHE20 -USES= zip -USE_JAVA= yes +USES= java zip JAVA_VERSION= 11+ NO_BUILD= yes diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile --- a/databases/sqldeveloper/Makefile +++ b/databases/sqldeveloper/Makefile @@ -18,8 +18,7 @@ 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 diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile --- a/databases/squirrel-sql/Makefile +++ b/databases/squirrel-sql/Makefile @@ -10,8 +10,8 @@ LICENSE= GPLv2 -USES= zip -USE_JAVA= 11+ +USES= java zip +JAVA_VERSION= 11+ DATADIR= ${PREFIX}/share/java/${PKGBASE} diff --git a/deskutils/docear/Makefile b/deskutils/docear/Makefile --- a/deskutils/docear/Makefile +++ b/deskutils/docear/Makefile @@ -15,8 +15,7 @@ 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} diff --git a/deskutils/freemind/Makefile b/deskutils/freemind/Makefile --- a/deskutils/freemind/Makefile +++ b/deskutils/freemind/Makefile @@ -15,8 +15,7 @@ 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 diff --git a/deskutils/freeplane/Makefile b/deskutils/freeplane/Makefile --- a/deskutils/freeplane/Makefile +++ b/deskutils/freeplane/Makefile @@ -13,8 +13,7 @@ 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 diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile --- a/deskutils/ganttproject/Makefile +++ b/deskutils/ganttproject/Makefile @@ -13,8 +13,7 @@ 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 diff --git a/deskutils/projectlibre/Makefile b/deskutils/projectlibre/Makefile --- a/deskutils/projectlibre/Makefile +++ b/deskutils/projectlibre/Makefile @@ -14,7 +14,7 @@ LICENSE= CPAL-1.0 -USE_JAVA= yes +USES= java DATADIR= ${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION} DESKTOP_ENTRIES="ProjectLibre" \ diff --git a/deskutils/thinkingrock/Makefile b/deskutils/thinkingrock/Makefile --- a/deskutils/thinkingrock/Makefile +++ b/deskutils/thinkingrock/Makefile @@ -12,7 +12,7 @@ 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 diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile --- a/devel/R-cran-rJava/Makefile +++ b/devel/R-cran-rJava/Makefile @@ -12,15 +12,14 @@ 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 @@ 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 diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -38,11 +38,8 @@ 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 --- a/devel/ammonite/Makefile +++ b/devel/ammonite/Makefile @@ -13,8 +13,7 @@ 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 --- a/devel/antlr/Makefile +++ b/devel/antlr/Makefile @@ -13,9 +13,8 @@ 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 --- a/devel/antlr3/Makefile +++ b/devel/antlr3/Makefile @@ -13,9 +13,10 @@ 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 --- a/devel/antlr4/Makefile +++ b/devel/antlr4/Makefile @@ -12,10 +12,10 @@ 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 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -14,10 +14,9 @@ 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 --- a/devel/apache-commons-configuration/Makefile +++ b/devel/apache-commons-configuration/Makefile @@ -16,11 +16,12 @@ ${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 --- a/devel/apache-commons-daemon/Makefile +++ b/devel/apache-commons-daemon/Makefile @@ -13,10 +13,11 @@ 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 --- a/devel/apache-commons-io/Makefile +++ b/devel/apache-commons-io/Makefile @@ -12,7 +12,7 @@ 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 --- a/devel/apache-commons-jxpath/Makefile +++ b/devel/apache-commons-jxpath/Makefile @@ -11,7 +11,8 @@ 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 --- a/devel/apache-log4j2/Makefile +++ b/devel/apache-log4j2/Makefile @@ -12,11 +12,9 @@ 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 --- a/devel/apache-rat/Makefile +++ b/devel/apache-rat/Makefile @@ -11,8 +11,7 @@ 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 --- a/devel/arduino/Makefile +++ b/devel/arduino/Makefile @@ -21,13 +21,11 @@ ${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 --- a/devel/arduino18/Makefile +++ b/devel/arduino18/Makefile @@ -48,14 +48,11 @@ 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 --- a/devel/argouml/Makefile +++ b/devel/argouml/Makefile @@ -16,12 +16,13 @@ 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 --- a/devel/artifactory/Makefile +++ b/devel/artifactory/Makefile @@ -20,11 +20,9 @@ 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 --- a/devel/astah-community/Makefile +++ b/devel/astah-community/Makefile @@ -15,8 +15,7 @@ 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 --- a/devel/avalon-framework/Makefile +++ b/devel/avalon-framework/Makefile @@ -8,7 +8,8 @@ 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 --- a/devel/bazel/Makefile +++ b/devel/bazel/Makefile @@ -16,15 +16,10 @@ 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 --- a/devel/bazel5/Makefile +++ b/devel/bazel5/Makefile @@ -19,15 +19,10 @@ 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 --- a/devel/bfg/Makefile +++ b/devel/bfg/Makefile @@ -10,8 +10,7 @@ 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 --- a/devel/cfr/Makefile +++ b/devel/cfr/Makefile @@ -14,8 +14,7 @@ # 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 --- a/devel/charva/Makefile +++ b/devel/charva/Makefile @@ -17,10 +17,9 @@ 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 --- a/devel/coursier/Makefile +++ b/devel/coursier/Makefile @@ -13,8 +13,7 @@ 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 --- a/devel/dbus-java/Makefile +++ b/devel/dbus-java/Makefile @@ -16,9 +16,7 @@ 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 --- a/devel/doctorj/Makefile +++ b/devel/doctorj/Makefile @@ -8,8 +8,7 @@ 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 --- a/devel/flex-sdk/Makefile +++ b/devel/flex-sdk/Makefile @@ -9,8 +9,7 @@ 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 --- a/devel/flex-sdk35/Makefile +++ b/devel/flex-sdk35/Makefile @@ -11,8 +11,7 @@ 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 --- a/devel/flexdock/Makefile +++ b/devel/flexdock/Makefile @@ -10,8 +10,7 @@ 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 --- a/devel/flexjson/Makefile +++ b/devel/flexjson/Makefile @@ -10,7 +10,8 @@ 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 --- a/devel/ghidra/Makefile +++ b/devel/ghidra/Makefile @@ -17,10 +17,8 @@ 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 --- a/devel/gradle/Makefile +++ b/devel/gradle/Makefile @@ -12,8 +12,7 @@ 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 --- a/devel/gradle5/Makefile +++ b/devel/gradle5/Makefile @@ -11,10 +11,8 @@ 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 --- a/devel/gradle6/Makefile +++ b/devel/gradle6/Makefile @@ -13,8 +13,7 @@ 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 --- a/devel/gradle62/Makefile +++ b/devel/gradle62/Makefile @@ -14,8 +14,7 @@ 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 --- a/devel/gradle761/Makefile +++ b/devel/gradle761/Makefile @@ -13,8 +13,7 @@ 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 --- a/devel/ireport/Makefile +++ b/devel/ireport/Makefile @@ -9,8 +9,7 @@ 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 --- a/devel/java-findbugs/Makefile +++ b/devel/java-findbugs/Makefile @@ -10,7 +10,8 @@ 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 --- a/devel/jcmdline/Makefile +++ b/devel/jcmdline/Makefile @@ -10,7 +10,8 @@ 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 --- a/devel/jenkins-lts/Makefile +++ b/devel/jenkins-lts/Makefile @@ -14,9 +14,9 @@ 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 --- a/devel/jenkins/Makefile +++ b/devel/jenkins/Makefile @@ -13,8 +13,8 @@ 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 --- a/devel/jetbrains-clion/Makefile +++ b/devel/jetbrains-clion/Makefile @@ -36,10 +36,8 @@ 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 --- a/devel/jetbrains-goland/Makefile +++ b/devel/jetbrains-goland/Makefile @@ -23,10 +23,9 @@ 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 --- a/devel/jetbrains-phpstorm/Makefile +++ b/devel/jetbrains-phpstorm/Makefile @@ -24,10 +24,9 @@ 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 --- a/devel/jetbrains-rustrover/Makefile +++ b/devel/jetbrains-rustrover/Makefile @@ -25,10 +25,9 @@ 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 --- a/devel/jetbrains-sqlite/Makefile +++ b/devel/jetbrains-sqlite/Makefile @@ -15,14 +15,12 @@ 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 --- a/devel/jetbrains-webstorm/Makefile +++ b/devel/jetbrains-webstorm/Makefile @@ -24,10 +24,9 @@ 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 --- a/devel/jgoodies-looks/Makefile +++ b/devel/jgoodies-looks/Makefile @@ -11,7 +11,7 @@ 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 --- a/devel/jiic/Makefile +++ b/devel/jiic/Makefile @@ -12,9 +12,9 @@ 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 --- a/devel/jline/Makefile +++ b/devel/jline/Makefile @@ -9,8 +9,8 @@ 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 --- a/devel/jna/Makefile +++ b/devel/jna/Makefile @@ -15,14 +15,10 @@ 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 --- a/devel/jsap/Makefile +++ b/devel/jsap/Makefile @@ -9,7 +9,8 @@ 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 --- a/devel/leiningen/Makefile +++ b/devel/leiningen/Makefile @@ -15,7 +15,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USE_JAVA= yes +USES= java + NO_ARCH= yes NO_BUILD= yes diff --git a/devel/libastylej/Makefile b/devel/libastylej/Makefile --- a/devel/libastylej/Makefile +++ b/devel/libastylej/Makefile @@ -12,10 +12,10 @@ 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 --- a/devel/libmatthew/Makefile +++ b/devel/libmatthew/Makefile @@ -14,8 +14,7 @@ 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 --- a/devel/libreadline-java/Makefile +++ b/devel/libreadline-java/Makefile @@ -9,6 +9,9 @@ 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 @@ 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 --- a/devel/libvirt-java/Makefile +++ b/devel/libvirt-java/Makefile @@ -14,8 +14,8 @@ 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 --- a/devel/listserialc/Makefile +++ b/devel/listserialc/Makefile @@ -10,11 +10,11 @@ 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 --- a/devel/log4j/Makefile +++ b/devel/log4j/Makefile @@ -10,9 +10,8 @@ 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 --- a/devel/luajava/Makefile +++ b/devel/luajava/Makefile @@ -8,8 +8,7 @@ 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 --- a/devel/maven/Makefile +++ b/devel/maven/Makefile @@ -13,10 +13,9 @@ 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 --- a/devel/maven363/Makefile +++ b/devel/maven363/Makefile @@ -13,8 +13,7 @@ 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 --- a/devel/maven39/Makefile +++ b/devel/maven39/Makefile @@ -13,10 +13,9 @@ 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 --- a/devel/mill/Makefile +++ b/devel/mill/Makefile @@ -13,8 +13,7 @@ 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 --- a/devel/netscape-java40/Makefile +++ b/devel/netscape-java40/Makefile @@ -13,7 +13,8 @@ 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 --- a/devel/nexus2-oss/Makefile +++ b/devel/nexus2-oss/Makefile @@ -15,18 +15,16 @@ 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 --- a/devel/ocaml-camljava/Makefile +++ b/devel/ocaml-camljava/Makefile @@ -9,12 +9,11 @@ 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 --- a/devel/opengrok/Makefile +++ b/devel/opengrok/Makefile @@ -23,9 +23,8 @@ 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 --- a/devel/p5-Inline-Java/Makefile +++ b/devel/p5-Inline-Java/Makefile @@ -15,13 +15,12 @@ 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} diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile --- a/devel/p5-Java/Makefile +++ b/devel/p5-Java/Makefile @@ -8,10 +8,9 @@ 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 --- a/devel/pmd/Makefile +++ b/devel/pmd/Makefile @@ -12,9 +12,8 @@ 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 --- a/devel/protobuf-java/Makefile +++ b/devel/protobuf-java/Makefile @@ -10,7 +10,7 @@ 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 --- a/devel/py-jep/Makefile +++ b/devel/py-jep/Makefile @@ -12,12 +12,11 @@ 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 --- a/devel/pycharm-ce/Makefile +++ b/devel/pycharm-ce/Makefile @@ -17,8 +17,7 @@ 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 --- a/devel/pycharm-pro/Makefile +++ b/devel/pycharm-pro/Makefile @@ -21,7 +21,7 @@ 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 @@ 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 --- a/devel/rubygem-jruby-jars/Makefile +++ b/devel/rubygem-jruby-jars/Makefile @@ -13,8 +13,7 @@ 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 --- a/devel/rubymine/Makefile +++ b/devel/rubymine/Makefile @@ -16,10 +16,8 @@ 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 --- a/devel/sabre/Makefile +++ b/devel/sabre/Makefile @@ -10,11 +10,10 @@ 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 --- a/devel/sbt/Makefile +++ b/devel/sbt/Makefile @@ -11,15 +11,15 @@ 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 --- a/devel/scalatest/Makefile +++ b/devel/scalatest/Makefile @@ -13,8 +13,8 @@ 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 --- a/devel/simian/Makefile +++ b/devel/simian/Makefile @@ -29,28 +29,14 @@ OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= LANG OPTIONS_SINGLE_LANG= JAVA MONO +OPTIONS_SUB= yes OPTIONS_DEFAULT= JAVA -.include - -.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 pre-fetch: .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) diff --git a/devel/slf4j/Makefile b/devel/slf4j/Makefile --- a/devel/slf4j/Makefile +++ b/devel/slf4j/Makefile @@ -9,9 +9,9 @@ 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 --- a/devel/smc/Makefile +++ b/devel/smc/Makefile @@ -10,7 +10,8 @@ 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 --- a/devel/soapui/Makefile +++ b/devel/soapui/Makefile @@ -16,9 +16,9 @@ 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 --- a/devel/sonar-scanner-cli/Makefile +++ b/devel/sonar-scanner-cli/Makefile @@ -11,10 +11,9 @@ 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 --- a/devel/sonarqube-ant-task/Makefile +++ b/devel/sonarqube-ant-task/Makefile @@ -11,8 +11,7 @@ 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 --- a/devel/sonarqube-community/Makefile +++ b/devel/sonarqube-community/Makefile @@ -30,9 +30,8 @@ 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 --- a/devel/spark/Makefile +++ b/devel/spark/Makefile @@ -22,9 +22,8 @@ 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 --- a/devel/sparsebitset/Makefile +++ b/devel/sparsebitset/Makefile @@ -11,8 +11,7 @@ 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 --- a/devel/staf/Makefile +++ b/devel/staf/Makefile @@ -39,14 +39,14 @@ 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 --- a/devel/statcvs/Makefile +++ b/devel/statcvs/Makefile @@ -15,10 +15,9 @@ 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 --- a/devel/statsvn/Makefile +++ b/devel/statsvn/Makefile @@ -20,10 +20,9 @@ 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 --- a/devel/swank-clojure/Makefile +++ b/devel/swank-clojure/Makefile @@ -7,9 +7,9 @@ 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 --- a/devel/tijmp/Makefile +++ b/devel/tijmp/Makefile @@ -11,10 +11,8 @@ 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 --- a/devel/tinylaf/Makefile +++ b/devel/tinylaf/Makefile @@ -9,8 +9,8 @@ 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 --- a/devel/umlgraph/Makefile +++ b/devel/umlgraph/Makefile @@ -9,8 +9,7 @@ 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 --- a/devel/violet/Makefile +++ b/devel/violet/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -USE_JAVA= yes +USES= java NO_BUILD= YES diff --git a/devel/zanata-cli/Makefile b/devel/zanata-cli/Makefile --- a/devel/zanata-cli/Makefile +++ b/devel/zanata-cli/Makefile @@ -11,7 +11,8 @@ 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 --- a/devel/zookeeper/Makefile +++ b/devel/zookeeper/Makefile @@ -14,11 +14,8 @@ 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} diff --git a/dns/denominator/Makefile b/dns/denominator/Makefile --- a/dns/denominator/Makefile +++ b/dns/denominator/Makefile @@ -9,7 +9,8 @@ COMMENT= Portably control DNS clouds WWW= https://github.com/Netflix/denominator -USE_JAVA= yes +USES= java + NO_BUILD= yes STRIP= # none PLIST_FILES= bin/${PORTNAME} diff --git a/dns/dnsjava/Makefile b/dns/dnsjava/Makefile --- a/dns/dnsjava/Makefile +++ b/dns/dnsjava/Makefile @@ -10,10 +10,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +USES= java:ant USE_GITHUB= yes -USE_JAVA= yes -USE_ANT= yes ALL_TARGET= jar NO_ARCH= yes diff --git a/editors/bined/Makefile b/editors/bined/Makefile --- a/editors/bined/Makefile +++ b/editors/bined/Makefile @@ -9,8 +9,8 @@ LICENSE= APACHE20 -USES= zip -USE_JAVA= yes +USES= java zip + NO_BUILD= yes OPTIONS_DEFINE= DOCS diff --git a/editors/drjava/Makefile b/editors/drjava/Makefile --- a/editors/drjava/Makefile +++ b/editors/drjava/Makefile @@ -11,8 +11,9 @@ COMMENT= Lightweight IDE for writing Java programs WWW= http://www.drjava.org +USES= java + NO_BUILD= yes -USE_JAVA= yes SUB_FILES= ${PORTNAME} SUB_LIST= DRJAVAJAR=${DRJAVAJAR} diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile --- a/editors/jedit/Makefile +++ b/editors/jedit/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -USES= cpe xorg +USES= cpe java xorg OPTIONS_DEFINE= MACROS DOCS MACROS_DESC= Install default set of macros (highly recommended) @@ -20,7 +20,6 @@ OPTIONS_DEFAULT= MACROS OPTIONS_SUB= yes -USE_JAVA= yes JAVA_VERSION= 11+ USE_XORG= x11 diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -228,8 +228,8 @@ Java-WebSocket-1.5.6.tar.gz:src \ bsh-2.1.1-src.zip:src \ rhino-1.7.14.zip:src -JAVA_USE= JAVA=yes -JAVA_VARS= JAVA_BUILD=yes JAVA_RUN=yes JAVA_VERSION=17+ +JAVA_USES= java +JAVA_VARS= JAVA_VERSION=17+ KF5_CONFIGURE_ENABLE= kf5 KF5_USE= kde=config,coreaddons,i18n,kio,windowsystem diff --git a/editors/omegaT/Makefile b/editors/omegaT/Makefile --- a/editors/omegaT/Makefile +++ b/editors/omegaT/Makefile @@ -13,11 +13,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash -USES= desktop-file-utils shebangfix zip -USE_JAVA= yes +USES= desktop-file-utils java shebangfix zip JAVA_VERSION= 11 JAVA_VENDOR= openjdk -JAVA_RUN= yes SHEBANG_FILES= linux-install.sh OmegaT omegat.kaptn SHEBANG_LANG= kaptain diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -111,13 +111,10 @@ RUN_DEPENDS+= gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT} USES= autoreconf bison compiler:c++11-lib cpe desktop-file-utils \ - gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \ + gettext-runtime gl gmake gnome iconv java jpeg perl5 pkgconfig \ shared-mime-info ssl tar:bzip2 xorg USE_GL= gl glu USE_GNOME= gdkpixbuf2 gdkpixbuf2xlib gtk20 libxslt glib20 -USE_JAVA= yes -JAVA_BUILD= jdk -JAVA_RUN= jdk JAVA_VENDOR= openjdk USE_PERL5= build USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -113,13 +113,10 @@ RUN_DEPENDS+= gcc${GCC_DEFAULT}>0:lang/gcc${GCC_DEFAULT} USES= autoreconf bison compiler:c++11-lib cpe desktop-file-utils \ - gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \ + gettext-runtime gl gmake gnome iconv java jpeg perl5 pkgconfig \ python:3.9 shared-mime-info ssl tar:${TARTYPE} xorg USE_GL= gl glu USE_GNOME= gdkpixbuf2 gdkpixbuf2xlib gtk20 libxslt glib20 -USE_JAVA= yes -JAVA_BUILD= jdk -JAVA_RUN= jdk JAVA_VENDOR= openjdk USE_PERL5= build USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ diff --git a/editors/treeform/Makefile b/editors/treeform/Makefile --- a/editors/treeform/Makefile +++ b/editors/treeform/Makefile @@ -8,9 +8,9 @@ COMMENT= Linguistic Syntax/Semantics tree drawing editor WWW= https://treeform.blogspot.com/ -USES= zip +USES= java zip + NO_BUILD= yes -USE_JAVA= yes SUB_FILES= treeform WRKSRC= ${WRKDIR}/TreeForm diff --git a/emulators/edumips64/Makefile b/emulators/edumips64/Makefile --- a/emulators/edumips64/Makefile +++ b/emulators/edumips64/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2 -USE_JAVA= yes +USES= java JAVA_VERSION= 17+ DESKTOP_ENTRIES= "EduMIPS64" \ diff --git a/emulators/javatari/Makefile b/emulators/javatari/Makefile --- a/emulators/javatari/Makefile +++ b/emulators/javatari/Makefile @@ -15,7 +15,8 @@ EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip -USE_JAVA= yes +USES= java + NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \ bin/javatari diff --git a/filesystems/hfsexplorer/Makefile b/filesystems/hfsexplorer/Makefile --- a/filesystems/hfsexplorer/Makefile +++ b/filesystems/hfsexplorer/Makefile @@ -11,9 +11,9 @@ BUILD_DEPENDS= ant:devel/apache-ant +USES= java USE_GITHUB= yes GH_ACCOUNT= unsound -USE_JAVA= yes DESKTOP_ENTRIES= "hfsexplorer" \ "reader Mac-formatted harddisk" \ diff --git a/finance/jgnash/Makefile b/finance/jgnash/Makefile --- a/finance/jgnash/Makefile +++ b/finance/jgnash/Makefile @@ -16,8 +16,7 @@ SUB_LIST= JAVA="${JAVA}" PLIST_SUB+= DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||} -USES= zip -USE_JAVA= yes +USES= java zip JAVA_VENDOR= openjdk NO_BUILD= yes diff --git a/finance/quickfix/Makefile b/finance/quickfix/Makefile --- a/finance/quickfix/Makefile +++ b/finance/quickfix/Makefile @@ -38,7 +38,7 @@ RUBY_USES= ruby RUBY_CONFIGURE_WITH= ruby RUBY_LIB_DEPENDS+=libunwind.so:devel/libunwind -JAVA_USE= java=yes +JAVA_USES= java JAVA_CONFIGURE_WITH= java INSTALL_TARGET=install-strip diff --git a/finance/venice/Makefile b/finance/venice/Makefile --- a/finance/venice/Makefile +++ b/finance/venice/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 -USES= gnome -USE_JAVA= yes +USES= gnome java + NO_BUILD= yes PORTDOCS= * diff --git a/ftp/dmachine/Makefile b/ftp/dmachine/Makefile --- a/ftp/dmachine/Makefile +++ b/ftp/dmachine/Makefile @@ -9,8 +9,7 @@ LICENSE= GPLv2 -USES= zip -USE_JAVA= yes +USES= java zip NO_ARCH= yes NO_BUILD= yes diff --git a/ftp/jftp/Makefile b/ftp/jftp/Makefile --- a/ftp/jftp/Makefile +++ b/ftp/jftp/Makefile @@ -10,9 +10,10 @@ LICENSE= GPLv2 +USES= java + NO_BUILD= yes NO_ARCH= yes -USE_JAVA= yes WRKSRC= ${WRKDIR}/j-ftp DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/games/blackjackclient/Makefile b/games/blackjackclient/Makefile --- a/games/blackjackclient/Makefile +++ b/games/blackjackclient/Makefile @@ -11,8 +11,8 @@ LICENSE= GPLv2 -USES= zip -USE_JAVA= yes +USES= java zip + PLIST_FILES= bin/${PORTNAME} \ ${JAVAJARDIR}/${PORTNAME}.jar SUB_FILES= ${PORTNAME}.sh diff --git a/games/coronapoker/Makefile b/games/coronapoker/Makefile --- a/games/coronapoker/Makefile +++ b/games/coronapoker/Makefile @@ -12,7 +12,8 @@ BUILD_DEPENDS= maven>0:devel/maven -USE_JAVA= 11+ +USES= java +JAVA_VERSION= 11+ USE_GITHUB= yes GH_ACCOUNT= tonikelope diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile --- a/games/dmjava/Makefile +++ b/games/dmjava/Makefile @@ -12,8 +12,8 @@ EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= zip -USE_JAVA= yes +USES= java zip + NO_BUILD= yes do-install: diff --git a/games/domination/Makefile b/games/domination/Makefile --- a/games/domination/Makefile +++ b/games/domination/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv3 -USES= dos2unix zip:infozip +USES= dos2unix java zip:infozip DOS2UNIX_GLOB= *.txt *.ini *.cards *.map -USE_JAVA= yes + NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME:S/d/D/} diff --git a/games/freecol/Makefile b/games/freecol/Makefile --- a/games/freecol/Makefile +++ b/games/freecol/Makefile @@ -9,14 +9,14 @@ LICENSE= GPLv2 -USES= cpe zip +USES= cpe java zip +JAVA_VERSION= 11+ OPTIONS_DEFINE= DOCS NO_BUILD= yes NO_ARCH= yes SUB_FILES= freecol -USE_JAVA= 11+ PLIST_FILES= bin/freecol \ ${DESKTOPDIR:S,^${PREFIX}/,,}/freecol.desktop diff --git a/games/gogui/Makefile b/games/gogui/Makefile --- a/games/gogui/Makefile +++ b/games/gogui/Makefile @@ -17,10 +17,9 @@ BUILD_DEPENDS= xsltproc:textproc/libxslt \ docbook-xsl>0:textproc/docbook-xsl +USES= java:ant USE_GITHUB= yes GH_ACCOUNT= lemonsqueeze -USE_JAVA= yes -USE_ANT= yes MAKE_ARGS+= -Ddocbook-xsl.dir=${LOCALBASE}/share/xsl/docbook diff --git a/games/java-games-suite/Makefile b/games/java-games-suite/Makefile --- a/games/java-games-suite/Makefile +++ b/games/java-games-suite/Makefile @@ -8,7 +8,7 @@ COMMENT= Simple Java games collection WWW= https://sourceforge.net/projects/javagamessuite/ -USE_JAVA= yes +USES= java NO_ARCH= yes diff --git a/games/jchessboard/Makefile b/games/jchessboard/Makefile --- a/games/jchessboard/Makefile +++ b/games/jchessboard/Makefile @@ -11,10 +11,9 @@ LICENSE= GPLv2 -USES= tar:tgz -USE_ANT= yes -USE_JAVA= yes +USES= java:ant tar:tgz USE_LOCALE= en_US.ISO8859-1 + NO_ARCH= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/games/jin/Makefile b/games/jin/Makefile --- a/games/jin/Makefile +++ b/games/jin/Makefile @@ -15,10 +15,8 @@ BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${JAVAJARDIR}/bsh.jar:lang/bsh -USES= dos2unix +USES= dos2unix java:ant DOS2UNIX_GLOB= *.java *.txt -USE_JAVA= yes -USE_ANT= yes MAKE_ARGS+= -lib ${JAVAJARDIR}/bsh.jar diff --git a/games/jinput/Makefile b/games/jinput/Makefile --- a/games/jinput/Makefile +++ b/games/jinput/Makefile @@ -13,13 +13,12 @@ maven>0:devel/maven RUN_DEPENDS= ${JAVAJARDIR}/jutils/jutils.jar:games/jutils +USES= java # Using a fork because of maven dependencies USE_GITLAB= yes GL_ACCOUNT= voidanix GL_TAGNAME= bf22dd975bbba31f01895332255b63df376894e6 -USE_JAVA= 8+ - PLIST_DIRS= ${JAVAJARDIR}/${PORTNAME} PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar diff --git a/games/jtans/Makefile b/games/jtans/Makefile --- a/games/jtans/Makefile +++ b/games/jtans/Makefile @@ -12,11 +12,12 @@ LICENSE= GPLv2+ # got from website +USES= java + NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . -USE_JAVA= yes NO_BUILD= yes SUB_FILES= jtans.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/games/jutils/Makefile b/games/jutils/Makefile --- a/games/jutils/Makefile +++ b/games/jutils/Makefile @@ -12,13 +12,12 @@ BUILD_DEPENDS= maven>0:devel/maven +USES= java # Using a fork because of maven dependencies USE_GITLAB= yes GL_ACCOUNT= voidanix GL_TAGNAME= f950e23e42081308b4be3b0fc4b57d4dbab70dac -USE_JAVA= 8+ - PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar PLIST_DIRS= ${JAVAJARDIR}/${PORTNAME} diff --git a/games/lizzie/Makefile b/games/lizzie/Makefile --- a/games/lizzie/Makefile +++ b/games/lizzie/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= maven>0:devel/maven RUN_DEPENDS= leelaz:games/leela-zero -USE_JAVA= yes +USES= java USE_GITHUB= yes GH_ACCOUNT= featurecat diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile --- a/games/lwjgl/Makefile +++ b/games/lwjgl/Makefile @@ -15,15 +15,13 @@ ${JAVAJARDIR}/jinput/jinput.jar:games/jinput RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= dos2unix xorg +USES= dos2unix java:ant xorg DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$ -USE_ANT= yes USE_GITHUB= yes GH_ACCOUNT= LWJGL GH_TAGNAME= 2df01dd -USE_JAVA= 8 USE_LDCONFIG= yes USE_XORG= x11 xcursor xext xrandr xxf86vm MAKE_ENV+= CLASSPATH=${JAVAJARDIR}/jutils/jutils.jar:${JAVAJARDIR}/jinput/jinput.jar:${WRKSRC}/${DISTNAME}/jar/ diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile --- a/games/lwjgl3/Makefile +++ b/games/lwjgl3/Makefile @@ -47,14 +47,13 @@ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz -USES= gl gnome -USE_ANT= yes +USES= gl gnome java:ant +JAVA_VERSION= 17+ USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX} USE_GL= gl USE_GNOME= glib20 gtk30 -USE_JAVA= 17+ MAKE_ARGS= -Dbuild.offline=true \ -Djavadoc.skip=true \ diff --git a/games/minecraft-client/Makefile b/games/minecraft-client/Makefile --- a/games/minecraft-client/Makefile +++ b/games/minecraft-client/Makefile @@ -16,9 +16,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/lwjgl/lwjgl.jar:games/lwjgl \ xrandr:x11/xrandr -USES= openal -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java openal JAVA_OS= native JAVA_VENDOR= openjdk diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile --- a/games/minecraft-server/Makefile +++ b/games/minecraft-server/Makefile @@ -16,7 +16,7 @@ LICENSE_TEXT= The license can be viewed at: https://account.mojang.com/documents/minecraft_eula LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell -USE_JAVA= yes +USES= java JAVA_VERSION= 21 NO_ARCH= yes diff --git a/games/moagg/Makefile b/games/moagg/Makefile --- a/games/moagg/Makefile +++ b/games/moagg/Makefile @@ -18,8 +18,7 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} -USES= zip -USE_JAVA= yes +USES= java zip NO_BUILD= yes PORTDOCS= AUTHORS README.txt diff --git a/games/multimc/Makefile b/games/multimc/Makefile --- a/games/multimc/Makefile +++ b/games/multimc/Makefile @@ -11,14 +11,13 @@ RUN_DEPENDS= lwjgl>=2.9.3:games/lwjgl -USES= cmake compiler:c++14-lang qt:5 +USES= cmake compiler:c++14-lang java qt:5 USE_GITHUB= yes GH_ACCOUNT= MultiMC GH_PROJECT= MultiMC5 GH_TUPLE= MultiMC:libnbtplusplus:508eda8:libnbtplusplus/libraries/libnbtplusplus \ MultiMC:quazip:3691d57:quazip/libraries/quazip USE_LDCONFIG= yes -USE_JAVA= 8+ USE_QT= core concurrent gui network testlib:build widgets xml \ buildtools:build qmake:build diff --git a/games/pcgen/Makefile b/games/pcgen/Makefile --- a/games/pcgen/Makefile +++ b/games/pcgen/Makefile @@ -10,9 +10,9 @@ LICENSE= LGPL21 -USES= zip +USES= java zip + WRKSRC= ${WRKDIR}/${PORTNAME} -USE_JAVA= yes NO_BUILD= yes NO_ARCH= yes diff --git a/games/prismlauncher/Makefile b/games/prismlauncher/Makefile --- a/games/prismlauncher/Makefile +++ b/games/prismlauncher/Makefile @@ -17,7 +17,7 @@ openjdk21>0:java/openjdk21 \ xrandr:x11/xrandr -USES= cmake compiler:c++17-lang desktop-file-utils gl kde:6 qt:6 \ +USES= cmake compiler:c++17-lang desktop-file-utils gl java kde:6 qt:6 \ shared-mime-info USE_GITHUB= yes GH_ACCOUNT= PrismLauncher @@ -25,7 +25,6 @@ GH_TUPLE= gulrak:filesystem:2fc4b463:filesystem/libraries/filesystem \ PrismLauncher:libnbtplusplus:23b95512:libnbtplusplus/libraries/libnbtplusplus USE_GL= opengl -USE_JAVA= yes USE_KDE= ecm:build USE_QT= 5compat base networkauth diff --git a/games/rescue/Makefile b/games/rescue/Makefile --- a/games/rescue/Makefile +++ b/games/rescue/Makefile @@ -12,9 +12,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/gpl.txt -USES= dos2unix zip:infozip +USES= dos2unix java zip:infozip DOS2UNIX_GLOB= *.css *.htm *.ini *.txt *.xml -USE_JAVA= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} DESKTOP_ENTRIES= "Rescue! Max" \ diff --git a/games/robocode-naval/Makefile b/games/robocode-naval/Makefile --- a/games/robocode-naval/Makefile +++ b/games/robocode-naval/Makefile @@ -16,12 +16,10 @@ PORTSCOUT= limit:^\d+\.\d+\.\d+$$ -USES= cpe dos2unix zip +USES= cpe dos2unix java:extract,run zip CPE_VENDOR= ${PORTNAME}_project DOS2UNIX_GLOB= *.css *.team *.properties package-list MANIFEST.MF -USE_JAVA= yes -JAVA_EXTRACT= yes -JAVA_RUN= yes + NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/games/robocode/Makefile b/games/robocode/Makefile --- a/games/robocode/Makefile +++ b/games/robocode/Makefile @@ -13,12 +13,10 @@ LICENSE= EPL LICENSE_FILE= ${WRKSRC}/license/epl-v10.html -USES= cpe dos2unix zip:infozip +USES= cpe dos2unix java:extract,run zip:infozip CPE_VENDOR= ${PORTNAME}_project DOS2UNIX_GLOB= *.css *.team *.properties package-list MANIFEST.MF -USE_JAVA= yes -JAVA_EXTRACT= yes -JAVA_RUN= yes + NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes diff --git a/games/runelite/Makefile b/games/runelite/Makefile --- a/games/runelite/Makefile +++ b/games/runelite/Makefile @@ -17,8 +17,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${DISTDIR}/${DIST_SUBDIR}/LICENSE -USES= cpe -USE_JAVA= yes +USES= cpe java JAVA_VERSION= 11 DESKTOP_ENTRIES="RuneLite" \ diff --git a/games/sokobano/Makefile b/games/sokobano/Makefile --- a/games/sokobano/Makefile +++ b/games/sokobano/Makefile @@ -14,8 +14,9 @@ RUN_DEPENDS:= ${LOCALBASE}/share/java/classes/jmf.jar:java/jmf \ ${BUILD_DEPENDS} -USES= gmake -USE_JAVA= 8 +USES= gmake java +JAVA_VERSION= 8 + MAKEFILE= ${FILESDIR}/makefile MAKE_ENV= JAVA_VERSION=${JAVA_VERSION} WRKSRC= ${WRKDIR}/Sokobano diff --git a/games/spicetrade/Makefile b/games/spicetrade/Makefile --- a/games/spicetrade/Makefile +++ b/games/spicetrade/Makefile @@ -11,7 +11,8 @@ COMMENT= Colourful 14th century Arab spice trading game WWW= http://www.spicetrade.org/ -USE_JAVA= yes +USES= java + DATADIR= ${JAVASHAREDIR}/${PORTNAME} NO_BUILD= yes NO_ARCH= yes diff --git a/games/stendhal/Makefile b/games/stendhal/Makefile --- a/games/stendhal/Makefile +++ b/games/stendhal/Makefile @@ -12,9 +12,7 @@ LICENSE= BSD2CLAUSE GPLv2 LICENSE_COMB= multi -USES= shebangfix -USE_JAVA= yes -USE_ANT= yes +USES= java:ant shebangfix WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile --- a/graphics/aoi/Makefile +++ b/graphics/aoi/Makefile @@ -16,9 +16,9 @@ LIB_DEPENDS= libjogl.so:graphics/jogl -USES= zip +USES= java zip DOS2UNIX_FILES= ../AoI_Manual/*.html # USES=dos2unix is optional -USE_JAVA= yes + NO_BUILD= yes WRKSRC= ${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g} diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile --- a/graphics/batik/Makefile +++ b/graphics/batik/Makefile @@ -13,8 +13,7 @@ CPE_VENDOR= apache -USES= cpe -USE_JAVA= yes +USES= cpe java NO_ARCH= yes NO_BUILD= yes diff --git a/graphics/cbviewer/Makefile b/graphics/cbviewer/Makefile --- a/graphics/cbviewer/Makefile +++ b/graphics/cbviewer/Makefile @@ -18,9 +18,9 @@ RUN_DEPENDS= unrar:archivers/unrar -USES= dos2unix zip +USES= dos2unix java zip DOS2UNIX_GLOB= CREDITS -USE_JAVA= yes + NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/graphics/cosmoplayer/Makefile b/graphics/cosmoplayer/Makefile --- a/graphics/cosmoplayer/Makefile +++ b/graphics/cosmoplayer/Makefile @@ -19,7 +19,8 @@ RUN_DEPENDS= ${JAVALIBDIR}/java40.jar:devel/netscape-java40 -USE_JAVA= yes +USES= java + NO_BUILD= yes NO_ARCH= yes diff --git a/graphics/ditaa/Makefile b/graphics/ditaa/Makefile --- a/graphics/ditaa/Makefile +++ b/graphics/ditaa/Makefile @@ -11,8 +11,7 @@ LICENSE= LGPL3 -USES= zip -USE_JAVA= yes +USES= java zip DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/graphics/geoapi/Makefile b/graphics/geoapi/Makefile --- a/graphics/geoapi/Makefile +++ b/graphics/geoapi/Makefile @@ -8,10 +8,10 @@ COMMENT= Java interface API based upon OGC Standards WWW= http://geoapi.sf.net -USES= zip +USES= java zip + NO_BUILD= yes NO_ARCH= yes -USE_JAVA= yes NO_WRKSUBDIR= yes JARFILES= geoapi-${PORTVERSION} jsr-275-0.9.3 geoapi-conformance-${PORTVERSION} diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile --- a/graphics/geoserver/Makefile +++ b/graphics/geoserver/Makefile @@ -13,8 +13,8 @@ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/license/NOTICE.txt -USES= cpe zip -USE_JAVA= 17+ +USES= cpe java zip +JAVA_VERSION= 17+ USE_RC_SUBR= ${PORTNAME} NO_ARCH= yes diff --git a/graphics/jalbum/Makefile b/graphics/jalbum/Makefile --- a/graphics/jalbum/Makefile +++ b/graphics/jalbum/Makefile @@ -10,10 +10,10 @@ WRKSRC= ${WRKDIR}/jAlbum -USES= zip +USES= java zip + NO_BUILD= yes -USE_JAVA= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= jalbum.sh diff --git a/graphics/jave6/Makefile b/graphics/jave6/Makefile --- a/graphics/jave6/Makefile +++ b/graphics/jave6/Makefile @@ -12,8 +12,8 @@ EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} -USES= zip -USE_JAVA= yes +USES= java zip + NO_BUILD= yes SUB_FILES= jave6 pkg-message diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile --- a/graphics/jdraw/Makefile +++ b/graphics/jdraw/Makefile @@ -11,8 +11,9 @@ COMMENT= Pixel oriented graphics editor WWW= https://jdraw.sourceforge.net +USES= java + NO_BUILD= yes -USE_JAVA= yes OPTIONS_DEFINE= PLASTIC3D OPTIONS_DEFAULT= PLASTIC3D diff --git a/graphics/jogamp-jogl/Makefile b/graphics/jogamp-jogl/Makefile --- a/graphics/jogamp-jogl/Makefile +++ b/graphics/jogamp-jogl/Makefile @@ -17,10 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64 powerpc64 powerpc64le -USES= compiler tar:xz xorg - -USE_ANT= yes -USE_JAVA= yes +USES= compiler java:ant tar:xz xorg USE_XORG= x11 xcursor xrandr xrender xxf86vm PATCH_WRKSRC= ${WRKDIR} diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile --- a/graphics/jogl/Makefile +++ b/graphics/jogl/Makefile @@ -26,13 +26,11 @@ # jogl/make/build.xml ONLY_FOR_ARCHS= i386 amd64 -USES= gl xorg zip +USES= gl java:ant xorg zip USE_XORG= x11 xau xdamage xdmcp xext xfixes xorgproto xt xxf86vm USE_GL= gl -USE_ANT= yes USE_LDCONFIG= yes USE_LOCALE= en_US.UTF-8 -USE_JAVA= yes BUILD_WRKSRC= ${WRKSRC}/jogl/make BUILD_BINPATH= ${WRKSRC}/bin diff --git a/graphics/jpatch/Makefile b/graphics/jpatch/Makefile --- a/graphics/jpatch/Makefile +++ b/graphics/jpatch/Makefile @@ -9,8 +9,8 @@ COMMENT= Spline based 3D modeling tool WWW= http://www.jpatch.com -USES= zip -USE_JAVA= yes +USES= java zip + NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION} diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile --- a/graphics/libpano13/Makefile +++ b/graphics/libpano13/Makefile @@ -25,7 +25,7 @@ OPTIONS_DEFAULT= SUITESPARSE SUITESPARSE_DESC= Use math/suitesparse for faster operation OPTIONS_SUB= yes -JAVA_USE= java=yes +JAVA_USES= java JAVA_CMAKE_BOOL= SUPPORT_JAVA_PROGRAMS JAVA_VARS= JAVA_OS=native SUITESPARSE_LIB_DEPENDS= \ diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile --- a/graphics/lightzone/Makefile +++ b/graphics/lightzone/Makefile @@ -32,15 +32,11 @@ GH_ACCOUNT= ktgw0316 GH_PROJECT= LightZone -USES= desktop-file-utils gmake gnome jpeg pkgconfig xorg -USE_ANT= yes -USE_JAVA= yes +USES= desktop-file-utils gmake gnome java:ant,run jpeg pkgconfig xorg USE_GCC= yes USE_LDCONFIG= yes USE_XORG= x11 JAVA_VENDOR= openjdk -JAVA_BUILD= yes -JAVA_RUN= yes PATCH_WRKSRC= ${WRKSRC:H} WRKSRC_SUBDIR= linux diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile --- a/graphics/mapyrus/Makefile +++ b/graphics/mapyrus/Makefile @@ -24,8 +24,7 @@ SUB_FILES= ${PORTNAME} pkg-message SUB_LIST= MAPYRUSJAR=${MAPYRUSJAR} -USES= zip -USE_JAVA= yes +USES= java zip do-install: @${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile --- a/graphics/ogre3d/Makefile +++ b/graphics/ogre3d/Makefile @@ -62,7 +62,7 @@ JAVA_CMAKE_BOOL= OGRE_BUILD_COMPONENT_JAVA JAVA_BUILD_DEPENDS= swig:devel/swig JAVA_VARS= CMAKE_ARGS+=-DJAVA_HOME=${JAVA_HOME} -JAVA_USE= JAVA=yes +JAVA_USES= java JAVA_BROKEN= error: incompatible types: SWIGTYPE_p_std__mapT_std__string_std__string_std__lessT_std__string_t_t__iterator cannot be converted to Iterator PYTHON_CMAKE_BOOL= OGRE_BUILD_COMPONENT_PYTHON diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -87,7 +87,7 @@ JAVA_BUILD_DEPENDS= ant:devel/apache-ant JAVA_CMAKE_BOOL= BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA JAVA_MAKE_ENV= JAVACMD=${JAVA} -JAVA_USE= JAVA=yes +JAVA_USES= java LTO_DESC= Enables Link Time Optimizations LTO_CMAKE_BOOL= ENABLE_THIN_LTO diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -54,7 +54,7 @@ .if defined(WITH_JAVA) ONLY_FOR_ARCHS= i386 -USE_JAVA= yes +USES+= java BUILD_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer RUN_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer CONFIGURE_ARGS+= --with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \ diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile --- a/graphics/openjump/Makefile +++ b/graphics/openjump/Makefile @@ -29,9 +29,7 @@ LICENSE_PERMS_JDOM= auto-accept LICENSE_PERMS_JYTHON= auto-accept -USES= zip -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java zip NO_ARCH= yes NO_BUILD= yes diff --git a/graphics/plantuml/Makefile b/graphics/plantuml/Makefile --- a/graphics/plantuml/Makefile +++ b/graphics/plantuml/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 -USE_JAVA= yes +USES= java NO_ARCH= yes NO_BUILD= yes diff --git a/graphics/processing/Makefile b/graphics/processing/Makefile --- a/graphics/processing/Makefile +++ b/graphics/processing/Makefile @@ -14,8 +14,8 @@ RUN_DEPENDS= jikes>=1.22:java/jikes \ ${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:comms/rxtx -USES= cpe tar:tgz -USE_JAVA= yes +USES= cpe java tar:tgz + NO_BUILD= yes SUB_FILES= processing diff --git a/graphics/tintfu/Makefile b/graphics/tintfu/Makefile --- a/graphics/tintfu/Makefile +++ b/graphics/tintfu/Makefile @@ -10,12 +10,13 @@ COMMENT= GraphViz .dot file editor WWW= https://tintfu.sourceforge.net/ +USES= java + NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . NO_BUILD= yes -USE_JAVA= yes PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}.jar \ bin/tintfu diff --git a/graphics/xmlgraphics-commons/Makefile b/graphics/xmlgraphics-commons/Makefile --- a/graphics/xmlgraphics-commons/Makefile +++ b/graphics/xmlgraphics-commons/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_JAVA= yes +USES= java NO_ARCH= yes NO_BUILD= yes diff --git a/graphics/yed/Makefile b/graphics/yed/Makefile --- a/graphics/yed/Makefile +++ b/graphics/yed/Makefile @@ -15,10 +15,8 @@ # Downloading requires acceptance of license agreement LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept -USES= cpe zip +USES= cpe java zip CPE_VENDOR= yworks -USE_JAVA= yes -JAVA_VERSION= 8+ DESKTOP_ENTRIES="yEd" "${COMMENT}" "" "yed" "Graphics;" false diff --git a/java/apache-bcel/Makefile b/java/apache-bcel/Makefile --- a/java/apache-bcel/Makefile +++ b/java/apache-bcel/Makefile @@ -11,8 +11,9 @@ LICENSE= APACHE20 +USES= java + NO_BUILD= yes -USE_JAVA= yes NO_ARCH= yes diff --git a/java/apache-commons-beanutils/Makefile b/java/apache-commons-beanutils/Makefile --- a/java/apache-commons-beanutils/Makefile +++ b/java/apache-commons-beanutils/Makefile @@ -16,10 +16,9 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections -USES= dos2unix -USE_JAVA= yes -USE_ANT= yes +USES= dos2unix java:ant DOS2UNIX_FILES= build.xml + ALL_TARGET= dist MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \ -Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar diff --git a/java/apache-commons-cli/Makefile b/java/apache-commons-cli/Makefile --- a/java/apache-commons-cli/Makefile +++ b/java/apache-commons-cli/Makefile @@ -11,7 +11,8 @@ LICENSE= APACHE20 -USE_JAVA= yes +USES= java + NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/java/apache-commons-codec/Makefile b/java/apache-commons-codec/Makefile --- a/java/apache-commons-codec/Makefile +++ b/java/apache-commons-codec/Makefile @@ -11,10 +11,10 @@ LICENSE= APACHE20 +USES= java + OPTIONS_DEFINE= DOCS -USE_JAVA= yes -JAVA_VERSION= 8+ NO_BUILD= yes NO_ARCH= yes diff --git a/java/apache-commons-collections/Makefile b/java/apache-commons-collections/Makefile --- a/java/apache-commons-collections/Makefile +++ b/java/apache-commons-collections/Makefile @@ -12,9 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USE_JAVA= yes +USES= java:ant JAVA_VERSION= 8 11 17 18 19 20 -USE_ANT= yes ALL_TARGET= jar NO_ARCH= yes diff --git a/java/apache-commons-collections4/Makefile b/java/apache-commons-collections4/Makefile --- a/java/apache-commons-collections4/Makefile +++ b/java/apache-commons-collections4/Makefile @@ -12,8 +12,7 @@ LICENSE= APACHE20 -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} NO_BUILD= yes diff --git a/java/apache-commons-dbcp/Makefile b/java/apache-commons-dbcp/Makefile --- a/java/apache-commons-dbcp/Makefile +++ b/java/apache-commons-dbcp/Makefile @@ -13,10 +13,11 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-pool.jar:java/apache-commons-pool +USES= java +JAVA_VERSION= 8 + OPTIONS_DEFINE= DOCS -USE_JAVA= yes -JAVA_VERSION= 8 NO_BUILD= yes NO_ARCH= yes diff --git a/java/apache-commons-httpclient/Makefile b/java/apache-commons-httpclient/Makefile --- a/java/apache-commons-httpclient/Makefile +++ b/java/apache-commons-httpclient/Makefile @@ -19,10 +19,9 @@ OPTIONS_DEFINE= DOCS -USES+= cpe +USES+= cpe java:ant CPE_VENDOR= apache -USE_JAVA= yes -USE_ANT= yes + MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES NO_ARCH= yes diff --git a/java/apache-commons-lang/Makefile b/java/apache-commons-lang/Makefile --- a/java/apache-commons-lang/Makefile +++ b/java/apache-commons-lang/Makefile @@ -11,9 +11,9 @@ LICENSE= APACHE20 -USE_JAVA= yes +USES= java:ant JAVA_VERSION= 8 -USE_ANT= yes + ALL_TARGET= jar NO_ARCH= yes diff --git a/java/apache-commons-lang3/Makefile b/java/apache-commons-lang3/Makefile --- a/java/apache-commons-lang3/Makefile +++ b/java/apache-commons-lang3/Makefile @@ -11,9 +11,10 @@ LICENSE= APACHE20 +USES= java + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_JAVA= yes NO_BUILD= yes NO_ARCH= yes diff --git a/java/apache-commons-logging/Makefile b/java/apache-commons-logging/Makefile --- a/java/apache-commons-logging/Makefile +++ b/java/apache-commons-logging/Makefile @@ -11,11 +11,12 @@ LICENSE= APACHE20 +USES= java + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= DOCS -USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes diff --git a/java/apache-commons-pool/Makefile b/java/apache-commons-pool/Makefile --- a/java/apache-commons-pool/Makefile +++ b/java/apache-commons-pool/Makefile @@ -11,10 +11,10 @@ LICENSE= APACHE20 +USES= java + OPTIONS_DEFINE= DOCS -USE_JAVA= yes -JAVA_VERSION= 8+ NO_BUILD= yes NO_ARCH= yes diff --git a/java/aparapi/Makefile b/java/aparapi/Makefile --- a/java/aparapi/Makefile +++ b/java/aparapi/Makefile @@ -15,15 +15,12 @@ LIB_DEPENDS= libOpenCL.so:devel/ocl-icd RUN_DEPENDS= opencl>=0:devel/opencl -ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le - +USES= dos2unix java:ant USE_GITHUB= yes -USE_JAVA= yes -USE_ANT= yes -ALL_TARGET= dist +ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le -USES= dos2unix +ALL_TARGET= dist do-install: (cd ${WRKSRC}/dist_freebsd && ${INSTALL_DATA} aparapi.jar ${STAGEDIR}${JAVAJARDIR}) diff --git a/java/avis/Makefile b/java/avis/Makefile --- a/java/avis/Makefile +++ b/java/avis/Makefile @@ -10,7 +10,7 @@ WWW= https://avis.sourceforge.net/ USES= zip -USE_JAVA= yes + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .if !defined(WITHOUT_COMPILE) @@ -18,7 +18,9 @@ ANT_CMD?= ${LOCALBASE}/bin/ant ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} ANT_TARGETS= jar-server -JAVA_BUILD= yes +USES+= java:build +.else +USES+= java .endif OPTIONS_DEFINE= DOCS diff --git a/java/berkeley-db/Makefile b/java/berkeley-db/Makefile --- a/java/berkeley-db/Makefile +++ b/java/berkeley-db/Makefile @@ -15,10 +15,11 @@ BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:java/junit +USES= java:ant +JAVA_VERSION= 8 + OPTIONS_DEFINE= DOCS EXAMPLES TEST -USE_JAVA= 8 -USE_ANT= yes MAKE_ENV+= JAVALIBDIR="${JAVALIBDIR}" MAKE_ARGS+= -cp ${JAVALIBDIR}/junit.jar EXTRACT_AFTER_ARGS+= --exclude '*.jar' diff --git a/java/bluej/Makefile b/java/bluej/Makefile --- a/java/bluej/Makefile +++ b/java/bluej/Makefile @@ -15,10 +15,11 @@ RUN_DEPENDS= openjfx14>0:java/openjfx14 +USES= java + NO_ARCH= yes NO_BUILD= yes -USE_JAVA= yes JAVA_VERSION= 11+ SUB_FILES= bluej SUB_LIST= JAVA_HOME=${JAVA_HOME} diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile --- a/java/bouncycastle/Makefile +++ b/java/bouncycastle/Makefile @@ -20,13 +20,11 @@ OPTIONS_DEFINE= DOCS +USES= cpe java:ant CPE_PRODUCT= legion-of-the-bouncy-castle-java-crytography-api CPE_VENDOR= ${PORTNAME} -USE_JAVA= yes -USES= cpe JDKMVERSION= 1.6 # ${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/} JDKNVERSION= 16 # ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/} -USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES MAKE_ARGS= -f jdk${JDKNVERSION}.xml ALL_TARGET= build-provider build zip-src diff --git a/java/bouncycastle15/Makefile b/java/bouncycastle15/Makefile --- a/java/bouncycastle15/Makefile +++ b/java/bouncycastle15/Makefile @@ -19,11 +19,9 @@ ${JAVALIBDIR}/mail.jar:java/javamail RUN_DEPENDS= ${JAVALIBDIR}/mail.jar:java/javamail -USES= cpe +USES= cpe java:ant CPE_VENDOR= ${PORTNAME} CPE_PRODUCT= legion-of-the-bouncy-castle-java-crytography-api -USE_ANT= yes -USE_JAVA= yes MAKE_ARGS= -f \ ant/jdk${JDKNVERSION}+.xml diff --git a/java/cos/Makefile b/java/cos/Makefile --- a/java/cos/Makefile +++ b/java/cos/Makefile @@ -22,8 +22,8 @@ BROKEN= unfetchable, upstream seems gone NO_WRKSUBDIR= yes -USES= zip -USE_JAVA= yes +USES= java zip + NO_BUILD= yes DATAFILES= readme.txt license.txt doc DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/java/dbvis/Makefile b/java/dbvis/Makefile --- a/java/dbvis/Makefile +++ b/java/dbvis/Makefile @@ -14,8 +14,9 @@ # Redistribution is not permitted LICENSE_PERMS= auto-accept -USE_JAVA= yes +USES= java JAVA_VENDOR= openjdk + NO_BUILD= yes WRKSRC= ${WRKDIR}/DbVisualizer diff --git a/java/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile --- a/java/eclipse-cdt/Makefile +++ b/java/eclipse-cdt/Makefile @@ -15,11 +15,8 @@ RUN_DEPENDS= eclipse:java/eclipse -USES= zip -USE_JAVA= YES +USES= java zip JAVA_OS= native -JAVA_RUN= YES -JAVA_VERSION= 8+ NO_BUILD= YES NO_WRKSUBDIR= YES diff --git a/java/eclipse-drjava/Makefile b/java/eclipse-drjava/Makefile --- a/java/eclipse-drjava/Makefile +++ b/java/eclipse-drjava/Makefile @@ -12,10 +12,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/eclipse:java/eclipse -USES= zip +USES= java zip NO_BUILD= yes NO_WRKSUBDIR= yes -USE_JAVA= yes JAVA_OS= native diff --git a/java/eclipse-ecj/Makefile b/java/eclipse-ecj/Makefile --- a/java/eclipse-ecj/Makefile +++ b/java/eclipse-ecj/Makefile @@ -17,9 +17,9 @@ EXTRACT_BEFORE_ARGS= xf EXTRACT_AFTER_ARGS= -C ${WRKSRC} -USE_ANT= yes -USE_JAVA= yes +USES= java:ant JAVA_VERSION= 8 + SUB_FILES= ecj.sh SUB_LIST= PORTVERSION=${PORTVERSION} NO_WRKSUBDIR= yes diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile --- a/java/eclipse-findbugs/Makefile +++ b/java/eclipse-findbugs/Makefile @@ -12,9 +12,8 @@ RUN_DEPENDS= eclipse:java/eclipse -USES= zip +USES= java zip NO_BUILD= yes -USE_JAVA= yes JAVA_OS= native PLIST_SUB= \ diff --git a/java/eclipse-pydev/Makefile b/java/eclipse-pydev/Makefile --- a/java/eclipse-pydev/Makefile +++ b/java/eclipse-pydev/Makefile @@ -13,12 +13,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/eclipse:java/eclipse -USES= python zip - -USE_JAVA= YES -JAVA_VERSION= 8+ +USES= java python zip JAVA_OS= native -JAVA_RUN= YES NO_BUILD= YES NO_WRKSUBDIR= YES @@ -29,11 +25,7 @@ JYTHON_DESC= Use Jython as Python interpreter -.include - -.if ${PORT_OPTIONS:MJYTHON} -RUN_DEPENDS+= jython:lang/jython -.endif +JYTHON_RUN_DEPENDS= jython:lang/jython PLUGINDIR= share/eclipse/dropins/${PORTNAME}/eclipse diff --git a/java/eclipse-shelled/Makefile b/java/eclipse-shelled/Makefile --- a/java/eclipse-shelled/Makefile +++ b/java/eclipse-shelled/Makefile @@ -13,10 +13,9 @@ RUN_DEPENDS= eclipse:java/eclipse -USES= zip +USES= java zip NO_BUILD= yes NO_WRKSUBDIR= yes -USE_JAVA= yes JAVA_OS= native do-install: diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -20,7 +20,8 @@ LIB_DEPENDS= libsecret-1.so:security/libsecret \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 -USES= compiler:c++17-lang gl gmake pkgconfig gnome +USES= compiler:c++17-lang gl gmake java pkgconfig gnome +JAVA_VERSION= 17+ # The github repositories. The repository under NorbertXYZ is for a predefined maven # download, so the build does not need to download while do-build is running @@ -41,7 +42,6 @@ NorbertXYZ:eclipse_maven:${DISTVERSION}:n USE_GL= gl glu USE_GNOME= gtk30 -USE_JAVA= 17+ DESKTOP_ENTRIES= "Eclipse" \ "${COMMENT}" \ diff --git a/java/eclipse/Makefile.plugins b/java/eclipse/Makefile.plugins --- a/java/eclipse/Makefile.plugins +++ b/java/eclipse/Makefile.plugins @@ -1,5 +1,5 @@ NO_BUILD= yes -USE_JAVA= yes +USES+= java JAVA_VERSION= 17+ REPO_DIRS?= features plugins diff --git a/java/hamcrest/Makefile b/java/hamcrest/Makefile --- a/java/hamcrest/Makefile +++ b/java/hamcrest/Makefile @@ -9,7 +9,8 @@ COMMENT= Library of matchers for building test expressions WWW= https://hamcrest.org/ -USE_JAVA= yes +USES= java + NO_ARCH= yes NO_BUILD= yes diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -19,9 +19,8 @@ GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -USES= autoreconf compiler:c++11-lang desktop-file-utils gmake \ +USES= autoreconf compiler:c++11-lang desktop-file-utils gmake java \ pkgconfig shebangfix xorg -USE_JAVA= yes JAVA_VERSION= 8 JAVA_OS= native JAVA_VENDOR= openjdk diff --git a/java/infobus/Makefile b/java/infobus/Makefile --- a/java/infobus/Makefile +++ b/java/infobus/Makefile @@ -17,8 +17,7 @@ DEPRECATED= Outdated API and is no longer actively developed or maintained EXPIRATION_DATE=2025-01-25 -USES= zip -USE_JAVA= YES +USES= java zip NO_BUILD= yes diff --git a/java/intellij-ultimate/Makefile b/java/intellij-ultimate/Makefile --- a/java/intellij-ultimate/Makefile +++ b/java/intellij-ultimate/Makefile @@ -20,7 +20,7 @@ jetbrains-sqlite>=241.15989.150:devel/jetbrains-sqlite \ lsof:sysutils/lsof -USE_JAVA= yes +USES= java JAVA_VERSION= 17+ CONFLICTS= idea intellij diff --git a/java/intellij/Makefile b/java/intellij/Makefile --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -17,13 +17,9 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier -USES= cpe python:run shebangfix +USES= cpe java python:run shebangfix CPE_VENDOR= jetbrains CPE_PRODUCT= ${PORTNAME}_idea - -USE_JAVA= yes -JAVA_VERSION= 8+ - SHEBANG_FILES= bin/printenv.py bin/restart.py NO_ARCH= yes diff --git a/java/jai/Makefile b/java/jai/Makefile --- a/java/jai/Makefile +++ b/java/jai/Makefile @@ -15,9 +15,9 @@ LICENSE_TEXT= Redistribution is not permitted LICENSE_PERMS= auto-accept -USES= cpe zip +USES= cpe java zip CPE_VENDOR= oracle -USE_JAVA= yes + WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} NO_BUILD= yes diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile --- a/java/jakarta-oro/Makefile +++ b/java/jakarta-oro/Makefile @@ -10,8 +10,8 @@ LICENSE= APACHE20 -USE_JAVA= yes -USE_ANT= yes +USES= java:ant + ALL_TARGET= jar javadocs JAVALIBNAME= ${PORTNAME}-${PORTVERSION} diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile --- a/java/jasmin/Makefile +++ b/java/jasmin/Makefile @@ -9,12 +9,11 @@ COMMENT= Java Assembler Interface WWW= https://jasmin.sourceforge.net/ -USES= dos2unix zip -USE_ANT= yes -ALL_TARGET= jasmin -USE_JAVA= yes -JAVA_VERSION= 8 +USES= dos2unix java:ant zip DOS2UNIX_REGEX= .*\.(txt|xml|j|class|java|mf|css|bnf|html) +JAVA_VERSION= 8 + +ALL_TARGET= jasmin SUB_FILES= jasmin.sh diff --git a/java/java-cup/Makefile b/java/java-cup/Makefile --- a/java/java-cup/Makefile +++ b/java/java-cup/Makefile @@ -15,7 +15,8 @@ http://www2.cs.tum.edu/projects/cup/licence.php LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USE_JAVA= yes +USES= java + NO_BUILD= yes SUB_FILES= java-cup.sh diff --git a/java/java-getopt/Makefile b/java/java-getopt/Makefile --- a/java/java-getopt/Makefile +++ b/java/java-getopt/Makefile @@ -9,10 +9,10 @@ LICENSE= LGPL20 +USES= java:ant + OPTIONS_DEFINE= DOCS -USE_JAVA= yes -USE_ANT= yes ALL_TARGET= jar NO_WRKSUBDIR= yes diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile --- a/java/java-subversion/Makefile +++ b/java/java-subversion/Makefile @@ -5,12 +5,8 @@ COMMENT= Java bindings for Version control system WWW= https://subversion.apache.org/ -USES= compiler - -USE_JAVA= yes +USES= compiler java JAVA_OS= native -JAVA_BUILD= yes -JAVA_RUN= yes PORTREVISION_LATEST= 0 PORTREVISION_LTS= 0 diff --git a/java/java3d/Makefile b/java/java3d/Makefile --- a/java/java3d/Makefile +++ b/java/java3d/Makefile @@ -15,12 +15,11 @@ BROKEN_armv6= fails to compile: build.xml: Compile failed; see the compiler error output for details BROKEN_armv7= fails to compile: build.xml: Compile failed; see the compiler error output for details -USES= compiler:c11 gl tar:bzip2 xorg -USE_JAVA= 8 +USES= compiler:c11 gl java:ant tar:bzip2 xorg +JAVA_VERSION= 8 USE_GL= gl USE_XORG= xt JAVA_VENDOR= openjdk -USE_ANT= yes LLD_UNSAFE= yes PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH} diff --git a/java/javahelp/Makefile b/java/javahelp/Makefile --- a/java/javahelp/Makefile +++ b/java/javahelp/Makefile @@ -12,11 +12,10 @@ BUILD_DEPENDS= ${TOMCAT_jsp}:${TOMCAT_PORT} +USES= java:ant USE_GITHUB= yes GH_ACCOUNT= javaee GH_TAGNAME= 3ca862d -USE_JAVA= yes -USE_ANT= yes TOMCAT_VER?= 9.0 TOMCAT_PORT= www/tomcat${TOMCAT_VER:S/.0//:S/.//} diff --git a/java/javamail/Makefile b/java/javamail/Makefile --- a/java/javamail/Makefile +++ b/java/javamail/Makefile @@ -12,14 +12,12 @@ OPTIONS_DEFINE= DOCS EXAMPLES -USES= cpe +USES= cpe java:ant USE_GITHUB= yes GH_ACCOUNT= javaee - CPE_VENDOR= sun -USE_JAVA= YES JAVA_VERSION= 8 -USE_ANT= YES + NO_ARCH= yes PLIST_FILES= %%JAVAJARDIR%%/mail.jar diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -21,7 +21,7 @@ SRC= ${.CURDIR}/src SCRIPTS= classpath javavmwrapper -# This is normally defined by bsd.java.mk when USE_JAVA is defined, but +# This is normally defined by bsd.java.mk when USES=java is defined, but # we can't do that here since it would result in a circular dependency JAVALIBDIR= ${LOCALBASE}/share/java/classes diff --git a/java/jaxen/Makefile b/java/jaxen/Makefile --- a/java/jaxen/Makefile +++ b/java/jaxen/Makefile @@ -9,7 +9,8 @@ COMMENT= Java XPath Engine WWW= https://jaxen.org -USE_JAVA= YES +USES= java + NO_BUILD= YES JARFILES= jaxen-core.jar jaxen-dom.jar jaxen-dom4j.jar jaxen-exml.jar jaxen-full.jar jaxen-jdom.jar lib/saxpath.jar diff --git a/java/jcalendar/Makefile b/java/jcalendar/Makefile --- a/java/jcalendar/Makefile +++ b/java/jcalendar/Makefile @@ -7,10 +7,9 @@ COMMENT= Java Date Chooser WWW= https://www.toedter.com/en/jcalendar/ -USES= zip -USE_JAVA= yes +USES= java:ant zip JAVA_VERSION= 8 -USE_ANT= yes + WRKSRC= ${WRKDIR}/src PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \ %%JAVAJARDIR%%/looks-2.0.1.jar diff --git a/java/jcckit/Makefile b/java/jcckit/Makefile --- a/java/jcckit/Makefile +++ b/java/jcckit/Makefile @@ -12,8 +12,8 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= zip -USE_JAVA= yes +USES= java zip + WRKSRC= ${WRKDIR}/JCCKit NO_BUILD= yes NO_ARCH= yes diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile --- a/java/jcommon/Makefile +++ b/java/jcommon/Makefile @@ -10,26 +10,25 @@ LICENSE= LGPL21 USES= zip -USE_JAVA= yes OPTIONS_DEFINE= COMPILE DOCS OPTIONS_DEFAULT=COMPILE COMPILE_DESC= Build from source +COMPILE_USES= java:ant +COMPILE_USES_OFF= java +COMPILE_VARS_OFF= NO_BUILD=yes +COMPILE_ALL_TARGET= compile-xml + .include .if ${PORT_OPTIONS:MCOMPILE} -USE_ANT= yes -ALL_TARGET= compile-xml BUILD_WRKSRC= ${WRKSRC}/ant -.else -NO_BUILD= yes -.endif - -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MCOMPILE} +.if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= javadoc PORTDOCS= * .endif +.endif PLIST_FILES= %%JAVAJARDIR%%/jcommon.jar %%JAVAJARDIR%%/jcommon-xml.jar diff --git a/java/jd-gui/Makefile b/java/jd-gui/Makefile --- a/java/jd-gui/Makefile +++ b/java/jd-gui/Makefile @@ -13,10 +13,9 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= desktop-file-utils +USES= desktop-file-utils java USE_GITHUB= yes GH_ACCOUNT= java-decompiler -USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes diff --git a/java/jdom/Makefile b/java/jdom/Makefile --- a/java/jdom/Makefile +++ b/java/jdom/Makefile @@ -10,9 +10,9 @@ RUN_DEPENDS= ${JAVALIBDIR}/jaxen-jdom.jar:java/jaxen -USE_JAVA= yes +USES= java:ant JAVA_VERSION= 8 -USE_ANT= yes + ALL_TARGET= package WRKSRC= ${WRKDIR}/${PORTNAME} @@ -25,23 +25,21 @@ OPTIONS_DEFINE= DOCS EXAMPLES -.include - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -.endif +DOCS_ALL_TARGET= javadoc do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${WRKSRC}/build/jdom.jar ${STAGEDIR}${JAVAJARDIR} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/build/samples/ && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${EXAMPLESDIR}) -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC} && ${INSTALL_DATA} README.txt TODO.txt CHANGES.txt \ COMMITTERS.txt LICENSE.txt ${STAGEDIR}${DOCSDIR}) -.endif + +do-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/build/samples/ && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/java/jflex/Makefile b/java/jflex/Makefile --- a/java/jflex/Makefile +++ b/java/jflex/Makefile @@ -9,7 +9,7 @@ LICENSE= BSD3CLAUSE -USE_JAVA= yes +USES= java # # JFlex has two build options --- Maven and Bazel --- and neither of diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile --- a/java/jfreechart/Makefile +++ b/java/jfreechart/Makefile @@ -11,27 +11,26 @@ RUN_DEPENDS= ${JAVALIBDIR}/jcommon.jar:java/jcommon -USE_JAVA= yes - OPTIONS_DEFINE= COMPILE DOCS OPTIONS_DEFAULT=COMPILE + COMPILE_DESC= Build from source +COMPILE_USES= java:ant +COMPILE_USES_OFF= java +COMPILE_USE= LOCALE=en_US.UTF-8 +COMPILE_ALL_TARGET= compile +COMPILE_VARS_OFF= NO_BUILD=yes + .include .if ${PORT_OPTIONS:MCOMPILE} -USE_ANT= yes -USE_LOCALE= en_US.UTF-8 -ALL_TARGET= compile BUILD_WRKSRC= ${WRKSRC}/ant -.else -NO_BUILD= yes -.endif - -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MCOMPILE} +.if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= javadoc PORTDOCS= * .endif +.endif PLIST_FILES= %%JAVAJARDIR%%/jfreechart.jar diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile --- a/java/jgraph/Makefile +++ b/java/jgraph/Makefile @@ -13,14 +13,16 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +USES= zip + +NO_WRKSUBDIR= yes + OPTIONS_DEFINE= COMPILE DOCS COMPILE_DESC= Compile from source instead of using prebuilt binaries -USES= zip -NO_WRKSUBDIR= yes -USE_JAVA= yes -JAVA_RUN= yes +COMPILE_USES= java:build +COMPILE_USES_OFF= java .include @@ -28,7 +30,6 @@ BUILD_DEPENDS+= ${ANT_CMD}:devel/apache-ant ANT_CMD?= ${LOCALBASE}/bin/ant ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} -JAVA_BUILD= yes ANT_TARGETS= jar . if ${PORT_OPTIONS:MDOCS} ANT_TARGETS+= doc diff --git a/java/jgraphx/Makefile b/java/jgraphx/Makefile --- a/java/jgraphx/Makefile +++ b/java/jgraphx/Makefile @@ -10,10 +10,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt +USES= java:ant USE_GITHUB= yes GH_ACCOUNT= jgraph -USE_JAVA= yes -USE_ANT= yes NO_ARCH= yes diff --git a/java/jlex/Makefile b/java/jlex/Makefile --- a/java/jlex/Makefile +++ b/java/jlex/Makefile @@ -11,8 +11,9 @@ COMMENT= Lexical analyzer generator, written for Java, in Java WWW= https://www.cs.princeton.edu/~appel/modern/java/JLex/ +USES= java + PLIST_FILES= %%JAVAJARDIR%%/jlex.jar bin/jlex -USE_JAVA= yes NO_WRKSUBDIR= yes SUB_FILES= jlex.sh pkg-message diff --git a/java/jmf/Makefile b/java/jmf/Makefile --- a/java/jmf/Makefile +++ b/java/jmf/Makefile @@ -14,8 +14,8 @@ LICENSE_TEXT= Redistribution of pre-compiled binaries is not permitted LICENSE_PERMS= auto-accept -USES= zip -USE_JAVA= yes +USES= java zip + NO_BUILD= YES WRKSRC= ${WRKDIR}/JMF-${PORTVERSION} diff --git a/java/jode/Makefile b/java/jode/Makefile --- a/java/jode/Makefile +++ b/java/jode/Makefile @@ -12,11 +12,11 @@ BUILD_DEPENDS= ${GETOPT_JAR}:java/java-getopt RUN_DEPENDS:= ${BUILD_DEPENDS} +USES= gmake java perl5 shebangfix + VENDOR_VERSION= 1.1.2-pre1 -USE_JAVA= yes NEED_JAVAC= yes GNU_CONFIGURE= yes -USES= gmake perl5 shebangfix SHEBANG_FILES= ${WRKSRC}/jcpp USE_PERL5= test MAKE_JOBS_UNSAFE= yes diff --git a/java/jrosetta/Makefile b/java/jrosetta/Makefile --- a/java/jrosetta/Makefile +++ b/java/jrosetta/Makefile @@ -12,9 +12,8 @@ COMMENT= API for building a graphical console in Swing WWW= http://dev.artenum.com/projects/JRosetta -USES= zip -USE_JAVA= yes -JAVA_RUN= yes +USES= java zip + NO_ARCH= yes NO_BUILD= yes diff --git a/java/jta/Makefile b/java/jta/Makefile --- a/java/jta/Makefile +++ b/java/jta/Makefile @@ -14,8 +14,7 @@ LICENSE_TEXT= See the license LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -USES= zip -USE_JAVA= yes +USES= java zip NO_BUILD= yes DOWNLOAD_URL= http://download.oracle.com/otndocs/jcp/7286-jta-${PORTVERSION}-spec-oth-JSpec/?submit=Download diff --git a/java/jtiger/Makefile b/java/jtiger/Makefile --- a/java/jtiger/Makefile +++ b/java/jtiger/Makefile @@ -7,7 +7,8 @@ COMMENT= Unit Test Framework and Tools for the Java2 Platform WWW= http://www.jtiger.org/ -USE_JAVA= yes +USES= java + NO_BUILD= yes NO_WRKSUBDIR= yes NO_ARCH= yes diff --git a/java/jump/Makefile b/java/jump/Makefile --- a/java/jump/Makefile +++ b/java/jump/Makefile @@ -8,8 +8,8 @@ COMMENT= Java library for arbitrary precision computations WWW= https://jump-math.sourceforge.net/ -USE_JAVA= yes -USE_ANT= yes +USES= java:ant + ALL_TARGET= jar JARFILE= ${PORTNAME}.jar @@ -19,17 +19,13 @@ OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= apidocs -.endif +DOCS_ALL_TARGET= apidocs do-install: ${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${STAGEDIR}${JAVAJARDIR} -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.endif .include diff --git a/java/junit/Makefile b/java/junit/Makefile --- a/java/junit/Makefile +++ b/java/junit/Makefile @@ -11,10 +11,10 @@ RUN_DEPENDS= ${JAVALIBDIR}/hamcrest.jar:java/hamcrest -USES= cpe +USES= cpe java CPE_VENDOR= ${PORTNAME} CPE_PRODUCT= ${PORTNAME}4 -USE_JAVA= yes + NO_ARCH= yes NO_BUILD= yes diff --git a/java/jxgrabkey/Makefile b/java/jxgrabkey/Makefile --- a/java/jxgrabkey/Makefile +++ b/java/jxgrabkey/Makefile @@ -11,12 +11,13 @@ LICENSE= LGPL3 -USES= tar:bz2 -USE_JAVA= yes -USE_ANT= yes +USES= java:ant tar:bz2 + OPTIONS_DEFINE= TEST + TEST_BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:java/junit \ ${JAVALIBDIR}/hamcrest.jar:java/hamcrest + MAKE_ENV+= JAVA_HOME=${JAVA_HOME} OPSYS=${OPSYS} PLIST_FILES= %%JAVAJARDIR%%/JXGrabKey.jar lib/libJXGrabKey.so USE_LDCONFIG= yes diff --git a/java/lightweight-java-profiler/Makefile b/java/lightweight-java-profiler/Makefile --- a/java/lightweight-java-profiler/Makefile +++ b/java/lightweight-java-profiler/Makefile @@ -15,15 +15,13 @@ ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= assembly only available for x86 +USES= gmake java shebangfix +JAVA_VERSION= 8 USE_GITHUB= yes GH_ACCOUNT= inevity GH_TAGNAME= e8041b5 -USE_JAVA= yes -JAVA_VERSION= 8 - USE_LDCONFIG= yes -USES= gmake shebangfix SHEBANG_FILES= Makefile diff --git a/java/mx4j/Makefile b/java/mx4j/Makefile --- a/java/mx4j/Makefile +++ b/java/mx4j/Makefile @@ -8,7 +8,8 @@ COMMENT= Open Source implementation of the Java Management Extensions (JMX) WWW= https://mx4j.sourceforge.net -USE_JAVA= yes +USES= java + NO_BUILD= yes JARFILES= mx4j-examples.jar mx4j-impl.jar mx4j-jmx.jar \ diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile --- a/java/netbeans/Makefile +++ b/java/netbeans/Makefile @@ -11,12 +11,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cpe shebangfix zip - +USES= cpe java shebangfix zip CPE_VENDOR= apache - -USE_JAVA= yes JAVA_VERSION= 11 17 + NO_BUILD= yes SHEBANG_FILES= extide/ant/bin/antRun.pl \ diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile --- a/java/netrexx/Makefile +++ b/java/netrexx/Makefile @@ -9,9 +9,9 @@ COMMENT= Human-oriented programming language for writing/using Java classes WWW= http://www-306.ibm.com/software/awdtools/netrexx/ +USES= java zip + NO_BUILD= yes -USES= zip -USE_JAVA= yes OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/java/netty/Makefile b/java/netty/Makefile --- a/java/netty/Makefile +++ b/java/netty/Makefile @@ -11,11 +11,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cpe tar:bzip2 -USE_JAVA= yes +USES= cpe java:extract tar:bzip2 -JAVA_VERSION= 8+ -JAVA_EXTRACT= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.Final diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile --- a/java/openjfx14/Makefile +++ b/java/openjfx14/Makefile @@ -33,7 +33,7 @@ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -USES= gettext-runtime gl gnome jpeg localbase:ldflags ninja pkgconfig \ +USES= gettext-runtime gl gnome java jpeg localbase:ldflags ninja pkgconfig \ sqlite xorg USE_GITHUB= yes @@ -41,7 +41,6 @@ GH_PROJECT= jfx USE_GL= gl USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango -USE_JAVA= yes JAVA_VERSION= 11 USE_LDCONFIG= yes USE_XORG= x11 xtst xxf86vm diff --git a/java/phpeclipse/Makefile b/java/phpeclipse/Makefile --- a/java/phpeclipse/Makefile +++ b/java/phpeclipse/Makefile @@ -14,9 +14,7 @@ PLUGIN_PATHS= features plugins PATCH_TASKS= eclipse.versionReplacer eclipse.idReplacer -USES= zip:infozip -USE_JAVA= yes -USE_ANT= yes +USES= java:ant zip:infozip WRKSRC= ${WRKDIR}/dist ECLIPSE= lib/eclipse diff --git a/java/proguard/Makefile b/java/proguard/Makefile --- a/java/proguard/Makefile +++ b/java/proguard/Makefile @@ -9,9 +9,10 @@ LICENSE= GPLv2 +USES= java + OPTIONS_DEFINE= DOCS EXAMPLES -USE_JAVA= yes NO_BUILD= yes NO_ARCH= yes diff --git a/java/servingxml/Makefile b/java/servingxml/Makefile --- a/java/servingxml/Makefile +++ b/java/servingxml/Makefile @@ -9,12 +9,11 @@ BUILD_DEPENDS= ${ANT_CMD}:devel/apache-ant -USES= zip -USE_JAVA= yes +USES= java:build zip + ANT_CMD?= ${LOCALBASE}/bin/ant ANT= ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD} ANT_TARGETS= dist -JAVA_BUILD= yes do-build: @cd ${WRKSRC} && ${ANT} ${ANT_TARGETS} diff --git a/java/sigar/Makefile b/java/sigar/Makefile --- a/java/sigar/Makefile +++ b/java/sigar/Makefile @@ -15,14 +15,12 @@ LIB_DEPENDS= libsigar.so:devel/sigar TEST_DEPENDS= ${JAVALIBDIR}/junit.jar:java/junit +USES= java perl5 USE_GITHUB= yes GH_ACCOUNT= polo-language # amishHammer GH_TAGNAME= 6719d4d - -USES= perl5 USE_PERL5= build -USE_JAVA= yes -JAVA_RUN= yes + NO_CCACHE= yes BUILD_WRKSRC= ${WRKSRC}/bindings/java diff --git a/java/springframework/Makefile b/java/springframework/Makefile --- a/java/springframework/Makefile +++ b/java/springframework/Makefile @@ -13,8 +13,7 @@ CONFLICTS= springframework-3.1.* NO_BUILD= yes -USE_JAVA= yes -USES= zip +USES= java zip OPTIONS_DEFINE= DOCS RESRCS RESRCS_DESC= Install resource files diff --git a/java/springframework31/Makefile b/java/springframework31/Makefile --- a/java/springframework31/Makefile +++ b/java/springframework31/Makefile @@ -16,8 +16,7 @@ CONFLICTS= springframework-3.2.* NO_BUILD= yes -USE_JAVA= yes -USES= zip +USES= java zip OPTIONS_DEFINE= DOCS RESRCS RESRCS_DESC= Install resource files diff --git a/java/sqlitejdbc/Makefile b/java/sqlitejdbc/Makefile --- a/java/sqlitejdbc/Makefile +++ b/java/sqlitejdbc/Makefile @@ -12,9 +12,10 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +USES= gmake java tar:tgz +JAVA_VERSION= 8 + WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION} -USE_JAVA= 8 -USES= gmake tar:tgz MAKE_ENV= JAVA_HOME="${JAVA_HOME}" ALL_TARGET= native diff --git a/java/trove4j/Makefile b/java/trove4j/Makefile --- a/java/trove4j/Makefile +++ b/java/trove4j/Makefile @@ -11,7 +11,8 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USE_JAVA= yes +USES= java + NO_BUILD= yes PORTDOCS= javadocs AUTHORS.txt CHANGES.txt LICENSE.txt README-idea-devel.txt \ diff --git a/java/visualvm/Makefile b/java/visualvm/Makefile --- a/java/visualvm/Makefile +++ b/java/visualvm/Makefile @@ -13,10 +13,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= desktop-file-utils zip:infozip +USES= desktop-file-utils java zip:infozip + NO_BUILD= yes -USE_JAVA= yes -JAVA_VERSION= 8+ WRKSRC= ${WRKDIR}/visualvm_${PORTVERSION:S/.//g} SUB_FILES= visualvm.desktop diff --git a/java/wildfly/Makefile b/java/wildfly/Makefile --- a/java/wildfly/Makefile +++ b/java/wildfly/Makefile @@ -10,7 +10,8 @@ LICENSE= GPLv2 -USE_JAVA= 17+ +USES= java +JAVA_VERSION= 17+ USE_RC_SUBR= wildfly NO_BUILD= yes diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile --- a/lang/abcl/Makefile +++ b/lang/abcl/Makefile @@ -11,6 +11,8 @@ BROKEN_armv6= fails to build: build.xml: Java returned: 1 BROKEN_armv7= fails to build: build.xml: Java returned: 1 +USES= java:ant + PLIST_FILES= share/java/classes/abcl.jar \ share/java/classes/abcl-contrib.jar \ bin/abcl @@ -18,9 +20,6 @@ SUB_LIST+= JAVAJARDIR="${JAVAJARDIR}" SUB_FILES= abcl -USE_JAVA= yes -USE_ANT= yes - do-install: ${INSTALL_DATA} -v ${WRKSRC}/dist/abcl.jar ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} -v ${WRKSRC}/dist/abcl-contrib.jar ${STAGEDIR}${JAVAJARDIR} diff --git a/lang/apache-commons-jelly/Makefile b/lang/apache-commons-jelly/Makefile --- a/lang/apache-commons-jelly/Makefile +++ b/lang/apache-commons-jelly/Makefile @@ -11,7 +11,8 @@ LICENSE= APACHE20 -USE_JAVA= yes +USES= java + NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile --- a/lang/bsh/Makefile +++ b/lang/bsh/Makefile @@ -8,13 +8,12 @@ LICENSE= APACHE20 +USES= java:ant +JAVA_VERSION= 8 USE_GITHUB= yes GH_ACCOUNT= beanshell GH_PROJECT= beanshell -USE_JAVA= 8 -USE_ANT= yes - CONFLICTS_INSTALL= schilyutils # bin/bsh ALL_TARGET= jarall diff --git a/lang/ceylon/Makefile b/lang/ceylon/Makefile --- a/lang/ceylon/Makefile +++ b/lang/ceylon/Makefile @@ -11,11 +11,9 @@ LICENSE= APACHE20 GPLv2 LICENSE_COMB= multi -USES= zip -NO_BUILD= yes +USES= java zip -USE_JAVA= yes -JAVA_RUN= yes +NO_BUILD= yes PORTDATA= * diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile --- a/lang/clojure/Makefile +++ b/lang/clojure/Makefile @@ -14,8 +14,8 @@ RUN_DEPENDS= bash:shells/bash \ rlwrap:devel/rlwrap -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java + NO_ARCH= yes NO_BUILD= yes diff --git a/lang/erlang-java/Makefile b/lang/erlang-java/Makefile --- a/lang/erlang-java/Makefile +++ b/lang/erlang-java/Makefile @@ -14,10 +14,9 @@ RUN_DEPENDS= erl:lang/erlang -USES= autoreconf:build gmake perl5 +USES= autoreconf:build gmake java perl5 USE_GITHUB= yes GH_PROJECT= otp -USE_JAVA= yes USE_PERL5= build GNU_CONFIGURE= yes diff --git a/lang/erlang-runtime21/Makefile b/lang/erlang-runtime21/Makefile --- a/lang/erlang-runtime21/Makefile +++ b/lang/erlang-runtime21/Makefile @@ -71,7 +71,7 @@ HIPE_CONFIGURE_ENABLE= hipe JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java KQUEUE_CONFIGURE_ENABLE= kernel-poll NATIVE_IMPLIES= HIPE NATIVE_CONFIGURE_ENABLE= native-libs diff --git a/lang/erlang-runtime22/Makefile b/lang/erlang-runtime22/Makefile --- a/lang/erlang-runtime22/Makefile +++ b/lang/erlang-runtime22/Makefile @@ -71,7 +71,7 @@ HIPE_CONFIGURE_ENABLE= hipe JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java KQUEUE_CONFIGURE_ENABLE= kernel-poll NATIVE_IMPLIES= HIPE NATIVE_CONFIGURE_ENABLE= native-libs diff --git a/lang/erlang-runtime23/Makefile b/lang/erlang-runtime23/Makefile --- a/lang/erlang-runtime23/Makefile +++ b/lang/erlang-runtime23/Makefile @@ -69,7 +69,7 @@ HIPE_CONFIGURE_ENABLE= hipe JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java KQUEUE_CONFIGURE_ENABLE= kernel-poll NATIVE_IMPLIES= HIPE NATIVE_CONFIGURE_ENABLE= native-libs diff --git a/lang/erlang-runtime24/Makefile b/lang/erlang-runtime24/Makefile --- a/lang/erlang-runtime24/Makefile +++ b/lang/erlang-runtime24/Makefile @@ -70,7 +70,7 @@ DTRACE_VARS= STRIP="" JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java KQUEUE_CONFIGURE_ENABLE= kernel-poll ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_USES= localbase:ldflags diff --git a/lang/erlang-runtime25/Makefile b/lang/erlang-runtime25/Makefile --- a/lang/erlang-runtime25/Makefile +++ b/lang/erlang-runtime25/Makefile @@ -70,7 +70,7 @@ DTRACE_VARS= STRIP="" JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java KQUEUE_CONFIGURE_ENABLE= kernel-poll ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_USES= localbase:ldflags diff --git a/lang/erlang-runtime26/Makefile b/lang/erlang-runtime26/Makefile --- a/lang/erlang-runtime26/Makefile +++ b/lang/erlang-runtime26/Makefile @@ -68,7 +68,7 @@ DTRACE_VARS= STRIP="" JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java KQUEUE_CONFIGURE_ENABLE= kernel-poll ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_USES= localbase:ldflags diff --git a/lang/erlang-runtime27/Makefile b/lang/erlang-runtime27/Makefile --- a/lang/erlang-runtime27/Makefile +++ b/lang/erlang-runtime27/Makefile @@ -68,7 +68,7 @@ DTRACE_VARS= STRIP="" JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java KQUEUE_CONFIGURE_ENABLE= kernel-poll ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_USES= localbase:ldflags diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -82,7 +82,7 @@ xsltproc:textproc/libxslt JAVA_CONFIGURE_WITH= javac JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java KQUEUE_CONFIGURE_ENABLE= kernel-poll MANPAGES_RUN_DEPENDS= ${LOCALBASE}/etc/man.d/erlang.conf:lang/erlang-man ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile --- a/lang/groovy/Makefile +++ b/lang/groovy/Makefile @@ -10,9 +10,8 @@ LICENSE= APACHE20 -USES= cpe zip +USES= cpe java zip CPE_VENDOR= apache -USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile --- a/lang/jruby/Makefile +++ b/lang/jruby/Makefile @@ -13,10 +13,8 @@ RUN_DEPENDS= bash:shells/bash -USES= cpe -USE_JAVA= yes +USES= java cpe -JAVA_VERSION= 8+ NO_BUILD= yes JRUBY_HOME?= ${PREFIX}/share/${PORTNAME} diff --git a/lang/jython/Makefile b/lang/jython/Makefile --- a/lang/jython/Makefile +++ b/lang/jython/Makefile @@ -21,9 +21,9 @@ EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions \ LICENSE.txt LICENSE_Apache.txt -USES= cpe +USES= cpe java CPE_VENDOR= python -USE_JAVA= yes + NO_BUILD= yes NO_ARCH= yes REINPLACE_ARGS= -i "" diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile --- a/lang/kawa/Makefile +++ b/lang/kawa/Makefile @@ -10,10 +10,9 @@ LICENSE= MIT -USES= gmake groff readline -USE_JAVA= yes +USES= gmake groff java readline + GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --enable-kawa-frontend \ --with-java-source=${JAVA_PORT_VERSION} CONFIGURE_ENV= JAVA="${JAVA}" JAVAC="${JAVAC}" diff --git a/lang/kotlin/Makefile b/lang/kotlin/Makefile --- a/lang/kotlin/Makefile +++ b/lang/kotlin/Makefile @@ -14,9 +14,8 @@ RUN_DEPENDS= bash:shells/bash -USES= zip +USES= java zip -USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile --- a/lang/linux-j/Makefile +++ b/lang/linux-j/Makefile @@ -16,8 +16,7 @@ LICENSE_FILE= ${FILESDIR}/license.txt LICENSE_PERMS= auto-accept dist-mirror pkg-mirror -USES= linux -USE_JAVA= yes +USES= java linux CONFLICTS_INSTALL= docbook-utils # bin/jw diff --git a/lang/pkl/Makefile b/lang/pkl/Makefile --- a/lang/pkl/Makefile +++ b/lang/pkl/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 -USE_JAVA= yes +USES= java JAVA_VERSION= 17+ NO_ARCH= yes diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile --- a/lang/rhino/Makefile +++ b/lang/rhino/Makefile @@ -23,7 +23,7 @@ LINEDIT_DESC= Enable line editing in the Rhino shell LINEDIT_RUN_DEPENDS= ${JLINEJAR}:devel/jline -LINEDIT_USE= java=yes ant=yes +LINEDIT_USES= java:ant MAKE_ARGS= -Dxmlbeans.url=file://${DISTDIR}/${DIST_SUBDIR}/xmlbeans-2.5.0.zip \ -Dswing-ex-url=file://${DISTDIR}/${DIST_SUBDIR}/src.zip diff --git a/lang/scala/Makefile b/lang/scala/Makefile --- a/lang/scala/Makefile +++ b/lang/scala/Makefile @@ -12,10 +12,8 @@ RUN_DEPENDS= bash:shells/bash -USES= cpe +USES= cpe java CPE_VENDOR= ${PORTNAME}-lang -USE_JAVA= yes -JAVA_VERSION= 8+ NO_ARCH= yes NO_BUILD= yes diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile --- a/lang/sisc/Makefile +++ b/lang/sisc/Makefile @@ -11,7 +11,8 @@ LICENSE= MPL11 GPLv2+ LICENSE_COMB= dual -USE_JAVA= yes +USES= java + NO_BUILD= yes NO_ARCH= yes diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile --- a/mail/davmail/Makefile +++ b/mail/davmail/Makefile @@ -10,11 +10,9 @@ LICENSE= GPLv2 -USES= dos2unix tar:tgz +USES= dos2unix java:ant tar:tgz DOS2UNIX_FILES= build.xml -USE_ANT= yes -USE_JAVA= yes USE_RC_SUBR= davmail # 6.1.0 REVISION= 3423 diff --git a/mail/james/Makefile b/mail/james/Makefile --- a/mail/james/Makefile +++ b/mail/james/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cpe +USES= cpe java CPE_VENDOR= apache -USE_JAVA= yes + NO_ARCH= yes NO_BUILD= yes diff --git a/mail/mime4j/Makefile b/mail/mime4j/Makefile --- a/mail/mime4j/Makefile +++ b/mail/mime4j/Makefile @@ -13,9 +13,10 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging +USES= java + OPTIONS_DEFINE= DOCS -USE_JAVA= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/apache-${PORTNAME}-${PORTVERSION} diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile --- a/math/R-cran-XLConnect/Makefile +++ b/math/R-cran-XLConnect/Makefile @@ -22,8 +22,7 @@ TEST_DEPENDS= R-cran-zoo>0:math/R-cran-zoo \ R-cran-ggplot2>0:graphics/R-cran-ggplot2 -USES= cran -USE_JAVA= yes +USES= cran java DEP_JARS= commons-codec commons-collections4 commons-compress \ log4j-api poi poi-ooxml poi-ooxml-full SparseBitSet xmlbeans diff --git a/math/apache-commons-math/Makefile b/math/apache-commons-math/Makefile --- a/math/apache-commons-math/Makefile +++ b/math/apache-commons-math/Makefile @@ -16,8 +16,7 @@ LICENSE= APACHE20 -USE_ANT= yes -USE_JAVA= yes +USES= java:ant USE_LOCALE= en_US.ISO8859-1 ALL_TARGET= compile jar @@ -26,17 +25,13 @@ JARFILE= ${PORTNAME:S,3,,}-3.6.jar DESTJARFILE= ${PORTNAME}.jar PLIST_FILES+= ${JAVAJARDIR}/${DESTJARFILE} +PORTDOCS= LICENSE.txt NOTICE.txt RELEASE-NOTES.txt license-header.txt OPTIONS_DEFINE= DOCS -NO_ARCH= yes - -.include +DOCS_ALL_TARGET= javadoc -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -PORTDOCS= LICENSE.txt NOTICE.txt RELEASE-NOTES.txt license-header.txt -.endif +NO_ARCH= yes post-extract: ${MKDIR} ${WRKSRC}/lib @@ -46,9 +41,8 @@ ${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE} -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}/ -.endif .include diff --git a/math/cvc5/Makefile b/math/cvc5/Makefile --- a/math/cvc5/Makefile +++ b/math/cvc5/Makefile @@ -21,14 +21,11 @@ LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libcadical.so:math/cadical -USES= cmake:testing ncurses compiler:c++17-lang \ +USES= cmake:testing ncurses compiler:c++17-lang java:build \ localbase:ldflags pkgconfig python:build USE_LDCONFIG= yes USE_GITHUB= yes -USE_JAVA= yes -JAVA_BUILD= yes - CMAKE_BUILD_TYPE= Production CMAKE_ARGS+= -DFREEBSD_DISTDIR=${DISTDIR} \ -DPython_EXECUTABLE:STRING=${PYTHON_CMD} diff --git a/math/geogebra/Makefile b/math/geogebra/Makefile --- a/math/geogebra/Makefile +++ b/math/geogebra/Makefile @@ -21,8 +21,7 @@ ONLY_FOR_ARCHS= amd64 i386 -USES= desktop-file-utils gnome shared-mime-info shebangfix tar:bzip2 -USE_JAVA= yes +USES= desktop-file-utils gnome java shared-mime-info shebangfix tar:bzip2 JAVA_VERSION= 17+ CONFLICTS= math/geogebra-i18n diff --git a/math/jacop/Makefile b/math/jacop/Makefile --- a/math/jacop/Makefile +++ b/math/jacop/Makefile @@ -14,8 +14,7 @@ BUILD_DEPENDS= maven>0:devel/maven -USE_JAVA= yes - +USES= java USE_GITHUB= yes GH_ACCOUNT= radsz diff --git a/math/jeuclid/Makefile b/math/jeuclid/Makefile --- a/math/jeuclid/Makefile +++ b/math/jeuclid/Makefile @@ -8,9 +8,8 @@ COMMENT= Java based MathML rendering solution WWW= https://jeuclid.sourceforge.net/ -USES= zip -USE_JAVA= yes -JAVA_RUN= yes +USES= java zip + NO_ARCH= yes NO_BUILD= yes diff --git a/math/jlatexmath/Makefile b/math/jlatexmath/Makefile --- a/math/jlatexmath/Makefile +++ b/math/jlatexmath/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons -USE_JAVA= yes +USES= java NO_ARCH= yes NO_BUILD= yes diff --git a/math/jtransforms/Makefile b/math/jtransforms/Makefile --- a/math/jtransforms/Makefile +++ b/math/jtransforms/Makefile @@ -11,9 +11,7 @@ LICENSE= GPLv2 LGPL20 MPL11 LICENSE_COMB= multi -USES= tar:bzip2 -USE_JAVA= yes -USE_ANT= yes +USES= java:ant tar:bzip2 WRKSRC= ${WRKDIR}/JTransforms diff --git a/math/jts/Makefile b/math/jts/Makefile --- a/math/jts/Makefile +++ b/math/jts/Makefile @@ -12,11 +12,11 @@ BUILD_DEPENDS= maven>0:devel/maven +USES= java +JAVA_VERSION= 11+ USE_GITHUB= yes GH_ACCOUNT= locationtech -USE_JAVA= yes -JAVA_VERSION= 11+ NO_ARCH= yes VER= ${PORTVERSION:tl} diff --git a/math/matlab-installer/Makefile b/math/matlab-installer/Makefile --- a/math/matlab-installer/Makefile +++ b/math/matlab-installer/Makefile @@ -14,11 +14,9 @@ auto-ask:sysutils/auto-admin \ webbrowser:www/webbrowser \ -USES= linux tar:xz +USES= java linux tar:xz USE_LINUX= dri devtools -USE_JAVA= yes JAVA_OS= linux -JAVA_RUN= yes NO_BUILD= yes PLIST_FILES= bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz diff --git a/math/octave/Makefile b/math/octave/Makefile --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -104,7 +104,7 @@ DOCS_USES= tex DOCS_USE= TEX=dvipsk:build,formats:build -JAVA_USE= JAVA=yes +JAVA_USES= java JAVA_CFLAGS= -I${JAVA_HOME}/include/${OPSYS:tl} QT6_USES= qt:6 OPENBLAS_USES= blaslapack:openblas diff --git a/math/plman/Makefile b/math/plman/Makefile --- a/math/plman/Makefile +++ b/math/plman/Makefile @@ -12,8 +12,7 @@ NO_BUILD= yes -USES= zip -USE_JAVA= yes +USES= java zip DATADIR= ${JAVASHAREDIR}/${PORTNAME} REPLACE_FILES= ${WRKSRC}/bin/${PORTNAME} diff --git a/math/sage/Makefile b/math/sage/Makefile --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -338,14 +338,13 @@ pixz:archivers/pixz USES= autoreconf blaslapack:openblas compiler:c++11-lib fortran \ - gettext gmake gnome iconv jpeg libtool localbase magick:6,build \ + gettext gmake gnome iconv java jpeg libtool localbase magick:6,build \ ncurses ninja:build perl5 pkgconfig python readline shebangfix \ sqlite tex tk xorg USE_TEX= latex:build pdftex:build tex:build USE_XORG= x11 xext xscrnsaver USE_GNOME= cairo glib20 pango USE_PYTHON= cython -USE_JAVA= yes # for science/jmol CONFLICTS= ${PYTHON_PKGNAMEPREFIX}wheel-0.* diff --git a/math/scilab/Makefile b/math/scilab/Makefile --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -96,8 +96,8 @@ GUI_RUN_DEPENDS= ${_GUI_DEPENDS} GUI_ALL_TARGET= all doc -GUI_USES= gl -GUI_USE= GL=gl JAVA=yes +GUI_USES= gl java +GUI_USE= GL=gl GUI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-bin-JAVA_HOME GUI_CONFIGURE_ON= --with-jdk=${JAVA_HOME} \ --with-docbook=${LOCALBASE}/share/xsl/docbook \ diff --git a/math/vtk8/Makefile b/math/vtk8/Makefile --- a/math/vtk8/Makefile +++ b/math/vtk8/Makefile @@ -85,7 +85,7 @@ # Wrapping JAVA_CATEGORIES= java -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java JAVA_CMAKE_BOOL= VTK_WRAP_JAVA Module_vtkWrappingJava JAVA_CMAKE_ON= -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ -DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \ diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -98,7 +98,7 @@ -DVTK_USE_X:BOOL=OFF OSMESA_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa -JAVA_VARS= USE_JAVA=yes +JAVA_USES= java JAVA_CMAKE_BOOL= VTK_WRAP_JAVA JAVA_CMAKE_ON= -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ -DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \ diff --git a/misc/elki/Makefile b/misc/elki/Makefile --- a/misc/elki/Makefile +++ b/misc/elki/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= gradle5:devel/gradle5 -USE_JAVA= yes +USES= java JAVA_VERSION= 17 # Java 8 fails on aarch64: Java VM: OpenJDK 64-Bit Server VM (25.342-b07 mixed mode bsd-aarch64 compressed oops) Core dump written. USE_GITHUB= yes diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile --- a/misc/freeguide/Makefile +++ b/misc/freeguide/Makefile @@ -13,9 +13,9 @@ RUN_DEPENDS= tv_cat:textproc/p5-xmltv -USE_JAVA= yes +USES= java:ant JAVA_VERSION= 8 -USE_ANT= yes + NO_ARCH= yes MAKE_ARGS= -Dinstall_share_dir=${STAGEDIR}${PREFIX}/share \ diff --git a/misc/jbidwatcher/Makefile b/misc/jbidwatcher/Makefile --- a/misc/jbidwatcher/Makefile +++ b/misc/jbidwatcher/Makefile @@ -8,9 +8,8 @@ COMMENT= Java-based application allowing you to monitor eBay auctions WWW= https://www.jbidwatcher.com/ -USES= tar:bzip2 -USE_JAVA= yes -USE_ANT= yes +USES= java:ant tar:bzip2 + ALL_TARGET= jar SUB_FILES= jbidwatcher diff --git a/misc/openhab/Makefile b/misc/openhab/Makefile --- a/misc/openhab/Makefile +++ b/misc/openhab/Makefile @@ -12,11 +12,10 @@ LICENSE= EPL LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -USES= cpe zip -USE_JAVA= yes +USES= cpe java zip JAVA_VERSION= 17 -JAVA_RUN= yes USE_RC_SUBR= openhab + SUB_FILES= pkg-message NO_WRKSUBDIR= yes NO_ARCH= yes diff --git a/misc/openhab2/Makefile b/misc/openhab2/Makefile --- a/misc/openhab2/Makefile +++ b/misc/openhab2/Makefile @@ -12,11 +12,10 @@ LICENSE= EPL LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -USES= cpe zip -USE_JAVA= yes +USES= cpe java zip JAVA_VERSION= 8 -JAVA_RUN= yes USE_RC_SUBR= openhab2 + SUB_FILES= pkg-message update.freebsd NO_WRKSUBDIR= yes NO_ARCH= yes diff --git a/misc/pauker/Makefile b/misc/pauker/Makefile --- a/misc/pauker/Makefile +++ b/misc/pauker/Makefile @@ -9,7 +9,8 @@ COMMENT= Java-based flashcard learning using the Leitner system WWW= https://pauker.sourceforge.net -USE_JAVA= yes +USES= java + NO_BUILD= yes do-install: diff --git a/misc/pipe/Makefile b/misc/pipe/Makefile --- a/misc/pipe/Makefile +++ b/misc/pipe/Makefile @@ -9,10 +9,10 @@ COMMENT= Tool for creating and analysing Petri nets WWW= https://pipe2.sourceforge.net/ -USES= zip +USES= java zip + NO_BUILD= yes NO_ARCH= yes -USE_JAVA= yes SUB_FILES= pipe.sh diff --git a/misc/tvbrowser/Makefile b/misc/tvbrowser/Makefile --- a/misc/tvbrowser/Makefile +++ b/misc/tvbrowser/Makefile @@ -10,7 +10,7 @@ LICENSE= GPLv3 -USE_JAVA= yes +USES= java JAVA_VERSION= 11+ NO_BUILD= yes diff --git a/multimedia/ffdec/Makefile b/multimedia/ffdec/Makefile --- a/multimedia/ffdec/Makefile +++ b/multimedia/ffdec/Makefile @@ -11,9 +11,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/license.txt -USES= zip -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java zip NO_ARCH= yes NO_BUILD= yes diff --git a/multimedia/filebot/Makefile b/multimedia/filebot/Makefile --- a/multimedia/filebot/Makefile +++ b/multimedia/filebot/Makefile @@ -22,8 +22,7 @@ jna>0:devel/jna \ openjfx14>0:java/openjfx14 -USES= tar:xz -USE_JAVA= yes +USES= java tar:xz JAVA_VERSION= 11 NO_WRKSUBDIR= yes diff --git a/multimedia/gdialog/Makefile b/multimedia/gdialog/Makefile --- a/multimedia/gdialog/Makefile +++ b/multimedia/gdialog/Makefile @@ -14,8 +14,7 @@ BUILD_DEPENDS= projectx>=0.90.4.00:multimedia/projectx RUN_DEPENDS= projectx>=0.90.4.00:multimedia/projectx -USES= zip -USE_JAVA= yes +USES= java zip CONFLICTS_INSTALL= zenity # bin/gdialog diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile --- a/multimedia/kodi/Makefile +++ b/multimedia/kodi/Makefile @@ -50,7 +50,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} USES= autoreconf:build cmake:noninja compiler:c++17-lang cpe \ - desktop-file-utils gettext gmake gnome iconv jpeg libtool \ + desktop-file-utils gettext gmake gnome iconv java:build jpeg libtool \ pkgconfig python sqlite ssl KODI_CODENAME= Omega @@ -78,8 +78,6 @@ PLIST_SUB= ARCH=${KODI_ARCH_${ARCH}} USE_LDCONFIG= yes -USE_JAVA= yes -JAVA_BUILD= jre USE_GNOME= libxml2 CMAKE_ARGS= -DGIT_VERSION="${DISTVERSION}-${KODI_CODENAME}" \ -DLIBDVDCSS_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdcss-${LIBDVDCSS_VERSION}_GH0.tar.gz" \ diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile --- a/multimedia/libbluray/Makefile +++ b/multimedia/libbluray/Makefile @@ -15,11 +15,10 @@ libfontconfig.so:x11-fonts/fontconfig USES= cpe gnome libtool pathfix pkgconfig tar:bzip2 +CPE_VENDOR= videolan USE_GNOME= libxml2 USE_LDCONFIG= yes -CPE_VENDOR= videolan - GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen-doc --disable-optimizations --disable-static @@ -34,18 +33,12 @@ JAVA_CATEGORIES= java JAVA_BUILD_DEPENDS= ant:devel/apache-ant +JAVA_USES= java:build JAVA_CONFIGURE_ENABLE= bdjava-jar JAVA_CONFIGURE_WITH= java9 - -.include - -.if ${PORT_OPTIONS:MJAVA} -USE_JAVA= yes -JAVA_VERSION= 8 -JAVA_BUILD= yes -MAKE_ENV= JAVA_HOME=${JAVA_HOME} \ +JAVA_MAKE_ENV= JAVA_HOME=${JAVA_HOME} \ PATH=${JAVA_HOME}/bin:${PATH} -.endif +JAVA_VARS= JAVA_VERSION=8 pre-build: @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' ${WRKSRC}/src/libbluray/bdj/bdj.c diff --git a/multimedia/projectx/Makefile b/multimedia/projectx/Makefile --- a/multimedia/projectx/Makefile +++ b/multimedia/projectx/Makefile @@ -12,8 +12,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/Copying -USES= zip:infozip -USE_JAVA= yes +USES= java zip:infozip SUB_FILES= project-x.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/net-im/convey/Makefile b/net-im/convey/Makefile --- a/net-im/convey/Makefile +++ b/net-im/convey/Makefile @@ -10,8 +10,7 @@ COMMENT= Instant Message (IM) program using the Jabber protocol WWW= https://convey.sourceforge.net/ -USE_ANT= yes -USE_JAVA= yes +USES= java:ant MAKE_ARGS= -quiet diff --git a/net-im/jicofo/Makefile b/net-im/jicofo/Makefile --- a/net-im/jicofo/Makefile +++ b/net-im/jicofo/Makefile @@ -12,10 +12,10 @@ BUILD_DEPENDS= maven>0:devel/maven +USES= java USE_GITHUB= yes GH_ACCOUNT= jitsi GH_TAGNAME= 258eb98 -USE_JAVA= yes JAVA_VERSION= 11 USE_RC_SUBR= ${PORTNAME} diff --git a/net-im/jitsi-srtp-native/Makefile b/net-im/jitsi-srtp-native/Makefile --- a/net-im/jitsi-srtp-native/Makefile +++ b/net-im/jitsi-srtp-native/Makefile @@ -15,11 +15,10 @@ BUILD_DEPENDS= jitsi-videobridge>=2.1.681:net-im/jitsi-videobridge -USES= ssl +USES= java ssl USE_GITHUB= yes USE_LDCONFIG= yes GH_PROJECT= ${PORTNAME}-srtp -USE_JAVA= yes JAVA_VERSION= 11 PLIST_FILES= lib/libjitsisrtp_1.1.so diff --git a/net-im/jitsi-videobridge/Makefile b/net-im/jitsi-videobridge/Makefile --- a/net-im/jitsi-videobridge/Makefile +++ b/net-im/jitsi-videobridge/Makefile @@ -14,10 +14,10 @@ BUILD_DEPENDS= maven>0:devel/maven RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash +USES= java USE_GITHUB= yes GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX} GH_TAGNAME= b2d4229 -USE_JAVA= yes JAVA_VERSION= 11 DATADIR= ${JAVASHAREDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile --- a/net-im/openfire/Makefile +++ b/net-im/openfire/Makefile @@ -15,12 +15,11 @@ BUILD_DEPENDS= maven>0:devel/maven -USES= cpe +USES= java cpe CPE_VENDOR= igniterealtime USE_GITHUB= YES GH_ACCOUNT= igniterealtime GH_PROJECT= Openfire -USE_JAVA= yes USE_RC_SUBR= ${PORTNAME} DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/net-im/signal-cli/Makefile b/net-im/signal-cli/Makefile --- a/net-im/signal-cli/Makefile +++ b/net-im/signal-cli/Makefile @@ -21,12 +21,10 @@ RUN_DEPENDS= libsignal-client>=0.9.0:net-im/libsignal-client TEST_DEPENDS= qrencode:graphics/libqrencode -USES= gmake shebangfix +USES= gmake java shebangfix USE_GITHUB= yes GH_ACCOUNT= AsamK -USE_JAVA= yes JAVA_VERSION= 11+ -JAVA_RUN= jre USE_RC_SUBR= signal_cli SHEBANG_FILES= bin/${PORTNAME} SHEBANG_LANG= sh diff --git a/net-im/signald/Makefile b/net-im/signald/Makefile --- a/net-im/signald/Makefile +++ b/net-im/signald/Makefile @@ -78,18 +78,16 @@ libsqlitejdbc.so:java/sqlitejdbc \ libzkgroup.so:net-im/zkgroup -USES= gmake shebangfix +USES= gmake java shebangfix USE_GITLAB= yes GL_ACCOUNT= signald GL_TAGNAME= 65cf5e8a1cf2b81fd1f5c3936e0164d53c5a9b29 - -USE_JAVA= yes JAVA_VERSION= 11+ -JAVA_RUN= jre +USE_RC_SUBR= signald + SUB_FILES= signald.7 SUB_LIST= JAVA_HOME="${JAVA_HOME}" \ PKGBASE="${PKGBASE}" -USE_RC_SUBR= signald NO_ARCH= yes diff --git a/net-im/zkgroup/Makefile b/net-im/zkgroup/Makefile --- a/net-im/zkgroup/Makefile +++ b/net-im/zkgroup/Makefile @@ -12,10 +12,9 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cargo +USES= cargo java USE_GITHUB= yes GH_ACCOUNT= signalapp -USE_JAVA= yes JAVA_VERSION= 11+ USE_LDCONFIG= yes diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -124,7 +124,7 @@ CURL_XML_IMPLIES= CURL XML CURL_XML_CONFIGURE_ENABLE= ascent bind curl_xml -JAVA_USE= java +JAVA_USES= java JAVA_CONFIGURE_ENABLE= java JAVA_CONFIGURE_WITH= java=${LOCALBASE} diff --git a/net-mgmt/confregdecode/Makefile b/net-mgmt/confregdecode/Makefile --- a/net-mgmt/confregdecode/Makefile +++ b/net-mgmt/confregdecode/Makefile @@ -9,7 +9,8 @@ COMMENT= Cisco Systems IOS(tm) configuration register decoder WWW= https://cosi-nms.sourceforge.net/ -USE_JAVA= yes +USES= java + ALL_TARGET= jar MAKE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/net-mgmt/midpoint/Makefile b/net-mgmt/midpoint/Makefile --- a/net-mgmt/midpoint/Makefile +++ b/net-mgmt/midpoint/Makefile @@ -21,11 +21,10 @@ LICENSE_PERMS_BITSTREAM= dist-mirror dist-sell pkg-mirror pkg-sell \ auto-accept -USE_JAVA= yes +USES= java JAVA_VERSION= 11+ JAVA_OS= native JAVA_VENDOR= openjdk oracle -JAVA_RUN= yes USE_RC_SUBR= midpoint diff --git a/net-mgmt/riemann/Makefile b/net-mgmt/riemann/Makefile --- a/net-mgmt/riemann/Makefile +++ b/net-mgmt/riemann/Makefile @@ -10,11 +10,11 @@ LICENSE= APACHE20 BSD2CLAUSE BSD3CLAUSE CDDL EPL GPLv2+ LGPL20+ MIT LICENSE_COMB= multi -USES= tar:bzip2 +USES= java tar:bzip2 +JAVA_VERSION= 21+ + NO_BUILD= yes NO_ARCH= yes -USE_JAVA= yes -JAVA_VERSION= 21+ SUB_LIST= JAVA_HOME=${JAVA_HOME} diff --git a/net-mgmt/unifi8/Makefile b/net-mgmt/unifi8/Makefile --- a/net-mgmt/unifi8/Makefile +++ b/net-mgmt/unifi8/Makefile @@ -22,13 +22,10 @@ externaldb_PKGNAMESUFFIX= -externaldb -USES= cpe - +USES= cpe java CPE_VENDOR= ui CPE_PRODUCT= unifi_controller -USE_JAVA= yes JAVA_VERSION= 17 -JAVA_RUN= jre USE_RC_SUBR= unifi CONFLICTS_INSTALL= unifi7 diff --git a/net-mgmt/zabbix5-java/Makefile b/net-mgmt/zabbix5-java/Makefile --- a/net-mgmt/zabbix5-java/Makefile +++ b/net-mgmt/zabbix5-java/Makefile @@ -4,8 +4,6 @@ MASTERDIR= ${.CURDIR}/../zabbix5-server -USE_JAVA= yes - PLIST= ${PKGDIR}/pkg-plist.java OPTIONS_DEFINE= IPV6 diff --git a/net-mgmt/zabbix5-server/Makefile b/net-mgmt/zabbix5-server/Makefile --- a/net-mgmt/zabbix5-server/Makefile +++ b/net-mgmt/zabbix5-server/Makefile @@ -57,6 +57,10 @@ --datadir=${ETCDIR} \ --with-iconv=${ICONV_PREFIX} +.if ${ZABBIX_BUILD} == "java" +USES+= java +.endif + .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" CPPFLAGS+= -I${LOCALBASE}/include diff --git a/net-mgmt/zabbix6-java/Makefile b/net-mgmt/zabbix6-java/Makefile --- a/net-mgmt/zabbix6-java/Makefile +++ b/net-mgmt/zabbix6-java/Makefile @@ -8,6 +8,4 @@ OPTIONS_DEFINE= IPV6 -USE_JAVA= yes - .include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -167,6 +167,10 @@ .endif # if ${ZABBIX_BUILD} != "java" +.if ${ZABBIX_BUILD} == "java" +USES+= java +.endif + .include post-patch: diff --git a/net-mgmt/zabbix64-java/Makefile b/net-mgmt/zabbix64-java/Makefile --- a/net-mgmt/zabbix64-java/Makefile +++ b/net-mgmt/zabbix64-java/Makefile @@ -8,6 +8,4 @@ OPTIONS_DEFINE= IPV6 -USE_JAVA= yes - .include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix64-server/Makefile b/net-mgmt/zabbix64-server/Makefile --- a/net-mgmt/zabbix64-server/Makefile +++ b/net-mgmt/zabbix64-server/Makefile @@ -169,6 +169,10 @@ .endif # if ${ZABBIX_BUILD} != "java" +.if ${ZABBIX_BUILD} == "java" +USES+= java +.endif + .include post-patch: diff --git a/net-mgmt/zabbix7-java/Makefile b/net-mgmt/zabbix7-java/Makefile --- a/net-mgmt/zabbix7-java/Makefile +++ b/net-mgmt/zabbix7-java/Makefile @@ -8,6 +8,4 @@ OPTIONS_DEFINE= IPV6 -USE_JAVA= yes - .include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix7-server/Makefile b/net-mgmt/zabbix7-server/Makefile --- a/net-mgmt/zabbix7-server/Makefile +++ b/net-mgmt/zabbix7-server/Makefile @@ -166,6 +166,10 @@ .endif # if ${ZABBIX_BUILD} != "java" +.if ${ZABBIX_BUILD} == "java" +USES+= java +.endif + .include post-patch: diff --git a/net-mgmt/zabbix72-java/Makefile b/net-mgmt/zabbix72-java/Makefile --- a/net-mgmt/zabbix72-java/Makefile +++ b/net-mgmt/zabbix72-java/Makefile @@ -8,6 +8,4 @@ OPTIONS_DEFINE= IPV6 -USE_JAVA= yes - .include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix72-server/Makefile b/net-mgmt/zabbix72-server/Makefile --- a/net-mgmt/zabbix72-server/Makefile +++ b/net-mgmt/zabbix72-server/Makefile @@ -164,6 +164,10 @@ .endif # if ${ZABBIX_BUILD} != "java" +.if ${ZABBIX_BUILD} == "java" +USES+= java +.endif + .include post-patch: diff --git a/net-p2p/phex/Makefile b/net-p2p/phex/Makefile --- a/net-p2p/phex/Makefile +++ b/net-p2p/phex/Makefile @@ -11,8 +11,8 @@ LICENSE= GPLv2 -USES= zip -USE_JAVA= yes +USES= java zip + NO_BUILD= yes SUB_FILES= ${PORTNAME}.sh diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile --- a/net-p2p/vuze/Makefile +++ b/net-p2p/vuze/Makefile @@ -18,10 +18,9 @@ ${JAVALIBDIR}/swt.jar:x11-toolkits/swt RUN_DEPENDS= ${JAVALIBDIR}/swt.jar:x11-toolkits/swt -USES= cpe gnome zip -USE_JAVA= yes +USES= cpe gnome java:ant zip JAVA_OS= native -USE_ANT= yes + NO_WRKSUBDIR= yes NO_ARCH= yes diff --git a/net/activemq/Makefile b/net/activemq/Makefile --- a/net/activemq/Makefile +++ b/net/activemq/Makefile @@ -12,9 +12,8 @@ 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 --- a/net/apache-commons-net/Makefile +++ b/net/apache-commons-net/Makefile @@ -12,7 +12,8 @@ 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 --- a/net/belle-sip/Makefile +++ b/net/belle-sip/Makefile @@ -13,13 +13,11 @@ 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 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -123,9 +123,8 @@ 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 --- a/net/java-beepcore/Makefile +++ b/net/java-beepcore/Makefile @@ -12,7 +12,8 @@ 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 --- a/net/jcifs/Makefile +++ b/net/jcifs/Makefile @@ -12,8 +12,8 @@ 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 --- a/net/jgroups/Makefile +++ b/net/jgroups/Makefile @@ -9,10 +9,10 @@ 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 --- a/net/jicmp/Makefile +++ b/net/jicmp/Makefile @@ -9,14 +9,13 @@ 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 --- a/net/jicmp6/Makefile +++ b/net/jicmp6/Makefile @@ -7,11 +7,9 @@ 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 --- a/net/jrdesktop/Makefile +++ b/net/jrdesktop/Makefile @@ -11,7 +11,8 @@ LICENSE= GPLv3 -USE_JAVA= yes +USES= java + NO_BUILD= yes SUB_FILES= jrdesktop diff --git a/net/jsch/Makefile b/net/jsch/Makefile --- a/net/jsch/Makefile +++ b/net/jsch/Makefile @@ -9,10 +9,8 @@ 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 --- a/net/kafka/Makefile +++ b/net/kafka/Makefile @@ -13,12 +13,9 @@ 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 --- a/net/keycloak/Makefile +++ b/net/keycloak/Makefile @@ -10,15 +10,11 @@ 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 --- a/net/ldapbrowser/Makefile +++ b/net/ldapbrowser/Makefile @@ -19,7 +19,8 @@ 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 --- a/net/seda/Makefile +++ b/net/seda/Makefile @@ -9,8 +9,8 @@ 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 @@ PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME:tl}.jar -.include - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -.endif +DOCS_ALL_TARGET= javadoc pre-build: # use our build.xml @@ -40,7 +36,8 @@ @${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 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -17,11 +17,11 @@ 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 --- a/net/spread-j/Makefile +++ b/net/spread-j/Makefile @@ -15,7 +15,8 @@ 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 --- a/net/tigervnc-viewer-java/Makefile +++ b/net/tigervnc-viewer-java/Makefile @@ -4,10 +4,8 @@ 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 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -40,8 +40,7 @@ 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 --- a/net/toonel/Makefile +++ b/net/toonel/Makefile @@ -11,11 +11,11 @@ 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} diff --git a/news/nzbhydra2/Makefile b/news/nzbhydra2/Makefile --- a/news/nzbhydra2/Makefile +++ b/news/nzbhydra2/Makefile @@ -13,8 +13,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le -USES= python -USE_JAVA= yes +USES= java python USE_RC_SUBR= nzbhydra2 EXTRACT_SUFX= .zip @@ -35,7 +34,6 @@ JAVA_VERSION= 17+ JAVA_VENDOR= openjdk -JAVA_RUN= yes USERS= nzbhydra2 GROUPS= nzbhydra2 diff --git a/print/pdf-renderer/Makefile b/print/pdf-renderer/Makefile --- a/print/pdf-renderer/Makefile +++ b/print/pdf-renderer/Makefile @@ -14,10 +14,8 @@ BROKEN_armv6= fails to install: swinglabs-build-impl.xml: Javadoc returned 1 BROKEN_armv7= fails to install: swinglabs-build-impl.xml: Javadoc returned 1 -USES= dos2unix zip +USES= dos2unix java:ant zip NO_WRKSUBDIR= yes -USE_JAVA= yes -USE_ANT= yes ALL_TARGET= jar @@ -28,11 +26,7 @@ OPTIONS_DEFINE= DOCS DOS2UNIX_FILES= swinglabs-build-impl.xml -.include - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -.endif +DOCS_ALL_TARGET= javadoc .include @@ -45,12 +39,12 @@ @${INSTALL_DATA} ${WRKSRC}/dist/PDFRenderer.jar \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar @${ECHO_MSG} " [DONE]" -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${ECHO_MSG} -n ">> Installing documentation..." @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/dist && ${FIND} javadoc \ | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 @${ECHO_MSG} " [DONE]" -.endif .include diff --git a/print/pdfbox/Makefile b/print/pdfbox/Makefile --- a/print/pdfbox/Makefile +++ b/print/pdfbox/Makefile @@ -18,9 +18,9 @@ JAR_NAMES= pdfbox fontbox preflight xmpbox pdfbox-tools pdfbox-debugger -USES= cpe +USES= cpe java CPE_VENDOR= apache -USE_JAVA= yes + NO_BUILD= yes NO_ARCH= yes diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile --- a/print/pdflib/Makefile +++ b/print/pdflib/Makefile @@ -29,6 +29,8 @@ OPTIONS_SUB= yes PERL_DESC= Build perl bindings JAVA_DESC= Build Java bindings + +JAVA_USES= java PERL_CONFIGURE_WITH= perl=${PERL} PORTDOCS= * @@ -38,9 +40,6 @@ .include .if ${PORT_OPTIONS:MJAVA} -USE_JAVA= yes -JAVA_BUILD= yes -JAVA_RUN= yes CONFIGURE_ARGS+=--with-java=${JAVA_HOME} .else CONFIGURE_ARGS+=--with-java=no diff --git a/print/pdftk/Makefile b/print/pdftk/Makefile --- a/print/pdftk/Makefile +++ b/print/pdftk/Makefile @@ -15,11 +15,11 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-lang3.jar:java/apache-commons-lang3 \ ${JAVALIBDIR}/bcprov.jar:java/bouncycastle15 -USE_ANT= yes +USES= java:ant USE_GITLAB= yes GL_ACCOUNT= pdftk-java GL_TAGNAME= e4292c8f1bd2580a44d3cbf3570a4505bd3a74b6 -USE_JAVA= yes + ALL_TARGET= jar NO_ARCH= yes SUB_FILES= pdftk diff --git a/science/cdk/Makefile b/science/cdk/Makefile --- a/science/cdk/Makefile +++ b/science/cdk/Makefile @@ -13,9 +13,8 @@ BUILD_DEPENDS= maven>0:devel/maven -USE_JAVA= yes +USES= java USE_GITHUB= yes - JAVA_VERSION= 17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=68892, tid=0x000000000002b995 guarantee(val < (1U << nbits)) failed: Field too big for insn NO_ARCH= yes diff --git a/science/colt/Makefile b/science/colt/Makefile --- a/science/colt/Makefile +++ b/science/colt/Makefile @@ -8,33 +8,29 @@ COMMENT= Java package for scalable scientific and technical computing WWW= https://acs.lbl.gov/~hoschek/colt/ -USE_JAVA= yes +NO_ARCH= yes + WRKSRC= ${WRKDIR}/${PORTNAME} +PLIST_FILES= ${JAVAJARDIR}/colt.jar +PORTDOCS= * + OPTIONS_DEFINE= DOCS COMPILE OPTIONS_DEFAULT=COMPILE + COMPILE_DESC= Install the pre-compiled .jar file +COMPILE_USES= java:ant +COMPILE_USES_OFF= java +COMPILE_USE= LOCALE=en_US.ISO8859-1 +COMPILE_ALL_TARGET= build +COMPILE_VARS_OFF= NO_BUILD=yes + .include -.if ${PORT_OPTIONS:MCOMPILE} -USE_ANT= yes -USE_LOCALE= en_US.ISO8859-1 -ALL_TARGET= build -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MCOMPILE} && ${PORT_OPTIONS:MDOCS} ALL_TARGET+= javadoc .endif -.else -NO_BUILD= yes -.endif - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -.endif - -PLIST_FILES= %%JAVAJARDIR%%/colt.jar - -.include do-install: .if ${PORT_OPTIONS:MDOCS} @@ -47,4 +43,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/lib/colt.jar ${STAGEDIR}${JAVAJARDIR} -.include +.include diff --git a/science/devisor/Makefile b/science/devisor/Makefile --- a/science/devisor/Makefile +++ b/science/devisor/Makefile @@ -9,7 +9,8 @@ COMMENT= Design and Visualization Software Resource for FeatFlow WWW= http://www.featflow.de/ -USE_JAVA= yes +USES= java + NO_BUILD= yes # Sources are available though SUB_FILES= devisorgrid.sh diff --git a/science/hdf/Makefile b/science/hdf/Makefile --- a/science/hdf/Makefile +++ b/science/hdf/Makefile @@ -36,9 +36,8 @@ OPTIONS_SUB= yes JAVA_CONFIGURE_ENABLE= java -JAVA_USE= JAVA=yes -JAVA_VARS= JAVA_VERSION=17 \ - JAVA_BUILD=yes +JAVA_USES= java:build +JAVA_VARS= JAVA_VERSION=17 JAVA_CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} \ PATH=${JAVA_HOME}/bin:${PATH} JAVA_MAKE_ENV= PATH=${JAVA_HOME}/bin:${PATH} diff --git a/science/jmol/Makefile b/science/jmol/Makefile --- a/science/jmol/Makefile +++ b/science/jmol/Makefile @@ -11,8 +11,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USE_JAVA= yes -USE_ANT= yes +USES= java:ant JAVA_VERSION= 17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=91175, tid=0x000000000007cda5 guarantee(val < (1U << nbits)) failed: Field too big for insn NO_ARCH= yes diff --git a/science/openmodelica/Makefile b/science/openmodelica/Makefile --- a/science/openmodelica/Makefile +++ b/science/openmodelica/Makefile @@ -39,13 +39,12 @@ USES= cmake compiler:c++14-lang iconv fortran gettext-runtime gl \ gnome blaslapack localbase:ldflags qt:5 readline pkgconfig \ - python:build shebangfix + python:build shebangfix java USE_QT= concurrent core declarative gui location network opengl \ printsupport svg webchannel webengine widgets xml xmlpatterns \ buildtools:build qmake:build USE_GL= gl opengl USE_GNOME= libxml2 -USE_JAVA= yes USE_LDCONFIG= ${PREFIX}/lib/omc ${PREFIX}/lib/omc/OMSimulator ${PREFIX}/lib/omc/cpp ${PREFIX}/lib/omc/ffi # https://github.com/OpenModelica/OpenModelica/issues/9925 USE_GITHUB= yes diff --git a/science/opensim-core/Makefile b/science/opensim-core/Makefile --- a/science/opensim-core/Makefile +++ b/science/opensim-core/Makefile @@ -41,7 +41,7 @@ JAVA_CMAKE_ON= -DJAVA_AWT_LIBRARY=${LOCALBASE}/openjdk8/jre/lib/amd64/libawt.so \ -DJAVA_JVM_LIBRARY=${LOCALBASE}/openjdk8/jre/lib/amd64/server/libjvm.so \ -DJAVA_INCLUDE_PATH=${LOCALBASE}/openjdk8/include -JAVA_USE= JAVA=yes +JAVA_USES= java JAVA_BUILD_DEPENDS= swig40:devel/swig40 JAVA_BINARY_ALIAS= swig=swig40 diff --git a/science/opsin/Makefile b/science/opsin/Makefile --- a/science/opsin/Makefile +++ b/science/opsin/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= maven>0:devel/maven -USE_JAVA= yes +USES= java JAVA_VERSION= 17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=29730, tid=0x000000000002d236 guarantee(val < (1U << nbits)) failed: Field too big for insn NO_ARCH= yes diff --git a/science/simsmith/Makefile b/science/simsmith/Makefile --- a/science/simsmith/Makefile +++ b/science/simsmith/Makefile @@ -12,8 +12,7 @@ COMMENT= Java-based Smith Chart program WWW= http://ae6ty.com/Smith_Charts.html -USE_JAVA= yes -JAVA_RUN= yes +USES= java PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}${EXTRACT_SUFX} \ bin/${PORTNAME} diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile --- a/security/bastillion/Makefile +++ b/security/bastillion/Makefile @@ -17,8 +17,7 @@ RUN_DEPENDS= bash:shells/bash -USES= shebangfix -USE_JAVA= yes +USES= java shebangfix USE_GITHUB= nodefault SHEBANG_FILES= jetty_bastillion/bin/jetty.sh diff --git a/security/dirbuster/Makefile b/security/dirbuster/Makefile --- a/security/dirbuster/Makefile +++ b/security/dirbuster/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL21+ CC-BY-SA-3.0 LICENSE_COMB= multi -USES= zip -USE_JAVA= yes +USES= java zip + NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/security/i2p/Makefile b/security/i2p/Makefile --- a/security/i2p/Makefile +++ b/security/i2p/Makefile @@ -20,16 +20,13 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:math/gmp LIB_DEPENDS= libiconv.so:converters/libiconv -USES= cpe gettext tar:bz2 +USES= cpe gettext java:ant tar:bz2 CPE_VENDOR= geti2p WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} USE_RC_SUBR= i2p -USE_ANT= yes -USE_JAVA= yes NO_ARCH= yes -JAVA_BUILD= jdk USE_LOCALE= en_US.UTF-8 ALL_TARGET= updater tarball diff --git a/security/iaikpkcs11wrapper/Makefile b/security/iaikpkcs11wrapper/Makefile --- a/security/iaikpkcs11wrapper/Makefile +++ b/security/iaikpkcs11wrapper/Makefile @@ -12,8 +12,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES -USES= dos2unix gmake zip -USE_JAVA= yes +USES= dos2unix gmake java zip DOS2UNIX_GLOB= Makefile *.c DOS2UNIX_WRKSRC= ${WRKDIR}/src/native JAVA_OS= native diff --git a/security/owasp-dependency-check/Makefile b/security/owasp-dependency-check/Makefile --- a/security/owasp-dependency-check/Makefile +++ b/security/owasp-dependency-check/Makefile @@ -20,10 +20,10 @@ BUILD_DEPENDS= maven>0:devel/maven +USES= java USE_GITHUB= yes GH_ACCOUNT= jeremylong GH_PROJECT= DependencyCheck -USE_JAVA= yes NO_ARCH= yes SUB_FILES= owasp-dependency-check diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile --- a/security/xml-security/Makefile +++ b/security/xml-security/Makefile @@ -15,13 +15,11 @@ LICENSE= APACHE20 -OPTIONS_DEFINE= DOCS EXAMPLES -USES= cpe zip +USES= cpe java:ant zip CPE_PRODUCT= xml_security_for_java CPE_VENDOR= apache -USE_JAVA= yes + WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES ALL_TARGET= jar @@ -30,30 +28,28 @@ PLIST_FILES= %%JAVAJARDIR%%/xmlsec.jar -.include +OPTIONS_DEFINE= DOCS EXAMPLES -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -.endif +DOCS_ALL_TARGET= javadoc do-install: @${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/xmlsec.jar..." @${INSTALL_DATA} ${WRKSRC}/build/xmlsec-${PORTVERSION}.jar \ ${STAGEDIR}/${JAVAJARDIR}/xmlsec.jar @${ECHO} " [ DONE ]" -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${ECHO} -n ">> Installing documentation in ${DOCSDIR}..." @${MKDIR} ${STAGEDIR}/${DOCSDIR} @(cd ${WRKSRC}/build/docs/html && ${COPYTREE_SHARE} javadoc \ ${STAGEDIR}/${DOCSDIR}) @${ECHO} " [ DONE ]" -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + +do-install-EXAMPLES-on: @${ECHO} -n ">> Installing examples in ${EXAMPLESDIR}..." @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} @(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} "javax org" \ ${STAGEDIR}/${EXAMPLESDIR}) @${ECHO} " [ DONE ]" -.endif .include diff --git a/security/zaproxy/Makefile b/security/zaproxy/Makefile --- a/security/zaproxy/Makefile +++ b/security/zaproxy/Makefile @@ -12,11 +12,8 @@ BUILD_DEPENDS= gradle:devel/gradle -USES= gettext-runtime -USE_JAVA= yes - +USES= gettext-runtime java USE_GITHUB= yes - JAVA_VERSION= 11 NO_ARCH= yes diff --git a/sysutils/digdag/Makefile b/sysutils/digdag/Makefile --- a/sysutils/digdag/Makefile +++ b/sysutils/digdag/Makefile @@ -11,10 +11,8 @@ LICENSE= APACHE20 -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java JAVA_VENDOR= openjdk -JAVA_RUN= yes USE_RC_SUBR= ${PORTNAME} NO_ARCH= yes diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -30,8 +30,7 @@ OPTIONS_DEFINE= FACTER_JAVA FACTER_JAVA_DESC= Build with Java bindings for puppetserver -FACTER_JAVA_USE= java=yes -FACTER_JAVA_VARS= JAVA_BUILD=yes +FACTER_JAVA_USES= java:build FACTER_JAVA_CMAKE_ON= -DJAVA_HOME=${JAVA_HOME} OPTIONS_DEFAULT= FACTER_JAVA diff --git a/sysutils/graylog/Makefile b/sysutils/graylog/Makefile --- a/sysutils/graylog/Makefile +++ b/sysutils/graylog/Makefile @@ -14,12 +14,8 @@ LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= cpe tar:tgz -USE_JAVA= yes - +USES= cpe java:extract,run tar:tgz JAVA_VERSION= 17+ -JAVA_EXTRACT= yes -JAVA_RUN= yes NO_BUILD= yes NO_ARCH= yes diff --git a/sysutils/javaservicewrapper/Makefile b/sysutils/javaservicewrapper/Makefile --- a/sysutils/javaservicewrapper/Makefile +++ b/sysutils/javaservicewrapper/Makefile @@ -13,11 +13,8 @@ ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le -USES= gmake iconv -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= gmake iconv java:ant -USE_ANT= yes USE_LDCONFIG= ${PREFIX}/lib/javaservicewrapper/lib DATADIR= ${PREFIX}/lib/${PORTNAME} diff --git a/sysutils/jdiskreport/Makefile b/sysutils/jdiskreport/Makefile --- a/sysutils/jdiskreport/Makefile +++ b/sysutils/jdiskreport/Makefile @@ -7,8 +7,7 @@ COMMENT= Java program to graphically display disk usage statistics WWW= http://www.jgoodies.com/freeware/jdiskreport/ -USES= zip -USE_JAVA= YES +USES= java zip PLIST_SUB= JDISKDIR=${JDISKDIR:S,${PREFIX}/,,g} PLIST_SUB+= PORTVERSION=${PORTVERSION} diff --git a/sysutils/jtopen/Makefile b/sysutils/jtopen/Makefile --- a/sysutils/jtopen/Makefile +++ b/sysutils/jtopen/Makefile @@ -13,9 +13,9 @@ LICENSE_FILE= ${FILESDIR}/IBMPL10 LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= zip +USES= java zip + NO_WRKSUBDIR= yes -USE_JAVA= yes NO_BUILD= yes diff --git a/sysutils/jvmtop/Makefile b/sysutils/jvmtop/Makefile --- a/sysutils/jvmtop/Makefile +++ b/sysutils/jvmtop/Makefile @@ -15,7 +15,8 @@ BUILD_DEPENDS= maven>0:devel/maven EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_JAVA= yes + +USES= java NO_ARCH= yes diff --git a/sysutils/logstash7/Makefile b/sysutils/logstash7/Makefile --- a/sysutils/logstash7/Makefile +++ b/sysutils/logstash7/Makefile @@ -15,12 +15,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash -USES= cpe shebangfix - +USES= cpe java shebangfix CPE_VENDOR= elastic -USE_JAVA= yes JAVA_VERSION= 11+ -JAVA_RUN= yes USE_RC_SUBR= logstash SHEBANG_FILES= bin/* diff --git a/sysutils/logstash8/Makefile b/sysutils/logstash8/Makefile --- a/sysutils/logstash8/Makefile +++ b/sysutils/logstash8/Makefile @@ -15,12 +15,9 @@ RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash -USES= cpe shebangfix - +USES= cpe java shebangfix CPE_VENDOR= elastic -USE_JAVA= yes JAVA_VERSION= 17+ -JAVA_RUN= yes USE_RC_SUBR= logstash SHEBANG_FILES= bin/* diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -55,10 +55,8 @@ PYTHON_DESC= Include Python plugins SNMP_DESC= Include SNMP plugins -JAVA_USE= JAVA=yes +JAVA_USES= java JAVA_INSTALL_TARGET= install-plugins-java -JAVA_VARS= JAVA_BUILD=yes \ - JAVA_RUN=yes PERL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg \ p5-Net-DNS>=0:dns/p5-Net-DNS \ diff --git a/sysutils/pcns/Makefile b/sysutils/pcns/Makefile --- a/sysutils/pcns/Makefile +++ b/sysutils/pcns/Makefile @@ -16,7 +16,8 @@ DEPRECATED= not supported upstream EXPIRATION_DATE= 2025-01-31 -USE_JAVA= 11+ +USES= java +JAVA_VERSION= 11+ USE_RC_SUBR= pcns SUB_FILES= pkg-message diff --git a/sysutils/puppetserver7/Makefile b/sysutils/puppetserver7/Makefile --- a/sysutils/puppetserver7/Makefile +++ b/sysutils/puppetserver7/Makefile @@ -19,13 +19,11 @@ rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \ sudo>=1:security/sudo -USES= ruby shebangfix +USES= java ruby shebangfix USE_RC_SUBR= puppetserver -USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes -JAVA_VERSION= 8+ CONFLICTS_INSTALL= puppetserver[0-9] diff --git a/sysutils/puppetserver8/Makefile b/sysutils/puppetserver8/Makefile --- a/sysutils/puppetserver8/Makefile +++ b/sysutils/puppetserver8/Makefile @@ -19,13 +19,12 @@ rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \ sudo>=1:security/sudo -USES= ruby shebangfix +USES= ruby java shebangfix +JAVA_VERSION= 11+ USE_RC_SUBR= puppetserver -USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes -JAVA_VERSION= 11+ CONFLICTS_INSTALL= puppetserver[0-9] diff --git a/sysutils/rundeck/Makefile b/sysutils/rundeck/Makefile --- a/sysutils/rundeck/Makefile +++ b/sysutils/rundeck/Makefile @@ -11,9 +11,8 @@ LICENSE= APACHE20 -USES= cpe +USES= cpe java CPE_VENDOR= pagerduty -USE_JAVA= 8+s USE_RC_SUBR= rundeck CONFLICTS_INSTALL= rundeck2 diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -118,7 +118,7 @@ share/syslog-ng/include/scl/cim/template.conf JAVA_CONFIGURE_ENABLE= java -JAVA_USE= JAVA=yes +JAVA_USES= java JAVA_PLIST_FILES= lib/syslog-ng/libmod-java.so \ lib/syslog-ng/java-modules/syslog-ng-core.jar @@ -271,7 +271,7 @@ lib/syslog-ng/libbigquery.so \ lib/syslog-ng/libcloud_auth.so -MQTT_CONFIGURE_ON= --enable-mqtt --with-libpaho-mqtt=${PREFIX} +MQTT_CONFIGURE_ON= --enable-mqtt --with-libpaho-mqtt=${PREFIX} MQTT_CONFIGURE_OFF= --disable-mqtt MQTT_LIB_DEPENDS= libpaho-mqtt3cs.so:net/libpaho-mqtt3 MQTT_PLIST_FILES= lib/syslog-ng/libmqtt.so diff --git a/textproc/apache-commons-csv/Makefile b/textproc/apache-commons-csv/Makefile --- a/textproc/apache-commons-csv/Makefile +++ b/textproc/apache-commons-csv/Makefile @@ -14,10 +14,11 @@ 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 --- a/textproc/apache-commons-digester/Makefile +++ b/textproc/apache-commons-digester/Makefile @@ -16,10 +16,11 @@ 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 --- a/textproc/apache-poi/Makefile +++ b/textproc/apache-poi/Makefile @@ -31,10 +31,9 @@ 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 --- a/textproc/apache-solr/Makefile +++ b/textproc/apache-solr/Makefile @@ -14,12 +14,10 @@ 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 --- a/textproc/apache-xmlbeans/Makefile +++ b/textproc/apache-xmlbeans/Makefile @@ -12,9 +12,7 @@ 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 --- a/textproc/denature/Makefile +++ b/textproc/denature/Makefile @@ -16,8 +16,7 @@ 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 --- a/textproc/dom4j/Makefile +++ b/textproc/dom4j/Makefile @@ -8,9 +8,8 @@ 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 --- a/textproc/dtd2relax/Makefile +++ b/textproc/dtd2relax/Makefile @@ -11,8 +11,8 @@ 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 --- a/textproc/elasticsearch7/Makefile +++ b/textproc/elasticsearch7/Makefile @@ -15,8 +15,7 @@ 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 --- a/textproc/elasticsearch8/Makefile +++ b/textproc/elasticsearch8/Makefile @@ -15,8 +15,7 @@ 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 --- a/textproc/fop/Makefile +++ b/textproc/fop/Makefile @@ -17,8 +17,7 @@ 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 --- a/textproc/jalingo/Makefile +++ b/textproc/jalingo/Makefile @@ -11,9 +11,7 @@ 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 --- a/textproc/jarnal/Makefile +++ b/textproc/jarnal/Makefile @@ -11,8 +11,7 @@ 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 --- a/textproc/jaxup/Makefile +++ b/textproc/jaxup/Makefile @@ -16,16 +16,14 @@ ${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 --- a/textproc/jdictionary/Makefile +++ b/textproc/jdictionary/Makefile @@ -8,9 +8,8 @@ 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 --- a/textproc/jdictionary/Makefile.plugin +++ b/textproc/jdictionary/Makefile.plugin @@ -5,8 +5,8 @@ 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 --- a/textproc/jing/Makefile +++ b/textproc/jing/Makefile @@ -13,10 +13,7 @@ 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 --- a/textproc/link-grammar/Makefile +++ b/textproc/link-grammar/Makefile @@ -43,7 +43,7 @@ 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 --- a/textproc/lucene/Makefile +++ b/textproc/lucene/Makefile @@ -11,8 +11,8 @@ 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 --- a/textproc/lucene5/Makefile +++ b/textproc/lucene5/Makefile @@ -13,8 +13,8 @@ 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 --- a/textproc/nux/Makefile +++ b/textproc/nux/Makefile @@ -12,7 +12,8 @@ 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 --- a/textproc/opensearch/Makefile +++ b/textproc/opensearch/Makefile @@ -17,8 +17,7 @@ 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 --- a/textproc/opensearch13/Makefile +++ b/textproc/opensearch13/Makefile @@ -17,8 +17,7 @@ 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 --- a/textproc/ppower4/Makefile +++ b/textproc/ppower4/Makefile @@ -13,8 +13,7 @@ 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 --- a/textproc/qrcodegen/Makefile +++ b/textproc/qrcodegen/Makefile @@ -12,10 +12,10 @@ 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 --- a/textproc/resume/Makefile +++ b/textproc/resume/Makefile @@ -10,8 +10,8 @@ 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 --- a/textproc/saxon-devel/Makefile +++ b/textproc/saxon-devel/Makefile @@ -13,13 +13,13 @@ 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 --- a/textproc/saxon-he/Makefile +++ b/textproc/saxon-he/Makefile @@ -11,8 +11,8 @@ 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 --- a/textproc/saxon/Makefile +++ b/textproc/saxon/Makefile @@ -11,8 +11,8 @@ 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 --- a/textproc/tagsoup/Makefile +++ b/textproc/tagsoup/Makefile @@ -11,8 +11,7 @@ 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 --- a/textproc/trang/Makefile +++ b/textproc/trang/Makefile @@ -13,10 +13,7 @@ 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 --- a/textproc/weka/Makefile +++ b/textproc/weka/Makefile @@ -11,8 +11,8 @@ 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 --- a/textproc/xalan-j/Makefile +++ b/textproc/xalan-j/Makefile @@ -14,10 +14,10 @@ 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 --- a/textproc/xerces-j/Makefile +++ b/textproc/xerces-j/Makefile @@ -10,7 +10,8 @@ LICENSE= APACHE20 -USE_JAVA= yes +USES= java + NO_BUILD= yes NO_ARCH= yes diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile --- a/textproc/xincluder/Makefile +++ b/textproc/xincluder/Makefile @@ -17,8 +17,8 @@ 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 --- a/textproc/xml-commons/Makefile +++ b/textproc/xml-commons/Makefile @@ -9,8 +9,8 @@ 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 --- a/textproc/xmlenc/Makefile +++ b/textproc/xmlenc/Makefile @@ -8,10 +8,9 @@ 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 --- a/textproc/xom/Makefile +++ b/textproc/xom/Makefile @@ -11,7 +11,8 @@ 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 --- a/textproc/xp/Makefile +++ b/textproc/xp/Makefile @@ -9,10 +9,9 @@ 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 --- a/textproc/xstream/Makefile +++ b/textproc/xstream/Makefile @@ -13,9 +13,9 @@ 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 --- a/textproc/zorba/Makefile +++ b/textproc/zorba/Makefile @@ -24,12 +24,17 @@ 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 @@ 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 @@ -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 diff --git a/www/archiva/Makefile b/www/archiva/Makefile --- a/www/archiva/Makefile +++ b/www/archiva/Makefile @@ -13,11 +13,8 @@ RUN_DEPENDS= javaservicewrapper:sysutils/javaservicewrapper -USES= cpe +USES= cpe java CPE_VENDOR= apache - -USE_JAVA= yes - USE_RC_SUBR= ${PORTNAME} PLIST_SUB= ARCHIVA_CONF=${PREFIX}/${PORTNAME} \ diff --git a/www/axis2/Makefile b/www/axis2/Makefile --- a/www/axis2/Makefile +++ b/www/axis2/Makefile @@ -12,8 +12,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cpe zip +USES= cpe java zip CPE_VENDOR= apache + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes NO_ARCH= yes @@ -30,7 +31,6 @@ TOMCAT101_VARS= APPHOME=${LOCALBASE}/apache-tomcat-10.1 TOMCAT101_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat101 -USE_JAVA= yes SHAREOWN= www SHAREGRP= www diff --git a/www/closure-compiler/Makefile b/www/closure-compiler/Makefile --- a/www/closure-compiler/Makefile +++ b/www/closure-compiler/Makefile @@ -12,7 +12,8 @@ LICENSE= APACHE20 -USE_JAVA= 11+ +USES= java +JAVA_VERSION= 11+ NO_ARCH= yes NO_BUILD= yes diff --git a/www/glassfish/Makefile b/www/glassfish/Makefile --- a/www/glassfish/Makefile +++ b/www/glassfish/Makefile @@ -11,8 +11,7 @@ LICENSE= EPL -USES= zip -USE_JAVA= yes +USES= java zip NO_BUILD= yes @@ -21,7 +20,7 @@ WRKSRC= ${WRKDIR}/glassfish5 DATADIR= ${PREFIX}/${PORTNAME}-${PORTVERSION} -# Since we USE_JAVA, we propagate the received JAVA_HOME variable to the +# Since we USES=java, we propagate the received JAVA_HOME variable to the # template files, since it is used by the rc script. SUB_LIST= GLASSFISHVERSION=${PORTVERSION} \ JAVA_HOME=${JAVA_HOME} diff --git a/www/glassfish4/Makefile b/www/glassfish4/Makefile --- a/www/glassfish4/Makefile +++ b/www/glassfish4/Makefile @@ -7,15 +7,15 @@ COMMENT= Reference implementation of the Java EE application server WWW= https://glassfish.java.net/ -USES= cpe zip +USES= cpe java zip CPE_VENDOR= oracle -USE_JAVA= yes + NO_BUILD= yes WRKSRC= ${WRKDIR}/glassfish4 DATADIR= ${PREFIX}/${PORTNAME}-${PORTVERSION} -# Since we USE_JAVA, we propagate the received JAVA_HOME variable to the +# Since we USES=java, we propagate the received JAVA_HOME variable to the # template files, since it is used by the rc script. SUB_LIST= GLASSFISHVERSION=${PORTVERSION} \ JAVA_HOME=${JAVA_HOME} diff --git a/www/grails/Makefile b/www/grails/Makefile --- a/www/grails/Makefile +++ b/www/grails/Makefile @@ -13,9 +13,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:tu} -USES= cpe zip +USES= cpe java zip CPE_VENDOR= gopivotal -USE_JAVA= yes + NO_BUILD= yes NO_ARCH= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/www/htmlcompressor/Makefile b/www/htmlcompressor/Makefile --- a/www/htmlcompressor/Makefile +++ b/www/htmlcompressor/Makefile @@ -12,8 +12,9 @@ LICENSE= APACHE20 +USES= java + NO_WRKSUBDIR= yes -USE_JAVA= yes NO_BUILD= yes NO_ARCH= yes diff --git a/www/httpasyncclient/Makefile b/www/httpasyncclient/Makefile --- a/www/httpasyncclient/Makefile +++ b/www/httpasyncclient/Makefile @@ -13,10 +13,10 @@ RUN_DEPENDS= ${JAVALIBDIR}/httpclient.jar:www/httpclient -USES= cpe +USES= cpe java CPE_VENDOR= apache + OPTIONS_DEFINE= DOCS -USE_JAVA= yes NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile --- a/www/httpclient/Makefile +++ b/www/httpclient/Makefile @@ -17,11 +17,10 @@ OPTIONS_DEFINE= DOCS -USES= cpe +USES= cpe java CPE_PRODUCT= commons-httpclient CPE_VENDOR= apache -USE_JAVA= yes NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/httpcomponents-client-${DISTVERSION} diff --git a/www/httpcore/Makefile b/www/httpcore/Makefile --- a/www/httpcore/Makefile +++ b/www/httpcore/Makefile @@ -12,9 +12,9 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-cli.jar:java/apache-commons-cli +USES= java OPTIONS_DEFINE= DOCS -USE_JAVA= yes NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/httpcomponents-core-${DISTVERSION} diff --git a/www/jericho-html/Makefile b/www/jericho-html/Makefile --- a/www/jericho-html/Makefile +++ b/www/jericho-html/Makefile @@ -7,8 +7,7 @@ COMMENT= Java library to analyse and manipulate HTML WWW= https://jerichohtml.sourceforge.net/doc/index.html -USES= zip -USE_JAVA= yes +USES= java zip INTERFACES:= "compile-time-dependencies/slf4j-api-1.6.1.jar:\ compile-time-dependencies/commons-logging-api-1.1.1.jar:\ diff --git a/www/jetty10/Makefile b/www/jetty10/Makefile --- a/www/jetty10/Makefile +++ b/www/jetty10/Makefile @@ -15,11 +15,10 @@ RUN_DEPENDS= bash:shells/bash -USES= cpe shebangfix +USES= cpe java shebangfix CONFLICTS= jetty8.* jetty9.* jetty11.* jetty12.* -USE_JAVA= yes NO_ARCH= yes CPE_VENDOR= eclipse SHEBANG_FILES= bin/jetty.sh diff --git a/www/jetty12/Makefile b/www/jetty12/Makefile --- a/www/jetty12/Makefile +++ b/www/jetty12/Makefile @@ -15,11 +15,10 @@ RUN_DEPENDS= bash:shells/bash -USES= cpe shebangfix +USES= cpe java shebangfix CONFLICTS= jetty8.* jetty9.* jetty10.* jetty11.* -USE_JAVA= yes NO_ARCH= yes CPE_VENDOR= eclipse SHEBANG_FILES= bin/jetty.sh diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile --- a/www/jmeter/Makefile +++ b/www/jmeter/Makefile @@ -39,8 +39,8 @@ ${JAVALIBDIR}/xstream.jar:textproc/xstream \ ${LOCALBASE}/share/java/rhino/rhino.jar:lang/rhino -USES= tar:tgz -USE_JAVA= yes +USES= java tar:tgz + NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= jmeter.sh diff --git a/www/payara/Makefile b/www/payara/Makefile --- a/www/payara/Makefile +++ b/www/payara/Makefile @@ -9,9 +9,8 @@ LICENSE= GPLv2 CDDL LICENSE_COMB= dual -USES= zip -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java zip + NO_BUILD= yes WRKSRC= ${WRKDIR}/payara5 @@ -23,7 +22,7 @@ PLIST_SUB+= VARDIR=${VARDIR} PLIST_SUB+= VARMAIN=${VARMAIN} -# Since we USE_JAVA, we propagate the received JAVA_HOME variable to the +# Since we USES=java, we propagate the received JAVA_HOME variable to the # template files, since it is used by the rc script. SUB_LIST= PAYARAVERSION=${PORTVERSION} \ JAVA_HOME=${JAVA_HOME} diff --git a/www/scloader/Makefile b/www/scloader/Makefile --- a/www/scloader/Makefile +++ b/www/scloader/Makefile @@ -11,8 +11,7 @@ LICENSE= GPLv2 -USES= dos2unix zip -USE_JAVA= yes +USES= dos2unix java zip NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/www/selenium/Makefile b/www/selenium/Makefile --- a/www/selenium/Makefile +++ b/www/selenium/Makefile @@ -12,12 +12,9 @@ LICENSE= APACHE20 -USES= cpe +USES= cpe java CPE_VENDOR= jenkins - -USE_JAVA= yes JAVA_VERSION= 11+ -JAVA_RUN= yes USE_RC_SUBR= selenium diff --git a/www/servlet-api/Makefile b/www/servlet-api/Makefile --- a/www/servlet-api/Makefile +++ b/www/servlet-api/Makefile @@ -10,7 +10,8 @@ COMMENT= The Servlet API WWW= http://java.sun.com/products/servlet/ -USE_JAVA= yes +USES= java + NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile --- a/www/tomcat-devel/Makefile +++ b/www/tomcat-devel/Makefile @@ -13,9 +13,8 @@ RUN_DEPENDS= jsvc:devel/apache-commons-daemon -USES= cpe +USES= cpe java CPE_VENDOR= apache -USE_JAVA= yes JAVA_VERSION= 17+ USE_RC_SUBR= ${PKGBASE:C/-/_/} diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile --- a/www/tomcat-native/Makefile +++ b/www/tomcat-native/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 -USES= libtool ssl -USE_JAVA= yes +USES= java libtool ssl USE_LDCONFIG= yes + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apr=${LOCALBASE} \ --with-java-home=${JAVA_HOME} \ diff --git a/www/tomcat-native2/Makefile b/www/tomcat-native2/Makefile --- a/www/tomcat-native2/Makefile +++ b/www/tomcat-native2/Makefile @@ -13,9 +13,9 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 -USES= libtool ssl -USE_JAVA= yes +USES= java libtool ssl USE_LDCONFIG= yes + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apr=${LOCALBASE} \ --with-java-home=${JAVA_HOME} \ diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile --- a/www/tomcat101/Makefile +++ b/www/tomcat101/Makefile @@ -13,9 +13,8 @@ RUN_DEPENDS= jsvc:devel/apache-commons-daemon -USES= cpe +USES= cpe java CPE_VENDOR= apache -USE_JAVA= yes JAVA_VERSION= 11+ USE_RC_SUBR= ${PKGBASE:C/-/_/} diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile --- a/www/tomcat110/Makefile +++ b/www/tomcat110/Makefile @@ -13,9 +13,8 @@ RUN_DEPENDS= jsvc:devel/apache-commons-daemon -USES= cpe +USES= cpe java CPE_VENDOR= apache -USE_JAVA= yes JAVA_VERSION= 17+ USE_RC_SUBR= ${PKGBASE:C/-/_/} diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile --- a/www/tomcat9/Makefile +++ b/www/tomcat9/Makefile @@ -13,10 +13,8 @@ RUN_DEPENDS= jsvc:devel/apache-commons-daemon -USES= cpe +USES= cpe java CPE_VENDOR= apache -USE_JAVA= yes -JAVA_VERSION= 8+ USE_RC_SUBR= ${PKGBASE:C/-/_/} NO_ARCH= yes diff --git a/www/tomee/Makefile b/www/tomee/Makefile --- a/www/tomee/Makefile +++ b/www/tomee/Makefile @@ -12,9 +12,8 @@ RUN_DEPENDS= jsvc:devel/apache-commons-daemon -USES= cpe +USES= cpe java CPE_VENDOR= apache -USE_JAVA= yes USE_RC_SUBR= ${PKGBASE} EXTRACT_AFTER_ARGS= --exclude *.bat \ diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile --- a/www/unit-java/Makefile +++ b/www/unit-java/Makefile @@ -62,8 +62,7 @@ %%JAVAJARDIR%%/websocket-api-java${JAVA_PORT_VERSION}-${UNIT_VERSION}.jar \ libexec/unit/modules/${UNIT_MODNAME}.unit.so -USE_JAVA= yes -JAVA_VERSION= 8+ +USES+= java #JAVA_VERSION= 8 11 12 13 14 15 USE_RC_SUBR?= # reset to empty diff --git a/www/vertx/Makefile b/www/vertx/Makefile --- a/www/vertx/Makefile +++ b/www/vertx/Makefile @@ -16,7 +16,6 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} JAVA_OS= native -JAVA_RUN= yes PLIST_SUB= VERTXVER=${PORTVERSION} @@ -25,8 +24,7 @@ SED_APPEND_ARGS= ${nl}JAVA_HOME=${JAVA_HOME} SHEBANG_FILES= bin/vertx -USE_JAVA= yes -USES= shebangfix +USES= java shebangfix VERTX_CMD= ${WRKSRC}/bin/vertx VERTX_DIST= client conf lib diff --git a/www/yuicompressor/Makefile b/www/yuicompressor/Makefile --- a/www/yuicompressor/Makefile +++ b/www/yuicompressor/Makefile @@ -14,9 +14,10 @@ LICENSE= BSD3CLAUSE MPL20 LICENSE_COMB= multi +USES= java + NO_WRKSUBDIR= yes -USE_JAVA= yes NO_BUILD= yes NO_ARCH= yes diff --git a/x11-fm/mucommander/Makefile b/x11-fm/mucommander/Makefile --- a/x11-fm/mucommander/Makefile +++ b/x11-fm/mucommander/Makefile @@ -10,8 +10,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/license.txt -USES= tar:tgz -USE_JAVA= yes +USES= java tar:tgz JAVA_VERSION= 11+ NO_ARCH= yes diff --git a/x11-toolkits/skinlf/Makefile b/x11-toolkits/skinlf/Makefile --- a/x11-toolkits/skinlf/Makefile +++ b/x11-toolkits/skinlf/Makefile @@ -14,8 +14,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= zip -USE_JAVA= yes +USES= java zip JAR_NAME= ${PORTNAME}.jar diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile --- a/x11-toolkits/swt/Makefile +++ b/x11-toolkits/swt/Makefile @@ -13,12 +13,9 @@ ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le -USES= compiler:c++11-lang gl gmake gnome pkgconfig zip:infozip xorg - -USE_ANT= yes +USES= compiler:c++11-lang gl gmake gnome java:ant pkgconfig zip:infozip xorg USE_GL= glu gl USE_GNOME= gdkpixbuf2 gtk30 -USE_JAVA= yes USE_XORG= xtst JAVA_OS= native