diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile
index a256db7236d6..ad434245fcf4 100644
--- a/databases/spatialite_gui/Makefile
+++ b/databases/spatialite_gui/Makefile
@@ -1,32 +1,38 @@
 # Created by: lbartoletti <lbartoletti@FreeBSD.org>
 
 PORTNAME=	spatialite_gui
-PORTVERSION=	1.7.1
-PORTREVISION=	9
+DISTVERSION=	2.1.0
+DISTVERSIONSUFFIX=	-beta1
 CATEGORIES=	databases geography
-MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
+MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Graphical User Interface (GUI) tool supporting SpatiaLite
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgaiagraphics.so:graphics/libgaiagraphics \
+LIB_DEPENDS=	librasterlite2.so:graphics/librasterlite2 \
 		libfreexl.so:textproc/freexl \
-		libspatialite.so:databases/spatialite
+		libspatialite.so:databases/spatialite \
+		libxlsxwriter.so:math/libxlsxwriter \
+		libvirtualpg.so:databases/virtualpg \
+		librttopo.so:devel/librttopo \
+		libcurl.so:ftp/curl \
+		libminizip.so:archivers/minizip \
+		libproj.so:graphics/proj \
+		libgeos_c.so:graphics/geos
 
 USES=		compiler:c++11-lang gmake gnome iconv localbase:ldflags \
-		pkgconfig
-USE_WX=		2.8
+		pgsql pkgconfig sqlite
+USE_WX=		3.0
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
 
-CPPFLAGS+=	`${WX_CONFIG} --cppflags` "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
+CPPFLAGS+=	`${WX_CONFIG} --cppflags`
 LDFLAGS+=	${ICONV_LIB} `${WX_CONFIG} --libs` -lsqlite3
-CONFIGURE_ARGS=	CFLAGS="${CFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-USE_LDCONFIG=	yes
-
-PLIST_FILES=	bin/spatialite_gui
+CONFIGURE_ARGS=	CFLAGS="${CFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		--with-wxconfig=${WX_CONFIG}
+INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/spatialite_gui/distinfo b/databases/spatialite_gui/distinfo
index 0bea43d4b9b6..a218a27327b9 100644
--- a/databases/spatialite_gui/distinfo
+++ b/databases/spatialite_gui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561512545
-SHA256 (spatialite_gui-1.7.1.tar.gz) = cb9cb1ede7f83a5fc5f52c83437e556ab9cb54d6ace3c545d31b317fd36f05e4
-SIZE (spatialite_gui-1.7.1.tar.gz) = 1090178
+TIMESTAMP = 1643314509
+SHA256 (spatialite_gui-2.1.0-beta1.tar.gz) = ba48d96df18cebc3ff23f69797207ae1582cce62f4596b69bae300ca3c23db33
+SIZE (spatialite_gui-2.1.0-beta1.tar.gz) = 2023014
diff --git a/databases/spatialite_gui/pkg-plist b/databases/spatialite_gui/pkg-plist
new file mode 100644
index 000000000000..4a9deb6c406c
--- /dev/null
+++ b/databases/spatialite_gui/pkg-plist
@@ -0,0 +1,19 @@
+bin/spatialite_gui
+share/applications/spatialite-gui.desktop
+share/icons/hicolor/128x128/apps/spatialite-gui.png
+share/icons/hicolor/16x16/apps/spatialite-gui.png
+share/icons/hicolor/192x192/apps/spatialite-gui.png
+share/icons/hicolor/22x22/apps/spatialite-gui.png
+share/icons/hicolor/24x24/apps/spatialite-gui.png
+share/icons/hicolor/256x256/apps/spatialite-gui.png
+share/icons/hicolor/32x32/apps/spatialite-gui.png
+share/icons/hicolor/36x36/apps/spatialite-gui.png
+share/icons/hicolor/40x40/apps/spatialite-gui.png
+share/icons/hicolor/42x42/apps/spatialite-gui.png
+share/icons/hicolor/48x48/apps/spatialite-gui.png
+share/icons/hicolor/512x512/apps/spatialite-gui.png
+share/icons/hicolor/64x64/apps/spatialite-gui.png
+share/icons/hicolor/72x72/apps/spatialite-gui.png
+share/icons/hicolor/80x80/apps/spatialite-gui.png
+share/icons/hicolor/8x8/apps/spatialite-gui.png
+share/icons/hicolor/96x96/apps/spatialite-gui.png