diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 03bb4aa15e94..0f90d7a71fa5 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,346 +1,346 @@
 PORTNAME=	ImageMagick
 DISTVERSION=	7.1.0-43
-PORTREVISION=	3
+PORTREVISION=	4
 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
 
 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/geeqie/Makefile b/graphics/geeqie/Makefile
index f232fb9db745..7cc15f49bdd6 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,111 +1,111 @@
 PORTNAME=	geeqie
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Lightweight image viewer forked from GQview
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
 RUN_DEPENDS=	bash:shells/bash
 
 CONFLICTS=	geeqie-devel
 
 USES=		autoreconf compiler:c++11-lang gmake gnome jpeg \
 		localbase pkgconfig desktop-file-utils tar:xz lua:53 shebangfix
 USE_GNOME=	cairo gdkpixbuf2 intltool
 USE_GITHUB=	yes
 GH_ACCOUNT=	BestImageViewer
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readmedir="${DOCSDIR}"
 SHEBANG_FILES=	plugins/*/geeqie-*
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	EXIV2 LCMS LIRC MAP FFMPEGTHUMBNAILER DOCS NLS ARCHIVE
 OPTIONS_DEFAULT=EXIV2 LCMS GTK3 PDF FFMPEGTHUMBNAILER HEIF WEBP DJVU OPENJPEG RAW ARCHIVE JXL
 OPTIONS_SINGLE=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=GTK2 GTK3
 OPTIONS_GROUP=	FORMATS
 OPTIONS_GROUP_FORMATS=	TIFF PDF HEIF WEBP DJVU OPENJPEG RAW JXL
 OPTIONS_SUB=	yes
 
 EXIV2_DESC=	Metadata editing
 LCMS_DESC=	Color adjusting
 LIRC_DESC=	Remote control (broken)
 MAP_DESC=	GPS map support via libchamplain
 TOOLKIT_DESC=	Graphical user interface toolkit
 FORMATS_DESC=	Image formats support
 GTK2_DESC=	Use GTK 2
 GTK3_DESC=	Use GTK 3
 
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_ENABLE=	exiv2
 
 LCMS_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS_CONFIGURE_ENABLE=	lcms
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_ENABLE=	lirc
 LIRC_CONFIGURE_ON=	--with-lirc-prefix="${LOCALBASE}"
 LIRC_BROKEN=		does not build with old lirc from ports
 
 MAP_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
 			libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 			libclutter-1.0.so:graphics/clutter \
 			libcogl.so:graphics/cogl \
 			libjson-glib-1.0.so:devel/json-glib
 
 MAP_CONFIGURE_ENABLE=	map gpu-accel
 MAP_REQUIRES=		GTK3
 MAP_USES=		gl xorg
 MAP_USE=		GL=egl XORG=xrandr,x11,xext,xdamage,xfixes,xcomposite,xi
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CONFIGURE_ENABLE=	tiff
 
 GTK2_USE=		GNOME=gtk20
 GTK3_USE=		GNOME=gtk30
 GTK3_CONFIGURE_ENABLE=	gtk3
 
 PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 PDF_CONFIGURE_ENABLE=	pdf
 PDF_REQUIRES=		GTK3
 
 FFMPEGTHUMBNAILER_DESC=	Video file thumbnails generating support
 FFMPEGTHUMBNAILER_CONFIGURE_ENABLE=	ffmpegthumbnailer
 FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
 
 GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libfontconfig.so:x11-fonts/fontconfig
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-tools
 
 HEIF_CONFIGURE_ENABLE=	heif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 
 WEBP_CONFIGURE_ENABLE=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 DJVU_CONFIGURE_ENABLE=	djvu
 DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 
 OPENJPEG_CONFIGURE_ENABLE=	j2k
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 RAW_CONFIGURE_ENABLE=	raw
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
 
 ARCHIVE_CONFIGURE_ENABLE=	archive
 ARCHIVE_USES=		libarchive
 
 JXL_CONFIGURE_ENABLE=	jpegxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 4bc3c243efb9..0068546f29c8 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,156 +1,156 @@
 PORTNAME?=	gimp
 PORTVERSION=	2.10.32
-PORTREVISION=	4
+PORTREVISION=	5
 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
 
 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 5a2d98ea31ff..7440a026bef3 100644
--- a/graphics/gimp-jxl-plugin/Makefile
+++ b/graphics/gimp-jxl-plugin/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	gimp-jxl-plugin
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.1
+DISTVERSION=	0.7rc
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	GIMP plugin to read/write JPEG XL images
 
 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 adc343eb2152..528d2cabbfad 100644
--- a/graphics/gimp-jxl-plugin/distinfo
+++ b/graphics/gimp-jxl-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635545136
-SHA256 (libjxl-libjxl-v0.6.1_GH0.tar.gz) = ccbd5a729d730152303be399f033b905e608309d5802d77a61a95faa092592c5
-SIZE (libjxl-libjxl-v0.6.1_GH0.tar.gz) = 16953185
+TIMESTAMP = 1659708598
+SHA256 (libjxl-libjxl-v0.7rc_GH0.tar.gz) = 17148629624e328cd015439b37bf07fc49245afefa1abaa50ef9e7a56028dcef
+SIZE (libjxl-libjxl-v0.7rc_GH0.tar.gz) = 1505052
diff --git a/graphics/imlib2-jxl/Makefile b/graphics/imlib2-jxl/Makefile
index f3a054521aca..2f513247a906 100644
--- a/graphics/imlib2-jxl/Makefile
+++ b/graphics/imlib2-jxl/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	imlib2-jxl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	JPEG XL loader for imlib2
 
 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 819a78abfbda..9946f7000950 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/libjxl/Makefile b/graphics/libjxl/Makefile
index b1b7795c8b1f..0968109876ce 100644
--- a/graphics/libjxl/Makefile
+++ b/graphics/libjxl/Makefile
@@ -1,80 +1,66 @@
 PORTNAME=	libjxl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.1
-PORTREVISION=	6
+DISTVERSION=	0.7rc
 CATEGORIES=	graphics
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	adb32f3f8f37.patch:-p1 # https://github.com/libjxl/libjxl/pull/193
-PATCHFILES+=	c31dca74e68f.patch:-p1 # https://github.com/libjxl/libjxl/pull/678
-PATCHFILES+=	0b70567432ab.patch:-p1 # https://github.com/libjxl/libjxl/pull/797
-PATCHFILES+=	e0107a6ca637.patch:-p1 # https://github.com/libjxl/libjxl/pull/847
-PATCHFILES+=	e903d53a58b4.patch:-p1 # https://github.com/libjxl/libjxl/pull/1071
-PATCHFILES+=	600b59153882.patch:-p1 # https://github.com/libjxl/libjxl/pull/1156
-PATCHFILES+=	98d25826edc1.patch:-p1 # https://github.com/libjxl/libjxl/pull/1343
-PATCHFILES+=	1f849bd28145.patch:-p1 # https://github.com/libjxl/libjxl/pull/1369
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	JPEG XL reference encoder/decoder
 
-LICENSE=	BSD3CLAUSE ZLIB
-LICENSE_COMB=	multi
-LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE
-LICENSE_FILE_ZLIB=	${WRKSRC}/third_party/lodepng/LICENSE
+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 \
-		lvandeve:lodepng:48e5364:lodepng/third_party/lodepng \
+		libjxl:testdata:d81acac:testdata/third_party/testdata \
 		webmproject:sjpeg:868ab55:sjpeg/third_party/sjpeg \
 		${NULL}
 CMAKE_ON=	JPEGXL_ENABLE_PLUGINS
 CMAKE_OFF=	JPEGXL_WARNINGS_AS_ERRORS ${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=	libImath.so:math/Imath \
-			libOpenEXR.so:graphics/openexr
+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 f55542f9a3b0..dc58a9ad9fa1 100644
--- a/graphics/libjxl/distinfo
+++ b/graphics/libjxl/distinfo
@@ -1,25 +1,9 @@
-TIMESTAMP = 1635545136
-SHA256 (libjxl-libjxl-v0.6.1_GH0.tar.gz) = ccbd5a729d730152303be399f033b905e608309d5802d77a61a95faa092592c5
-SIZE (libjxl-libjxl-v0.6.1_GH0.tar.gz) = 16953185
+TIMESTAMP = 1659708598
+SHA256 (libjxl-libjxl-v0.7rc_GH0.tar.gz) = 17148629624e328cd015439b37bf07fc49245afefa1abaa50ef9e7a56028dcef
+SIZE (libjxl-libjxl-v0.7rc_GH0.tar.gz) = 1505052
 SHA256 (jbeich-skcms-6437475_GH0.tar.gz) = 6818ea7aa053a964d1795d6d1d3c5e2aad5d30dff9817c8e604e324ef643ec01
 SIZE (jbeich-skcms-6437475_GH0.tar.gz) = 9200034
-SHA256 (lvandeve-lodepng-48e5364_GH0.tar.gz) = 41e0bcc686e31ee2d51a6c87c0089045f4805e4053d39026ad02e8aa90c782c1
-SIZE (lvandeve-lodepng-48e5364_GH0.tar.gz) = 239988
+SHA256 (libjxl-testdata-d81acac_GH0.tar.gz) = ae76a2bf3cbbeb927ad2570f08da6cfb0157ac8d3284ba5003848d1514489909
+SIZE (libjxl-testdata-d81acac_GH0.tar.gz) = 26789139
 SHA256 (webmproject-sjpeg-868ab55_GH0.tar.gz) = ffe757b376fed2fd94473f8625c25f82a3a23aa317fb1bbf1ac8159b6e0a7726
 SIZE (webmproject-sjpeg-868ab55_GH0.tar.gz) = 2472084
-SHA256 (adb32f3f8f37.patch) = 52e4fd7e1bce238731a9a1a0b1c9124624c6f85766d3debaf2d2e0f017471692
-SIZE (adb32f3f8f37.patch) = 5664
-SHA256 (c31dca74e68f.patch) = c6a1412d73f1ee156d4cc978fde7e5ec91e62bae9946ebb38a5e78be7f93a253
-SIZE (c31dca74e68f.patch) = 767
-SHA256 (0b70567432ab.patch) = 3141d2f814e196c89b254692ab5eb911164c906ac58d78b009331f5ac01f4d6b
-SIZE (0b70567432ab.patch) = 5886
-SHA256 (e0107a6ca637.patch) = c1c130d786503c9e1ee479c3d2736320b5c52866d9acf9d5ab46bdb8ef39bd90
-SIZE (e0107a6ca637.patch) = 15581
-SHA256 (e903d53a58b4.patch) = 32a04b4f9f88e2dcbbdef2ca3b03a52b38d22ccda806fd98df67ed46cb2b3cb9
-SIZE (e903d53a58b4.patch) = 4937
-SHA256 (600b59153882.patch) = d432c690ae59e2ce2b43fd45eb2d6c849178aad782b839f824bfb133d84b8d3a
-SIZE (600b59153882.patch) = 1697
-SHA256 (98d25826edc1.patch) = 24031f56b6cf7f55f463e566d788c22b7adf17da939dafc73947f919350b2120
-SIZE (98d25826edc1.patch) = 1387
-SHA256 (1f849bd28145.patch) = 834bc7c9a260c47cff25ad27ddf8f6a79a2ce71a62bd541a1d22cb6027dcec4f
-SIZE (1f849bd28145.patch) = 987
diff --git a/graphics/libjxl/pkg-plist b/graphics/libjxl/pkg-plist
index 91051800f600..e19126abd3ff 100644
--- a/graphics/libjxl/pkg-plist
+++ b/graphics/libjxl/pkg-plist
@@ -1,35 +1,38 @@
+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
 %%PIXBUF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jxl.so
 lib/libjxl.a
 lib/libjxl.so
-lib/libjxl.so.0.6
-lib/libjxl.so.0.6.1
+lib/libjxl.so.0.7
+lib/libjxl.so.0.7.0
 lib/libjxl_dec.a
 lib/libjxl_threads.a
 lib/libjxl_threads.so
-lib/libjxl_threads.so.0.6
-lib/libjxl_threads.so.0.6.1
+lib/libjxl_threads.so.0.7
+lib/libjxl_threads.so.0.7.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/vips/Makefile b/graphics/vips/Makefile
index 80e019262beb..6e8f87753aca 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -1,104 +1,104 @@
 PORTNAME=	vips
 PORTVERSION=	8.12.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Free image processing system
 
 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 a10fbc96cb14..2b15c6a5b82f 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AV1 reference encoder/decoder
 
 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 707c1e28560a..61ed15eeeaab 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	swayimg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	2a07af9d2362.patch:-p1 # https://github.com/artemsen/swayimg/issues/37
 PATCHFILES+=	2e885eadec15.patch:-p1 # https://github.com/artemsen/swayimg/pull/36
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Image viewer for Sway/Wayland
 
 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=	AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP
 OPTIONS_DEFAULT=AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP
 OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}
 
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
 AVIF_MESON_ENABLED=	avif
 
 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
 
 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=	libwebp.so:graphics/webp
 WEBP_MESON_ENABLED=	webp
 
 .include <bsd.port.mk>