sync ports with The Matrix

databases/pgtcl/Makefile

@@ -1,9 +1,9 @@
 COMMENT=	Tcl interface to PostgreSQL
 
-V=		1.7
+GH_ACCOUNT=	flightaware
-DISTNAME=	libpgtcl-$V
+GH_PROJECT=	Pgtcl
-PKGNAME=	pgtcl-$V
+GH_TAGNAME=	v3.0.0
-REVISION=	1
+PKGNAME=	${DISTNAME:L}
 CATEGORIES=	databases
 
 HOMEPAGE=	https://flightaware.github.io/Pgtcl/
@@ -13,33 +13,38 @@ MAINTAINER=	Stuart Cassoff <stwo@users.sourceforge.net>
 # BSD
 PERMIT_PACKAGE=	Yes
 
-PORTROACH=	site:https://github.com/flightaware/Pgtcl/archive/
-MASTER_SITES=	https://ftp.postgresql.org/pub/projects/pgFoundry/pgtcl/pgtcl/$V/
-
 MODULES=	lang/tcl
 
-LIB_DEPENDS=	databases/postgresql
+LIB_DEPENDS=	databases/postgresql \
+		databases/sqlite3
 RUN_DEPENDS=	${MODTCL_RUN_DEPENDS}
 BUILD_DEPENDS=	${MODTCL_BUILD_DEPENDS}
-WANTLIB +=	pq>=5 ${MODTCL_WANTLIB}
+WANTLIB +=	pq>=5 sqlite3
 
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoreconf
 CONFIGURE_ARGS=	--with-tcl=${MODTCL_LIBDIR} \
 		--libdir=${MODTCL_TCLDIR} \
 		--with-postgres-include=${LOCALBASE}/include/postgresql \
 		--with-postgres-lib=${LOCALBASE}/lib \
 		--disable-threads
 
+# fix sqlite detection
+CONFIGURE_ARGS+=CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+# the configure needs to be adapted for 2.71
+AUTOCONF_VERSION=2.69
+AUTOMAKE_VERSION=1.16
+
 FAKE_FLAGS =	PKG_DIR='$$(PACKAGE_NAME)' INSTALL_PROGRAM='$$(INSTALL_DATA)' \
 		PKG_HEADERS='' PKG_TCL_SOURCES=''
 
 NO_TEST=	Yes
-ALL_TARGET =	 binaries libraries
-INSTALL_TARGET =install-binaries install-libraries
-SEPARATE_BUILD =Yes
 SUBST_VARS =	VER
 
-VER =		${V:S/.//g}
+# upstream forgot to update the version number in configure.in
+# after tagging 3.0.0?
+VER =		277
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgtcl/html

databases/pgtcl/distinfo

@@ -1,2 +1,2 @@
-SHA256 (libpgtcl-1.7.tar.gz) = COmhSWGxs9mFgpq+VvMHpoOAFzvSEnHMwWtfEu2wsuw=
+SHA256 (Pgtcl-3.0.0.tar.gz) = i6SRRBDv8o6upuf0M06mmfY0dGFcBHoxtTqPqE+iMqc=
-SIZE (libpgtcl-1.7.tar.gz) = 497868
+SIZE (Pgtcl-3.0.0.tar.gz) = 642965

databases/pgtcl/patches/patch-configure

@@ -1,20 +0,0 @@
---- configure.orig	Mon Apr 30 20:54:06 2012
-+++ configure	Mon Apr 30 20:59:24 2012
-@@ -7826,7 +7826,7 @@ fi
- 
- 	# TEA specific:
- 	CFLAGS_OPTIMIZE=-O2
--	CFLAGS_WARNING="-Wall -Wno-implicit-int"
-+	CFLAGS_WARNING="-Wall"
- 
- else
-   CFLAGS_WARNING=""
-@@ -9006,7 +9006,7 @@ fi
- fi
- 
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
- 	    { echo "$as_me:$LINENO: checking for ELF" >&5
- echo $ECHO_N "checking for ELF... $ECHO_C" >&6; }
- if test "${tcl_cv_ld_elf+set}" = set; then

databases/pgtcl/pkg/PLIST

@@ -1,8 +1,46 @@
+@so lib/tcl/libpgtcl${VER}.so
 lib/tcl/pgtcl/
-lib/tcl/pgtcl/libpgtcl${VER}.so
+@so lib/tcl/pgtcl/libpgtcl${VER}.so
 lib/tcl/pgtcl/pkgIndex.tcl
+@man man/mann/PgGetConnectionId.n
+@man man/mann/pg_blocking.n
+@man man/mann/pg_cancelrequest.n
+@man man/mann/pg_conndefaults.n
+@man man/mann/pg_connect.n
+@man man/mann/pg_copy_complete.n
+@man man/mann/pg_dbinfo.n
+@man man/mann/pg_disconnect.n
+@man man/mann/pg_escape_bytea.n
+@man man/mann/pg_escape_string.n
+@man man/mann/pg_exec.n
+@man man/mann/pg_exec_prepared.n
+@man man/mann/pg_execute.n
+@man man/mann/pg_getresult.n
+@man man/mann/pg_isbusy.n
+@man man/mann/pg_listen.n
+@man man/mann/pg_lo_close.n
+@man man/mann/pg_lo_creat.n
+@man man/mann/pg_lo_export.n
+@man man/mann/pg_lo_import.n
+@man man/mann/pg_lo_lseek.n
+@man man/mann/pg_lo_open.n
+@man man/mann/pg_lo_read.n
+@man man/mann/pg_lo_tell.n
+@man man/mann/pg_lo_truncate.n
+@man man/mann/pg_lo_unlink.n
+@man man/mann/pg_lo_write.n
+@man man/mann/pg_null_value_string.n
+@man man/mann/pg_on_connection_loss.n
+@man man/mann/pg_quote.n
+@man man/mann/pg_result.n
+@man man/mann/pg_select.n
+@man man/mann/pg_sendquery.n
+@man man/mann/pg_sendquery_prepared.n
+@man man/mann/pg_sqlite.n
+@man man/mann/pg_unescape_bytea.n
 share/doc/pgtcl/
 share/doc/pgtcl/html/
+share/doc/pgtcl/html/HTML.index
 share/doc/pgtcl/html/index.html
 share/doc/pgtcl/html/libpgtcl-loading.html
 share/doc/pgtcl/html/libpgtcl-ref.html
@@ -15,12 +53,14 @@ share/doc/pgtcl/html/pgtcl-pgcancelrequest.html
 share/doc/pgtcl/html/pgtcl-pgconndefaults.html
 share/doc/pgtcl/html/pgtcl-pgconnect.html
 share/doc/pgtcl/html/pgtcl-pgconninfo.html
+share/doc/pgtcl/html/pgtcl-pgcopycomplete.html
 share/doc/pgtcl/html/pgtcl-pgdisconnect.html
 share/doc/pgtcl/html/pgtcl-pgescape-bytea.html
 share/doc/pgtcl/html/pgtcl-pgescape-string.html
 share/doc/pgtcl/html/pgtcl-pgexec.html
 share/doc/pgtcl/html/pgtcl-pgexecprepared.html
 share/doc/pgtcl/html/pgtcl-pgexecute.html
+share/doc/pgtcl/html/pgtcl-pggetconnectionid.html
 share/doc/pgtcl/html/pgtcl-pggetresult.html
 share/doc/pgtcl/html/pgtcl-pgisbusy.html
 share/doc/pgtcl/html/pgtcl-pglisten.html
@@ -39,6 +79,8 @@ share/doc/pgtcl/html/pgtcl-pgresult.html
 share/doc/pgtcl/html/pgtcl-pgselect.html
 share/doc/pgtcl/html/pgtcl-pgsendquery.html
 share/doc/pgtcl/html/pgtcl-pgsendqueryprepared.html
+share/doc/pgtcl/html/pgtcl-pgsqlite.html
+share/doc/pgtcl/html/pgtcl-pgtruncate.html
 share/doc/pgtcl/html/pgtcl-pgunescape-bytea.html
 share/doc/pgtcl/html/pgtcl-quote.html
 share/doc/pgtcl/html/pgtcl-tclnamespace.html

devel/flatbuffers/Makefile

@@ -3,6 +3,7 @@ COMMENT=	memory optimized serialization library
 GH_ACCOUNT=	google
 GH_PROJECT=	flatbuffers
 GH_TAGNAME=	v23.5.26
+REVISION=	0
 
 SHARED_LIBS=	flatbuffers	2.0	# 2.0.0
 

devel/flatbuffers/pkg/PLIST

@@ -1,3 +1,4 @@
+@conflict osrm-backend-*
 @bin bin/flatc
 include/flatbuffers/
 include/flatbuffers/allocator.h

geo/osrm-backend/Makefile

@@ -7,6 +7,7 @@ COMMENT =		high-performance road network routing engine
 GH_ACCOUNT =		Project-OSRM
 GH_PROJECT =		osrm-backend
 GH_TAGNAME =		v5.27.1
+REVISION =		0
 
 CATEGORIES =		geo
 

geo/osrm-backend/pkg/PLIST

@@ -1,5 +1,6 @@
 @newgroup _osrm_routed:815
 @newuser _osrm_routed:815:815::OSRM Router:/var/empty:/sbin/nologin
+@conflict flatbuffers-*
 @rcscript ${RCDIR}/osrm_routed
 @bin bin/osrm-components
 @bin bin/osrm-contract

graphics/py-matplotlib/Makefile

@@ -1,6 +1,6 @@
 COMMENT=	Python charting and plotting API
 
-MODPY_EGG_VERSION =	3.6.3
+MODPY_EGG_VERSION =	3.7.2
 DISTNAME =		matplotlib-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 
@@ -26,20 +26,23 @@ MODPY_PYBUILD =		setuptools_scm
 NO_TEST =		Yes
 
 BUILD_DEPENDS =	devel/py-certifi${MODPY_FLAVOR}>=2020.06.20 \
+		devel/py-pybind11${MODPY_FLAVOR}>=2.6 \
 		math/qhull \
-		math/py-numpy${MODPY_FLAVOR}>=1.19 \
+		math/py-numpy${MODPY_FLAVOR}>=1.21 \
+		math/py-oldest-supported-numpy${MODPY_FLAVOR} \
 		textproc/py-sphinx${MODPY_FLAVOR}
 
 RUN_DEPENDS=	devel/py-tz${MODPY_FLAVOR} \
 		devel/py-dateutil${MODPY_FLAVOR}>=2.7 \
-		devel/py-kiwisolver${MODPY_FLAVOR}>=1.0.1 \
+		devel/py-kiwisolver${MODPY_FLAVOR}>=1.3.1 \
-		devel/py-parsing${MODPY_FLAVOR}>=2.2.1 \
+		devel/py-parsing${MODPY_FLAVOR}>=2.3.1 \
 		devel/py-gobject3${MODPY_FLAVOR} \
 		math/py-contourpy${MODPY_FLAVOR}>=1.0.1 \
-		math/py-numpy${MODPY_FLAVOR}>=1.19 \
+		math/py-numpy${MODPY_FLAVOR}>=1.21 \
-		graphics/py-Pillow${MODPY_FLAVOR}>=6.2.0 \
+		graphics/py-Pillow${MODPY_FLAVOR}>=8.0.0 \
 		graphics/py-cairo${MODPY_FLAVOR} \
 		graphics/py-cycler${MODPY_FLAVOR}>=0.10 \
+		print/py-fonttools${MODPY_FLAVOR}>=4.22.0 \
 		sysutils/py-packaging${MODPY_FLAVOR}>=20.0 \
 		${MODPY_TKINTER_DEPENDS}
 

graphics/py-matplotlib/distinfo

@@ -1,2 +1,2 @@
-SHA256 (matplotlib-3.6.3.tar.gz) = H01pcHsWd1YM2VJUTuSWL2j/B5UvuQaf+MErVjU8uMk=
+SHA256 (matplotlib-3.7.2.tar.gz) = qM25Hd2wRDa9LwmLj99LgTUuaM9NLGdW/MQUeRB2Vps=
-SIZE (matplotlib-3.6.3.tar.gz) = 35868590
+SIZE (matplotlib-3.7.2.tar.gz) = 38095843

graphics/py-matplotlib/patches/patch-setupext_py

@@ -1,7 +1,7 @@
 Index: setupext.py
 --- setupext.py.orig
 +++ setupext.py
-@@ -435,6 +435,7 @@ class Matplotlib(SetupPackage):
+@@ -443,6 +443,7 @@ class Matplotlib(SetupPackage):
          ext = Extension(
              "matplotlib._qhull", ["src/_qhull_wrapper.cpp"],
              define_macros=[("MPL_DEVNULL", os.devnull)])
@@ -9,7 +9,7 @@ Index: setupext.py
          add_numpy_flags(ext)
          Qhull.add_flags(ext)
          yield ext
-@@ -448,6 +449,7 @@ class Matplotlib(SetupPackage):
+@@ -456,6 +457,7 @@ class Matplotlib(SetupPackage):
              libraries={"linux": ["dl"], "win32": ["comctl32", "psapi"],
                         "cygwin": ["comctl32", "psapi"]}.get(sys.platform, []),
              extra_link_args={"win32": ["-mwindows"]}.get(sys.platform, []))

graphics/py-matplotlib/pkg/PLIST

@@ -81,8 +81,6 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}backend_tool
 lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}backend_tools.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}bezier.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}bezier.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}blocking_input.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}blocking_input.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}category.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}category.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/matplotlib/${MODPY_PYCACHE}cm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -225,12 +223,9 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/${MODPY_PYCACHE}_base.$
 lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/${MODPY_PYCACHE}_secondary_axes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/${MODPY_PYCACHE}_secondary_axes.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/${MODPY_PYCACHE}_subplots.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/${MODPY_PYCACHE}_subplots.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/_axes.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/_base.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/_secondary_axes.py
-lib/python${MODPY_VERSION}/site-packages/matplotlib/axes/_subplots.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/axis.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/backend_bases.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/backend_managers.py
@@ -371,7 +366,6 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/web_backend/nbagg_u
 lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/web_backend/package.json
 lib/python${MODPY_VERSION}/site-packages/matplotlib/backends/web_backend/single_figure.html
 lib/python${MODPY_VERSION}/site-packages/matplotlib/bezier.py
-lib/python${MODPY_VERSION}/site-packages/matplotlib/blocking_input.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/category.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/cbook/
 lib/python${MODPY_VERSION}/site-packages/matplotlib/cbook/__init__.py
@@ -944,6 +938,7 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_a
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.svg
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/axis_options.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/axisbelow.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.png
@@ -1023,6 +1018,7 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_a
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/eventplot.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/eventplot.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/eventplot.svg
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/extent_units.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg
@@ -1133,6 +1129,7 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_a
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/mixed_collection.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/mixed_collection.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/mixed_collection.svg
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/mixed_errorbar_polar_caps.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/mollweide_grid.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/mollweide_grid.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/mollweide_grid.svg
@@ -1212,6 +1209,7 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_a
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/test_alpha.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/test_alpha.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/test_alpha.svg
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/test_centered_bar_label_nonlinear.svg
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/test_eventplot_defaults.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/test_eventplot_problem_kwargs.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_axes/test_loglog_nonpos.png
@@ -1262,10 +1260,12 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_b
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate2.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_pgf/pgf_xelatex.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/colorbar_shift.eps
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/coloredhatcheszerolw.eps
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/empty.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/multi_font_type3.eps
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/multi_font_type42.eps
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/scatter.eps
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/type3.eps
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/type42_without_prep.eps
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_backend_ps/useafm.eps
@@ -1471,6 +1471,8 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_i
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_image/image_interps.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_image/image_interps.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_image/image_interps.svg
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_image/image_placement.pdf
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_image/image_placement.svg
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_image/image_shift.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_image/image_shift.svg
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_image/imshow.pdf
@@ -3090,6 +3092,7 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_p
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_polar/polar_coords.svg
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_polar/polar_invertedylim.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_polar/polar_invertedylim_rorigin.png
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_polar/polar_log.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_polar/polar_negative_rmin.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_polar/polar_negative_rmin.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_polar/polar_negative_rmin.svg
@@ -3159,6 +3162,9 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_s
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_skew/skew_rects.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_skew/skew_rects.svg
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_spines/
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_spines/black_axes.pdf
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_spines/black_axes.png
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_spines/black_axes.svg
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.svg
@@ -3279,7 +3285,6 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_u
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_usetex/test_usetex.pdf
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_usetex/test_usetex.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_widgets/
-lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_widgets/check_bunch_of_radio_buttons.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/baseline_images/test_widgets/check_radio_buttons.png
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/cmr10.pfb
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tests/conftest.py
@@ -3402,6 +3407,22 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_triangulation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_triangulation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_tricontour.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_tricontour.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_trifinder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_trifinder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_triinterpolate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_triinterpolate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_tripcolor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_tripcolor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_triplot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_triplot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_trirefine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_trirefine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_tritools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}_tritools.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}triangulation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}triangulation.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}tricontour.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -3418,6 +3439,14 @@ lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}trirefin
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}trirefine.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}tritools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/${MODPY_PYCACHE}tritools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/_triangulation.py
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/_tricontour.py
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/_trifinder.py
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/_triinterpolate.py
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/_tripcolor.py
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/_triplot.py
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/_trirefine.py
+lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/_tritools.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/triangulation.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/tricontour.py
 lib/python${MODPY_VERSION}/site-packages/matplotlib/tri/trifinder.py
@@ -3459,6 +3488,35 @@ lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/axes_size.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/inset_locator.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/mpl_axes.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/parasite_axes.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/${MODPY_PYCACHE}test_axes_grid1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/${MODPY_PYCACHE}test_axes_grid1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/anchored_artists.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/anchored_direction_arrows.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/anchored_direction_arrows_many_args.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/anchored_locator_base_call.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/fill_facecolor.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/image_grid.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/image_grid_each_left_label_mode_all.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/image_grid_single_bottom_label_mode_1.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/imagegrid_cbar_mode.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/inset_axes.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/inset_locator.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/insetposition.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/inverted_zoomed_axes.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/rgb_axes.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/twin_axes_empty_and_removed.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/baseline_images/test_axes_grid1/zoomed_axes.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/conftest.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE}/
@@ -3478,8 +3536,6 @@ lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE}axisline_style.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE}axislines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE}axislines.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE}clip_path.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE}clip_path.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE}floating_axes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE}floating_axes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/${MODPY_PYCACHE}grid_finder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -3495,11 +3551,57 @@ lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/axes_rgb.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/axis_artist.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/axisline_style.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/axislines.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/clip_path.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/floating_axes.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/grid_finder.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/grid_helper_curvelinear.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/parasite_axes.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_angle_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_angle_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_axis_artist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_axis_artist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_axislines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_axislines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_floating_axes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_floating_axes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_grid_finder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_grid_finder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_grid_helper_curvelinear.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/${MODPY_PYCACHE}test_grid_helper_curvelinear.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axis_artist/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axis_artist/axis_artist.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axis_artist/axis_artist_labelbase.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axis_artist/axis_artist_ticklabels.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axis_artist/axis_artist_ticks.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axislines/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axislines/ParasiteAxesAuxTrans_meshplot.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axislines/Subplot.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axislines/SubplotZero.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axislines/axisline_style.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axislines/axisline_style_size_color.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axislines/axisline_style_tight.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_axislines/subplotzero_ylabel.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_floating_axes/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_floating_axes/curvelinear3.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_floating_axes/curvelinear4.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_grid_helper_curvelinear/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_grid_helper_curvelinear/axis_direction.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_grid_helper_curvelinear/custom_transform.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/baseline_images/test_grid_helper_curvelinear/polar_box.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/conftest.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/test_angle_helper.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/test_axis_artist.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/test_axislines.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/test_floating_axes.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/test_grid_finder.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/axisartist/tests/test_grid_helper_curvelinear.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/${MODPY_PYCACHE}/
@@ -3517,135 +3619,88 @@ lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/art3d.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/axes3d.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/axis3d.py
 lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/proj3d.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axes_grid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}test_art3d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axes_grid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}test_art3d.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axes_grid1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}test_axes3d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axes_grid1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}test_axes3d.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_angle_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}test_legend3d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_angle_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/${MODPY_PYCACHE}test_legend3d.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_axis_artist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_axis_artist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_axislines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/add_collection3d_zs_array.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_axislines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/add_collection3d_zs_scalar.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_clip_path.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/arc_pathpatch.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_clip_path.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/aspects.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_floating_axes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/aspects_adjust_box.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_floating_axes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/axes3d_cla.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_grid_finder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/axes3d_focal_length.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_grid_finder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/axes3d_isometric.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_grid_helper_curvelinear.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/axes3d_labelpad.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_axisartist_grid_helper_curvelinear.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/axes3d_ortho.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_mplot3d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/axes3d_primary_views.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/${MODPY_PYCACHE}test_mplot3d.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/axes3d_rotated.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/bar3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/bar3d_notshaded.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/bar3d_shaded.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/computed_zorder.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/anchored_direction_arrows.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/contour3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/anchored_direction_arrows_many_args.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/contour3d_extend3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/anchored_locator_base_call.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/contourf3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/fill_facecolor.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/contourf3d_fill.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/image_grid.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/equal_box_aspect.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/inset_axes.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/errorbar3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/inset_locator.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/errorbar3d_errorevery.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/inverted_zoomed_axes.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/lines3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/rgb_axes.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/minor_ticks.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/twin_axes_empty_and_removed.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/mixedsubplot.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axes_grid1/zoomed_axes.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/panecolor_rcparams.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_axis_artist/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/plot_3d_from_2d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_axis_artist/axis_artist.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/poly3dcollection_alpha.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_axis_artist/axis_artist_labelbase.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/poly3dcollection_closed.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_axis_artist/axis_artist_ticklabels.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/proj3d_axes_cube.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_axis_artist/axis_artist_ticks.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/proj3d_axes_cube_ortho.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_axislines/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/proj3d_lines_dists.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_axislines/ParasiteAxesAuxTrans_meshplot.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/quiver3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_axislines/Subplot.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/quiver3d_masked.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_axislines/SubplotZero.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/quiver3d_pivot_middle.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_clip_path/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/quiver3d_pivot_tail.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_clip_path/clip_path.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/scatter3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_floating_axes/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/scatter3d_color.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_floating_axes/curvelinear3.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/scatter3d_linewidth.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_floating_axes/curvelinear4.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/scatter_spiral.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_grid_helper_curvelinear/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/stem3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_grid_helper_curvelinear/axis_direction.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/surface3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_grid_helper_curvelinear/custom_transform.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/surface3d_masked.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_axisartist_grid_helper_curvelinear/polar_box.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/surface3d_masked_strides.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/surface3d_shaded.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/add_collection3d_zs_array.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/text3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/add_collection3d_zs_scalar.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/tricontour.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/arc_pathpatch.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/trisurf3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/aspects.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/trisurf3d_shaded.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_cla.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/voxels-alpha.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_focal_length.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/voxels-edge-style.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_isometric.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/voxels-named-colors.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_labelpad.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/voxels-rgb-data.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_ortho.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/voxels-simple.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_primary_views.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/voxels-xyz.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/axes3d_rotated.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3dzerocstride.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_notshaded.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/wireframe3dzerorstride.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/bar3d_shaded.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_legend3d/
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/computed_zorder.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_legend3d/fancy.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/contour3d.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_legend3d/legend_bar.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/contour3d_extend3d.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/baseline_images/test_legend3d/legend_plot.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/contourf3d.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/conftest.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/contourf3d_fill.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/test_art3d.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/equal_box_aspect.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/test_axes3d.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/errorbar3d.png
+lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/mplot3d/tests/test_legend3d.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/errorbar3d_errorevery.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/lines3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/minor_ticks.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/mixedsubplot.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/plot_3d_from_2d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/poly3dcollection_alpha.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/poly3dcollection_closed.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/proj3d_axes_cube.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/proj3d_axes_cube_ortho.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/proj3d_lines_dists.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_masked.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_pivot_middle.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/quiver3d_pivot_tail.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d_color.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter3d_linewidth.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/scatter_spiral.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/stem3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_masked.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_masked_strides.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/surface3d_shaded.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/text3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/tricontour.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/trisurf3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/trisurf3d_shaded.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-alpha.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-edge-style.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-named-colors.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-rgb-data.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-simple.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/voxels-xyz.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/wireframe3d.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/wireframe3dzerocstride.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/baseline_images/test_mplot3d/wireframe3dzerorstride.png
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/conftest.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_axes_grid.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_axes_grid1.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_axisartist_angle_helper.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_axisartist_axis_artist.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_axisartist_axislines.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_axisartist_clip_path.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_axisartist_floating_axes.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_axisartist_grid_finder.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-lib/python${MODPY_VERSION}/site-packages/mpl_toolkits/tests/test_mplot3d.py
 lib/python${MODPY_VERSION}/site-packages/pylab.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/
 share/examples/${MODPY_PY_PREFIX}matplotlib/README.txt
@@ -3929,13 +3984,13 @@ share/examples/${MODPY_PY_PREFIX}matplotlib/pie_and_polar_charts/pie_demo2.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pie_and_polar_charts/pie_features.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pie_and_polar_charts/polar_bar.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pie_and_polar_charts/polar_demo.py
+share/examples/${MODPY_PY_PREFIX}matplotlib/pie_and_polar_charts/polar_error_caps.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pie_and_polar_charts/polar_legend.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pie_and_polar_charts/polar_scatter.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pyplots/
 share/examples/${MODPY_PY_PREFIX}matplotlib/pyplots/README.txt
 share/examples/${MODPY_PY_PREFIX}matplotlib/pyplots/axline.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pyplots/matplotlibrc
-share/examples/${MODPY_PY_PREFIX}matplotlib/pyplots/pyplot_mathtext.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pyplots/pyplot_simple.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pyplots/pyplot_text.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/pyplots/pyplot_three.py
@@ -3983,7 +4038,7 @@ share/examples/${MODPY_PY_PREFIX}matplotlib/specialty_plots/README.txt
 share/examples/${MODPY_PY_PREFIX}matplotlib/specialty_plots/advanced_hillshading.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/specialty_plots/anscombe.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/specialty_plots/hinton_demo.py
-share/examples/${MODPY_PY_PREFIX}matplotlib/specialty_plots/leftventricle_bulleye.py
+share/examples/${MODPY_PY_PREFIX}matplotlib/specialty_plots/leftventricle_bullseye.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/specialty_plots/mri_demo.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/specialty_plots/mri_with_eeg.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/specialty_plots/radar_chart.py
@@ -4057,6 +4112,7 @@ share/examples/${MODPY_PY_PREFIX}matplotlib/subplots_axes_and_figures/gridspec_a
 share/examples/${MODPY_PY_PREFIX}matplotlib/subplots_axes_and_figures/gridspec_multicolumn.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/subplots_axes_and_figures/gridspec_nested.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/subplots_axes_and_figures/invert_axes.py
+share/examples/${MODPY_PY_PREFIX}matplotlib/subplots_axes_and_figures/mosaic.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/subplots_axes_and_figures/multiple_figs_demo.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/subplots_axes_and_figures/secondary_axis.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/subplots_axes_and_figures/share_axis_lims_views.py
@@ -4110,7 +4166,6 @@ share/examples/${MODPY_PY_PREFIX}matplotlib/text_labels_and_annotations/tex_demo
 share/examples/${MODPY_PY_PREFIX}matplotlib/text_labels_and_annotations/text_alignment.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/text_labels_and_annotations/text_commands.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/text_labels_and_annotations/text_fontdict.py
-share/examples/${MODPY_PY_PREFIX}matplotlib/text_labels_and_annotations/text_rotation.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/text_labels_and_annotations/text_rotation_relative_to_line.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/text_labels_and_annotations/titles_demo.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/text_labels_and_annotations/unicode_minus.py
@@ -4169,9 +4224,16 @@ share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/embedding_webagg_sgs
 share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/fourier_demo_wx_sgskip.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/gtk3_spreadsheet_sgskip.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/gtk4_spreadsheet_sgskip.py
+share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/images/
+share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/images/eye-symbolic.svg
+share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/images/eye.pdf
+share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/images/eye.png
+share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/images/eye.svg
+share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/images/eye_large.png
 share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/mathtext_wx_sgskip.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/mpl_with_glade3.glade
 share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/mpl_with_glade3_sgskip.py
+share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/mplcvd.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/pylab_with_gtk3_sgskip.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/pylab_with_gtk4_sgskip.py
 share/examples/${MODPY_PY_PREFIX}matplotlib/user_interfaces/svg_histogram_sgskip.py

lang/algol68g/Makefile

@@ -1,5 +1,5 @@
 COMMENT =	Algol 68 Genie compiler-interpreter
-DISTNAME =	algol68g-3.3.2
+DISTNAME =	algol68g-3.3.5
 CATEGORIES =	lang
 
 HOMEPAGE =	https://jmvdveer.home.xs4all.nl/algol.html
@@ -10,12 +10,14 @@ PERMIT_PACKAGE =	Yes
 
 MASTER_SITES =	https://jmvdveer.home.xs4all.nl/
 
-WANTLIB += c curses m pthread
+WANTLIB += c curl curses m pthread
 
 # ports-gcc used because of C99 and crashes spotted at runtime on sparc64
 COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c
 
+LIB_DEPENDS =	net/curl
+
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS =	--disable-gsl \
 			--disable-mathlib \

lang/algol68g/distinfo

@@ -1,2 +1,2 @@
-SHA256 (algol68g-3.3.2.tar.gz) = b/tkbhPrOyKkJ+rgpZ4uqLyp//RN6LU0Z+/mzdgd3t0=
+SHA256 (algol68g-3.3.5.tar.gz) = uljmrR0sdg6ZPIy711sJydgKlsh4dTdbNuDcbtezRho=
-SIZE (algol68g-3.3.2.tar.gz) = 657791
+SIZE (algol68g-3.3.5.tar.gz) = 659011

lang/lfe/Makefile

@@ -2,7 +2,7 @@ COMMENT =		Lisp Flavoured Erlang (LFE)
 
 GH_ACCOUNT =		lfe
 GH_PROJECT =		lfe
-GH_TAGNAME =		2.1.1
+GH_TAGNAME =		2.1.2
 
 CATEGORIES =		lang
 
@@ -16,7 +16,6 @@ DISTFILES +=		${GH_DISTFILE}
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/erlang
-MODERL_VERSION =	25
 MODERL_MODULES =	rebar3_proper	0.12.1 \
 			proper		1.4.0
 

lang/lfe/distinfo

@@ -1,6 +1,6 @@
 SHA256 (hex_modules/proper-1.4.0.tar) = GChYQhhb0z772pfRNKXLWgiEOE2zYRn+4OPPpIhWjLs=
 SHA256 (hex_modules/rebar3_proper-0.12.1.tar) = ZpHE0Yg1Q1eCQNFX6qnUnz67MVaJL3wyDwcIaJYjJ7g=
-SHA256 (lfe-2.1.1.tar.gz) = 5aus1X3C81fdpG2DNqQARr6Ab1xndvlWEmdsS0X21Ws=
+SHA256 (lfe-2.1.2.tar.gz) = WXQ8JJb3LyrVlYQzEfSdCe+TL/qluyYHXHnDaKOUj4A=
 SIZE (hex_modules/proper-1.4.0.tar) = 154112
 SIZE (hex_modules/rebar3_proper-0.12.1.tar) = 16384
-SIZE (lfe-2.1.1.tar.gz) = 362597
+SIZE (lfe-2.1.2.tar.gz) = 364310

mail/aerc/patches/patch-filters_colorize_c

@@ -1,4 +1,4 @@
-disable OSC 8; tcell-term has issues with it.
+disable OSC 8 sequences as our less(1) has issues with it.
 
 Index: filters/colorize.c
 --- filters/colorize.c.orig

mail/grommunio/admin-api/Makefile

@@ -2,11 +2,11 @@ COMMENT=	management REST API for grommunio
 
 V=		1.11
 DISTNAME=	grommunio-admin-api-${V}
-REVISION=	1
+REVISION=	2
 
 GH_ACCOUNT=	grommunio
 GH_PROJECT=	admin-api
-GH_COMMIT=	482afbb15728f36a857e71aad22f47855ce108b5
+GH_COMMIT=	a6e29aec67bc2143622f1a6f8609ddf3401f50ca
 
 CATEGORIES=	mail www productivity
 
@@ -21,7 +21,7 @@ RUN_DEPENDS=	databases/py-ldap3${MODPY_FLAVOR} \
 		devel/py-argcomplete${MODPY_FLAVOR} \
 		devel/py-jsonschema${MODPY_FLAVOR} \
 		mail/grommunio/gromox \
-		mail/grommunio/libexmdbpp \
+		mail/grommunio/libexmdbpp>=1.11 \
 		net/py-idna${MODPY_FLAVOR} \
 		net/py-dnspython${MODPY_FLAVOR} \
 		security/py-cryptography${MODPY_FLAVOR} \

mail/grommunio/admin-api/distinfo

@@ -1,2 +1,2 @@
-SHA256 (grommunio/grommunio-admin-api-1.11-482afbb1.tar.gz) = SyiOmx5C8/AYzrCNX3jsT9BRZXIaat9S2alnwcfSwP8=
+SHA256 (grommunio/grommunio-admin-api-1.11-a6e29aec.tar.gz) = yltCz+XFwywcjtA2UBD9VI9GjjIUqN7n7FSYAe3nh0M=
-SIZE (grommunio/grommunio-admin-api-1.11-482afbb1.tar.gz) = 258795
+SIZE (grommunio/grommunio-admin-api-1.11-a6e29aec.tar.gz) = 259484

mail/grommunio/dav/Makefile

@@ -1,12 +1,11 @@
 COMMENT=	CalDAV and CardDAV interface for grommunio
 
-V=		1.1
+V=		1.3
 DISTNAME=	grommunio-dav-${V}
-REVISION=	0
 
 GH_ACCOUNT=	grommunio
 GH_PROJECT=     grommunio-dav
-GH_COMMIT=      9976bca1a92329c499b2400adec26dd8cc07ef19
+GH_COMMIT=      a9262794cb6b27acd10943138c92a230b0742ea8
 
 DISTFILES=	${GH_DISTFILE} \
 		${GH_PROJECT}-${GH_COMMIT}-vendor.tar.gz:0
@@ -39,7 +38,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${INSTDIR}
 	cd ${WRKSRC} && pax -rw .* * ${INSTDIR}
 	mv ${INSTDIR}/config.php ${INSTDIR}/config.php.dist
-	mv ${INSTDIR}/log4php.xml ${INSTDIR}/log4php.xml.dist
+	mv ${INSTDIR}/glogger.ini ${INSTDIR}/glogger.ini.dist
 	chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 	find ${INSTDIR} -type f -and -name '.git*' -delete
 	find ${INSTDIR} -type d -and -name '.github' -exec rm -rf {} +

mail/grommunio/dav/distinfo

@@ -1,4 +1,4 @@
-SHA256 (grommunio/grommunio-dav-1.1-9976bca1.tar.gz) = Pd5rFQCSG1bN/N62kUl37IyhqN6UxNhsvopzLd2/5qU=
+SHA256 (grommunio/grommunio-dav-1.3-a9262794.tar.gz) = TVucZhKZNDwTeXl1kib88mUfFgux07+QpNJikM5hL8I=
-SHA256 (grommunio/grommunio-dav-9976bca1a92329c499b2400adec26dd8cc07ef19-vendor.tar.gz) = EkhJHnqfh//VowEfApjd5EdcnaveVTzsvMl7Qa3ylTA=
+SHA256 (grommunio/grommunio-dav-a9262794cb6b27acd10943138c92a230b0742ea8-vendor.tar.gz) = Hh/352CWf+O5xxMbMQsRoNKJflY9NMoKwFhwM0qcY88=
-SIZE (grommunio/grommunio-dav-1.1-9976bca1.tar.gz) = 49668
+SIZE (grommunio/grommunio-dav-1.3-a9262794.tar.gz) = 51128
-SIZE (grommunio/grommunio-dav-9976bca1a92329c499b2400adec26dd8cc07ef19-vendor.tar.gz) = 910704
+SIZE (grommunio/grommunio-dav-a9262794cb6b27acd10943138c92a230b0742ea8-vendor.tar.gz) = 610221

mail/grommunio/dav/patches/patch-config_php

@@ -10,10 +10,3 @@ Index: config.php
  
  // Number of items to send in one request.
  define('MAX_SYNC_ITEMS', 1000);
-@@ -24,4 +24,4 @@ define('MAX_SYNC_ITEMS', 1000);
- // Developer mode: verifies log messages
- define('DEVELOPER_MODE', true);
- 
--// Logging: adjust in log4php.xml
-\ No newline at end of file
-+// Logging: adjust in log4php.xml

mail/grommunio/dav/patches/patch-glogger_ini

@@ -0,0 +1,11 @@
+Index: glogger.ini
+--- glogger.ini.orig
++++ glogger.ini
+@@ -1,5 +1,5 @@
+ ; Available log levels: FATAL ERROR WARN INFO DEBUG TRACE
+-level = TRACE
+-file = "/var/log/grommunio-dav/dav.log"
++level = INFO
++file = "../logs/grommunio-dav/dav.log"
+ timeFormat = "d.m.Y H:i:s"
+ lineFormat = "%datetime% [%extra.process_id%] [%level_name%] %channel% %message%\n"

mail/grommunio/dav/patches/patch-log4php_xml

@@ -1,20 +0,0 @@
-Index: log4php.xml
---- log4php.xml.orig
-+++ log4php.xml
-@@ -4,7 +4,7 @@
-         <layout class="LoggerLayoutPattern">
-             <param name="conversionPattern" value="%date{d.m.Y H:i:s} [%5pid] [%-5level] %4logger %msg%n" />
-         </layout>
--	<param name="file" value="/var/log/grommunio-dav/dav.log" />
-+	<param name="file" value="../logs/grommunio-dav/dav.log" />
-         <param name="append" value="true" />
-     </appender>
-     <root>
-@@ -12,6 +12,6 @@
- 
-         <!-- Possible values from least to most granular:
-              FATAL, ERROR, WARN, INFO, DEBUG, TRACE -->
--        <level value="TRACE" />
-+        <level value="INFO" />
-     </root>
- </configuration>

mail/grommunio/dav/patches/patch-vendor_autoload_php

@@ -10,4 +10,4 @@ Index: vendor/autoload.php
 +
  require_once __DIR__ . '/composer/autoload_real.php';
  
- return ComposerAutoloaderInite7a02ea966e359790e81bd7430324527::getLoader();
+ return ComposerAutoloaderInit2702ec2a5742b1162f093c8e12b5dc60::getLoader();

mail/grommunio/dav/patches/patch-vendor_composer_autoload_classmap_php

@@ -1,7 +1,7 @@
 Index: vendor/composer/autoload_classmap.php
 --- vendor/composer/autoload_classmap.php.orig
 +++ vendor/composer/autoload_classmap.php
-@@ -6,10 +6,10 @@ $vendorDir = dirname(__DIR__);
+@@ -6,13 +6,13 @@ $vendorDir = dirname(__DIR__);
  $baseDir = dirname($vendorDir);
  
  return array(
@@ -11,19 +11,12 @@ Index: vendor/composer/autoload_classmap.php
 +    'BaseRecurrence' => UMAPI_PATH . '/class.baserecurrence.php',
      'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
 -    'FreeBusy' => '/var/www/grommunio-mapi-header-php/class.freebusy.php',
-+    'FreeBusy' => UMAPI_PATH . '/class.freebusy.php',
-     'Logger' => $vendorDir . '/apache/log4php/src/main/php/Logger.php',
-     'LoggerAppender' => $vendorDir . '/apache/log4php/src/main/php/LoggerAppender.php',
-     'LoggerAppenderConsole' => $vendorDir . '/apache/log4php/src/main/php/appenders/LoggerAppenderConsole.php',
-@@ -89,9 +89,9 @@ return array(
-     'LoggerRoot' => $vendorDir . '/apache/log4php/src/main/php/LoggerRoot.php',
-     'LoggerThrowableInformation' => $vendorDir . '/apache/log4php/src/main/php/LoggerThrowableInformation.php',
-     'LoggerUtils' => $vendorDir . '/apache/log4php/src/main/php/helpers/LoggerUtils.php',
 -    'MAPIException' => '/var/www/grommunio-mapi-header-php/class.mapiexception.php',
 -    'Meetingrequest' => '/var/www/grommunio-mapi-header-php/class.meetingrequest.php',
 -    'Recurrence' => '/var/www/grommunio-mapi-header-php/class.recurrence.php',
 -    'TaskRecurrence' => '/var/www/grommunio-mapi-header-php/class.taskrecurrence.php',
 -    'TaskRequest' => '/var/www/grommunio-mapi-header-php/class.taskrequest.php',
++    'FreeBusy' => UMAPI_PATH . '/class.freebusy.php',
 +    'MAPIException' => UMAPI_PATH . '/class.mapiexception.php',
 +    'Meetingrequest' => UMAPI_PATH . '/class.meetingrequest.php',
 +    'Recurrence' => UMAPI_PATH . '/class.recurrence.php',

mail/grommunio/dav/patches/patch-vendor_composer_autoload_files_php

@@ -1,8 +1,8 @@
 Index: vendor/composer/autoload_files.php
 --- vendor/composer/autoload_files.php.orig
 +++ vendor/composer/autoload_files.php
-@@ -15,8 +15,8 @@ return array(
+@@ -16,8 +16,8 @@ return array(
-     'ebdb698ed4152ae445614b69b5e4bb6a' => $vendorDir . '/sabre/http/lib/functions.php',
+     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
      '777dc149d682152f9ab0caaeffcdbb27' => $baseDir . '/config.php',
      '32a4f751fbcde8755e5f28bd96eed397' => $baseDir . '/version.php',
 -    'b05b0d0a4f97d8e7b104a9a31ac2ca03' => '/var/www/grommunio-mapi-header-php/mapi.util.php',

mail/grommunio/dav/patches/patch-vendor_composer_autoload_static_php

@@ -1,8 +1,8 @@
 Index: vendor/composer/autoload_static.php
 --- vendor/composer/autoload_static.php.orig
 +++ vendor/composer/autoload_static.php
-@@ -16,10 +16,10 @@ class ComposerStaticInite7a02ea966e359790e81bd74303245
+@@ -17,10 +17,10 @@ class ComposerStaticInit2702ec2a5742b1162f093c8e12b5dc
-         'ebdb698ed4152ae445614b69b5e4bb6a' => __DIR__ . '/..' . '/sabre/http/lib/functions.php',
+         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
          '777dc149d682152f9ab0caaeffcdbb27' => __DIR__ . '/../..' . '/config.php',
          '32a4f751fbcde8755e5f28bd96eed397' => __DIR__ . '/../..' . '/version.php',
 -        'b05b0d0a4f97d8e7b104a9a31ac2ca03' => '/var/www/grommunio-mapi-header-php/mapi.util.php',
@@ -16,7 +16,7 @@ Index: vendor/composer/autoload_static.php
      );
  
      public static $prefixLengthsPsr4 = array (
-@@ -93,10 +93,10 @@ class ComposerStaticInite7a02ea966e359790e81bd74303245
+@@ -107,15 +107,15 @@ class ComposerStaticInit2702ec2a5742b1162f093c8e12b5dc
      );
  
      public static $classMap = array (
@@ -26,19 +26,12 @@ Index: vendor/composer/autoload_static.php
 +        'BaseRecurrence' => UMAPI_PATH . '/class.baserecurrence.php',
          'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
 -        'FreeBusy' => '/var/www/grommunio-mapi-header-php/class.freebusy.php',
-+        'FreeBusy' => UMAPI_PATH . '/class.freebusy.php',
-         'Logger' => __DIR__ . '/..' . '/apache/log4php/src/main/php/Logger.php',
-         'LoggerAppender' => __DIR__ . '/..' . '/apache/log4php/src/main/php/LoggerAppender.php',
-         'LoggerAppenderConsole' => __DIR__ . '/..' . '/apache/log4php/src/main/php/appenders/LoggerAppenderConsole.php',
-@@ -176,11 +176,11 @@ class ComposerStaticInite7a02ea966e359790e81bd74303245
-         'LoggerRoot' => __DIR__ . '/..' . '/apache/log4php/src/main/php/LoggerRoot.php',
-         'LoggerThrowableInformation' => __DIR__ . '/..' . '/apache/log4php/src/main/php/LoggerThrowableInformation.php',
-         'LoggerUtils' => __DIR__ . '/..' . '/apache/log4php/src/main/php/helpers/LoggerUtils.php',
 -        'MAPIException' => '/var/www/grommunio-mapi-header-php/class.mapiexception.php',
 -        'Meetingrequest' => '/var/www/grommunio-mapi-header-php/class.meetingrequest.php',
 -        'Recurrence' => '/var/www/grommunio-mapi-header-php/class.recurrence.php',
 -        'TaskRecurrence' => '/var/www/grommunio-mapi-header-php/class.taskrecurrence.php',
 -        'TaskRequest' => '/var/www/grommunio-mapi-header-php/class.taskrequest.php',
++        'FreeBusy' => UMAPI_PATH . '/class.freebusy.php',
 +        'MAPIException' => UMAPI_PATH . '/class.mapiexception.php',
 +        'Meetingrequest' => UMAPI_PATH . '/class.meetingrequest.php',
 +        'Recurrence' => UMAPI_PATH . '/class.recurrence.php',

mail/grommunio/dav/pkg/PLIST

@@ -4,20 +4,21 @@ grommunio-dav/.scrutinizer.yml
 grommunio-dav/LICENSE
 grommunio-dav/README.rst
 grommunio-dav/build/
-grommunio-dav/build/fpm-grommunio-dav.conf
+grommunio-dav/build/grommunio-dav-upstream.conf
+grommunio-dav/build/grommunio-dav.conf
 grommunio-dav/build/grommunio-dav.lr
-grommunio-dav/build/nginx-grommunio-dav-upstream.conf
+grommunio-dav/build/pool-grommunio-dav.conf
-grommunio-dav/build/nginx-grommunio-dav.conf
 grommunio-dav/build/sysuser.conf
 grommunio-dav/composer.json
 grommunio-dav/composer.lock
 grommunio-dav/config.php.dist
 @sample grommunio-dav/config.php
+grommunio-dav/glogger.ini.dist
+@sample grommunio-dav/glogger.ini
 grommunio-dav/lib/
 grommunio-dav/lib/AuthBasicBackend.php
 grommunio-dav/lib/DAVACL.php
 grommunio-dav/lib/GLogger.php
-grommunio-dav/lib/GPSR3Logger.php
 grommunio-dav/lib/GrommunioCalDavBackend.php
 grommunio-dav/lib/GrommunioCardDavBackend.php
 grommunio-dav/lib/GrommunioDavBackend.php
@@ -25,10 +26,9 @@ grommunio-dav/lib/GrommunioIMipPlugin.php
 grommunio-dav/lib/GrommunioSchedulePlugin.php
 grommunio-dav/lib/GrommunioSyncState.php
 grommunio-dav/lib/MapiProps.php
+grommunio-dav/lib/MonologWrapper.php
 grommunio-dav/lib/PHPWrapper.php
 grommunio-dav/lib/PrincipalsBackend.php
-grommunio-dav/log4php.xml.dist
-@sample grommunio-dav/log4php.xml
 grommunio-dav/phpunit.xml
 grommunio-dav/server.php
 grommunio-dav/tests/
@@ -36,353 +36,6 @@ grommunio-dav/tests/grommunio-dav/
 grommunio-dav/tests/grommunio-dav/GrommunioCardDavBackendTest.php
 grommunio-dav/tests/grommunio-dav/GrommunioDavBackendTest.php
 grommunio-dav/vendor/
-grommunio-dav/vendor/apache/
-grommunio-dav/vendor/apache/log4php/
-grommunio-dav/vendor/apache/log4php/CHANGELOG
-grommunio-dav/vendor/apache/log4php/INSTALL
-grommunio-dav/vendor/apache/log4php/LICENSE
-grommunio-dav/vendor/apache/log4php/NOTICE
-grommunio-dav/vendor/apache/log4php/README
-grommunio-dav/vendor/apache/log4php/apigen.neon
-grommunio-dav/vendor/apache/log4php/build.xml
-grommunio-dav/vendor/apache/log4php/composer.json
-grommunio-dav/vendor/apache/log4php/doap_log4php.rdf
-grommunio-dav/vendor/apache/log4php/package-config.php
-grommunio-dav/vendor/apache/log4php/package.php
-grommunio-dav/vendor/apache/log4php/phpdoc.xml
-grommunio-dav/vendor/apache/log4php/phpunit.xml
-grommunio-dav/vendor/apache/log4php/pom.xml
-grommunio-dav/vendor/apache/log4php/src/
-grommunio-dav/vendor/apache/log4php/src/assembly/
-grommunio-dav/vendor/apache/log4php/src/assembly/src.xml
-grommunio-dav/vendor/apache/log4php/src/changes/
-grommunio-dav/vendor/apache/log4php/src/changes/changes.xml
-grommunio-dav/vendor/apache/log4php/src/examples/
-grommunio-dav/vendor/apache/log4php/src/examples/php/
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_console.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_dailyfile.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_echo.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_file.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_firephp.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_mail.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_mailevent.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_mongodb.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_null.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_pdo.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_php.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_rollingfile.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_socket.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_socket_server.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/appender_syslog.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/cache.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/configurator_basic.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/configurator_php.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/configurator_xml.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/filter_denyall.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/filter_levelmatch.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/filter_levelrange.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/filter_stringmatch.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/layout_html.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/layout_pattern.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/layout_simple.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/layout_ttcc.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/layout_xml.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/mdc.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/ndc.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/renderer_default.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/renderer_map.php
-grommunio-dav/vendor/apache/log4php/src/examples/php/simple.php
-grommunio-dav/vendor/apache/log4php/src/examples/resources/
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_console.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_dailyfile.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_echo.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_file.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_firephp.xml
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_mail.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_mailevent.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_mongodb.xml
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_null.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_pdo.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_php.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_rollingfile.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_socket.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_socket_server.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/appender_syslog.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/cache.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/configurator_php.php
-grommunio-dav/vendor/apache/log4php/src/examples/resources/configurator_xml.xml
-grommunio-dav/vendor/apache/log4php/src/examples/resources/filter_denyall.xml
-grommunio-dav/vendor/apache/log4php/src/examples/resources/filter_levelmatch.xml
-grommunio-dav/vendor/apache/log4php/src/examples/resources/filter_levelrange.xml
-grommunio-dav/vendor/apache/log4php/src/examples/resources/filter_stringmatch.xml
-grommunio-dav/vendor/apache/log4php/src/examples/resources/layout_html.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/layout_pattern.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/layout_simple.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/layout_ttcc.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/layout_xml.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/mdc.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/ndc.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/renderer_default.properties
-grommunio-dav/vendor/apache/log4php/src/examples/resources/renderer_map.properties
-grommunio-dav/vendor/apache/log4php/src/main/
-grommunio-dav/vendor/apache/log4php/src/main/php/
-grommunio-dav/vendor/apache/log4php/src/main/php/Logger.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerAppender.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerAppenderPool.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerAutoloader.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerConfigurable.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerConfigurator.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerException.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerFilter.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerHierarchy.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerLayout.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerLevel.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerLocationInfo.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerLoggingEvent.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerMDC.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerNDC.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerReflectionUtils.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerRoot.php
-grommunio-dav/vendor/apache/log4php/src/main/php/LoggerThrowableInformation.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderConsole.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderDailyFile.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderEcho.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderFile.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderFirePHP.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderMail.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderMailEvent.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderMongoDB.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderNull.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderPDO.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderPhp.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderRollingFile.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderSocket.php
-grommunio-dav/vendor/apache/log4php/src/main/php/appenders/LoggerAppenderSyslog.php
-grommunio-dav/vendor/apache/log4php/src/main/php/configurators/
-grommunio-dav/vendor/apache/log4php/src/main/php/configurators/LoggerConfigurationAdapter.php
-grommunio-dav/vendor/apache/log4php/src/main/php/configurators/LoggerConfigurationAdapterINI.php
-grommunio-dav/vendor/apache/log4php/src/main/php/configurators/LoggerConfigurationAdapterPHP.php
-grommunio-dav/vendor/apache/log4php/src/main/php/configurators/LoggerConfigurationAdapterXML.php
-grommunio-dav/vendor/apache/log4php/src/main/php/configurators/LoggerConfiguratorDefault.php
-grommunio-dav/vendor/apache/log4php/src/main/php/filters/
-grommunio-dav/vendor/apache/log4php/src/main/php/filters/LoggerFilterDenyAll.php
-grommunio-dav/vendor/apache/log4php/src/main/php/filters/LoggerFilterLevelMatch.php
-grommunio-dav/vendor/apache/log4php/src/main/php/filters/LoggerFilterLevelRange.php
-grommunio-dav/vendor/apache/log4php/src/main/php/filters/LoggerFilterStringMatch.php
-grommunio-dav/vendor/apache/log4php/src/main/php/helpers/
-grommunio-dav/vendor/apache/log4php/src/main/php/helpers/LoggerFormattingInfo.php
-grommunio-dav/vendor/apache/log4php/src/main/php/helpers/LoggerOptionConverter.php
-grommunio-dav/vendor/apache/log4php/src/main/php/helpers/LoggerPatternParser.php
-grommunio-dav/vendor/apache/log4php/src/main/php/helpers/LoggerUtils.php
-grommunio-dav/vendor/apache/log4php/src/main/php/layouts/
-grommunio-dav/vendor/apache/log4php/src/main/php/layouts/LoggerLayoutHtml.php
-grommunio-dav/vendor/apache/log4php/src/main/php/layouts/LoggerLayoutPattern.php
-grommunio-dav/vendor/apache/log4php/src/main/php/layouts/LoggerLayoutSerialized.php
-grommunio-dav/vendor/apache/log4php/src/main/php/layouts/LoggerLayoutSimple.php
-grommunio-dav/vendor/apache/log4php/src/main/php/layouts/LoggerLayoutTTCC.php
-grommunio-dav/vendor/apache/log4php/src/main/php/layouts/LoggerLayoutXml.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverter.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterClass.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterCookie.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterDate.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterEnvironment.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterFile.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterLevel.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterLine.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterLiteral.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterLocation.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterLogger.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterMDC.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterMessage.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterMethod.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterNDC.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterNewLine.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterProcess.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterRelative.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterRequest.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterServer.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterSession.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterSessionID.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterSuperglobal.php
-grommunio-dav/vendor/apache/log4php/src/main/php/pattern/LoggerPatternConverterThrowable.php
-grommunio-dav/vendor/apache/log4php/src/main/php/renderers/
-grommunio-dav/vendor/apache/log4php/src/main/php/renderers/LoggerRenderer.php
-grommunio-dav/vendor/apache/log4php/src/main/php/renderers/LoggerRendererDefault.php
-grommunio-dav/vendor/apache/log4php/src/main/php/renderers/LoggerRendererException.php
-grommunio-dav/vendor/apache/log4php/src/main/php/renderers/LoggerRendererMap.php
-grommunio-dav/vendor/apache/log4php/src/main/php/xml/
-grommunio-dav/vendor/apache/log4php/src/main/php/xml/log4php.dtd
-grommunio-dav/vendor/apache/log4php/src/site/
-grommunio-dav/vendor/apache/log4php/src/site/apt/
-grommunio-dav/vendor/apache/log4php/src/site/apt/contributingpatches.apt
-grommunio-dav/vendor/apache/log4php/src/site/apt/download.apt
-grommunio-dav/vendor/apache/log4php/src/site/apt/index.apt
-grommunio-dav/vendor/apache/log4php/src/site/apt/privacy-policy.apt
-grommunio-dav/vendor/apache/log4php/src/site/apt/volunteering.apt
-grommunio-dav/vendor/apache/log4php/src/site/cse.xml
-grommunio-dav/vendor/apache/log4php/src/site/resources/
-grommunio-dav/vendor/apache/log4php/src/site/resources/css/
-grommunio-dav/vendor/apache/log4php/src/site/resources/css/bootstrap.css
-grommunio-dav/vendor/apache/log4php/src/site/resources/css/bootstrap.min.css
-grommunio-dav/vendor/apache/log4php/src/site/resources/css/site.css
-grommunio-dav/vendor/apache/log4php/src/site/resources/images/
-grommunio-dav/vendor/apache/log4php/src/site/resources/images/collapsed.gif
-grommunio-dav/vendor/apache/log4php/src/site/resources/images/expanded.gif
-grommunio-dav/vendor/apache/log4php/src/site/resources/images/logos/
-grommunio-dav/vendor/apache/log4php/src/site/resources/images/logos/ls-logo.jpg
-grommunio-dav/vendor/apache/log4php/src/site/resources/images/logos/maven-feather.png
-grommunio-dav/vendor/apache/log4php/src/site/resources/img/
-grommunio-dav/vendor/apache/log4php/src/site/resources/img/glyphicons-halflings-white.png
-grommunio-dav/vendor/apache/log4php/src/site/resources/img/glyphicons-halflings.png
-grommunio-dav/vendor/apache/log4php/src/site/resources/js/
-grommunio-dav/vendor/apache/log4php/src/site/resources/js/bootstrap.js
-grommunio-dav/vendor/apache/log4php/src/site/resources/js/bootstrap.min.js
-grommunio-dav/vendor/apache/log4php/src/site/resources/js/jquery.js
-grommunio-dav/vendor/apache/log4php/src/site/resources/js/jquery.min.js
-grommunio-dav/vendor/apache/log4php/src/site/resources/js/prettify.js
-grommunio-dav/vendor/apache/log4php/src/site/resources/js/prettify.min.js
-grommunio-dav/vendor/apache/log4php/src/site/resources/js/site.js
-grommunio-dav/vendor/apache/log4php/src/site/site.vm
-grommunio-dav/vendor/apache/log4php/src/site/site.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/changelog.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/console.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/daily-file.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/echo.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/file.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/firephp.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/mail-event.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/mail.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/mongodb.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/null.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/pdo.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/php.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/rolling-file.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/socket.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/appenders/syslog.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/configuration.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/filters.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/introduction.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/layouts/
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/layouts.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/layouts/html.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/layouts/pattern.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/layouts/serialized.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/layouts/simple.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/layouts/ttcc.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/layouts/xml.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/loggers.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/docs/renderers.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/install.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/privacy.xml
-grommunio-dav/vendor/apache/log4php/src/site/xdoc/quickstart.xml
-grommunio-dav/vendor/apache/log4php/src/test/
-grommunio-dav/vendor/apache/log4php/src/test/config/
-grommunio-dav/vendor/apache/log4php/src/test/config/phpunit_to_surefire.xslt
-grommunio-dav/vendor/apache/log4php/src/test/php/
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerAppenderPoolTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerAppenderTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerConfiguratorTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerExceptionTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerFilterTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerHierarchyTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerLevelTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerLoggingEventTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerMDCTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerNDCTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerReflectionUtilsTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerRootTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerTestHelper.php
-grommunio-dav/vendor/apache/log4php/src/test/php/LoggerThrowableInformationTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/README
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderConsoleTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderDailyFileTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderEchoTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderFileTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderFirephpTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderMailEventTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderMailTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderMongoDBTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderNullTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderPDOTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderPhpTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderRollingFileTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderSocketTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/LoggerAppenderSyslogTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/appenders/socketServer.php
-grommunio-dav/vendor/apache/log4php/src/test/php/bootstrap.php
-grommunio-dav/vendor/apache/log4php/src/test/php/configurators/
-grommunio-dav/vendor/apache/log4php/src/test/php/configurators/LoggerConfigurationAdapterINITest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/configurators/LoggerConfigurationAdapterPHPTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/configurators/LoggerConfigurationAdapterXMLTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/filters/
-grommunio-dav/vendor/apache/log4php/src/test/php/filters/LoggerFilterDenyAllTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/filters/LoggerFilterLevelMatchTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/filters/LoggerFilterLevelRangeTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/filters/LoggerFilterStringMatchTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/helpers/
-grommunio-dav/vendor/apache/log4php/src/test/php/helpers/LoggerOptionConverterTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/helpers/LoggerPatternParserTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/helpers/LoggerUtilsTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/layouts/
-grommunio-dav/vendor/apache/log4php/src/test/php/layouts/LoggerLayoutHtmlTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/layouts/LoggerLayoutPatternTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/layouts/LoggerLayoutSerializedTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/layouts/LoggerLayoutSimpleTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/layouts/LoggerLayoutTTCCTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/layouts/LoggerLayoutXmlTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/pattern/
-grommunio-dav/vendor/apache/log4php/src/test/php/pattern/LoggerPatternConverterTest.php
-grommunio-dav/vendor/apache/log4php/src/test/php/renderers/
-grommunio-dav/vendor/apache/log4php/src/test/php/renderers/LoggerRendererMapTest.php
-grommunio-dav/vendor/apache/log4php/src/test/resources/
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/ini/
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/ini/config_invalid_appender_declaration_1.ini
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/ini/config_invalid_appender_declaration_2.ini
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/ini/config_invalid_syntax.ini
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/ini/config_valid.ini
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/ini/values.ini
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/php/
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/php/config_empty.php
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/php/config_invalid_syntax.php
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/php/config_not_an_array.php
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/php/config_valid.php
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/xml/
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/xml/config_duplicate_logger.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/xml/config_duplicate_renderer.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/xml/config_invalid_syntax.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/xml/config_valid.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/adapters/xml/config_valid_underscore.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/config_invalid_appender_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/config_invalid_filter_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/config_invalid_filter_parameters.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/config_invalid_layout_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/config_no_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/config_no_layout_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/config_not_existing_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/config_not_existing_filter_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/appenders/config_not_existing_layout_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/config.yml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/config1.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/loggers/
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/loggers/config_invalid_additivity.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/loggers/config_not_existing_appenders.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/renderers/
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/renderers/config_default_renderer.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/renderers/config_invalid_rendering_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/renderers/config_no_rendered_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/renderers/config_no_rendering_class.xml
-grommunio-dav/vendor/apache/log4php/src/test/resources/configs/renderers/config_not_existing_rendering_class.xml
 grommunio-dav/vendor/autoload.php
 grommunio-dav/vendor/bin/
 grommunio-dav/vendor/bin/generate_vcards
@@ -402,6 +55,139 @@ grommunio-dav/vendor/composer/autoload_static.php
 grommunio-dav/vendor/composer/installed.json
 grommunio-dav/vendor/composer/installed.php
 grommunio-dav/vendor/composer/platform_check.php
+grommunio-dav/vendor/monolog/
+grommunio-dav/vendor/monolog/monolog/
+grommunio-dav/vendor/monolog/monolog/CHANGELOG.md
+grommunio-dav/vendor/monolog/monolog/LICENSE
+grommunio-dav/vendor/monolog/monolog/README.md
+grommunio-dav/vendor/monolog/monolog/UPGRADE.md
+grommunio-dav/vendor/monolog/monolog/composer.json
+grommunio-dav/vendor/monolog/monolog/src/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Attribute/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/DateTimeImmutable.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/ElasticsearchFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/GoogleCloudLoggingFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/LogmaticFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/Curl/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/ElasticaHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/ElasticsearchHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FallbackGroupHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/Handler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/LogmaticHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/NoopHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/OverflowHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/ProcessHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/RedisPubSubHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SendGridHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/Slack/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SqsHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SymfonyMailerHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/TelegramBotHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/WebRequestRecognizerTrait.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/LogRecord.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Logger.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/HostnameProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Registry.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/ResettableInterface.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/SignalHandler.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Test/
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Test/TestCase.php
+grommunio-dav/vendor/monolog/monolog/src/Monolog/Utils.php
 grommunio-dav/vendor/psr/
 grommunio-dav/vendor/psr/log/
 grommunio-dav/vendor/psr/log/LICENSE
@@ -957,4 +743,12 @@ grommunio-dav/vendor/sabre/xml/lib/Version.php
 grommunio-dav/vendor/sabre/xml/lib/Writer.php
 grommunio-dav/vendor/sabre/xml/lib/XmlDeserializable.php
 grommunio-dav/vendor/sabre/xml/lib/XmlSerializable.php
+grommunio-dav/vendor/symfony/
+grommunio-dav/vendor/symfony/polyfill-ctype/
+grommunio-dav/vendor/symfony/polyfill-ctype/Ctype.php
+grommunio-dav/vendor/symfony/polyfill-ctype/LICENSE
+grommunio-dav/vendor/symfony/polyfill-ctype/README.md
+grommunio-dav/vendor/symfony/polyfill-ctype/bootstrap.php
+grommunio-dav/vendor/symfony/polyfill-ctype/bootstrap80.php
+grommunio-dav/vendor/symfony/polyfill-ctype/composer.json
 grommunio-dav/version.php

mail/grommunio/gromox/Makefile

@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS=	${LLD_ARCHS}
 COMMENT-main=	groupware server backend with RPC, IMAP, POP3 support
 COMMENT-mapi=	gromox MAPI extensions for PHP
 
-V=		2.10
+V=		2.11
 DISTNAME=	gromox-${V}
 
 PKGNAME-main=	gromox-core-${V}
@@ -12,7 +12,7 @@ PKGNAME-mapi=	gromox-mapi-${V}
 
 GH_ACCOUNT=	grommunio
 GH_PROJECT=	gromox
-GH_COMMIT=	993d421a768d52716b2368fbf8432c0501ba42df
+GH_COMMIT=	ae30bb006ae05f8e4694056c1c2d120d04fc7cc3
 
 CATEGORIES=	mail www productivity
 

mail/grommunio/gromox/distinfo

@@ -1,2 +1,2 @@
-SHA256 (grommunio/gromox-2.10-993d421a.tar.gz) = mfVzrc1Ai0LnZymnD7LUzGbUqpQidivvSYMMQYi/0KM=
+SHA256 (grommunio/gromox-2.11-ae30bb00.tar.gz) = +l+/S6KqwukngoaGlSvWcpcC484LWM7xZqc0STvscR0=
-SIZE (grommunio/gromox-2.10-993d421a.tar.gz) = 1675107
+SIZE (grommunio/gromox-2.11-ae30bb00.tar.gz) = 1680837

mail/grommunio/gromox/patches/patch-configure_ac

@@ -0,0 +1,48 @@
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -107,25 +107,25 @@ PKG_CHECK_MODULES([sqlite], [sqlite3])
+ PKG_CHECK_MODULES([ssl], [libssl])
+ PKG_CHECK_MODULES([tinyxml], [tinyxml2 >= 8])
+ PKG_CHECK_MODULES([vmime], [vmime >= 0.9.2])
+-AC_MSG_CHECKING([for vmime >= 0.9.2+git160])
+-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+-	#include <string>
+-	#include <vmime/net/transport.hpp>
+-	#include <vmime/utility/inputStreamStringAdapter.hpp>
+-	int main() {
+-		using namespace vmime;
+-		using namespace vmime::net;
+-		std::string ct;
+-		utility::inputStreamStringAdapter ad(ct);
+-		mailbox mb;
+-		transport *xp;
+-		utility::progressListener *pr;
+-		xp->send(mb, mailboxList{}, ad, ct.size(), pr, mb, transport::sendOptions{});
+-	}
+-])], [AC_MSG_RESULT([yes])], [
+-	AC_MSG_RESULT([no])
+-	AC_MSG_ERROR([vmime is still too old. See doc/install.rst.])
+-])
++#AC_MSG_CHECKING([for vmime >= 0.9.2+git160])
++#AC_COMPILE_IFELSE([AC_LANG_SOURCE([
++#	#include <string>
++#	#include <vmime/net/transport.hpp>
++#	#include <vmime/utility/inputStreamStringAdapter.hpp>
++#	int main() {
++#		using namespace vmime;
++#		using namespace vmime::net;
++#		std::string ct;
++#		utility::inputStreamStringAdapter ad(ct);
++#		mailbox mb;
++#		transport *xp;
++#		utility::progressListener *pr;
++#		xp->send(mb, mailboxList{}, ad, ct.size(), pr, mb, transport::sendOptions{});
++#	}
++#])], [AC_MSG_RESULT([yes])], [
++#	AC_MSG_RESULT([no])
++#	AC_MSG_ERROR([vmime is still too old. See doc/install.rst.])
++#])
+ PKG_CHECK_MODULES([xml2], [libxml-2.0])
+ PKG_CHECK_MODULES([xxhash], [libxxhash >= 0.7], [have_xxhash=1], [have_xxhash=0])
+ PKG_CHECK_MODULES([zlib], [zlib])

mail/grommunio/gromox/patches/patch-exch_dnsbl_filter_cpp

@@ -1,17 +1,16 @@
 Index: exch/dnsbl_filter.cpp
 --- exch/dnsbl_filter.cpp.orig
 +++ exch/dnsbl_filter.cpp
-@@ -7,11 +7,13 @@
+@@ -7,12 +7,12 @@
  #endif
  #include <cerrno>
  #include <cstring>
 -#include <resolv.h>
  #include <string>
  #include <arpa/inet.h>
+ #include <arpa/nameser.h>
  #include <libHX/string.h>
-+#include <sys/types.h>
  #include <netinet/in.h>
-+#include <arpa/nameser.h>
 +#include <resolv.h>
  #include <gromox/config_file.hpp>
  #include <gromox/scope.hpp>

mail/grommunio/gromox/patches/patch-lib_mapi_rop_util_cpp

@@ -0,0 +1,12 @@
+Index: lib/mapi/rop_util.cpp
+--- lib/mapi/rop_util.cpp.orig
++++ lib/mapi/rop_util.cpp
+@@ -195,7 +195,7 @@ time_t rop_util_nttime_to_unix(uint64_t nt_time)
+ }
+ 
+ gromox::time_point rop_util_nttime_to_unix2(uint64_t nt_time)
+-{return gromox::time_point(nt_dur(nt_time)-nt_offset);}
++{return gromox::time_point(std::chrono::duration_cast<time_point::duration>(nt_dur(nt_time)-nt_offset));}
+ 
+ time_t rop_util_rtime_to_unix(uint32_t t)
+ {

mail/grommunio/gromox/pkg/PLIST-main

@@ -164,6 +164,7 @@ man/man4/mysql_adaptor.4gx
 man/man4/pam_gromox.4gx
 man/man4/timer_agent.4gx
 man/man4/user_filter.4gx
+@man man/man5/gromox-selinux.5
 @man man/man5/gromox.cfg.5
 @man man/man7/gromox.7
 man/man7/mapi.7gx
@@ -667,7 +668,6 @@ share/gromox/c1a-2.abkt
 share/gromox/c1a-200.abkt
 share/gromox/c1a-3.abkt
 share/gromox/c1a-6.abkt
-share/gromox/codepage_lang.json
 share/gromox/cpid.txt
 share/gromox/exmdb_list.txt
 share/gromox/folder_names.txt

mail/grommunio/libexmdbpp/Makefile

@@ -1,6 +1,6 @@
 COMMENT=	C++ implementation of the exmdb wire protocol for grommunio
 
-V=		1.10
+V=		1.11
 DISTNAME=	libexmdbpp-${V}
 
 SHARED_LIBS+=	exmdbpp	0.0 # 0.0

mail/grommunio/libexmdbpp/distinfo

@@ -1,2 +1,2 @@
-SHA256 (grommunio/libexmdbpp-1.10-cea6069b.tar.gz) = e4NyT8mhccvP0Xm8bPkQy5HuM4bfkY3hjlHNQztd0CI=
+SHA256 (grommunio/libexmdbpp-1.11-cea6069b.tar.gz) = e4NyT8mhccvP0Xm8bPkQy5HuM4bfkY3hjlHNQztd0CI=
-SIZE (grommunio/libexmdbpp-1.10-cea6069b.tar.gz) = 85387
+SIZE (grommunio/libexmdbpp-1.11-cea6069b.tar.gz) = 85387

mail/grommunio/mapi-header-php/Makefile

@@ -2,10 +2,11 @@ COMMENT=	grommunio PHP MAPI headers
 
 V=		1.1
 DISTNAME=	grommunio-mapi-header-php-${V}
+REVISION=	0
 
 GH_ACCOUNT=	grommunio
 GH_PROJECT=     mapi-header-php
-GH_COMMIT=	389f0cf6b438f55a698c849af3771f5e349a2937
+GH_COMMIT=	18b40f9701e08026713286c4c80dd2e765ae032c
 
 CATEGORIES=	mail www
 

mail/grommunio/mapi-header-php/distinfo

@@ -1,2 +1,2 @@
-SHA256 (grommunio/grommunio-mapi-header-php-1.1-389f0cf6.tar.gz) = 1XAbWxb4WNVC9C1QhO+4PWaJMpSQexJkbng3VehWXb4=
+SHA256 (grommunio/grommunio-mapi-header-php-1.1-18b40f97.tar.gz) = FOuhuHg2fK2NDSF0l5T5OYc1PMQtgRspQR+pc70dImo=
-SIZE (grommunio/grommunio-mapi-header-php-1.1-389f0cf6.tar.gz) = 103834
+SIZE (grommunio/grommunio-mapi-header-php-1.1-18b40f97.tar.gz) = 104054

mail/grommunio/sync/Makefile

@@ -2,11 +2,11 @@ COMMENT=	EAS (Exchange ActiveSync) interface for grommunio
 
 V=		2.0
 DISTNAME=	grommunio-sync-${V}
-REVISION=	0
+REVISION=	1
 
 GH_ACCOUNT=	grommunio
 GH_PROJECT=     grommunio-sync
-GH_COMMIT=      cba7b39980146c0cb6dc9eb8b1a05998708ad4f8
+GH_COMMIT=      313dd0285dcd53849b2444df524d0e54b4e4ca07
 
 DISTFILES=	${GH_DISTFILE} \
 		${GH_PROJECT}-${GH_COMMIT}-vendor.tar.gz:0

mail/grommunio/sync/distinfo

@@ -1,4 +1,4 @@
-SHA256 (grommunio/grommunio-sync-2.0-cba7b399.tar.gz) = 09HiXi8fru6UsRnCTltwkw1MPPE3Hxj7C8BFCBPn++o=
+SHA256 (grommunio/grommunio-sync-2.0-313dd028.tar.gz) = Uaec9vLf3PyILB5IjOKasresd06UGKx/i/5OJgfuZ2A=
-SHA256 (grommunio/grommunio-sync-cba7b39980146c0cb6dc9eb8b1a05998708ad4f8-vendor.tar.gz) = Y+qyljjso/u3LbjH8erxBsK1XCUwbyvzpsArD7NrYLQ=
+SHA256 (grommunio/grommunio-sync-313dd0285dcd53849b2444df524d0e54b4e4ca07-vendor.tar.gz) = ekXBbFuY5WmXdW3c5aJ3MbZL1mnhJ/9jfwm5IBThbVo=
-SIZE (grommunio/grommunio-sync-2.0-cba7b399.tar.gz) = 312491
+SIZE (grommunio/grommunio-sync-2.0-313dd028.tar.gz) = 312431
-SIZE (grommunio/grommunio-sync-cba7b39980146c0cb6dc9eb8b1a05998708ad4f8-vendor.tar.gz) = 11544
+SIZE (grommunio/grommunio-sync-313dd0285dcd53849b2444df524d0e54b4e4ca07-vendor.tar.gz) = 11667

mail/grommunio/web/Makefile

@@ -2,11 +2,11 @@ COMMENT=	web user interface for grommunio
 
 V=		3.2
 DISTNAME=	grommunio-web-${V}
-REVISION=	3
+REVISION=	4
 
 GH_ACCOUNT=	grommunio
 GH_PROJECT=     grommunio-web
-GH_COMMIT=      f037827a7574b1fe1566191c817b7f98ab46ac78
+GH_COMMIT=      dddd22913a541c08cfcf08846c4b1ce3af067bd7
 
 CATEGORIES=	mail www
 

mail/grommunio/web/distinfo

@@ -1,2 +1,2 @@
-SHA256 (grommunio/grommunio-web-3.2-f037827a.tar.gz) = Fpxn20smUVeJ541w86KrDHofo7Ynk4fPiXMaETEAWhI=
+SHA256 (grommunio/grommunio-web-3.2-dddd2291.tar.gz) = pXMHa68FLjYM+vo5BYREWbbVudDcIdwmBmzMtbujkNE=
-SIZE (grommunio/grommunio-web-3.2-f037827a.tar.gz) = 27326338
+SIZE (grommunio/grommunio-web-3.2-dddd2291.tar.gz) = 27325889

misc/screen/Makefile

@@ -1,6 +1,6 @@
 COMMENT=	multi-screen window manager
 
-DISTNAME=	screen-4.9.0
+DISTNAME=	screen-4.9.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=screen/}
 
@@ -9,7 +9,7 @@ HOMEPAGE=	https://www.gnu.org/software/screen/
 # GPLv3+
 PERMIT_PACKAGE=	Yes
 
-AUTOCONF_VERSION=2.69
+AUTOCONF_VERSION=2.71
 CONFIGURE_STYLE=autoconf
 CONFIGURE_ARGS=	--with-sys-screenrc="${SYSCONFDIR}/screenrc"
 
@@ -30,11 +30,11 @@ ALL_TARGET=	screen screen.info
 DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
 pre-build:
-	@${SUBST_CMD} ${WRKSRC}/doc/screen.1
+	${SUBST_CMD} ${WRKSRC}/doc/screen.1
 
 post-install:
-	@cd ${PREFIX}/bin && mv -f screen-* screen
+	cd ${PREFIX}/bin && mv -f screen-* screen
-	@chmod 755 ${PREFIX}/bin/screen
+	chmod 755 ${PREFIX}/bin/screen
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
 		${PREFIX}/share/examples/screen/screenrc

misc/screen/distinfo

@@ -1,2 +1,2 @@
-SHA256 (screen-4.9.0.tar.gz) = +TNSgbtNFTjtB433iiDC8506+aTpHFfQhCceAonHMPQ=
+SHA256 (screen-4.9.1.tar.gz) = Js7z48QlccDUhK1vrxEMXBUJH7+HKwb6eqR2bHQFrGk=
-SIZE (screen-4.9.0.tar.gz) = 798229
+SIZE (screen-4.9.1.tar.gz) = 1040785

misc/screen/patches/patch-configure_ac

@@ -13,7 +13,7 @@ Index: configure.ac
  ])dnl
  dnl
  define(AC_NOTE,
-@@ -362,7 +362,7 @@ main()
+@@ -385,7 +385,7 @@ int main()
  ], AC_NOTE(- your fifos are usable) fifo=1,
  AC_NOTE(- your fifos are not usable),
  AC_NOTE(- skipping check because we are cross compiling; assuming fifos are usable) fifo=1)
@@ -22,7 +22,7 @@ Index: configure.ac
  
  if test -n "$fifo"; then
  AC_CHECKING(for broken fifo implementation)
-@@ -411,7 +411,7 @@ main()
+@@ -436,7 +436,7 @@ main()
  ], AC_NOTE(- your implementation is ok), 
  AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1,
  AC_NOTE(- skipping check because we are cross compiling; assuming fifo implementation is ok))
@@ -31,7 +31,7 @@ Index: configure.ac
  fi
  
  dnl
-@@ -474,7 +474,7 @@ main()
+@@ -503,7 +503,7 @@ main()
  ], AC_NOTE(- your sockets are usable) sock=1,
  AC_NOTE(- your sockets are not usable),
  AC_NOTE(- skipping check because we are cross compiling; assuming sockets are usable) sock=1)
@@ -40,7 +40,7 @@ Index: configure.ac
  
  if test -n "$sock"; then
  AC_CHECKING(socket implementation)
-@@ -514,7 +514,7 @@ main()
+@@ -546,7 +546,7 @@ main()
  AC_NOTE(- unix domain sockets are not kept in the filesystem)
  AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1,
  AC_NOTE(- skipping check because we are cross compiling; assuming sockets are normal))
@@ -49,11 +49,3 @@ Index: configure.ac
  fi
  
  
-@@ -619,6 +619,7 @@ main()
- ],AC_NOTE(- select is ok),
- AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN),
- AC_NOTE(- skipping check because we are cross compiling; assuming select is ok))
-+rm -f /tmp/conftest$$
- 
- dnl
- dnl    ****  termcap or terminfo  ****

misc/screen/patches/patch-doc_screen_1

@@ -37,7 +37,7 @@ Index: doc/screen.1
  The option \*Q\-n\*U may be used to suppress the line feed.
  See also \*Qsleep\*U.
  Echo is also useful for online checking of environment variables.
-@@ -5205,12 +5205,12 @@ Examples in the 
+@@ -5212,12 +5212,12 @@ Examples in the 
  .I screen
  distribution package for private and global initialization files.
  .IP $SYSSCREENRC 
@@ -52,7 +52,7 @@ Index: doc/screen.1
  .IP $SCREENDIR/S\-<login>
  .IP /local/screens/S\-<login>
  Socket directories (default)
-@@ -5231,7 +5231,7 @@ Output log files created by the log function
+@@ -5238,7 +5238,7 @@ Output log files created by the log function
  or
  .IP /etc/termcap
  Terminal capability databases
@@ -61,7 +61,7 @@ Index: doc/screen.1
  Login records
  .IP $LOCKPRG
  Program that locks a terminal.
-@@ -5356,9 +5356,9 @@ does not make use of hardware tabs.
+@@ -5365,9 +5365,9 @@ does not make use of hardware tabs.
  must be installed as set-uid with owner root on most systems in order
  to be able to correctly change the owner of the tty device file for
  each window.

misc/screen/patches/patch-doc_screen_texinfo

@@ -0,0 +1,21 @@
+./screen.texinfo:2403: Node `Window Settings' lacks menu item for `Mousetrack' despite being its Up target.
+
+Index: doc/screen.texinfo
+--- doc/screen.texinfo.orig
++++ doc/screen.texinfo
+@@ -2416,6 +2416,7 @@ terminal emulation itself.
+ * Monitor::                     Watch for activity or inactivity in a window
+ * Windows::			List the active windows
+ * Hardstatus::			Set a window's hardstatus line
++* Mousetrack::			Set whether screen should track mouse events.
+ @end menu
+ 
+ @node Naming Windows, Console,  , Window Settings
+@@ -5147,7 +5148,6 @@ categories.
+ * Backtick::			Program a command for a backtick string escape.
+ * Screen Saver::		Define a screen safer.
+ * Zmodem::			Define how screen treats zmodem requests.
+-* Mousetrack::			Set whether screen should track mouse events.
+ @end menu
+ 
+ @node At, Break,  , Miscellaneous

net/miniflux/Makefile

@@ -1,10 +1,11 @@
 COMMENT =	minimalist and opinionated feed reader
 
-MODGO_MODNAME =	miniflux.app
+V =		2.0.47
-MODGO_VERSION =	v0.0.0-20230722010713-4a4c309da01e
 
-DISTNAME =	miniflux.app-${MODGO_VERSION}
+MODGO_MODNAME =	miniflux.app/v2
-V =		2.0.46.20230722
+MODGO_VERSION =	v${V}
+
+DISTNAME =	${MODGO_MODNAME}-${MODGO_VERSION}
 PKGNAME =	miniflux-${V}
 
 CATEGORIES =	net www
@@ -20,7 +21,7 @@ MODULES =		lang/go
 
 ALL_TARGET =		${MODGO_MODNAME}/...
 
-MODGO_LDFLAGS +=	-X miniflux.app/version.Version=${V}
+MODGO_LDFLAGS +=	-X miniflux.app/v2/internal/version.Version=${V}
 
 SUBST_VARS =		VARBASE \
 			SYSCONFDIR

net/miniflux/distinfo

@@ -65,8 +65,8 @@ SHA256 (go_modules/github.com/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.
 SHA256 (go_modules/github.com/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.zip) = 8a+jakvQvwmhKQ86/vlUBY4zTWsnWq5qWR2NrSdvXi8=
 SHA256 (go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.4.mod) = VwnvZ7EkgagjGOBaaOvQW3UmgHT0vBQYdwmr4WE8TPk=
 SHA256 (go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.4.zip) = C0SquqmupdKOZnhJrU2YITUUZsNZHde+3bLQJdttVfI=
-SHA256 (go_modules/github.com/mccutchen/go-httpbin/v2/@v/v2.10.0.mod) = rSI0ZJKMyGmIZPDwGqjDg/qj80ZKRO1gphjoX17Z20E=
+SHA256 (go_modules/github.com/mccutchen/go-httpbin/v2/@v/v2.11.0.mod) = rSI0ZJKMyGmIZPDwGqjDg/qj80ZKRO1gphjoX17Z20E=
-SHA256 (go_modules/github.com/mccutchen/go-httpbin/v2/@v/v2.10.0.zip) = fF8yQyoV9nMmqdgpISZMfVLclNxNK6u1AjMXX4QGBcE=
+SHA256 (go_modules/github.com/mccutchen/go-httpbin/v2/@v/v2.11.0.zip) = PwgmMCBsmRG3dElFRPN8uof4N5ZIwnQpmxv0JjTAPeg=
 SHA256 (go_modules/github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod) = J6Xp8FxxCJtv1eEZ/ByM6B8MFtpOwzVxV7HYXiuoWuI=
 SHA256 (go_modules/github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip) = ke9JWZvsRZhp2U/z3sEohxq2a9LfphBB8eEWn5tKgHM=
 SHA256 (go_modules/github.com/modern-go/reflect2/@v/v1.0.2.mod) = CZ7ljsIQFVKAaS+eI2D1IycuUl8GJydUvnoqRNv6BiM=
@@ -97,11 +97,10 @@ SHA256 (go_modules/github.com/stretchr/testify/@v/v1.6.1.mod) = //gWjZjmoHFWxFSh
 SHA256 (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = //gWjZjmoHFWxFShtuklUJ8xd+lsFVUW1/lrQHnMo78=
 SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = 4HYHTBVgrR3amLiwD+pjCMS2zNBt3QiNIttGJu1o9zg=
 SHA256 (go_modules/github.com/stretchr/testify/@v/v1.8.0.zip) = 2ICt9ElEkSC0WaIiD1OcaWSP15fe1bdFzzrdYOyECB4=
-SHA256 (go_modules/github.com/tdewolff/minify/v2/@v/v2.12.7.mod) = yNTp6bPARI2qnIdrPZPztZV1qS4iXctUOoKCYP5LqsI=
+SHA256 (go_modules/github.com/tdewolff/minify/v2/@v/v2.12.8.mod) = T9BNuxMFHyLCTvVv7CxFKYWV9l5ArnAhAU/cwWMCnWU=
-SHA256 (go_modules/github.com/tdewolff/minify/v2/@v/v2.12.7.zip) = Ukwqt5yop0YSjcX6F44JDV0NarVytnJCYmnRFsVgBhY=
+SHA256 (go_modules/github.com/tdewolff/minify/v2/@v/v2.12.8.zip) = L+iF16rFDghpb7rZW7C9WgBtSkzAYjBlbOL/YVUdrQI=
-SHA256 (go_modules/github.com/tdewolff/parse/v2/@v/v2.6.6.mod) = a1woS+NCCtGbfGAk6ZMyEqPTShal6JzrezGvMiwclb0=
+SHA256 (go_modules/github.com/tdewolff/parse/v2/@v/v2.6.7.mod) = ozTfCi3SOOt1ZRhUVd2Cyqwlln1wqaXIL7dqzPKvUm4=
-SHA256 (go_modules/github.com/tdewolff/parse/v2/@v/v2.6.6.zip) = jgVIdVtxehymORfMW6VdQNOFxCQD1RAkXNQ0ETgQDds=
+SHA256 (go_modules/github.com/tdewolff/parse/v2/@v/v2.6.7.zip) = lG202KRj9Dy4XhXCJ5k5oEmzo9iYwe1/aQ5U8cRrVbs=
-SHA256 (go_modules/github.com/tdewolff/test/@v/v1.0.7.mod) = wqX9LTkh+DUgtd0Jn6IPouMxmxHCOnP9yzMf/wVrBEA=
 SHA256 (go_modules/github.com/tdewolff/test/@v/v1.0.9.mod) = wqX9LTkh+DUgtd0Jn6IPouMxmxHCOnP9yzMf/wVrBEA=
 SHA256 (go_modules/github.com/tdewolff/test/@v/v1.0.9.zip) = PcVfYpylim3YEIprmTJUhF/vid1gAgBx9a2Jibk8JD0=
 SHA256 (go_modules/github.com/technoweenie/multipartstreamer/@v/v1.0.1.mod) = 49OxNJJgB3tcgPSDJhj2DgSCjbVRX4Z3ymwmGcdW3Ig=
@@ -109,13 +108,13 @@ SHA256 (go_modules/github.com/technoweenie/multipartstreamer/@v/v1.0.1.zip) = Wp
 SHA256 (go_modules/github.com/xhit/go-str2duration/@v/v1.2.0.mod) = 78SvQrm5705uK5QCRMPAE2Jve3xTgCS2OOEQ21stkDQ=
 SHA256 (go_modules/github.com/xhit/go-str2duration/@v/v1.2.0.zip) = h999qe2aSKLaaz3xTTOlZ6nm7SRU5MvWlLqn7ILKfsE=
 SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM=
-SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.5.4.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM=
+SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.5.6.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM=
-SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.5.4.zip) = fkMw29C2fv+Oux5c1ojfRI8QDAZ+oL2o7lVO8uoT094=
+SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.5.6.zip) = 8T3al3tMzYR9Gra2t5t1eC6aJZ63tUfk8vooxZQwrEQ=
 SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0=
 SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod) = OrnwH0YQ/ns5vYXWjo2XglNR5+KCw5zaQUV8KidvO+M=
 SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod) = zWMRYSoqpNDX4DxBs6ofvC1fiVqz9hCJ+rgL/p+PVIU=
-SHA256 (go_modules/golang.org/x/crypto/@v/v0.11.0.mod) = /LuJS63Wnh6BujaHj6iLkNrV7nA9X1UGnUtfokABl0M=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.12.0.mod) = E5IvYZekDrnn/Aa1z1b11eQRlR8ZxZ++x7hTJHagMsY=
-SHA256 (go_modules/golang.org/x/crypto/@v/v0.11.0.zip) = MEIrNTJoevBifO0PikhVAERGfbBm/QHEDtyCqRsr4/Y=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.12.0.zip) = KbeIvY8SKSFK+DG/mUEqCdGQlt6jxivDKBZWtkCT0S0=
 SHA256 (go_modules/golang.org/x/mod/@v/v0.10.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
 SHA256 (go_modules/golang.org/x/mod/@v/v0.10.0.zip) = +HZHOsJ/HG47D/+XHIT7689nDbCz6PKB4DFJ/PY2/iU=
 SHA256 (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = QtGQI/+PLq5wC8VJXzcezZmKItGbqYXQr19pkAslQIM=
@@ -127,12 +126,12 @@ SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) =
 SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20210916014120-12bc252f5db8.mod) = +pFfXQIs+wy4Zaou4306d0G0BvhOtKg3hi4pzGmrTvQ=
 SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20220722155237-a158d28d115b.mod) = sxXFJkfS2i925c2502fh1nJ3hCNqm/+2EhkrGbEKEo0=
 SHA256 (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 07fiNv8J5jIr5IkXAhbgGNMiGGLxoFPctj5T6rhTPBc=
-SHA256 (go_modules/golang.org/x/net/@v/v0.12.0.mod) = CBr+VirQKbz5pSjq2tofIQ11qqN7UXc+3ns+qx0rwOk=
+SHA256 (go_modules/golang.org/x/net/@v/v0.14.0.mod) = J5QJ9uHSLmOn4Mk3QOYvDhLmTVOnzEi6MpGYxDOCvRI=
-SHA256 (go_modules/golang.org/x/net/@v/v0.12.0.zip) = LETX9g4l4xViFDeOb81QDdt7SYcJn2e4clhktUZtm7g=
+SHA256 (go_modules/golang.org/x/net/@v/v0.14.0.zip) = /dXKVlNkS2XZBicF7K5wsVZmBUf5bUYGZZlg/gwFOHE=
 SHA256 (go_modules/golang.org/x/net/@v/v0.7.0.mod) = Qex26iFy8+4wMeOPmlNZOaWE1rs170gIVP3LjCAmcBs=
 SHA256 (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 6275vWQFrOPZnkOB0CVs5B+Dxm0aILTigwpMd2JF9xo=
-SHA256 (go_modules/golang.org/x/oauth2/@v/v0.10.0.mod) = s4hCz9tuhBBjsKNTKodPXdmOO4In4wHuVbJWgmAomQk=
+SHA256 (go_modules/golang.org/x/oauth2/@v/v0.11.0.mod) = ErhfdqpriKyeB4FHaajsCzrPQDKXe6xAXgAfBk+/uYc=
-SHA256 (go_modules/golang.org/x/oauth2/@v/v0.10.0.zip) = HoE5J3aRH1GgWM4QryHpzjysbmBp8Oy5E+kOHb6McbI=
+SHA256 (go_modules/golang.org/x/oauth2/@v/v0.11.0.zip) = Bvm8Z3drq6eK5EN0T4RsGT5o13WzM5tjB4jMoDiC3ac=
 SHA256 (go_modules/golang.org/x/oauth2/@v/v0.5.0.mod) = PQc+kZagqQK85eW3Ub194hB6A1ifWUWPI0pLfFIHDV8=
 SHA256 (go_modules/golang.org/x/oauth2/@v/v0.6.0.mod) = J62Hdx96jQGEbuqn20CaFBnZZPiuyi4P4pro0eHF7f4=
 SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
@@ -148,19 +147,18 @@ SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod) =
 SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
 SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
 SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220908164124-27713097b956.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
 SHA256 (go_modules/golang.org/x/sys/@v/v0.10.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.10.0.zip) = 31J9Nlf5nYZIjJSz9f0kc557FI0BnNcpVEYiQ+CvMvY=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.11.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.11.0.zip) = DQP00ao7KOyA4gBeyDAQBOIVPjFUkRuuv1e5z6kA+ZM=
 SHA256 (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
 SHA256 (go_modules/golang.org/x/sys/@v/v0.8.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
 SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = TLqxT3cGdxsnHZlaGzzBMf5aJGqtx+5tG6bwvYlHgfo=
 SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = dAeU4pFPXMh+JWVsWEMiKyxlZlghIF9FYyoEd8jT95s=
-SHA256 (go_modules/golang.org/x/term/@v/v0.10.0.mod) = 20Bl6yQTonHCo7PHHIqKogt3+hhZU9lmT6qHrJWpnYE=
+SHA256 (go_modules/golang.org/x/term/@v/v0.11.0.mod) = NLAXNBj7P7d+reCs0AufATPZqfNKXD6Rj/Ifat91I78=
-SHA256 (go_modules/golang.org/x/term/@v/v0.10.0.zip) = vUXo4dzUvqCS8Igaod8+Ry2xDDoAK7i6EmhXyyS21y4=
+SHA256 (go_modules/golang.org/x/term/@v/v0.11.0.zip) = 2aeez7kIMz8D1/P0tZdVGmkWRixsXQQFKMmIfflWYA4=
 SHA256 (go_modules/golang.org/x/term/@v/v0.5.0.mod) = DW9YIoqtwaZSjmdV2gGFFlZuOuXFIB963hdz9W+o2TQ=
-SHA256 (go_modules/golang.org/x/text/@v/v0.11.0.mod) = FR5qGDlJHEtQ3+nDNFHwYyjVUYvY7koAYd4Ct60zL7I=
+SHA256 (go_modules/golang.org/x/text/@v/v0.12.0.mod) = FR5qGDlJHEtQ3+nDNFHwYyjVUYvY7koAYd4Ct60zL7I=
-SHA256 (go_modules/golang.org/x/text/@v/v0.11.0.zip) = YvTCT/Fq4W3avykOFsiWceskyu7IG/rIgTTAHTz3V6g=
+SHA256 (go_modules/golang.org/x/text/@v/v0.12.0.zip) = Q3p4fH+SvLiy8quX/NdM6IteelshqimekPXF3Sintm8=
 SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.mod) = NoedWG/YAB6E2oeHGQoR5PeHSeKoHf6Lm2kxiZ//Mc8=
 SHA256 (go_modules/golang.org/x/text/@v/v0.3.2.mod) = bDx63ysK1xQ9kT9GmNGQhCI2ml5vGYYg+X8+UvmhuN0=
 SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI=
@@ -194,7 +192,7 @@ SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) = IVeYYKIDBvz0OxvSNNH7oxlJnHd
 SHA256 (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = qrj7xOYwDqCOav4crqGKIckMefSJ9SxT4vIEMfGpoBU=
 SHA256 (go_modules/mvdan.cc/xurls/v2/@v/v2.5.0.mod) = JaaqDMOKAOz/km2vfiH95k+pESDtUtDeu5XLFhWcCZQ=
 SHA256 (go_modules/mvdan.cc/xurls/v2/@v/v2.5.0.zip) = rMhwwY8KELdTgl7872PtzbE6nJsVQZaVuq/xw5nJNWI=
-SHA256 (miniflux.app-v0.0.0-20230722010713-4a4c309da01e.zip) = 1hBxmkFTWhGrfXKHBduxdCfPdKwimx3HrQObaRukA2Y=
+SHA256 (miniflux.app/v2-v2.0.47.zip) = Bjxkx1+G5CuCePVtnQOkR+AOCaaOVqBzkoX860jqsp4=
 SIZE (go_modules/cloud.google.com/go/compute/@v/v1.20.1.mod) = 1093
 SIZE (go_modules/cloud.google.com/go/compute/@v/v1.20.1.zip) = 1707819
 SIZE (go_modules/cloud.google.com/go/compute/metadata/@v/v0.2.3.mod) = 98
@@ -262,8 +260,8 @@ SIZE (go_modules/github.com/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.mo
 SIZE (go_modules/github.com/matryer/try/@v/v0.0.0-20161228173917-9ac251b645a2.zip) = 4444
 SIZE (go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.4.mod) = 178
 SIZE (go_modules/github.com/matttproud/golang_protobuf_extensions/@v/v1.0.4.zip) = 45223
-SIZE (go_modules/github.com/mccutchen/go-httpbin/v2/@v/v2.10.0.mod) = 51
+SIZE (go_modules/github.com/mccutchen/go-httpbin/v2/@v/v2.11.0.mod) = 51
-SIZE (go_modules/github.com/mccutchen/go-httpbin/v2/@v/v2.10.0.zip) = 133838
+SIZE (go_modules/github.com/mccutchen/go-httpbin/v2/@v/v2.11.0.zip) = 136497
 SIZE (go_modules/github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod) = 39
 SIZE (go_modules/github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip) = 10936
 SIZE (go_modules/github.com/modern-go/reflect2/@v/v1.0.2.mod) = 46
@@ -294,11 +292,10 @@ SIZE (go_modules/github.com/stretchr/testify/@v/v1.6.1.mod) = 216
 SIZE (go_modules/github.com/stretchr/testify/@v/v1.7.0.mod) = 216
 SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.0.mod) = 188
 SIZE (go_modules/github.com/stretchr/testify/@v/v1.8.0.zip) = 113507
-SIZE (go_modules/github.com/tdewolff/minify/v2/@v/v2.12.7.mod) = 438
+SIZE (go_modules/github.com/tdewolff/minify/v2/@v/v2.12.8.mod) = 452
-SIZE (go_modules/github.com/tdewolff/minify/v2/@v/v2.12.7.zip) = 7093003
+SIZE (go_modules/github.com/tdewolff/minify/v2/@v/v2.12.8.zip) = 7093800
-SIZE (go_modules/github.com/tdewolff/parse/v2/@v/v2.6.6.mod) = 86
+SIZE (go_modules/github.com/tdewolff/parse/v2/@v/v2.6.7.mod) = 86
-SIZE (go_modules/github.com/tdewolff/parse/v2/@v/v2.6.6.zip) = 138502
+SIZE (go_modules/github.com/tdewolff/parse/v2/@v/v2.6.7.zip) = 139988
-SIZE (go_modules/github.com/tdewolff/test/@v/v1.0.7.mod) = 41
 SIZE (go_modules/github.com/tdewolff/test/@v/v1.0.9.mod) = 41
 SIZE (go_modules/github.com/tdewolff/test/@v/v1.0.9.zip) = 4073
 SIZE (go_modules/github.com/technoweenie/multipartstreamer/@v/v1.0.1.mod) = 49
@@ -306,13 +303,13 @@ SIZE (go_modules/github.com/technoweenie/multipartstreamer/@v/v1.0.1.zip) = 5193
 SIZE (go_modules/github.com/xhit/go-str2duration/@v/v1.2.0.mod) = 48
 SIZE (go_modules/github.com/xhit/go-str2duration/@v/v1.2.0.zip) = 5709
 SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 41
-SIZE (go_modules/github.com/yuin/goldmark/@v/v1.5.4.mod) = 41
+SIZE (go_modules/github.com/yuin/goldmark/@v/v1.5.6.mod) = 41
-SIZE (go_modules/github.com/yuin/goldmark/@v/v1.5.4.zip) = 231642
+SIZE (go_modules/github.com/yuin/goldmark/@v/v1.5.6.zip) = 235297
 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = 88
 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod) = 146
 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod) = 247
-SIZE (go_modules/golang.org/x/crypto/@v/v0.11.0.mod) = 190
+SIZE (go_modules/golang.org/x/crypto/@v/v0.12.0.mod) = 190
-SIZE (go_modules/golang.org/x/crypto/@v/v0.11.0.zip) = 1784008
+SIZE (go_modules/golang.org/x/crypto/@v/v0.12.0.zip) = 1785968
 SIZE (go_modules/golang.org/x/mod/@v/v0.10.0.mod) = 84
 SIZE (go_modules/golang.org/x/mod/@v/v0.10.0.zip) = 162521
 SIZE (go_modules/golang.org/x/mod/@v/v0.6.0-dev.0.20220419223038-86c51ed26bb4.mod) = 157
@@ -324,12 +321,12 @@ SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod) = 1
 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20210916014120-12bc252f5db8.mod) = 179
 SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20220722155237-a158d28d115b.mod) = 179
 SIZE (go_modules/golang.org/x/net/@v/v0.10.0.mod) = 123
-SIZE (go_modules/golang.org/x/net/@v/v0.12.0.mod) = 155
+SIZE (go_modules/golang.org/x/net/@v/v0.14.0.mod) = 155
-SIZE (go_modules/golang.org/x/net/@v/v0.12.0.zip) = 1712326
+SIZE (go_modules/golang.org/x/net/@v/v0.14.0.zip) = 1781193
 SIZE (go_modules/golang.org/x/net/@v/v0.7.0.mod) = 123
 SIZE (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 123
-SIZE (go_modules/golang.org/x/oauth2/@v/v0.10.0.mod) = 358
+SIZE (go_modules/golang.org/x/oauth2/@v/v0.11.0.mod) = 358
-SIZE (go_modules/golang.org/x/oauth2/@v/v0.10.0.zip) = 189990
+SIZE (go_modules/golang.org/x/oauth2/@v/v0.11.0.zip) = 137428
 SIZE (go_modules/golang.org/x/oauth2/@v/v0.5.0.mod) = 308
 SIZE (go_modules/golang.org/x/oauth2/@v/v0.6.0.mod) = 308
 SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod) = 25
@@ -345,19 +342,18 @@ SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod) = 3
 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 33
 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 33
 SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220908164124-27713097b956.mod) = 33
 SIZE (go_modules/golang.org/x/sys/@v/v0.10.0.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.10.0.zip) = 1902132
+SIZE (go_modules/golang.org/x/sys/@v/v0.11.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.11.0.zip) = 1906917
 SIZE (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 33
 SIZE (go_modules/golang.org/x/sys/@v/v0.8.0.mod) = 33
 SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95
 SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = 95
-SIZE (go_modules/golang.org/x/term/@v/v0.10.0.mod) = 68
+SIZE (go_modules/golang.org/x/term/@v/v0.11.0.mod) = 68
-SIZE (go_modules/golang.org/x/term/@v/v0.10.0.zip) = 19958
+SIZE (go_modules/golang.org/x/term/@v/v0.11.0.zip) = 19958
 SIZE (go_modules/golang.org/x/term/@v/v0.5.0.mod) = 67
-SIZE (go_modules/golang.org/x/text/@v/v0.11.0.mod) = 197
+SIZE (go_modules/golang.org/x/text/@v/v0.12.0.mod) = 197
-SIZE (go_modules/golang.org/x/text/@v/v0.11.0.zip) = 9237183
+SIZE (go_modules/golang.org/x/text/@v/v0.12.0.zip) = 9237331
 SIZE (go_modules/golang.org/x/text/@v/v0.3.0.mod) = 25
 SIZE (go_modules/golang.org/x/text/@v/v0.3.2.mod) = 88
 SIZE (go_modules/golang.org/x/text/@v/v0.3.3.mod) = 97
@@ -391,4 +387,4 @@ SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.mod) = 95
 SIZE (go_modules/gopkg.in/yaml.v3/@v/v3.0.1.zip) = 104623
 SIZE (go_modules/mvdan.cc/xurls/v2/@v/v2.5.0.mod) = 140
 SIZE (go_modules/mvdan.cc/xurls/v2/@v/v2.5.0.zip) = 33829
-SIZE (miniflux.app-v0.0.0-20230722010713-4a4c309da01e.zip) = 843363
+SIZE (miniflux.app/v2-v2.0.47.zip) = 847603

net/miniflux/modules.inc

@@ -28,7 +28,7 @@ MODGO_MODULES =	\
 	github.com/matrix-org/gomatrix				 v0.0.0-20220926102614-ceba4d9f7530 \
 	github.com/matryer/try					 v0.0.0-20161228173917-9ac251b645a2 \
 	github.com/matttproud/golang_protobuf_extensions	 v1.0.4 \
-	github.com/mccutchen/go-httpbin/v2			 v2.10.0 \
+	github.com/mccutchen/go-httpbin/v2			 v2.11.0 \
 	github.com/modern-go/concurrent				 v0.0.0-20180306012644-bacd9c7ef1dd \
 	github.com/modern-go/reflect2				 v1.0.2 \
 	github.com/mwitkow/go-conntrack				 v0.0.0-20190716064945-2f068394615f \
@@ -42,20 +42,20 @@ MODGO_MODULES =	\
 	github.com/spf13/pflag					 v1.0.5 \
 	github.com/stretchr/objx				 v0.1.0 \
 	github.com/stretchr/testify				 v1.8.0 \
-	github.com/tdewolff/minify/v2				 v2.12.7 \
+	github.com/tdewolff/minify/v2				 v2.12.8 \
-	github.com/tdewolff/parse/v2				 v2.6.6 \
+	github.com/tdewolff/parse/v2				 v2.6.7 \
 	github.com/tdewolff/test				 v1.0.9 \
 	github.com/technoweenie/multipartstreamer		 v1.0.1 \
 	github.com/xhit/go-str2duration				 v1.2.0 \
-	github.com/yuin/goldmark				 v1.5.4 \
+	github.com/yuin/goldmark				 v1.5.6 \
-	golang.org/x/crypto					 v0.11.0 \
+	golang.org/x/crypto					 v0.12.0 \
 	golang.org/x/mod					 v0.10.0 \
-	golang.org/x/net					 v0.12.0 \
+	golang.org/x/net					 v0.14.0 \
-	golang.org/x/oauth2					 v0.10.0 \
+	golang.org/x/oauth2					 v0.11.0 \
 	golang.org/x/sync					 v0.2.0 \
-	golang.org/x/sys					 v0.10.0 \
+	golang.org/x/sys					 v0.11.0 \
-	golang.org/x/term					 v0.10.0 \
+	golang.org/x/term					 v0.11.0 \
-	golang.org/x/text					 v0.11.0 \
+	golang.org/x/text					 v0.12.0 \
 	golang.org/x/tools					 v0.6.0 \
 	golang.org/x/xerrors					 v0.0.0-20191204190536-9bdfabe68543 \
 	google.golang.org/appengine				 v1.6.7 \
@@ -79,7 +79,6 @@ MODGO_MODFILES =	\
 	github.com/prometheus/procfs		 v0.8.0 \
 	github.com/stretchr/testify		 v1.6.1 \
 	github.com/stretchr/testify		 v1.7.0 \
-	github.com/tdewolff/test		 v1.0.7 \
 	github.com/yuin/goldmark		 v1.4.13 \
 	golang.org/x/crypto			 v0.0.0-20190308221718-c2843e01d9a2 \
 	golang.org/x/crypto			 v0.0.0-20190911031432-227b76d455e7 \
@@ -108,9 +107,8 @@ MODGO_MODFILES =	\
 	golang.org/x/sys			 v0.0.0-20210615035016-665e8c7367d1 \
 	golang.org/x/sys			 v0.0.0-20220520151302-bc2c85ada10a \
 	golang.org/x/sys			 v0.0.0-20220722155257-8c9f86f7a55f \
-	golang.org/x/sys			 v0.0.0-20220908164124-27713097b956 \
+	golang.org/x/sys			 v0.10.0 \
 	golang.org/x/sys			 v0.5.0 \
-	golang.org/x/sys			 v0.6.0 \
 	golang.org/x/sys			 v0.8.0 \
 	golang.org/x/term			 v0.0.0-20201126162022-7de9c90e9dd1 \
 	golang.org/x/term			 v0.0.0-20210927222741-03fcf44c2211 \

net/mosquitto/Makefile

@@ -1,8 +1,7 @@
 COMMENT =		opensource MQTT broker
 
-V =			2.0.15
+V =			2.0.17
 DISTNAME =		mosquitto-$V
-REVISION =		0
 
 SHARED_LIBS +=  mosquitto                 2.1 # 1.5
 SHARED_LIBS +=  mosquittopp               2.0 # 1.5
@@ -40,7 +39,8 @@ CFLAGS +=		-I${LOCALBASE}/include
 TEST_DEPENDS=		${MODPY_RUN_DEPENDS} \
 			${BUILD_PKGPATH}-=$V \
 			devel/cunit \
-			devel/gmake
+			devel/gmake \
+			sysutils/py-psutil${MODPY_FLAVOR}
 
 pre-test:
 	ln -fs ${WRKBUILD}/src/mosquitto ${WRKSRC}/src/

net/mosquitto/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mosquitto-2.0.15.tar.gz) = RzWx0y4/kceoiWdB2IowIuiXMKHuiXlG3s+g3ycDmsY=
+SHA256 (mosquitto-2.0.17.tar.gz) = O+epESNlZ8Gp++Jbrz4xZwBLpKDBUaRI7x9/wHfbpS8=
-SIZE (mosquitto-2.0.15.tar.gz) = 792632
+SIZE (mosquitto-2.0.17.tar.gz) = 795960

net/mosquitto/patches/patch-man_CMakeLists_txt

@@ -1,23 +1,16 @@
-just use the bundled manuals
+ignore presence/absence of xsltproc, just use the bundled manuals
+which are included in tarball downloads
 
 Index: man/CMakeLists.txt
 --- man/CMakeLists.txt.orig
 +++ man/CMakeLists.txt
-@@ -6,7 +6,7 @@
+@@ -24,7 +24,9 @@ if(XSLTPROC)
- 
- if(NOT WIN32)
- 	find_program(XSLTPROC xsltproc OPTIONAL)
--	if(XSLTPROC)
-+	if(FALSE)
- 		function(compile_manpage page)
- 			add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/man/${page}
- 				COMMAND xsltproc ${PROJECT_SOURCE_DIR}/man/${page}.xml -o ${PROJECT_SOURCE_DIR}/man/
-@@ -25,8 +25,6 @@ if(NOT WIN32)
  	compile_manpage("mosquitto-tls.7")
  	compile_manpage("mqtt.7")
  	compile_manpage("mosquitto.8")
--	else()
++endif()
--		message(FATAL_ERROR "xsltproc not found: manpages cannot be built")
- 	endif()
  
- endif()
++if(TRUE)
+ 	install(FILES
+ 		mosquitto_ctrl.1
+ 		mosquitto_ctrl_dynsec.1

net/mosquitto/patches/patch-test_broker_Makefile

@@ -5,7 +5,7 @@
 Index: test/broker/Makefile
 --- test/broker/Makefile.orig
 +++ test/broker/Makefile
-@@ -55,7 +55,7 @@ msg_sequence_test:
+@@ -56,7 +56,7 @@ msg_sequence_test:
  	./02-subpub-qos1-oversize-payload.py
  	./02-subpub-qos1.py
  	./02-subpub-qos2-1322.py
@@ -14,9 +14,12 @@ Index: test/broker/Makefile
  	./02-subpub-qos2-pubrec-error.py
  	./02-subpub-qos2-receive-maximum-1.py
  	./02-subpub-qos2-receive-maximum-2.py
-@@ -146,8 +146,8 @@ msg_sequence_test:
+@@ -148,10 +148,10 @@ msg_sequence_test:
+ 
+ 08 :
  ifeq ($(WITH_TLS),yes)
- 	./08-ssl-bridge.py
+-	./08-ssl-bridge.py
++	-./08-ssl-bridge.py
  	./08-ssl-connect-cert-auth-crl.py
 -	./08-ssl-connect-cert-auth-expired.py
 -	./08-ssl-connect-cert-auth-revoked.py

net/powerdns_recursor/Makefile

@@ -1,6 +1,6 @@
 COMMENT=		recursive nameserver
 
-V=			4.9.0
+V=			4.9.1
 DISTNAME=		pdns-recursor-${V}
 EXTRACT_SUFX =		.tar.bz2
 PKGNAME=		powerdns-recursor-${V}

net/powerdns_recursor/distinfo

@@ -1,2 +1,2 @@
-SHA256 (pdns-recursor-4.9.0.tar.bz2) = 028WKEPjZ2RqZhp4XKC+zem2hVKFW/QFMq66+hA5ZvM=
+SHA256 (pdns-recursor-4.9.1.tar.bz2) = Ch7cE+jyvWYfOeMWOH2UHiLeagO4p6L8Zi/fi5Quor4=
-SIZE (pdns-recursor-4.9.0.tar.bz2) = 1551436
+SIZE (pdns-recursor-4.9.1.tar.bz2) = 1566613

net/py-tlslite-ng/Makefile

@@ -1,8 +1,8 @@
 COMMENT =		Python SSL and TLS library
 
-MODPY_EGG_VERSION =	0.8.0-alpha47
+MODPY_EGG_VERSION =	0.8.0-beta1
 DISTNAME =		tlslite-ng-${MODPY_EGG_VERSION}
-PKGNAME =		py-${DISTNAME:S/-alpha/alpha/}
+PKGNAME =		py-${DISTNAME:S/-beta/beta/}
 EPOCH =			0
 
 PLIST_VERSION =		${MODPY_EGG_VERSION:S/-/_/}

net/py-tlslite-ng/distinfo

@@ -1,2 +1,2 @@
-SHA256 (tlslite-ng-0.8.0-alpha47.tar.gz) = wMoWcgCgjaNDv+GCDDFVaZIF2pnbriSh/DU0M0NGOjs=
+SHA256 (tlslite-ng-0.8.0-beta1.tar.gz) = VlxfzZ1FzISasnWFJmgCIKzCsLEZEYNd6LEDJdTMdEg=
-SIZE (tlslite-ng-0.8.0-alpha47.tar.gz) = 516435
+SIZE (tlslite-ng-0.8.0-beta1.tar.gz) = 519354

security/boringssl/head/Makefile

@@ -1,7 +1,7 @@
 GH_ACCOUNT =	google
 GH_PROJECT =	boringssl
-GH_COMMIT =	9fc1c33e9c21439ce5f87855a6591a9324e569fd
+GH_COMMIT =	4325d8c801b043f23d23e99aa3c5f663f0d88168
-DISTNAME =	boringssl-20230710
+DISTNAME =	boringssl-20230824
 
 MASTER_SITES0 =	https://proxy.golang.org/
 

security/boringssl/head/distinfo

@@ -1,4 +1,4 @@
-SHA256 (boringssl-20230710-9fc1c33e.tar.gz) = PioV0AJjTkz9RKdL4obtmcjtE4EYR5GBowmeFpE+OUI=
+SHA256 (boringssl-20230824-4325d8c8.tar.gz) = kV1I5u8bzXRUjikOLWIiFzds/077djxXkM8LBtMA5KE=
 SHA256 (go_modules/golang.org/x/crypto/@v/v0.10.0.mod) = LAC5Gxo4OLTluAFtx+6AEL7pCK+ErVH30bgs956frN0=
 SHA256 (go_modules/golang.org/x/crypto/@v/v0.10.0.zip) = Lk+bct9vSAp0RIOxTWuMutmP8GY5mXmsdP8dxbdOm+w=
 SHA256 (go_modules/golang.org/x/net/@v/v0.11.0.mod) = DWuyXbLvxAvNvMtxZoT1ihVALyKzQpCY18uFDyIirWE=
@@ -7,7 +7,7 @@ SHA256 (go_modules/golang.org/x/sys/@v/v0.9.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/
 SHA256 (go_modules/golang.org/x/sys/@v/v0.9.0.zip) = OzfIdTTrq/nRpg7wPaFoBfEpNAi8r4t8u6nWRu2gfX8=
 SHA256 (go_modules/golang.org/x/term/@v/v0.9.0.mod) = Wi2XadlxLw3n6DPKDO5iWibh8vvt+sp0huFBzs9+CUw=
 SHA256 (go_modules/golang.org/x/term/@v/v0.9.0.zip) = tObSrJdzJiXu5YH0f+SiEl3YZo/ihXlLrBqaGn/T8eM=
-SIZE (boringssl-20230710-9fc1c33e.tar.gz) = 35071632
+SIZE (boringssl-20230824-4325d8c8.tar.gz) = 35007933
 SIZE (go_modules/golang.org/x/crypto/@v/v0.10.0.mod) = 188
 SIZE (go_modules/golang.org/x/crypto/@v/v0.10.0.zip) = 1780916
 SIZE (go_modules/golang.org/x/net/@v/v0.11.0.mod) = 153

security/py-tlsfuzzer/Makefile

@@ -1,13 +1,13 @@
 COMMENT =		fuzzer and test suite for TLS implementations.
 
-MODPY_EGG_VERSION =	20230823
+MODPY_EGG_VERSION =	20230825
 DISTNAME =		tlsfuzzer-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		security
 
 GH_ACCOUNT =		tlsfuzzer
 GH_PROJECT =		tlsfuzzer
-GH_COMMIT =		05b14e67e348c96c5ca347b55ba20f4174b8327b
+GH_COMMIT =		c4e30e759ef99eb5f7d52ba63550528b9c547928
 
 MAINTAINER =		Theo Buehler <tb@openbsd.org>
 

security/py-tlsfuzzer/distinfo

@@ -1,2 +1,2 @@
-SHA256 (tlsfuzzer-20230823-05b14e67.tar.gz) = DnbIuBiEhGzjrmgWBQDP9LMpsUzyDcnu+hI/LpFRNHo=
+SHA256 (tlsfuzzer-20230825-c4e30e75.tar.gz) = 9Tc+DVnZZyM52DD51d32aZaezYg5Psaa5tqbFvNlk0A=
-SIZE (tlsfuzzer-20230823-05b14e67.tar.gz) = 5161156
+SIZE (tlsfuzzer-20230825-c4e30e75.tar.gz) = 5162430

security/steghide/Makefile

@@ -1,7 +1,7 @@
 COMMENT =		software able to hide data in various kind of files
 
 DISTNAME =		steghide-0.5.1
-REVISION =		9
+REVISION =		10
 CATEGORIES =		security
 HOMEPAGE =		http://steghide.sf.net/
 
@@ -22,7 +22,8 @@ LIB_DEPENDS =		devel/gettext,-runtime \
 CONFIGURE_STYLE =	autoconf
 AUTOCONF_VERSION =	2.57
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
+			LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl" \
+			ac_cv_prog_ac_cv_prog_doxygen=no
 
 CXXFLAGS +=		-std=c++03
 

security/steghide/pkg/PLIST

@@ -1,4 +1,4 @@
-bin/steghide
+@bin bin/steghide
 @man man/man1/steghide.1
 share/locale/de/LC_MESSAGES/steghide.mo
 share/locale/es/LC_MESSAGES/steghide.mo

sysutils/exoscale-cli/Makefile

@@ -1,6 +1,6 @@
 COMMENT=		manage Exoscale infrastructure from the command-line
 
-GH_TAGNAME=		v1.72.0
+GH_TAGNAME=		v1.72.1
 GH_ACCOUNT=		exoscale
 GH_PROJECT=		cli
 DISTNAME=		${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME:C/^v//}

sysutils/exoscale-cli/distinfo

@@ -1,2 +1,2 @@
-SHA256 (exoscale-cli-1.72.0.tar.gz) = i3GPLtnc8bc8UlrtRFNDsQkk7tsgo7nHs2u2M4fnRf0=
+SHA256 (exoscale-cli-1.72.1.tar.gz) = qHUXCi0kWJaI/HdKMR3HGdJ+3Tr5jYUrNjsr+I8nNak=
-SIZE (exoscale-cli-1.72.0.tar.gz) = 5877338
+SIZE (exoscale-cli-1.72.1.tar.gz) = 4981077

sysutils/terraform/Makefile

@@ -1,7 +1,7 @@
 COMMENT=		tool for building, changing, and versioning infrastructure
 
 MODGO_MODNAME=		github.com/hashicorp/terraform
-MODGO_VERSION=		v1.5.5
+MODGO_VERSION=		v1.5.6
 DISTNAME=		terraform-${MODGO_VERSION}
 
 WRKDIST=		${WRKDIR}/github.com/hashicorp/terraform@${MODGO_VERSION}

sysutils/terraform/distinfo

@@ -1786,7 +1786,7 @@ SHA256 (go_modules/sigs.k8s.io/structured-merge-diff/v4/@v/v4.2.1.mod) = MZI3y2a
 SHA256 (go_modules/sigs.k8s.io/structured-merge-diff/v4/@v/v4.2.1.zip) = 9L7QuayfT9ekxDVbSACgzs8kQ0ISmRJM7oZtb4J54Lc=
 SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.mod) = 8ikTVRI4fWZj4fCZmkkiq3CN7UvcgExxzpPj1gK6ld0=
 SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.zip) = Ve0Ixd9EigM79+LCkS1NqoW4VqBchUsMh8zIXH8/v8c=
-SHA256 (terraform-v1.5.5.zip) = bfGBma+TOyHi4Jdx6PWs2s1INLw82l/NnCuFwnOR4iw=
+SHA256 (terraform-v1.5.6.zip) = L1HLrBHpn5jIWLZWDjkyv4+51Lt1Wiayq8vJDv3lP64=
 SIZE (go_modules/cloud.google.com/go/@v/v0.100.2.mod) = 531
 SIZE (go_modules/cloud.google.com/go/@v/v0.102.0.mod) = 568
 SIZE (go_modules/cloud.google.com/go/@v/v0.102.1.mod) = 568
@@ -3575,4 +3575,4 @@ SIZE (go_modules/sigs.k8s.io/structured-merge-diff/v4/@v/v4.2.1.mod) = 346
 SIZE (go_modules/sigs.k8s.io/structured-merge-diff/v4/@v/v4.2.1.zip) = 239376
 SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.mod) = 106
 SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.zip) = 20937
-SIZE (terraform-v1.5.5.zip) = 7215747
+SIZE (terraform-v1.5.6.zip) = 7216422

sysutils/terragrunt/Makefile

@@ -4,7 +4,7 @@ BROKEN-armv7=	old kr/pty doesn't support OpenBSD arm arches; needs creack/pty@v1
 COMMENT=	thin wrapper for Terraform that provides extra tools
 
 MODGO_MODNAME=	github.com/gruntwork-io/terragrunt
-MODGO_VERSION=	v0.50.6
+MODGO_VERSION=	v0.50.7
 DISTNAME=	terragrunt-${MODGO_VERSION}
 
 WRKDIST=	${WRKDIR}/github.com/gruntwork-io/terragrunt@${MODGO_VERSION}

sysutils/terragrunt/distinfo

@@ -2276,7 +2276,7 @@ SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.mod) = 8ikTVRI4fWZj4fCZmkkiq3CN7Uv
 SHA256 (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.zip) = Ve0Ixd9EigM79+LCkS1NqoW4VqBchUsMh8zIXH8/v8c=
 SHA256 (go_modules/vizzlo.com/mixpanel/@v/v1.2.0.mod) = yN8LGbDuRyeLE3eF/gW8IbjAla+OSySvL69BbAjwPcg=
 SHA256 (go_modules/vizzlo.com/mixpanel/@v/v1.2.0.zip) = df7t6+njyqtCXJd5NhYLUgZJBtBH6IQpH9kwmJxDJj0=
-SHA256 (terragrunt-v0.50.6.zip) = 04lzpmZsrsqPM2wLo1ESOz8azHGbado+/yjUAalQ05c=
+SHA256 (terragrunt-v0.50.7.zip) = wi++fkzqLmmCSzrT0Fqr8bwY3xhZDZffhoT88Vk+XoU=
 SIZE (go_modules/cloud.google.com/go/@v/v0.100.2.mod) = 531
 SIZE (go_modules/cloud.google.com/go/@v/v0.102.0.mod) = 568
 SIZE (go_modules/cloud.google.com/go/@v/v0.102.1.mod) = 568
@@ -4555,4 +4555,4 @@ SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.mod) = 106
 SIZE (go_modules/sigs.k8s.io/yaml/@v/v1.2.0.zip) = 20937
 SIZE (go_modules/vizzlo.com/mixpanel/@v/v1.2.0.mod) = 36
 SIZE (go_modules/vizzlo.com/mixpanel/@v/v1.2.0.zip) = 10562
-SIZE (terragrunt-v0.50.6.zip) = 2864304
+SIZE (terragrunt-v0.50.7.zip) = 2864428

sysutils/xxhash/Makefile

@@ -4,20 +4,21 @@ COMMENT =	extremely fast non-cryptographic hash algorithm
 GH_ACCOUNT =	Cyan4973
 GH_PROJECT =	xxHash
 GH_TAGNAME =	v0.8.2
-REVISION =	0
+REVISION =	1
 PKGNAME =	${DISTNAME:L}
 
 SHARED_LIBS =	xxhash 0.3	# 0.8.1
 
 CATEGORIES =	sysutils
 
-HOMEPAGE =	https://cyan4973.github.io/xxHash/
+HOMEPAGE =	https://xxhash.com
 
 MAINTAINER =	Bjorn Ketelaars <bket@openbsd.org>
 
 # BSD 2-Clause
 PERMIT_PACKAGE =	Yes
 
+# uses pledge()
 WANTLIB =	c
 
 MAKE_FLAGS =	CC="${CC}" \

sysutils/xxhash/patches/patch-cli_xsum_os_specific_c

@@ -0,0 +1,31 @@
+Use pledge(2), xxhsum(1) only ever reads files or stdin.
+
+Index: cli/xsum_os_specific.c
+--- cli/xsum_os_specific.c.orig
++++ cli/xsum_os_specific.c
+@@ -69,6 +69,11 @@ static int XSUM_IS_CONSOLE(FILE* stdStream)
+  || defined(__DJGPP__) \
+  || defined(__MSYS__) \
+  || defined(__HAIKU__)
++#  ifdef __OpenBSD__
++#    include <errno.h>       /* errno */
++#    include <string.h>      /* strerror */
++#    include "xsum_output.h" /* XSUM_log */
++#  endif
+ #  include <unistd.h>   /* isatty */
+ #  define XSUM_IS_CONSOLE(stdStream) isatty(fileno(stdStream))
+ #elif defined(MSDOS) || defined(OS2)
+@@ -135,6 +140,13 @@ static int XSUM_stat(const char* infilename, XSUM_stat
+ #ifndef XSUM_NO_MAIN
+ int main(int argc, const char* argv[])
+ {
++#ifdef __OpenBSD__
++    if (pledge("stdio rpath", NULL) == -1) {
++        XSUM_log("pledge: %s\n", strerror(errno));
++        return 1;
++    }
++#endif
++
+     return XSUM_main(argc, argv);
+ }
+ #endif

sysutils/xxhash/patches/patch-tests_sanity_test_c

@@ -0,0 +1,19 @@
+Use pledge(2), the sanity test does even not read files.
+
+Index: tests/sanity_test.c
+--- tests/sanity_test.c.orig
++++ tests/sanity_test.c
+@@ -639,6 +639,13 @@ int main(int argc, const char* argv[])
+     (void) argc;
+     (void) argv;
+ 
++#ifdef __OpenBSD__
++    if (pledge("stdio", NULL) == -1) {
++        XSUM_log("pledge: %s\n", strerror(errno));
++        return EXIT_FAILURE;
++    }
++#endif
++
+     {
+         /* XXH32 */
+         size_t const n = sizeof(XSUM_XXH32_testdata) / sizeof(XSUM_XXH32_testdata[0]);

www/chromium/Makefile

@@ -6,7 +6,7 @@ DPB_PROPERTIES=		parallel parallel2
 
 COMMENT=		Chromium browser
 
-V=			116.0.5845.96
+V=			116.0.5845.110
 
 DISTNAME=		chromium-${V}
 

www/chromium/distinfo

@@ -1,10 +1,10 @@
-SHA256 (chrome-linux-116.0.5845.96-llvm13.profdata.tar.xz) = t3CYIVXWUAMxJlqwtmcGkqtzxpplDTOYgTs3i60eYGk=
+SHA256 (chrome-linux-116.0.5845.110-llvm13.profdata.tar.xz) = ZzOHnZLfhD4v3zqKryIaeFxeX3PYYlprm4wzdjV/EtE=
-SHA256 (chromium-116.0.5845.96-testdata.tar.xz) = 9iaw+zTb9SjfEYMLnR1/XlaDLWdwzNP60HzuMemCVgY=
+SHA256 (chromium-116.0.5845.110-testdata.tar.xz) = eEV3+qM3gByBEbtUWfcqZQQwU/aL7AN6sZIIKMZTTcM=
-SHA256 (chromium-116.0.5845.96.tar.xz) = HsEFKpWavO2WQrNkglSbwuvvpCjtE2KJ2ODFS0zNHIE=
+SHA256 (chromium-116.0.5845.110.tar.xz) = 6F70eaGkly/9TS44nLrzQd9MfMpj5Ou7ONF1/aEG2ak=
 SHA256 (libudev-openbsd-20221108-c3330efd.tar.gz) = BBKUTWeCkarFwKZQ+eg9DfekIMr5xi2G4Lce0C43pnc=
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = osopYtr0gqj5QxY1QeHHO6SyaU+rzSUQmB8ttO2kk8g=
-SIZE (chrome-linux-116.0.5845.96-llvm13.profdata.tar.xz) = 27750072
+SIZE (chrome-linux-116.0.5845.110-llvm13.profdata.tar.xz) = 27740936
-SIZE (chromium-116.0.5845.96-testdata.tar.xz) = 269310352
+SIZE (chromium-116.0.5845.110-testdata.tar.xz) = 267917840
-SIZE (chromium-116.0.5845.96.tar.xz) = 1599788748
+SIZE (chromium-116.0.5845.110.tar.xz) = 1599776928
 SIZE (libudev-openbsd-20221108-c3330efd.tar.gz) = 32757
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

www/chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc

@@ -1,7 +1,7 @@
 Index: media/gpu/chromeos/video_decoder_pipeline.cc
 --- media/gpu/chromeos/video_decoder_pipeline.cc.orig
 +++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -979,14 +979,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -986,14 +986,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
      }
    }
  
@@ -18,7 +18,7 @@ Index: media/gpu/chromeos/video_decoder_pipeline.cc
    // Linux w/ V4L2 should not use a custom allocator
    // Only tested with video_decode_accelerator_tests
    // TODO(wenst@) Test with full Chromium Browser
-@@ -1117,7 +1117,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1124,7 +1124,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
               << " VideoFrames";
      auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
  

www/chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5

@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2673,7 +2673,7 @@
+@@ -2675,7 +2675,7 @@
        name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_allows_third_party: true,
@@ -10,7 +10,7 @@ Index: third_party/blink/renderer/platform/runtime_enabled_features.json5
      },
      {
        name: "PaymentInstruments",
-@@ -3634,7 +3634,7 @@
+@@ -3636,7 +3636,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -19,7 +19,7 @@ Index: third_party/blink/renderer/platform/runtime_enabled_features.json5
      },
      {
        name: "URLPatternCompareComponent",
-@@ -3812,12 +3812,12 @@
+@@ -3814,12 +3814,12 @@
        status: "experimental",
        base_feature: "none",
        origin_trial_feature_name: "WebAppUrlHandling",

www/qutebrowser/Makefile

@@ -1,6 +1,6 @@
 COMMENT =		keyboard-focused browser with a minimal GUI
 
-MODPY_EGG_VERSION =	2.5.4
+MODPY_EGG_VERSION =	3.0.0
 DISTNAME =		qutebrowser-${MODPY_EGG_VERSION}
 
 HOMEPAGE =		https://www.qutebrowser.org/
@@ -14,6 +14,7 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_PYBUILD =		setuptools
 
+# prefers PyQt6 if possible; see patch-qutebrowser_qt_machinery_py if switching
 RUN_DEPENDS =		devel/desktop-file-utils \
 			textproc/py-yaml${MODPY_FLAVOR} \
 			x11/gtk+4,-guic \
@@ -23,16 +24,18 @@ RUN_DEPENDS =		devel/desktop-file-utils \
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
-	${INSTALL_DATA} ${WRKSRC}/misc/org.qutebrowser.qutebrowser.desktop ${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/misc/org.qutebrowser.qutebrowser.desktop \
+		${PREFIX}/share/applications/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/qutebrowser/
-	${INSTALL_DATA} ${WRKSRC}/icons/*.{ico,xpm} ${PREFIX}/share/pixmaps/qutebrowser/
+	${INSTALL_DATA} ${WRKSRC}/qutebrowser/icons/*.{ico,xpm} \
+		${PREFIX}/share/pixmaps/qutebrowser/
 .for s in 16 24 32 48 64 96 128 256 512
 	${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/${s}x${s}/apps/
-	${INSTALL_DATA} ${WRKSRC}/icons/qutebrowser-${s}x${s}.png \
+	${INSTALL_DATA} ${WRKSRC}/qutebrowser/icons/qutebrowser-${s}x${s}.png \
 		${PREFIX}/share/icons/hicolor/${s}x${s}/apps/qutebrowser.png
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps/
-	${INSTALL_DATA} ${WRKSRC}/icons/qutebrowser.svg \
+	${INSTALL_DATA} ${WRKSRC}/qutebrowser/icons/qutebrowser.svg \
 		${PREFIX}/share/icons/hicolor/scalable/apps/
 
 .include <bsd.port.arch.mk>

www/qutebrowser/distinfo

@@ -1,2 +1,2 @@
-SHA256 (qutebrowser-2.5.4.tar.gz) = pGCyICUn5CpnDCbSJdn6ZBfQkswfFvOpXnvJXdicGrE=
+SHA256 (qutebrowser-3.0.0.tar.gz) = Oer0p/DwUfOejUCgSCSkMvLLAjNyJx51qgN7bcQQ2Pw=
-SIZE (qutebrowser-2.5.4.tar.gz) = 6117674
+SIZE (qutebrowser-3.0.0.tar.gz) = 6030459

www/qutebrowser/patches/patch-qutebrowser_qt_machinery_py

@@ -0,0 +1,12 @@
+Index: qutebrowser/qt/machinery.py
+--- qutebrowser/qt/machinery.py.orig
++++ qutebrowser/qt/machinery.py
+@@ -34,7 +34,7 @@ from qutebrowser.utils import log
+ # sed -i 's/_WRAPPER_OVERRIDE = .*/_WRAPPER_OVERRIDE = "PyQt6"/' qutebrowser/qt/machinery.py
+ #
+ # Users: Set the QUTE_QT_WRAPPER environment variable to change the default wrapper.
+-_WRAPPER_OVERRIDE = None
++_WRAPPER_OVERRIDE = "PyQt5"
+ 
+ WRAPPERS = [
+     "PyQt6",

www/qutebrowser/pkg/PLIST

@@ -17,12 +17,8 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}__main__.${
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}qutebrowser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}qutebrowser.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/qutebrowser/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/api/
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/api/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qutebrowser/api/${MODPY_PYCACHE}/
@@ -414,11 +410,29 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/no_pdfjs.html
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/pre.html
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/process.html
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/settings.html
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/startpage.html
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/styled.html
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/tabs.html
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/version.html
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/warning-qt5.html
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/warning-sessions.html
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/html/warning-webkit.html
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-128x128.png
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-16x16.png
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-24x24.png
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-256x256.png
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-32x32.png
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-48x48.png
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-512x512.png
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-64x64.png
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-96x96.png
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-all.svg
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser-favicon.svg
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser.icns
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser.ico
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser.svg
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/icons/qutebrowser.xpm
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/img/
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/img/broken_qutebrowser_logo.png
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/img/file.svg
@@ -433,9 +447,7 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/position_caret.j
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/array_at.user.js
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/discord.user.js
-lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/globalthis.user.js
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/googledocs.user.js
-lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/object_fromentries.user.js
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/string_replaceall.user.js
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/quirks/whatsapp_web.user.js
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/scroll.js
@@ -493,6 +505,8 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODP
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}backforward.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}bar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}clock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}clock.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}keystring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -501,6 +515,8 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODP
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}percentage.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}progress.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}progress.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}searchmatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}searchmatch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}tabindex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}tabindex.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}textbase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -509,10 +525,12 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODP
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/${MODPY_PYCACHE}url.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/backforward.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/bar.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/clock.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/command.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/keystring.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/percentage.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/progress.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/searchmatch.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/tabindex.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/textbase.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/mainwindow/statusbar/url.py
@@ -560,6 +578,8 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/${MODPY_PYCACHE}miscwi
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/${MODPY_PYCACHE}miscwidgets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/${MODPY_PYCACHE}msgbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/${MODPY_PYCACHE}msgbox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/${MODPY_PYCACHE}nativeeventfilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/${MODPY_PYCACHE}nativeeventfilter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/${MODPY_PYCACHE}objects.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/${MODPY_PYCACHE}objects.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/${MODPY_PYCACHE}pastebin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -596,6 +616,7 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/keyhintwidget.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/lineparser.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/miscwidgets.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/msgbox.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/nativeeventfilter.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/objects.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/pastebin.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/quitter.py
@@ -605,9 +626,63 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/split.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/sql.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/throttle.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/misc/utilcmds.py
-lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}_core_pyqtproperty.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}_core_pyqtproperty.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}dbus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}dbus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}gui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}gui.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}machinery.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}machinery.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}network.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}network.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}opengl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}opengl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}printsupport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}printsupport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}qml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}qml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}sip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}sip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}sql.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}sql.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}webenginecore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}webenginecore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}webenginewidgets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}webenginewidgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}webkit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}webkit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}webkitwidgets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}webkitwidgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/_core_pyqtproperty.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/core.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/dbus.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/gui.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/machinery.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/network.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/opengl.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/printsupport.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/qml.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/sip.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/sql.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/test.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/webenginecore.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/webenginewidgets.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/webkit.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/webkitwidgets.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/qt/widgets.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/qutebrowser.py
-lib/python${MODPY_VERSION}/site-packages/qutebrowser/resources.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}/
@@ -629,6 +704,8 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}messa
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}objreg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}objreg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}qtlog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}qtlog.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}qtutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}qtutils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -653,6 +730,7 @@ lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/jinja.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/log.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/message.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/objreg.py
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/qtlog.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/qtutils.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/resources.py
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/utils/standarddir.py

www/ungoogled-chromium/Makefile

@@ -7,7 +7,7 @@ DPB_PROPERTIES=		parallel parallel2
 
 COMMENT=		Chromium browser sans integration with Google
 
-V=			116.0.5845.96
+V=			116.0.5845.110
 UGV=			${V}-1
 
 DISTNAME=		ungoogled-chromium-${V}

www/ungoogled-chromium/distinfo

@@ -1,10 +1,10 @@
-SHA256 (chromium-116.0.5845.96-testdata.tar.xz) = 9iaw+zTb9SjfEYMLnR1/XlaDLWdwzNP60HzuMemCVgY=
+SHA256 (chromium-116.0.5845.110-testdata.tar.xz) = eEV3+qM3gByBEbtUWfcqZQQwU/aL7AN6sZIIKMZTTcM=
-SHA256 (chromium-116.0.5845.96.tar.xz) = HsEFKpWavO2WQrNkglSbwuvvpCjtE2KJ2ODFS0zNHIE=
+SHA256 (chromium-116.0.5845.110.tar.xz) = 6F70eaGkly/9TS44nLrzQd9MfMpj5Ou7ONF1/aEG2ak=
 SHA256 (libudev-openbsd-20221108-c3330efd.tar.gz) = BBKUTWeCkarFwKZQ+eg9DfekIMr5xi2G4Lce0C43pnc=
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = osopYtr0gqj5QxY1QeHHO6SyaU+rzSUQmB8ttO2kk8g=
-SHA256 (ungoogled-chromium-116.0.5845.96-1.tar.gz) = Ji/9dVG3bH1SfJWhw+EeBDHvhifryx1cLw1g+5Argtg=
+SHA256 (ungoogled-chromium-116.0.5845.110-1.tar.gz) = RiWtxlaVri4EAyji+Hs/w2np5ulPfGPKNHo+N0XbEZU=
-SIZE (chromium-116.0.5845.96-testdata.tar.xz) = 269310352
+SIZE (chromium-116.0.5845.110-testdata.tar.xz) = 267917840
-SIZE (chromium-116.0.5845.96.tar.xz) = 1599788748
+SIZE (chromium-116.0.5845.110.tar.xz) = 1599776928
 SIZE (libudev-openbsd-20221108-c3330efd.tar.gz) = 32757
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
-SIZE (ungoogled-chromium-116.0.5845.96-1.tar.gz) = 672233
+SIZE (ungoogled-chromium-116.0.5845.110-1.tar.gz) = 673054

www/ungoogled-chromium/patches/patch-media_gpu_chromeos_video_decoder_pipeline_cc

@@ -1,7 +1,7 @@
 Index: media/gpu/chromeos/video_decoder_pipeline.cc
 --- media/gpu/chromeos/video_decoder_pipeline.cc.orig
 +++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -979,14 +979,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -986,14 +986,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
      }
    }
  
@@ -18,7 +18,7 @@ Index: media/gpu/chromeos/video_decoder_pipeline.cc
    // Linux w/ V4L2 should not use a custom allocator
    // Only tested with video_decode_accelerator_tests
    // TODO(wenst@) Test with full Chromium Browser
-@@ -1117,7 +1117,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1124,7 +1124,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
               << " VideoFrames";
      auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
  

www/ungoogled-chromium/patches/patch-third_party_blink_renderer_platform_runtime_enabled_features_json5

@@ -1,7 +1,7 @@
 Index: third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2682,7 +2682,7 @@
+@@ -2684,7 +2684,7 @@
        name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_allows_third_party: true,
@@ -10,7 +10,7 @@ Index: third_party/blink/renderer/platform/runtime_enabled_features.json5
      },
      {
        name: "PaymentInstruments",
-@@ -3643,7 +3643,7 @@
+@@ -3645,7 +3645,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -19,7 +19,7 @@ Index: third_party/blink/renderer/platform/runtime_enabled_features.json5
      },
      {
        name: "URLPatternCompareComponent",
-@@ -3821,12 +3821,12 @@
+@@ -3823,12 +3823,12 @@
        status: "experimental",
        base_feature: "none",
        origin_trial_feature_name: "WebAppUrlHandling",

www/vimb/Makefile

@@ -1,4 +1,5 @@
 COMMENT =	modal webkit-based browser inspired by vim
+REVISION =	0
 
 GH_ACCOUNT =	fanglingsu
 GH_PROJECT =	vimb
@@ -12,6 +13,7 @@ HOMEPAGE =	https://fanglingsu.github.io/vimb/
 PERMIT_PACKAGE =	Yes
 
 WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 harfbuzz
 WANTLIB += intl javascriptcoregtk-4.1 pango-1.0 pangocairo-1.0
 WANTLIB += pthread soup-3.0 webkit2gtk-4.1
 

www/vimb/pkg/PLIST

@@ -4,5 +4,6 @@ lib/vimb/
 @man man/man1/vimb.1
 share/applications/vimb.desktop
 @tag update-desktop-database
+share/doc/pkg-readmes/${PKGSTEM}
 share/metainfo/
 share/metainfo/vimb.metainfo.xml

www/vimb/pkg/README

@@ -0,0 +1,8 @@
++-------------------------------------------------------------------------------
+| Running ${PKGSTEM} on OpenBSD
++-------------------------------------------------------------------------------
+
+For a full multimedia experience, such as playing MP3 audio or MPEG
+videos, install the "gstreamer1-plugins-libav" package:
+
+# pkg_add gstreamer1-plugins-libav