Framework: sync with upstream

Taken from: FreeBSD
2025-01-07 14:15:05 +01:00 · 2025-01-07 14:15:05 +01:00 · d75c497195
commit d75c497195
parent 5bcaadaa37
33 changed files with 994 additions and 414 deletions
--- a/51
+++ b/51
@ -10,6 +10,47 @@ 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
+
+  Converted remaining bsd.ocaml.mk to Uses/ocaml.mk
+
+  - Instead of USE_OCAML=yes use USES=ocaml. If empty USES=ocaml implies
+    build and run
+  - Instead of USE_OCAMLFIND_PLIST use USES=ocaml:findplist which also
+    implies USES=ocaml:findlib
+  - Instead of USE_OCAML_CAMLP4 use USES=ocaml:camlp4
+  - Instead of USE_OCAML_FINDLIB use USES=ocaml:findlib
+  - Instead of USE_OCAML_LDCONFIG use USES=ocaml:ldconfig
+  - Instead of USE_OCAML_WASH use USES=ocaml:wash
+  - Instead of NO_OCAML_BUILDDEPENDS use USES=ocaml:run
+  - Instead of NO_OCAML_RUNDDEPENDS use USES=ocaml:build
+  - Instead of USE_OCAML_TK use USES=ocaml:tk which actually implies
+    USES=ocaml:tkbuild and USES=ocaml:tkrun
+  - Instead of NO_OCAMLTK_BUILDDEPENDS use USES=ocaml:tkrun
+  - Instead of NO_OCAMLTK_RUNDEPENDS use USES=ocaml:tkbuild
+  - USES=ocaml:dune remains unchanged
+  - Prepare to add/remove keywords easily
+
 20240408:
 AUTHOR: flo@FreeBSD.org

@ -442,7 +483,7 @@ AUTHOR: tcberner@FreeBSD.org
  Ports that depend on mlt should now use USES=mlt:<version> to specify
  their dependency.

-  At the moment the supported version is 6, but will be extended to also 
+  At the moment the supported version is 6, but will be extended to also
  allow for selection of mlt 7 shortly.

 20210604:
@ -501,8 +542,8 @@ AUTHOR: pauamma@gundo.com
  purpose, such as:
  * course-writing or course-delivery applications,
  * classroom or school management applications (eg, scheduling classes),
-  * applications, utilities, or games primarily or substantially designed 
-    to help the user learn a specific topic or study in general, like typing 
+  * applications, utilities, or games primarily or substantially designed
+    to help the user learn a specific topic or study in general, like typing
    tutors, flashcard applications, or educational games.

 20201110:
@ -593,7 +634,7 @@ AUTHOR: mat@FreeBSD.org

  USES=lua sets LUA_FLAVOR that needs to be used on all dependencies of
  flavored lua ports, in a similar way as PHP or Python flavors.
-  
+
 20200115:
 AUTHOR: bapt@FreeBSD.org

@ -605,7 +646,7 @@ AUTHOR: bapt@FreeBSD.org

  The ipv6 virtual category is gone, it does not make sense anymore in 2019
  where the norm in applications is to have support both ipv4 and ipv6.
-  
+
 20191001:
 AUTHOR: bapt@FreeBSD.org

--- a/2
+++ b/2
@ -3,7 +3,7 @@
 The compilation of software known as the FreeBSD Ports Collection is
 distributed under the following terms:

-Copyright (C) 1994-2024 The FreeBSD Project.
+Copyright (C) 1994-2025 The FreeBSD Project.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
--- a/8
+++ b/8
@ -288,8 +288,8 @@ snmpd:*:344:
 _metronome:*:345:
 ngircd:*:346:
 eturnal:*:347:
-# free: 348
-# free: 349
+davfs2:*:348:
+tempo:*:349:
 _sabnzbd:*:350:
 sonarr:*:351:
 radarr:*:352:
@ -596,7 +596,7 @@ _xrdp:*:648:
 # free: 652
 # free: 653
 # free: 654
-# free: 655
+tinc:*:655:
 # free: 656
 # free: 657
 # free: 658
@ -677,7 +677,7 @@ bopm:*:717:
 # free: 733
 # free: 734
 c-lightning:*:735:
-# free: 736
+zonemaster:*:736:
 # free: 737
 # free: 738
 # free: 739
--- a/247
+++ b/247
@ -3754,3 +3754,250 @@ x11-toolkits/py-qt5-chart|x11-toolkits/py-qt5-charts|2024-12-08|Renamed to be co
 x11-toolkits/py-qt6-chart|x11-toolkits/py-qt6-charts|2024-12-08|Renamed to be consistent with the Qt module name
 devel/sfml251|devel/sfml|2024-12-09|Removed pinned port because the last user is gone
 devel/ocaml-seq|lang/ocaml|2024-12-10|Has expired: Seq is provided by lang/ocaml
+textproc/mdocml|textproc/mandoc|2024-12-17|Upstream reanamed
+www/shellinabox|sysutils/ttyd|2024-12-24|Has expired: Abandonware and outdated, last release in 2016. Use sysutils/ttyd instead
+audio/spiralsynth|audio/spiralsynthmodular|2024-12-24|Has expired: SpiralSynth isn't being supported any more, use audio/spiralsynthmodular
+textproc/apache-solr8|textproc/apache-solr|2024-12-24|Has expired: Deprecated upstream 2024-10-25, upgrade to version 9 in textproc/apache-solr instead
+editors/ghostwriter@qt5|editors/ghostwriter|2024-12-29|Flavors removed, now supports only qt6
+editors/ghostwriter@qt6|editors/ghostwriter|2024-12-29|Flavors removed, now supports only qt6
+java/bouncycastle15|java/bouncycastle|2024-12-31|Instead of removing bouncycastle replace it with java/bouncycastle15
+x11-toolkits/py-fltk|x11-toolkits/py-pyfltk|2024-12-31|Rename to match upstream naming. Move x11-toolkits/py-fltk to x11-toolkits/py-pyfltk
+databases/py-pgspecial1|databases/py-pgspecial|2024-12-31|Remove obsoleted port. Use databases/py-pgspecial instead
+devel/py-prompt-toolkit1|devel/py-prompt-toolkit|2024-12-31|Remove obsoleted port. Use devel/py-prompt-toolkit instead
+devel/py-protobuf4|devel/py-protobuf|2024-12-31|Remove obsoleted port. Use devel/py-protobuf instead
+math/py-blis07|math/py-blis|2024-12-31|Remove obsoleted port. Use math/py-blis instead
+security/py-pysaml26|security/py-pysaml2|2024-12-31|Remove obsoleted port. Use security/py-pysaml2 instead
+textproc/py-mistune2|textproc/py-mistune|2024-12-31|Remove obsoleted port. Use textproc/py-mistune instead
+textproc/py-rich12|textproc/py-rich|2024-12-31|Remove obsoleted port. Use textproc/py-rich instead
+www/py-tornado4|www/py-tornado|2024-12-31|Remove obsoleted port. Use www/py-tornado instead
+www/py-tornado5|www/py-tornado|2024-12-31|Remove obsoleted port. Use www/py-tornado instead
+archivers/rubygem-minitar-cli0|archivers/rubygem-minitar-cli|2024-12-31|Remove obsoleted port. Use archivers/rubygem-minitar-cli instead
+archivers/rubygem-rubyzip20|archivers/rubygem-rubyzip|2024-12-31|Remove obsoleted port. Use archivers/rubygem-rubyzip instead
+databases/rubygem-redis-clustering52|databases/rubygem-redis-clustering|2024-12-31|Remove obsoleted port. Use databases/rubygem-redis-clustering instead
+databases/rubygem-redis4|databases/rubygem-redis|2024-12-31|Remove obsoleted port. Use databases/rubygem-redis instead
+databases/rubygem-redis52|databases/rubygem-redis|2024-12-31|Remove obsoleted port. Use databases/rubygem-redis instead
+devel/rubygem-bootsnap117|devel/rubygem-bootsnap|2024-12-31|Remove obsoleted port. Use devel/rubygem-bootsnap instead
+devel/rubygem-childprocess3|devel/rubygem-childprocess|2024-12-31|Remove obsoleted port. Use devel/rubygem-childprocess instead
+devel/rubygem-childprocess40|devel/rubygem-childprocess|2024-12-31|Remove obsoleted port. Use devel/rubygem-childprocess instead
+devel/rubygem-cucumber-messages23|devel/rubygem-cucumber-messages|2024-12-31|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead
+devel/rubygem-event_stream_parser0|devel/rubygem-event_stream_parser|2024-12-31|Remove obsoleted port. Use devel/rubygem-event_stream_parser instead
+devel/rubygem-faraday_middleware-aws-sigv403|devel/rubygem-faraday_middleware-aws-sigv4|2024-12-31|Remove obsoleted port. Use devel/rubygem-faraday_middleware-aws-sigv4 instead
+devel/rubygem-fugit18|devel/rubygem-fugit|2024-12-31|Remove obsoleted port. Use devel/rubygem-fugit instead
+devel/rubygem-gettext_i18n_rails112|devel/rubygem-gettext_i18n_rails|2024-12-31|Remove obsoleted port. Use devel/rubygem-gettext_i18n_rails instead
+devel/rubygem-google-apis-cloudresourcemanager_v1035|devel/rubygem-google-apis-cloudresourcemanager_v1|2024-12-31|Remove obsoleted port. Use devel/rubygem-google-apis-cloudresourcemanager_v1 instead
+devel/rubygem-google-apis-core011|devel/rubygem-google-apis-core|2024-12-31|Remove obsoleted port. Use devel/rubygem-google-apis-core instead
+devel/rubygem-google-apis-iam_v1050|devel/rubygem-google-apis-iam_v1|2024-12-31|Remove obsoleted port. Use devel/rubygem-google-apis-iam_v1 instead
+devel/rubygem-grape1|devel/rubygem-grape|2024-12-31|Remove obsoleted port. Use devel/rubygem-grape instead
+devel/rubygem-libddprof|devel/rubygem-libdatadog|2024-12-31|Remove obsoleted port. Use devel/rubygem-libdatadog instead
+net/rubygem-google-cloud-storage145|net/rubygem-google-cloud-storage|2024-12-31|Remove obsoleted port. Use net/rubygem-google-cloud-storage instead
+net/rubygem-octokit8|net/rubygem-octokit|2024-12-31|Remove obsoleted port. Use net/rubygem-octokit instead
+textproc/rubygem-elasticsearch-api713|textproc/rubygem-elasticsearch-api|2024-12-31|Remove obsoleted port. Use textproc/rubygem-elasticsearch-api instead
+textproc/rubygem-elasticsearch-transport713|textproc/rubygem-elasticsearch-transport|2024-12-31|Remove obsoleted port. Use textproc/rubygem-elasticsearch-transport instead
+textproc/rubygem-kramdown1|textproc/rubygem-kramdown|2024-12-31|Remove obsoleted port. Use textproc/rubygem-kramdown instead
+textproc/rubygem-kramdown23|textproc/rubygem-kramdown|2024-12-31|Remove obsoleted port. Use textproc/rubygem-kramdown instead
+textproc/rubygem-rexml32|textproc/rubygem-rexml|2024-12-31|Remove obsoleted port. Use textproc/rubygem-rexml instead
+textproc/rubygem-rexml33|textproc/rubygem-rexml|2024-12-31|Remove obsoleted port. Use textproc/rubygem-rexml instead
+textproc/rubygem-rouge43|textproc/rubygem-rouge|2024-12-31|Remove obsoleted port. Use textproc/rubygem-rouge instead
+textproc/rubygem-terser11|textproc/rubygem-terser|2024-12-31|Remove obsoleted port. Use textproc/rubygem-terser instead
+www/rubygem-httparty020|www/rubygem-httparty|2024-12-31|Remove obsoleted port. Use www/rubygem-httparty instead
+devel/rubygem-fog-core220|devel/rubygem-fog-core|2024-12-31|Remove obsoleted port. Use devel/rubygem-fog-core instead
+devel/rubygem-childprocess41|devel/rubygem-childprocess|2024-12-31|Remove obsoleted port. Use devel/rubygem-childprocess instead
+multimedia/recmpeg|multimedia/ffmpeg|2025-01-01|Has expired: Depends on deprecated and obsolete library libfame, consider migrating to multimedia/ffmpeg
+net-mgmt/zabbix64-java||2025-01-01|Has expired: Zabbix 6.4 is expected to reach EoL on December 31, 2024
+net-mgmt/zabbix64-agent||2025-01-01|Has expired: Zabbix 6.4 is expected to reach EoL on December 31, 2024
+net-mgmt/zabbix64-proxy||2025-01-01|Has expired: Zabbix 6.4 is expected to reach EoL on December 31, 2024
+net-mgmt/zabbix64-frontend||2025-01-01|Has expired: Zabbix 6.4 is expected to reach EoL on December 31, 2024
+net-mgmt/zabbix64-server||2025-01-01|Has expired: Zabbix 6.4 is expected to reach EoL on December 31, 2024
+www/webtrees20|www/webtrees21|2025-01-01|Has expired: Uses obsolete PHP version; use www/webtrees21 or www/webtrees22 instead
+dns/py-idna_ssl||2025-01-01|Has expired: Upstream repository has been archived on Oct 22, 2020
+science/py-nilearn||2025-01-01|Has expired: Depends on expired devel/py-codecov
+biology/ncbi-vdb||2025-01-01|Has expired: Very outdated, unmaintained and unsupported upstream
+www/grafana9|www/grafana|2025-01-01|Has expired: EOLed upstream
+textproc/cl-meta-sbcl||2025-01-01|Removed, depends on expired and unfetchable textproc/cl-meta
+textproc/cl-meta||2025-01-01|Has expired: Upstream is gone
+databases/postgis32||2025-01-01|Has expired: Please use newer versions
+math/sage||2025-01-01|Has expired: Broken for more than two years
+security/gnome-ssh-askpass||2025-01-01|Has expired: Uses deprecated gtk2 library
+comms/concordance||2025-01-01|Has expired: Logitech Harmony were officially discontinued in 2021, last major product in 2019
+lang/parrot||2025-01-01|Has expired: Development stopped in 2017
+net-im/purple-plugin-pack||2025-01-01|Has expired: Uses deprecated gtk2 libraries
+security/sssd|security/sssd2|2025-01-01|Has expired: Not supported, please use deve/sssd2
+databases/ldb22||2025-01-01|Has expired: Required only by security/sssd, which expires on 2024-12-31
+databases/postgresql12-contrib||2025-01-01|Has expired: PostgreSQL-12 is end-of-life
+databases/postgresql12-client||2025-01-01|Has expired: PostgreSQL-12 is end-of-life
+databases/postgresql12-plperl||2025-01-01|Has expired: PostgreSQL-12 is end-of-life
+databases/postgresql12-pltcl||2025-01-01|Has expired: PostgreSQL-12 is end-of-life
+databases/postgresql12-plpython||2025-01-01|Has expired: PostgreSQL-12 is end-of-life
+databases/postgresql12-docs||2025-01-01|Has expired: PostgreSQL-12 is end-of-life
+databases/postgresql12-pgtcl||2025-01-01|Removed, PostgreSQL-12 is end-of-life
+databases/postgresql12-server||2025-01-01|Has expired: PostgreSQL-12 is end-of-life
+devel/kdesvn||2025-01-01|Has expired: Dwindling amount of users and streamlining of ports for the KDE Team to maintain
+databases/compass||2025-01-01|Has expired: Depends on expired devel/electron29
+security/dirmngr|security/gnupg|2025-01-01|Has expired: Obsolete, now maintained within GNU Privacy Guard (GnuPG). Please use security/gnupg
+math/opensolaris-libm||2025-01-01|Has expired: Obsolete, consider using libm in base or math/openlibm
+textproc/sgrep||2025-01-01|Has expired: Abandonware, primary site is dead and according to website not touched in 20 years. Consider migrating to textproc/p5-ack
+devel/gitflow||2025-01-01|Has expired: Upstream repo archived Jun 19, 2023
+filesystems/sqlfs||2025-01-01|Has expired: Abandoned upstream, superseded by forks
+filesystems/gitfs||2025-01-01|Has expired: Abandonware, last release on 2019
+filesystems/httpfs||2025-01-01|Has expired: Abandonware, last release in 2012 and there are multiple issues unresolved
+multimedia/dumpmpeg|multimedia/ffmpeg|2025-01-01|Has expired: Obsolete utility, consider using multimedia/ffmpeg
+devel/cquery|devel/ccls|2025-01-01|Has expired: Abandonware, upstream repo archived Jul 30, 2020. Consider using migrating to devel/ccls
+security/py-first-server||2025-01-01|Has expired: Upstream project has been archived
+security/maia||2025-01-01|Has expired: Depends on deprecated dependencies and doesn't work with PHP 8
+devel/grv||2025-01-01|Has expired: Unmaintained for years, outdated
+deskutils/basket||2025-01-01|Has expired: Unmaintained for years, fails to build with libgit 1.8.1
+www/Stikked||2025-01-01|Has expired: Broken with PHP 8+ (see PR 281858)
+databases/pgpool-II-41||2025-01-01|Has expired: Upstream EOL reaches on 2024-10-31
+devel/electron29||2025-01-01|Has expired: EOLed upstream, switch to newer version
+devel/electron30||2025-01-01|Has expired: EOLed upstream, switch to newer version
+comms/libconcord||2025-01-01|Has expired: Logitech Harmony were officially discontinued in 2021, last major product in 2019
+japanese/onew||2025-01-01|Has expired: Unfetchabled and listed BROKEN for over year
+lang/twelf||2025-01-01|Has expired: Dead upstream and fails to build
+devel/py-codecov||2025-01-01|Has expired: Deprecated by upstream. On February 1, 2022 this uploader will be completely deprecated and will no longer be able to upload coverage to Codecov
+editors/imhex-current||2025-01-02|Replaced with editors/imhex
+graphics/yacreader@qt5|graphics/yacreader|2025-01-02|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored graphics/yacreader port based on Qt 6.x instead
+graphics/yacreader@qt6|graphics/yacreader|2025-01-02|Flavorization has been removed. Continue to enjoy graphics/yacreader based on Qt 6.x as usual
+security/mbedtls|security/mbedtls2|2025-01-02|Legacy version
+audio/gstreamer1-plugins-musepack||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+audio/libumidi||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+audio/lms||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+biology/py-bigwig||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+cad/kicad-library-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+chinese/xemacs21||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+comms/tqsllib||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+comms/umcs7840||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+converters/aha||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+databases/mariadb114-connector-c||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+databases/pymongo28||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/appstream-qt5||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/avr-gcc-42||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/cppunit113||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/gitlab-workhorse||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/gmake43||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/libuInputPlus||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/linux-c7-libffi||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/node-gyp||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/node-nan||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/npm-minidump||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/p4d||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/p4ftpd||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/p4p||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/p4web||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/p5-String-RewritePrefix||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/py-azure-keyvault-keys||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/py-fake-factory||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/py-jail||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/py-jailconf||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/py-zeep||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/rubygem-acts-as-taggable-on||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/rubygem-google-apis-serviceusage_v1_041||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/rubygem-validates_timeliness7||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/sublime-merge||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/vulkan-validation-layers||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/xlocale||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/xtoolchain-llvm60||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+devel/xtoolchain-llvm70||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+editors/sublime-test4||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+editors/sublime-text4||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+emulators/Elliott-803||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+emulators/ppsspp-qt5-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+emulators/qemu50||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+filesystems/rubygem-aws-sdk-efs||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+finance/bitcoin-armory||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+finance/openerp||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+games/knights-kde4||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+graphics/cairomm16||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+graphics/openscenegraph||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+graphics/poppler-qt4||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+graphics/py-poppler-qt4||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+graphics/py-svg_path||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+graphics/sverchok-blender||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+japanese/asterisk16-sounds||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+java/jakarta-commons-beanutils||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+java/linux-sun-jdk18||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+lang/slib-guile1||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+lang/slib-guile2||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+math/py-python_fcl||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+math/py-z3||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+math/rubygem-ruby-statistics||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+math/superlu_mt||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+misc/ossp-uuid-perl||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+multimedia/gstreamer1-plugins-kate||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+multimedia/gstreamer1-plugins-schroedinger||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net-mgmt/snap||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net/frr7-pythontools||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net/haproxy19||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net/haproxy21||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net/haproxy23||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net/openistgt||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net/p5-SOAP-Transport-HTTP-Plack||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net/samba4-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net/softethervpn||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+net/wifi-firmware-base||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+news/husky-areafix-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+news/husky-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+news/husky-fidoconf-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+news/husky-hpt-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+news/husky-htick-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+news/husky-huskylib-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+news/husky-smapi-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+print/harfbuzz-bh-view||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+security/mere-auth||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+security/pam_fprint||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+security/php74-hash||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+security/py-winrm||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+security/pyptlib||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+security/sshguard-ipfilter||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+shells/tcsh_nls||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+sysutils/blackbox_exporter||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+sysutils/diskprep||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+sysutils/openshift-install-devel||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+sysutils/openshift-install45||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+sysutils/openshift-install46||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+sysutils/psgconf||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+sysutils/py-logbook||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+sysutils/u-boot-duovero||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+sysutils/watchman450||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+textproc/checkbashisms||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+textproc/fmtlib||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+textproc/logseq||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+textproc/node-re2||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+textproc/py-elasticsearch-curator-py||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+textproc/rubygem-sassc-rails||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+vietnamese/kde4-l10n||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+www/asp2php||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+www/graylog-web-interface||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+www/httpd||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+www/py-demjson||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+www/py-vcrpy||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+www/redmine-stuff_to_do||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-apm||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-ark||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-chips||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-cirrus||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-geode||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-i128||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-i740||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-mach64||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-neomagic||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-openchrome||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-r128||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-rendition||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-savage||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-siliconmotion||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-sis||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-tdfx||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-drivers/xf86-video-voodoo||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11-toolkits/gnome-sharp20||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11/libfmqt-l10n||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11/lightdm-slick-greeter||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11/mere-about||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+x11/mere-utils||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+editors/neovim-qt@qt5|editors/neovim-qt|2025-01-02|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored editors/neovim-qt port based on Qt 6.x instead
+editors/neovim-qt@qt6|editors/neovim-qt|2025-01-02|Flavorization has been removed. Continue to enjoy editors/neovim-qt based on Qt 6.x as usual
+deskutils/copyq@qt5|deskutils/copyq|2025-01-02|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored deskutils/copyq port based on Qt 6.x instead
+deskutils/copyq@qt6|deskutils/copyq|2025-01-02|Flavorization has been removed. Continue to enjoy deskutils/copyq based on Qt 6.x as usual
+devel/py-pyls-black||2025-01-04|Repository has been archived by the owner. Use textproc/py-python-lsp-black instead
+net-im/telegram-desktop@qt5|net-im/telegram-desktop|2025-01-05|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use unflavored net-im/telegram-desktop port based on Qt 6.x instead
+net-im/telegram-desktop@qt6|net-im/telegram-desktop|2025-01-05|Flavorization has been removed. Continue to enjoy net-im/telegram-desktop based on Qt 6.x as usual
+deskutils/iconbrowser|deskutils/elementary-iconbrowser|2025-01-06|Switch to reverse domain name notation
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@ -561,6 +561,9 @@ proxydeps_suggest_uses() {
 	# Qt5
 	elif expr ${pkg} : '.*/qt5-.*' > /dev/null; then
 		warn "you need USES=qt:5 and USE_QT+=$(echo ${pkg} | sed -E 's|.*/qt5-||')"
+	# Qt6
+	elif expr ${pkg} : '.*/qt6-.*' > /dev/null; then
+		warn "you need USES=qt:6 and USE_QT+=$(echo ${pkg} | sed -E 's|.*/qt6-||')"
 	# MySQL
 	elif expr ${lib_file} : "${LOCALBASE}/lib/mysql/[^/]*$" > /dev/null; then
 		warn "you need USES+=mysql"
--- a/Mk/Uses/cl.mk
+++ b/Mk/Uses/cl.mk
@ -0,0 +1,142 @@
+# Provide support for Common Lisp ports.
+#
+# Feature:	cl
+# Usage:	USES=cl
+# Valid ARGS:	none
+#
+# Variables, which may be set by ports:
+# ASDF_MODULES   - List of ASDF modules to build when FASL_TARGET is set (defaults to PORTNAME)
+# FASL_TARGET    - Build fasl variant of port (one of ccl, clisp, or sbcl)
+# USE_ASDF       - Depend on devel/cl-asdf
+# USE_ASDF_FASL  - Depend on devel/cl-asdf-<FASL_TARGET>
+# USE_CCL        - Depend on lang/ccl; implied when FASL_TARGET=ccl
+# USE_CLISP      - Depend on lang/clisp; implied when FASL_TARGET=clisp
+# USE_SBCL       - Depend on lang/sbcl; implied when FASL_TARGET=SBCL
+#
+# Variables to be read by ports:
+# ASDF_PATHNAME  - Path to CL source
+# ASDF_REGISTRY  - Path to CL registry containing asd files
+# CCL            - Path to the Clozure Common Lisp compiler
+# CLISP          - Path to the GNU Common Lisp compiler
+# CL_LIBDIR_REL  - CL library directory relative to LOCALBASE or PREFIX
+# DOCSDIR        - DOCSDIR accounting for cl- PKGNAMEPREFIX
+# EXAMPLESDIR    - EXAMPLESDIR accounting for cl- PKGNAMEPREFIX
+# FASL_DIR_REL   - Relative path to compiled fasl files; depends on FASL_TARGET
+# FASL_PATHNAME	 - Path to CL fasl
+# LISP_EXTRA_ARG - Extra arguments used when building fasl
+# SBCL           - Path to the Steel Bank Common Lisp compiler
+
+.if !defined(_INCLUDE_USES_CL_MK)
+_INCLUDE_USES_CL_MK=	yes
+
+CL_ASDF_Include_MAINTAINER=	olgeni@FreeBSD.org
+
+CCL?=		${LOCALBASE}/bin/ccl
+CLISP?=		${LOCALBASE}/bin/clisp
+SBCL?=		${LOCALBASE}/bin/sbcl
+
+CL_LIBDIR_REL=	lib/common-lisp
+
+ASDF_PATHNAME=	${PREFIX}/${CL_LIBDIR_REL}/${PORTNAME}
+ASDF_REGISTRY=	${PREFIX}/${CL_LIBDIR_REL}/system-registry
+
+# Include PKGNAMEPREFIX in DOCSDIR and EXAMPLESDIR
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
+
+.  if ${PORTNAME} != "ccl"
+NO_ARCH=	yes
+.  endif
+
+.  if defined(FASL_TARGET)
+FASL_DIR_REL=	${FASL_TARGET}fasl
+FASL_PATHNAME=	${PREFIX}/${CL_LIBDIR_REL}/${PORTNAME}/${FASL_DIR_REL}
+PKGNAMESUFFIX=	-${FASL_TARGET}
+.    if ${FASL_TARGET} == "ccl"
+USE_CCL=	yes
+.    elif ${FASL_TARGET} == "clisp"
+USE_CLISP=	yes
+.    elif ${FASL_TARGET} == "sbcl"
+USE_SBCL=	yes
+.    endif
+.  endif # defined(FASL_TARGET)
+
+.  if defined(USE_CCL)
+BUILD_DEPENDS+=	ccl:lang/ccl
+RUN_DEPENDS+=	ccl:lang/ccl
+.  elif defined(USE_CLISP)
+BUILD_DEPENDS+=	clisp:lang/clisp
+RUN_DEPENDS+=	clisp:lang/clisp
+.  elif defined(USE_SBCL)
+BUILD_DEPENDS+=	sbcl:lang/sbcl
+RUN_DEPENDS+=	sbcl:lang/sbcl
+.  endif
+
+.  if defined(USE_ASDF)
+# Depend on the ASDF port, even if the Common Lisp compiler already has a bundled
+# ASDF framework.
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
+.  endif # defined(USE_ASDF)
+
+.  if defined(USE_ASDF_FASL)
+.    if defined(USE_CCL)
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/build/asdf.fx64fsl:devel/cl-asdf-ccl
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/build/asdf.fx64fsl:devel/cl-asdf-ccl
+.    elif defined(USE_CLISP)
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/build/asdf.fas:devel/cl-asdf-clisp
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/build/asdf.fas:devel/cl-asdf-clisp
+.    elif defined(USE_SBCL)
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/build/asdf.fasl:devel/cl-asdf-sbcl
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/build/asdf.fasl:devel/cl-asdf-sbcl
+.    endif
+.  endif # defined(USE_ASDF_FASL)
+
+.  if defined(FASL_TARGET)
+
+ASDF_MODULES?=	${PORTNAME}
+
+.    if !target(do-build)
+# See devel/cl-freebsd-asdf-init/files/cl-freebsd-asdf-init.lisp for the meaning
+# of FBSD_ASDF_COMPILE_PORT.
+do-build:
+.      for MODULE in ${ASDF_MODULES}
+.        if defined(USE_CCL)
+	@FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
+		${CCL} ${LISP_EXTRA_ARG} -b -n \
+		-l ${LOCALBASE}/etc/cl-freebsd-asdf-init \
+		-e "(asdf:oos 'asdf:compile-op :${MODULE})"
+.        endif # USE_CCL
+
+.        if defined(USE_CLISP)
+	@FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
+		${CLISP} ${LISP_EXTRA_ARG} -ansi -norc \
+		-i ${LOCALBASE}/etc/cl-freebsd-asdf-init \
+		-x "(asdf:oos 'asdf:compile-op :${MODULE})"
+.        endif # USE_CLISP
+
+.        if defined(USE_SBCL)
+	@FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
+		${SBCL} ${LISP_EXTRA_ARG} --noinform --userinit /dev/null --disable-debugger \
+		--eval '#.(load "${LOCALBASE}/etc/cl-freebsd-asdf-init")' \
+		--eval "(asdf:oos 'asdf:compile-op :${MODULE})" \
+		--eval "(quit)"
+.        endif # USE_SBCL
+.      endfor
+.    endif # !target(do-build)
+
+.    if !target(do-install)
+do-install:
+	@${MKDIR} ${STAGEDIR}${FASL_PATHNAME}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${FASL_PATHNAME}
+
+.    endif # !target(do-install)
+post-install:
+	@cd ${WRKSRC} && ${FIND} * -type f \
+		| ${SORT} \
+		| ${AWK} '{ print "${CL_LIBDIR_REL}/${PORTNAME}/${FASL_DIR_REL}/" $$1 }' \
+		>> ${TMPPLIST}
+
+.  endif # FASL_TARGET
+
+.endif # _INCLUDE_USES_ASDF_MK
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@ -68,7 +68,7 @@ _valid_ARGS=		indirect insource noninja run testing _internal

 # Reminder: devel/cmake-core, devel/cmake-doc, devel/cmake-gui, and devel/cmake-man
 # are all affected by changing _CMAKE_VERSION. Please check each of these ports.
-_CMAKE_VERSION=		3.31.2
+_CMAKE_VERSION=		3.31.3
 CMAKE_BIN=		${LOCALBASE}/bin/cmake

 # Sanity check
--- a/Mk/Uses/elfctl.mk
+++ b/Mk/Uses/elfctl.mk
@ -1,26 +1,39 @@
-# Change an ELF binary's feature control note
+# Set ELF binary feature control notes
 #
 # Feature:	elfctl
-# Usage:	USES=elfctl
-# Valid ARGS:	none
+# Usage:	USES=elfctl or USES=elfctl:ARGS
+# Valid ARGS:	build (default, implicit), stage
 #
-# Variables
+# Files listed in ELF_FEATURES are relative to:
+#   - ${BUILD_WRKSRC} when the `build` argument is supplied
+#   - ${STAGEDIR} when the `stage` argument is supplied.
 #
-#   ELF_FEATURES=	featurelist:path/to/file1 \
-#			featurelist:path/to/file1 \
-			featurelist:path/to/file2
+# Variables:
 #
-# The file paths listed in ELF_FEATURES are relative to ${BUILD_WRKSRC}.
+# ELF_FEATURES=	featurelist:path/to/file1 \
+#		featurelist:path/to/file2
 #

 .if !defined(_INCLUDE_USES_ELFCTL_MK)
 _INCLUDE_USES_ELFCTL_MK=	yes

-.  if ! empty(ELF_FEATURES)
-_USES_build+=	720:elfctl-post-build
-elfctl-post-build:
+.  if empty(elfctl_ARGS)
+elfctl_ARGS=	build
+.  endif
+
+.  if ${elfctl_ARGS} == "build"
+_ELFCTL_TOPDIR=	${BUILD_WRKSRC}
+.  elif ${elfctl_ARGS} == "stage"
+_ELFCTL_TOPDIR=	${STAGEDIR}
+.  else
+IGNORE=	USES=elfctl - invalid args: [${elfctl_ARGS}] specified
+.  endif
+
+.  if !empty(ELF_FEATURES)
+_USES_${elfctl_ARGS}+=	720:elfctl-post-${elfctl_ARGS}
+elfctl-post-${elfctl_ARGS}:
 .    for feat in ${ELF_FEATURES}
-	${ELFCTL} -i -e ${feat:C/:.*//} ${BUILD_WRKSRC}/${feat:C/.*://}
+	${ELFCTL} -i -e ${feat:C/:.*//} ${_ELFCTL_TOPDIR}/${feat:C/.*://}
 .    endfor
 .  endif

--- a/Mk/Uses/gmake.mk
+++ b/Mk/Uses/gmake.mk
@ -13,7 +13,7 @@ IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments
 .  endif

 BUILD_DEPENDS+=		gmake>=4.4.1:devel/gmake
-CONFIGURE_ENV+=		MAKE=gmake
-MAKE_CMD=		gmake
+CONFIGURE_ENV+=		MAKE=${GMAKE}
+MAKE_CMD=		${GMAKE}

 .endif
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@ -54,7 +54,7 @@ _GST1_SOVERSION=	0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERS

 _GST1_CATEGORIES=	audio comms devel ftp graphics multimedia net security \
 			sysutils textproc www x11 x11-toolkits
-_GST1_PLUGINS_audio= 	a52dec amrnb amrwbdec bs2b cdparanoia chromaprint faac \
+_GST1_PLUGINS_audio= 	a52dec alsa amrnb amrwbdec bs2b cdparanoia chromaprint faac \
 			faad flac flite gme gsm jack ladspa lame lv2 modplug \
 			mpg123 ogg openmpt opus pulse shout2 sidplay \
 			sndfile sndio soundtouch speex taglib twolame vorbis \
@ -121,6 +121,9 @@ gst-libgstreamer_PORT=	multimedia/gstreamer${_GST_VER}
 gst-a52dec_PORT=	audio/gstreamer${_GST_VER}-plugins-a52dec
 gst-a52dec_IMPL=	ugly

+gst-alsa_PORT=		audio/gstreamer${_GST_VER}-plugins-alsa
+gst-alsa_IMPL=		#
+
 gst-amrnb_PORT=		audio/gstreamer${_GST_VER}-plugins-amrnb
 gst-amrnb_IMPL=		ugly

--- a/Mk/Uses/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[+])
+#			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(USE_JAVA)
+.if !defined(_INCLUDE_USES_JAVA_MK)

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

 #-------------------------------------------------------------------------------
 # Stage 1: Define constants
@ -160,7 +201,7 @@ SUB_LIST+=		JAVA_OS="${JAVA_OS}"
 .    endif

 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	8 11 17 18 19 20 21
+__JAVA_VERSION_LIST=	8 11 17 18 19 20 21 22 23
 _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
 _JAVA_VENDOR_LIST=		openjdk oracle
@ -181,6 +222,10 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_20_INFO=		PORT=java/openjdk20			HOME=${LOCALBASE}/
 											VERSION=20	OS=native	VENDOR=openjdk
 _JAVA_PORT_NATIVE_OPENJDK_JDK_21_INFO=		PORT=java/openjdk21			HOME=${LOCALBASE}/openjdk21 \
 											VERSION=21	OS=native	VENDOR=openjdk
+_JAVA_PORT_NATIVE_OPENJDK_JDK_22_INFO=		PORT=java/openjdk22			HOME=${LOCALBASE}/openjdk22 \
+											VERSION=22	OS=native	VENDOR=openjdk
+_JAVA_PORT_NATIVE_OPENJDK_JDK_23_INFO=		PORT=java/openjdk23			HOME=${LOCALBASE}/openjdk23 \
+											VERSION=23	OS=native	VENDOR=openjdk
 _JAVA_PORT_LINUX_ORACLE_JDK_8_INFO=		PORT=java/linux-oracle-jdk18	HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \
 											VERSION=8	OS=linux	VENDOR=oracle

@ -201,6 +246,8 @@ __JAVA_PORTS_ALL=	\
 					JAVA_PORT_NATIVE_OPENJDK_JDK_19 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_20 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_21 \
+					JAVA_PORT_NATIVE_OPENJDK_JDK_22 \
+					JAVA_PORT_NATIVE_OPENJDK_JDK_23 \
 					JAVA_PORT_LINUX_ORACLE_JDK_8
 _JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
 			JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \
@ -215,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
@ -261,21 +307,11 @@ 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
 .    if defined(JAVA_VERSION)
-_JAVA_VERSION=	${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21/}
+_JAVA_VERSION=	${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23/}
 .    else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .    endif
@ -365,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

@ -416,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.
@ -454,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:"
@ -477,5 +501,4 @@ java-debug:
 	@${ECHO_CMD} "JAVAC=                          ${JAVAC}"
 	@${ECHO_CMD} "JAVA_CLASSES=                   ${JAVA_CLASSES}"

-.  endif
 .endif
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@ -100,7 +100,7 @@ KDE_PLASMA5_VERSION?=		5.27.11
 KDE_PLASMA5_BRANCH?=		stable

 # Next KDE Plasma desktop
-KDE_PLASMA6_VERSION?=		6.2.3
+KDE_PLASMA6_VERSION?=		6.2.4
 KDE_PLASMA6_BRANCH?=		stable

 # Current KDE frameworks.
@ -108,7 +108,7 @@ KDE_FRAMEWORKS5_VERSION?=	5.116.0
 KDE_FRAMEWORKS5_BRANCH?=	stable

 # Next KDE Frameworks (Qt6 based)
-KDE_FRAMEWORKS6_VERSION?=	6.7.0
+KDE_FRAMEWORKS6_VERSION?=	6.9.0
 KDE_FRAMEWORKS6_BRANCH?=	stable

 # Current KDE applications.
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@ -90,7 +90,7 @@ _linux_rl9_graphene=			linux-rl9-graphene>0:graphics/linux-rl9-graphene
 _linux_${linux_ARGS}_graphite2=		linux-${linux_ARGS}-graphite2>0:graphics/linux-${linux_ARGS}-graphite2
 _linux_${linux_ARGS}_gsm=		linux-${linux_ARGS}-gsm>0:audio/linux-${linux_ARGS}-gsm
 _linux_rl9_gstreamer1=			linux-rl9-gstreamer1>0:multimedia/linux-rl9-gstreamer1
-_linux_rl9_gstreamer1-libav=		linux-rl9-gstreamer1-libav>0:multimedia/linux-rl9-gstreamer1-libav
+_linux_rl9_gstreamer1-libav=		linux-rl9-gstreamer1-plugin-libav>0:multimedia/linux-rl9-gstreamer1-libav
 _linux_${linux_ARGS}_gtk2=		linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2
 _linux_${linux_ARGS}_gtk3=		linux-${linux_ARGS}-gtk3>0:x11-toolkits/linux-${linux_ARGS}-gtk3
 _linux_${linux_ARGS}_harfbuzz=		linux-${linux_ARGS}-harfbuzz>0:print/linux-${linux_ARGS}-harfbuzz
--- a/Mk/Uses/mate.mk
+++ b/Mk/Uses/mate.mk
@ -58,7 +58,7 @@ common_DETECT=		${LOCALBASE}/bin/mate-autogen
 common_BUILD_DEPENDS=	${common_DETECT}:devel/mate-common
 common_RUN_DEPENDS=	${common_DETECT}:devel/mate-common

-controlcenter_DETECT=		${LOCALBASE}/libdata/pkgconfig/mate-window-settings-2.0.pc
+controlcenter_DETECT=		${LOCALBASE}/libdata/pkgconfig/mate-default-applications.pc
 controlcenter_BUILD_DEPENDS=	${controlcenter_DETECT}:sysutils/mate-control-center
 controlcenter_LIB_DEPENDS=	libmate-window-settings.so:sysutils/mate-control-center
 controlcenter_RUN_DEPENDS=	${controlcenter_DETECT}:sysutils/mate-control-center
--- a/Mk/Uses/meson.mk
+++ b/Mk/Uses/meson.mk
@ -33,6 +33,7 @@ BUILD_DEPENDS+=		meson:devel/meson
 USE_LOCALE?=	en_US.UTF-8

 CONFIGURE_ARGS+=	--prefix ${PREFIX} \
+			--localstatedir /var \
 			--infodir ${INFO_PATH}

 # Enable all optional features to make builds deterministic. Consumers can
@ -70,6 +71,7 @@ BUILD_WRKSRC=		${WRKSRC}/${MESON_BUILD_DIR}

 INSTALL_WRKSRC=		${WRKSRC}/${MESON_BUILD_DIR}

+TEST_ENV+=		MESON_TESTTHREADS=${MAKE_JOBS_NUMBER}
 TEST_WRKSRC=		${WRKSRC}/${MESON_BUILD_DIR}
 TEST_TARGET=		test

--- a/Mk/Uses/ninja.mk
+++ b/Mk/Uses/ninja.mk
@ -1,13 +1,13 @@
-# Provide support to use Ninja
+# Support for the Ninja and Samurai build systems
 #
-# Feature:		ninja
-# Usage:		USES=ninja
-# Valid ARGS:		build, make (default), run, samurai
+# Feature:	ninja
+# Usage:	USES=ninja[:arg]
+# Valid ARGS:	build, make, run, samurai
 #
-# build			add a build dependency on ninja
-# make			use ninja for the build instead of make, implies "build"
-# run			add a run dependency on ninja
-# samurai		use samurai irregardless of NINJA_DEFAULT (implies make)
+# build		add a build dependency on ninja
+# make		use ninja for the build instead of make; implies "build" (default)
+# run		add a run dependency on ninja
+# samurai	use samurai regardless of NINJA_DEFAULT; implies "make"
 #
 # MAINTAINER: ports@FreeBSD.org

@ -41,11 +41,10 @@ NINJA_CMD=	samu
 _NINJA_PORT=	devel/samurai
 MAKE_ENV+=	SAMUFLAGS="-v -j${MAKE_JOBS_NUMBER}"
 .    if ${ninja_ARGS:Mbuild} && !${BINARY_ALIAS:U:Mninja=*}
-# Cmake and Meson have native support for Samurai and detect and
-# use it when Ninja is not available in the build environment.  The
-# alias is needed for other ports which call Ninja directly and do
-# not fall back to Samurai. There should be no harm in providing it
-# generally.
+# CMake and Meson have native support for Samurai and use it in lieu of
+# Ninja if not found in the build environment. BINARY_ALIAS is needed
+# for other ports that call the ninja binary directly with no fallback
+# consideration for samu.
 BINARY_ALIAS+=	ninja=samu
 .    endif
 .  else
@ -61,9 +60,9 @@ MAKE_ENV+=	NINJA_STATUS="[%p %s/%t] "

 .  if ${ninja_ARGS:Mmake}
 .    if ${NINJA_DEFAULT} == ninja && !defined(_SAMURAI_FROM_ARGS)
-# samu does not support GNU-style args, so we cannot just append
-# -v last.  samu gets this via SAMUFLAGS above but ninja does not
-# support an equivalent environment variable.
+# samu does not support GNU-style args, so we cannot simply append `-v`
+# to MAKE_ARGS to enable verbosity. This is instead accomplished via
+# the SAMUFLAGS environment variable defined above in MAKE_ENV.
 MAKE_ARGS+=	-v
 .    endif
 CMAKE_ARGS+=	-GNinja
--- a/Mk/Uses/ocaml.mk
+++ b/Mk/Uses/ocaml.mk
@ -1,38 +1,186 @@
-# Provide support to use the Dune package builder for OCaml
+# Provide support for OCaml
+# Feature:	ocaml
+# Usage:	USES=ocaml or USES=ocaml:args
 #
-# Feature:		ocaml
-# Usage:		USES=ocaml:dune
-#			USE_OCAML=yes
+# Valid ARGS:	build, camlp4, dune, findlib, findplist, ldconfig, tk, tkbuild, tkrun, wash
+#		If empty, defaults to build and run
+#
+# build		-	Add ocamlc to BUILD|EXTRACT|PATCH_DEPENDS
+#
+# camlp4	-	Use camlp4 to build
+#
+# dune		-	Use dune as a build system
+#
+# findlib	-	Set if port uses ocamlfind to install packages.
+# 			Package direcories will be automatically deleted
+#
+# findplist	-	Add contents of findlib target directories automatically
+#
+# ldconfig	-	Set if your port installs shared libraries into ocaml
+# 			site-lib dir. OCaml ld.conf file will be automatically
+# 			processed. When dune is used Dune may install stublibs in
+# 			site-lib package directory(ies) or in a single directory
+# 			below DUNE_LIBDIR.
+#
+# run		-	Add ocamlc to RUN_DEPENDS
+#
+# tk		-	Set if port needs ocaml-labltk which implies tkbuild and
+#			tkrun
+#
+# tkbuild	-	Add labltk to BUILD|EXTRACT|PATCH_DEPENDS
+#
+# tkrun		-	Add labltk to RUN_DEPENDS
+#
+# wash		- 	Set if your port wants to automatically
+#			purge shared Ocaml dirs on uninstall. It's
+#			useful when installing to non-standard PREFIX
 #
 # Variables that may be set by the port:
 #
-#  OCAML_PACKAGES	List of packages to build and install, defaults to PORTNAME
+# OCAML_PKGDIRS		-	Directories under site-lib to be processed
+#				if USES=ocaml:findlib specified.
+#				Default: ${PORTNAME}
 #
-#  USE_OCAML_LDCONFIG	Dune may install stublibs in site-lib package directory(ies)
-#  OCAML_LDLIBS		or in a single directory below DUNE_LIBDIR.
+# OCAML_LDLIBS		-	Directories under PREFIX to be automatically
+#				added/removed from ld.conf
+#				Default: ${OCAML_SITELIBDIR}/${PORTNAME}
 #
-# Appends to: BUILD_DEPENDS, MAKE_ENV
+# OCAML_PACKAGES	- 	List of packages to build and install, defaults to ${PORTNAME}
 #
 # MAINTAINER: freebsd@dev.thsi.be

 .if !defined(_INCLUDE_USES_OCAML_MK)
 _INCLUDE_USES_OCAML_MK=	yes

-.  if empty(ocaml_ARGS:Mdune)
-IGNORE=	Incorrect 'USES+= ocaml:${ocaml_ARGS}' ocaml requires a single 'dune' argument (for now)
+_OCAML_VALID_ARGS=	build camlp4 dune findlib findplist ldconfig tk tkbuild tkrun wash
+_OCAML_UNKNOWN_ARGS=
+.  for arg in ${ocaml_ARGS}
+.    if empty(_OCAML_VALID_ARGS:M${arg})
+_OCAML_UNKNOWN_ARGS+=	${arg}
+.    endif
+.  endfor
+.  if !empty(_OCAML_UNKNOWN_ARGS)
+IGNORE=	has unknown USES=ocaml arguments: ${_OCAML_UNKNOWN_ARGS}
+.  endif
+.  if ${ocaml_ARGS:Mfindplist} && ${ocaml_ARGS:Mfindlib}
+DEV_WARNING+=   "USES=ocaml:findlib is included in USES=ocaml:findplist, so it is not needed"
+.  endif
+.  if empty(ocaml_ARGS)
+ocaml_ARGS=	build,run
 .  endif

-.  if !defined(OCAML_include)
-.error USES=dune only works with USE_OCAML=yes
-.  endif
+.  if !empty(ocaml_ARGS)
+.undef _USE_OCAML_BUILD
+.undef _USE_OCAML_CAMLP4
+.undef _USE_OCAML_DUNE
+.undef _USE_OCAML_FINDLIB
+.undef _USE_OCAML_FINDPLIST
+.undef _USE_OCAML_LDCONFIG
+.undef _USE_OCAML_RUN
+.undef _USE_OCAML_TKBUILD
+.undef _USE_OCAML_TKRUN
+.undef _USE_OCAML_WASH
+_OCAML_ARGS=		${ocaml_ARGS:S/,/ /g}
+.    if ${_OCAML_ARGS:Mcamlp4}
+_USE_OCAML_CAMLP4=	yes
+_OCAML_ARGS:=	${_OCAML_ARGS:Ncamlp4}
+.    endif
+.    if ${_OCAML_ARGS:Mdune}
+_USE_OCAML_DUNE=	yes
+_OCAML_ARGS:=	${_OCAML_ARGS:Ndune}
+.    endif
+.    if ${_OCAML_ARGS:Mfindplist}
+_USE_OCAML_FINDPLIST=	yes
+_OCAML_ARGS:=	${_OCAML_ARGS:Nfindplist}
+_OCAML_ARGS+=		findlib
+.    endif
+.    if ${_OCAML_ARGS:Mfindlib}
+_USE_OCAML_FINDLIB=	yes
+_OCAML_ARGS:=	${_OCAML_ARGS:Nfindlib}
+.    endif
+.    if ${_OCAML_ARGS:Mldconfig}
+_USE_OCAML_LDCONFIG=	yes
+_OCAML_ARGS:=	${_OCAML_ARGS:Nldconfig}
+.    endif
+.    if ${_OCAML_ARGS:Mtk}
+_OCAML_ARGS+=		tkbuild
+_OCAML_ARGS+=		tkrun
+.    endif
+.    if ${_OCAML_ARGS:Mtkbuild}
+.      if defined(NO_BUILD)
+IGNORE=		Makefile error: NO_BUILD and USES=ocaml:tkbuild cannot be set at the same time
+.      else
+_USE_OCAML_TKBUILD=	yes
+_OCAML_ARGS:=	${_OCAML_ARGS:Ntkbuild}
+.      endif
+.    endif
+.    if ${_OCAML_ARGS:Mtkrun}
+_USE_OCAML_TKRUN=	yes
+_OCAML_ARGS:=	${_OCAML_ARGS:Ntkrun}
+.    endif
+.    if ${_OCAML_ARGS:Mwash}
+_USE_OCAML_WASH=	yes
+_OCAML_ARGS:=	${_OCAML_ARGS:Nwash}
+.    endif
+.    if empty(_OCAML_ARGS)
+_OCAML_ARGS+=		build
+_OCAML_ARGS+=		run
+.    endif
+.    if ${_OCAML_ARGS:Mbuild}
+.      if defined(NO_BUILD)
+IGNORE=		Makefile error: NO_BUILD and USES=ocaml:build cannot be set at the same time
+.      else
+_USE_OCAML_BUILD=	yes
+.      endif
+.    endif
+.    if ${_OCAML_ARGS:Mrun}
+_USE_OCAML_RUN=	yes
+.    endif
+.  endif # !empty(ocaml_ARGS)
+
+#
+# OCaml programs location
+#
+OCAMLC?=		${LOCALBASE}/bin/ocamlc
+OCAMLC_OPT?=		${LOCALBASE}/bin/ocamlc.opt
+OCAMLCP?=		${LOCALBASE}/bin/ocamlcp
+OCAMLFIND?=		${LOCALBASE}/bin/ocamlfind
+CAMLP4?=		${LOCALBASE}/bin/camlp4
+OCAMLTK?=		${LOCALBASE}/bin/labltk
+
+#
+# OCaml library directory
+#
+OCAML_LIBDIR?=		lib/ocaml
+
+#
+# Where to install site libraries
+#
+OCAML_SITELIBDIR?=	${OCAML_LIBDIR}/site-lib
+
+#
+# OCaml compiler port dependency
+#
+OCAMLC_PORT?=		lang/ocaml
+OCAMLC_DEPEND?=		${OCAMLC}:${OCAMLC_PORT}
+
+#
+# OCaml package manager port dependency
+#
+OCAMLFIND_PORT?=	devel/ocaml-findlib
+OCAMLFIND_DEPEND?=	${OCAMLFIND}:${OCAMLFIND_PORT}
+
+#
+# OCaml camlp4 port dependency
+#
+CAMLP4_PORT?=		devel/ocaml-camlp4
+CAMLP4_DEPEND?=		${CAMLP4}:${CAMLP4_PORT}

 #
 # Dune builder port
 #
-DUNE_PORT?=		devel/ocaml-dune
-DUNE_DEPEND?=		ocaml-dune>=3.7.1_2:devel/ocaml-dune
-
-BUILD_DEPENDS+=		${DUNE_DEPEND}
+.  if defined(_USE_OCAML_DUNE)
+BUILD_DEPENDS+=		ocaml-dune>=3.7.1_2:devel/ocaml-dune

 DUNE_ARGS=		--display=short --always-show-command-line \
 			--no-config -j ${MAKE_JOBS_NUMBER} --profile release \
@ -50,8 +198,116 @@ DUNE_INSTALL_TARGETS?=
 DUNE_LIBDIR?=		${OCAML_SITELIBDIR}
 OCAML_PACKAGES?=		${PORTNAME}
 DUNE_ROOT?=		.
+# Left empty for default @install target
+ALL_TARGET?=
+.  endif

-.  if USE_OCAML_LDCONFIG
+#
+# OCaml TK bindings dependency
+#
+OCAMLTK_PORT?=		x11-toolkits/ocaml-labltk
+OCAMLTK_DEPENDS?=	${OCAMLTK}:${OCAMLTK_PORT}
+
+#
+# Common OCaml examples and documents location
+#
+OCAML_DOCSDIR=		${PREFIX}/share/doc/ocaml
+OCAML_EXAMPLESDIR=	${PREFIX}/share/examples/ocaml
+
+#
+# Location of OCaml ld.conf file
+#
+OCAML_LDCONF?=		${OCAML_LIBDIR}/ld.conf
+
+# ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not
+# work well with staging.
+.  if defined(_USE_OCAML_LDCONFIG)
+.    if !target(ocaml-ldconfig)
+OCAMLFIND_LDCONF?=	/dev/null
+.    endif
+.  endif
+
+OCAMLFIND_DESTDIR?=	${PREFIX}/${OCAML_SITELIBDIR}
+OCAMLFIND_LDCONF?=	${PREFIX}/${OCAML_LDCONF}
+
+.  if defined(_USE_OCAML_BUILD)
+EXTRACT_DEPENDS+=	${OCAMLC_DEPEND}
+PATCH_DEPENDS+=		${OCAMLC_DEPEND}
+BUILD_DEPENDS+=		${OCAMLC_DEPEND}
+.  endif
+.  if defined(_USE_OCAML_RUN)
+RUN_DEPENDS+=		${OCAMLC_DEPEND}
+.  endif
+PLIST_SUB+=	OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
+
+.  if defined(_USE_OCAML_FINDLIB)
+#
+# We'll additionally add ocamlfind to RUN_DEPENDS, since
+# if the port requires ocamlfind to install - it requires
+# some ocaml libraries and these libraries RUN_DEPENDS on
+# ocamlfind
+#
+BUILD_DEPENDS+=		${OCAMLFIND_DEPEND}
+RUN_DEPENDS+=		${OCAMLFIND_DEPEND}
+MAKE_ENV+=	OCAMLFIND_DESTDIR="${STAGEDIR}${OCAMLFIND_DESTDIR}" \
+		OCAMLFIND_LDCONF="${OCAMLFIND_LDCONF}"
+
+#
+# Directories under site-lib to process automatically
+#
+OCAML_PKGDIRS?=	${PORTNAME}
+_USES_install+=	250:ocaml-pre-install 735:ocaml-findlib
+.    if !target(ocaml-pre-install)
+ocaml-pre-install:
+	${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}
+.    endif
+.    if !target(ocaml-findlib)
+ocaml-findlib:
+.      for DIR in ${OCAML_PKGDIRS}
+.        if defined(_USE_OCAML_FINDPLIST)
+	@${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \
+		's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+.        endif
+	@${ECHO_CMD} "@postunexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \
+		>> ${TMPPLIST}
+.      endfor
+.    endif
+.  endif
+
+.  if defined(_USE_OCAML_CAMLP4)
+BUILD_DEPENDS+=		${CAMLP4_DEPEND}
+.  endif
+
+.    if defined(_USE_OCAML_TKBUILD)
+EXTRACT_DEPENDS+=	${OCAMLTK_DEPENDS}
+PATCH_DEPENDS+=		${OCAMLTK_DEPENDS}
+BUILD_DEPENDS+=		${OCAMLTK_DEPENDS}
+.    endif
+.    if defined(_USE_OCAML_TKRUN)
+RUN_DEPENDS+=		${OCAMLTK_DEPENDS}
+.    endif
+
+.  if defined(_USE_OCAML_LDCONFIG)
+#
+# Directories under PREFIX for appending to ld.conf
+#
+OCAML_LDLIBS?=	${OCAML_SITELIBDIR}/${PORTNAME}
+_USES_install+=	740:ocaml-ldconfig
+.    if !target(ocaml-ldconfig)
+ocaml-ldconfig:
+.      for LIB in ${OCAML_LDLIBS}
+	@${ECHO_CMD} "@postexec ${ECHO_CMD} "%D/${LIB}" >> %D/${OCAML_LDCONF}" \
+		>> ${TMPPLIST}
+	@${ECHO_CMD} "@postunexec ${SED} -i \"\" -e '/${LIB:S#/#\/#g}/d' %D/${OCAML_LDCONF}"  >> ${TMPPLIST}
+.      endfor
+.    endif
+.  endif
+
+.  if defined(_USE_OCAML_WASH)
+PLIST_FILES+=	"@rmempty ${OCAML_LDCONF}"
+.  endif
+
+.  if defined(_USE_OCAML_LDCONFIG) && defined(_USE_OCAML_DUNE)
 .    if !empty(OCAML_LDLIBS)
 .      if ${OCAML_LDLIBS:[#]} > 1
 .        for _l in ${OCAML_LDLIBS}
@ -68,13 +324,13 @@ DUNE_ENV+=	DUNE_FREEBSD_STUBLIBS_RELATIVE_TO_LIBDIR=${OCAML_PACKAGES:[1]}
 .    endif
 .  endif

-# left empty for default @install target
-ALL_TARGET?=	
+.  if defined(_USE_OCAML_DUNE)
 MAKE_ENV+=	${DUNE_ENV}

 DO_MAKE_BUILD?=	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${DUNE_CMD} build ${DUNE_ARGS} ${DUNE_BUILD_ARGS}
+.  endif

-.  if !target(do-install) && !defined(NO_INSTALL)
+.  if !target(do-install) && !defined(NO_INSTALL) && defined(_USE_OCAML_DUNE)
 do-install:
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${WRK_ENV} ${MAKE_ENV} ${FAKEROOT} ${DUNE_CMD} install ${DUNE_ARGS} ${DUNE_INSTALL_ARGS} ${DUNE_INSTALL_TARGETS})
 .  endif
--- a/Mk/Uses/octave.mk
+++ b/Mk/Uses/octave.mk
@ -22,7 +22,7 @@ IGNORE=	Incorrect 'USES+= octave:${octave_ARGS}' usage: argument [${arg}] is not
 .    endif
 .  endfor

-OCTAVE_VERSION=	9.2.0
+OCTAVE_VERSION=	9.3.0

 .  if empty(octave_ARGS:Menv)
 BUILD_DEPENDS+=	octave:math/octave
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@ -5,13 +5,13 @@
 #
 # version 	Maintainer can set versions required. You can set this to
 #		[min]-[max] or min+ or -max or as an explicit version
-#		(eg. 12-14 for [min]-[max], 12+ or 12-
+#		(eg. 14-16 for [min]-[max], 14+ or 16-
 #		for min+ and max-, 13 for an explicit version). Example:
 #
 #		    USES=pgsql:13		# Only use PostgreSQL 13
-#		    USES=pgsql:12+		# Use PostgreSQL 12 or newer
-#		    USES=pgsql:12-14	# Use PostgreSQL between 12 & 14 inclusive
-#		    USES=pgsql:12-		# Use any PostgreSQL up to 12
+#		    USES=pgsql:13+		# Use PostgreSQL 13 or newer
+#		    USES=pgsql:14-16	# Use PostgreSQL between 14 & 16 inclusive
+#		    USES=pgsql:14-		# Use any PostgreSQL up to 14
 #		    USES=pgsql		# Use the default PostgreSQL
 #
 #		WANT_PGSQL=	server[:fetch] plperl plpython pltcl
@ -39,7 +39,7 @@ _INCLUDE_USES_PGSQL_MK=	yes

 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-VALID_PGSQL_VER=	12 13 14 15 16 17
+VALID_PGSQL_VER=	13 14 15 16 17

 # Override non-default LIBVERS like this:
 #PGSQL99_LIBVER=6
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@ -193,7 +193,7 @@ PHP_EXT_DIR=   20210902
 PHP_EXT_INC=    hash json openssl pcre spl
 .    else
 # (rene) default to DEFAULT_VERSIONS
-PHP_EXT_DIR=   20220829
+PHP_EXT_DIR=   20230831
 PHP_EXT_INC=    hash json openssl pcre random spl
 .    endif

--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@ -59,8 +59,7 @@ MASTER_SITE_RBDEV=	https://www.riverbankcomputing.com/pypi/packages/%SUBDIR%/
 # Qt version-agnostic components
 MASTER_SITES_PYQTBUILDER=	PYPI/source/P/PyQt-builder
 MASTER_SITES_QSCI2=		RIVERBANK/QScintilla/${PORTVERSION} \
-				SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
-				GENTOO
+				SF/pyqt/QScintilla2/QScintilla-${PORTVERSION}
 MASTER_SITES_SIP=		PYPI/source/s/sip

 # Qt 5 components
@ -82,6 +81,8 @@ MASTER_SITES_PYQT6CHARTS=	PYPI/source/P/PyQt6-Charts \
 				RBDEV/PyQt6-Charts
 MASTER_SITES_PYQT6DATAVIS3D=	PYPI/source/P/PyQt6-DataVisualization \
 				RBDEV/PyQt6-DataVisualization
+MASTER_SITES_PYQT6GRAPHS=	PYPI/source/P/PyQt6-Graphs \
+				RBDEV/PyQt6-Graphs
 MASTER_SITES_PYQT6NETWORKAUTH=	PYPI/source/P/PyQt6-NetworkAuth \
 				RBDEV/PyQt6-NetworkAuth
 MASTER_SITES_PYQT6WEBENGINE=	PYPI/source/P/PyQt6-WebEngine \
@ -91,8 +92,9 @@ MASTER_SITES_PYQT6WEBENGINE=	PYPI/source/P/PyQt6-WebEngine \
 MASTER_SITES_PYQT=		${MASTER_SITES_PYQT${_PYQT_VERSION}}
 MASTER_SITES_PYQTSIP=		${MASTER_SITES_PYQT${_PYQT_VERSION}SIP}
 MASTER_SITES_PYQT3D=		${MASTER_SITES_PYQT${_PYQT_VERSION}3D}
-MASTER_SITES_PYQTCHARTS=		${MASTER_SITES_PYQT${_PYQT_VERSION}CHARTS}
+MASTER_SITES_PYQTCHARTS=	${MASTER_SITES_PYQT${_PYQT_VERSION}CHARTS}
 MASTER_SITES_PYQTDATAVIS3D=	${MASTER_SITES_PYQT${_PYQT_VERSION}DATAVIS3D}
+MASTER_SITES_PYQTGRAPHS=	${MASTER_SITES_PYQT${_PYQT_VERSION}GRAPHS}
 MASTER_SITES_PYQTNETWORKAUTH=	${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
 MASTER_SITES_PYQTWEBENGINE=	${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}

@ -106,12 +108,12 @@ MASTER_SITES_PYQTWEBENGINE=	${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
 # below, should have a suitable epoch appended to the version.

 # Qt version-agnostic components
-PYQTBUILDER_VERSION=		1.16.4
+PYQTBUILDER_VERSION=		1.17.0
 QSCI2_VERSION=			2.14.1
-SIP_VERSION=			6.8.6	# ,1
+SIP_VERSION=			6.9.1	# ,1

 # Qt 5 components
-PYQT5SIP_VERSION=		12.15.0
+PYQT5SIP_VERSION=		12.16.1
 PYQT5_VERSION=			5.15.11
 PYQT53D_VERSION=		5.15.7
 PYQT5CHARTS_VERSION=		5.15.7
@ -120,20 +122,21 @@ PYQT5NETWORKAUTH_VERSION=	5.15.6
 PYQT5WEBENGINE_VERSION=		5.15.7

 # Qt 6 components
-PYQT6SIP_VERSION=		13.8.0
-PYQT6_VERSION=			6.7.1
-PYQT63D_VERSION=		6.7.0
-PYQT6CHARTS_VERSION=		6.7.0
-PYQT6DATAVIS3D_VERSION=		6.7.0
-PYQT6NETWORKAUTH_VERSION=	6.7.0
-PYQT6WEBENGINE_VERSION=		6.7.0
+PYQT6SIP_VERSION=		13.9.1
+PYQT6_VERSION=			6.8.0
+PYQT63D_VERSION=		6.8.0
+PYQT6CHARTS_VERSION=		6.8.0
+PYQT6DATAVIS3D_VERSION=		6.8.0
+PYQT6GRAPHS_VERSION=		6.8.0
+PYQT6NETWORKAUTH_VERSION=	6.8.0
+PYQT6WEBENGINE_VERSION=		6.8.0

 # Qt version-agnostic components
 PYQTBUILDER_DISTNAME=		pyqt_builder-${PYQTBUILDER_VERSION}
 QSCI2_DISTNAME=			QScintilla_src-${QSCI2_VERSION}

 # Qt 5 components
-PYQT5SIP_DISTNAME=		PyQt5_sip-${PYQT5SIP_VERSION}
+PYQT5SIP_DISTNAME=		pyqt5_sip-${PYQT5SIP_VERSION}
 PYQT5_DISTNAME=			PyQt5-${PYQT5_VERSION}
 PYQT53D_DISTNAME=		PyQt3D-${PYQT53D_VERSION}
 PYQT5CHARTS_DISTNAME=		PyQtChart-${PYQT5CHARTS_VERSION}
@ -142,11 +145,12 @@ PYQT5NETWORKAUTH_DISTNAME=	PyQtNetworkAuth-${PYQT5NETWORKAUTH_VERSION}
 PYQT5WEBENGINE_DISTNAME=	PyQtWebEngine-${PYQT5WEBENGINE_VERSION}

 # Qt 6 components
-PYQT6SIP_DISTNAME=		PyQt6_sip-${PYQT6SIP_VERSION}
+PYQT6SIP_DISTNAME=		pyqt6_sip-${PYQT6SIP_VERSION}
 PYQT6_DISTNAME=			PyQt6-${PYQT6_VERSION}
 PYQT63D_DISTNAME=		PyQt6_3D-${PYQT63D_VERSION}
 PYQT6CHARTS_DISTNAME=		PyQt6_Charts-${PYQT6CHARTS_VERSION}
 PYQT6DATAVIS3D_DISTNAME=	PyQt6_DataVisualization-${PYQT6DATAVIS3D_VERSION}
+PYQT6GRAPHS_DISTNAME=		PyQt6_Graphs-${PYQT6GRAPHS_VERSION}
 PYQT6NETWORKAUTH_DISTNAME=	PyQt6_NetworkAuth-${PYQT6NETWORKAUTH_VERSION}
 PYQT6WEBENGINE_DISTNAME=	PyQt6_WebEngine-${PYQT6WEBENGINE_VERSION}

@ -167,6 +171,7 @@ PYQT_VERSION=			${PYQT${_PYQT_VERSION}_VERSION}
 PYQT3D_VERSION=			${PYQT${_PYQT_VERSION}3D_VERSION}
 PYQTCHARTS_VERSION=		${PYQT${_PYQT_VERSION}CHARTS_VERSION}
 PYQTDATAVIS3D_VERSION=		${PYQT${_PYQT_VERSION}DATAVIS3D_VERSION}
+PYQTGRAPHS_VERSION=		${PYQT${_PYQT_VERSION}GRAPHS_VERSION}
 PYQTNETWORKAUTH_VERSION=	${PYQT${_PYQT_VERSION}NETWORKAUTH_VERSION}
 PYQTWEBENGINE_VERSION=		${PYQT${_PYQT_VERSION}WEBENGINE_VERSION}

@ -175,6 +180,7 @@ PYQT_DISTNAME=			${PYQT${_PYQT_VERSION}_DISTNAME}
 PYQT3D_DISTNAME=		${PYQT${_PYQT_VERSION}3D_DISTNAME}
 PYQTCHARTS_DISTNAME=		${PYQT${_PYQT_VERSION}CHARTS_DISTNAME}
 PYQTDATAVIS3D_DISTNAME=		${PYQT${_PYQT_VERSION}DATAVIS3D_DISTNAME}
+PYQTGRAPHS_DISTNAME=		${PYQT${_PYQT_VERSION}GRAPHS_DISTNAME}
 PYQTNETWORKAUTH_DISTNAME=	${PYQT${_PYQT_VERSION}NETWORKAUTH_DISTNAME}
 PYQTWEBENGINE_DISTNAME=		${PYQT${_PYQT_VERSION}WEBENGINE_DISTNAME}

@ -194,6 +200,7 @@ py-pyqt6_PATH=			${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION}
 py-3d_PATH=			${PYQT_PY_RELNAME}-3d>=${PYQT3D_VERSION}
 py-charts_PATH=			${PYQT_PY_RELNAME}-charts>=${PYQTCHARTS_VERSION}
 py-datavis3d_PATH=		${PYQT_PY_RELNAME}-datavis3d>=${PYQTDATAVIS3D_VERSION}
+py-graphs_PATH=			${PYQT_PY_RELNAME}-graphs>=${PYQTCHART_VERSION}
 py-networkauth_PATH=		${PYQT_PY_RELNAME}-networkauth>=${PYQTNETWORKAUTH_VERSION}
 py-webengine_PATH=		${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION}

@ -207,6 +214,7 @@ py-pyqt6_PORT=			devel/${PYQT_RELNAME}-pyqt
 py-3d_PORT=			graphics/${PYQT_RELNAME}-3d
 py-charts_PORT=			x11-toolkits/${PYQT_RELNAME}-charts
 py-datavis3d_PORT=		x11-toolkits/${PYQT_RELNAME}-datavis3d
+py-graphs_PORT=			x11-toolkits/${PYQT_RELNAME}-graphs
 py-networkauth_PORT=		net/${PYQT_RELNAME}-networkauth
 py-webengine_PORT=		www/${PYQT_RELNAME}-webengine

--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@ -23,8 +23,8 @@ _QT_MK_INCLUDED=	qt.mk
 # Qt versions currently supported by the framework.
 _QT_SUPPORTED?=		5 6
 QT5_VERSION?=		5.15.16
-QT6_VERSION?=		6.7.3
-PYSIDE6_VERSION?=	6.7.3
+QT6_VERSION?=		6.8.1
+PYSIDE6_VERSION?=	6.8.0.2

 # Support for intermediate Qt6 releases. This partially defines
 # _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
@ -74,6 +74,7 @@ QT_DESCRIPTIONSDIR_REL?=${QT_DATADIR_REL}/modules
 QT_LIBEXECDIR_REL?=	libexec/${_QT_RELNAME}
 QT_IMPORTDIR_REL?=	${QT_ARCHDIR_REL}/imports
 QT_QMLDIR_REL?=		${QT_ARCHDIR_REL}/qml
+QT_SBOMDIR_REL?=	${QT_ARCHDIR_REL}/sbom
 QT_DATADIR_REL?=	share/${_QT_RELNAME}
 QT_DOCDIR_REL?=		share/doc/${_QT_RELNAME}
 QT_L10NDIR_REL?=	${QT_DATADIR_REL}/translations
@ -111,7 +112,7 @@ QMAKESPEC?=		${QT_MKSPECDIR}/${QMAKESPECNAME}
 QMAKE_COMPILER=	$$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac)

 .  for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
-	QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
+	QML SBOM DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
 	CMAKE TOOL
 QT_${dir}DIR=	${PREFIX}/${QT_${dir}DIR_REL}
 # Export all directories to the plist substituion for QT_DIST ports.
@ -251,7 +252,7 @@ qt-imageformats_PORT=	graphics/${_QT_RELNAME}-imageformats
 qt-imageformats_PATH=	${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so

 qt-languageserver_PORT=	devel/${_QT_RELNAME}-languageserver
-qt-languageserver_LIB=	libQt${_QT_LIBVER}LanguageServer.so
+qt-languageserver_PATH=	${LOCALBASE}/${QT_LIBDIR_REL}/libQt6LanguageServer.a

 qt-lottie_PORT=		graphics/${_QT_RELNAME}-lottie
 qt-lottie_LIB=		libQt${_QT_LIBVER}Bodymovin.so
--- a/Mk/Uses/xfce.mk
+++ b/Mk/Uses/xfce.mk
@ -13,7 +13,7 @@
 _INCLUDE_USES_XFCE_Mk=	yes
 _USES_POST+=	xfce

-_USE_XFCE_ALL=	garcon libexo libmenu libutil panel thunar xfconf
+_USE_XFCE_ALL=	garcon libexo libmenu libutil panel thunar xdt xfconf windowing

 xfce_ARGS?=	# empty

@ -37,8 +37,12 @@ libutil_LIB_DEPENDS=	libxfce4util.so:x11/libxfce4util
 thunar_LIB_DEPENDS=	libthunarx-3.so:x11-fm/thunar
 thunar_RUN_DEPENDS=	Thunar:x11-fm/thunar

+xdt_BUILD_DEPENDS=	xfce4-dev-tools>=4.19.4:devel/xfce4-dev-tools
+
 xfconf_LIB_DEPENDS=	libxfconf-0.so:x11/xfce4-conf

+windowing_LIB_DEPENDS=	libxfce4windowing-0.so:x11/libxfce4windowing
+
 .  if defined(USE_XFCE)
 # First, expand all USE_XFCE_REQ recursively.
 .    for comp in ${_USE_XFCE_ALL}
--- a/Mk/bsd.commands.mk
+++ b/Mk/bsd.commands.mk
@ -45,7 +45,7 @@ FIND?=			/usr/bin/find
 FLEX?=			/usr/bin/flex
 FMT?=			/usr/bin/fmt
 FMT_80?=		${FMT} 75 79
-GMAKE?=			gmake
+GMAKE?=			${LOCALBASE}/bin/gmake
 GREP?=			/usr/bin/grep
 GUNZIP_CMD?=		/usr/bin/gunzip -f
 GZCAT?=			/usr/bin/gzcat
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@ -73,7 +73,7 @@ GUILE_DEFAULT?=		2.2
 # Format:	     version[-flavor]
 # Examples:	     6-nox11, 7
 IMAGEMAGICK_DEFAULT?=	7
-# Possible values: 8, 11, 17, 18, 19, 20, 21
+# Possible values: 8, 11, 17, 18, 19, 20, 21, 22 23
 JAVA_DEFAULT?=		8
 # Possible values: 3.4.0, 3.99
 .  if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64}
@ -126,10 +126,10 @@ _PERL5_FROM_BIN!=	${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;'
 _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .  endif
-# Possible values: 12, 13, 14, 15, 16, 17
+# Possible values: 13, 14, 15, 16, 17
 PGSQL_DEFAULT?=		16
 # Possible values: 8.1, 8.2, 8.3, 8.4
-PHP_DEFAULT?=		8.2
+PHP_DEFAULT?=		8.3
 # Possible values: rust, legacy
 .  if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
 PYCRYPTOGRAPHY_DEFAULT?=	rust
--- a/Mk/bsd.licenses.db.mk
+++ b/Mk/bsd.licenses.db.mk
@ -38,10 +38,13 @@ Licenses_db_Include_MAINTAINER=         portmgr@FreeBSD.org
 # _LICENSE_LIST_GROUPS	- List of defined license groups
 #

-_LICENSE_LIST= 	BSL CDDL CPAL-1.0 ClArtistic EPL GFDL GMGPL \
+_LICENSE_LIST= 	BSL CDDL CPAL-1.0 ClArtistic EPL EU GFDL GMGPL \
 				ISCL MIT NCSA ODbL OFL10 OFL11 OWL OpenSSL PD PSFL PostgreSQL \
 				RUBY UNLICENSE WTFPL1 WTFPL ZLIB ZPL21

+# EU family
+_LICENSE_LIST+= EUPL11 EUPL12
+
 # GNU family
 _LICENSE_LIST+= AGPLv3 GPLv1 GPLv2 GPLv3 GPLv3RLE LGPL20 LGPL21 LGPL3
 _LICENSE_LIST+= AGPLv3+ GPLv1+ GPLv2+ GPLv3+ GPLv3RLE+ LGPL20+ LGPL21+ \
@ -79,6 +82,8 @@ _LICENSE_LIST+= NONE

 # List of groups (only names must be present)

+_LICENSE_NAME_EU=	European Union Public Licence
+
 _LICENSE_NAME_FSF=	Free Software Foundation Approved

 _LICENSE_NAME_GPL=	GPL Compatible
@ -269,6 +274,12 @@ _LICENSE_GROUPS_CPAL-1.0=	FSF OSI
 _LICENSE_NAME_EPL=	Eclipse Public License
 _LICENSE_GROUPS_EPL=	FSF OSI

+_LICENSE_NAME_EUPL11=	European Union Public Licence version 1.1
+_LICENSE_GROUPS_EUPL11=	EU OSI
+
+_LICENSE_NAME_EUPL12=	European Union Public Licence version 1.2
+_LICENSE_GROUPS_EUPL12=	EU OSI
+
 _LICENSE_NAME_GFDL=	GNU Free Documentation License
 _LICENSE_GROUPS_GFDL=	FSF

--- a/Mk/bsd.ocaml.mk
+++ b/Mk/bsd.ocaml.mk
@ -1,198 +0,0 @@
-# ex:ts=4
-#
-# $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $
-#
-# bsd.ocaml.mk - Support for the Objective Caml language packages
-#
-# Author: Stanislav Sedov <ssedov@mbsd.msk.ru>
-#
-# Feel free to send any comments and suggestions to maintainer.
-#
-# Currently recognised variables are:
-#
-# USE_OCAML		-	Set if your port uses OCaml to build/install.
-# NO_OCAML_BUILDDEPENDS	-	Don't add ocamlc to BUILD|EXTRACT|PATCH_DEPENDS.
-# NO_OCAML_RUNDEPENDS	-	Don't add ocamlc to RUN_DEPENDS.
-# USE_OCAML_FINDLIB	-	Set if your port uses ocamlfind to install
-#				packages. Package direcories will be
-#				automatically deleted.
-# USE_OCAML_CAMLP4	-	Set if your port uses camlp4 to build.
-# USE_OCAML_TK		-	Set if you port needs ocaml-labltk.
-# NO_OCAMLTK_BUILDDEPENDS -	Don't add labltk to BUILD|EXTRACT|PATCH_DEPENDS.
-# NO_OCAMLTK_RUNDEPENDS	-	Don't add labltk to RUN_DEPENDS.
-# USE_OCAML_LDCONFIG	-	Set if your port installs shared libraries
-#				into ocaml site-lib dir. OCaml ld.conf file
-#				will be automatically processed.
-# USE_OCAMLFIND_PLIST	-	Add contents of findlib target directories
-#				automatically.
-# USE_OCAML_WASH	-	Set if your port wants to automatically
-#				purge shared Ocaml dirs on uninstall. It's
-#				useful when installing to non-standard PREFIX
-# OCAML_PKGDIRS		-	Directories under site-lib to be processed
-#				if USE_OCAML_FINDLIB specified.
-#				Default: ${PORTNAME}
-# OCAML_LDLIBS		-	Directories under PREFIX to be automatically
-#				added/removed from ld.conf
-#				Default: ${OCAML_SITELIBDIR}/${PORTNAME}
-
-.if !defined(OCAML_include)
-
-OCAML_MAINTAINER=	ports@FreeBSD.org
-OCAML_include=		bsd.ocaml.mk
-
-#
-# OCaml programs location
-#
-OCAMLC?=		${LOCALBASE}/bin/ocamlc
-OCAMLC_OPT?=		${LOCALBASE}/bin/ocamlc.opt
-OCAMLCP?=		${LOCALBASE}/bin/ocamlcp
-OCAMLFIND?=		${LOCALBASE}/bin/ocamlfind
-CAMLP4?=		${LOCALBASE}/bin/camlp4
-OCAMLTK?=		${LOCALBASE}/bin/labltk
-
-#
-# OCaml library directory
-#
-OCAML_LIBDIR?=		lib/ocaml
-
-#
-# Where to install site libraries
-#
-OCAML_SITELIBDIR?=	${OCAML_LIBDIR}/site-lib
-
-#
-# OCaml compiler port dependency
-#
-OCAMLC_PORT?=		lang/ocaml
-OCAMLC_DEPEND?=		${OCAMLC}:${OCAMLC_PORT}
-
-#
-# OCaml package manager port dependency
-#
-OCAMLFIND_PORT?=	devel/ocaml-findlib
-OCAMLFIND_DEPEND?=	${OCAMLFIND}:${OCAMLFIND_PORT}
-
-#
-# OCaml camlp4 port dependency
-#
-CAMLP4_PORT?=		devel/ocaml-camlp4
-CAMLP4_DEPEND?=		${CAMLP4}:${CAMLP4_PORT}
-
-#
-# OCaml TK bindings dependency
-#
-OCAMLTK_PORT?=		x11-toolkits/ocaml-labltk
-OCAMLTK_DEPENDS?=	${OCAMLTK}:${OCAMLTK_PORT}
-
-#
-# Common OCaml examples and documents location
-#
-OCAML_DOCSDIR=		${PREFIX}/share/doc/ocaml
-OCAML_EXAMPLESDIR=	${PREFIX}/share/examples/ocaml
-
-#
-# Location of OCaml ld.conf file
-#
-OCAML_LDCONF?=		${OCAML_LIBDIR}/ld.conf
-
-# ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not
-# work well with staging.
-.  if defined(USE_OCAML_LDCONFIG)
-.    if !target(ocaml-ldconfig)
-OCAMLFIND_LDCONF?=	/dev/null
-.    endif
-.  endif
-
-OCAMLFIND_DESTDIR?=	${PREFIX}/${OCAML_SITELIBDIR}
-OCAMLFIND_LDCONF?=	${PREFIX}/${OCAML_LDCONF}
-
-.  if defined(USE_OCAML)
-.    if !defined(NO_OCAML_BUILDDEPENDS)
-EXTRACT_DEPENDS+=	${OCAMLC_DEPEND}
-PATCH_DEPENDS+=		${OCAMLC_DEPEND}
-BUILD_DEPENDS+=		${OCAMLC_DEPEND}
-.    endif
-.    if !defined(NO_OCAML_RUNDEPENDS)
-RUN_DEPENDS+=		${OCAMLC_DEPEND}
-.    endif
-PLIST_SUB+=	OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
-.  endif
-
-.  if defined(USE_OCAML_FINDLIB)
-#
-# We'll additionally add ocamlfind to RUN_DEPENDS, since
-# if the port requires ocamlfind to install - it requires
-# some ocaml libraries and these libraries RUN_DEPENDS on
-# ocamlfind
-#
-BUILD_DEPENDS+=		${OCAMLFIND_DEPEND}
-RUN_DEPENDS+=		${OCAMLFIND_DEPEND}
-MAKE_ENV+=	OCAMLFIND_DESTDIR="${STAGEDIR}${OCAMLFIND_DESTDIR}" \
-		OCAMLFIND_LDCONF="${OCAMLFIND_LDCONF}"
-
-#
-# Directories under site-lib to process automatically
-#
-OCAML_PKGDIRS?=	${PORTNAME}
-_USES_install+=	735:ocaml-findlib
-.    if !target(ocaml-findlib)
-ocaml-findlib:
-.      for DIR in ${OCAML_PKGDIRS}
-.        if defined(USE_OCAMLFIND_PLIST)
-	@${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \
-		's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-.        endif
-	@${ECHO_CMD} "@postunexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \
-		>> ${TMPPLIST}
-.      endfor
-.    endif
-.  endif
-
-.  if defined(USE_OCAML_CAMLP4)
-BUILD_DEPENDS+=		${CAMLP4_DEPEND}
-.  endif
-
-.  if defined(USE_OCAML_TK)
-.    if !defined(NO_OCAMLTK_BUILDDEPENDS)
-EXTRACT_DEPENDS+=	${OCAMLTK_DEPENDS}
-PATCH_DEPENDS+=		${OCAMLTK_DEPENDS}
-BUILD_DEPENDS+=		${OCAMLTK_DEPENDS}
-.    endif
-.    if !defined(NO_OCAMLTK_RUNDEPENDS)
-RUN_DEPENDS+=		${OCAMLTK_DEPENDS}
-.    endif
-.  endif
-
-.  if defined(USE_OCAML_LDCONFIG)
-#
-# Directories under PREFIX for appending to ld.conf
-#
-OCAML_LDLIBS?=	${OCAML_SITELIBDIR}/${PORTNAME}
-_USES_install+=	740:ocaml-ldconfig
-.    if !target(ocaml-ldconfig)
-ocaml-ldconfig:
-.      for LIB in ${OCAML_LDLIBS}
-	@${ECHO_CMD} "@postexec ${ECHO_CMD} "%D/${LIB}" >> %D/${OCAML_LDCONF}" \
-		>> ${TMPPLIST}
-	@${ECHO_CMD} "@postunexec ${SED} -i \"\" -e '/${LIB:S#/#\/#g}/d' %D/${OCAML_LDCONF}"  >> ${TMPPLIST}
-.      endfor
-.    endif
-.  endif
-
-.  if defined(USE_OCAML_WASH)
-PLIST_FILES+=	"@rmempty ${OCAML_LDCONF}"
-.  endif
-
-.endif #!defined(OCAML_include)
-
-.if defined(_POSTMKINCLUDED)
-
-.  if defined(USE_OCAML_FINDLIB)
-
-pre-install: ${STAGEDIR}${OCAMLFIND_DESTDIR}
-${STAGEDIR}${OCAMLFIND_DESTDIR}:
-	@${MKDIR} ${.TARGET}
-
-.  endif
-
-.endif # _POSTMKINCLUDED
--- a/Mk/bsd.options.desc.mk
+++ b/Mk/bsd.options.desc.mk
@ -389,7 +389,7 @@ OPENCL_DESC?=		Heterogeneous computing via OpenCL
 OPENCV_DESC?=		Computer Vision support via OpenCV
 OPENEXR_DESC?=		HDR image format support via OpenEXR
 OPENGL_DESC?=		2D/3D rendering support via OpenGL
-OPENJPEG_DESC?=		Enhanced JPEG graphics support
+OPENJPEG_DESC?=		JPEG 2000 support via OpenJPEG
 OPENMP_DESC?=		Parallel processing support via OpenMP
 OPENMPI_DESC?=		Parallel processing support via Open MPI
 OPENRAW_DESC?=		RAW camera format support
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -357,18 +357,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 ##
 # LDFLAGS_${ARCH} Append the ldflags to LDFLAGS only on the specified architecture
 ##
-# USE_OPENLDAP	- If set, this port uses the OpenLDAP libraries.
-#				  Implies: WANT_OPENLDAP_VER?=24
-# WANT_OPENLDAP_VER
-#				- Legal values are: 24
-#				  If set to an unknown value, the port is marked BROKEN.
-##
-# 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_OCAML		- If set, this port relies on the OCaml language.
-#				  Implies inclusion of bsd.ocaml.mk.  (Also see
-#				  that file for more information on USE_OCAML*).
 ##
 # USE_GECKO		- If set, this port uses the Gecko/Mozilla product.
 #				  See bsd.gecko.mk for more details.
@ -385,9 +373,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  Implies NO_LICENSES_INSTALL=yes, NO_MTREE=yes, and causes
 #				  Linux ldconfig to be used when USE_LDCONFIG is defined.
 ##
-# USE_TEX			- A list of the TeX dependencies the port has.
-#
-##
 # USE_RC_SUBR	- If set, the ports startup/shutdown script uses the common
 #				  routines found in /etc/rc.subr.
 #				  If this is set to a list of files, these files will be
@ -1179,7 +1164,7 @@ OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
 .    endif
 _EXPORTED_VARS+=	OSVERSION

-.    if ${OPSYS} == FreeBSD && (${OSVERSION} < 1303000 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1401000))
+.    if ${OPSYS} == FreeBSD && (${OSVERSION} < 1304000 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1401000))
 _UNSUPPORTED_SYSTEM_MESSAGE=	Ports Collection support for your ${OPSYS} version has ended, and no ports\
 								are guaranteed to build on this system. Please upgrade to a supported release.
 .      if defined(ALLOW_UNSUPPORTED_SYSTEM)
@ -1414,14 +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_OCAML)
-.include "${PORTSDIR}/Mk/bsd.ocaml.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)
@ -1615,9 +1592,12 @@ PKG_NOTES+=	flavor
 PKG_NOTE_flavor=	${FLAVOR}
 .    endif

+# GIT_CEILING_DIRECTORIES prevents ports that try to find their version
+# using git from finding the ports tree's git repository.
 WRK_ENV+=		HOME=${WRKDIR} \
 				MACHINE_ARCH=${MACHINE_ARCH} \
 				PWD="$${PWD}" \
+				GIT_CEILING_DIRECTORIES=${WRKDIR} \
 				__MAKE_CONF=${NONEXISTENT}
 .    for e in OSVERSION PATH TERM TMPDIR \
 				UNAME_b UNAME_i UNAME_K UNAME_m UNAME_n \
@ -1938,14 +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_OCAML)
-.include "${PORTSDIR}/Mk/bsd.ocaml.mk"
-.    endif
-
 .    if defined(USE_WX) || defined(USE_WX_NOT)
 .include "${PORTSDIR}/Mk/bsd.wx.mk"
 .    endif
@ -2582,8 +2554,8 @@ check-categories:
 VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
 	benchmarks biology budgie cad chinese comms converters \
 	databases deskutils devel dns docs \
-	editors education elisp emulators enlightenment finance french ftp \
-	filesystems \
+	editors education elisp emulators enlightenment \
+	filesystems finance french ftp \
 	games geography german gnome gnustep graphics \
 	hamradio haskell hebrew hungarian irc japanese java \
 	kde ${_KDE_CATEGORIES_SUPPORTED} kld korean \
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@ -210,7 +210,11 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		XORG_CAT CARGO_USE_GITHUB CARGO_USE_GITLAB CARGO_GIT_SUBDIR \
 		USE_RUBY USE_RUBY_EXTCONF USE_RUBY_SETUP RUBY_NO_BUILD_DEPENDS \
 		RUBY_NO_RUN_DEPENDS USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN \
-		USE_OPENLDAP WANT_OPENLDAP_VER
+		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 USE_JAVA JAVA_BUILD \
+		JAVA_EXTRACT USE_ANT JAVA_RUN
 SANITY_DEPRECATED=	MLINKS \
 			USE_MYSQL WANT_MYSQL_VER \
 			PYDISTUTILS_INSTALLNOSINGLE
@ -307,6 +311,22 @@ USE_RUBY_EXTCONF_ALT=	USES=ruby:extconf
 USE_RUBY_SETUP_ALT=	USES=ruby:setup
 RUBY_NO_BUILD_DEPENDS_ALT=	USES=ruby:run
 RUBY_NO_RUN_DEPENDS_ALT=	USES=ruby:build
+USE_OCAMLFIND_PLIST_ALT=	USES=ocaml:findplist
+USE_OCAML_ALT=		USES=ocaml
+USE_OCAML_CAMLP4_ALT=	USES=ocaml:camlp4
+USE_OCAML_FINDLIB_ALT=	USES=ocaml:findlib
+USE_OCAML_LDCONFIG_ALT=	USES=ocaml:ldconfig
+USE_OCAML_TK_ALT=	USES=ocaml:tk
+USE_OCAML_WASH_ALT=	USES=ocaml:wash
+NO_OCAMLTK_BUILDDEPENDS_ALT=	USES=ocaml:tkrun
+NO_OCAMLTK_RUNDEPENDS_ALT=	USES=ocaml:tkbuild
+NO_OCAML_BUILDDEPENDS_ALT=	USES=ocaml:run
+NO_OCAML_RUNDEPENDS_ALT=	USES=ocaml:build
+USE_ANT_ALT=	USES=java:ant
+USE_JAVA_ALT=		USES=java
+JAVA_EXTRACT_ALT=	USES=java:extract
+JAVA_BUILD_ALT=		USES=java:build
+JAVA_RUN_ALT=		USES=java:run

 .for a in ${SANITY_DEPRECATED}
 .  if defined(${a})
--- a/Tools/scripts/pypi-get-latest-version.sh
+++ b/Tools/scripts/pypi-get-latest-version.sh
@ -40,6 +40,7 @@ done
 fetch -o - https://pypi.python.org/pypi/$PACKAGE_NAME/json 2>/dev/null |
 	jq -r '.releases | keys[]' |
 	grep -v dev |
+	grep -v -E ".*(a|b|rc)[0-9]*$" |
 	version_sort |
 	tail -1 ||
 	echo "failed to find the Python package '$PACKAGE_NAME'"
--- a/8
+++ b/8
@ -294,8 +294,8 @@ snmpd:*:344:344::0:0:Net-SNMP Daemon:/nonexistent:/usr/sbin/nologin
 _metronome:*:345:345::0:0:Metronome Daemon:/nonexistent:/usr/sbin/nologin
 ngircd:*:346:346::0:0:ngIRCd Daemon:/var/empty:/usr/sbin/nologin
 eturnal:*:347:347::0:0:eturnal User:/var/spool/eturnal:/bin/sh
-# free: 348
-# free: 349
+davfs2:*:348:348::0:0:Davfs2 Daemon:/nonexistent:/usr/sbin/nologin
+tempo:*:349:349::0:0:Tempo Daemon:/nonexistent:/usr/sbin/nologin
 _sabnzbd:*:350:350::0:0:sabnzb Daemon:/nonexistent:/usr/sbin/nologin
 sonarr:*:351:351::0:0:Sonarr PVR:/nonexistent:/usr/sbin/nologin
 radarr:*:352:352::0:0:Radarr Daemon:/nonexistent:/usr/sbin/nologin
@ -602,7 +602,7 @@ _xrdp:*:648:648::0:0:xrdp daemon:/nonexistent:/usr/sbin/nologin
 # free: 652
 # free: 653
 # free: 654
-# free: 655
+tinc:*:655:655::0:0:tinc daemon:/nonexistent:/usr/sbin/nologin
 # free: 656
 # free: 657
 # free: 658
@ -683,7 +683,7 @@ _dnscrypt-wrapper:*:718:65534::0:0:dnscrypt-wrapper user:/var/empty:/usr/sbin/no
 # free: 733
 # free: 734
 c-lightning:*:735:735::0:0:c-lightning Daemon:/var/db/c-lightning:/usr/sbin/nologin
-# free: 736
+zonemaster:*:736:736::0:0:Zonemaster Daemon:/nonexistent:/usr/sbin/nologin
 # free: 737
 # free: 738
 # free: 739
--- a/32
+++ b/32
@ -5,6 +5,38 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20241230:
+  AFFECTS: users of net/xrdp-devel
+  AUTHOR: meta@FreeBSD.org
+
+  The port has been updated to the latest development snapshot.
+
+  The directory for the config files has also changed from
+  PREFIX/etc/xrdp to PREFIX/etc/xrdp-devel to prevent incompatible config
+  files for net/xrdp and net/xrdp-devel from getting mixed up.
+
+  When updating net/xrdp-devel from old verisons, move the config files to
+  the new directory.
+
+20241224:
+  AFFECTS: users of net/xrdp
+  AUTHOR: meta@FreeBSD.org
+
+  xrdp supports H.264 encoding in graphics remoting since v0.10.2.
+  It reduces the amount of data transmitted over the network and provides
+  a much smoother and more responsive experience compared to previous
+  versions. When updating from older v0.10.x versions to v0.10.2, make
+  sure to merge the new xrdp.ini with the old one because xrdp.ini has
+  some new configuration parameters for H.264. See 20240704 if updating
+  from v0.9.x.
+
+  Furthermore, xrdp v0.10.2 supports running the xrdp daemon as an
+  unprivileged user. See the xrdp.ini(5) man page for configuring xrdp to
+  run as an unprivileged user. You can also check if xrdp is properly
+  configured to run as an unprivleged user using the script located at:
+
+    %%PREFIX%%/share/xrdp/xrdp-chkpriv
+
 20241203:
  AFFECTS: users of deskutils/treesheets
  AUTHOR: eduardo@FreeBSD.org