Date: Tue, 31 Dec 2024 08:58:10 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0835676e361b - main - Mk/**java.mk: Convert bsd.java.mk to USES Message-ID: <202412310858.4BV8wApC083306@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0835676e361bca74b28b09fe0425ed5ee958f26b commit 0835676e361bca74b28b09fe0425ed5ee958f26b Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-12-27 19:10:41 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-12-31 08:57:55 +0000 Mk/**java.mk: Convert bsd.java.mk to USES The following features have been added or changed: - Instead of USE_JAVA use USES=java. This defaults to USES=java:build,run if NO_BUILD is undefined. Else it defaults to USES=java:run - Instead of USE_ANT=yes use USES=java:ant which also implies USES=java:build - Instead of JAVA_BUILD=yes use USES=java:build. Does not imply run or extract - Instead of JAVA_EXTRACT=yes use USES=java:extract does not imply build or run - Instead of JAVA_RUN=yes use USES=java:run does not imply extract or build - Instead of USE_JAVA=<version> use USES=java and JAVA_VERSION=<version> Approved by: mat (portmgr), glewis Differential Revision: https://reviews.freebsd.org/D48201 --- CHANGES | 19 ++++ Mk/{bsd.java.mk => Uses/java.mk} | 167 +++++++++++++++------------- Mk/bsd.port.mk | 11 -- Mk/bsd.sanity.mk | 8 +- archivers/apache-commons-compress/Makefile | 3 +- archivers/javatar/Makefile | 2 +- archivers/snappy-java/Makefile | 4 +- astro/gpsprune/Makefile | 2 +- astro/josm/Makefile | 3 +- astro/mkgmap-splitter/Makefile | 3 +- astro/mkgmap/Makefile | 3 +- astro/osmosis/Makefile | 3 +- audio/atunes/Makefile | 2 +- audio/jid3lib/Makefile | 3 +- audio/musiccontrol/Makefile | 2 +- audio/nyquist/Makefile | 4 +- benchmarks/linux-vdbench/Makefile | 3 +- benchmarks/scimark2/Makefile | 3 +- benchmarks/typometer/Makefile | 4 +- biology/artemis/Makefile | 3 +- biology/bbmap/Makefile | 3 +- biology/canu/Makefile | 4 +- biology/cytoscape/Makefile | 3 +- biology/ddocent/Makefile | 3 +- biology/erminej/Makefile | 3 +- biology/fastqc/Makefile | 3 +- biology/figtree/Makefile | 3 +- biology/gatk/Makefile | 4 +- biology/gkl/Makefile | 3 +- biology/igv/Makefile | 3 +- biology/jalview/Makefile | 2 +- biology/picard-tools/Makefile | 3 +- biology/readseq/Makefile | 2 +- biology/snpeff/Makefile | 3 +- biology/sra-tools/Makefile | 3 +- biology/trimmomatic/Makefile | 4 +- cad/digital/Makefile | 5 +- cad/electric-ng/Makefile | 2 +- cad/fidocadj/Makefile | 3 +- cad/impact/Makefile | 3 +- cad/logisim/Makefile | 4 +- cad/silice/Makefile | 3 +- cad/surelog/Makefile | 9 +- cad/sweethome3d/Makefile | 6 +- comms/java-simple-serial-connector/Makefile | 3 +- comms/rxtx/Makefile | 3 +- databases/apache-commons-dbutils/Makefile | 3 +- databases/c3p0/Makefile | 3 +- databases/cassandra3/Makefile | 4 +- databases/cassandra4/Makefile | 4 +- databases/db18/Makefile | 5 +- databases/db5/Makefile | 2 +- databases/frontbase-jdbc/Makefile | 2 +- databases/hsqldb/Makefile | 5 +- databases/jdbc-oracle11g/Makefile | 2 +- databases/jetbrains-datagrip/Makefile | 4 +- databases/jrobin/Makefile | 2 +- databases/jrrd/Makefile | 9 +- databases/libgda5/Makefile | 4 +- databases/liquibase/Makefile | 4 +- databases/metabase/Makefile | 5 +- databases/mysql-connector-j/Makefile | 5 +- databases/mysql-connector-java51/Makefile | 3 +- databases/neo4j/Makefile | 3 +- databases/postgis-jdbc/Makefile | 3 +- databases/postgresql-jdbc/Makefile | 3 +- databases/powerarchitect/Makefile | 2 +- databases/puppetdb7/Makefile | 3 +- databases/puppetdb8/Makefile | 3 +- databases/rocksdb-jni/Makefile | 6 +- databases/sql-workbench/Makefile | 3 +- databases/sqldeveloper/Makefile | 3 +- databases/squirrel-sql/Makefile | 4 +- deskutils/docear/Makefile | 3 +- deskutils/freemind/Makefile | 3 +- deskutils/freeplane/Makefile | 3 +- deskutils/ganttproject/Makefile | 3 +- deskutils/projectlibre/Makefile | 2 +- deskutils/thinkingrock/Makefile | 2 +- devel/R-cran-rJava/Makefile | 11 +- devel/RStudio/Makefile | 5 +- devel/ammonite/Makefile | 3 +- devel/antlr/Makefile | 3 +- devel/antlr3/Makefile | 3 +- devel/antlr4/Makefile | 4 +- devel/apache-ant/Makefile | 3 +- devel/apache-commons-configuration/Makefile | 3 +- devel/apache-commons-daemon/Makefile | 5 +- devel/apache-commons-io/Makefile | 2 +- devel/apache-commons-jxpath/Makefile | 3 +- devel/apache-log4j2/Makefile | 4 +- devel/apache-rat/Makefile | 3 +- devel/arduino/Makefile | 4 +- devel/arduino18/Makefile | 5 +- devel/argouml/Makefile | 3 +- devel/artifactory/Makefile | 4 +- devel/astah-community/Makefile | 3 +- devel/avalon-framework/Makefile | 3 +- devel/bazel/Makefile | 7 +- devel/bazel5/Makefile | 7 +- devel/bfg/Makefile | 3 +- devel/cfr/Makefile | 3 +- devel/charva/Makefile | 5 +- devel/coursier/Makefile | 3 +- devel/dbus-java/Makefile | 4 +- devel/doctorj/Makefile | 3 +- devel/flex-sdk/Makefile | 3 +- devel/flex-sdk35/Makefile | 3 +- devel/flexdock/Makefile | 3 +- devel/flexjson/Makefile | 3 +- devel/ghidra/Makefile | 4 +- devel/gradle/Makefile | 3 +- devel/gradle5/Makefile | 4 +- devel/gradle6/Makefile | 3 +- devel/gradle62/Makefile | 3 +- devel/gradle761/Makefile | 3 +- devel/ireport/Makefile | 3 +- devel/java-findbugs/Makefile | 3 +- devel/jcmdline/Makefile | 3 +- devel/jenkins-lts/Makefile | 4 +- devel/jenkins/Makefile | 4 +- devel/jetbrains-clion/Makefile | 4 +- devel/jetbrains-goland/Makefile | 3 +- devel/jetbrains-phpstorm/Makefile | 3 +- devel/jetbrains-rustrover/Makefile | 3 +- devel/jetbrains-sqlite/Makefile | 4 +- devel/jetbrains-webstorm/Makefile | 3 +- devel/jgoodies-looks/Makefile | 2 +- devel/jiic/Makefile | 4 +- devel/jline/Makefile | 4 +- devel/jna/Makefile | 6 +- devel/jsap/Makefile | 3 +- devel/leiningen/Makefile | 3 +- devel/libastylej/Makefile | 4 +- devel/libmatthew/Makefile | 3 +- devel/libreadline-java/Makefile | 6 +- devel/libvirt-java/Makefile | 4 +- devel/listserialc/Makefile | 2 +- devel/log4j/Makefile | 3 +- devel/luajava/Makefile | 3 +- devel/maven/Makefile | 3 +- devel/maven363/Makefile | 3 +- devel/maven39/Makefile | 3 +- devel/mill/Makefile | 3 +- devel/netscape-java40/Makefile | 3 +- devel/nexus2-oss/Makefile | 8 +- devel/ocaml-camljava/Makefile | 3 +- devel/opengrok/Makefile | 3 +- devel/p5-Inline-Java/Makefile | 9 +- devel/p5-Java/Makefile | 3 +- devel/pmd/Makefile | 3 +- devel/protobuf-java/Makefile | 2 +- devel/py-jep/Makefile | 3 +- devel/pycharm-ce/Makefile | 3 +- devel/pycharm-pro/Makefile | 3 +- devel/rubygem-jruby-jars/Makefile | 3 +- devel/rubymine/Makefile | 4 +- devel/sabre/Makefile | 5 +- devel/sbt/Makefile | 4 +- devel/scalatest/Makefile | 4 +- devel/simian/Makefile | 22 +--- devel/slf4j/Makefile | 4 +- devel/smc/Makefile | 3 +- devel/soapui/Makefile | 4 +- devel/sonar-scanner-cli/Makefile | 3 +- devel/sonarqube-ant-task/Makefile | 3 +- devel/sonarqube-community/Makefile | 3 +- devel/spark/Makefile | 3 +- devel/sparsebitset/Makefile | 3 +- devel/staf/Makefile | 4 +- devel/statcvs/Makefile | 5 +- devel/statsvn/Makefile | 5 +- devel/swank-clojure/Makefile | 2 +- devel/tijmp/Makefile | 4 +- devel/tinylaf/Makefile | 4 +- devel/umlgraph/Makefile | 3 +- devel/violet/Makefile | 2 +- devel/zanata-cli/Makefile | 3 +- devel/zookeeper/Makefile | 5 +- dns/denominator/Makefile | 3 +- dns/dnsjava/Makefile | 3 +- editors/bined/Makefile | 4 +- editors/drjava/Makefile | 3 +- editors/jedit/Makefile | 3 +- editors/libreoffice/Makefile | 4 +- editors/omegaT/Makefile | 4 +- editors/openoffice-4/Makefile | 5 +- editors/openoffice-devel/Makefile | 5 +- editors/treeform/Makefile | 4 +- emulators/edumips64/Makefile | 2 +- emulators/javatari/Makefile | 3 +- filesystems/hfsexplorer/Makefile | 2 +- finance/jgnash/Makefile | 3 +- finance/quickfix/Makefile | 2 +- finance/venice/Makefile | 4 +- ftp/dmachine/Makefile | 3 +- ftp/jftp/Makefile | 3 +- games/blackjackclient/Makefile | 4 +- games/coronapoker/Makefile | 3 +- games/dmjava/Makefile | 4 +- games/domination/Makefile | 4 +- games/freecol/Makefile | 4 +- games/gogui/Makefile | 3 +- games/java-games-suite/Makefile | 2 +- games/jchessboard/Makefile | 5 +- games/jin/Makefile | 4 +- games/jinput/Makefile | 3 +- games/jtans/Makefile | 3 +- games/jutils/Makefile | 3 +- games/lizzie/Makefile | 2 +- games/lwjgl/Makefile | 4 +- games/lwjgl3/Makefile | 5 +- games/minecraft-client/Makefile | 4 +- games/minecraft-server/Makefile | 2 +- games/moagg/Makefile | 3 +- games/multimc/Makefile | 3 +- games/pcgen/Makefile | 4 +- games/prismlauncher/Makefile | 3 +- games/rescue/Makefile | 3 +- games/robocode-naval/Makefile | 6 +- games/robocode/Makefile | 6 +- games/runelite/Makefile | 3 +- games/sokobano/Makefile | 5 +- games/spicetrade/Makefile | 3 +- games/stendhal/Makefile | 4 +- graphics/aoi/Makefile | 4 +- graphics/batik/Makefile | 3 +- graphics/cbviewer/Makefile | 4 +- graphics/cosmoplayer/Makefile | 3 +- graphics/ditaa/Makefile | 3 +- graphics/geoapi/Makefile | 4 +- graphics/geoserver/Makefile | 4 +- graphics/jalbum/Makefile | 4 +- graphics/jave6/Makefile | 4 +- graphics/jdraw/Makefile | 3 +- graphics/jogamp-jogl/Makefile | 5 +- graphics/jogl/Makefile | 4 +- graphics/jpatch/Makefile | 4 +- graphics/libpano13/Makefile | 2 +- graphics/lightzone/Makefile | 6 +- graphics/mapyrus/Makefile | 3 +- graphics/ogre3d/Makefile | 2 +- graphics/opencv/Makefile | 2 +- graphics/opendx/Makefile | 2 +- graphics/openjump/Makefile | 4 +- graphics/plantuml/Makefile | 2 +- graphics/processing/Makefile | 4 +- graphics/tintfu/Makefile | 3 +- graphics/xmlgraphics-commons/Makefile | 2 +- graphics/yed/Makefile | 4 +- java/apache-bcel/Makefile | 3 +- java/apache-commons-beanutils/Makefile | 5 +- java/apache-commons-cli/Makefile | 3 +- java/apache-commons-codec/Makefile | 4 +- java/apache-commons-collections/Makefile | 3 +- java/apache-commons-collections4/Makefile | 3 +- java/apache-commons-dbcp/Makefile | 5 +- java/apache-commons-httpclient/Makefile | 5 +- java/apache-commons-lang/Makefile | 4 +- java/apache-commons-lang3/Makefile | 3 +- java/apache-commons-logging/Makefile | 3 +- java/apache-commons-pool/Makefile | 4 +- java/aparapi/Makefile | 9 +- java/avis/Makefile | 6 +- java/berkeley-db/Makefile | 5 +- java/bluej/Makefile | 3 +- java/bouncycastle/Makefile | 4 +- java/bouncycastle15/Makefile | 4 +- java/cos/Makefile | 4 +- java/dbvis/Makefile | 3 +- java/eclipse-cdt/Makefile | 5 +- java/eclipse-drjava/Makefile | 3 +- java/eclipse-ecj/Makefile | 4 +- java/eclipse-findbugs/Makefile | 3 +- java/eclipse-pydev/Makefile | 12 +- java/eclipse-shelled/Makefile | 3 +- java/eclipse/Makefile | 4 +- java/eclipse/Makefile.plugins | 2 +- java/hamcrest/Makefile | 3 +- java/icedtea-web/Makefile | 3 +- java/infobus/Makefile | 3 +- java/intellij-ultimate/Makefile | 2 +- java/intellij/Makefile | 6 +- java/jai/Makefile | 4 +- java/jakarta-oro/Makefile | 4 +- java/jasmin/Makefile | 9 +- java/java-cup/Makefile | 3 +- java/java-getopt/Makefile | 4 +- java/java-subversion/Makefile | 6 +- java/java3d/Makefile | 5 +- java/javahelp/Makefile | 3 +- java/javamail/Makefile | 6 +- java/javavmwrapper/Makefile | 2 +- java/jaxen/Makefile | 3 +- java/jcalendar/Makefile | 5 +- java/jcckit/Makefile | 4 +- java/jcommon/Makefile | 15 ++- java/jd-gui/Makefile | 3 +- java/jdom/Makefile | 22 ++-- java/jflex/Makefile | 2 +- java/jfreechart/Makefile | 19 ++-- java/jgraph/Makefile | 11 +- java/jgraphx/Makefile | 3 +- java/jlex/Makefile | 3 +- java/jmf/Makefile | 4 +- java/jode/Makefile | 4 +- java/jrosetta/Makefile | 5 +- java/jta/Makefile | 3 +- java/jtiger/Makefile | 3 +- java/jump/Makefile | 14 +-- java/junit/Makefile | 4 +- java/jxgrabkey/Makefile | 7 +- java/lightweight-java-profiler/Makefile | 6 +- java/mx4j/Makefile | 3 +- java/netbeans/Makefile | 6 +- java/netrexx/Makefile | 4 +- java/netty/Makefile | 5 +- java/openjfx14/Makefile | 3 +- java/phpeclipse/Makefile | 4 +- java/proguard/Makefile | 3 +- java/servingxml/Makefile | 5 +- java/sigar/Makefile | 6 +- java/springframework/Makefile | 3 +- java/springframework31/Makefile | 3 +- java/sqlitejdbc/Makefile | 5 +- java/trove4j/Makefile | 3 +- java/visualvm/Makefile | 5 +- java/wildfly/Makefile | 3 +- lang/abcl/Makefile | 5 +- lang/apache-commons-jelly/Makefile | 3 +- lang/bsh/Makefile | 5 +- lang/ceylon/Makefile | 6 +- lang/clojure/Makefile | 4 +- lang/erlang-java/Makefile | 3 +- lang/erlang-runtime21/Makefile | 2 +- lang/erlang-runtime22/Makefile | 2 +- lang/erlang-runtime23/Makefile | 2 +- lang/erlang-runtime24/Makefile | 2 +- lang/erlang-runtime25/Makefile | 2 +- lang/erlang-runtime26/Makefile | 2 +- lang/erlang-runtime27/Makefile | 2 +- lang/erlang/Makefile | 2 +- lang/groovy/Makefile | 3 +- lang/jruby/Makefile | 4 +- lang/jython/Makefile | 4 +- lang/kawa/Makefile | 5 +- lang/kotlin/Makefile | 3 +- lang/linux-j/Makefile | 3 +- lang/pkl/Makefile | 2 +- lang/rhino/Makefile | 2 +- lang/scala/Makefile | 4 +- lang/sisc/Makefile | 3 +- mail/davmail/Makefile | 4 +- mail/james/Makefile | 4 +- mail/mime4j/Makefile | 3 +- math/R-cran-XLConnect/Makefile | 3 +- math/apache-commons-math/Makefile | 16 +-- math/cvc5/Makefile | 5 +- math/geogebra/Makefile | 3 +- math/jacop/Makefile | 3 +- math/jeuclid/Makefile | 5 +- math/jlatexmath/Makefile | 2 +- math/jtransforms/Makefile | 4 +- math/jts/Makefile | 4 +- math/matlab-installer/Makefile | 4 +- math/octave/Makefile | 2 +- math/plman/Makefile | 3 +- math/sage/Makefile | 3 +- math/scilab/Makefile | 4 +- math/vtk8/Makefile | 2 +- math/vtk9/Makefile | 2 +- misc/elki/Makefile | 2 +- misc/freeguide/Makefile | 4 +- misc/jbidwatcher/Makefile | 5 +- misc/openhab/Makefile | 5 +- misc/openhab2/Makefile | 5 +- misc/pauker/Makefile | 3 +- misc/pipe/Makefile | 4 +- misc/tvbrowser/Makefile | 2 +- multimedia/ffdec/Makefile | 4 +- multimedia/filebot/Makefile | 3 +- multimedia/gdialog/Makefile | 3 +- multimedia/kodi/Makefile | 4 +- multimedia/libbluray/Makefile | 15 +-- multimedia/projectx/Makefile | 3 +- net-im/convey/Makefile | 3 +- net-im/jicofo/Makefile | 2 +- net-im/jitsi-srtp-native/Makefile | 3 +- net-im/jitsi-videobridge/Makefile | 2 +- net-im/openfire/Makefile | 3 +- net-im/signal-cli/Makefile | 4 +- net-im/signald/Makefile | 8 +- net-im/zkgroup/Makefile | 3 +- net-mgmt/collectd5/Makefile | 2 +- net-mgmt/confregdecode/Makefile | 3 +- net-mgmt/midpoint/Makefile | 3 +- net-mgmt/riemann/Makefile | 6 +- net-mgmt/unifi8/Makefile | 5 +- net-mgmt/zabbix5-java/Makefile | 2 - net-mgmt/zabbix5-server/Makefile | 4 + net-mgmt/zabbix6-java/Makefile | 2 - net-mgmt/zabbix6-server/Makefile | 4 + net-mgmt/zabbix64-java/Makefile | 2 - net-mgmt/zabbix64-server/Makefile | 4 + net-mgmt/zabbix7-java/Makefile | 2 - net-mgmt/zabbix7-server/Makefile | 4 + net-mgmt/zabbix72-java/Makefile | 2 - net-mgmt/zabbix72-server/Makefile | 4 + net-p2p/phex/Makefile | 4 +- net-p2p/vuze/Makefile | 5 +- net/activemq/Makefile | 3 +- net/apache-commons-net/Makefile | 3 +- net/belle-sip/Makefile | 4 +- net/freeswitch/Makefile | 5 +- net/java-beepcore/Makefile | 3 +- net/jcifs/Makefile | 4 +- net/jgroups/Makefile | 4 +- net/jicmp/Makefile | 9 +- net/jicmp6/Makefile | 6 +- net/jrdesktop/Makefile | 3 +- net/jsch/Makefile | 4 +- net/kafka/Makefile | 5 +- net/keycloak/Makefile | 6 +- net/ldapbrowser/Makefile | 3 +- net/seda/Makefile | 13 +-- net/serviio/Makefile | 8 +- net/spread-j/Makefile | 3 +- net/tigervnc-viewer-java/Makefile | 4 +- net/tightvnc/Makefile | 3 +- net/toonel/Makefile | 4 +- news/nzbhydra2/Makefile | 4 +- print/pdf-renderer/Makefile | 14 +-- print/pdfbox/Makefile | 4 +- print/pdflib/Makefile | 5 +- print/pdftk/Makefile | 4 +- science/cdk/Makefile | 3 +- science/colt/Makefile | 32 +++--- science/devisor/Makefile | 3 +- science/hdf/Makefile | 5 +- science/jmol/Makefile | 3 +- science/openmodelica/Makefile | 3 +- science/opensim-core/Makefile | 2 +- science/opsin/Makefile | 2 +- science/simsmith/Makefile | 3 +- security/bastillion/Makefile | 3 +- security/dirbuster/Makefile | 4 +- security/i2p/Makefile | 5 +- security/iaikpkcs11wrapper/Makefile | 3 +- security/owasp-dependency-check/Makefile | 2 +- security/xml-security/Makefile | 20 ++-- security/zaproxy/Makefile | 5 +- sysutils/digdag/Makefile | 4 +- sysutils/facter/Makefile | 3 +- sysutils/graylog/Makefile | 6 +- sysutils/javaservicewrapper/Makefile | 5 +- sysutils/jdiskreport/Makefile | 3 +- sysutils/jtopen/Makefile | 4 +- sysutils/jvmtop/Makefile | 3 +- sysutils/logstash7/Makefile | 5 +- sysutils/logstash8/Makefile | 5 +- sysutils/munin-node/Makefile | 4 +- sysutils/pcns/Makefile | 3 +- sysutils/puppetserver7/Makefile | 4 +- sysutils/puppetserver8/Makefile | 5 +- sysutils/rundeck/Makefile | 3 +- sysutils/syslog-ng/Makefile | 4 +- textproc/apache-commons-csv/Makefile | 3 +- textproc/apache-commons-digester/Makefile | 3 +- textproc/apache-poi/Makefile | 3 +- textproc/apache-solr/Makefile | 4 +- textproc/apache-xmlbeans/Makefile | 4 +- textproc/denature/Makefile | 3 +- textproc/dom4j/Makefile | 3 +- textproc/dtd2relax/Makefile | 4 +- textproc/elasticsearch7/Makefile | 3 +- textproc/elasticsearch8/Makefile | 3 +- textproc/fop/Makefile | 3 +- textproc/jalingo/Makefile | 4 +- textproc/jarnal/Makefile | 3 +- textproc/jaxup/Makefile | 6 +- textproc/jdictionary/Makefile | 3 +- textproc/jdictionary/Makefile.plugin | 4 +- textproc/jing/Makefile | 5 +- textproc/link-grammar/Makefile | 2 +- textproc/lucene/Makefile | 4 +- textproc/lucene5/Makefile | 4 +- textproc/nux/Makefile | 3 +- textproc/opensearch/Makefile | 3 +- textproc/opensearch13/Makefile | 3 +- textproc/ppower4/Makefile | 3 +- textproc/qrcodegen/Makefile | 4 +- textproc/resume/Makefile | 4 +- textproc/saxon-devel/Makefile | 4 +- textproc/saxon-he/Makefile | 4 +- textproc/saxon/Makefile | 4 +- textproc/tagsoup/Makefile | 3 +- textproc/trang/Makefile | 5 +- textproc/weka/Makefile | 4 +- textproc/xalan-j/Makefile | 4 +- textproc/xerces-j/Makefile | 3 +- textproc/xincluder/Makefile | 4 +- textproc/xml-commons/Makefile | 4 +- textproc/xmlenc/Makefile | 5 +- textproc/xom/Makefile | 3 +- textproc/xp/Makefile | 3 +- textproc/xstream/Makefile | 4 +- textproc/zorba/Makefile | 25 ++--- www/archiva/Makefile | 5 +- www/axis2/Makefile | 4 +- www/closure-compiler/Makefile | 3 +- www/glassfish/Makefile | 5 +- www/glassfish4/Makefile | 6 +- www/grails/Makefile | 4 +- www/htmlcompressor/Makefile | 3 +- www/httpasyncclient/Makefile | 4 +- www/httpclient/Makefile | 3 +- www/httpcore/Makefile | 2 +- www/jericho-html/Makefile | 3 +- www/jetty10/Makefile | 3 +- www/jetty12/Makefile | 3 +- www/jmeter/Makefile | 4 +- www/payara/Makefile | 7 +- www/scloader/Makefile | 3 +- www/selenium/Makefile | 5 +- www/servlet-api/Makefile | 3 +- www/tomcat-devel/Makefile | 3 +- www/tomcat-native/Makefile | 4 +- www/tomcat-native2/Makefile | 4 +- www/tomcat101/Makefile | 3 +- www/tomcat110/Makefile | 3 +- www/tomcat9/Makefile | 4 +- www/tomee/Makefile | 3 +- www/unit-java/Makefile | 3 +- www/vertx/Makefile | 4 +- www/yuicompressor/Makefile | 3 +- x11-fm/mucommander/Makefile | 3 +- x11-toolkits/skinlf/Makefile | 3 +- x11-toolkits/swt/Makefile | 5 +- 538 files changed, 978 insertions(+), 1365 deletions(-) diff --git a/CHANGES b/CHANGES index d5c37f30f68e..b7b8e8a93a40 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,25 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20241231: +AUTHOR: bofh@FreeBSD.org + + Convert bsd.java.mk to USES + + The following features have been added or changed: + - Instead of USE_JAVA use USES=java. This defaults to + USES=java:build,run if NO_BUILD is undefined. Else it defaults to + USES=java:run + - Instead of USE_ANT=yes use USES=java:ant which also implies + USES=java:build + - Instead of JAVA_BUILD=yes use USES=java:build. Does not imply run or + extract + - Instead of JAVA_EXTRACT=yes use USES=java:extract does not imply + build or run + - Instead of JAVA_RUN=yes use USES=java:run does not imply extract or + build + - Instead of USE_JAVA=<version> use USES=java and JAVA_VERSION=<version> + 20241231: AUTHOR: bofh@FreeBSD.org diff --git a/Mk/bsd.java.mk b/Mk/Uses/java.mk similarity index 83% rename from Mk/bsd.java.mk rename to Mk/Uses/java.mk index 2c089c85785f..96f42f5546b9 100644 --- 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 @@ Java_Include_MAINTAINER= java@FreeBSD.org # Stage 4: Add any dependencies if necessary # Stage 5: Define all settings for the port to use # +# MAINTAINER: java@FreeBSD.org + +.if !defined(_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 @@ _JDK_FILE=bin/javac # suitable # -# From here, the port is using bsd.java.mk v2.0 # Error checking: defined JAVA_{HOME,PORT,PORT_VERSION,PORT_VENDOR,PORT_OS} . for variable in JAVA_HOME JAVA_PORT JAVA_PORT_VERSION JAVA_PORT_VENDOR JAVA_PORT_OS @@ -267,16 +307,6 @@ check-makevars:: ${FALSE}) . endif -# Set default values for JAVA_BUILD and JAVA_RUN -# When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre -# (unless NO_BUILD is set) -. if !defined(JAVA_EXTRACT) && !defined(JAVA_BUILD) && !defined(JAVA_RUN) -. if !defined(NO_BUILD) -JAVA_BUILD= jdk -. endif -JAVA_RUN= jre -. endif - # JDK dependency setting . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE @@ -371,46 +401,36 @@ JAVA_PORT_OS_DESCRIPTION:= ${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/} # Stage 4: Add any dependencies if necessary # -# Ant Support: USE_ANT --> JAVA_BUILD=jdk -. if defined(USE_ANT) -JAVA_BUILD= jdk -. endif - # Add the JDK port to the dependencies DEPEND_JAVA= ${JAVA}:${JAVA_PORT} -. if defined(JAVA_EXTRACT) +. if defined(_USE_JAVA_EXTRACT) EXTRACT_DEPENDS+= ${DEPEND_JAVA} . endif -. if defined(JAVA_BUILD) -. if defined(NO_BUILD) -check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: JAVA_BUILD and NO_BUILD cannot be set at the same time."; - @${FALSE} -. endif +. if defined(_USE_JAVA_BUILD) BUILD_DEPENDS+= ${DEPEND_JAVA} . endif -. if defined(JAVA_RUN) +. if defined(_USE_JAVA_RUN) RUN_DEPENDS+= ${DEPEND_JAVA} . endif # Ant support: default do-build target -. if defined(USE_ANT) -DESTDIRNAME?= -Dfreebsd.ports.destdir +. if defined(_USE_JAVA_ANT) +DESTDIRNAME= -Dfreebsd.ports.destdir ANT?= ${LOCALBASE}/bin/ant MAKE_ENV+= JAVA_HOME=${JAVA_HOME} BUILD_DEPENDS+= ${ANT}:devel/apache-ant 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 @@ do-test: # Define the location of the Java compiler. # Only define JAVAC if a JDK is needed -. undef JAVAC +#. undef JAVAC # Then test if a JAVAC has to be set (JAVA_BUILD==jdk) -. if defined(JAVA_BUILD) -. if (${JAVA_BUILD:tu} == "JDK") && !defined(JAVAC) +. if defined(_USE_JAVA_BUILD) && !defined(JAVAC) JAVAC?= ${JAVA_HOME}/bin/javac -. endif . endif # Define the location of some more executables. @@ -460,9 +478,9 @@ java-debug: @${ECHO_CMD} "JAVA_VERSION= ${JAVA_VERSION} (${_JAVA_VERSION})" @${ECHO_CMD} "JAVA_OS= ${JAVA_OS} (${_JAVA_OS})" @${ECHO_CMD} "JAVA_VENDOR= ${JAVA_VENDOR} (${_JAVA_VENDOR})" - @${ECHO_CMD} "JAVA_BUILD= ${JAVA_BUILD}" - @${ECHO_CMD} "JAVA_RUN= ${JAVA_RUN}" - @${ECHO_CMD} "JAVA_EXTRACT= ${JAVA_EXTRACT}" + @${ECHO_CMD} "JAVA_BUILD= ${_USE_JAVA_BUILD}" + @${ECHO_CMD} "JAVA_RUN= ${_USE_JAVA_RUN}" + @${ECHO_CMD} "JAVA_EXTRACT= ${_USE_JAVA_EXTRACT}" @${ECHO_CMD} "JAVA_DEFAULT= ${JAVA_DEFAULT}" @${ECHO_CMD} @${ECHO_CMD} "# JDK port dependency selection process:" @@ -483,5 +501,4 @@ java-debug: @${ECHO_CMD} "JAVAC= ${JAVAC}" @${ECHO_CMD} "JAVA_CLASSES= ${JAVA_CLASSES}" -. endif .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index bbc0fe68ff19..8c8287d0d0b7 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -357,9 +357,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org ## # LDFLAGS_${ARCH} Append the ldflags to LDFLAGS only on the specified architecture ## -# USE_JAVA - If set, this port relies on the Java language. -# Implies inclusion of bsd.java.mk. (Also see -# that file for more information on USE_JAVA_*). ## # USE_GECKO - If set, this port uses the Gecko/Mozilla product. # See bsd.gecko.mk for more details. @@ -1402,10 +1399,6 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg .sinclude "${odir}/Mk/bsd.overlay.mk" . endfor -. if defined(USE_JAVA) -.include "${PORTSDIR}/Mk/bsd.java.mk" -. endif - . if defined(USE_APACHE_BUILD) USES+= apache:build,${USE_APACHE_BUILD:C/2([0-9])/2.\1/g} . elif defined(USE_APACHE_RUN) @@ -1925,10 +1918,6 @@ PKGPOSTDEINSTALL?= ${PKGDIR}/pkg-post-deinstall .sinclude "${odir}/Mk/bsd.overlay.mk" . endfor -. if defined(USE_JAVA) -.include "${PORTSDIR}/Mk/bsd.java.mk" -. endif - . if defined(USE_WX) || defined(USE_WX_NOT) .include "${PORTSDIR}/Mk/bsd.wx.mk" . endif diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index f8bad3132290..18c49a2ea5aa 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -213,7 +213,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ USE_OPENLDAP WANT_OPENLDAP_VER USE_OCAML USE_OCAML_CAMLP4 USE_OCAML_WASH \ USE_OCAML_TK NO_OCAMLTK_BUILDDEPENDS NO_OCAMLTK_RUNDEPENDS \ USE_OCAMLFIND_PLIST USE_OCAML_FINDLIB USE_OCAML_LDCONFIG \ - NO_OCAML_BUILDDEPENDS NO_OCAML_RUNDEPENDS + NO_OCAML_BUILDDEPENDS NO_OCAML_RUNDEPENDS USE_JAVA JAVA_BUILD \ + JAVA_EXTRACT USE_ANT JAVA_RUN SANITY_DEPRECATED= MLINKS \ USE_MYSQL WANT_MYSQL_VER \ PYDISTUTILS_INSTALLNOSINGLE @@ -321,6 +322,11 @@ NO_OCAMLTK_BUILDDEPENDS_ALT= USES=ocaml:tkrun NO_OCAMLTK_RUNDEPENDS_ALT= USES=ocaml:tkbuild NO_OCAML_BUILDDEPENDS_ALT= USES=ocaml:run NO_OCAML_RUNDEPENDS_ALT= USES=ocaml:build +USE_ANT_ALT= USES=java:ant +USE_JAVA_ALT= USES=java +JAVA_EXTRACT_ALT= USES=java:extract +JAVA_BUILD_ALT= USES=java:build +JAVA_RUN_ALT= USES=java:run .for a in ${SANITY_DEPRECATED} . if defined(${a}) diff --git a/archivers/apache-commons-compress/Makefile b/archivers/apache-commons-compress/Makefile index 07d9257eb061..4ac77a8c69fd 100644 --- a/archivers/apache-commons-compress/Makefile +++ b/archivers/apache-commons-compress/Makefile @@ -11,8 +11,7 @@ WWW= https://commons.apache.org/proper/commons-compress/ LICENSE= APACHE20 -USE_JAVA= yes -JAVA_VERSION= 8+ +USES= java WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes diff --git a/archivers/javatar/Makefile b/archivers/javatar/Makefile index a9bf1bf03676..d7eb62cfa84e 100644 --- a/archivers/javatar/Makefile +++ b/archivers/javatar/Makefile @@ -11,7 +11,7 @@ WWW= http://www.trustice.com/java/tar/ LICENSE= PD LICENSE_FILE= ${WRKSRC}/doc/LICENSE -USE_JAVA= yes +USES= java NO_BUILD= yes diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile index e8cc14d88d72..a0de8443e720 100644 --- a/archivers/snappy-java/Makefile +++ b/archivers/snappy-java/Makefile @@ -25,7 +25,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= cmake:devel/cmake-core \ sbt:devel/sbt -USES= gmake +USES= gmake java:build USE_GITHUB= yes GH_ACCOUNT= xerial @@ -36,8 +36,6 @@ GH_TUPLE= google:snappy:${DISTVERSION:R}:google \ google:googletest:b796f7d:google_googletest/google_googletest \ kiyo-masui:bitshuffle:${BITSHUFFLE_V}:masui -USE_JAVA= yes -JAVA_BUILD= jre # prevent JAVA_RUN via bsd.java.mk USE_LDCONFIG= yes MAKE_ARGS+= CXX="${CXX}" TEST_TARGET= test diff --git a/astro/gpsprune/Makefile b/astro/gpsprune/Makefile index b349fb5f6e05..1044699f5246 100644 --- a/astro/gpsprune/Makefile +++ b/astro/gpsprune/Makefile @@ -16,7 +16,7 @@ NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes -USE_JAVA= yes +USES= java *** 8860 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412310858.4BV8wApC083306>