diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index ca005bdce131..a606be9f1177 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,114 +1,112 @@
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.3.38
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
 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 SSE TEST TIFF UMEM WEBP WMF X11 XML ZLIB ZSTD
-OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB
-JXL_DESC=	JPEG XL image format via libjxl (BROKEN now)
+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)
 UMEM_DESC=	UMEM memory allocation library support
 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_BROKEN=		does not build: use of undeclared identifier 'JxlEncoderFrameSettings'
 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
 UMEM_CONFIGURE_WITH=	umem
 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} != powerpc64 && ${ARCH} != powerpc64le && ${ARCH} != riscv64
 USES+=		compiler:gcc-c++11-lib
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MSSE}
 .if ${MACHINE_CPU:Msse}
 CFLAGS+=	-msse
 .endif
 .if ${MACHINE_CPU:Msse2}
 CFLAGS+=	-msse2
 .endif
 .if ${MACHINE_CPU:Msse3}
 CFLAGS+=	-msse3
 .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/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure
index 92a9e3083493..01011aea16aa 100644
--- a/graphics/GraphicsMagick/files/patch-configure
+++ b/graphics/GraphicsMagick/files/patch-configure
@@ -1,89 +1,102 @@
 --- configure.orig	2015-02-28 20:53:46 UTC
 +++ configure
 @@ -13277,7 +13277,6 @@ fi
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 -      hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        ;;
 @@ -24497,60 +24496,6 @@ else
      X_CFLAGS="$X_CFLAGS -I$x_includes"
    fi
  
 -  # It would also be nice to do this for all -L options, not just this one.
 -  if test -n "$x_libraries"; then
 -    X_LIBS="$X_LIBS -L$x_libraries"
 -    # For Solaris; some versions of Sun CC require a space after -R and
 -    # others require no space.  Words are not sufficient . . . .
 -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
 -$as_echo_n "checking whether -R must be followed by a space... " >&6; }
 -    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
 -    ac_xsave_c_werror_flag=$ac_c_werror_flag
 -    ac_c_werror_flag=yes
 -    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -int
 -main ()
 -{
 -
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -if ac_fn_c_try_link "$LINENO"; then :
 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -       X_LIBS="$X_LIBS -R$x_libraries"
 -else
 -  LIBS="$ac_xsave_LIBS -R $x_libraries"
 -       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -int
 -main ()
 -{
 -
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -if ac_fn_c_try_link "$LINENO"; then :
 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 -$as_echo "yes" >&6; }
 -	  X_LIBS="$X_LIBS -R $x_libraries"
 -else
 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
 -$as_echo "neither works" >&6; }
 -fi
 -rm -f core conftest.err conftest.$ac_objext \
 -    conftest$ac_exeext conftest.$ac_ext
 -fi
 -rm -f core conftest.err conftest.$ac_objext \
 -    conftest$ac_exeext conftest.$ac_ext
 -    ac_c_werror_flag=$ac_xsave_c_werror_flag
 -    LIBS=$ac_xsave_LIBS
 -  fi
  
    # Check for system-dependent libraries X programs must link with.
    # Do this before checking for the system-independent R6 libraries
+@@ -27336,10 +27281,8 @@ $as_echo "no -- some components failed test" >&6; }
+ $as_echo "no -- some components failed test" >&6; }
+         have_jxl='no (failed tests)'
+     else
+-        # JXL is a C++ Lib so requires linking with stdc++.
+-        # TODO: A better solution would be to tell automake to do any linking with
+-        # c++, but I can't figure out a way to get this working.
+-        LIB_JXL='-ljxl -ljxl_threads -lhwy -lbrotlidec -lbrotlienc -lstdc++'
++        # TODO: use pkg-config
++        LIB_JXL='-ljxl -ljxl_threads'
+         LIBS="$LIB_JXL $LIBS"
+ 
+ $as_echo "#define HasJXL 1" >>confdefs.h
 @@ -27703,7 +27649,7 @@ fi
  #
  
  # Subdirectory under lib to place GraphicsMagick lib files
 -MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
 +MagickLibSubdir="${PACKAGE_NAME}"
  
  cat >>confdefs.h <<_ACEOF
  #define MagickLibSubdir "$MagickLibSubdir"
 @@ -27807,7 +27753,7 @@ _ACEOF
  
  #
  # Path to GraphicsMagick share files
 -MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
 +MagickShareSubdir="${PACKAGE_NAME}"
  MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
  MagickSharePathDefine="${MagickSharePath}/"
  case "${build_os}" in