diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 63c380f50658..1131e7696e69 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.3.38
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 WWW=		http://www.graphicsmagick.org/
 
 LICENSE=	MIT
 
 USES=		cpe libtool localbase pathfix pkgconfig tar:zst
 
 CONFIGURE_ARGS=	--enable-shared --enable-static \
 		--with-windows-font-dir=${WINDOWS_FONT_DIR} \
 		--without-dps --without-gdi32 --without-perl --without-trio
 CONFIGURE_ENV=	PTHREAD_LIBS=-lpthread
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 # Use fonts installed by x11-fonts/webfonts by default
 WINDOWS_FONT_DIR?=	${LOCALBASE}/share/fonts/webfonts
 
 OPTIONS_DEFINE=	BZIP2 DOCS FPX FREETYPE HEIF JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP Q8BIT PNG TEST TIFF WEBP WMF X11 XML ZLIB ZSTD
 OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB
 Q8BIT_DESC=	Use 8-bit pixels (speed) instead of 16-bit (quality)
 TEST_DESC=	Run bundled self-tests after build
 
 BZIP2_CONFIGURE_WITH=	bzlib
 FPX_CONFIGURE_WITH=	fpx
 FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
 FREETYPE_CONFIGURE_WITH=ttf
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 HEIF_CONFIGURE_WITH=	heif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 JASPER_CONFIGURE_WITH=	jp2
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JBIG_CONFIGURE_WITH=	jbig
 JBIG_LIB_DEPENDS=	libjbig.so:graphics/jbigkit
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
 JXL_CONFIGURE_WITH=	jxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 LCMS2_CONFIGURE_WITH=	lcms2
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LZMA_CONFIGURE_WITH=	lzma
 OPENMP_CONFIGURE_OFF=	--disable-openmp --without-threads
 OPENMP_CONFIGURE_ON=	--disable-openmp-slow --enable-openmp --with-threads
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 Q8BIT_CONFIGURE_OFF=	--with-quantum-depth=16
 Q8BIT_CONFIGURE_ON=	--with-quantum-depth=8
 Q8BIT_PLIST_SUB=	Q=8
 Q8BIT_PLIST_SUB_OFF=	Q=16
 TEST_BUILD_DEPENDS=	webfonts>=0:x11-fonts/webfonts
 TEST_RUN_DEPENDS=	webfonts>=0:x11-fonts/webfonts
 TIFF_CONFIGURE_WITH=	tiff
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WMF_CONFIGURE_WITH=	wmf
 X11_CONFIGURE_OFF=	ac_cv_lib_ICE_IceConnectionNumber=no
 X11_CONFIGURE_WITH=	x
 X11_USES=		xorg
 X11_USE=		XORG=ice,sm,x11,xext
 XML_CONFIGURE_WITH=	xml
 XML_USE=		GNOME=libxml2
 XML_USES=		gnome
 ZLIB_CONFIGURE_WITH=	zlib
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMP}
 .if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le && ${ARCH} != riscv64
 USES+=		compiler:gcc-c++11-lib
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MWMF}
 .if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=	libwmflite.so:graphics/libwmf
 .else
 LIB_DEPENDS+=	libwmflite.so:graphics/libwmf-nox11
 .endif
 .endif
 
 post-install-Q8BIT-off:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q16/coders ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q16/filters
 
 post-install-Q8BIT-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q8/coders ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q8/filters
 
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 21e6ed7ff97c..1fd13c3cbf65 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,346 +1,347 @@
 PORTNAME=	ImageMagick
 DISTVERSION=	7.1.0-57
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
 		https://mirror.dogado.de/imagemagick/releases/ \
 		https://mirror.checkdomain.de/imagemagick/releases/ \
 		https://ftp.icm.edu.pl/pub/unix/graphics/ImageMagick/releases/ \
 		https://imagemagick.org/archive/releases/
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Image processing tools
 WWW=		https://imagemagick.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl	\
 		libzip.so:archivers/libzip
 
 TESTS_DEPENDS=	gsfonts>=0:print/gsfonts
 
 # bin/Magick++-config
 CONFLICTS_INSTALL=	ImageMagick6 ImageMagick6-nox11
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
 USES=		cpe gettext-runtime gmake gnome libtool:keepla localbase \
 		pathfix perl5 pkgconfig:both shebangfix tar:xz
 CPE_PRODUCT=	imagemagick
 CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps \
 		--without-flif \
 		--without-zstd
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
 SAMPLE_FILES=	colors.xml delegates.xml log.xml mime.xml policy.xml \
 		quantization-table.xml thresholds.xml type-apple.xml \
 		type-dejavu.xml type-ghostscript.xml type-urw-base35.xml \
 		type-windows.xml type.xml
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \
 		GRAPHVIZ GSLIB JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES \
 		OPENEXR OPENMP PANGO PDF PERL PNG RAQM SVG TESTS TIFF WEBP WMF \
 		THREADS X11 16BIT_PIXEL HDRI HEIF RAW
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE HEIF \
 		JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES OPENEXR PDF PERL PNG RAQM SVG \
 		TIFF WEBP WMF THREADS X11 HDRI RAW
 
 DJVU_DESC=		DJVU format support (needs THREADS)
 GSLIB_DESC=		libgs (Postscript SHLIB) support
 FFMPEG_DESC=		VIDEO codec support as FFmpeg
 TESTS_DESC=		Run bundled self-tests after build
 #SIMD_CONFIGURE_WITH=	gcc-arch
 CONFIGURE_ARGS+=	--without-gcc-arch
 
 16BIT_PIXEL_DESC=	16bit pixel support
 16BIT_PIXEL_CONFIGURE_OFF=--with-quantum-depth=8
 16BIT_PIXEL_VARS=	_QBIT=Q16
 16BIT_PIXEL_VARS_OFF=	_QBIT=Q8
 PLIST_SUB+=		QBIT=${_QBIT}
 
 # Produce BZip compressed MIFF images
 BZIP2_DESC=		bzip2 compressed MIFF images
 BZIP2_CONFIGURE_WITH=	bzlib
 
 FFTW_CONFIGURE_WITH=	fftw
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 FONTCONFIG_CONFIGURE_WITH=	fontconfig
 FONTCONFIG_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig
 
 FREETYPE_CONFIGURE_WITH=	freetype
 FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 
 # FPX (FlashPIX) images
 FPX_CONFIGURE_WITH=	fpx
 FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
 
 GRAPHVIZ_CONFIGURE_WITH=	gvc
 GRAPHVIZ_LIB_DEPENDS=	libgvc.so:graphics/graphviz
 GRAPHVIZ_CFLAGS=	-I${LOCALBASE}/include/graphviz
 GRAPHVIZ_LDFLAGS=	-L${LOCALBASE}/lib/graphviz
 
 HEIF_CONFIGURE_WITH=	heic
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 
 HDRI_DESC=		High dynamic range images support
 HDRI_CONFIGURE_ENABLE=	hdri
 HDRI_VARS=		_HDRI=HDRI
 HDRI_VARS_OFF=		_HDRI=""
 PLIST_SUB+=		HDRI=${_HDRI}
 
 # JBIG images (lossless compression for bi-level images)
 JBIG_CONFIGURE_WITH=	jbig
 JBIG_LIB_DEPENDS=	libjbig.so:graphics/jbigkit
 
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
 
 # JPEG2000 images (wavelet-based lossy compression)
 JPEG2000_DESC=		OpenJPEG 2000 support via openjpeg
 JPEG2000_CONFIGURE_WITH=openjp2
 JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 JXL_CONFIGURE_WITH=	jxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 
 LCMS2_CONFIGURE_WITH=	lcms
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 
 LQR_CONFIGURE_WITH=	lqr
 LQR_LIB_DEPENDS=	liblqr-1.so:graphics/liblqr-1
 LQR_USE=		gnome=glib20
 
 LZMA_CONFIGURE_WITH=	lzma
 
 # Loadable coders, smaller executable, but PerlMagick not really works
 # ('make test' there works)
 MODULES_DESC=		Modules support
 MODULES_CONFIGURE_WITH=	modules
 
 PANGO_CONFIGURE_WITH=	pango
 PANGO_USE=		gnome=pango
 PANGO_IMPLIES=		X11
 
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 RAQM_DESC=		Complex text layout support
 RAQM_CONFIGURE_WITH=	raqm
 RAQM_LIB_DEPENDS=	libraqm.so:print/libraqm
 
 # libraw is by default liked to lcms2, whichs also ends up in IM regardless
 # of the IM LCMS option.
 RAW_DESC=		RAW format support (implies the lcms2 option)
 RAW_CONFIGURE_WITH=	raw
 RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
 RAW_IMPLIES=		LCMS2
 
 SVG_DESC=		SVG vector image format support (via librsvg, implies the x11 option)
 SVG_CONFIGURE_WITH=	rsvg
 SVG_USE=		gnome=cairo,gdkpixbuf2,librsvg2
 SVG_IMPLIES=		X11
 
 TIFF_CONFIGURE_WITH=	tiff
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 X11_CONFIGURE_WITH=	x
 X11_USES=		xorg
 X11_USE=		xorg=ice,sm,x11,xext,xt
 X11_VARS=		CONFLICTS_INSTALL+="ImageMagick7-nox11"
 X11_VARS_OFF=		CONFLICTS_INSTALL+="ImageMagick7" \
 			PKGNAMESUFFIX=7-nox11
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHREADS}
 _IMAGEMAGICK_THREADS=yes
 _IMAGEMAGICK_THREADS_MSG=with threads
 . if exists(${PERL})
 PERL_THREADED!=	${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac'; ${ECHO_CMD}
 . else
 # if ${PERL} doesn't exists, assume we dealing with threaded perl.
 PERL_THREADED=	yes
 . endif
 .else
 _IMAGEMAGICK_THREADS=no
 _IMAGEMAGICK_THREADS_MSG=without threads
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa
 . if defined(PERL_THREADED)
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is threaded
 _IMAGEMAGICK_THREADS=yes
 . else
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is non-threaded
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. ${_IMAGEMAGICK_THREADS_PERL_MSG}. Reinstall Perl with threads or undefine WITH_IMAGEMAGICK_PERL
 .  if ${_IMAGEMAGICK_THREADS} == "yes"
 IGNORE=${_IMAGEMAGICK_THREADS_IGNORE_MSG} or undefine WITH_THREADS
 .  endif
 _IMAGEMAGICK_THREADS=no
 . endif
 .else
 CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL='@comment '
 .endif
 
 .if ${_IMAGEMAGICK_THREADS} == "yes"
 CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ENV+=		PTHREAD_LIBS="-lpthread"
 LDFLAGS+=		-lpthread
 .else
 CONFIGURE_ARGS+=	--without-threads
 _IMAGEMAGICK_THREADS=no
 .endif
 
 # OpenMP
 .if ${PORT_OPTIONS:MOPENMP}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
 CONFIGURE_ARGS+=	--enable-openmp
 . endif
 .else
 CONFIGURE_ARGS+=	--disable-openmp
 .endif
 .if defined(WITH_WINDOWS_FONT_DIR)
 CONFIGURE_ARGS+=	--with-windows-font-dir=${WITH_WINDOWS_FONT_DIR}
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
 LIB_DEPENDS+=		libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 PLIST_SUB+=		OPENEXR=""
 . endif
 .else
 CONFIGURE_ARGS+=	--without-openexr
 PLIST_SUB+=		OPENEXR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDJVU}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . endif
 LIB_DEPENDS+=		libdjvulibre.so:graphics/djvulibre
 PLIST_SUB+=		DJVU=""
 .else
 CONFIGURE_ARGS+=	--without-djvu
 PLIST_SUB+=		DJVU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGSLIB}
 CONFIGURE_ARGS+=	--with-gslib
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11
 . else
 USES+=		ghostscript
 . endif
 .else
 CONFIGURE_ARGS+=	--without-gslib
 .endif
 
 # WMF (Windows Meta File) images
 .if ${PORT_OPTIONS:MWMF}
 . if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=		libwmf.so:graphics/libwmf
 . else
 LIB_DEPENDS+=		libwmf.so:graphics/libwmf-nox11
 . endif
 CONFIGURE_ARGS+=	--with-wmf=yes
 PLIST_SUB+=		WMF=""
 .else
 CONFIGURE_ARGS+=	--without-wmf
 PLIST_SUB+=		WMF="@comment "
 .endif
 
 # PDF (Adobe Portable Document Format) support
 .if ${PORT_OPTIONS:MPDF}
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11
 . else
 USES+=		ghostscript
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MPDF} || ${PORT_OPTIONS:MGSLIB}
 RUN_DEPENDS+=	gsfonts>=0:print/gsfonts
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
 BUILD_DEPENDS+=		ffmpeg:multimedia/ffmpeg
 RUN_DEPENDS+=		ffmpeg:multimedia/ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install-strip install-docDATA install-data-html
 .else
 INSTALL_TARGET=	install-strip
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11,build
 . else
 USES+=		ghostscript:build
 . endif
 .endif
 
 post-patch:
 # strip library name of variable parts that can change due to
 # the HDRI and Q16 option
 	@${REINPLACE_CMD}  -e 's|_@MAGICK_ABI_SUFFIX@||g; \
 		s|\.@MAGICK_ABI_SUFFIX@||g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|@\.@MAGICK_ABI_SUFFIX@|@|g' \
 		${WRKSRC}/PerlMagick/Makefile.PL.in \
 		${WRKSRC}/PerlMagick/quantum/Makefile.PL.in \
 		${WRKSRC}/Magick++/bin/Magick++-config.in \
 		${WRKSRC}/Magick++/lib/Magick++.pc.in \
 		${WRKSRC}/MagickCore/MagickCore-config.in \
 		${WRKSRC}/MagickCore/MagickCore.pc.in \
 		${WRKSRC}/MagickCore/ImageMagick.pc.in \
 		${WRKSRC}/MagickWand/MagickWand-config.in \
 		${WRKSRC}/MagickWand/MagickWand.pc.in
 
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)
 	@${ECHO_CMD} '###################################################################'
 	@${ECHO_CMD} NOTICE: ${_IMAGEMAGICK_THREADS_PERL_MSG}. Building ImageMagick ${_IMAGEMAGICK_THREADS_MSG}.
 	@${ECHO_CMD} '###################################################################'
 .endif
 
 .if ${PORT_OPTIONS:MSVG} && ! ${PORT_OPTIONS:MX11}
 	@${ECHO_CMD} NOTICE: SVG format support disabled, requires X11
 .endif
 
 post-install:
 .for i in ${SAMPLE_FILES}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-7/${i} \
 		${STAGEDIR}${PREFIX}/etc/ImageMagick-7/${i}.sample
 .endfor
 
 post-install-TESTS-on: test
 
 do-test:
 	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} ${_MAKE_JOBS} check
 
 .include <bsd.port.mk>
diff --git a/graphics/darktable42/Makefile b/graphics/darktable42/Makefile
index adef74e722d2..55e7b6d1cd79 100644
--- a/graphics/darktable42/Makefile
+++ b/graphics/darktable42/Makefile
@@ -1,166 +1,167 @@
 PORTNAME=	darktable
 PORTVERSION=	4.2.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION}/
 PKGNAMESUFFIX=	42
 
 # this port is meant as temporary offering while graphics/darktable is still at 4.0.x
 MAINTAINER=	mandree@FreeBSD.org
 # dumbbell@ has blanket approval for port changes. This includes removal if and only if graphics/darktable is at least the same version as darktable42
 COMMENT=	Virtual lighttable and darkroom for photographers
 WWW=		https://www.darktable.org/
 
 LICENSE=	GPLv3
 
 ONLY_FOR_ARCHS=		aarch64 amd64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	uses 64-bit address space
 
 DEPRECATED=	Will expire as soon as graphics/darktable will have updated to 4.2
 
 BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
 		p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
 		po4a-translate:textproc/po4a \
 		xsltproc:textproc/libxslt \
 		bash:shells/bash
 LIB_DEPENDS=	libcolord-gtk.so:graphics/colord-gtk \
 		libcolord.so:graphics/colord \
 		libcurl.so:ftp/curl \
 		libexiv2.so:graphics/exiv2 \
 		libharfbuzz.so:print/harfbuzz \
 		libicui18n.so:devel/icu \
 		libImath.so:math/Imath \
 		libjasper.so:graphics/jasper \
 		libjson-glib-1.0.so:devel/json-glib \
 		libjxl_threads.so:graphics/libjxl \
 		liblcms2.so:graphics/lcms2 \
 		liblensfun.so:graphics/lensfun \
 		libpng.so:graphics/png \
 		libpugixml.so:textproc/pugixml \
 		libsoup-2.4.so:devel/libsoup \
 		libtiff.so:graphics/tiff
 
 USES=		cmake compiler:c++14-lang desktop-file-utils gl gnome jpeg \
 		perl5 pkgconfig sdl shebangfix sqlite tar:xz xorg
 USE_GL=		gl
 USE_GNOME=	cairo gtk30 intltool librsvg2 libxml2
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 USE_SDL=	sdl2
 USE_XORG=	ice sm x11 xext xrandr
 
 SHEBANG_FILES=	tools/*.sh
 
 CMAKE_ARGS+=	-DBINARY_PACKAGE_BUILD=1 \
 		-DBUILD_CMSTEST:BOOL=ON \
 		-DUSE_KWALLET:BOOL=ON
 
 CFLAGS+=	-fopenmp
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/}
 
 OPTIONS_DEFINE=		AVIF DOCS GEO GPHOTO GMIC GRAPHMAGICK HEIF LIBSECRET LTO \
 			LUA NLS OPENEXR OPENJPEG PRINT TOOLS WEBP
 OPTIONS_DEFAULT=	AVIF GEO GPHOTO HEIF LTO LUA OPENEXR OPENJPEG PRINT WEBP
 OPTIONS_SUB=		yes
 
 GEO_DESC=		Support geotagging
 GMIC_DESC=		Support G'Mic-compressed LUT in lut3d
 LIBSECRET_DESC=		Support libsecret as password backend
 TOOLS_DESC=		Install additional scripts
 
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
 AVIF_CMAKE_BOOL=	USE_AVIF
 
 GEO_LIB_DEPENDS=	libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map
 GEO_CMAKE_BOOL=		USE_MAP
 
 GMIC_LIB_DEPENDS=	libgmic.so:graphics/gmic
 GMIC_CMAKE_BOOL=	USE_GMIC
 
 GPHOTO_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 GPHOTO_CMAKE_BOOL=	USE_CAMERA_SUPPORT
 
 GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHMAGICK_CMAKE_BOOL=	USE_GRAPHICSMAGICK
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_CMAKE_BOOL=	USE_HEIF
 
 LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 LIBSECRET_CMAKE_BOOL=	USE_LIBSECRET
 
 LTO_CMAKE_BOOL=		RAWSPEED_ENABLE_LTO
 
 LUA_USES=		lua:54
 LUA_CMAKE_BOOL=		USE_LUA
 
 # FIXME: Even with NLS turned off, darktable(1) is still linked to
 # libintl.so.
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-runtime
 NLS_CMAKE_BOOL=		USE_NLS
 NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_CMAKE_BOOL=	USE_OPENEXR
 OPENEXR_CFLAGS=		-I${LOCALBASE}/include/Imath
 
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 OPENJPEG_CMAKE_BOOL=	USE_OPENJPEG
 
 PRINT_LIB_DEPENDS=	libcups.so:print/cups
 PRINT_CMAKE_BOOL=	BUILD_PRINT
 
 TOOLS_BUILD_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 TOOLS_RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CMAKE_BOOL=	USE_WEBP
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64
 CMAKE_ARGS+=	-DUSE_OPENCL:BOOL=OFF
 CXXFLAGS+=	-DGDK_DISABLE_DEPRECATED
 PLIST_SUB+=	NO_OPENCL="@comment "
 .else
 PLIST_SUB+=	NO_OPENCL=""
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD || ${ARCH} == "i386"
 LLVM_DEFAULT=	13
 BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
 CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
 CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
 LD=		${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 BINARY_ALIAS+=	ld.lld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
 BINARY_ALIAS+=	llvm-objcopy=${LOCALBASE}/bin/llvm-objcopy${LLVM_DEFAULT}
 BINARY_ALIAS+=	llvm-ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT}
 BINARY_ALIAS+=	llvm-ranlib=${LOCALBASE}/bin/llvm-ranlib${LLVM_DEFAULT}
 .endif
 
 # work around CMAKE/CCACHE flaw (cmake stomps over ccache)
 .if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE)
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN}
 .endif
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
 # darktable defines the __XOPEN_SOURCE preprocessor macro, which
 # restricts symbol visibility on FreeBSD and causes compilation failures
 # on, for instance, the cups_print module, because u_char remains
 # undefined. Remove _XOPEN_SOURCE maro definitions.
 post-patch:
 	${REINPLACE_CMD} '/add_definitions."-D_XOPEN_SOURCE=.*"/d' ${WRKSRC}/CMakeLists.txt
 
 post-install-TOOLS-off:
 	@${RM} -f ${STAGEDIR}${DATADIR}/tools/extract_wb_from_images.sh
 
 .include <bsd.port.post.mk>
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 370f901c9cf6..273d8bc12ca7 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	geeqie
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Lightweight image viewer forked from GQview
 WWW=		https://www.geeqie.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
 RUN_DEPENDS=	bash:shells/bash
 BUILD_DEPENDS=	xxd:editors/vim
 
 USES=		desktop-file-utils gettext-tools gnome jpeg \
 		lua:53 meson pkgconfig shebangfix
 USE_GNOME=	cairo gdkpixbuf2 gtk30 glib20
 USE_GITHUB=	yes
 GH_ACCOUNT=	BestImageViewer
 SHEBANG_FILES=	plugins/*/geeqie-*
 MESON_ARGS=	-Djpeg=enabled -Dlua=enabled
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	EXIV2 LCMS MAP FFMPEGTHUMBNAILER ARCHIVE SPELL DOCS NLS
 OPTIONS_DEFAULT=EXIV2 LCMS MAP FFMPEGTHUMBNAILER ARCHIVE SPELL \
 		TIFF PDF HEIF WEBP DJVU OPENJPEG RAW JXL
 OPTIONS_GROUP=	FORMATS
 OPTIONS_GROUP_FORMATS=	TIFF PDF HEIF WEBP DJVU OPENJPEG RAW JXL
 OPTIONS_SUB=	yes
 
 FORMATS_DESC=	Image formats support
 
 EXIV2_DESC=		Metadata editing
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_MESON_ENABLED=	exiv2
 
 LCMS_DESC=		Color adjusting
 LCMS_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS_MESON_ENABLED=	cms
 
 MAP_DESC=		GPS map support via libchamplain
 MAP_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
 			libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 			libclutter-1.0.so:graphics/clutter
 MAP_MESON_ENABLED=	gps-map
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MESON_ENABLED=	tiff
 
 PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 PDF_MESON_ENABLED=	pdf
 
 FFMPEGTHUMBNAILER_DESC=	Video file thumbnails generating support
 FFMPEGTHUMBNAILER_MESON_ENABLED=	videothumbnailer
 FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
 
 HEIF_MESON_ENABLED=	heif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 
 WEBP_MESON_ENABLED=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 DJVU_MESON_ENABLED=	djvu
 DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 
 OPENJPEG_MESON_ENABLED=	j2k
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 RAW_MESON_ENABLED=	libraw
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
 
 ARCHIVE_MESON_ENABLED=	archive
 ARCHIVE_USES=		libarchive
 
 JXL_MESON_ENABLED=	jpegxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 
 SPELL_DESC=		Spelling check through gspell
 SPELL_MESON_ENABLED=	spell
 SPELL_LIB_DEPENDS=	libgspell-1.so:textproc/gspell
 
 DOCS_BUILD_DEPENDS=	yelp-build:textproc/yelp-tools
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index e9838e6e1e6b..8840097b0cda 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,157 +1,157 @@
 PORTNAME?=	gimp
 PORTVERSION=	2.10.32
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	GIMP/gimp/v${PORTVERSION:R}
 PKGNAMESUFFIX=	-app
 #DISTNAME=	gimp-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNU Image Manipulation Program
 WWW=		https://www.gimp.org/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
 		glib-networking>=0:net/glib-networking \
 		mypaint-brushes>0:graphics/mypaint-brushes
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libbabl-0.1.so:x11/babl \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgegl-0.4.so:graphics/gegl \
 		libgexiv2.so:graphics/gexiv2 \
 		libharfbuzz.so:print/harfbuzz \
 		libjson-c.so:devel/json-c \
 		libjson-glib-1.0.so:devel/json-glib \
 		liblcms2.so:graphics/lcms2 \
 		libmypaint.so:graphics/libmypaint \
 		libpng.so:graphics/png \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libtiff.so:graphics/tiff
 LIB_DEPENDS+=	${LIB_DEPENDS_${ARCH}}
 
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
 LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=		libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=	libunwind.so:devel/libunwind
 
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
 		glib-networking>=0:net/glib-networking \
 		mypaint-brushes>0:graphics/mypaint-brushes
 
 USES+=		compiler:c++14-lang cpe gettext gmake gnome jpeg libtool \
 		localbase pkgconfig shebangfix tar:bzip2 xorg
 CPE_VENDOR=	gimp
 CPE_PRODUCT=	gimp
 USE_GNOME+=	cairo gtk20 intltool librsvg2
 USE_LDCONFIG=	yes
 USE_XORG=	ice sm x11 xcursor xext xfixes xmu xpm xt
 
 SHEBANG_FILES=	plug-ins/pygimp/plug-ins/*.py
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--with-html-dir=${PREFIX}/share/doc/gimp \
 			--with-bug-report-url="https://bugs.freebsd.org/" \
 			--disable-gtk-doc \
 			--without-linux-input \
 			--with-print \
 			--without-gudev \
 			--enable-default-binary \
 			--disable-gimp-console \
 			--disable-python \
 			--without-appdata-test \
 			--with-desktop-dir=${PREFIX}/share \
 			--docdir=${PREFIX}/share/doc/gimp \
 			--with-icc-directory=${LOCALBASE}/share/color/icc \
 			--without-webkit \
 			--enable-default-binary
 CONFIGURE_ENV=		GIMP_THREAD_LIBS=-lpthread
 
 INSTALL_TARGET=	install-strip
 .if !defined(XAUTHORITY)
 TEST_ENV=	XAUTHORITY=${HOME}/.Xauthority
 .endif
 TEST_TARGET=	check
 
 LIBS+=		-lexecinfo -lm
 
 PLIST_SUB+=	LIBVER=0.1000.${PORTVERSION:E}
 
 .if !defined(GIMP_SLAVE)
 
 USES+=		desktop-file-utils
 
 OPTIONS_DEFINE?=	AALIB GHOSTSCRIPT HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD \
 			WEBP WMF
 OPTIONS_DEFAULT=	AALIB HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
 OPTIONS_SUB=		yes
 
 .endif
 
 .if defined(GIMP_SLAVE)
 PKG_CONFIG?=		${LOCALBASE}/bin/pkg-config
 GIMP_LIBS=		`${PKG_CONFIG} --libs gimp-2.0`
 GIMP_THUMB_LIBS=	`${PKG_CONFIG} --libs gimpthumb-2.0`
 GIMP_UI_LIBS=		`${PKG_CONFIG} --libs gimpui-2.0`
 
 LIB_DEPENDS+=	libgimp-2.0.so:graphics/gimp-app
 
 .else
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
 AALIB_DESC=	Ascii-art Plug-in
 OPENJPEG_DESC=	Enhanced JPEG (jpeg2000) graphics support
 
 AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_WITH=	aa
 
 GHOSTSCRIPT_USES=		ghostscript
 GHOSTSCRIPT_CONFIGURE_WITH=	gs
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_CONFIGURE_WITH=	libheif
 
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_CONFIGURE_WITH=	jpegxl
 
 LIBMNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 LIBMNG_CONFIGURE_WITH=	libmng
 
 OPENEXR_LIB_DEPENDS=	libImath.so:math/Imath \
 			libOpenEXR.so:graphics/openexr
 OPENEXR_CONFIGURE_WITH=	openexr
 
 OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
 OPENJPEG_CONFIGURE_WITH=	jpeg2000
 
 SIMD_CONFIGURE_OFF=	--disable-mmx \
 			--disable-sse \
 			--disable-altivec
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_WITH=	webp
 
 WMF_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 			libwmf.so:graphics/libwmf
 
 WMF_CONFIGURE_WITH=	wmf
 
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%GIMP_LIBS%%|${GIMP_LIBS}|; \
 		s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \
 		s|%%GIMP_UI_LIBS%%|${GIMP_UI_LIBS}|' \
 			${WRKSRC}/plug-ins/pygimp/Makefile.in
 	@${REINPLACE_CMD} \
 		-e 's|x86_64|amd64|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-jxl-plugin/Makefile b/graphics/gimp-jxl-plugin/Makefile
index 872b35c7004e..1939210dd441 100644
--- a/graphics/gimp-jxl-plugin/Makefile
+++ b/graphics/gimp-jxl-plugin/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	gimp-jxl-plugin
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.0
+DISTVERSION=	0.8.0rc1
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	GIMP plugin to read/write JPEG XL images
 WWW=		https://jpeg.org/jpegxl/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC:H:H}/LICENSE
 
 LIB_DEPENDS=	libgegl-0.4.so:graphics/gegl \
 		libgimp-2.0.so:graphics/gimp-app \
 		libjxl.so:graphics/libjxl \
 		libbabl-0.1.so:x11/babl
 
 USES=		cmake compiler:c++11-lang gnome pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	gtk20
 GH_ACCOUNT=	${GH_PROJECT}
 GH_PROJECT=	libjxl
 WRKSRC_SUBDIR=	plugins/gimp
 LDFLAGS+=	-Wl,--as-needed # GIMP deps
 PLIST_FILES=	libexec/gimp/2.2/plug-ins/file-jxl/file-jxl
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-jxl-plugin/distinfo b/graphics/gimp-jxl-plugin/distinfo
index 2ec091f2ad85..3bb2d1682fe5 100644
--- a/graphics/gimp-jxl-plugin/distinfo
+++ b/graphics/gimp-jxl-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663763390
-SHA256 (libjxl-libjxl-v0.7.0_GH0.tar.gz) = 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e
-SIZE (libjxl-libjxl-v0.7.0_GH0.tar.gz) = 1505917
+TIMESTAMP = 1673608669
+SHA256 (libjxl-libjxl-v0.8.0rc1_GH0.tar.gz) = a94f3a011b0238d20c9dab3f7c5e6cfcc7bd669f2d9fd9aec89b8a43c51ba7f5
+SIZE (libjxl-libjxl-v0.8.0rc1_GH0.tar.gz) = 1611950
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index bcef8782b66a..6f86fa6a5337 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,104 +1,104 @@
 PORTNAME=	gthumb
 PORTVERSION=	3.12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Image viewer and browser for the GNOME environment
 WWW=		https://wiki.gnome.org/Apps/gthumb/
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter \
 		libcogl.so:graphics/cogl \
 		libgstreamer-1.0.so:multimedia/gstreamer1 \
 		libjson-glib-1.0.so:devel/json-glib \
 		liblcms2.so:graphics/lcms2 \
 		liboauth.so:net/liboauth \
 		libpng.so:graphics/png \
 		libsoup-2.4.so:devel/libsoup \
 		libtiff.so:graphics/tiff \
 		libcolord.so:graphics/colord
 RUN_DEPENDS=	gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas
 
 USES=		bison compiler:c++11-lib cpe desktop-file-utils gettext gl \
 		gnome jpeg localbase:ldflags meson pkgconfig \
 		python:3.5+,build shebangfix tar:xz xorg
 USE_GL=		egl
 USE_GNOME=	cairo gtk30 intltool librsvg2
 USE_XORG=	x11 xcomposite xdamage xext xfixes xrandr xi
 MESON_ARGS=	-Dlibrsvg=true \
 		-Dlibchamplain=false
 CPE_VENDOR=	gnome
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 SHEBANG_FILES=	*.py data/gschemas/*.py gthumb/*.py po/*.py
 
 PLIST_SUB=	GTHUMB_VER="3.10"
 
 GLIB_SCHEMAS=	org.gnome.gthumb.change-date.gschema.xml \
 		org.gnome.gthumb.comments.gschema.xml \
 		org.gnome.gthumb.contact-sheet.gschema.xml \
 		org.gnome.gthumb.convert-format.gschema.xml \
 		org.gnome.gthumb.crop.gschema.xml \
 		org.gnome.gthumb.enums.xml \
 		org.gnome.gthumb.facebook.gschema.xml \
 		org.gnome.gthumb.file-manager.gschema.xml \
 		org.gnome.gthumb.flickr.gschema.xml \
 		org.gnome.gthumb.gschema.xml \
 		org.gnome.gthumb.gstreamer-tools.gschema.xml \
 		org.gnome.gthumb.image-print.gschema.xml \
 		org.gnome.gthumb.image-viewer.gschema.xml \
 		org.gnome.gthumb.importer.gschema.xml \
 		org.gnome.gthumb.photo-importer.gschema.xml \
 		org.gnome.gthumb.picasaweb.gschema.xml \
 		org.gnome.gthumb.pixbuf-savers.gschema.xml \
 		org.gnome.gthumb.rename-series.gschema.xml \
 		org.gnome.gthumb.resize-images.gschema.xml \
 		org.gnome.gthumb.resize.gschema.xml \
 		org.gnome.gthumb.rotate.gschema.xml \
 		org.gnome.gthumb.slideshow.gschema.xml \
 		org.gnome.gthumb.webalbums.gschema.xml \
 		org.gnome.gthumb.catalogs.gschema.xml \
 		org.gnome.gthumb.terminal.gschema.xml
 
 OPTIONS_DEFINE=		BRASERO CLUTTER EXIV2 GSTREAMER JXL RAW SECRET \
 			WEBP WEBSERVICES YELP
 OPTIONS_DEFAULT=	BRASERO CLUTTER EXIV2 GSTREAMER JXL RAW SECRET \
 			WEBP WEBSERVICES YELP
 OPTIONS_SUB=		yes
 
 BRASERO_DESC=		Write galleries to CD/DVD (large dependency)
 BRASERO_LIB_DEPENDS=	libbrasero-media3.so:sysutils/brasero
 BRASERO_MESON_TRUE=	libbrasero
 CLUTTER_DESC=		Fancy slideshows
 CLUTTER_LIB_DEPENDS=	libclutter-gtk-1.0.so:graphics/clutter-gtk3
 CLUTTER_MESON_TRUE=	clutter
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_MESON_TRUE=	exiv2
 GSTREAMER_USES=		gstreamer
 GSTREAMER_MESON_TRUE=	gstreamer
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_MESON_TRUE=		libjxl
 RAW_DESC=		Raw image support via libraw
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
 RAW_MESON_TRUE=		libraw
 SECRET_DESC=		Libsecret support for storing passwords
 SECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 SECRET_MESON_TRUE=	libsecret
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_MESON_TRUE=	libwebp
 WEBSERVICES_DESC=	Web services
 WEBSERVICES_LIB_DEPENDS=\
 			libjson-glib-1.0.so:devel/json-glib \
 			libwebkit2gtk-4.0.so:www/webkit2-gtk3
 WEBSERVICES_MESON_TRUE=	webservices
 YELP_DESC=		Viewer for built-in help system
 YELP_RUN_DEPENDS=	yelp:x11/yelp
 
 .include <bsd.port.mk>
diff --git a/graphics/imlib2-jxl/Makefile b/graphics/imlib2-jxl/Makefile
index 10081ec3b4b1..52c8f2b3a61a 100644
--- a/graphics/imlib2-jxl/Makefile
+++ b/graphics/imlib2-jxl/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	imlib2-jxl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	JPEG XL loader for imlib2
 WWW=		https://github.com/alistair7/imlib2-jxl
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE-BSD-ab
 
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
 		libjxl.so:graphics/libjxl
 
 USES=		gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	alistair7
 MAKE_ENV=	RELEASE_CFLAGS="${CFLAGS}"
 ALL_TARGET=	# empty
 PLIST_FILES=	lib/imlib2/loaders/jxl.so
 
 OPTIONS_DEFINE=	LCMS2
 OPTIONS_DEFAULT=LCMS2
 
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 
 post-patch-LCMS2-off:
 	@${REINPLACE_CMD} -e '/-DIMLIB2JXL_USE_LCMS/d' \
 		-e 's/`pkg-config[^`]*lcms[^`]*`//' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.so:H}
 	${INSTALL_LIB} ${WRKSRC}/${PLIST_FILES:M*.so:T} \
 		${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.so:H}
 
 .include <bsd.port.mk>
diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile
index 48031bdacf9a..0053b443cc13 100644
--- a/graphics/kf5-kimageformats/Makefile
+++ b/graphics/kf5-kimageformats/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	kimageformats
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 library providing support for additional image formats
 
 LIB_DEPENDS=	libImath.so:math/Imath
 
 USES=		cmake compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	archive \
 		ecm:build
 USE_QT=		core gui printsupport widgets \
 		buildtools:build qmake:build
 
 CFLAGS+=	-I${LOCALBASE}/include/Imath
 
 OPTIONS_DEFINE=	AVIF JXL HEIF OPENEXR
 OPTIONS_DEFAULT=	AVIF JXL HEIF OPENEXR
 OPTIONS_SUB=	yes
 
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
 AVIF_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_libavif
 
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_CMAKE_BOOL=		KIMAGEFORMATS_JXL
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_CMAKE_BOOL=	KIMAGEFORMATS_HEIF
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 
 post-patch:
 		${REINPLACE_CMD} s,Imf::Int64,uint64_t, \
 			${WRKSRC}/src/imageformats/exr.cpp
 
 .include <bsd.port.mk>
diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 526788a34492..b0ae571909a9 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	krita
 DISTVERSION=	5.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Sketching and painting program
 WWW=		https://krita.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	libheif>=1.12.0:graphics/libheif
 BUILD_DEPENDS+=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	xsimd>=8.1:devel/xsimd
 BUILD_DEPENDS_amd64=	xsimd>=8.1:devel/xsimd
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libOpenColorIO.so:graphics/opencolorio \
 		libX11.so:x11/libX11 \
 		libboost_system.so:devel/boost-libs \
 		libfftw3.so:math/fftw3 \
 		libexiv2.so:graphics/exiv2 \
 		libcurl.so:ftp/curl \
 		libgif.so:graphics/giflib \
 		libgsl.so:math/gsl \
 		libheif.so:graphics/libheif \
 		libturbojpeg.so:graphics/libjpeg-turbo \
 		libjxl.so:graphics/libjxl \
 		liblcms2.so:graphics/lcms2 \
 		libmypaint.so:graphics/libmypaint \
 		libpng.so:graphics/png \
 		libpoppler.so:graphics/poppler \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
 		libquazip1-qt5.so:archivers/quazip \
 		libraw.so:graphics/libraw \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libxcb.so:x11/libxcb \
 		libxcb-util.so:x11/xcb-util
 
 # Disable ninja generator for now (with gmake), until the duplicate test targets are resolved upstream.
 USES=		cmake compiler:c++11-lib desktop-file-utils \
 		eigen:3 gettext jpeg kde:5 localbase:ldflags pkgconfig \
 		python:3.7+ qt:5 shared-mime-info tar:xz xorg
 USE_KDE=	archive completion config coreaddons crash guiaddons i18n \
 		itemmodels itemviews kio service widgetsaddons windowsystem
 USE_QT=		concurrent core dbus declarative gui multimedia network printsupport \
 		sql svg testlib widgets x11extras xml sql-sqlite3:run \
 		buildtools:build qmake:build
 USE_XORG=	ice sm xcb xext xi
 
 CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_PyQt5:BOOL=true
 
 OPTIONS_DEFINE=		GMIC OPENEXR
 OPTIONS_DEFAULT=	OPENEXR
 OPTIONS_SUB=		yes
 
 GMIC_DESC=		Depend on the G'Mic plugin #'
 GMIC_RUN_DEPENDS=	gmic_krita_qt:graphics/gmic-qt@krita
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
 			libKSeExpr.so:graphics/kseexpr
 OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 
 PLIST_SUB=	SHLIB_VER=18.0.0 \
 		SHLIB_SHVER=18
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 BUILD_DEPENDS+=	vc>=1.1.0:devel/vc
 .else
 CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_Vc=ON
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile
index cac19b6f5760..716308e9d3db 100644
--- a/graphics/libjxl/Makefile
+++ b/graphics/libjxl/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	libjxl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.0
+DISTVERSION=	0.8.0rc1
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	JPEG XL reference encoder/decoder
 WWW=		https://jpeg.org/jpegxl/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libbrotlienc.so:archivers/brotli \
 		libhwy.so:devel/highway
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++11-lib cpe localbase:ldflags pkgconfig shared-mime-info
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
-GH_TUPLE=	jbeich:skcms:6437475:skcms/third_party/skcms \
-		libjxl:testdata:d81acac:testdata/third_party/testdata \
+GH_TUPLE=	jbeich:skcms:b25b07b:skcms/third_party/skcms \
+		libjxl:testdata:d6168ff:testdata/third_party/testdata \
 		webmproject:sjpeg:868ab55:sjpeg/third_party/sjpeg \
 		${NULL}
 CMAKE_ON=	JPEGXL_ENABLE_PLUGINS
 CMAKE_OFF=	${BENCHMARK FUZZERS TCMALLOC:L:S/^/JPEGXL_ENABLE_/}
 CMAKE_OFF+=	${OpenGL GLUT:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} # sjpeg
 CMAKE_OFF+=	${CMAKE_TESTING_ON}
 LDFLAGS+=	-Wl,--as-needed # brotlicommon, OPENEXR/PNG deps
 
 OPTIONS_DEFINE=	GIF JPEG LTO MANPAGES OPENEXR PIXBUF PNG
 OPTIONS_DEFAULT=GIF JPEG LTO MANPAGES OPENEXR PIXBUF PNG
 OPTIONS_EXCLUDE_i386=	LTO # ConvolutionWithTranspose(): JXL_CHECK: out->xsize() == in.ysize()
 OPTIONS_EXCLUDE_powerpc64=	${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # https://github.com/llvm/llvm-project/issues/46697
 OPTIONS_EXCLUDE_riscv64=	LTO # bug 262871
 OPTIONS_SUB=	yes
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_GIF
 
 JPEG_USES=		jpeg
 JPEG_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_JPEG
 
 LTO_CMAKE_BOOL=		CMAKE_INTERPROCEDURAL_OPTIMIZATION
 LTO_CMAKE_ON=		-DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW
 
 MANPAGES_BUILD_DEPENDS=	a2x:textproc/asciidoc
 MANPAGES_USES=		python:build
 MANPAGES_CMAKE_BOOL=	JPEGXL_ENABLE_MANPAGES
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_CMAKE_BOOL=	JPEGXL_ENABLE_OPENEXR
 
 PIXBUF_USES=		gnome
 PIXBUF_USE=		GNOME=gdkpixbuf2
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_PNG
 
 post-patch:
 	@${REINPLACE_CMD} 's,/usr,${LOCALBASE},' \
 		${WRKSRC}/plugins/gdk-pixbuf/jxl.thumbnailer
 
 post-patch-PIXBUF-off:
 	@${REINPLACE_CMD} -i.nopixbuf '/gdk-pixbuf/d' ${WRKSRC}/plugins/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/graphics/libjxl/distinfo b/graphics/libjxl/distinfo
index 0676c9a91868..eac9cc6829e5 100644
--- a/graphics/libjxl/distinfo
+++ b/graphics/libjxl/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1663763390
-SHA256 (libjxl-libjxl-v0.7.0_GH0.tar.gz) = 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e
-SIZE (libjxl-libjxl-v0.7.0_GH0.tar.gz) = 1505917
-SHA256 (jbeich-skcms-6437475_GH0.tar.gz) = 6818ea7aa053a964d1795d6d1d3c5e2aad5d30dff9817c8e604e324ef643ec01
-SIZE (jbeich-skcms-6437475_GH0.tar.gz) = 9200034
-SHA256 (libjxl-testdata-d81acac_GH0.tar.gz) = ae76a2bf3cbbeb927ad2570f08da6cfb0157ac8d3284ba5003848d1514489909
-SIZE (libjxl-testdata-d81acac_GH0.tar.gz) = 26789139
+TIMESTAMP = 1673608669
+SHA256 (libjxl-libjxl-v0.8.0rc1_GH0.tar.gz) = a94f3a011b0238d20c9dab3f7c5e6cfcc7bd669f2d9fd9aec89b8a43c51ba7f5
+SIZE (libjxl-libjxl-v0.8.0rc1_GH0.tar.gz) = 1611950
+SHA256 (jbeich-skcms-b25b07b_GH0.tar.gz) = 3e1ce9bb99269f1093d1e4e04bcbdbbecf0920a0c67abace278e37c61b93fb0e
+SIZE (jbeich-skcms-b25b07b_GH0.tar.gz) = 10041269
+SHA256 (libjxl-testdata-d6168ff_GH0.tar.gz) = ed133d390a516ff9f52f17ec4c43d15d735d99a39f39b76c17b5f4084ae15c40
+SIZE (libjxl-testdata-d6168ff_GH0.tar.gz) = 67547424
 SHA256 (webmproject-sjpeg-868ab55_GH0.tar.gz) = ffe757b376fed2fd94473f8625c25f82a3a23aa317fb1bbf1ac8159b6e0a7726
 SIZE (webmproject-sjpeg-868ab55_GH0.tar.gz) = 2472084
diff --git a/graphics/libjxl/pkg-plist b/graphics/libjxl/pkg-plist
index 844c10471f0f..c6da4ad5cb19 100644
--- a/graphics/libjxl/pkg-plist
+++ b/graphics/libjxl/pkg-plist
@@ -1,39 +1,39 @@
 bin/cjpeg_hdr
 bin/cjxl
 bin/djxl
 bin/jxlinfo
 include/jxl/butteraugli.h
 include/jxl/butteraugli_cxx.h
 include/jxl/cms_interface.h
 include/jxl/codestream_header.h
 include/jxl/color_encoding.h
 include/jxl/decode.h
 include/jxl/decode_cxx.h
 include/jxl/encode.h
 include/jxl/encode_cxx.h
 include/jxl/jxl_export.h
 include/jxl/jxl_threads_export.h
 include/jxl/memory_manager.h
 include/jxl/parallel_runner.h
 include/jxl/resizable_parallel_runner.h
 include/jxl/resizable_parallel_runner_cxx.h
 include/jxl/thread_parallel_runner.h
 include/jxl/thread_parallel_runner_cxx.h
 include/jxl/types.h
 include/jxl/version.h
 %%PIXBUF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jxl.so
 lib/libjxl.a
 lib/libjxl.so
-lib/libjxl.so.0.7
-lib/libjxl.so.0.7.0
+lib/libjxl.so.0.8
+lib/libjxl.so.0.8.0
 lib/libjxl_dec.a
 lib/libjxl_threads.a
 lib/libjxl_threads.so
-lib/libjxl_threads.so.0.7
-lib/libjxl_threads.so.0.7.0
+lib/libjxl_threads.so.0.8
+lib/libjxl_threads.so.0.8.0
 libdata/pkgconfig/libjxl.pc
 libdata/pkgconfig/libjxl_threads.pc
 %%MANPAGES%%share/man/man1/cjxl.1.gz
 %%MANPAGES%%share/man/man1/djxl.1.gz
 share/mime/packages/image-jxl.xml
 %%PIXBUF%%share/thumbnailers/jxl.thumbnailer
diff --git a/graphics/sdl2_image/Makefile b/graphics/sdl2_image/Makefile
index 27fbfe5e9b34..61074cb75eed 100644
--- a/graphics/sdl2_image/Makefile
+++ b/graphics/sdl2_image/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	sdl2_image
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	2.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple library to load images of various formats as SDL surfaces
 WWW=		https://github.com/libsdl-org/SDL_image
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cmake sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	libsdl-org
 GH_PROJECT=	SDL_image
 USE_SDL=	sdl2
 CMAKE_OFF=	SDL2IMAGE_DEPS_SHARED \
 		SDL2IMAGE_SAMPLES \
 		SDL2IMAGE_BACKEND_STB
 CMAKE_ARGS=	-DSDL2IMAGE_DEBUG_POSTFIX:STRING=
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	AVIF JPEG JXL PNG TIFF WEBP TEST
 OPTIONS_DEFAULT=AVIF JPEG JXL PNG
 
 JPEG_USES=		jpeg
 JPEG_CMAKE_BOOL=	SDL2IMAGE_JPG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CMAKE_BOOL=		SDL2IMAGE_PNG
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_BOOL=	SDL2IMAGE_TIF
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CMAKE_BOOL=	SDL2IMAGE_WEBP
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
 AVIF_CMAKE_BOOL=	SDL2IMAGE_AVIF
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_CMAKE_BOOL=		SDL2IMAGE_JXL
 TEST_CMAKE_BOOL=	SDL2IMAGE_TESTS
 TEST_CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 TEST_LIB_DEPENDS=	libunwind.so:devel/libunwind
 TEST_TEST_TARGET=	test
 TEST_IMPLIES=		PNG JPEG  # does not build otherwise
 TEST_BROKEN=		does not build  # XXX: probably devel/sdl20 problem
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/external
 
 .include <bsd.port.mk>
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index c124578a29d2..f443464b9b40 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -1,105 +1,105 @@
 PORTNAME=	vips
 PORTVERSION=	8.13.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Free image processing system
 WWW=		https://libvips.github.io/libvips
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang cpe gettext gmake gnome libtool localbase pathfix pkgconfig python shebangfix
 USE_GNOME=	glib20
 
 CONFIGURE_ARGS=	--disable-introspection \
 		--without-doxygen \
 		--without-imagequant \
 		--without-nifti \
 		--without-openslide \
 		--without-pdfium
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
 SHEBANG_FILES=	tools/vips-${PORTVERSION:R} tools/vipsprofile
 
 OPTIONS_DEFINE=	CFITSIO DEBUG DOCS FFTW GIF GSF HEIF JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER TIFF WEBP X11
 OPTIONS_RADIO=	MAGICK
 OPTIONS_RADIO_MAGICK=	IMAGEMAGICK GRAPHMAGICK
 OPTIONS_DEFAULT=CFITSIO FFTW GIF GSF HEIF IMAGEMAGICK JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER TIFF WEBP X11
 GSF_DESC=	Structured file formats support
 ORC_DESC=	ORC language support
 MATIO_DESC=	Matlab MAT format support
 
 CFITSIO_CONFIGURE_WITH=	cfitsio
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 DEBUG_CONFIGURE_ENABLE=	debug
 DEBUG_INSTALL_TARGET_OFF=	install-strip
 DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
 DOCS_CONFIGURE_ENABLE=	gtk-doc gtk-doc-html
 FFTW_CONFIGURE_WITH=	fftw
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 GIF_CONFIGURE_WITH=	giflib
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GRAPHMAGICK_CONFIGURE_ON=	--with-magickpackage=GraphicsMagick
 GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
 GSF_CONFIGURE_WITH=	gsf
 GSF_USE=		GNOME=libgsf
 HEIF_CONFIGURE_WITH=	heif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 IMAGEMAGICK_CONFIGURE_ON=	--with-magickpackage=MagickCore
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 JPEG_USES=		jpeg
 JXL_CONFIGURE_WITH=	libjxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 LCMS2_CONFIGURE_WITH=	lcms
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LIBEXIF_CONFIGURE_WITH=	libexif
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBRSVG2_CONFIGURE_WITH=rsvg
 LIBRSVG2_USE=		GNOME=cairo,librsvg2
 MATIO_CONFIGURE_WITH=	matio
 MATIO_LIB_DEPENDS=	libmatio.so:math/matio
 OPENEXR_CONFIGURE_WITH=	OpenEXR
 OPENEXR_LIB_DEPENDS=	libImath.so:math/Imath libOpenEXR.so:graphics/openexr
 ORC_CONFIGURE_WITH=	orc
 ORC_LIB_DEPENDS=	liborc-0.4.so:devel/orc
 PANGO_CONFIGURE_WITH=	pangoft2
 PANGO_USE=		GNOME=pango
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 POPPLER_CONFIGURE_WITH=	poppler
 POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 POPPLER_USE=		GNOME=cairo
 TIFF_CONFIGURE_WITH=	tiff
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 WEBP_CONFIGURE_WITH=	libwebp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 X11_CONFIGURE_WITH=	x
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
 .if ${PORT_OPTIONS:MX11}
 USES+=		magick:7
 .else
 USES+=		magick:7,nox11
 .endif
 .endif
 
 .if !${PORT_OPTIONS:MGRAPHMAGICK} && !${PORT_OPTIONS:MIMAGEMAGICK}
 CONFIGURE_ARGS+=--without-magick
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index e933c08ce571..9e65dd285458 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AV1 reference encoder/decoder
 WWW=		https://aomedia.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USES=		cmake compiler:c++11-lib perl5
 USE_GITHUB=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	jbeich # mirror
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	ENABLE_DOCS ENABLE_TESTS
 
 OPTIONS_DEFINE=	JXL VMAF
 OPTIONS_DEFAULT=JXL VMAF
 
 JXL_DESC=		Encoding tuning for Butteraugli
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_USES=		pkgconfig
 JXL_CMAKE_ON=		-DCONFIG_TUNE_BUTTERAUGLI:STRING=1
 
 VMAF_DESC=		Encoding tuning for VMAF
 VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 VMAF_USES=		pkgconfig
 VMAF_CMAKE_ON=		-DCONFIG_TUNE_VMAF:STRING=1
 
 post-patch:
 # Extract (snapshot) version from the port instead of CHANGELOG
 	@${REINPLACE_CMD} 's,$${AOM_ROOT}/CHANGELOG,${DISTVERSIONFULL:S/^v//},' \
 		${WRKSRC}/build/cmake/version.cmake
 
 .include <bsd.port.mk>
diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
index 79a3a357d78a..8ba21df7685a 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	swayimg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Image viewer for Sway/Wayland
 WWW=		https://github.com/artemsen/swayimg
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libepoll-shim.so:devel/libepoll-shim \
 		libwayland-client.so:graphics/wayland \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	artemsen
 MESON_ARGS=	-Dversion="${DISTVERSIONFULL}"
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz \
 		man/man5/${PORTNAME}rc.5.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/icons/hicolor/64x64/apps/${PORTNAME}.png \
 		${NULL}
 
 OPTIONS_DEFINE=	BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP ZSH
 OPTIONS_DEFAULT=BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP ZSH
 OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}
 
 BASH_BUILD_DEPENDS=	bash-completion>0:shells/bash-completion
 BASH_MESON_ENABLED=	bash
 BASH_PLIST_FILES=	share/bash-completion/completions/${PORTNAME}
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_USES=		localbase:ldflags
 GIF_MESON_ENABLED=	gif
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_MESON_ENABLED=	heif
 
 JPEG_USES=		jpeg
 JPEG_MESON_ENABLED=	jpeg
 
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_MESON_ENABLED=	jxl
 
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_MESON_ENABLED=	exif
 
 LIBRSVG2_USES=		gnome
 LIBRSVG2_USE=		GNOME=cairo,librsvg2
 LIBRSVG2_MESON_ENABLED=	svg
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MESON_ENABLED=	png
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MESON_ENABLED=	tiff
 
 WEBP_LIB_DEPENDS=	libwebpdemux.so:graphics/webp
 WEBP_MESON_ENABLED=	webp
 
 ZSH_MESON_ENABLED=	zsh
 ZSH_PLIST_FILES=	share/zsh/site-functions/_${PORTNAME}
 
 .include <bsd.port.mk>