20 files changed, 313 insertions, 153 deletions
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 02755c196585..581d4d24e0c1 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -41,6 +41,8 @@
     SUBDIR += copyq
     SUBDIR += coregarage
     SUBDIR += countdown
+    SUBDIR += crengine-ng
+    SUBDIR += crqt-ng
     SUBDIR += dailystrips
     SUBDIR += deforaos-notes
     SUBDIR += deforaos-todo
diff --git a/deskutils/crengine-ng/Makefile b/deskutils/crengine-ng/Makefile
new file mode 100644
index 000000000000..6e68cbcf0cdc
--- /dev/null
+++ b/deskutils/crengine-ng/Makefile
@@ -0,0 +1,34 @@
+PORTNAME=	crengine-ng
+DISTVERSION=	0.9.12
+CATEGORIES=	deskutils
+
+MAINTAINER=	kenrap@kennethraplee.com
+COMMENT=	Cross-platform library for text viewers and e-book readers
+WWW=		https://gitlab.com/coolreader-ng/crengine-ng
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libfribidi.so:converters/fribidi \
+		libgif.so:graphics/giflib \
+		libharfbuzz.so:print/harfbuzz \
+		libpng.so:graphics/png \
+		libunibreak.so:textproc/libunibreak \
+		libutf8proc.so:textproc/utf8proc \
+		libzstd.so:archivers/zstd
+
+USES=		cmake pkgconfig desktop-file-utils jpeg
+
+USE_GITLAB=	yes
+GL_ACCOUNT=	coolreader-ng
+
+CMAKE_ARGS=	-D CRE_BUILD_STATIC=OFF \
+		-D DOC_DATA_COMPRESSION_LEVEL=3
+
+.if defined(WITH_LTO)
+CMAKE_ARGS+= -D ENABLE_LTO=ON
+.endif
+
+.include <bsd.port.mk>
diff --git a/deskutils/crengine-ng/distinfo b/deskutils/crengine-ng/distinfo
new file mode 100644
index 000000000000..6eb7ce29e84b
--- /dev/null
+++ b/deskutils/crengine-ng/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1754181107
+SHA256 (crengine-ng-0.9.12.tar.bz2) = d098a0b1e5c0e9d5e2202b225d34cf35bd371ff109fd239fb84e1c84816cf47b
+SIZE (crengine-ng-0.9.12.tar.bz2) = 4378495
diff --git a/deskutils/crengine-ng/pkg-descr b/deskutils/crengine-ng/pkg-descr
new file mode 100644
index 000000000000..49469b88b122
--- /dev/null
+++ b/deskutils/crengine-ng/pkg-descr
@@ -0,0 +1 @@
+A cross-platform library designed to implement text viewers and e-book readers.
diff --git a/deskutils/crengine-ng/pkg-plist b/deskutils/crengine-ng/pkg-plist
new file mode 100644
index 000000000000..ffb523820b01
--- /dev/null
+++ b/deskutils/crengine-ng/pkg-plist
@@ -0,0 +1,131 @@
+include/crengine-ng/crbookformats.h
+include/crengine-ng/crconcurrent.h
+include/crengine-ng/crengine-ng-config.h
+include/crengine-ng/crengine.h
+include/crengine-ng/crgui.h
+include/crengine-ng/crhist.h
+include/crengine-ng/crhyphman.h
+include/crengine-ng/cri18n.h
+include/crengine-ng/crlocaledata.h
+include/crengine-ng/crlocks.h
+include/crengine-ng/crlog.h
+include/crengine-ng/crprops.h
+include/crengine-ng/crsetup.h
+include/crengine-ng/crskin.h
+include/crengine-ng/crtimerutil.h
+include/crengine-ng/crtrace.h
+include/crengine-ng/crtxtenc.h
+include/crengine-ng/cssdef.h
+include/crengine-ng/dtddef.h
+include/crengine-ng/fb2def.h
+include/crengine-ng/ldomdoccache.h
+include/crengine-ng/ldomdocument.h
+include/crengine-ng/ldommarkedrange.h
+include/crengine-ng/ldomnode.h
+include/crengine-ng/ldomnodecallback.h
+include/crengine-ng/ldomword.h
+include/crengine-ng/ldomwordex.h
+include/crengine-ng/ldomwordexlist.h
+include/crengine-ng/ldomxpointer.h
+include/crengine-ng/ldomxpointerex.h
+include/crengine-ng/ldomxrange.h
+include/crengine-ng/ldomxrangelist.h
+include/crengine-ng/lvarray.h
+include/crengine-ng/lvassetcontainerfactory.h
+include/crengine-ng/lvautoptr.h
+include/crengine-ng/lvbasedrawbuf.h
+include/crengine-ng/lvbyteorder.h
+include/crengine-ng/lvcacheableobject.h
+include/crengine-ng/lvcacheloadingcallback.h
+include/crengine-ng/lvcolordrawbuf.h
+include/crengine-ng/lvcontainer.h
+include/crengine-ng/lvcontaineriteminfo.h
+include/crengine-ng/lvdocprops.h
+include/crengine-ng/lvdocview.h
+include/crengine-ng/lvdocviewcallback.h
+include/crengine-ng/lvdocviewcmd.h
+include/crengine-ng/lvdocviewprops.h
+include/crengine-ng/lvdrawbuf.h
+include/crengine-ng/lvembeddedfont.h
+include/crengine-ng/lvfnt.h
+include/crengine-ng/lvfntman.h
+include/crengine-ng/lvfont.h
+include/crengine-ng/lvgraydrawbuf.h
+include/crengine-ng/lvhashtable.h
+include/crengine-ng/lvimagesource.h
+include/crengine-ng/lvimg.h
+include/crengine-ng/lvmemman.h
+include/crengine-ng/lvpagemap.h
+include/crengine-ng/lvpagesplitter.h
+include/crengine-ng/lvptrvec.h
+include/crengine-ng/lvqueue.h
+include/crengine-ng/lvref.h
+include/crengine-ng/lvrefcache.h
+include/crengine-ng/lvrend.h
+include/crengine-ng/lvserialbuf.h
+include/crengine-ng/lvstorageobject.h
+include/crengine-ng/lvstream.h
+include/crengine-ng/lvstreamutils.h
+include/crengine-ng/lvstring.h
+include/crengine-ng/lvstring32collection.h
+include/crengine-ng/lvstring32hashedcollection.h
+include/crengine-ng/lvstring8collection.h
+include/crengine-ng/lvstsheet.h
+include/crengine-ng/lvstyles.h
+include/crengine-ng/lvtextfm.h
+include/crengine-ng/lvthread.h
+include/crengine-ng/lvtinydom_common.h
+include/crengine-ng/lvtinydomutils.h
+include/crengine-ng/lvtinynodecollection.h
+include/crengine-ng/lvtocitem.h
+include/crengine-ng/lvtypes.h
+include/crengine-ng/lvxmlparsercallback.h
+include/crengine-ng/lxmldocbase.h
+lib/cmake/crengine-ng/crengine-ng-config-version.cmake
+lib/cmake/crengine-ng/crengine-ng-config.cmake
+lib/cmake/crengine-ng/crengine-ng-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/crengine-ng/crengine-ng-targets.cmake
+lib/libcrengine-ng.so
+lib/libcrengine-ng.so.0.9.12
+lib/libcrengine-ng.so.7
+libdata/pkgconfig/crengine-ng.pc
+%%DATADIR%%/chm.css
+%%DATADIR%%/dict.css
+%%DATADIR%%/doc.css
+%%DATADIR%%/docx.css
+%%DATADIR%%/epub.css
+%%DATADIR%%/fb2.css
+%%DATADIR%%/fb3.css
+%%DATADIR%%/htm.css
+%%DATADIR%%/html5.css
+%%DATADIR%%/hyph/hyph-ar.pattern
+%%DATADIR%%/hyph/hyph-bg.pattern
+%%DATADIR%%/hyph/hyph-bn.pattern
+%%DATADIR%%/hyph/hyph-cs.pattern
+%%DATADIR%%/hyph/hyph-da.pattern
+%%DATADIR%%/hyph/hyph-de-1996.pattern
+%%DATADIR%%/hyph/hyph-el-monoton.pattern
+%%DATADIR%%/hyph/hyph-en-gb.pattern
+%%DATADIR%%/hyph/hyph-en-us.pattern
+%%DATADIR%%/hyph/hyph-es.pattern
+%%DATADIR%%/hyph/hyph-fa.pattern
+%%DATADIR%%/hyph/hyph-fi.pattern
+%%DATADIR%%/hyph/hyph-fr.pattern
+%%DATADIR%%/hyph/hyph-grc.pattern
+%%DATADIR%%/hyph/hyph-gu.pattern
+%%DATADIR%%/hyph/hyph-hu.pattern
+%%DATADIR%%/hyph/hyph-it.pattern
+%%DATADIR%%/hyph/hyph-mr.pattern
+%%DATADIR%%/hyph/hyph-nl.pattern
+%%DATADIR%%/hyph/hyph-pa.pattern
+%%DATADIR%%/hyph/hyph-pl.pattern
+%%DATADIR%%/hyph/hyph-pt.pattern
+%%DATADIR%%/hyph/hyph-ru-ru,en-us.pattern
+%%DATADIR%%/hyph/hyph-ru-ru.pattern
+%%DATADIR%%/hyph/hyph-ta.pattern
+%%DATADIR%%/hyph/hyph-te.pattern
+%%DATADIR%%/hyph/hyph-uk.pattern
+%%DATADIR%%/hyph/hyph-zh-latn-pinyin.pattern
+%%DATADIR%%/markdown.css
+%%DATADIR%%/rtf.css
+%%DATADIR%%/txt.css
diff --git a/deskutils/crqt-ng/Makefile b/deskutils/crqt-ng/Makefile
new file mode 100644
index 000000000000..0860381c95de
--- /dev/null
+++ b/deskutils/crqt-ng/Makefile
@@ -0,0 +1,28 @@
+PORTNAME=	crqt-ng
+DISTVERSION=	1.0.15
+CATEGORIES=	deskutils
+
+MAINTAINER=	kenrap@kennethraplee.com
+COMMENT=	E-book reader
+WWW=		https://gitlab.com/coolreader-ng/crqt-ng
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libcrengine-ng.so:deskutils/crengine-ng
+
+USES=		qt:6 cmake desktop-file-utils pkgconfig
+
+USE_GITLAB=	yes
+GL_ACCOUNT=	coolreader-ng
+
+USE_QT=		base translations
+
+CMAKE_ARGS=	-D DOC_DATA_COMPRESSION_LEVEL=3 \
+		-D USE_QT=QT6 \
+		-D MAX_IMAGE_SCALE_MUL=2
+
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB=    yes
+
+.include <bsd.port.mk>
diff --git a/deskutils/crqt-ng/distinfo b/deskutils/crqt-ng/distinfo
new file mode 100644
index 000000000000..48972c76b1b7
--- /dev/null
+++ b/deskutils/crqt-ng/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1754231857
+SHA256 (crqt-ng-1.0.15.tar.bz2) = 1a4dd8f750ad585f2600d40b71b54b2d65f48abfee1414a055f27585cd6ad6a8
+SIZE (crqt-ng-1.0.15.tar.bz2) = 446115
diff --git a/deskutils/crqt-ng/pkg-descr b/deskutils/crqt-ng/pkg-descr
new file mode 100644
index 000000000000..c6cc144c24a6
--- /dev/null
+++ b/deskutils/crqt-ng/pkg-descr
@@ -0,0 +1,2 @@
+Cross-platform open source e-book reader using crengine-ng.
+It is a fork of the CoolReader project.
diff --git a/deskutils/crqt-ng/pkg-plist b/deskutils/crqt-ng/pkg-plist
new file mode 100644
index 000000000000..b9d26d781d05
--- /dev/null
+++ b/deskutils/crqt-ng/pkg-plist
@@ -0,0 +1,19 @@
+bin/crqt
+share/applications/crqt.desktop
+share/crqt/backgrounds/bg_paper1.jpg
+share/crqt/backgrounds/bg_paper1_dark.jpg
+%%NLS%%share/crqt/i18n/crqt_bg.qm
+%%NLS%%share/crqt/i18n/crqt_cs.qm
+%%NLS%%share/crqt/i18n/crqt_hu.qm
+%%NLS%%share/crqt/i18n/crqt_nl.qm
+%%NLS%%share/crqt/i18n/crqt_ru.qm
+%%NLS%%share/crqt/i18n/crqt_uk.qm
+share/crqt/textures/tx_fabric.jpg
+share/crqt/textures/tx_fabric_dark.jpg
+share/crqt/textures/tx_sand.jpg
+share/crqt/textures/tx_sand_dark.jpg
+share/icons/hicolor/48x48/apps/crqt.png
+share/icons/hicolor/scalable/apps/crqt.svg
+share/metainfo/crqt.appdata.xml
+share/pixmaps/crqt.png
+share/pixmaps/crqt.xpm
diff --git a/deskutils/py-paperless-ngx/Makefile b/deskutils/py-paperless-ngx/Makefile
index 36704d283f77..0b59cef7fabd 100644
--- a/deskutils/py-paperless-ngx/Makefile
+++ b/deskutils/py-paperless-ngx/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	paperless-ngx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.18.3
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/:webui \
 		GH:gh
@@ -40,7 +41,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.6:devel/py-Jinja2@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}httptools>=0.6.4:www/py-httptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx-oauth>=0.10.1:www/py-httpx-oauth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imap-tools>=1.11.0:mail/py-imap-tools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}inotifyrecursive>=0.3.5_3:devel/py-inotifyrecursive@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}inotifyrecursive>=0.3.5_5:devel/py-inotifyrecursive@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}langdetect>=1.0.9:textproc/py-langdetect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mysqlclient>=2.2.7:databases/py-mysqlclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.8.1:textproc/py-nltk@${PY_FLAVOR} \
diff --git a/deskutils/py-vdirsyncer/Makefile b/deskutils/py-vdirsyncer/Makefile
index a186d20a78e4..cfcfb0248bbb 100644
--- a/deskutils/py-vdirsyncer/Makefile
+++ b/deskutils/py-vdirsyncer/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vdirsyncer
-PORTVERSION=	0.19.3
-PORTREVISION=	1
+PORTVERSION=	0.20.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,11 +12,11 @@ WWW=		https://vdirsyncer.pimutils.org/en/stable/ \
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8.0<4.0.0:www/py-aiohttp@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}aiostream>=0.4.3:www/py-aiostream@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}aiostream>=0.4.3<0.8.0:www/py-aiostream@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=5.0<9.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click-log>=0.3.0<0.5.0:devel/py-click-log@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \
diff --git a/deskutils/py-vdirsyncer/distinfo b/deskutils/py-vdirsyncer/distinfo
index f0fc3e36f838..9e8211b6a7f3 100644
--- a/deskutils/py-vdirsyncer/distinfo
+++ b/deskutils/py-vdirsyncer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1726487338
-SHA256 (vdirsyncer-0.19.3.tar.gz) = e437851feb985dec3544654f8f9cf6dd109b0b03f7e19956086603092ffeb28f
-SIZE (vdirsyncer-0.19.3.tar.gz) = 125478
+TIMESTAMP = 1757120620
+SHA256 (vdirsyncer-0.20.0.tar.gz) = feb1a533500a95c14fd155733a1056fe359192553d82c07c6ba04fcbfc40b12d
+SIZE (vdirsyncer-0.20.0.tar.gz) = 126633
diff --git a/deskutils/py-vdirsyncer/files/patch-atomicwrites b/deskutils/py-vdirsyncer/files/patch-atomicwrites
deleted file mode 100644
index 3d0b9bb94616..000000000000
--- a/deskutils/py-vdirsyncer/files/patch-atomicwrites
+++ /dev/null
@@ -1,111 +0,0 @@
-Obtained from:	https://github.com/pimutils/vdirsyncer/commit/8b063c39cb3e26a2beef5b6beed7e99c9e9641ac
-
---- setup.py.orig	2024-09-11 15:26:58 UTC
-+++ setup.py
-@@ -16,8 +16,6 @@ requirements = [
-     "click>=5.0,<9.0",
-     "click-log>=0.3.0, <0.5.0",
-     "requests >=2.20.0",
--    # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d  # noqa
--    "atomicwrites>=0.1.7",
-     "aiohttp>=3.8.0,<4.0.0",
-     "aiostream>=0.4.3,<0.5.0",
- ]
---- vdirsyncer/cli/utils.py.orig	2024-09-11 15:26:58 UTC
-+++ vdirsyncer/cli/utils.py
-@@ -10,7 +10,6 @@ import click
- 
- import aiohttp
- import click
--from atomicwrites import atomic_write
- 
- from .. import BUGTRACKER_HOME
- from .. import DOCS_HOME
-@@ -21,6 +20,7 @@ from ..sync.status import SqliteStatus
- from ..sync.exceptions import StorageEmpty
- from ..sync.exceptions import SyncConflict
- from ..sync.status import SqliteStatus
-+from ..utils import atomic_write
- from ..utils import expand_path
- from ..utils import get_storage_init_args
- from . import cli_logger
---- vdirsyncer/storage/filesystem.py.orig	2024-09-11 15:26:58 UTC
-+++ vdirsyncer/storage/filesystem.py
-@@ -5,9 +5,8 @@ import subprocess
- import os
- import subprocess
- 
--from atomicwrites import atomic_write
--
- from .. import exceptions
-+from ..utils import atomic_write
- from ..utils import checkdir
- from ..utils import expand_path
- from ..utils import generate_href
---- vdirsyncer/storage/google.py.orig	2024-09-11 15:26:58 UTC
-+++ vdirsyncer/storage/google.py
-@@ -11,9 +11,9 @@ import click
- 
- import aiohttp
- import click
--from atomicwrites import atomic_write
- 
- from .. import exceptions
-+from ..utils import atomic_write
- from ..utils import checkdir
- from ..utils import expand_path
- from ..utils import open_graphical_browser
---- vdirsyncer/storage/singlefile.py.orig	2024-09-11 15:26:58 UTC
-+++ vdirsyncer/storage/singlefile.py
-@@ -8,9 +8,8 @@ from typing import Iterable
- import os
- from typing import Iterable
- 
--from atomicwrites import atomic_write
--
- from .. import exceptions
-+from ..utils import atomic_write
- from ..utils import checkfile
- from ..utils import expand_path
- from ..utils import get_etag_from_file
---- vdirsyncer/utils.py.orig	2024-09-11 15:26:58 UTC
-+++ vdirsyncer/utils.py
-@@ -1,8 +1,10 @@ from __future__ import annotations
- from __future__ import annotations
- 
-+import contextlib
- import functools
- import os
- import sys
-+import tempfile
- import uuid
- from inspect import getfullargspec
- from typing import Callable
-@@ -220,3 +222,27 @@ def open_graphical_browser(url, new=0, autoraise=True)
-             return
- 
-     raise RuntimeError("No graphical browser found. Please open the URL " "manually.")
-+
-+
-+@contextlib.contextmanager
-+def atomic_write(dest, mode="wb", overwrite=False):
-+    if "w" not in mode:
-+        raise RuntimeError("`atomic_write` requires write access")
-+
-+    fd, src = tempfile.mkstemp(prefix=os.path.basename(dest), dir=os.path.dirname(dest))
-+    file = os.fdopen(fd, mode=mode)
-+
-+    try:
-+        yield file
-+    except Exception:
-+        os.unlink(src)
-+        raise
-+    else:
-+        file.flush()
-+        file.close()
-+
-+        if overwrite:
-+            os.rename(src, dest)
-+        else:
-+            os.link(src, dest)
-+            os.unlink(src)
diff --git a/deskutils/py-vdirsyncer/files/patch-pyproject.toml b/deskutils/py-vdirsyncer/files/patch-pyproject.toml
new file mode 100644
index 000000000000..5c3217b4eb53
--- /dev/null
+++ b/deskutils/py-vdirsyncer/files/patch-pyproject.toml
@@ -0,0 +1,21 @@
+--- pyproject.toml.orig	2025-08-28 20:57:38 UTC
++++ pyproject.toml
+@@ -4,7 +4,7 @@
+ # how to package vdirsyncer.
+ 
+ [build-system]
+-requires = ["setuptools>=64", "setuptools_scm>=8"]
++requires = ["setuptools>=61", "setuptools_scm>=8"]
+ build-backend = "setuptools.build_meta"
+ 
+ [project]
+@@ -16,8 +16,7 @@ keywords = ["todo", "task", "icalendar", "cli"]
+ readme = "README.rst"
+ requires-python = ">=3.8"
+ keywords = ["todo", "task", "icalendar", "cli"]
+-license = "BSD-3-Clause"
+-license-files = ["LICENSE"]
++license = { text = "BSD-3-Clause" }
+ classifiers = [
+     "Development Status :: 4 - Beta",
+     "Environment :: Console",
diff --git a/deskutils/py-vdirsyncer/files/patch-setup.py b/deskutils/py-vdirsyncer/files/patch-setup.py
deleted file mode 100644
index b44e3361296f..000000000000
--- a/deskutils/py-vdirsyncer/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2024-09-11 15:26:58 UTC
-+++ setup.py
-@@ -17,7 +17,7 @@ requirements = [
-     "click-log>=0.3.0, <0.5.0",
-     "requests >=2.20.0",
-     "aiohttp>=3.8.0,<4.0.0",
--    "aiostream>=0.4.3,<0.5.0",
-+    "aiostream>=0.4.3",
- ]
- 
- 
diff --git a/deskutils/stirling-pdf/Makefile b/deskutils/stirling-pdf/Makefile
index 62f1147c2406..d142c9544dba 100644
--- a/deskutils/stirling-pdf/Makefile
+++ b/deskutils/stirling-pdf/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	stirling-pdf
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.2
 CATEGORIES=	deskutils java
 MASTER_SITES=	https://files.stirlingpdf.com/v${PORTVERSION}/
 DISTNAME=	Stirling-PDF-with-login
diff --git a/deskutils/stirling-pdf/distinfo b/deskutils/stirling-pdf/distinfo
index 679b9f3b1383..5cedfe914cd6 100644
--- a/deskutils/stirling-pdf/distinfo
+++ b/deskutils/stirling-pdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1754800804
-SHA256 (stirling-pdf/1.2.0/Stirling-PDF-with-login.jar) = 3b00e79f587a8539f4958204e39469fb1b52b6d412783fe124193a10e1be6202
-SIZE (stirling-pdf/1.2.0/Stirling-PDF-with-login.jar) = 153811712
+TIMESTAMP = 1757134697
+SHA256 (stirling-pdf/1.3.2/Stirling-PDF-with-login.jar) = e424ea6c2ec9c88c422e6dcdac53fcffad498a2bd428a9de92bd748eacd54baa
+SIZE (stirling-pdf/1.3.2/Stirling-PDF-with-login.jar) = 153493847
diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile
index b5b717c57c16..c72ff88c0b56 100644
--- a/deskutils/treesheets/Makefile
+++ b/deskutils/treesheets/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	treesheets
-DISTVERSION=	1.0.20250617
-PORTREVISION=	1
+DISTVERSION=	2507
 CATEGORIES=	deskutils
 
 MAINTAINER=	eduardo@FreeBSD.org
@@ -13,13 +12,11 @@ LICENSE_FILE=	${WRKSRC}/ZLIB_LICENSE.txt
 USES=		cmake desktop-file-utils shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	aardappel
-GH_TAGNAME=	15700798552
 USE_WX=		3.2
-
-PORTSCOUT=	ignore:1 # upstream uses CI run ids as releases
+GH_TUPLE=	aardappel:lobster:v2025.3:external/lobster
 
 PORTDATA=	images scripts
-PORTDOCS=	docs readme.html
+PORTDOCS=	docs readme-ko.html readme-zh_CN.html readme.html
 PORTEXAMPLES=	examples
 
 OPTIONS_DEFINE=	DOCS EXAMPLES NLS
@@ -27,4 +24,8 @@ OPTIONS_SUB=	yes
 
 NLS_USES=	gettext-tools
 
+post-extract:
+	${MKDIR} ${WRKDIR}/.build/_deps/lobster-src
+	${CP} -R ${WRKSRC}/lobster/* ${WRKDIR}/.build/_deps/lobster-src
+
 .include <bsd.port.mk>
diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo
index 60da807e7903..6c0ae4022014 100644
--- a/deskutils/treesheets/distinfo
+++ b/deskutils/treesheets/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1750158203
-SHA256 (aardappel-treesheets-1.0.20250617-15700798552_GH0.tar.gz) = 33146a7f5ae30ae7dbe5692b18ed6ed5b06c5b475c736fb52e05813e3c2ccf67
-SIZE (aardappel-treesheets-1.0.20250617-15700798552_GH0.tar.gz) = 3312954
+TIMESTAMP = 1757527112
+SHA256 (aardappel-treesheets-2507_GH0.tar.gz) = dfd21bb46c9f456d6e6107d8edbf1ae8556da0c05830bd2c64415074989e1d3f
+SIZE (aardappel-treesheets-2507_GH0.tar.gz) = 2358134
+SHA256 (aardappel-lobster-v2025.3_GH0.tar.gz) = 8eef481d779f9c1d53e860341e582d54732cbec997b5a05c0f4628107fc1e12d
+SIZE (aardappel-lobster-v2025.3_GH0.tar.gz) = 26681905
diff --git a/deskutils/treesheets/files/patch-CMakeLists.txt b/deskutils/treesheets/files/patch-CMakeLists.txt
index 745c53af74c3..7263d8e56183 100644
--- a/deskutils/treesheets/files/patch-CMakeLists.txt
+++ b/deskutils/treesheets/files/patch-CMakeLists.txt
@@ -1,15 +1,50 @@
---- CMakeLists.txt.orig	2025-06-14 21:33:28 UTC
+Build with system wx workaround:
+https://github.com/aardappel/treesheets/issues/1083
+
+--- CMakeLists.txt.orig	2025-09-10 10:53:00 UTC
 +++ CMakeLists.txt
-@@ -4,7 +4,7 @@ string(TIMESTAMP TimeStamp "%y%m%d.%H%M" UTC)
- 
- string(TIMESTAMP TimeStamp "%y%m%d.%H%M" UTC)
+@@ -7,7 +7,7 @@ endif()
+     set(TREESHEETS_VERSION "${timestamp}")
+ endif()
  
 -project(TreeSheets
 +project(treesheets
      DESCRIPTION "A free-form hierarchical data organizer"
      HOMEPAGE_URL "https://github.com/aardappel/treesheets"
-     VERSION ${TimeStamp})
-@@ -174,11 +174,11 @@ target_link_libraries(TreeSheets PRIVATE ${TREESHEETS_
+     VERSION "${TREESHEETS_VERSION}")
+@@ -32,17 +32,11 @@ FetchContent_Declare(
+ 
+ include(FetchContent)
+ FetchContent_Declare(
+-    wxwidgets
+-    GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets
+-    GIT_TAG v3.2.8
+-    FIND_PACKAGE_ARGS 3.2.8 NAMES wxWidgets
+-)
+-FetchContent_Declare(
+     lobster
+     GIT_REPOSITORY https://github.com/aardappel/lobster
+     GIT_TAG v2025.3
+ )
+-FetchContent_MakeAvailable(wxwidgets lobster)
++FetchContent_MakeAvailable(lobster)
+ 
+ ### Options
+ 
+@@ -143,7 +137,11 @@ target_precompile_headers(TreeSheets PUBLIC src/stdafx
+ target_precompile_headers(TreeSheets PUBLIC src/stdafx.h)
+ 
+ ## Link wxWidgets, lobster-impl and StackWalker into TreeSheets
+-set(TREESHEETS_LIBS wx::aui wx::adv wx::core wx::xml wx::net lobster-impl)
++find_package(wxWidgets REQUIRED COMPONENTS aui adv core xml net)
++set(TREESHEETS_LIBS ${wxWidgets_LIBRARIES} lobster-impl)
++target_link_libraries(TreeSheets PRIVATE ${TREESHEETS_LIBS})
++target_include_directories(TreeSheets PRIVATE ${wxWidgets_INCLUDE_DIRS})
++target_compile_definitions(TreeSheets PRIVATE ${wxWidgets_DEFINITIONS})
+ if(WIN32)
+     list(APPEND TREESHEETS_LIBS StackWalker)
+ endif()
+@@ -153,11 +151,11 @@ target_link_libraries(TreeSheets PRIVATE ${TREESHEETS_
  
  ## Platform specific installation paths
  
@@ -23,10 +58,10 @@
      include(GNUInstallDirs)
  
      set(TREESHEETS_BINDIR ${CMAKE_INSTALL_BINDIR})
-@@ -211,7 +211,7 @@ install(FILES TS/readme.html DESTINATION ${TREESHEETS_
- install(TARGETS TreeSheets DESTINATION ${TREESHEETS_BINDIR})
+@@ -193,7 +191,7 @@ install(FILES ${treesheets_readme_files} DESTINATION $
  install(DIRECTORY TS/docs DESTINATION ${TREESHEETS_DOCDIR})
- install(FILES TS/readme.html DESTINATION ${TREESHEETS_DOCDIR})
+ file(GLOB treesheets_readme_files "TS/readme*.html")
+ install(FILES ${treesheets_readme_files} DESTINATION ${TREESHEETS_DOCDIR})
 -install(DIRECTORY TS/examples DESTINATION ${TREESHEETS_DOCDIR})
 +install(DIRECTORY TS/examples DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/${CMAKE_PROJECT_NAME})