diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index d0864d714011..b91572a9b9b4 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,183 +1,182 @@
 # Created by: Randall Hopper
 
 PORTNAME=	gdal
-PORTVERSION=	3.3.0
-PORTREVISION=	2
+PORTVERSION=	3.3.1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Translator library for raster geospatial data formats
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BUILD_DEPENDS=	libgeotiff>=1.5.0:graphics/libgeotiff \
 		proj>=6,1:graphics/proj
 LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
 		libgif.so:graphics/giflib \
 		libjson-c.so:devel/json-c \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libqhull.so.7:math/qhull \
 		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	ARMADILLO CFITSIO CHARLS CRYPTOPP CURL DODS ECW EXPAT EXR FREEXL GEOS GTA HDF5 JASPER KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
 OPTIONS_RADIO=	PDF
 OPTIONS_RADIO_PDF=	PODOFO POPPLER
 OPTIONS_DEFAULT=CURL EXPAT FREEXL GEOS JASPER LIBXML2 OPENJPEG PCRE PGSQL POPPLER WEBP ZSTD \
 		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
 OPTIONS_SUB=	yes
 CHARLS_DESC=	JPEG-Lossless support via charls
 CRYPTOPP_DESC=	Cryptopp support
 DODS_DESC=	DODS/OPeNDAP support
 EXR_DESC=	EXR support via OpenEXR library
 PCRE_DESC=	Regular expression support for SQLite
 TILEDB_DESC=	TileDB support
 
 USES=		compiler:c++14-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz
 
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
 		--enable-static=yes \
 		--with-cpp14 \
 		--with-crypto=yes \
 		--with-geotiff=yes \
 		--with-gif=yes \
 		--with-gnm=yes \
 		--with-jpeg=yes \
 		--with-libjson-c=yes \
 		--with-liblzma=yes \
 		--with-libtiff=yes \
 		--with-libz=/usr \
 		--with-pcidsk=internal \
 		--with-pcraster=internal \
 		--with-png=yes \
 		--with-proj=yes \
 		--with-qhull=yes \
 		--with-threads=yes \
 		--without-libtool \
 		${ICONV_CONFIGURE_ARG}
 GNU_CONFIGURE=	yes
 LDFLAGS+=	${ICONV_LIB}
 MAKEFILE=	GNUmakefile
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 SLAVEDIRS=	graphics/p5-Geo-GDAL graphics/py-gdal
 
 HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
 		alg/gvgcpfit.h \
 		alg/internal_qhull_headers.h \
 		alg/thinplatespline.h\
 		gcore/gdalexif.h \
 		gcore/gdaljp2metadatagenerator.h \
 		gcore/gdalsse_priv.h \
 		gnm/gnm_priv.h \
 		port/cpl_aws.h \
 		port/cpl_cpu_features.h \
 		port/cpl_google_cloud.h \
 		port/cpl_sha1.h \
 		port/cpl_sha256.h \
 		port/cpl_vsil_curl_priv.h \
 		port/cpl_worker_thread_pool.h
 
 ARMADILLO_CONFIGURE_OFF=--with-armadillo=no
 ARMADILLO_CONFIGURE_ON=	--with-armadillo=${LOCALBASE}
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
 CFITSIO_CONFIGURE_WITH=	cfitsio
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CHARLS_CONFIGURE_WITH=	charls
 CHARLS_LIB_DEPENDS=	libcharls.so:graphics/charls
 CRYPTOPP_CONFIGURE_OFF=	--with-cryptopp=no
 CRYPTOPP_CONFIGURE_ON=	--with-cryptopp=${LOCALBASE}
 CRYPTOPP_LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 CURL_CONFIGURE_OFF=	--with-curl=no
 CURL_CONFIGURE_ON=	--with-curl=${LOCALBASE}/bin/curl-config
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 DODS_CONFIGURE_OFF=	--with-dods-root=no
 DODS_CONFIGURE_ON=	--with-dods-root=${LOCALBASE}
 DODS_LIB_DEPENDS=	libdap.so:devel/libdap
 ECW_CONFIGURE_WITH=	ecw
 ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
 EXPAT_CONFIGURE_WITH=	expat
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 EXR_CONFIGURE_WITH=	exr
 EXR_LIB_DEPENDS=	libImath.so:math/Imath \
 			libOpenEXR.so:graphics/openexr
 EXR_CFLAGS=		-DInt64=uint64_t
 FREEXL_CONFIGURE_WITH=	freexl
 FREEXL_LIB_DEPENDS=	libfreexl.so:textproc/freexl
 GEOS_CONFIGURE_OFF=	--with-geos=no
 GEOS_CONFIGURE_ON=	--with-geos=${LOCALBASE}/bin/geos-config
 GEOS_LIB_DEPENDS=	libgeos.so:graphics/geos
 GTA_CONFIGURE_WITH=	gta
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_WITH=	jasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 KML_CONFIGURE_WITH=	libkml
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
 LIBXML2_CONFIGURE_OFF=	--with-xml2=no
 LIBXML2_CONFIGURE_ON=	--with-xml2=yes
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 MYSQL_CONFIGURE_OFF=	--with-mysql=no
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
 MYSQL_USES=		mysql
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_CONFIGURE_WITH=	odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 OPENJPEG_BUILD_DEPENDS=	openjpeg>=2.1.0:graphics/openjpeg
 OPENJPEG_CONFIGURE_WITH=openjpeg
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 PCRE_CONFIGURE_WITH=	pcre
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PGSQL_CONFIGURE_WITH=	pg
 PGSQL_USES=		pgsql
 PODOFO_CONFIGURE_WITH=	podofo
 PODOFO_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 POPPLER_CONFIGURE_WITH=	poppler=${LOCALBASE}
 POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler
 SFCGAL_CONFIGURE_OFF=	--with-sfcgal=no
 SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
 SPATIALITE_CONFIGURE_WITH=	spatialite
 SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
 SQLITE_CONFIGURE_WITH=	sqlite3
 SQLITE_USES=		sqlite
 TILEDB_CONFIGURE_OFF=	--with-tiledb=no
 TILEDB_CONFIGURE_ON=	--with-tiledb=${LOCALBASE}
 TILEDB_LIB_DEPENDS=	libtiledb.so:databases/tiledb
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 XERCES_CONFIGURE_WITH=	xerces
 XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/alg/internal_libqhull/
 	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/
 	@${RM} -r ${WRKSRC}/frmts/png/libpng/
 	@${RM} -r ${WRKSRC}/frmts/zlib/
 	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/scripts/gdal-bash-completion.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo
index 9673618a1445..0a04109b4afe 100644
--- a/graphics/gdal/distinfo
+++ b/graphics/gdal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624630042
-SHA256 (gdal-3.3.0.tar.xz) = 190c8f4b56afc767f43836b2a5cd53cc52ee7fdc25eb78c6079c5a244e28efa7
-SIZE (gdal-3.3.0.tar.xz) = 12923948
+TIMESTAMP = 1626460018
+SHA256 (gdal-3.3.1.tar.xz) = 48ab00b77d49f08cf66c60ccce55abb6455c3079f545e60c90ee7ce857bccb70
+SIZE (gdal-3.3.1.tar.xz) = 12933888
diff --git a/graphics/gdal/files/patch-configure b/graphics/gdal/files/patch-configure
index 6aebd59759a9..8d4eede12444 100644
--- a/graphics/gdal/files/patch-configure
+++ b/graphics/gdal/files/patch-configure
@@ -1,143 +1,57 @@
-Obtained from:	https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6
+% sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure
 
-sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure
-
---- configure.orig	2021-04-26 12:29:56 UTC
+--- configure.orig	2021-06-28 10:57:58 UTC
 +++ configure
 @@ -36537,9 +36537,9 @@ $as_echo "$LIBKML_VERSION" >&6; }
              libkml_include_dir2="$libkml_prefix/include/kml"
              libkml_include_dir3="$libkml_prefix/include/kml/third_party/boost_1_34_1"
              if test "$libkml_prefix" = "/usr"; then
 -                libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
 +                libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
              else
 -                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
 +                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
              fi
              run_libkml_test="yes"
          elif test "$libkml_requested" = "yes"; then
-@@ -38323,6 +38323,7 @@ fi
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: GEOS support disabled" >&5
- $as_echo "GEOS support disabled" >&6; }
-     GEOS_CONFIG=no
-+    HAVE_GEOS=no
- 
-   elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
- 
-@@ -38580,15 +38581,13 @@ $as_echo "$as_me: WARNING: GEOS was found on your syst
- 
-   else
- 
--    if test $ac_geos_config_auto = "no" ; then
-+    if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
-       as_fn_error $? "GEOS support explicitly enabled, but geos-config could not be found" "$LINENO" 5
-     fi
- 
-   fi
- 
--HAVE_GEOS_RESULT="no"
- if test "${HAVE_GEOS}" = "yes" ; then
--
-   { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from GEOS $GEOS_VERSION" >&5
- $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;}
- 
-@@ -38602,7 +38601,6 @@ $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION"
- 
-   GEOS_LIBS="$STRIPPED_LIBRARY_NAME"
-   LIBS="${GEOS_LIBS} ${LIBS}"
--  HAVE_GEOS_RESULT="yes"
- fi
- 
- 
-@@ -38625,6 +38623,7 @@ fi
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: SFCGAL support disabled" >&5
- $as_echo "SFCGAL support disabled" >&6; }
-+    HAVE_SFCGAL=no
-     SFCGAL_CONFIG=no
- 
-   elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
-@@ -38883,15 +38882,13 @@ $as_echo "$as_me: WARNING: SFCGAL was found on your sy
- 
-   else
- 
--    if test $ac_sfcgal_config_auto = "no" ; then
-+    if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
-       as_fn_error $? "SFCGAL support explicitly enabled, but sfcgal-config could not be found" "$LINENO" 5
-     fi
- 
-   fi
- 
--HAVE_SFCGAL_RESULT="no"
- if test "${HAVE_SFCGAL}" = "yes" ; then
--
-   { $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from SFCGAL $SFCGAL_VERSION" >&5
- $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;}
- 
-@@ -38905,7 +38902,6 @@ $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERS
- 
-   SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME"
-   LIBS="${SFCGAL_LIBS} ${LIBS}"
--  HAVE_SFCGAL_RESULT="yes"
- fi
- 
- 
-@@ -42250,13 +42246,13 @@ fi
+@@ -42246,13 +42246,13 @@ fi
      # Test that the package found is for the right architecture
      saved_LIBS="$LIBS"
      LIBS="$EXR_LIBS"
 -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ImfTiledInputReadTile in -lIlmImf" >&5
 -$as_echo_n "checking for ImfTiledInputReadTile in -lIlmImf... " >&6; }
 -if ${ac_cv_lib_IlmImf_ImfTiledInputReadTile+:} false; then :
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ImfTiledInputReadTile in -lOpenEXR" >&5
 +$as_echo_n "checking for ImfTiledInputReadTile in -lOpenEXR... " >&6; }
 +if ${ac_cv_lib_OpenEXR_ImfTiledInputReadTile+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lIlmImf  $LIBS"
 +LIBS="-lOpenEXR  $LIBS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -42276,17 +42272,17 @@ return ImfTiledInputReadTile ();
+@@ -42272,17 +42272,17 @@ return ImfTiledInputReadTile ();
  }
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
 -  ac_cv_lib_IlmImf_ImfTiledInputReadTile=yes
 +  ac_cv_lib_OpenEXR_ImfTiledInputReadTile=yes
  else
 -  ac_cv_lib_IlmImf_ImfTiledInputReadTile=no
 +  ac_cv_lib_OpenEXR_ImfTiledInputReadTile=no
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_IlmImf_ImfTiledInputReadTile" >&5
 -$as_echo "$ac_cv_lib_IlmImf_ImfTiledInputReadTile" >&6; }
 -if test "x$ac_cv_lib_IlmImf_ImfTiledInputReadTile" = xyes; then :
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OpenEXR_ImfTiledInputReadTile" >&5
 +$as_echo "$ac_cv_lib_OpenEXR_ImfTiledInputReadTile" >&6; }
 +if test "x$ac_cv_lib_OpenEXR_ImfTiledInputReadTile" = xyes; then :
    HAVE_EXR=yes
  else
    HAVE_EXR=no
-@@ -44998,7 +44994,7 @@ echo "  FreeXL support:            ${HAVE_FREEXL}"
- echo "  GEORASTER support:         ${HAVE_GEORASTER}"
- 
- 
--echo "  GEOS support:              ${HAVE_GEOS_RESULT}"
-+echo "  GEOS support:              ${HAVE_GEOS}"
- 
- 
- echo "  Google libkml support:     ${HAVE_LIBKML}"
-@@ -45162,7 +45158,7 @@ echo "  RasterLite2 support:       ${HAVE_RASTERLITE2}
- echo "  RDB support:               ${RDB_SETTING}"
- 
- 
--echo "  SFCGAL support:            ${HAVE_SFCGAL_RESULT}"
-+echo "  SFCGAL support:            ${HAVE_SFCGAL}"
- 
- 
- echo "  SOSI support:              ${SOSI_ENABLED}"
diff --git a/graphics/gdal/files/patch-m4-geos.m4 b/graphics/gdal/files/patch-m4-geos.m4
deleted file mode 100644
index b44b0079f277..000000000000
--- a/graphics/gdal/files/patch-m4-geos.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-Obtained from:	https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6
-
---- m4/geos.m4.orig	2021-04-26 12:31:16 UTC
-+++ m4/geos.m4
-@@ -55,6 +55,7 @@ AC_DEFUN([GEOS_INIT],[
- 
-     AC_MSG_RESULT([GEOS support disabled])
-     GEOS_CONFIG=no
-+    HAVE_GEOS=no
- 
-   elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
- 
-@@ -160,7 +161,7 @@ AC_DEFUN([GEOS_INIT],[
- 
-   else
- 
--    if test $ac_geos_config_auto = "no" ; then
-+    if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
-       AC_MSG_ERROR([GEOS support explicitly enabled, but geos-config could not be found])
-     fi
- 
diff --git a/graphics/gdal/files/patch-m4-sfcgal.m4 b/graphics/gdal/files/patch-m4-sfcgal.m4
deleted file mode 100644
index 448bea3cbf09..000000000000
--- a/graphics/gdal/files/patch-m4-sfcgal.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-Obtained from:	https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6
-
---- m4/sfcgal.m4.orig	2021-04-26 12:31:13 UTC
-+++ m4/sfcgal.m4
-@@ -53,6 +53,7 @@ AC_DEFUN([SFCGAL_INIT],[
-   if test x"$with_sfcgal" = x"no" ; then
- 
-     AC_MSG_RESULT([SFCGAL support disabled])
-+    HAVE_SFCGAL=no
-     SFCGAL_CONFIG=no
- 
-   elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
-@@ -159,7 +160,7 @@ AC_DEFUN([SFCGAL_INIT],[
- 
-   else
- 
--    if test $ac_sfcgal_config_auto = "no" ; then
-+    if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
-       AC_MSG_ERROR([SFCGAL support explicitly enabled, but sfcgal-config could not be found])
-     fi
-