diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index a2c2c4526d31..cfd8593f3c34 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,99 +1,82 @@
 # Created by: Ron van Daal
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.3.36
-PORTREVISION=	1
+DISTVERSION=	1.3.37
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	SF \
-		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${PORTVERSION:R}/
+MASTER_SITES=	SF
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
 LICENSE=	MIT
 
-USES=		cpe libtool localbase pathfix tar:bzip2
+USES=		cpe libtool localbase pathfix tar:xz
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
+CONFIGURE_ENV=	PTHREAD_LIBS=-lpthread
 CONFIGURE_ARGS=	--enable-shared --enable-static \
 		--with-windows-font-dir=${WINDOWS_FONT_DIR} \
 		--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 JASPER JBIG JPEG 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
+OPTIONS_DEFINE=	DOCS FPX FREETYPE JASPER JBIG JPEG LCMS2 OPENMP Q8BIT PNG TEST TIFF WEBP WMF X11 XML ZSTD
+OPTIONS_DEFAULT=FREETYPE JASPER JBIG JPEG LCMS2 OPENMP PNG TIFF WEBP WMF X11 XML
 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
+FPX_CONFIGURE_WITH=	fpx
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
-JASPER_CONFIGURE_WITH=	jp2
+FREETYPE_CONFIGURE_WITH=ttf
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
-JBIG_CONFIGURE_WITH=	jbig
+JASPER_CONFIGURE_WITH=	jp2
 JBIG_LIB_DEPENDS=	libjbig.so:graphics/jbigkit
-JPEG_CONFIGURE_WITH=	jpeg
+JBIG_CONFIGURE_WITH=	jbig
 JPEG_USES=		jpeg
-LCMS2_CONFIGURE_WITH=	lcms2
+JPEG_CONFIGURE_WITH=	jpeg
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
-LZMA_CONFIGURE_WITH=	lzma
+LCMS2_CONFIGURE_WITH=	lcms2
 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
+PNG_CONFIGURE_WITH=	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
+TIFF_CONFIGURE_WITH=	tiff
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
+WEBP_CONFIGURE_WITH=	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
+X11_CONFIGURE_OFF=	ac_cv_lib_ICE_IceConnectionNumber=no
+X11_CONFIGURE_WITH=	x
 XML_USES=		gnome
-ZLIB_CONFIGURE_WITH=	zlib
-ZSTD_CONFIGURE_WITH=	zstd
+XML_USE=		GNOME=libxml2
+XML_CONFIGURE_WITH=	xml
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
+ZSTD_CONFIGURE_WITH=	zstd
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMP}
-.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le
+.if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le
 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
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index 0de99fd38e49..f3abde5e27b9 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609598843
-SHA256 (GraphicsMagick-1.3.36.tar.bz2) = 2017829803cb0810bbc8284eee703dfeb1ac0a46f5a39940d30b4a2f5eeae435
-SIZE (GraphicsMagick-1.3.36.tar.bz2) = 8464166
+TIMESTAMP = 1639387126
+SHA256 (GraphicsMagick-1.3.37.tar.xz) = 90dc22f1a7bd240e4c9065a940962bf13da43c99bcc36cb111cc3c1a0d7477d4
+SIZE (GraphicsMagick-1.3.37.tar.xz) = 5623688
diff --git a/graphics/GraphicsMagick/files/patch-utilities_tests_convert.tap b/graphics/GraphicsMagick/files/patch-utilities_tests_convert.tap
new file mode 100644
index 000000000000..164656a5b87e
--- /dev/null
+++ b/graphics/GraphicsMagick/files/patch-utilities_tests_convert.tap
@@ -0,0 +1,11 @@
+--- utilities/tests/convert.tap.orig	2021-12-17 20:43:52 UTC
++++ utilities/tests/convert.tap
+@@ -8,7 +8,7 @@
+ commands=${top_srcdir}/utilities/tests/convert-cmds.txt
+ 
+ # Count how many commands there are
+-count=`wc -l ${commands} | sed -e 's/ .*//'`
++count=`sed -n '$=' ${commands}`
+ 
+ # Number of tests we plan to execute
+ test_plan_fn ${count}
diff --git a/graphics/GraphicsMagick/pkg-plist b/graphics/GraphicsMagick/pkg-plist
index 84368876f6cb..3ec1c92b6c2d 100644
--- a/graphics/GraphicsMagick/pkg-plist
+++ b/graphics/GraphicsMagick/pkg-plist
@@ -95,15 +95,15 @@ lib/GraphicsMagick/config/type.mgk
 lib/libGraphicsMagick++.a
 lib/libGraphicsMagick++.so
 lib/libGraphicsMagick++.so.12
-lib/libGraphicsMagick++.so.12.5.0
+lib/libGraphicsMagick++.so.12.5.1
 lib/libGraphicsMagick.a
 lib/libGraphicsMagick.so
 lib/libGraphicsMagick.so.3
-lib/libGraphicsMagick.so.3.22.0
+lib/libGraphicsMagick.so.3.23.0
 lib/libGraphicsMagickWand.a
 lib/libGraphicsMagickWand.so
 lib/libGraphicsMagickWand.so.2
-lib/libGraphicsMagickWand.so.2.9.5
+lib/libGraphicsMagickWand.so.2.9.6
 libdata/pkgconfig/GraphicsMagick++.pc
 libdata/pkgconfig/GraphicsMagick.pc
 libdata/pkgconfig/GraphicsMagickWand.pc
@@ -136,6 +136,7 @@ man/man5/quantize.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2017
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2018
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2019
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2020
 %%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2001.html
@@ -157,6 +158,7 @@ man/man5/quantize.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2017.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2018.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2019.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2020.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html